From: marina <m.zozirova@gmail.com>
Date: Fri, 13 Dec 2024 08:07:36 +0000 (+0300)
Subject: ERP-259 Доработка второго шага передачи смен
X-Git-Tag: 1.7~169^2~5
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=3dd6e358838b80edf29efa5f0b33e8269af4c09f;p=erp24_rep%2Fyii-erp24%2F.git

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

diff --git a/erp24/views/shift-transfer/_replacement.php b/erp24/views/shift-transfer/_replacement.php
index a67e51d2..152c7665 100644
--- a/erp24/views/shift-transfer/_replacement.php
+++ b/erp24/views/shift-transfer/_replacement.php
@@ -35,9 +35,7 @@ $form = \yii\widgets\ActiveForm::begin(); ?>
 //echo Html::a('Справочник замен', Url::to(['/crud/product1c-replacement/index']));
 
 
-if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIONS, ShiftTransfer::STATUS_ID_INPUT_FACT_REMAINS])
-    && Yii::$app->user->id === $shiftTransfer->end_shift_admin_id) {
-
+if (\yii_app\records\Admin::findOne(Yii::$app->user->id)->group_id == \yii_app\records\AdminGroup::GROUP_IT) {
     echo Html::submitButton('Пересчитать таблицу замен', [
         'class' => 'btn btn-primary float-right',
         'name' => 'action',
@@ -268,11 +266,17 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO
                     [
                         'label' => 'Цена товара',
                         'attribute' => 'product_price',
+                        'value' => function($data) {
+                            return number_format($data['product_price'] ?? '', 2, '.', ' ');
+                        },
                     ],
                     [
                         'label' => 'Сумма',
                         'attribute' => 'summ',
                         'pageSummary' => true,
+                        'value' => function($data) {
+                            return number_format($data['summ'] ?? '', 2, '.', ' ');
+                        },
                         'footer' => Html::tag('b', 'Недостача: ') . '&nbsp;&nbsp;' .  Html::tag('b', number_format($writeOffsBalance, 2, '.', ' ')),
                     ],
                 ],
@@ -307,11 +311,17 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO
                 [
                     'label' => 'Цена товара',
                     'attribute' => 'product_price',
+                    'value' => function($data) {
+                        return number_format($data['product_price'] ?? '', 2, '.', ' ');
+                    },
                 ],
                 [
                     'label' => 'Сумма',
                     'attribute' => 'summ',
                     'pageSummary' => true,
+                    'value' => function($data) {
+                        return number_format($data['summ'] ?? '', 2, '.', ' ');
+                    },
                     'footer' => Html::tag('b', 'Излишек: ') . '&nbsp;&nbsp;' . Html::tag('b', number_format($incomingBalance, 2, '.', ' ')),
                 ],
             ],