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

Added minor things to Order; fixed saving patcher in Patching

Browse Source
This commit is contained in:
Frank Schubert
2021-11-09 21:04:29 +01:00
parent 33c9f7b2be
commit 8dd3831c0a
11 changed files with 159 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
application/Order/OrderController.php
View File

@@ -409,6 +409,7 @@ class OrderController extends mfBaseController {
} else {
$order_data['billing_type'] = "invoice";
}
$order_data['partner_number'] = $r->partner_number;
$order_data['bank_account_bank'] = $r->bank_account_bank;
$order_data['bank_account_owner'] = $r->bank_account_owner;
$order_data['bank_account_iban'] = $r->bank_account_iban;
@@ -688,19 +689,24 @@ class OrderController extends mfBaseController {
}
$date = $r->install_date;
if(!$date) {
if($date === null) {
$this->returnJson(["status" => "error", "order" => ['id' => $order_id]]);
}
if($date) {
$date = Layout::dateToInt($date);
if(!$date) {
$this->returnJson(["status" => "error", "order" => ['id' => $order_id]]);
}
} elseif($date === "") {
$date = null;
}
$date = Layout::dateToInt($date);
if(!$date) {
$this->returnJson(["status" => "error", "order" => ['id' => $order_id]]);
}
$order->install_date = $date;
$order->save();
$this->returnJson(["status" => "OK", "order" => ['id' => $order_id, 'date' => date('d.m.Y', $date)]]);
$this->returnJson(["status" => "OK", "order" => ['id' => $order_id, 'date' => ($date) ? date('d.m.Y', $date) : ""]]);
}
protected function deleteAction() {