[ERP-258] number_format

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 7a99aadf797180217ba60c5f53dd4866ae325e54..12cff65a448229fd2c0b196b1a28693ac2e26d8c 100644 (file)
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -145,9 +145,12 @@ class ShiftTransferController extends Controller
                         MultipleModel::loadMultipleFromArray($modelsShiftRemains, $loadDataShiftRemains, '', []);
                     }
 
+                    $discrepancy_rubles = 0;
                     foreach ($modelsShiftRemains as $modelsShiftRemain) {
+                        /* @var $modelsShiftRemain ShiftRemains */
                         $modelsShiftRemain->shift_transfer_id = $shiftTransfer->id;
                         if ($modelsShiftRemain->validate()) {
+                            $discrepancy_rubles += $modelsShiftRemain->retail_price * ($modelsShiftRemain->remains_count - $modelsShiftRemain->remains_1c);
                             $modelsShiftRemain->save();
                         } else {
                             var_dump($modelsShiftRemain->getErrors());
@@ -156,10 +159,9 @@ class ShiftTransferController extends Controller
                     }
 
                     if ($shiftTransfer->validate()) {
-                        $shiftTransfer->goods_transfer_summ = array_sum(ArrayHelper::getColumn($shiftTransfer->shiftRemains, 'remains_summ'));
                         $shiftTransfer->goods_transfer_count = array_sum(ArrayHelper::getColumn($shiftTransfer->shiftRemains, 'remains_count'));
                         $shiftTransfer->discrepancy_pieces = array_sum(ArrayHelper::getColumn($shiftTransfer->shiftRemains, 'fact_and_1c_diff'));
-                        $shiftTransfer->discrepancy_rubles = array_sum(ArrayHelper::getColumn($shiftTransfer->shiftRemains, 'remains_1c'));
+                        $shiftTransfer->discrepancy_rubles = $discrepancy_rubles;
                         $shiftTransfer->status_id = ShiftTransfer::STATUS_ID_TRANSFER_ACTIONS;
                         $shiftTransfer->setProductGroups();
                         $shiftTransfer->save();

diff --git a/erp24/views/shift-transfer/_transfer.php b/erp24/views/shift-transfer/_transfer.php
index d0a3e9a29dfda2709220cb3251a03391bf325548..35dcedf042c23f0dbbe79307d03d0150433b0a18 100644 (file)
--- a/erp24/views/shift-transfer/_transfer.php
+++ b/erp24/views/shift-transfer/_transfer.php
@@ -36,7 +36,7 @@ echo \kartik\grid\GridView::widget([
             'label' => 'Остатки по 1с, шт',
             'pageSummary' => true,
             'value' => function($data) {
-                return $data['remains_1c'] ?? '';
+                return number_format($data['remains_1c'] ?? '', 0, '.', ' ');
             },
         ],
         [
@@ -44,7 +44,7 @@ echo \kartik\grid\GridView::widget([
             'label' => 'Фактические остатки кол-во, шт',
             'pageSummary' => true,
             'value' => function($data) {
-                return $data['remains_count'] ?? '';
+                return number_format($data['remains_count'] ?? '', 0, '.', ' ');
             },
         ],
         [
@@ -52,7 +52,7 @@ echo \kartik\grid\GridView::widget([
             'label' => 'Разница факт и по программе 1с, шт',
             'pageSummary' => true,
             'value' => function($data) {
-                return $data['fact_and_1c_diff'] ?? '';
+                return number_format($data['fact_and_1c_diff'] ?? '', 0, '.', ' ');
             },
         ],
         [
@@ -60,7 +60,7 @@ echo \kartik\grid\GridView::widget([
             'label' => 'Сумма остатков (недостача или излишек), руб',
             'pageSummary' => true,
             'value' => function($data) {
-                return $data['remains_summ'] ?? '';
+                return number_format($data['remains_summ'] ?? '', 2, '.', ' ');
             },
         ],
         [
@@ -68,7 +68,7 @@ echo \kartik\grid\GridView::widget([
             'label' => 'Себестоимость, руб',
             'pageSummary' => true,
             'value' => function($data) {
-                return $data['self_cost'] ?? '';
+                return number_format($data['self_cost'] ?? '', 2, '.', ' ');
             },
         ],
     ],