ERP-243 Действия по замене (II этап)

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 47d9fa5f1238e352170406c36babbab065d1cb84..46ffef33aedbea1f915ff5f7189b29e9b1123ba9 100644 (file)
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -206,7 +206,6 @@ class ShiftTransferController extends Controller
             $storeId = array_flip(array_map('strval', CityStore::getAllActiveGuidId()))[$shiftTransfer->store_guid];
             $productSelfCost = SelfCostProduct::findOne(['product_guid' => $productGuid, 'date' => $shiftTransfer->date, 'store_id' => $storeId]);
 
-
             if (!$productPrice) {
                 throw new \Exception('У данного товара нет цены либо замен!');
             }

diff --git a/erp24/views/shift-transfer/_replacement.php b/erp24/views/shift-transfer/_replacement.php
index 7ef65d0020d8d74f8e0f7b24c4966688eecb9587..8cf258b282b018ae45ed9bfd04c759e3fd4c3806 100644 (file)
--- a/erp24/views/shift-transfer/_replacement.php
+++ b/erp24/views/shift-transfer/_replacement.php
@@ -39,8 +39,8 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO
                         'change' => new \yii\web\JsExpression('function() { setProductData.call(this); }'),
                     ],
                 ],
-                'value' => function ($data) {
-                    return $data['product_id'] ?? '';
+                'value' => function ($model) {
+                    return $model->product->name ?? '';
                 },
 
             ],
@@ -81,8 +81,8 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO
                     }'),
                     ],
                 ],
-                'value' => function ($data) {
-                    return $data['product_replacement_id'] ?? '';
+                'value' => function ($model) {
+                    return $model->productReplacement->name ?? '';
                 },
             ],
             [
@@ -149,7 +149,7 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO
 } else {
     echo GridView::widget([
         'dataProvider' => new ArrayDataProvider([
-            'allModels' => $shiftTransfer->equalizationRemains,  // Данные для таблицы
+            'allModels' => $shiftTransfer->equalizationRemains,
         ]),
         'columns' => [
             [
@@ -217,13 +217,9 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO
                 }
             ],
         ],
-        'showPageSummary' => true,  // Показывать итоговые данные
-        'summary' => 'Показано {begin} - {end} из {totalCount} записей',  // Настройка вывода суммы
-        'footerRowOptions' => ['class' => 'footer-row'],  // Стили для итоговой строки
-        'rowOptions' => function ($model, $key, $index, $grid) {
-            // Дополнительные настройки для строк, если нужно
-            return [];
-        },
+        'showPageSummary' => true,
+        'summary' => 'Показано {begin} - {end} из {totalCount} записей',
+        'footerRowOptions' => ['class' => 'footer-row'],
     ]);
 
     if (Yii::$app->user->id === $shiftTransfer->end_shift_admin_id && $shiftTransfer->status_id === ShiftTransfer::STATUS_ID_READY_TO_ACCEPT) {