Скрытие магазинов без значений прогноза

diff --git a/erp24/records/BouquetForecast.php b/erp24/records/BouquetForecast.php
index 69323d97604b142b30ee6dcd329de4a7b387c907..77e29035c91ccaaa1a101930755a958ed165d7fc 100644 (file)
--- a/erp24/records/BouquetForecast.php
+++ b/erp24/records/BouquetForecast.php
@@ -112,6 +112,7 @@ class BouquetForecast extends ActiveRecord
             ->andWhere(['type_sales' => $typeSales])
             ->andWhere(['month' => $month])
             ->andWhere(['year' => $year])
+            ->andWhere(['IS NOT', 'type_sales_value', null])
             ->leftJoin("$joinTable AS df", "df.id = bouquet_forecast.type_sales_id")
             ->select(["df.name AS name", 'type_sales_value AS value', 'type_sales_id AS id'])
             ->orderBy($defaultModel === CityStore::class ? 'df.id asc' : 'df.sequence_number asc')

diff --git a/erp24/views/bouquet/_form.php b/erp24/views/bouquet/_form.php
index 1e9dc3409fa8f62c9cdce895e644a07bae978e84..5ccb4377eb505e1bd894606183cb724e6412117d 100644 (file)
--- a/erp24/views/bouquet/_form.php
+++ b/erp24/views/bouquet/_form.php
@@ -261,16 +261,30 @@ $form = ActiveForm::begin([
             </div>
             <div class="row">
                 <div id="offline-container" class="container border p-3" style="max-height: 185px; background-color: white; overflow: auto;">
-                    <?php foreach ($storesTypeList as $item) { ?>
-                        <div class="row align-items-center mb-2">
-                            <div class="col-md-8">
-                                <?= Html::label($item['name'], null, ['class' => "col-form-label"]); ?>
+                    <?php
+                    if (!empty($storesTypeList)) { ?>
+                        <?php
+                        foreach ($storesTypeList as $item) { ?>
+                            <div class="row align-items-center mb-2">
+                                <div class="col-md-8">
+                                    <?= Html::label($item['name'], null, ['class' => "col-form-label"]); ?>
+                                </div>
+                                <div class="col-md-4">
+                                    <?= Html::input(
+                                        'number',
+                                        "BouquetForecast[type_sales_value][offline][{$item['id']}]",
+                                        $item['value'],
+                                        ['class' => 'form-control']
+                                    ) ?>
+                                </div>
                             </div>
-                            <div class="col-md-4">
-                                <?= Html::input('number', "BouquetForecast[type_sales_value][offline][{$item['id']}]", $item['value'], ['class' => 'form-control']) ?>
-                            </div>
-                        </div>
-                    <?php } ?>
+                        <?php
+                        } ?>
+                    <?php
+                    } else { ?>
+                        <p class="text-center text-muted">Для периода нет плановых данных</p>
+                    <?php
+                    } ?>
                 </div>
             </div>
 
@@ -279,16 +293,30 @@ $form = ActiveForm::begin([
             </div>
             <div class="row">
                 <div id="online-container" class="container border p-3" style="max-height: 185px;background-color: white; overflow: auto;">
-                    <?php foreach ($onlineStoresList as $item) { ?>
-                        <div class="row align-items-center mb-2">
-                            <div class="col-md-8">
-                                <?= Html::label($item['name'], null, ['class' => "col-form-label"]); ?>
-                            </div>
-                            <div class="col-md-4">
-                                <?= Html::input('number', "BouquetForecast[type_sales_value][online][{$item['id']}]", $item['value'], ['class' => 'form-control']) ?>
+                    <?php
+                    if (!empty($onlineStoresList)) { ?>
+                        <?php
+                        foreach ($onlineStoresList as $item) { ?>
+                            <div class="row align-items-center mb-2">
+                                <div class="col-md-8">
+                                    <?= Html::label($item['name'], null, ['class' => "col-form-label"]); ?>
+                                </div>
+                                <div class="col-md-4">
+                                    <?= Html::input(
+                                        'number',
+                                        "BouquetForecast[type_sales_value][online][{$item['id']}]",
+                                        $item['value'],
+                                        ['class' => 'form-control']
+                                    ) ?>
+                                </div>
                             </div>
-                        </div>
-                    <?php } ?>
+                        <?php
+                        } ?>
+                    <?php
+                    } else { ?>
+                        <p class="text-center text-muted">Для периода нет плановых данных</p>
+                    <?php
+                    } ?>
                 </div>
             </div>
 
@@ -297,16 +325,30 @@ $form = ActiveForm::begin([
             </div>
             <div class="row">
                 <div id="marketplace-container" class="container border p-3" style="max-height: 185px; background-color: white; overflow: auto;">
-                    <?php foreach ($marketplaceList as $item) { ?>
-                        <div class="row align-items-center mb-2">
-                            <div class="col-md-8">
-                                <?= Html::label($item['name'], null, ['class' => "col-form-label"]); ?>
-                            </div>
-                            <div class="col-md-4">
-                                <?= Html::input('number', "BouquetForecast[type_sales_value][marketplace][{$item['id']}]", $item['value'], ['class' => 'form-control']) ?>
+                    <?php
+                    if (!empty($marketplaceList)) { ?>
+                        <?php
+                        foreach ($marketplaceList as $item) { ?>
+                            <div class="row align-items-center mb-2">
+                                <div class="col-md-8">
+                                    <?= Html::label($item['name'], null, ['class' => "col-form-label"]); ?>
+                                </div>
+                                <div class="col-md-4">
+                                    <?= Html::input(
+                                        'number',
+                                        "BouquetForecast[type_sales_value][marketplace][{$item['id']}]",
+                                        $item['value'],
+                                        ['class' => 'form-control']
+                                    ) ?>
+                                </div>
                             </div>
-                        </div>
-                    <?php } ?>
+                            <?php
+                        } ?>
+                        <?php
+                    } else { ?>
+                        <p class="text-center text-muted">Для периода нет плановых данных</p>
+                    <?php
+                    } ?>
                 </div>
             </div>
         </div>