Merge branch 'refs/heads/develop' into feature_fomichev_erp_444_OS_autoplannogramm

# Conflicts:
#	erp24/services/AutoPlannogrammaService.php

diff --cc erp24/commands/CronController.php
Simple merge

diff --cc erp24/controllers/AutoPlannogrammaController.php
Simple merge

diff --cc erp24/services/AutoPlannogrammaService.php
index 04e286c8ad1ac447efa743fc59604d74110d3c15,39751ab9de856b62dfef51cd3f45fdea656f61d4..a580d627d645a300d4f1614cb507ab9213dde126
--- 1/erp24/services/AutoPlannogrammaService.php
--- 2/erp24/services/AutoPlannogrammaService.php
+++ b/erp24/services/AutoPlannogrammaService.php
@@@ -772,11 -846,36 +846,36 @@@ class AutoPlannogrammaServic
      public function calculateFullGoalChain(array $filters): array
      {
          $datePlan = $filters['plan_date'];
 -        $dateFromForCategory = (new \DateTime($datePlan))->modify('-' . (self::CATEGORY_LOOKBACK_MONTHS + self::LOOKBACK_MONTHS) . ' months')->format('Y-m-d');
 +        //$dateFromForCategory = (new \DateTime($datePlan))->modify('-' . (self::CATEGORY_LOOKBACK_MONTHS + self::LOOKBACK_MONTHS) . ' months')->format('Y-m-d');
  
-         $monthCategoryShare = $this->getMonthCategoryShareOrWriteOff($datePlan, $filters);
-         $monthCategoryGoal = $this->getMonthCategoryGoal($monthCategoryShare, $datePlan, $filters['type']);
+         //$monthCategoryShare = $this->getMonthCategoryShareOrWriteOff($dateFromForCategory, $filters);
+ 
+         //$monthCategoryGoal = $this->getMonthCategoryGoal($monthCategoryShare, $datePlan, $filters['type']);
+         $monthCategoryGoal = [];
+         $categoryPlan = CategoryPlan::find()
+             ->where(
+             ['year' => date('Y', strtotime($datePlan)),
+                 'month' => date('m', strtotime($datePlan)),
+                 'store_id' => $filters['store_id']])->indexBy('category')
+             ->asArray()
+             ->all();
+         foreach ($categoryPlan as $category) {
+             if ($category['category'] === 'Матрица') {
+                 continue;
+             }
+             if ($filters['type'] == AutoPlannogrammaService::TYPE_SALES) {
+                 $fullGoal  = $category['offline'] + $category['internet_shop'] + $category['marketplace'];
+             } else {
+                 $fullGoal  = $category['write_offs'];
+             }
+ 
+             $monthCategoryGoal[] = [
+                 'category' => $category['category'],
+                 'store_id' => $filters['store_id'],
+                 'goal' => $fullGoal
+             ];
  
+         }
          $monthSubcategoryShare = $this->getMonthSubcategoryShareOrWriteOff($datePlan, $filters);
          $monthSubcategoryGoal = $this->getMonthSubcategoryGoal($monthSubcategoryShare, $monthCategoryGoal);