From 326e7e5c48a070492d55da88855dfb9af5caf022 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Thu, 18 Jul 2024 10:26:25 +0300
Subject: [PATCH] =?utf8?q?[ERP-114]=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D1=82?=
 =?utf8?q?=D1=8C=20=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?utf8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=BE=D0=B8=D0=BC=D0=BE=D1=81?=
 =?utf8?q?=D1=82=D0=B8=20=D1=81=D0=BC=D0=B5=D0=BD=D1=8B=20=D1=83=20=D0=90?=
 =?utf8?q?=D0=B4=D0=BC=D0=B8=D0=BD=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=82?=
 =?utf8?q?=D0=BE=D1=80=D0=BE=D0=B2=20=D0=B2=20=D0=BB=D0=B8=D1=87=D0=BD?=
 =?utf8?q?=D0=BE=D0=BC=20=D0=BA=D0=B0=D0=B1=D0=B8=D0=BD=D0=B5=D1=82=D0=B5?=
 =?utf8?q?=20=D0=B8=D0=B7=20=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D1=87?=
 =?utf8?q?=D0=BD=D0=B8=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/services/CabinetService.php | 36 +++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/erp24/services/CabinetService.php b/erp24/services/CabinetService.php
index b8aa354a..8b30aa36 100755
--- a/erp24/services/CabinetService.php
+++ b/erp24/services/CabinetService.php
@@ -2384,30 +2384,30 @@ class CabinetService
 
         $normalCountShiftArray = SalaryHelper::$normalCountShift;
         if (!empty($employeeSelect["group_id"])) {
-            if (Admin::ADMINISTRATOR_GROUP_ID == $employeeSelect["group_id"]){
-                if ($dateFrom >= '2023-12-01') {
-                    $dayMonthDateRow = $yearSelect . '-' . $monthSelect . '-01';
-                    $timeRow = strtotime($dayMonthDateRow);
-                    $monthSelectRow = date('n', $timeRow);
-                    $yearSelectRow = date('Y', $timeRow);
-                    if ($yearSelectRow == '2024' && $monthSelectRow == 1) {
-                        $normalCountShift = 20;
-                    } else {
-                        // у Администратора число смен равно количеству дней со вторника по субботу в месяце
-                        $normalCountShift = HtmlHelper::getAdministratorWorkDays($monthSelect, $yearSelect);
-                    }
-                } else {
-                    // у Администратора число смен равно количеству рабочих дней в месяце
-                    $normalCountShift = HtmlHelper::getWorkDays($monthSelect, $yearSelect);
-                }
-            } else {
+//            if (Admin::ADMINISTRATOR_GROUP_ID == $employeeSelect["group_id"]){
+//                if ($dateFrom >= '2023-12-01') {
+//                    $dayMonthDateRow = $yearSelect . '-' . $monthSelect . '-01';
+//                    $timeRow = strtotime($dayMonthDateRow);
+//                    $monthSelectRow = date('n', $timeRow);
+//                    $yearSelectRow = date('Y', $timeRow);
+//                    if ($yearSelectRow == '2024' && $monthSelectRow == 1) {
+//                        $normalCountShift = 20;
+//                    } else {
+//                        // у Администратора число смен равно количеству дней со вторника по субботу в месяце
+//                        $normalCountShift = HtmlHelper::getAdministratorWorkDays($monthSelect, $yearSelect);
+//                    }
+//                } else {
+//                    // у Администратора число смен равно количеству рабочих дней в месяце
+//                    $normalCountShift = HtmlHelper::getWorkDays($monthSelect, $yearSelect);
+//                }
+//            } else {
                 $employeeSelectGroupId = $this->getGroupId($employeeId, $employeeSelect['group_id'], $dateFrom, $dateTo);
                 if (array_key_exists($employeeSelectGroupId, $normalCountShiftArray)) {
                     $normalCountShift = $normalCountShiftArray[$employeeSelectGroupId];
                 } else {
                     $normalCountShift = 15;
                 }
-            }
+//            }
         }
 
 
-- 
2.39.5