From 0e9a7284d2674b63f1832295fb5dda73376b1d05 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Mon, 9 Sep 2024 21:12:29 +0300 Subject: [PATCH] =?utf8?q?[ERP-152]=20=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= =?utf8?q?=20=D0=BF=D0=BE=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82?= =?utf8?q?=D0=B0=D1=80=D0=B8=D1=8F=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/actions/storage/IndexAction.php | 4 ++-- erp24/actions/storage/StoreAction.php | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/erp24/actions/storage/IndexAction.php b/erp24/actions/storage/IndexAction.php index 27678bb5..716dcabd 100644 --- a/erp24/actions/storage/IndexAction.php +++ b/erp24/actions/storage/IndexAction.php @@ -21,9 +21,9 @@ class IndexAction extends Action $products1c = Products1c::find()->where(['id' => $model->store_id])->one(); } - $stores = ArrayHelper::map(Products1c::find()->where(['tip' => 'city_store', 'view' => 1])->orderBy(['name' => SORT_ASC])->all(),"id", "name"); + $stores = ArrayHelper::map(Products1c::find()->select(['id', 'name'])->where(['tip' => 'city_store', 'view' => 1])->orderBy(['name' => SORT_ASC])->all(),"id", "name"); - $products = ArrayHelper::map(Products1c::find()->where(['tip' => 'products'])->all(),"id", "name"); + $products = ArrayHelper::map(Products1c::find()->select(['id', 'name'])->where(['tip' => 'products'])->all(),"id", "name"); $balances = Balances::find()->select(['product_id', 'quantity', 'reserv'])->where(['store_id' => $model->store_id])->orderBy(['quantity' => SORT_DESC])->all(); diff --git a/erp24/actions/storage/StoreAction.php b/erp24/actions/storage/StoreAction.php index 79cdf3e1..be913d86 100644 --- a/erp24/actions/storage/StoreAction.php +++ b/erp24/actions/storage/StoreAction.php @@ -21,16 +21,14 @@ class StoreAction extends Action $products1c = Products1c::find()->where(['id' => $model->store_id])->one(); } - $stores = ArrayHelper::map(Products1c::find()->where(['tip' => 'city_store', 'view' => 1])->orderBy(['name' => SORT_ASC])->all(),"id", "name"); + $stores = ArrayHelper::map(Products1c::find()->select(['id', 'name'])->where(['tip' => 'city_store', 'view' => 1])->orderBy(['name' => SORT_ASC])->all(),"id", "name"); $productGroups = Products1c::find()->where(['tip' => 'products_group', 'view' => 1])->orderBy(['name' => SORT_ASC])->all(); - $groups = ArrayHelper::map($productGroups, 'id', 'name'); $groups_arr = []; foreach ($productGroups as $productGroup) { $groups_arr[$productGroup->parent_id][$productGroup->id] = $productGroup; } - return $this->controller->render('store', compact('model', 'stores', 'products1c', 'groups_arr')); } -- 2.39.5