ERP-259 Доработка второго шага передачи смен

diff --git a/erp24/controllers/ReplacementInvoiceController.php b/erp24/controllers/ReplacementInvoiceController.php
index 156b094c1dc6525b539c2ed6ec9e18438ff3fd53..beea5132395e510651f571aeb190e0a56ca8d273 100644 (file)
--- 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 304730588150ad2ed489f1a228e17d882cdf8240..520aab0e00f3bc5136dd5b7ec878160bbd8ba6a5 100644 (file)
--- 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 523b81532bf1e5c0a9e21719b2dca0a142aa36b4..ce190886f01c4d328333428b25a90a99115f7a43 100644 (file)
--- 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]);
                 }
             ],
             [