From 0c4a0415b50142bdfe6ba72e4f634d1f9bb41ab7 Mon Sep 17 00:00:00 2001 From: fomichev Date: Wed, 4 Jun 2025 12:40:32 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BC?= =?utf8?q?=D0=B5=D1=82=D0=BE=D0=B4=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/CategoryPlanController.php | 2 +- erp24/services/StorePlanService.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erp24/controllers/CategoryPlanController.php b/erp24/controllers/CategoryPlanController.php index 0947df5f..5a1f751e 100644 --- a/erp24/controllers/CategoryPlanController.php +++ b/erp24/controllers/CategoryPlanController.php @@ -355,7 +355,7 @@ class CategoryPlanController extends Controller { $result['without_history'] ); - $productSalesShare = StorePlanService::calculateProductSalesShare( + $productSalesShare = StorePlanService::calculateProductSalesShareProductsWithHistory( $storeId, $selectedMonth, $result['with_history'] diff --git a/erp24/services/StorePlanService.php b/erp24/services/StorePlanService.php index 20d954b5..5b6141b3 100755 --- a/erp24/services/StorePlanService.php +++ b/erp24/services/StorePlanService.php @@ -626,7 +626,7 @@ class StorePlanService ->andWhere([ 'or', ['>=', 'date_to', $weekStart->format('Y-m-d')], - ['date_to' => '2100-01-01 03:00:00+03'] + ['date_to' => '2100-01-01 00:00:00+03'] ]) ->all(); @@ -981,7 +981,7 @@ class StorePlanService * 'monthlyPrice' => [ 'YYYY-MM' => цена ] * ] */ - public static function calculateProductSalesShare($storeId, $selectedMonth, $productsWithHistory) + public static function calculateProductSalesShareProductsWithHistory($storeId, $selectedMonth, $productsWithHistory) { $targetDate = strtotime(date('Y') . "-$selectedMonth-01"); -- 2.39.5