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

diff --git a/erp24/controllers/MatrixStatisticsController.php b/erp24/controllers/MatrixStatisticsController.php
index b51514c413bad38f0bb20777be459e991726d230..65ee11a3f5126443414c9e304c8b04efc1eda234 100644 (file)
--- 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 8ad8772413bbac3333b55f7bb0b0f449af853fda..14b7a6c83d02ccd954ac52ed5a35d85a01708cc2 100644 (file)
--- 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>