From: marina Date: Mon, 9 Dec 2024 09:41:35 +0000 (+0300) Subject: ERP-259 Доработка второго шага передачи смен X-Git-Tag: 1.7~183^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=2a4704fc52986011f196b46ce39260b010936da9;p=erp24_rep%2Fyii-erp24%2F.git ERP-259 Доработка второго шага передачи смен --- 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]); } ], [