ERP-302 Редактирование букета

diff --git a/erp24/controllers/BouquetController.php b/erp24/controllers/BouquetController.php
index 4e876dbb619f1841d7f3174d8f4fdf354a2d3404..13fda34e50fb11f186b74a993351885ae5b46d53 100644 (file)
--- a/erp24/controllers/BouquetController.php
+++ b/erp24/controllers/BouquetController.php
@@ -69,18 +69,19 @@ class BouquetController extends Controller
     {
         $model = new BouquetComposition();
 
+
         if (Yii::$app->request->isPost) {
             $data = Yii::$app->request->post();
             $model->guid = DataHelper::createGuidMy('07');
             $model->load($data);
-            if ($data['matrix_type_id']) {
-                BouquetCompositionMatrixTypeHistory::setData($data['matrix_type_id'], $model->id);
-            }
             if ($model->save()) {
-
                 $month = $data['month'];
                 $year = $data['year'];
 
+                if ($data['matrix_type_id']) {
+                    BouquetCompositionMatrixTypeHistory::setData($data['matrix_type_id'], $model->id);
+                }
+
                 $model->photo_bouquet = UploadedFile::getInstances($model, 'photo_bouquet');
                 if ($model->photo_bouquet) {
                     Files::deleteAll(['file_type' => 'image', 'entity_id' => $model->id, 'entity' => BouquetComposition::PHOTO_BOUQUET]);
@@ -132,11 +133,10 @@ class BouquetController extends Controller
                         }
                     }
                 }
-
                 return $this->redirect(['view', 'id' => $model->id]);
             }
         }
-        
+
         $availableItems = ArrayHelper::map(
             Products1c::find()
                 ->where([