Убрал комментарий старого кода

diff --git a/erp24/services/CabinetService.php b/erp24/services/CabinetService.php
index ad2cb08c7f99a8744269dda92eb31a49e1dcc4fc..aaabd6002be33ec01112d61b792fa4f139d65602 100755 (executable)
--- a/erp24/services/CabinetService.php
+++ b/erp24/services/CabinetService.php
@@ -2384,30 +2384,12 @@ 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 {
-                $employeeSelectGroupId = $this->getGroupId($employeeId, $employeeSelect['group_id'], $dateFrom, $dateTo);
-                if (array_key_exists($employeeSelectGroupId, $normalCountShiftArray)) {
-                    $normalCountShift = $normalCountShiftArray[$employeeSelectGroupId];
-                } else {
-                    $normalCountShift = 15;
-                }
-//            }
+            $employeeSelectGroupId = $this->getGroupId($employeeId, $employeeSelect['group_id'], $dateFrom, $dateTo);
+            if (array_key_exists($employeeSelectGroupId, $normalCountShiftArray)) {
+                $normalCountShift = $normalCountShiftArray[$employeeSelectGroupId];
+            } else {
+                $normalCountShift = 15;
+            }
         }