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

diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php
index 26ee35b929ab623aeb9320ad661ae23510fed58f..d93e4bf734c42fb6b5fa4c4b9b35d5e10db6aa24 100644 (file)
--- 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 120fc959aab6fac347f1c7bf0c0b9b281b3eb6eb..d7a831e9caf8f771dcc8f80ba7781d63662d7eb9 100644 (file)
--- 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 28d4460e35cda47f2f1d6f39028bff4c334bd2ee..3f9798ac2e2bd2efbc952a9245d03952d8a4cb48 100644 (file)
--- 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 7d2fcb2f88128cb37e8c3801e0609573a63bb851..4c5b798afd4fb1f757e013d070b5a1c3ee1cebd4 100644 (file)
--- 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 1e6f7aafc35c78c83b5983906d4402ff632dc846..73254c2886dab37999b2f405246aec3dae2519b8 100644 (file)
--- 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 3ab8cf4e5f2f03777631c4b26e5cd35262d4c1d4..468d0847e4680e6323e04aebbebd05f9bfccd295 100644 (file)
--- 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 b63cad832d8de02605b2bcac053002983ce38646..da80eb5520041e263a83dbfa4393cf1455fad9d9 100644 (file)
--- 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>