From: vladfo <fvv2011@gmail.com>
Date: Fri, 11 Oct 2024 13:59:56 +0000 (+0300)
Subject: Возвращаем возвраты
X-Git-Tag: 1.6~31^2~5
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=b151a25e18a67ee07f8d4c223b20abf231044e1b;p=erp24_rep%2Fyii-erp24%2F.git

Возвращаем возвраты
---

diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php
index e3730f2f..f6d48702 100644
--- a/erp24/services/MotivationService.php
+++ b/erp24/services/MotivationService.php
@@ -1932,7 +1932,7 @@ class MotivationService
             ->asArray()
             ->all();
 
-        /*$endDatePlusThreeWeeks = date('Y-m-d 23:59:59', strtotime($endDate . ' +1 weeks'));
+        $endDatePlusThreeWeeks = date('Y-m-d 23:59:59', strtotime($endDate . ' +3 weeks'));
 
         // Находим возвраты за указанный период + 3 недели
         $returnedSales = Sales::find()
@@ -1949,7 +1949,7 @@ class MotivationService
         // Фильтруем продажи, исключая возвраты
         $salesRecords = array_filter($salesRecords, function($sale) use ($returnedSalesIds) {
             return !in_array($sale['id'], $returnedSalesIds);
-        });*/
+        });
 
         if (empty($salesRecords)) {
             return [];