From 2063adf016ac5a0667d434f9e59ccee9628b9fab Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 4 Sep 2024 13:53:25 +0300
Subject: [PATCH] =?utf8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?utf8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8?=
 =?utf8?q?=20=D0=B2=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=82=D0=BD=D1=8B=D1=85?=
 =?utf8?q?=20=D1=87=D0=B5=D0=BA=D0=BE=D0=B2=20+=203=20=D0=BD=D0=B5=D0=B4?=
 =?utf8?q?=D0=B5=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/services/MotivationService.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php
index 9e60fdaf..35773ce1 100644
--- a/erp24/services/MotivationService.php
+++ b/erp24/services/MotivationService.php
@@ -1398,11 +1398,13 @@ class MotivationService
             ->all();
 
 
+        $endDatePlusThreeWeeks = date('Y-m-d', strtotime($endDate . ' +3 weeks'));
+
         $returnedSales = Sales::find()
             ->select(['sales_check'])
             ->where(['store_id' => $storeId, 'operation' => 'Возврат'])
             ->andWhere(['>=', 'date', $startDate])
-            ->andWhere(['<=', 'date', $endDate])
+            ->andWhere(['<=', 'date', $endDatePlusThreeWeeks])  // $endDate + 3 недели
             ->andWhere(['is not', 'sales_check', null])  // Проверяем, что поле sales_check не пустое
             ->asArray()
             ->all();
-- 
2.39.5