From dab39ca8d108b0ef0f7d77818193578caf559daa Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 30 Jul 2025 17:38:13 +0300
Subject: [PATCH] =?utf8?q?=D0=97=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD?=
 =?utf8?q?=D0=B8=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B0?=
 =?utf8?q?=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D0=BE=D1=81=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 ...ducts1cNomenclatureActualityController.php | 14 ++++-----
 .../add-activity.php                          | 31 +++++++------------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/erp24/controllers/Products1cNomenclatureActualityController.php b/erp24/controllers/Products1cNomenclatureActualityController.php
index 196d785d..4bf97e1a 100644
--- a/erp24/controllers/Products1cNomenclatureActualityController.php
+++ b/erp24/controllers/Products1cNomenclatureActualityController.php
@@ -214,22 +214,20 @@ class Products1cNomenclatureActualityController extends Controller
     {
         $request = Yii::$app->request;
 
-        if (!$request->get('historyDays') || !$request->get('intervalMonths')) {
+        $historyDays    = $request->get('historyDays');
+        $intervalMonths = $request->get('intervalMonths');
+
+
+        if ($historyDays === null || $intervalMonths === null) {
             return $this->render('add-activity', [
                 'historyDays'    => $historyDays ?? 14,
                 'intervalMonths' => $intervalMonths ?? 4,
             ]);
         }
 
-        $historyDays    = (int)$request->get('historyDays');
-        $intervalMonths = (int)$request->get('intervalMonths');
-
         $endDate   = date('Y-m-d');
         $startDate = date('Y-m-d', strtotime("-{$historyDays} days", strtotime($endDate)));
 
-        $storeIds  = array_map(fn($s) => $s->id, $this->getVisibleStores());
-        $countStores = count($storeIds);
-
         $productIds = (new Query())
             ->select('sp.product_id')
             ->from(['s' => 'sales'])
@@ -240,7 +238,7 @@ class Products1cNomenclatureActualityController extends Controller
             ->groupBy('sp.product_id')
             //->having(['=', new \yii\db\Expression('COUNT(DISTINCT s.store_id)'), $countStores])
             ->column();
-        var_dump($productIds); die();
+
         if (empty($productIds)) {
             Yii::$app->session->setFlash('info', 'Нет товаров, удовлетворяющих условиям.');
             return $this->render('add-activity', [
diff --git a/erp24/views/products1c-nomenclature-actuality/add-activity.php b/erp24/views/products1c-nomenclature-actuality/add-activity.php
index 035f02d2..06ebb09f 100644
--- a/erp24/views/products1c-nomenclature-actuality/add-activity.php
+++ b/erp24/views/products1c-nomenclature-actuality/add-activity.php
@@ -11,25 +11,18 @@ $this->title = 'Заполнить актуальность';
 <div class="add-activity p-4">
 <h1><?= Html::encode($this->title) ?></h1>
 
-<?php $form = ActiveForm::begin([
-    'method' => 'get',
-    'action' => ['add-activity'],
-    'options' => ['class' => 'form-inline'],
-]); ?>
+    <?php $form = ActiveForm::begin([
+        'method'=>'get',
+        'action'=>['add-activity'],
+    ]); ?>
+
+    <?= Html::label('История (дней)', 'historyDays') ?>
+    <?= Html::input('number', 'historyDays', $historyDays, ['min'=>1, 'class'=>'form-control']) ?>
+
+    <?= Html::label('Интервал (месяцы)', 'intervalMonths') ?>
+    <?= Html::input('number', 'intervalMonths', $intervalMonths, ['min'=>1, 'class'=>'form-control']) ?>
+
+    <?= Html::submitButton('Запустить', ['class'=>'btn btn-success mt-3']) ?>
 
-<div class="row g-3 align-items-end">
-    <div class="col-auto">
-        <?= $form->field(new \yii\base\DynamicModel(['historyDays'=>$historyDays]), 'historyDays')
-            ->textInput(['type'=>'number','min'=>1,'value'=>$historyDays])
-            ->label('История (дней)') ?>
-    </div>
-    <div class="col-auto">
-        <?= $form->field(new \yii\base\DynamicModel(['intervalMonths'=>$intervalMonths]), 'intervalMonths')
-            ->textInput(['type'=>'number','min'=>1,'value'=>$intervalMonths])
-            ->label('Интервал (месяцы)') ?>
-    </div>
-    <div class="col-auto">
-        <?= Html::submitButton('Запустить', ['class'=>'btn btn-success']) ?>
-    </div>
     <?php ActiveForm::end(); ?>
 </div>
\ No newline at end of file
-- 
2.39.5