From: marina <m.zozirova@gmail.com>
Date: Tue, 25 Feb 2025 12:36:12 +0000 (+0300)
Subject: ERP-302 Редактирование букета
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=c682c17d7a20115ddf1b53018b57cb1478dac36b;p=erp24_rep%2Fyii-erp24%2F.git

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

diff --git a/erp24/controllers/BouquetController.php b/erp24/controllers/BouquetController.php
index 1fc8e771..dc2aa78e 100644
--- a/erp24/controllers/BouquetController.php
+++ b/erp24/controllers/BouquetController.php
@@ -86,6 +86,7 @@ class BouquetController extends Controller
 
         if ($isNew) {
             $model->guid = DataHelper::createGuidMy('07');
+            $model->status = WriteOffsErp::STATUS_CREATED;
         }
 
         if (isset($data['matrix_type_id'])) {
diff --git a/erp24/records/BouquetComposition.php b/erp24/records/BouquetComposition.php
index 1987d9e0..115ebf68 100644
--- a/erp24/records/BouquetComposition.php
+++ b/erp24/records/BouquetComposition.php
@@ -21,6 +21,10 @@ use yii_app\services\FileService;
  * @property string|null $updated_at
  * @property int|null $created_by
  * @property int|null $updated_by
+ * @property int|null $status
+ * @property string|null $date_confirm
+ * @property string|null $date_1c_send
+ * @property string|null $confirm_admin
  *
  * @property BouquetCompositionProducts[] $bouquetCompositionProducts
  * @property BouquetCompositionMatrixTypeHistory $matrixType
@@ -105,9 +109,14 @@ class BouquetComposition extends ActiveRecord
             'guid' => 'GUID букета',
             'name' => 'Название букета',
             'created_at' => 'Дата создания',
+            'date_confirm' => 'Дата обновления',
+            'date_1c_send' => 'Дата обновления',
             'updated_at' => 'Дата обновления',
             'created_by' => 'ID создателя записи',
+            'confirm_admin' => 'ID подтвердившего',
             'updated_by' => 'ID обновителя записи',
+            'status' => 'Статус',
+
         ];
     }