From 0c61d5f7acec02eecae91b3dae710352330fcd79 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Thu, 18 Jul 2024 14:17:05 +0300 Subject: [PATCH] =?utf8?q?=D0=A1=201=D0=BE=D0=B3=D0=BE=20=D0=B0=D0=B2?= =?utf8?q?=D0=B3=D1=83=D1=81=D1=82=D0=B0=20=D1=81=D1=82=D0=BE=D0=B8=D0=BC?= =?utf8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=20?= =?utf8?q?=D1=81=D0=BC=D0=B5=D0=BD=D1=8B=20=D1=80=D0=B0=D0=B2=D0=BD=D0=B0?= =?utf8?q?=20=D0=B5=D0=B6=D0=B5=D0=B4=D0=BD=D0=B5=D0=B2=D0=BD=D0=BE=D0=B9?= =?utf8?q?=20=D0=BF=D0=BB=D0=B0=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/CabinetService.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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); -- 2.39.5