From 9321b14ba10ace555b7cf7acdfa2961c37587024 Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Wed, 2 Jul 2025 14:27:03 +0300
Subject: [PATCH] =?utf8?q?ERP-433=20=D0=9E=D1=82=D1=87=D0=B5=D1=82=20?=
 =?utf8?q?=D0=BF=D0=BE=20=D0=BE=D1=81=D1=82=D0=B0=D1=82=D0=BA=D0=B0=D0=BC?=
 =?utf8?q?=20=D0=B1=D1=83=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20=D0=B4=D0=BB?=
 =?utf8?q?=D1=8F=20=D0=9C=D0=9F=20=D0=B8=20=D0=BF=D1=80=D0=B8=D1=87=D0=B8?=
 =?utf8?q?=D0=BD=D0=B0=D0=BC,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BB=D0=BE?=
 =?utf8?q?=D0=B3=D0=B8=D0=BA=D0=B0=20=D0=BD=D0=B5=20=D0=BF=D1=80=D0=BE?=
 =?utf8?q?=D1=85=D0=BE=D0=B4=D0=B8=D1=82.=20=D0=92=D0=BE=D0=B7=D0=BC=D0=BE?=
 =?utf8?q?=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D1=80=D1=83=D1=87=D0=BD?=
 =?utf8?q?=D0=BE=D0=B9=20=D0=B2=D1=8B=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8?=
 =?utf8?q?=20=D0=B8=D0=B7=20ERP=20=D0=B2=20Excel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/actions/marketplace/ReportAction.php | 4 +++-
 erp24/views/marketplace/report.php         | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/erp24/actions/marketplace/ReportAction.php b/erp24/actions/marketplace/ReportAction.php
index f73f9cde..b12c0840 100644
--- a/erp24/actions/marketplace/ReportAction.php
+++ b/erp24/actions/marketplace/ReportAction.php
@@ -57,7 +57,7 @@ class ReportAction extends Action
                 'p1n.articule',
                 new \yii\db\Expression("
             (
-                'Коэффициент: ' || COALESCE(mp.reminder_koef::text, 'N/A') || E'\n' ||
+                'Коэффициент: ' || COALESCE(mp.reminder_koef::text, '-') || E'\n' ||
                 COALESCE(
                     concat_ws(
                         E'\n',
@@ -98,6 +98,8 @@ class ReportAction extends Action
 
         return $this->controller->render('report', [
             'dataProvider' => $dataProvider,
+            'isValid' => $isValid,
+            'storeId' => $storeId,
         ]);
 
     }
diff --git a/erp24/views/marketplace/report.php b/erp24/views/marketplace/report.php
index c9392c47..8dd83f9a 100644
--- a/erp24/views/marketplace/report.php
+++ b/erp24/views/marketplace/report.php
@@ -9,6 +9,8 @@ use yii_app\records\CityStore;
 
 /* @var $this yii\web\View */
 /* @var $dataProvider yii\data\ActiveDataProvider */
+/* @var $storeId string GUID магазина по дефолту Аэродромная */
+/* @var $isValid bool Флаг на активности на МП */
 
 $this->title = 'Отчет продуктов по активности на МП';
 $this->params['breadcrumbs'][] = $this->title;
@@ -22,9 +24,10 @@ $this->params['breadcrumbs'][] = $this->title;
             <div class="col-md">
                 <?= Select2::widget([
                     'name' => 'store',
-                    'value' => Yii::$app->request->post('store', 'dbd70103-2c7b-11e9-9b87-c85b76f0e893'),
+                    'value' => $storeId,
                     'data' => CityStore::getAllActiveGuidName(),
                     'options' => [
+                            'required' => true,
                         'placeholder' => 'Выберите магазин',
                     ],
                     'pluginOptions' => [
@@ -35,7 +38,7 @@ $this->params['breadcrumbs'][] = $this->title;
             <div class="col-md">
                 <?= Select2::widget([
                     'name' => 'is_valid',
-                    'value' => Yii::$app->request->post('is_valid'),
+                    'value' => $isValid,
                     'data' => [
                         'true' => 'Да',
                         'false' => 'Нет',
-- 
2.39.5