From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 7 Feb 2025 10:02:46 +0000 (+0300)
Subject: [ERP-283] поправки к отзыву
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=6d0c6335477d3a33d7bbd81826660bdceb83d3d6;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-283] поправки к отзыву
---

diff --git a/erp24/controllers/SalesWriteOffsPlanController.php b/erp24/controllers/SalesWriteOffsPlanController.php
index daa96794..28528e5d 100644
--- a/erp24/controllers/SalesWriteOffsPlanController.php
+++ b/erp24/controllers/SalesWriteOffsPlanController.php
@@ -46,7 +46,10 @@ 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', $prevPrevMonthStart, $prevPrevMonthEnd])
+            ->where(['between', 'date',
+                date("Y-m-d 00:00:00", strtotime($prevPrevMonthStart)),
+                date("Y-m-d 23:59:59", strtotime($prevPrevMonthEnd))])
+            ->andWhere(['in', 'order_id', [0, '']])
             ->groupBy(['store_id'])
             ->indexBy('store_id')
             ->asArray()->all();