From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Fri, 5 Jul 2024 10:23:29 +0000 (+0300)
Subject: Правки по личному кабинету
X-Git-Tag: 1.3~7^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=475bb01ab5dfb266c0dab3a1fd4adf50554e732b;p=erp24_rep%2Fyii-erp24%2F.git

Правки по личному кабинету
---

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)) {