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

diff --git a/erp24/controllers/EmployeeSalesReportController.php b/erp24/controllers/EmployeeSalesReportController.php
index f95844c8e080afdc7cf5cab8948012f6d4f7110f..5c3e6f6676c4babb0bf6d50a211990d1c96c00db 100644 (file)
--- 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) {