From f5d04f29b97adb977392eaacfa53e7b2732c25e3 Mon Sep 17 00:00:00 2001 From: E98Developer Date: Mon, 29 Jun 2026 06:50:55 +0200 Subject: [PATCH] =?UTF-8?q?MNOD=20EV3-447=20Term=C3=A9k=20v=C3=A1laszt?= =?UTF-8?q?=C3=B3=20=C3=B6sszes=20term=C3=A9k=20gomb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/OrderController.php | 3 +++ resources/js/moduleJs/order.js | 5 ++++- resources/views/modules/order/productSelectSidebar.blade.php | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/OrderController.php b/app/Http/Controllers/OrderController.php index 2d1126e..52405c2 100644 --- a/app/Http/Controllers/OrderController.php +++ b/app/Http/Controllers/OrderController.php @@ -1889,6 +1889,9 @@ public function getDataTableContent(): JsonResponse } else { if (\request()->get('groupId')) { $groupId = \request()->get('groupId'); + if ($groupId === 'all') { + $groupId = null; + } } } diff --git a/resources/js/moduleJs/order.js b/resources/js/moduleJs/order.js index 8e33aa5..93d453e 100644 --- a/resources/js/moduleJs/order.js +++ b/resources/js/moduleJs/order.js @@ -1269,7 +1269,7 @@ solution before template data:function (data) { data.searchStr=dataTableSearchStr; data.krel=dataTableSearchKrel; - data.groupId=selectedProductGroup; + data.groupId = (selectedProductGroup === 'all') ? null : selectedProductGroup; data.supplierId=Order.supplierId; data.deliveryDate=Order.deliveryDate; data.orderId=Order.id; @@ -1417,6 +1417,9 @@ solution before template $('.sidebar-wrapper .sidebar-menu .sidebar-dropdown .sidebar-submenu li a.categoryItem.clickable').on('click', function () { let groupId=$(this).data('id'); + if (groupId === 'all') { + groupId = null; + } selectedProductGroup=groupId; dataTableSearchStr=null; console.log(groupId); diff --git a/resources/views/modules/order/productSelectSidebar.blade.php b/resources/views/modules/order/productSelectSidebar.blade.php index 25b37dd..dfcc73b 100644 --- a/resources/views/modules/order/productSelectSidebar.blade.php +++ b/resources/views/modules/order/productSelectSidebar.blade.php @@ -46,6 +46,9 @@