From e13734a9b055b9bece986ee52fd26bdb6acc7b94 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 6 Dec 2024 10:48:20 +0300
Subject: [PATCH] =?utf8?q?[ERP-258]=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20?=
 =?utf8?q?=D0=BF=D0=B0=D0=B3=D0=B8=D0=BD=D0=B0=D1=86=D0=B8=D1=8E=20=D0=B8?=
 =?utf8?q?=D0=B7=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=8B=20=D0=B2?=
 =?utf8?q?=D1=8C=D1=8E=D1=88=D0=BA=D0=B8,=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1?=
 =?utf8?q?=D0=BE=D1=82=D0=B0=D0=BB=20=D0=BA=D0=B5=D0=B9=D1=81=20update=20?=
 =?utf8?q?=D0=B8=D0=B7=20index?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/ShiftTransferController.php | 8 ++++----
 erp24/records/ShiftTransfer.php               | 6 ++----
 erp24/views/shift-transfer/_transfer.php      | 5 +++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index d114bf06..7a99aadf 100644
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -120,10 +120,6 @@ class ShiftTransferController extends Controller
 
     public function actionUpdate($id = null)
     {
-        if (!Yii::$app->request->isPost) {
-            return $this->redirect('index');
-        }
-
         $shiftTransfer = ShiftTransfer::findOne($id);
 
         if (!$shiftTransfer) {
@@ -175,6 +171,10 @@ class ShiftTransferController extends Controller
                     }
                 }
             }
+        } else {
+            $data = self::buildLoadDataShiftRemains(explode(',', $shiftTransfer->product_groups), $shiftTransfer->store_guid);
+            $productGuids = $data['productGuids'];
+            $shiftTransfer->setGroups();
         }
 
         $isCreate = false;
diff --git a/erp24/records/ShiftTransfer.php b/erp24/records/ShiftTransfer.php
index 74155c3e..99691660 100644
--- a/erp24/records/ShiftTransfer.php
+++ b/erp24/records/ShiftTransfer.php
@@ -106,10 +106,8 @@ class ShiftTransfer extends \yii\db\ActiveRecord
     }
 
     public function setGroups() {
-        function cb($a) { return $a != 'other_items'; }
-        function cb2($a) { return $a == 'other_items'; }
-        $this->groups1 = array_filter(explode(',', $this->product_groups ?? ''), 'cb');
-        $this->groups2 = array_filter(explode(',', $this->product_groups ?? ''), 'cb2');
+        $this->groups1 = array_filter(explode(',', $this->product_groups ?? ''), function ($a) { return $a != 'other_items'; });
+        $this->groups2 = array_filter(explode(',', $this->product_groups ?? ''), function ($a) { return $a == 'other_items'; });
     }
 
     public function setProductGroups() {
diff --git a/erp24/views/shift-transfer/_transfer.php b/erp24/views/shift-transfer/_transfer.php
index b07dbc9c..ab47fc30 100644
--- a/erp24/views/shift-transfer/_transfer.php
+++ b/erp24/views/shift-transfer/_transfer.php
@@ -10,7 +10,8 @@ use yii_app\records\ShiftTransfer;
 echo \yii\helpers\Html::label('Таблица фактических остатков');
 echo \kartik\grid\GridView::widget([
     'dataProvider' => new \yii\data\ArrayDataProvider([
-        'allModels' => $shiftTransfer->shiftRemains
+        'allModels' => $shiftTransfer->shiftRemains,
+        'pagination' => false,
     ]),
 //                'showFooter' => true,
     'columns' => [
@@ -93,4 +94,4 @@ echo \kartik\grid\GridView::widget([
     ],
     'layout' => '{items}',
     'showPageSummary' => true,
-]); ?>
\ No newline at end of file
+]); ?>
-- 
2.39.5