From 475bb01ab5dfb266c0dab3a1fd4adf50554e732b Mon Sep 17 00:00:00 2001 From: Aleksey Filippov Date: Fri, 5 Jul 2024 13:23:29 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?utf8?q?=D0=BE=20=D0=BB=D0=B8=D1=87=D0=BD=D0=BE=D0=BC=D1=83=20=D0=BA?= =?utf8?q?=D0=B0=D0=B1=D0=B8=D0=BD=D0=B5=D1=82=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/actions/cabinet/IndexAction.php | 2 +- erp24/services/CabinetService.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/erp24/actions/cabinet/IndexAction.php b/erp24/actions/cabinet/IndexAction.php index c4722aef..d87dcbf3 100755 --- a/erp24/actions/cabinet/IndexAction.php +++ b/erp24/actions/cabinet/IndexAction.php @@ -87,7 +87,7 @@ class IndexAction extends Action ksort($adminFlorist); - $dateFrom = date("Y-m-d", time()); + $dateFrom = date("Y-m-01", time()); $dateTo = date("Y-m-d", time()); $daysSearchForm = new DaysSearchForm(); diff --git a/erp24/services/CabinetService.php b/erp24/services/CabinetService.php index 5e87cd90..ae3ed273 100755 --- a/erp24/services/CabinetService.php +++ b/erp24/services/CabinetService.php @@ -3723,7 +3723,6 @@ false ->andWhere(['>=', 'date_shift', $dateFrom]) ->andWhere(['<=', 'date_shift', $dateTo]) ->andWhere(['admin_id' => $adminId]) - ->andWhere(['status' => AdminCheckin::TYPE_END]) ; if (!empty($storeId)) { -- 2.39.5