From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 28 Feb 2025 13:24:54 +0000 (+0300)
Subject: [ERP-310] расчёт total 2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=c97d606511ebc1f2e6c2b4c550aa0ff310ac5a54;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-310] расчёт total 2
---

diff --git a/erp24/controllers/MatrixStatisticsController.php b/erp24/controllers/MatrixStatisticsController.php
index b51514c4..65ee11a3 100644
--- a/erp24/controllers/MatrixStatisticsController.php
+++ b/erp24/controllers/MatrixStatisticsController.php
@@ -43,7 +43,7 @@ class MatrixStatisticsController extends Controller {
 //            ->andWhere(['<=', 'date', date($model->year . '-' . $model->month . '-10 23:59:59')])
 //            ->asArray()->one();
         $total = 0;
-        $matrixTypes = MatrixType::find()->orderBy(['id'])->all();
+        $matrixTypes = MatrixType::find()->orderBy(['id' => SORT_ASC])->all();
         $boquetCompositionMatrixTypeHistory = BouquetCompositionMatrixTypeHistory::find()->where(['is_active' => true])->all();
         $matrixCost = [];
         foreach ($boquetCompositionMatrixTypeHistory as $bcmth) {
diff --git a/erp24/views/matrix-statistics/index.php b/erp24/views/matrix-statistics/index.php
index 8ad87724..14b7a6c8 100644
--- a/erp24/views/matrix-statistics/index.php
+++ b/erp24/views/matrix-statistics/index.php
@@ -171,8 +171,9 @@ $this->registerJsFile('/js/matrix-statistics/index.js', ['position' => \yii\web\
         <div class="row">
             <div class="col-1"></div>
             <div class="col-1"><?= $matrixType->name ?></div>
-            <div class="col-2"><?= number_format($matrixCost[$matrixType->id], 0, '.', ' ')?>р.</div>
-            <div class="col-2"><?= number_format($total == 0 ? 0 : $matrixCost[$matrixType->id] * 100.0 / $total, 0, '.', '')?>%</div>
+            <?php $cost = $matrixCost[$matrixType->id] ?? 0; ?>
+            <div class="col-2"><?= number_format($cost, 0, '.', ' ')?>р.</div>
+            <div class="col-2"><?= number_format($total == 0 ? 0 : $cost * 100.0 / $total, 0, '.', '')?>%</div>
         </div>
     <?php endforeach; ?>
 </div>