Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Contract WIP & Contractqueue WIP 2024-04-18

Browse Source
This commit is contained in:
Frank Schubert
2024-04-18 14:01:02 +02:00
parent 1819b8ee9c
commit bede016157
8 changed files with 685 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Layout/default/Contract/View.php
View File

@@ -156,10 +156,10 @@
<td><?=($contract->product_external) ? "Ja" : "Nein"?></td>
</tr><tr>
<th>Setup Preis:</th>
<td>€ <?=$contract->price_setup?></td>
<td class="<?=($contract->price_setup < 0) ? "text-danger" : ""?>">€ <?=$contract->price_setup?></td>
</tr><tr>
<th>Preis Periodisch:</th>
<td>€ <?=$contract->price?></td>
<td class="<?=($contract->price < 0) ? "text-danger" : ""?>">€ <?=$contract->price?></td>
</tr><tr>
<th>Verrechnungsperiode:</th>
<td>
@@ -261,9 +261,15 @@
<em>Vertrag manuell angelegt</em>
<?php elseif($j->value == "import"): ?>
<em>Vertrag importiert: <?=nl2br(htmlentities($j->text))?>
<?php elseif($j->value == "order"): ?>
<em>Vertrag aus Bestellung #<a href="<?=self::getUrl("Order", "edit", ["id" => $contract->orderproduct->order_id])?>"><?=$contract->orderproduct->order_id?></a> erstellt
<?php endif; ?>
</td>
<?php elseif($j->type == "credit_created"): ?>
<td><i class="far fa-money-bill-simple-wave text-secondary pl-1"></i></td>
<td style="width: 100%"><em>Gutschrift-Vertrag <a href="<?=self::getUrl("Contract", "View", ["contract_id" => $j->value])?>"><?=$j->value?></a> erstellt</em>
</td>
<?php elseif($j->type == "link"): ?>
<?php $link = new Contract($j->value); ?>
<td><i class="fas fa-link text-secondary pl-1"></i></td>
@@ -321,21 +327,26 @@
<?php if((is_array($contract->linkFrom) && count($contract->linkFrom)) || (is_array($contract->linkTo) && count($contract->linkTo))): ?>
<table class="table table-striped table-sm table-bordered table-hover">
<tr>
<th>Typ</th>
<th>Kunde</th>
<th>Contract ID</th>
<th>Typ</th>
<th>Produkt</th>
<th>Bestelldatum</th>
<th>Fertigstellung</th>
<th>Kündigung</th>
<th></th>
</tr>
<?php foreach($contract->links as $link): ?>
<?php foreach([$contract->linkFrom, $contract->linkTo] as $links): ?>
<?php foreach($links as $link): ?>
<?php
if($link->contract_id == $contract->id) {
$direction = "von";
$linkcontract = $link->origin;
if($link->type == "credit") {
$direction = "";
//continue;
}
} else {
$linkcontract = $link->contract;
if($link->type == "upgrade" || $link->type == "downgrade") {
@@ -344,14 +355,19 @@
if($link->type == "relocation") {
$direction = "nach";
}
if($link->type == "credit") {
$direction = "zu";
//continue;
}
}
?>
<tr>
<td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=__($link->type, "contract")?> <?=($link->type != "link") ? $direction : ""?></td>
<td><a href="<?=self::getUrl("Address", "View", ["id" => $linkcontract->owner_id])?>"><?=$linkcontract->owner->getCompanyOrName()?></a></td>
<td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["contract_id" => $linkcontract->id])?>"><?=$linkcontract->id?></a></td>
<td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=__($link->type, "contract")?> <?=($link->type != "link") ? $direction : ""?></td>
<td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["contract_id" => $linkcontract->id])?>"><?=$linkcontract->product_name?> [<?=$linkcontract->matchcode?>]</a></td>
<td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->order_date) ? date('d.m.Y', $linkcontract->order_date) : ""?></td>
<td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->finish_date) ? date('d.m.Y', $linkcontract->finish_date) : ""?></td>
@@ -361,6 +377,7 @@
</td>
</tr>
<?php endforeach; ?>
<?php endforeach; ?>
</table>
<?php endif; ?>
</div>

65
Layout/default/Contractqueue/Index.php
View File

