From 058f9eb516460f879568e30640244c8d6363f856 Mon Sep 17 00:00:00 2001 From: marina Date: Mon, 8 Jul 2024 09:45:25 +0300 Subject: [PATCH] =?utf8?q?=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20=D0=B4?= =?utf8?q?=D0=BB=D1=8F=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=B4=D0=B8=D0=BD=D0=B5?= =?utf8?q?=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=B4=D1=83=D0=B1=D0=BB=D0=B8?= =?utf8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D1=81=D0=BC?= =?utf8?q?=D0=B5=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/TimetableFactController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php index d1473406..c05bc0cc 100644 --- a/erp24/controllers/TimetableFactController.php +++ b/erp24/controllers/TimetableFactController.php @@ -358,7 +358,7 @@ class TimetableFactController extends Controller if ($action == 'applyPlus') { $plans = Timetable::find() ->andWhere(['>=', 'date', '2024-07-01']) - ->andWhere(['<=', 'date', '2024-07-05']) + ->andWhere(['<=', 'date', date('Y-m-d')]) // ->andWhere(['=', 'id', 111309]) ->all(); @@ -405,7 +405,7 @@ class TimetableFactController extends Controller $dataProvider = new ActiveDataProvider([ 'query' => TimetableFactModel::find() ->andWhere(['>=', 'date_shift', '2024-07-01']) - ->andWhere(['<=', 'date_shift', '2024-07-05']) + ->andWhere(['<=', 'date_shift', date('Y-m-d')]) ->orderBy('date_shift, admin_id,id, store_id'), 'pagination' => [ 'pageSize' => false -- 2.39.5