ERP-433 Отчет по остаткам букетов для МП и причинам, если логика не проходит. Возможн...

diff --git a/erp24/actions/marketplace/ReportAction.php b/erp24/actions/marketplace/ReportAction.php
index f73f9cde29ff26b785924699967dc3c941745256..b12c08407d7f04f8f60a8689747e355b0b83460b 100644 (file)
--- 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 c9392c4794cb8d5885f818e3cef16d28c36c1073..8dd83f9a79545f89db93321713e979b31fab1887 100644 (file)
--- 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' => 'Нет',