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

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 244bc4ce7551d31eee36b0b4231dd4b77ba6f4c4..718448d356bafbd092dd5b2125e5371995cf364e 100644 (file)
--- 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 , '',[]);
             }