]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
С 1ого августа стоимость норма смены равна ежедневной плате
authorAlexander Smirnov <fredeom@mail.ru>
Thu, 18 Jul 2024 11:17:05 +0000 (14:17 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Thu, 18 Jul 2024 11:17:05 +0000 (14:17 +0300)
erp24/services/CabinetService.php

index 8b30aa36562efeff58d31b2cf9dec6bc25671d62..ad2cb08c7f99a8744269dda92eb31a49e1dcc4fc 100755 (executable)
@@ -2513,12 +2513,14 @@ class CabinetService
 
         if (!empty($normalCountShift)) {
             if ($isAdministrator) {
-                $normalCostShift = round($administratorOklad / $normalCountShift, 1);
-
-                $dailyPayment = $normalCostShift;
+                if ($dateFrom >= '2024-08-01') {
+                    $normalCostShift = $monthlySalary['daily_payment'];
+                    $dailyPayment = $monthlySalary['daily_payment'];
+                } else {
+                    $normalCostShift = round($administratorOklad / $normalCountShift, 1);
+                    $dailyPayment = $normalCostShift;
+                }
                 $hourPayment = $dailyPayment / Admin::SHIFT_HOUR_COUNT_ADMINISTRATOR;
-
-
             } else {
                 $normalCostShift = round($monthlySalary['monthly_salary'] / $normalCountShift, 1);