From 6d0c6335477d3a33d7bbd81826660bdceb83d3d6 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 7 Feb 2025 13:02:46 +0300
Subject: [PATCH] =?utf8?q?[ERP-283]=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?utf8?q?=D0=BA=D0=B8=20=D0=BA=20=D0=BE=D1=82=D0=B7=D1=8B=D0=B2=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/SalesWriteOffsPlanController.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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();
-- 
2.39.5