[ERP-283] предпредыдущий месяц

diff --git a/erp24/controllers/SalesWriteOffsPlanController.php b/erp24/controllers/SalesWriteOffsPlanController.php
index fc69a2e8ef222a48ef08f5c8760f1a3db1155028..daa967945d306736acb3e8006d288a91d5f53e76 100644 (file)
--- a/erp24/controllers/SalesWriteOffsPlanController.php
+++ b/erp24/controllers/SalesWriteOffsPlanController.php
@@ -31,8 +31,8 @@ class SalesWriteOffsPlanController extends Controller
 
         $model->load(Yii::$app->request->get());
 
-        $prevMonthStart = date("Y-m-01", strtotime("-1 month", strtotime($model->year . "-" . $model->month . "-01")));
-        $prevMonthEnd = date("Y-m-t", strtotime("-1 month", strtotime($model->year . "-" . $model->month . "-01")));
+        $prevPrevMonthStart = date("Y-m-01", strtotime("-2 month", strtotime($model->year . "-" . $model->month . "-01")));
+        $prevPrevMonthEnd = date("Y-m-t", strtotime("-2 month", strtotime($model->year . "-" . $model->month . "-01")));
 
         $years = [];
         for ($i = 3; $i >= 0; $i--) {
@@ -46,7 +46,7 @@ class SalesWriteOffsPlanController extends Controller
         $sales = Sales::find()->select([
             "sum(CASE WHEN operation='Продажа' THEN summ ELSE (CASE WHEN operation='Возврат' THEN -summ ELSE 0 END) END) as total",
             'store_id'])
-            ->where(['between', 'date', $prevMonthStart, $prevMonthEnd])
+            ->where(['between', 'date', $prevPrevMonthStart, $prevPrevMonthEnd])
             ->groupBy(['store_id'])
             ->indexBy('store_id')
             ->asArray()->all();

diff --git a/erp24/views/sales-write-offs-plan/index.php b/erp24/views/sales-write-offs-plan/index.php
index c15a9ebb286c2233d3044dae7299755b9f92fe48..0df15a5de8d838a4a35dd5c8e51b70e5b340450f 100644 (file)
--- a/erp24/views/sales-write-offs-plan/index.php
+++ b/erp24/views/sales-write-offs-plan/index.php
@@ -141,7 +141,8 @@ function colorScheme2($p) {
         <thead>
             <tr><th rowspan="3" class="text-center align-middle border">Магазины</th><th colspan="4" class="text-center border">Total</th><th colspan="2" class="text-center border">Оффлайн торговля</th><th colspan="4" class="text-center border">Онлайн торговля</th></tr>
             <tr><th colspan="4" class="text-center border">Оффлайн + онлайн торговля</th><th colspan="2" class="text-center border">Магазин</th><th colspan="2" class="text-center border">Интернет-магазин</th><th colspan="2" class="text-center border">Маркетплейсы</th></tr>
-            <tr><th class="text-center border">Продажи</th><th class="text-center border">К прошлому месяцу</th><th class="text-center border">Списания</th><th class="text-center border">К Плану</th><th class="text-center border">Цель</th><th class="text-center border">К прошлому месяцу</th><th class="text-center border">Цель</th><th class="text-center border">К прошлому месяцу</th><th class="text-center border">Цель</th><th class="text-center border">К прошлому месяцу</th></tr>
+            <tr><th class="text-center border">Продажи</th><th class="text-center border">К позапрошлому месяцу</th><th class="text-center border">Списания</th><th class="text-center border">К Плану</th><th class="text-center border">Цель</th><th class="text-center border">К позапрошлому месяцу</th>
+            <th class="text-center border">Цель</th><th class="text-center border">К позапрошлому месяцу</th><th class="text-center border">Цель</th><th class="text-center border">К позапрошлому месяцу</th></tr>
         </thead>
         <tbody>
             <?php foreach ($stores as $store): ?>