From: Alexander Smirnov <fredeom@mail.ru>
Date: Thu, 18 Jul 2024 11:17:05 +0000 (+0300)
Subject: С 1ого августа стоимость норма смены равна ежедневной плате
X-Git-Tag: 1.4~69^2~2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=0c61d5f7acec02eecae91b3dae710352330fcd79;p=erp24_rep%2Fyii-erp24%2F.git

С 1ого августа стоимость норма смены равна ежедневной плате
---

diff --git a/erp24/services/CabinetService.php b/erp24/services/CabinetService.php
index 8b30aa36..ad2cb08c 100755
--- a/erp24/services/CabinetService.php
+++ b/erp24/services/CabinetService.php
@@ -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);