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

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

diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php
index 89dbe002..7ffcce11 100644
--- a/erp24/controllers/TimetableFactController.php
+++ b/erp24/controllers/TimetableFactController.php
@@ -255,6 +255,7 @@ class TimetableFactController extends Controller
                     $start = $facts[0];
                     $end = end($facts);
 
+
                     if ($start->id > $end->id) {
                         $temp = $start;
                         $start = $end;
@@ -275,7 +276,6 @@ class TimetableFactController extends Controller
             'query' => TimetableFactModel::find()
                 ->andWhere(['>=', 'date_shift', '2024-07-01'])
                 ->andWhere(['<=', 'date_shift', '2024-07-05'])
-                ->andWhere(['autoclosed' => 1])
                 ->orderBy('date_shift, admin_id,id,  store_id'),
             'pagination' => [
                 'pageSize' => false