[ERP-261] группы товаров

diff --git a/erp24/records/ShiftTransfer.php b/erp24/records/ShiftTransfer.php
index 25839337e78e9aa912f42189516462b27dcb6429..d06c2b2e29641b95bd8e2c964fde7e84e1cc2970 100644 (file)
--- a/erp24/records/ShiftTransfer.php
+++ b/erp24/records/ShiftTransfer.php
@@ -91,7 +91,7 @@ class ShiftTransfer extends \yii\db\ActiveRecord
             'discrepancy_rubles' => 'Расхождение факта, руб.',
             'comment' => 'Комментарий',
             'report' => 'Отчёт',
-            'product_groups' => 'Ð\9fÑ\80одÑ\83кÑ\82овÑ\8bе гÑ\80Ñ\83ппÑ\8b',
+            'product_groups' => 'Ð\93Ñ\80Ñ\83ппÑ\8b Ñ\82оваÑ\80ов',
             'groups1' => 'Другие группы',
             'groups2' => 'Основная группа',
             'error_text' => 'Error Text',

diff --git a/erp24/views/shift-transfer/index.php b/erp24/views/shift-transfer/index.php
index 280f0e81040bc1039c6eff21ecb34cf195340bbf..897bc5421140151ade3be7a68dd398c9e7e75fbb 100644 (file)
--- a/erp24/views/shift-transfer/index.php
+++ b/erp24/views/shift-transfer/index.php
@@ -56,6 +56,15 @@ use app\controllers\ShiftTransferController;
                 }
             ],
             'goods_transfer_summ',
+            [
+                'attribute' => 'product_groups',
+                'format' => 'html',
+                'value' => function ($model) {
+                    $productGroups = explode(',', $model['product_groups'] ?? '');
+                    $hints1 = \yii_app\records\ProductsClass::getHints();
+                    return implode('<br>', array_map(function($el) use ($hints1) { return $hints1[$el]; }, $productGroups));
+                }
+            ],
             'goods_transfer_count',
             'discrepancy_pieces',
             'discrepancy_rubles',