From ee7c1469f5f65441911980c0716f8d6ba03e17a4 Mon Sep 17 00:00:00 2001 From: Luca Haid Date: Tue, 21 Jan 2025 13:18:50 +0000 Subject: [PATCH] Preorder fix attribute statusflag --- Layout/default/Preorder/Index.php | 22 ++++++++++++++ .../WarehouseOrderRequestController.php | 5 +++- .../WarehouseOrderRequest.js | 30 ++++++++++++++++--- 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php index a3dd4ed17..b29e980c0 100644 --- a/Layout/default/Preorder/Index.php +++ b/Layout/default/Preorder/Index.php @@ -502,6 +502,28 @@ $pagination_entity_name = "Vorbestellungen"; "json" ); + // if attribute is inhouse_cabling_supplied and is checked or unchecked send an api request + // api + // do: setStatusFlag, preorder_id, flag_id: 1, value (0 or 1) + + if (attrib == "inhouse_cabling_supplied") { + var flag_id = 1; + $.post("", { + do: "setStatusFlag", + preorder_id: preorder_id, + flag_id: flag_id, + value: value + }, + function(success) { + if(success.status == "OK") { + attributeSuccess(success.result); + } else { + attributeError(success.result.id, success.result.attribute); + } + }, + "json" + ); + } }); }); }); diff --git a/application/WarehouseOrderRequest/WarehouseOrderRequestController.php b/application/WarehouseOrderRequest/WarehouseOrderRequestController.php index 77e7b78dc..92ac0dd6c 100644 --- a/application/WarehouseOrderRequest/WarehouseOrderRequestController.php +++ b/application/WarehouseOrderRequest/WarehouseOrderRequestController.php @@ -56,7 +56,7 @@ class WarehouseOrderRequestController extends TTCrud { 'delete' => 'Bestellwunsch wurde gelöscht', 'noChanges' => 'Keine Änderungen',]; - protected array $additionalJSVariables = ['BASE_URL' => '/WarehouseOrderRequest']; + protected array $additionalJSVariables = ['BASE_URL' => '/WarehouseOrderRequest', 'WAREHOUSE_ADMIN' => true]; public function permissionCheck(): bool { return $this->user->can(["WarehouseUser"]); @@ -89,6 +89,9 @@ class WarehouseOrderRequestController extends TTCrud { } $this->additionalJSVariables['user_id'] = $this->user->id; + if (!$this->user->can('WarehouseAdmin')) { + $this->additionalJSVariables['WAREHOUSE_ADMIN'] = false; + } } protected function customAutoCompleteWare($value) { diff --git a/public/js/pages/WarehouseOrderRequest/WarehouseOrderRequest.js b/public/js/pages/WarehouseOrderRequest/WarehouseOrderRequest.js index 5c93f4d6f..5216621ba 100644 --- a/public/js/pages/WarehouseOrderRequest/WarehouseOrderRequest.js +++ b/public/js/pages/WarehouseOrderRequest/WarehouseOrderRequest.js @@ -1,8 +1,24 @@ +window.localStorage.setItem('tt-table-WarehouseOrderRequest', JSON.stringify({ + filters: { + takeOverBy: null + } +})); + Vue.component('warehouse-order-request', { //language=Vue template: ` + + + + @@ -12,7 +28,7 @@ Vue.component('warehouse-order-request', {