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

diff --git a/erp24/records/BouquetComposition.php b/erp24/records/BouquetComposition.php
index 4b08d316b7822b28e244522eedd7b58893afe738..9ca3377db6c9d4233e41801a0db639ddeb6c5eba 100644 (file)
--- a/erp24/records/BouquetComposition.php
+++ b/erp24/records/BouquetComposition.php
@@ -85,8 +85,8 @@ class BouquetComposition extends ActiveRecord
     {
         return [
             [['name', 'matrix_type_id', 'status'], 'required', 'message' => 'Поле {attribute} не может быть пустым'],
-            [['created_by', 'updated_by', 'status', 'date_1c_send', 'date_confirm'], 'integer', 'message' => '{attribute} должен быть целым числом'],
-            [['created_at', 'updated_at', 'admin_confirm'], 'safe'],
+            [['created_by', 'updated_by', 'status'], 'integer', 'message' => '{attribute} должен быть целым числом'],
+            [['created_at', 'updated_at', 'admin_confirm',  'date_1c_send', 'date_confirm'], 'safe'],
             [['guid', 'name'], 'string', 'max' => 255, 'tooLong' => '{attribute} не должен превышать 255 символов'],
             [['error_text'], 'string'],
             [['photo_bouquet'], 'file',
@@ -111,8 +111,8 @@ class BouquetComposition extends ActiveRecord
             'guid' => 'GUID букета',
             'name' => 'Название букета',
             'created_at' => 'Дата создания',
-            'date_confirm' => 'Ð\94аÑ\82а обновления',
-            'date_1c_send' => 'Дата обновления',
+            'date_confirm' => 'Ð\94аÑ\82а подÑ\82веÑ\80ждения',
+            'date_1c_send' => 'Дата отправки в 1С',
             'updated_at' => 'Дата обновления',
             'created_by' => 'ID создателя записи',
             'confirm_admin' => 'ID подтвердившего',

diff --git a/erp24/records/BouquetForecast.php b/erp24/records/BouquetForecast.php
index bb4ade6d8795bdea65b3936c5095db176fe4f813..0884a361489a559fbec722b6a78045549b579a9c 100644 (file)
--- a/erp24/records/BouquetForecast.php
+++ b/erp24/records/BouquetForecast.php
@@ -114,7 +114,7 @@ class BouquetForecast extends ActiveRecord
             ->andWhere(['year' => $year])
             ->leftJoin("$joinTable AS df", "df.id = bouquet_forecast.type_sales_id")
             ->select(["df.name AS name", 'type_sales_value AS value', 'type_sales_id AS id'])
-            ->orderBy('type_sales_id')
+            ->orderBy($defaultModel === CityStore::class ? 'df.id asc' : 'df.sequence_number asc')
             ->asArray()
             ->all();
 
@@ -126,7 +126,7 @@ class BouquetForecast extends ActiveRecord
                     'name',
                     new Expression('NULL as value')
                 ])
-                ->orderBy("$joinTable.id")
+                ->orderBy($defaultModel === CityStore::class ? 'id' : 'sequence_number')
                 ->asArray()
                 ->all();
         }