From: vladfo Date: Fri, 11 Oct 2024 11:58:51 +0000 (+0300) Subject: убираем фильтр по возвратам X-Git-Tag: 1.6~31^2~9 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=fb0a528f90b173bfa3cab0cf958829f5244d2ff0;p=erp24_rep%2Fyii-erp24%2F.git убираем фильтр по возвратам --- diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php index e7bbee77..6e2589f7 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 . ' +1 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 [];