From: Alexander Smirnov <fredeom@mail.ru>
Date: Mon, 2 Dec 2024 09:06:37 +0000 (+0300)
Subject: [ERP-242] осле неправильного резолва конфликта
X-Git-Tag: 1.7~213^2~1
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=887ee8d4457ea7a218f364e459fb7609d411823e;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-242] осле неправильного резолва конфликта
---

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 244bc4ce..718448d3 100644
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -80,9 +80,9 @@ class ShiftTransferController extends Controller
             $shiftTransfer->save();
             ShiftRemains::deleteAll(['shift_transfer_id' => $shiftTransfer->id]);
             $modelsShiftRemains = MultipleModel::createMultipleModel(ShiftRemains::class,
-                'ShiftTransfer', 'shiftRemains');
+                'ShiftTransfer', 'shiftRemainsCopy');
             $postShiftTransfer = Yii::$app->request->post('ShiftTransfer');
-            $loadDataShiftRemains = ArrayHelper::getValue($postShiftTransfer, 'shiftRemains');
+            $loadDataShiftRemains = ArrayHelper::getValue($postShiftTransfer, 'shiftRemainsCopy');
             if (!empty($loadDataShiftRemains)) {
                 MultipleModel::loadMultipleFromArray($modelsShiftRemains, $loadDataShiftRemains , '',[]);
             }