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

diff --git a/erp24/actions/cabinet/IndexAction.php b/erp24/actions/cabinet/IndexAction.php
index c4722aefd8d77e81d6f0b848aa1479951c4d3e90..d87dcbf376882838194cc22718a58f764cf7451a 100755 (executable)
--- 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 5e87cd90d599e978395ae3dce8e2b8323fe81422..ae3ed273e07d50de4b8c67e75b838852f85b8f4d 100755 (executable)
--- 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)) {