From: Alexander Smirnov <fredeom@mail.ru>
Date: Mon, 10 Jun 2024 14:03:15 +0000 (+0300)
Subject: Исправил время ночных и дневных смен
X-Git-Tag: 1.2^2~7^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=578d9b83094cd78f9e09783f8e077ac83e5941c2;p=erp24_rep%2Fyii-erp24%2F.git

Исправил время ночных и дневных смен
---

diff --git a/erp24/controllers/EmployeeSalesReportController.php b/erp24/controllers/EmployeeSalesReportController.php
index f95844c8..5c3e6f66 100644
--- a/erp24/controllers/EmployeeSalesReportController.php
+++ b/erp24/controllers/EmployeeSalesReportController.php
@@ -56,12 +56,12 @@ class EmployeeSalesReportController extends Controller {
                 date("Y-m-d 23:59:59", strtotime($model->date_end))
             ]);
         if ($model->shift == 1) {
-            $salesQuery->andWhere(['between', "TO_CHAR(date, 'HH:MM')", "08:00", "20:00"]);
+            $salesQuery->andWhere(['between', "TO_CHAR(date, 'HH:MM')", "08:00", "19:59"]);
         }
         if ($model->shift ==2) {
             $salesQuery->andWhere(['or',
                 ['>=', "TO_CHAR(date, 'HH:MM')", "20:00"],
-                ['<=', "TO_CHAR(date, 'HH:MM')", "08:00"]
+                ['<=', "TO_CHAR(date, 'HH:MM')", "07:59"]
             ]);
         }
         if ($model->scope > 0) {