Переименование методов

diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php
index a3360580f05d6d95847cf31e02a4949f390b61cf..d0dfa07fabf42775e2e4281e3ca6a26ee3807da1 100644 (file)
--- a/erp24/controllers/AutoPlannogrammaController.php
+++ b/erp24/controllers/AutoPlannogrammaController.php
@@ -720,13 +720,13 @@ class AutoPlannogrammaController extends BaseController
                 $result['without_history']
             );
 
-            $productSalesShare = StorePlanService::calculateProductSalesShare(
+            $productSalesShare = StorePlanService::calculateProductSalesShareProductsWithHistory(
                 $filters['store_id'],
                 $filters['month'],
                 $result['with_history']
             );
 
-            $productSalesForecast = $service->calculateProductForecastInPieces(
+            $productSalesForecast = $service->calculateProductForecastInPiecesProductsWithHistory(
                 $filters['store_id'],
                 $filters['month'],
                 $filters['category'],

diff --git a/erp24/controllers/CategoryPlanController.php b/erp24/controllers/CategoryPlanController.php
index ee292ebb0e1d955c8d9d16362a0f21612d471307..ec7a1901a8ae1e7bdc41059ced85ed358ed91560 100644 (file)
--- 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/AutoPlannogrammaService.php b/erp24/services/AutoPlannogrammaService.php
index 065c95cd0be1eef0fe921be8490d4eb8453cae86..34d3de8991bfdbbbe4cbf15b1db356406ba94672 100644 (file)
--- a/erp24/services/AutoPlannogrammaService.php
+++ b/erp24/services/AutoPlannogrammaService.php
@@ -825,7 +825,7 @@ class AutoPlannogrammaService
         return $result;
     }
 
-    public static function calculateProductForecastInPieces(
+    public static function calculateProductForecastInPiecesProductsWithHistory(
         int $storeId,
         string $month,
         string $category,

diff --git a/erp24/services/StorePlanService.php b/erp24/services/StorePlanService.php
index fbc186250491c66b464db585ce63fc10d96987c7..f24f6dac144e0afb1cad0dd8df8fdfc128fc3d42 100755 (executable)
--- a/erp24/services/StorePlanService.php
+++ b/erp24/services/StorePlanService.php
@@ -478,6 +478,7 @@ class StorePlanService
         $initTime = (hrtime(true) - $t0) / 1e6; // миллисекунды
         Yii::warning( "Init (periods): {$initTime} ms\n");
         foreach ($productsWithoutHistory as $product) {
+            var_dump($product);die();
             $guid = $product['guid'];
             $t1 = hrtime(true);
             $similarProductIds = self::getSimilarProductIDs($guid);
@@ -986,7 +987,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");