From 1f1254c8184f55eca442795cac2f0383d6002f0d Mon Sep 17 00:00:00 2001 From: E98Developer Date: Sun, 9 Aug 2026 10:46:46 +0200 Subject: [PATCH] =?UTF-8?q?ADD=20EV3-431=20Profitcenter=20-=20bet=C5=B1k?= =?UTF-8?q?=C3=B3d=20phase2/2=20add=20hasCusetomer=20code=20switch=20to=20?= =?UTF-8?q?supplier=20administration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Admin/SupplierController.php | 6 ++++ resources/js/admin/supplier.js | 4 +++ .../views/admin/supplier/create.blade.php | 28 +++++++++---------- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/Admin/SupplierController.php b/app/Http/Controllers/Admin/SupplierController.php index 2eddfb2..37a64bd 100644 --- a/app/Http/Controllers/Admin/SupplierController.php +++ b/app/Http/Controllers/Admin/SupplierController.php @@ -102,6 +102,12 @@ private function getSupplierDataFromRequest(Request $request) $data[$key] = $request->get($key); } $data['status'] = DbStatusFieldEnum::active; + + // A hasCustomerCode mező csak akkor jelenik meg a formon, ha a SupplierCustomerCode + // feature flag aktív - ilyenkor nem szabad null-t írni a NOT NULL boolean oszlopba. + if ($request->has('hasCustomerCode')) { + $data['hasCustomerCode'] = $request->boolean('hasCustomerCode'); + } if ($contactId = $request->get('contactId')) { $data['contactId'] = $contactId; } else { diff --git a/resources/js/admin/supplier.js b/resources/js/admin/supplier.js index 2028b58..7c050e3 100644 --- a/resources/js/admin/supplier.js +++ b/resources/js/admin/supplier.js @@ -18,6 +18,9 @@ if(typeof Supplier==='undefined'){ if(typeof this.hasDeliveryConstraint ==="undefined"){ this.hasDeliveryConstraint=0; } + if(typeof this.hasCustomerCode ==="undefined"){ + this.hasCustomerCode=0; + } if(typeof this.orderCutOffTime ==="undefined"){ this.orderCutOffTime=12; } @@ -229,6 +232,7 @@ window.SupplierAdmin=function (options,SupplierItem) { $(CSSSelectorForm+' *[data-toggle=canSeeInOrder][data-title='+root.Supplier.canSeeInOrder+']').click(); $(CSSSelectorForm+' *[data-toggle=hooreycaDataActive][data-title='+root.Supplier.hooreycaDataActive+']').click(); $(CSSSelectorForm+' *[data-toggle=hasDeliveryConstraint][data-title='+root.Supplier.hasDeliveryConstraint+']').click(); + $(CSSSelectorForm+' *[data-toggle=hasCustomerCode][data-title='+root.Supplier.hasCustomerCode+']').click(); $(CSSSelectorForm+' input[name=orderCutOffTime]').val(root.Supplier.orderCutOffTime); $(CSSSelectorForm+' select[name=deliveryLeadTime]').val(root.Supplier.deliveryLeadTime); let productGroup=[]; diff --git a/resources/views/admin/supplier/create.blade.php b/resources/views/admin/supplier/create.blade.php index 4f1ffb7..859928d 100644 --- a/resources/views/admin/supplier/create.blade.php +++ b/resources/views/admin/supplier/create.blade.php @@ -350,6 +350,20 @@ class="form-control" id="openHours" + @feature('SupplierCustomerCode') +
+ +
+
+
+ Igen + Nem +
+ +
+
+
+ @endfeature
@@ -380,20 +394,6 @@ class="form-control" id="openHours"
- @feature('SupplierCustomerCode') -
- -
-
-
- Igen - Nem -
- -
-
-
- @endfeature {{--