From b59fed4446fe92813419d7303db2c9927d7ecae6 Mon Sep 17 00:00:00 2001 From: vladfo Date: Thu, 17 Oct 2024 09:59:57 +0300 Subject: [PATCH] =?utf8?q?=D0=A3=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D0=BC=20?= =?utf8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D1=83=20=D0=BD=D0=B0?= =?utf8?q?=203=20=D0=BD=D0=B5=D0=B4=D0=B5=D0=BB=D0=B8,=20=D0=BE=D1=81?= =?utf8?q?=D1=82=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D0=BC=20=D0=B4=D0=B5=D0=BD?= =?utf8?q?=D1=8C=20=D0=B2=20=D0=B4=D0=B5=D0=BD=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/MotivationService.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php index 6680b398..0574d1b6 100644 --- a/erp24/services/MotivationService.php +++ b/erp24/services/MotivationService.php @@ -1838,13 +1838,13 @@ class MotivationService ->all(); - $endDatePlusThreeWeeks = date('Y-m-d 23:59:59', strtotime($endDate . ' +3 weeks')); + $returnedSales = Sales::find() ->select(['sales_check']) ->where(['store_id' => $storeId, 'operation' => Sales::OPERATION_RETURN]) ->andWhere(['>=', 'date', $startDate]) - ->andWhere(['<=', 'date', $endDatePlusThreeWeeks]) // $endDate + 3 недели + ->andWhere(['<=', 'date', $endDate]) ->andWhere(['is not', 'sales_check', null]) // Проверяем, что поле sales_check не пустое ->asArray() ->all(); @@ -1933,14 +1933,14 @@ class MotivationService ->asArray() ->all(); - $endDatePlusThreeWeeks = date('Y-m-d 23:59:59', strtotime($endDate . ' +3 weeks')); - // Находим возвраты за указанный период + 3 недели + + // Находим возвраты за указанный период $returnedSales = Sales::find() ->select(['sales_check']) ->where(['store_id' => $storeId, 'operation' => Sales::OPERATION_RETURN]) ->andWhere(['>=', 'date', $startDate]) - ->andWhere(['<=', 'date', $endDatePlusThreeWeeks]) + ->andWhere(['<=', 'date', $endDate]) ->andWhere(['is not', 'sales_check', null]) ->asArray() ->all(); @@ -2032,14 +2032,14 @@ class MotivationService ->asArray() ->all(); - $endDatePlusThreeWeeks = date('Y-m-d 23:59:59', strtotime($endDate . ' +3 weeks')); - // Находим возвраты за указанный период + 3 недели + + // Находим возвраты за указанный период $returnedSales = Sales::find() // ->select(['id', 'date', 'sales_check']) ->where(['store_id' => $storeId, 'operation' => Sales::OPERATION_RETURN]) ->andWhere(['>=', 'date', $startDate]) - ->andWhere(['<=', 'date', $endDatePlusThreeWeeks]) + ->andWhere(['<=', 'date', $endDate]) ->andWhere(['is not', 'sales_check', null]) ->asArray() ->all(); -- 2.39.5