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

Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev

Browse Source
This commit is contained in:
Frank Schubert
2024-08-06 12:19:19 +02:00
parent 0caa0bfac2 a6389f014f
commit fe49be342d
13 changed files with 454 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/Contract/ContractController.php
View File

@@ -465,6 +465,9 @@ class ContractController extends mfBaseController
}
}
// TODO: Contractconfig übernehmen
if($contract_cancel_date) {
$contract->cancel_date = $contract_cancel_date->getTimestamp();
$contract->edit_by = $this->me->id;
@@ -768,7 +771,7 @@ class ContractController extends mfBaseController
$contract_data = [];
$contract_data["owner_id"] = (int)$r->owner_id;
$contract_data["billingaddress_id"] = ($r->billingaddress_id) ? (int)$r->billingaddress_id : null;
$contract_data["billingaddress_id"] = ($r->billingaddress_id) ? (int)$r->billingaddress_id : $r->owner_id;
$contract_data["product_id"] = (int)$r->product_id;
$contract_data["matchcode"] = $r->matchcode;
$contract_data["product_name"] = $r->product_name;
@@ -822,6 +825,7 @@ class ContractController extends mfBaseController
if ($mode == "add") {
$contract = ContractModel::create($contract_data);
} else {
$contract->edit_by = $this->me->id;
$contract->update($contract_data);
}
@@ -851,6 +855,7 @@ class ContractController extends mfBaseController
//var_dump($contract);exit;
$contract_id = $contract->save();
if (!$contract_id) {
$this->layout()->setFlash("Fehler beim Speichern.", "error");

12
application/Contract/ContractModel.php
View File

@@ -179,6 +179,7 @@ class ContractModel {
$data["price_setup"] = 0;
$data["price_nne"] = 0;
$data["price_nbe"] = 0;
$data["vatgroup_id"] = TT_VATGROUP_CREDIT;
}
$contract = ContractModel::create($data);
@@ -187,13 +188,19 @@ class ContractModel {
return $contract;
}
/**
* To create Credit Contract for Partner (NNE)
*
* @param Contract $contract
* @return bool|Contract
*/
public static function createCreditForContract($contract) {
$log = mfLoghandler::singleton();
$me = new User();
$me->loadMe();
if(!$contract->id) {
$log->warning(__METHOD__."(): Invalid Contractqueue object");
$log->warning(__METHOD__."(): Invalid Contract object");
return false;
}
@@ -281,8 +288,7 @@ class ContractModel {
$data["price_setup"] = 0;
$data["price_nne"] = 0;
$data["price_nbe"] = 0;
$data["vatgroup_id"] = $contract->vatgroup_id;
$data["vatgroup_id"] = TT_VATGROUP_CREDIT;
$credit = ContractModel::create($data);