From: marina <m.zozirova@gmail.com>
Date: Mon, 8 Jul 2024 06:45:25 +0000 (+0300)
Subject: скрипт для объединения задублированных смен
X-Git-Tag: 1.3^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=058f9eb516460f879568e30640244c8d6363f856;p=erp24_rep%2Fyii-erp24%2F.git

скрипт для объединения задублированных смен
---

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