diff --git a/Layout/default/Cpeshipping/Index.php b/Layout/default/Cpeshipping/Index.php index 549997d9a..9a8ac1fd5 100644 --- a/Layout/default/Cpeshipping/Index.php +++ b/Layout/default/Cpeshipping/Index.php @@ -58,7 +58,7 @@ -
"> + "> @@ -73,8 +73,14 @@
Versand
 orderproduct->product->attributes) && $c->orderproduct->product->attributes['hostnetwork_order']->value): ?> - + + external_finished) ? "checked='checked'" : ""?> /> + external_finished_by) ? "title='Vorleistungsdienst bestellt von ".$c->external_finisher->name." (".$c->external_finisher->address->getCompanyOrName(true).")'" : ""?>> + external_finished_by): ?> + external_finished_by) ? $c->external_finisher->getAbbrName() : ""?> + + nicht erforderlich @@ -89,7 +95,8 @@
- + +
@@ -143,11 +150,11 @@ var error = false; - $('input[name^=external_finish-]').each(function() { - var id_match = $(this).attr("name").match(/external_finish-(\d+)$/); + $('input[id^=external_finish-]').each(function() { + var id_match = $(this).attr("id").match(/external_finish-(\d+)$/); var id = id_match[1]; - if(!$("input[name^=external_finish-").is(":checked")) { + if(!$("input[id^=external_finish-").is(":checked")) { if($("#ship-" + id).is(":checked")) { error = true; $("#ship-error-" + id).show(); diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php index 29568af16..7469a1799 100644 --- a/Layout/default/Order/Form.php +++ b/Layout/default/Order/Form.php @@ -1,4 +1,6 @@ - + @@ -260,6 +262,12 @@ order_date) : date("d.m.Y")?>" /> +
+ +
+ +
+
Verzögerte Herstellung:
@@ -353,6 +361,11 @@ products) && count($order->products)): ?> products as $product): ?> + product->external == 1) { + $includes_external_product = true; + } + ?>
@@ -607,7 +620,7 @@
is("Admin", "netoperator")): ?> - id): ?> + id && !$includes_external_product): ?>
diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php index 0e6b990e1..41bb7f507 100644 --- a/Layout/default/Order/Index.php +++ b/Layout/default/Order/Index.php @@ -76,6 +76,11 @@
+
+ + +
+
- $v): ?> + $v): ?> @@ -279,7 +284,9 @@ install_date) : ""?>" placeholder="--.--.----" />
+
+
@@ -555,9 +562,9 @@ "> - $v): ?> + $v): ?> - + @@ -610,6 +617,7 @@ install_date) : ""?>" placeholder="--.--.----" />
+
@@ -790,15 +798,18 @@ - function saveVororttermin(id) { + function saveVororttermin(id, removeDate = false) { date = $('#vororttermin-' + id).val(); - if(!date) { + if(removeDate) { + date = ""; + } + /*if(!date) { $('#vororttermin-button-' + id).addClass("btn-danger"); $('#vororttermin-button-' + id).removeClass("btn-outline-success"); $('#vororttermin-button-' + id).removeClass("btn-outline-primary"); $('#vororttermin-' + id).addClass("is-invalid"); return false; - } + }*/ $.post('', { @@ -815,8 +826,15 @@ $('#vororttermin-' + id).addClass("is-valid"); $('#vororttermin-' + id).removeClass("is-invalid"); - $('#date-pill-' + id + '-install_date').html('Vorortinstallation: ' + data.order.date + ''); - $('#date-pill-' + id + '-install_date').addClass("active"); + if(data.order.date) { + $('#date-pill-' + id + '-install_date').html('Vorortinstallation: ' + data.order.date + ''); + $('#date-pill-' + id + '-install_date').addClass("active"); + } else { + $('#date-pill-' + id + '-install_date').removeClass("active"); + $('#date-pill-' + id + '-install_date').html('Vorortinstallation: --.--.----'); + $('#vororttermin-' + id).val(""); + } + setTimeout(function() { $('#vororttermin-' + id).removeClass("is-valid"); diff --git a/Layout/default/topbar.php b/Layout/default/topbar.php index b2ee7f7ed..291d5d859 100644 --- a/Layout/default/topbar.php +++ b/Layout/default/topbar.php @@ -16,7 +16,7 @@
  • - @@ -33,7 +33,7 @@ -
    +
    diff --git a/application/Cpeprovisioning/Cpeprovisioning.php b/application/Cpeprovisioning/Cpeprovisioning.php index 682102bf9..1b5be2dae 100644 --- a/application/Cpeprovisioning/Cpeprovisioning.php +++ b/application/Cpeprovisioning/Cpeprovisioning.php @@ -6,6 +6,7 @@ class Cpeprovisioning extends mfBaseModel { private $order; private $orderproduct; private $termination; + private $external_finisher; private $creator; private $editor; @@ -21,6 +22,11 @@ class Cpeprovisioning extends mfBaseModel { return $this->orderproduct; } + if($name == "external_finisher") { + $this->external_finisher = new User($this->external_finished_by); + return $this->external_finisher; + } + if($name == "creator") { $this->creator = new User($this->create_by); return $this->creator; diff --git a/application/Cpeprovisioning/CpeprovisioningModel.php b/application/Cpeprovisioning/CpeprovisioningModel.php index 20c5ca2d7..c3daab295 100644 --- a/application/Cpeprovisioning/CpeprovisioningModel.php +++ b/application/Cpeprovisioning/CpeprovisioningModel.php @@ -5,8 +5,14 @@ class CpeprovisioningModel { public $order_id; public $orderproduct_id; public $routerconfig_finished; + public $order_journal_id; public $routertype; public $shipping; + public $shipping_date; + public $external_finished; + public $external_finished_by; + public $shipped; + public $shipped_by; public $wifi_ssid; public $wifi_pass; public $mac; diff --git a/application/Cpeshipping/CpeshippingController.php b/application/Cpeshipping/CpeshippingController.php index ac9d79d05..73b34649b 100644 --- a/application/Cpeshipping/CpeshippingController.php +++ b/application/Cpeshipping/CpeshippingController.php @@ -59,17 +59,69 @@ class CpeshippingController extends mfBaseController { $this->layout()->set("shippings", $shippings); $this->layout()->set("pagination", $pagination); } + + protected function saveAction() { + $r = $this->request; + if($r->type == "ship") { + return $this->shipAction(); + } + //var_dump($r);exit; + if(is_array($r->external_finish) && count($r->external_finish)) { + $ext_finish = $r->external_finish; + } + + if(is_array($r->prov) && count($r->prov)) { + $provs = $r->prov; + } + + if(!count($provs)) { + $this->layout()->setFlash("Nichts zu speichern", "warning"); + $this->redirect("Cpeshipping"); + } + + $shippings = []; + foreach($provs as $prov_id) { + if(!is_numeric($prov_id) || $prov_id <= 0) { + continue; + } + + $prov = new Cpeprovisioning($prov_id); + + if(!$prov->id) { + continue; + } + if(!$prov->shipping) { + // is not supposed to be selectable in UI + continue; + } + + if(array_key_exists($prov_id, $ext_finish) && $ext_finish[$prov_id] == 1) { + $prov->external_finished = date('U'); + $prov->external_finished_by = $this->me->id; + } else { + $prov->external_finished = null; + $prov->external_finished_by = $this->me->id; + } + $prov->save(); + } + + $this->layout()->setFlash("Erfolgreich gespeichert.", "success"); + $this->redirect("Cpeshipping"); + } protected function shipAction() { - //$this->redirect("Cpeshipping"); $r = $this->request; //var_dump($r);exit; - + $ships = []; if(is_array($r->ships) && count($r->ships)) { $ships = $r->ships; } - + $ext_finish = []; + if(is_array($r->external_finish) && count($r->external_finish)) { + $ext_finish = $r->external_finish; + } + if(!count($ships)) { $this->layout()->setFlash("Keine CPEs ausgewählt", "warning"); $this->redirect("Cpeshipping"); @@ -90,8 +142,16 @@ class CpeshippingController extends mfBaseController { // is not supposed to be selectable in UI continue; } - $shippings[] = $prov; + if(array_key_exists($prov_id, $ext_finish) && $ext_finish[$prov_id] == 1) { + $prov->external_finished = date('U'); + $prov->external_finished_by = $this->me->id; + } else { + $prov->external_finished = null; + $prov->external_finished_by = $this->me->id; + } + $prov->save(); + $shippings[] = $prov; } $tpl = new Layout(); diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php index b289d60f0..d09250ad7 100644 --- a/application/Order/OrderController.php +++ b/application/Order/OrderController.php @@ -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() { diff --git a/application/Order/OrderModel.php b/application/Order/OrderModel.php index 90544993f..92c15b0d8 100644 --- a/application/Order/OrderModel.php +++ b/application/Order/OrderModel.php @@ -3,6 +3,7 @@ class OrderModel { public $owner_id; public $billingaddress_id; + public $partner_number; public $order_date; public $finish_date; public $finish_after; @@ -246,6 +247,13 @@ class OrderModel { } } + if(array_key_exists("partner_number", $filter)) { + $partner_number = FronkDB::singleton()->escape($filter['partner_number']); + if($partner_number) { + $where .= " AND Order.partner_number like '%$partner_number%'"; + } + } + if(array_key_exists("create_by", $filter)) { $create_by = $filter['create_by']; if(is_numeric($create_by)) { diff --git a/application/Patching/PatchingController.php b/application/Patching/PatchingController.php index a7b24bdda..bfe217ed6 100644 --- a/application/Patching/PatchingController.php +++ b/application/Patching/PatchingController.php @@ -177,14 +177,15 @@ class PatchingController extends mfBaseController { $mode = "add"; $patch_data["termination_id"] = $term_id; } - + //var_dump($mode, $r);exit; if($mode == "add") { - $patch_data['create_by'] = 1; - $patching = PatchingModel::create($patch_data); if($patch_data["patched"]) { $patch_data["patched_by"] = $this->me->id; $patch_data["patched_date"] = date("U"); } + $patch_data['create_by'] = $this->me_id; + $patching = PatchingModel::create($patch_data); + } else { if($patch_data["patched"] && !$patching->patched) { $patch_data["patched_by"] = $this->me->id; @@ -192,7 +193,7 @@ class PatchingController extends mfBaseController { } $patching->update($patch_data); } - + //var_dump($patching);exit; $id = $patching->save(); if(!$id) { $this->layout()->setFlash("Fehler beim Speichern", "error"); diff --git a/application/Patching/PatchingModel.php b/application/Patching/PatchingModel.php index 37dc8e8f9..b78c8396c 100644 --- a/application/Patching/PatchingModel.php +++ b/application/Patching/PatchingModel.php @@ -7,6 +7,8 @@ class PatchingModel { public $device_name = null; public $device_port = null; public $patched = null; + public $patched_by = null; + public $patched_date = null; public $create_by = null; public $edit_by = null;