From: Alexander Smirnov <fredeom@mail.ru>
Date: Mon, 2 Dec 2024 08:27:00 +0000 (+0300)
Subject: Merge branch 'develop' into feature_smirnov_erp-242_input_fact_remains
X-Git-Tag: 1.7~214^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=d6193d13aa55c001a8a34e6b873e25c441e18c70;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_smirnov_erp-242_input_fact_remains

# Conflicts:
#	erp24/controllers/ShiftTransferController.php
---

d6193d13aa55c001a8a34e6b873e25c441e18c70
diff --cc erp24/controllers/ShiftTransferController.php
index 618427ee,adae4373..244bc4ce
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@@ -69,41 -77,25 +76,25 @@@ class ShiftTransferController extends C
          if (!$shiftTransfer) {
              $shiftTransfer = new ShiftTransfer;
          }
- 
-         $loadDataShiftRemains = null;
- 
-         if ($shiftTransfer->load(Yii::$app->request->post())) {
+         if ($shiftTransfer->load(Yii::$app->request->post()) && $shiftTransfer->validate()) {
+             $shiftTransfer->save();
+             ShiftRemains::deleteAll(['shift_transfer_id' => $shiftTransfer->id]);
+             $modelsShiftRemains = MultipleModel::createMultipleModel(ShiftRemains::class,
+                 'ShiftTransfer', 'shiftRemains');
              $postShiftTransfer = Yii::$app->request->post('ShiftTransfer');
-             $loadDataShiftRemains = ArrayHelper::getValue($postShiftTransfer, 'shiftRemainsCopy');
- 
-             if ($shiftTransfer->id || ($shiftTransfer->validate() && $shiftTransfer->save())) {
-                 ShiftRemains::deleteAll(['shift_transfer_id' => $shiftTransfer->id]);
-                 $modelsShiftRemains = MultipleModel::createMultipleModel(ShiftRemains::class,
-                     'ShiftTransfer', 'shiftRemainsCopy');
-                 if (!empty($loadDataShiftRemains)) {
-                     MultipleModel::loadMultipleFromArray($modelsShiftRemains, $loadDataShiftRemains, '', []);
-                 }
- 
-                 foreach ($modelsShiftRemains as $modelsShiftRemain) {
-                     $modelsShiftRemain->shift_transfer_id = $shiftTransfer->id;
-                     if ($modelsShiftRemain->validate()) {
-                         $modelsShiftRemain->save();
-                     } else {
-                         var_dump($modelsShiftRemain->getErrors());
-                         die;
-                     }
-                 }
- 
-                 if ($shiftTransfer->validate()) {
-                     $shiftTransfer->goods_transfer_summ = array_sum(ArrayHelper::getColumn($shiftTransfer->shiftRemains, 'remains_summ'));
-                     $shiftTransfer->goods_transfer_count = array_sum(ArrayHelper::getColumn($shiftTransfer->shiftRemains, 'remains_count'));
-                     $shiftTransfer->discrepancy_pieces = array_sum(ArrayHelper::getColumn($shiftTransfer->shiftRemains, 'fact_and_1c_diff'));
-                     $shiftTransfer->discrepancy_rubles = array_sum(ArrayHelper::getColumn($shiftTransfer->shiftRemains, 'remains_1c'));
-                     $shiftTransfer->save();
- 
-                     return $this->redirect(['/shift-transfer/view', 'id' => $shiftTransfer->id]);
+             $loadDataShiftRemains = ArrayHelper::getValue($postShiftTransfer, 'shiftRemains');
+             if (!empty($loadDataShiftRemains)) {
 -                MultipleModel::loadMultipleFromArray($modelsShiftRemains, $loadDataShiftRemains, '', []);
++                MultipleModel::loadMultipleFromArray($modelsShiftRemains, $loadDataShiftRemains , '',[]);
+             }
+             foreach ($modelsShiftRemains as $modelsShiftRemain) {
+                 $modelsShiftRemain->shift_transfer_id = $shiftTransfer->id;
+                 if ($modelsShiftRemain->validate()) {
+                     $modelsShiftRemain->save();
+                 } else {
+                     var_dump($modelsShiftRemain->getErrors()); die;
                  }
              }
+             return $this->redirect(['/shift-transfer/view', 'id' => $shiftTransfer->id]);
          }
  
          $isCreate = false;