временное

diff --git a/erp24/controllers/MatrixStatisticsController.php b/erp24/controllers/MatrixStatisticsController.php
index 969c5fac3da13a609d86204b66dcad4742ce2813..cbd605d853651e702f4506ee0cd3c6b6114ed47d 100644 (file)
--- a/erp24/controllers/MatrixStatisticsController.php
+++ b/erp24/controllers/MatrixStatisticsController.php
@@ -9,6 +9,7 @@ use yii\web\Controller;
 use yii\web\Response;
 use yii_app\records\CityStore;
 use yii_app\records\CityStoreParams;
+use yii_app\records\Sales;
 use yii_app\records\StoreDynamic;
 
 class MatrixStatisticsController extends Controller {
@@ -33,6 +34,12 @@ class MatrixStatisticsController extends Controller {
 
         $model->load(Yii::$app->request->get());
 
+        ///////////////////////////////////////////
+        $sales = Sales::find()->where(['operation' => Sales::OPERATION_SALE])
+            ->andWhere(['>=', 'date', date($model->year . '-' . $model->month . '-01 00:00:00')])
+            ->andWhere(['<=', 'date', date($model->year . '-' . $model->month . '-t 23:59:59')])
+            ->all();
+        ///////////////////////////////////////////
         $years = [];
         for ($i = 3; $i >= 0; $i--) {
             $year = date("Y") - $i;

diff --git a/erp24/views/matrix-statistics/index.php b/erp24/views/matrix-statistics/index.php
index 64ab08cdcc3712a6e3b1d0a45d3500985ce5cf26..12d558ede6c13f3d8d73bcaf314b4e1519842367 100644 (file)
--- a/erp24/views/matrix-statistics/index.php
+++ b/erp24/views/matrix-statistics/index.php
@@ -145,4 +145,52 @@ $this->registerJsFile('/js/matrix-statistics/index.js', ['position' => \yii\web\
 
     <?php ActiveForm::end() ?>
 
+    <div class="row">
+        <div class="col-1 text-right">Сумма тотал</div>
+        <div class="col-2">976 250 р</div>
+    </div>
+    <div class="row">
+        <div class="col-1 text-right">% цели магазина</div>
+        <div class="col-2">27%</div>
+    </div>
+    <div class="row">
+        <div class="col-1 text-right">% цели матрицы</div>
+        <div class="col-2">-3%</div>
+    </div>
+
+    <div class="row">
+        <div class="col-2"></div>
+        <div class="col-2">Сумма планируемых продаж</div>
+        <div class="col-2">Доля группы матрицы</div>
+    </div>
+    <div class="row">
+        <div class="col-1"></div>
+        <div class="col-1">Базовая</div>
+        <div class="col-2">231 250 р.</div>
+        <div class="col-2">23%</div>
+    </div>
+    <div class="row">
+        <div class="col-1"></div>
+        <div class="col-1">Дополнительная</div>
+        <div class="col-2">45 000 р.</div>
+        <div class="col-2">4%</div>
+    </div>
+    <div class="row">
+        <div class="col-1"></div>
+        <div class="col-1">Изюмительная</div>
+        <div class="col-2">700 000 р.</div>
+        <div class="col-2">71%</div>
+    </div>
+    <div class="row">
+        <div class="col-1"></div>
+        <div class="col-1">Маркет Яндекс</div>
+        <div class="col-2">0 р.</div>
+        <div class="col-2">0 %</div>
+    </div>
+    <div class="row">
+        <div class="col-1"></div>
+        <div class="col-1">Маркет Флау</div>
+        <div class="col-2">0 р.</div>
+        <div class="col-2">0 %</div>
+    </div>
 </div>