From 578d9b83094cd78f9e09783f8e077ac83e5941c2 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Mon, 10 Jun 2024 17:03:15 +0300 Subject: [PATCH] =?utf8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB?= =?utf8?q?=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D0=BD=D0=BE=D1=87=D0=BD?= =?utf8?q?=D1=8B=D1=85=20=D0=B8=20=D0=B4=D0=BD=D0=B5=D0=B2=D0=BD=D1=8B?= =?utf8?q?=D1=85=20=D1=81=D0=BC=D0=B5=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/EmployeeSalesReportController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) { -- 2.39.5