@@ -78,13 +78,17 @@
<div class="card">
<div class="card-body mb-3">
<form method="post" action="<?=self::getUrl("Contractqueue", "commit")?>">
<div class="row">
<div class="col-12">
<div class="float-left">
<h4 class="header-title">Fertiggestellte Bestellungen</h4>
<button type="submit" class="btn btn-primary"><i class="fas fa-fw fa-check"></i> Markierte Elemente als Contract übernehmen</button>
</div>
<div class="float-right">
<a class="btn btn-primary mb-2" href="<?=self::getUrl("Contractqueue", "importFinishedOrders")?>"><i class="fas fa-fw fa-file-import"></i> Fertiggestellte Bestellungen importieren</a>
<a class="btn btn-outline-primary mb-2" href="<?=self::getUrl("Contractqueue", "importFinishedOrders")?>"><i class="fas fa-fw fa-file-import"></i> Fertiggestellte Bestellungen importieren</a>
</div>
</div>
</div>
@@ -92,6 +96,8 @@
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
<?php $i = 0; foreach($orders as $order_id => $contracts): ?>
<?php $order = $contracts[0]->orderproduct->order; ?>
@@ -139,8 +145,8 @@
<option></option>
</select>
<div class="input-group-append">
<button class="btn btn-primary" onclick="saveAddress('owner', <?=$order_id?>)"><i class="fas fa-check"></i></button>
<button class="btn btn-secondary" onclick="toggleEdit('owner', <?=$order_id?>, false)"><i class="fas fa-times"></i></button>
<button type="button" class="btn btn-primary" onclick="saveAddress('owner', <?=$order_id?>)"><i class="fas fa-check"></i></button>
<button type="button" class="btn btn-secondary" onclick="toggleEdit('owner', <?=$order_id?>, false)"><i class="fas fa-times"></i></button>
</div>
</div>
</div>
@@ -178,8 +184,8 @@
<option></option>
</select>
<div class="input-group-append">
<button class="btn btn-primary" onclick="saveAddress('billingaddress', <?=$order_id?>)"><i class="fas fa-check"></i></button>
<button class="btn btn-secondary" onclick="toggleEdit('billingaddress', <?=$order_id?>, false)"><i class="fas fa-times"></i></button>
<button type="button" class="btn btn-primary" onclick="saveAddress('billingaddress', <?=$order_id?>)"><i class="fas fa-check"></i></button>
<button type="button" class="btn btn-secondary" onclick="toggleEdit('billingaddress', <?=$order_id?>, false)"><i class="fas fa-times"></i></button>
</div>
</div>
</div>
@@ -246,10 +252,10 @@
<?php foreach($contracts as $contract): ?>
<tr id="contract-<?=$contract->id?>">
<td><input type="checkbox" class="form-control pointer" id="approve-order-<?=$order_id?>-contract-<?=$contract->id?>" onclick="toggleApproval(<?=$order_id?>, 'order')" <?=($contract->approved) ? "checked='checked'" : ""?> /></td>
<td><input type="checkbox" class="form-control pointer" value="<?=$contract->id?>" id="approve-order-<?=$order_id?>-contract-<?=$contract->id?>" onclick="toggleApproval(<?=$order_id?>, 'order')" <?=($contract->approved) ? "checked='checked'" : ""?> /></td>
<td class="text-wrap product">
<div class="text">
<i class="fas fa-fw fa-pencil pointer text-primary" onclick="toggleEdit('contract', <?=$contract->id?>, 'product')"></i> <span class="value"><?=$contract->product_name?></span>
<!--i class="fas fa-fw fa-pencil pointer text-primary" onclick="toggleEdit('contract', <?=$contract->id?>, 'product')"></i--> <span class="value"><?=$contract->product_name?></span>
<?php if($contract->termination_id && $contract->termination): ?>
<br /><small class="text-pink"><?=$contract->termination->code?> - <?= str_replace("\n", " - ", $contract->termination->getAddress())?></small>
<?php endif ?>
@@ -370,7 +376,7 @@
<?php foreach($contracts as $contract): ?>
<?php $credit = $contract->getCredit(); if(!$credit) continue; ?>
<tr id="credit-<?=$contract->id?>">
<td><input type="checkbox" class="form-control pointer" id="approve-credit-<?=$order_id?>-contract-<?=$contract->id?>" onclick="toggleApproval(<?=$order_id?>, 'credit')" <?=($contract->approved) ? "checked='checked'" : ""?> /></td>
<td><input type="checkbox" class="form-control pointer" value="<?=$contract->id?>" id="approve-credit-<?=$order_id?>-contract-<?=$contract->id?>" onclick="toggleApproval(<?=$order_id?>, 'credit')" <?=($contract->approved_credit) ? "checked='checked'" : ""?> /></td>
<td class="crediting_partner_name text value"><?=($credit["partner"]) ? $credit["partner"]->getCompanyOrName() : ""?></td>
<td class="text-wrap product text">
<span class="value"><?=$contract->product_name?></span>
@@ -423,13 +429,18 @@
</div>
<?php $i++; endforeach; ?>
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
</div>
<button type="submit" class="btn btn-primary"><i class="fas fa-fw fa-check"></i> Markierte Elemente als Contract übernehmen</button>
</form>
</div>
</div>
</div>
</div>
@@ -444,6 +455,39 @@
var products = <?=json_encode($prods)?>;
$("input[id^='approve-order-'], input[id^='approve-credit-']").change(function() {
var id = this.id;
console.log(this);
var order_match = id.match(/approve-(order|credit)-(\d+)-contract-(\d+)/);
var type = order_match[1];
//var order_id = order_match[2];
var cq_id = order_match[3];
var value = $(this).is(":checked") ? 1 : 0;
$.ajax({
url: "<?=self::getUrl("Contractqueue", "api")?>",
type: "POST",
data: {
do: "setApproval",
type: type,
//order_id: order_id,
cq_id: cq_id,
value: value
},
dataType: "json",
context: {
element_id: this.id,
checked: $(this).is(":checked")
},
success: function (success) {
console.log(this.element_id);
}
});
});
function toggleOrderApproval(cbox, order_id, type) {
if(!parseInt(order_id) || !order_id) return;
@@ -455,6 +499,7 @@
} else {
$("#" + type + "-products-" + order_id + " input[id^='approve-" + type + "-" + order_id + "-contract-']").prop('checked', false);
}
$("input[id^='approve-" + type + "-" + order_id + "-contract-']").change();
}
function toggleApproval(order_id, type) {
@@ -473,6 +518,8 @@
if(checked_count < box_count) {
$("#" + type + "-products-" + order_id + " .checkbox-toggle").prop("checked", false);
}
$("input[id^='approve-" + type + "-" + order_id + "-contract-']").change();
}
function toggleEdit(type, id, control_name) {

41
application/Contract/Contract.php
View File

@@ -50,6 +50,9 @@ class Contract extends mfBaseModel {
case "link":
$this->linkTo[] = $link;
break;
case "credit":
$this->linkFrom[] = $link;
break;
case "upgrade":
$this->upgradeTo[] = $link;
break;
@@ -73,6 +76,9 @@ class Contract extends mfBaseModel {
case "link":
$this->linkFrom[] = $link;
break;
case "credit":
$this->linkTo[] = $link;
break;
case "upgrade":
$this->upgradeFrom[] = $link;
break;
@@ -127,6 +133,39 @@ class Contract extends mfBaseModel {
return false;
}
public function addFilesFromOrder() {
if(!$this->orderproduct_id) {
return true;
}
$op = $this->getProperty("orderproduct");
$order = $op->order;
if(!$order || !$order->id) return true;
foreach($order->files as $file) {
$cfile = ContractFileModel::create([
"contract_id" => $this->id,
"file_id" => $file->file_id,
"name" => $file->name,
"description" => $file->description,
"create_by" => $file->create_by,
"edit_by" => $file->edit_by
]);
$cfile->save();
$journal = ContractjournalModel::create([
"contract_id" => $this->id,
"type" => "file",
"value" => $cfile->id,
"text" => (array_key_exists($cfile->name, TT_ORDER_FILE_TYPES)) ? TT_ORDER_FILE_TYPES[$cfile->name] : $cfile->name
]);
$journal->save();
}
}
public function getProperty($name) {
if($this->$name == null) {
@@ -227,7 +266,7 @@ class Contract extends mfBaseModel {
}
if($name == "links") {
$this->links = ContractLinkModel::includesContractId($this->id, ["type" => $link]);
$this->links = ContractLinkModel::includesContractId($this->id, ["type" => "link"]);
//var_dump($this->links);exit;
return $this->links;
}

78
application/Contract/ContractModel.php
View File

@@ -56,7 +56,7 @@ class ContractModel {
return $model;
}
public static function createFromOrderproduct($op) {
public static function createFromOrderproduct(OrderProduct $op) {
$log = mfLoghandler::singleton();
if(!$op->id) {
@@ -108,6 +108,82 @@ class ContractModel {
return $contract;
}
public static function createFromContractQueue(Contractqueue $cq, $contracttype = "contract") {
$log = mfLoghandler::singleton();
$me = new User();
$me->loadMe();
if(!$cq->id) {
$log->warning(__METHOD__."(): Invalid Contractqueue object");
return false;
}
$order_id = $cq->order_id;
$product_id = $cq->product_id;
$order = new Order($order_id);
$product = new Product($product_id);
if(!$order->id || !$product->id) {
$log->warning(__METHOD__."(): Invalid Order or Product");
return false;
}
if(!$order->finish_date || $order->finish_date > date("U")) {
$log->warning(__METHOD__."(): Order not finished yet");
return false;
}
$data = [];
$data["orderproduct_id"] = $cq->orderproduct_id;
$data["matchcode"] = $cq->matchcode;
$data["owner_id"] = $cq->owner_id;
$data["billingaddress_id"] = ($cq->billingaddress_id) ? $cq->billingaddress_id : $cq->owner_id;
$data["termination_id"] = ($cq->termination_id) ? $cq->termination_id : null;
$data["product_id"] = $cq->product_id;
$data["product_name"] = $cq->product_name;
$data["product_info"] = $cq->product_info;
$data["amount"] = $cq->amount;
$data["sla_id"] = $cq->sla_id;
$data["product_external"] = $cq->product_external;
$data["product_external_id"] = $cq->product_external_id;
$data["price"] = $cq->price;
$data["price_setup"] = $cq->price_setup;
$data["price_nne"] = $cq->price_nne;
$data["price_nbe"] = $cq->price_nbe;
$data["billing_delay"] = $cq->billing_delay;
$data["billing_period"] = $cq->billing_period;
$data["contract_term"] = $cq->contract_term;
$data["order_date"] = $order->order_date;
$data["finish_date"] = $order->finish_date;
$data["finish_date_by"] = $me->id;
$data["note"] = $order->note;
if($contracttype == "credit") {
$crediting_price = $cq->price_nne;
if($cq->crediting_partner_rate) {
$crediting_price = round($cq->price / 100 * $cq->crediting_partner_rate, 4);
}
$crediting_price *= -1;
$data["matchcode"] = $cq->crediting_matchcode;
$data["owner_id"] = $cq->crediting_partner_id;
$data["billingaddress_id"] = $cq->crediting_partner_id;
$data["termination_id"] = null;
$data["price"] = $crediting_price;
$data["price_setup"] = 0;
$data["price_nne"] = 0;
$data["price_nbe"] = 0;
}
$contract = ContractModel::create($data);
//var_dump($contract);exit;
return $contract;
}
public function savePrecontract($contract) {
}

138
application/Contractqueue/ContractqueueController.php
View File

@@ -167,6 +167,114 @@ class ContractqueueController extends mfBaseController {
}
$this->layout()->setFlash("Alle Bestellungen importiert", "success");
$this->redirect("Contractqueue");
}
protected function commitAction() {
$r = $this->request;
//var_dump($r->get());exit;
$new_contracts = [];
$c = 0;
$o = 0;
foreach(ContractqueueModel::search(["approved" => true, "contract_id" => null]) as $cq) {
//var_dump($cq);exit;
$contract = new Contract($cq->orderproduct_id);
if($contract->id) continue; // contract should not yet exist
/*
* Create Contract
*/
$contract = ContractModel::createFromContractqueue($cq);
if(!$contract->save()) {
$this->layout()->setFlash("Eine Position in Bestellung ".$cq->order_id." konnte nicht übernommen werden: Fehler beim Speichern");
continue;
}
$c++;
$cq->contract_id = $contract->id;
$cq->save();
// create Contractjournal
$journal = ContractjournalModel::create([
'contract_id' => $contract->id,
'type' => "created_from",
'value' => "order"
]);
$journal->save();
$contract->addFilesFromOrder();
/*
* Create Crediting Contract
* if required
*/
if($cq->approved_credit) {
$credit = ContractModel::createFromContractQueue($cq, "credit");
if(!$credit->save()) {
$this->layout()->setFlash("Zu einer Position in Bestellung ".$cq->order_id." konnte keine Gutschrift erstellt werden: Fehler beim Speichern");
continue;
}
$journal = ContractjournalModel::create([
'contract_id' => $credit->id,
'type' => "created_from",
'value' => "order"
]);
$journal->save();
$journal = ContractjournalModel::create([
'contract_id' => $contract->id,
'type' => "credit_created",
'value' => $credit->id
]);
$journal->save();
$link = ContractLinkModel::create([
'contract_id' => $contract->id,
'origin_contract_id' => $credit->id,
'type' => 'credit'
]);
$link->save();
// XXX: retour link erstellen?
}
/*
* Create ContractLinks
*/
foreach($new_contracts as $origin) {
if(ContractLinkModel::getFirst(["contract_id" => $contract->id, "origin_contract_id" => $origin->id])) {
continue;
}
$link = ContractLinkModel::create([
'contract_id' => $contract->id,
'origin_contract_id' => $origin->id,
'type' => 'link'
]);
$link->save();
if($link->id) {
$journal = ContractjournalModel::create([
'contract_id' => $contract->id,
'type' => "link",
'value' => $origin->id
]);
$journal->save();
$ojournal = ContractjournalModel::create([
'contract_id' => $origin->id,
'type' => "link",
'value' => $contract->id
]);
$ojournal->save();
}
}
$new_contracts[] = $contract;
}
$this->layout()->setFlash("$c Contracts erstellt", "success");
$this->redirect("Contract");
}
protected function apiAction() {
@@ -180,6 +288,9 @@ class ContractqueueController extends mfBaseController {
case "saveContract":
$return = $this->saveContractApi();
break;
case "setApproval":
$return = $this->setApprovalApi();
break;
default:
$return = false;
}
@@ -304,4 +415,31 @@ class ContractqueueController extends mfBaseController {
return ["contract" => $return, "credit" => $credit];
}
private function setApprovalApi() {
$r = $this->request;
//var_dump($r->get());exit;
$id = $r->cq_id;
if(!is_numeric($id) || $id < 1) {
return false;
}
$cq = new Contractqueue($id);
if(!$cq->id) {
return false;
}
if($r->type == "order") {
$cq->approved = $r->value;
}
if($r->type == "credit") {
$cq->approved_credit = $r->value;
}
$cq->save();
return ["message" => "contract saved"];
}
}

11
application/Contractqueue/ContractqueueModel.php
View File

@@ -236,7 +236,7 @@ class ContractqueueModel {
if(is_array($limit) && count($limit)) {
if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
$sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
} elseif(is_numeric($count)) {
} elseif(is_numeric($limit['count'])) {
$sql .= " LIMIT ".$limit['count'];
}
}
@@ -267,6 +267,15 @@ class ContractqueueModel {
}
}
if(array_key_exists("approved", $filter)) {
$approved = $filter['approved'];
if($approved) {
$where .= " AND Contractqueue.approved = 1";
} else {
$where .= " AND Contractqueue.approved = 0";
}
}
if(array_key_exists("contract_id", $filter)) {
$contract_id = $filter['contract_id'];
if(is_numeric($contract_id)) {

1
lang/de.php
View File

@@ -55,6 +55,7 @@ $l['contract.upgrade'] = "Upgrade";
$l['contract.downgrade'] = "Downgrade";
$l['contract.relocation'] = "Umzug";
$l['contract.productchange'] = "Produktwechsel";
$l['contract.credit'] = "Gutschrift";
$l['cc.oesterreich'] = "AT";

6
lib/mvcfronk/mfBase/mfBaseModel.php
View File

@@ -212,6 +212,12 @@ class mfBaseModel {
if($this->fieldprefix && !strstr($field,"_")) {
$where=$this->fieldprefix."_id=$id";
}
if(method_exists($this, "beforeDelete")) {
// delete can be canceled
if(!$this->beforeDelete()) {
return false;
}
}
if($this->db->delete($this->table,$where)) {
if(method_exists($this, "afterDelete")) {
$this->afterDelete();