ERP-422 Не сходятся продажи в ЛК флориста

diff --git a/erp24/helpers/DateHelper.php b/erp24/helpers/DateHelper.php
index 783a2e6cd6673a08dc8d8ab39a1e1a0df21ca166..8451706e7f0df5202e528169135fe4e58a4e9ff4 100644 (file)
--- 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 bc8098b9c80ed0df0ba83ef4c214b2ff06748544..05a545a96fe0fa0c9f063dc1ef105fb49c093102 100755 (executable)
--- 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;