From bd9fb72c71c8119e636e03829436a0f745459cd5 Mon Sep 17 00:00:00 2001 From: marina Date: Thu, 29 May 2025 17:50:50 +0300 Subject: [PATCH] =?utf8?q?ERP-422=20=D0=9D=D0=B5=20=D1=81=D1=85=D0=BE?= =?utf8?q?=D0=B4=D1=8F=D1=82=D1=81=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B4=D0=B0?= =?utf8?q?=D0=B6=D0=B8=20=D0=B2=20=D0=9B=D0=9A=20=D1=84=D0=BB=D0=BE=D1=80?= =?utf8?q?=D0=B8=D1=81=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/helpers/DateHelper.php | 2 ++ erp24/services/SalesService.php | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/erp24/helpers/DateHelper.php b/erp24/helpers/DateHelper.php index 783a2e6c..8451706e 100644 --- a/erp24/helpers/DateHelper.php +++ b/erp24/helpers/DateHelper.php @@ -25,6 +25,8 @@ class DateHelper ]; const DAYS_IN_WEEK_NAMES_SHORT = ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс']; + + public static int $hourStartDayShift = 7; public static int $hourStartSmen = 8; public static int $hourEndSmen = 20; public static int $hourStartExtendedSmen = 6; diff --git a/erp24/services/SalesService.php b/erp24/services/SalesService.php index bc8098b9..05a545a9 100755 --- a/erp24/services/SalesService.php +++ b/erp24/services/SalesService.php @@ -6,6 +6,8 @@ use DateTime; use Yii; use yii\helpers\ArrayHelper; use yii_app\helpers\DateHelper; +use yii_app\records\Admin; +use yii_app\records\AdminGroup; use yii_app\records\ProductsClass; use yii_app\records\Sales; @@ -248,8 +250,9 @@ class SalesService $dateTimeStartDay = false; $dateTimeEndDay = false; + $isDayWorker = in_array(Admin::findOne($adminId)->group_id, AdminGroup::GROUP_DAY()); $dateTimeEndDayPrepared = DateHelper::getDateTimeEndDay($dateTo, $dateTimeEndDay, $adminId); - $dateTimeEndDayPreparedHour = (new DateTime($dateTimeEndDayPrepared))->format('G'); + $dateTimeEndDayPreparedHour = $isDayWorker ? DateHelper::$hourStartDayShift : (new DateTime($dateTimeEndDayPrepared))->format('G'); if ($isAdministrator) { $dateTimeStartDay = true; -- 2.39.5