From c8a1f978f8e649c4c9d9ba5f9a48ecdd87f7e655 Mon Sep 17 00:00:00 2001 From: marina Date: Thu, 20 Feb 2025 15:49:05 +0300 Subject: [PATCH] =?utf8?q?ERP-302=20=D0=A0=D0=B5=D0=B4=D0=B0=D0=BA=D1=82?= =?utf8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B1=D1=83?= =?utf8?q?=D0=BA=D0=B5=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/BouquetController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/erp24/controllers/BouquetController.php b/erp24/controllers/BouquetController.php index 33694ed8..0351a290 100644 --- a/erp24/controllers/BouquetController.php +++ b/erp24/controllers/BouquetController.php @@ -51,7 +51,8 @@ class BouquetController extends Controller $query->andWhere(['mth.matrix_type_id' => $matrixTypeId, 'mth.is_active' => BouquetCompositionMatrixTypeHistory::IS_ACTIVE]); } - $query->groupBy('bouquet_composition.id'); + $query->groupBy('bouquet_composition.id') + ->orderBy('bouquet_composition.id desc'); $dataProvider = new \yii\data\ActiveDataProvider([ 'query' => $query, @@ -64,7 +65,8 @@ class BouquetController extends Controller ]); } - public function actionCreate() { + public function actionCreate() + { $model = new BouquetComposition(); if (Yii::$app->request->isPost) { @@ -373,7 +375,7 @@ class BouquetController extends Controller $storesTypeList = BouquetForecast::getStoresList($id, BouquetForecast::OFFLINE_STORES, StoreType::class, [], $month, $year); $marketplaceList = BouquetForecast::getStoresList($id, BouquetForecast::MARKETPLACE, CityStore::class, ['visible' => CityStore::IS_VISIBLE], $month, $year); - $onlineStoresList = BouquetForecast::getStoresList($id, BouquetForecast::ONLINE_STORES, CityStore::class, ['visible' => CityStore::IS_VISIBLE], $month, $year); + $onlineStoresList = BouquetForecast::getStoresList($id, BouquetForecast::ONLINE_STORES, CityStore::class, ['visible' => CityStore::IS_VISIBLE], $month, $year); return [ 'success' => true, -- 2.39.5