From: marina <m.zozirova@gmail.com>
Date: Wed, 7 May 2025 06:49:00 +0000 (+0300)
Subject: ERP-413 Обработка ОС Планограмма (месяц)
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=451f3e4ed5fd177c0d24b597cf116b1ee10d2765;p=erp24_rep%2Fyii-erp24%2F.git

ERP-413 Обработка ОС Планограмма (месяц)
---

diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php
index 26ee35b9..d93e4bf7 100644
--- a/erp24/controllers/AutoPlannogrammaController.php
+++ b/erp24/controllers/AutoPlannogrammaController.php
@@ -282,8 +282,8 @@ class AutoPlannogrammaController extends BaseController
         if (!empty($filters['plan_date'])) {
             $service = new AutoPlannogrammaService();
 
-            $monthCategoryShare = $service->getMonthCategoryShareOrWriteOff($filters['plan_date'], $filters);;
-            $data = $service->getMonthCategoryGoal($monthCategoryShare, $filters['plan_date'], $filters);;
+            $monthCategoryShare = $service->getMonthCategoryShareOrWriteOff($filters['plan_date'], $filters);
+            $data = $service->getMonthCategoryGoal($monthCategoryShare, $filters['plan_date'], $filters);
 
 
             $flatData = array_filter($data, function ($row) use ($filters) {
diff --git a/erp24/views/auto-plannogramma/1.php b/erp24/views/auto-plannogramma/1.php
index 120fc959..d7a831e9 100644
--- a/erp24/views/auto-plannogramma/1.php
+++ b/erp24/views/auto-plannogramma/1.php
@@ -1,5 +1,3 @@
-<?php
-?>
 <div class="filter-form" style="margin-bottom: 20px;">
     <?php use kartik\date\DatePicker;
     use kartik\grid\GridView;
@@ -8,9 +6,9 @@
     use yii\helpers\Html;
     use yii\widgets\ActiveForm;
     use yii_app\records\CityStore;
-    use yii_app\records\Products1cNomenclature;
-
-    $form = ActiveForm::begin(['method' => 'get']); ?>
+    use yii_app\records\Products1cNomenclature;?>
+<h1 class="ms-3 mb-4"><?= Html::encode("Расчет доли месяца для категорий (month_category_share)") ?></h1>
+    <?php $form = ActiveForm::begin(['method' => 'get']); ?>
     <div class="row p-3">
         <div class="col-md">
             <?= $form->field(new \yii\base\DynamicModel(['category' => $filters['category'] ?? '']), 'category')->widget(Select2::class, [
@@ -61,7 +59,7 @@
             <?= Html::submitButton('Фильтровать', ['class' => 'btn btn-primary']) ?>
         </div>
         <div class="col-md">
-            <?= Html::a('Сбросить', ['auto-planogramma/test-sales'], ['class' => 'btn btn-default']) ?>
+            <?= Html::a('Сбросить', ['auto-plannogramma/1'], ['class' => 'btn btn-default']) ?>
         </div>
     </div>
 
diff --git a/erp24/views/auto-plannogramma/2.php b/erp24/views/auto-plannogramma/2.php
index 28d4460e..3f9798ac 100644
--- a/erp24/views/auto-plannogramma/2.php
+++ b/erp24/views/auto-plannogramma/2.php
@@ -1,5 +1,4 @@
-<?php
-?>
+
 <div class="filter-form" style="margin-bottom: 20px;">
     <?php use kartik\date\DatePicker;
     use kartik\grid\GridView;
@@ -9,7 +8,9 @@
     use yii\widgets\ActiveForm;
     use yii_app\records\CityStore;
     use yii_app\records\Products1cNomenclature;
-
+?>
+    <h1 class="ms-3 mb-4"><?= Html::encode("Расчет цели месяца для категорий (month_category_goal)") ?></h1>
+    <?php
     $form = ActiveForm::begin(['method' => 'get']); ?>
     <div class="row p-3">
         <div class="col-md">
@@ -61,7 +62,7 @@
             <?= Html::submitButton('Фильтровать', ['class' => 'btn btn-primary']) ?>
         </div>
         <div class="col-md">
-            <?= Html::a('Сбросить', ['auto-planogramma/test-sales'], ['class' => 'btn btn-default']) ?>
+            <?= Html::a('Сбросить', ['auto-plannogramma/2'], ['class' => 'btn btn-default']) ?>
         </div>
     </div>
 
diff --git a/erp24/views/auto-plannogramma/3.php b/erp24/views/auto-plannogramma/3.php
index 7d2fcb2f..4c5b798a 100644
--- a/erp24/views/auto-plannogramma/3.php
+++ b/erp24/views/auto-plannogramma/3.php
@@ -7,7 +7,9 @@
     use yii\widgets\ActiveForm;
     use yii_app\records\CityStore;
     use yii_app\records\Products1cNomenclature;
-
+    ?>
+    <h1 class="ms-3 mb-4"><?= Html::encode("Расчет доли месяца для подкатегорий (month_subcategory_share)") ?></h1>
+    <?php
     $form = ActiveForm::begin(['method' => 'get']); ?>
     <div class="row p-3">
         <div class="col-md">
@@ -70,7 +72,7 @@
             <?= Html::submitButton('Фильтровать', ['class' => 'btn btn-primary']) ?>
         </div>
         <div class="col-md">
-            <?= Html::a('Сбросить', ['auto-planogramma/test-sales'], ['class' => 'btn btn-default']) ?>
+            <?= Html::a('Сбросить', ['auto-plannogramma/3'], ['class' => 'btn btn-default']) ?>
         </div>
     </div>
 
diff --git a/erp24/views/auto-plannogramma/4.php b/erp24/views/auto-plannogramma/4.php
index 1e6f7aaf..73254c28 100644
--- a/erp24/views/auto-plannogramma/4.php
+++ b/erp24/views/auto-plannogramma/4.php
@@ -9,7 +9,9 @@
     use yii\widgets\ActiveForm;
     use yii_app\records\CityStore;
     use yii_app\records\Products1cNomenclature;
-
+    ?>
+    <h1 class="ms-3 mb-4"><?= Html::encode("Расчет цели месяца для подкатегорий (month_subcategory_goal)") ?></h1>
+    <?php
     $form = ActiveForm::begin(['method' => 'get']); ?>
     <div class="row p-3">
         <div class="col-md">
@@ -72,7 +74,7 @@
             <?= Html::submitButton('Фильтровать', ['class' => 'btn btn-primary']) ?>
         </div>
         <div class="col-md">
-            <?= Html::a('Сбросить', ['auto-planogramma/test-sales'], ['class' => 'btn btn-default']) ?>
+            <?= Html::a('Сбросить', ['auto-plannogramma/4'], ['class' => 'btn btn-default']) ?>
         </div>
     </div>
 
diff --git a/erp24/views/auto-plannogramma/5.php b/erp24/views/auto-plannogramma/5.php
index 3ab8cf4e..468d0847 100644
--- a/erp24/views/auto-plannogramma/5.php
+++ b/erp24/views/auto-plannogramma/5.php
@@ -9,7 +9,9 @@
     use yii\widgets\ActiveForm;
     use yii_app\records\CityStore;
     use yii_app\records\Products1cNomenclature;
-
+    ?>
+    <h1 class="ms-3 mb-4"><?= Html::encode("Расчет доли месяца для типов (month_species_share)") ?></h1>
+    <?php
     $form = ActiveForm::begin(['method' => 'get']); ?>
     <div class="row p-3">
         <div class="col-md">
@@ -83,7 +85,7 @@
             <?= Html::submitButton('Фильтровать', ['class' => 'btn btn-primary']) ?>
         </div>
         <div class="col-md">
-            <?= Html::a('Сбросить', ['auto-planogramma/test-sales'], ['class' => 'btn btn-default']) ?>
+            <?= Html::a('Сбросить', ['auto-plannogramma/5'], ['class' => 'btn btn-default']) ?>
         </div>
     </div>
 
diff --git a/erp24/views/auto-plannogramma/6.php b/erp24/views/auto-plannogramma/6.php
index b63cad83..da80eb55 100644
--- a/erp24/views/auto-plannogramma/6.php
+++ b/erp24/views/auto-plannogramma/6.php
@@ -9,7 +9,9 @@
     use yii\widgets\ActiveForm;
     use yii_app\records\CityStore;
     use yii_app\records\Products1cNomenclature;
-
+    ?>
+    <h1 class="ms-3 mb-4"><?= Html::encode("Расчет цели месяца для типов (month_species_goal)") ?></h1>
+    <?php
     $form = ActiveForm::begin(['method' => 'get']); ?>
     <div class="row p-3">
         <div class="col-md">
@@ -83,7 +85,7 @@
             <?= Html::submitButton('Фильтровать', ['class' => 'btn btn-primary']) ?>
         </div>
         <div class="col-md">
-            <?= Html::a('Сбросить', ['auto-planogramma/test-sales'], ['class' => 'btn btn-default']) ?>
+            <?= Html::a('Сбросить', ['auto-plannogramma/6'], ['class' => 'btn btn-default']) ?>
         </div>
     </div>