From 2a4704fc52986011f196b46ce39260b010936da9 Mon Sep 17 00:00:00 2001 From: marina Date: Mon, 9 Dec 2024 12:41:35 +0300 Subject: [PATCH] =?utf8?q?ERP-259=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?utf8?q?=D1=82=D0=BA=D0=B0=20=D0=B2=D1=82=D0=BE=D1=80=D0=BE=D0=B3=D0=BE?= =?utf8?q?=20=D1=88=D0=B0=D0=B3=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4?= =?utf8?q?=D0=B0=D1=87=D0=B8=20=D1=81=D0=BC=D0=B5=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/ReplacementInvoiceController.php | 5 +++-- erp24/controllers/StoreBalanceController.php | 3 ++- erp24/views/store-balance/index.php | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/erp24/controllers/ReplacementInvoiceController.php b/erp24/controllers/ReplacementInvoiceController.php index 156b094c..beea5132 100644 --- a/erp24/controllers/ReplacementInvoiceController.php +++ b/erp24/controllers/ReplacementInvoiceController.php @@ -22,7 +22,8 @@ class ReplacementInvoiceController extends Controller public function actionIndex() { $dataProvider = new ActiveDataProvider([ - 'query' => ReplacementInvoice::find(), + 'query' => ReplacementInvoice::find() + ->orderBy('id desc'), 'pagination' => [ 'pageSize' => 20, ], @@ -51,7 +52,7 @@ class ReplacementInvoiceController extends Controller return $this->render('view', [ 'model' => $model, - 'dataProvider' =>$dataProvider + 'dataProvider' => $dataProvider ]); } diff --git a/erp24/controllers/StoreBalanceController.php b/erp24/controllers/StoreBalanceController.php index 30473058..520aab0e 100644 --- a/erp24/controllers/StoreBalanceController.php +++ b/erp24/controllers/StoreBalanceController.php @@ -21,7 +21,8 @@ class StoreBalanceController extends Controller public function actionIndex() { $dataProvider = new ActiveDataProvider([ - 'query' => StoreBalance::find(), + 'query' => StoreBalance::find() + ->orderBy('id desc'), 'pagination' => [ 'pageSize' => 20, ], diff --git a/erp24/views/store-balance/index.php b/erp24/views/store-balance/index.php index 523b8153..ce190886 100644 --- a/erp24/views/store-balance/index.php +++ b/erp24/views/store-balance/index.php @@ -22,8 +22,11 @@ $this->params['breadcrumbs'][] = $this->title; [ 'label' => 'Магазин', 'attribute' => 'store_id', + 'format' => 'raw', 'value' => function ($model) { - return CityStore::findOne(\yii_app\records\ExportImportTable::findOne(['export_val' => $model->store_id])->entity_id)->name; + return \yii\helpers\Html::a(CityStore::findOne( + \yii_app\records\ExportImportTable::findOne(['export_val' => $model->store_id])->entity_id)->name, + ['store-balance/view', 'id' => $model->id]); } ], [ -- 2.39.5