From 6bd2a183e6072e705f87cf833014f4b89be173a6 Mon Sep 17 00:00:00 2001 From: Aleksey Filippov Date: Thu, 4 Jul 2024 17:30:48 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=20?= =?utf8?q?=D0=BB=D0=B8=D1=87=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=B0=D0=B1?= =?utf8?q?=D0=B8=D0=BD=D0=B5=D1=82=D0=B0=20=D0=BD=D0=B0=20=D0=BD=D0=BE?= =?utf8?q?=D0=B2=D1=8B=D0=B9=20=D1=84=D0=B0=D0=BA=D1=82=20=D1=81=D0=BC?= =?utf8?q?=D0=B5=D0=BD=D1=8B=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/CabinetService.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/erp24/services/CabinetService.php b/erp24/services/CabinetService.php index 7b368cff..5e87cd90 100755 --- a/erp24/services/CabinetService.php +++ b/erp24/services/CabinetService.php @@ -2305,13 +2305,19 @@ class CabinetService $storeAdminsNames = array_combine($storeAdminsIds, $storeAdminsNamesPrepared); + $timetableAnotherStore = []; + $adminIdsInShiftAnotherStore = []; + $adminNamesInShiftAnotherStore = []; + $storeIdsInShiftAnotherStore = []; - $adminAnotherStore = $this->setAdminStore($timetableAnotherStore); + if (!empty($timetableAnotherStore)) { + $adminAnotherStore = $this->setAdminStore($timetableAnotherStore); - $timetableAnotherStore = ArrayHelper::getValue($adminAnotherStore, 'timetable'); - $adminIdsInShiftAnotherStore = ArrayHelper::getValue($adminAnotherStore, 'adminIdsInShift'); - $adminNamesInShiftAnotherStore = ArrayHelper::getValue($adminAnotherStore, 'adminNamesInShift'); - $storeIdsInShiftAnotherStore = ArrayHelper::getValue($adminAnotherStore, 'storeIdsInShift'); + $timetableAnotherStore = ArrayHelper::getValue($adminAnotherStore, 'timetable'); + $adminIdsInShiftAnotherStore = ArrayHelper::getValue($adminAnotherStore, 'adminIdsInShift'); + $adminNamesInShiftAnotherStore = ArrayHelper::getValue($adminAnotherStore, 'adminNamesInShift'); + $storeIdsInShiftAnotherStore = ArrayHelper::getValue($adminAnotherStore, 'storeIdsInShift'); + } $storeIdsInShiftKeys = array_merge(array_keys($storeIdsInShift), array_keys($storeIdsInShiftAnotherStore)); $storeIdsInShiftValues = array_merge($storeIdsInShift, $storeIdsInShiftAnotherStore); -- 2.39.5