From: marina Date: Tue, 15 Apr 2025 07:23:51 +0000 (+0300) Subject: Merge branch 'develop' into feature_zozirova_erp-359_logic_of_calculation_for_month X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=0850bbe602a41f9a5f43753951e620c9b9260d68;p=erp24_rep%2Fyii-erp24%2F.git Merge branch 'develop' into feature_zozirova_erp-359_logic_of_calculation_for_month --- 0850bbe602a41f9a5f43753951e620c9b9260d68 diff --cc erp24/views/auto-planogramma/index.php index d330c0bd,00000000..7201c532 mode 100644,000000..100644 --- a/erp24/views/auto-planogramma/index.php +++ b/erp24/views/auto-planogramma/index.php @@@ -1,350 -1,0 +1,336 @@@ + + +

+
+
+
+
+
+
+
+ 'year-filter', + 'data' => array_combine(range(date('Y') - 5, date('Y') + 5), range(date('Y') - 5, date('Y') + 5)), + 'options' => ['placeholder' => 'Год', 'id' => 'year'], + 'pluginOptions' => ['allowClear' => true], + ]) ?> +
+
+ 'city-filter', + 'data' => ArrayHelper::map(StoreCityList::findAll(['type' => StoreCityList::TYPE_CITY]), 'id', 'name'), + 'options' => ['placeholder' => 'Город', 'id' => 'city'], + 'pluginOptions' => ['allowClear' => true], + ]) ?> +
+
+ 'store-type-filter', + 'data' => ArrayHelper::map(StoreType::find()->orderBy('sequence_number')->all(), 'id', 'name'), + 'options' => ['placeholder' => 'Тип магазина', 'id' => 'store-type', 'style' => 'width: 110%;'], + 'pluginOptions' => ['allowClear' => true], + ]) ?> +
+
+ 'territorial-manager-filter', + 'data' => ArrayHelper::map( + array_merge( + Admin::findAll(['group_id' => AdminGroup::GROUP_BUSH_DIRECTOR]), + Admin::findAll(['id' => StoreDynamic::find()->andWhere(['category' => 3, 'active' => 1])->select('value_int')->column()]) + ), + 'id', + 'name', + ), + 'options' => ['placeholder' => 'Тер. управляющий', 'id' => 'territorial-manger'], + 'pluginOptions' => ['allowClear' => true], + ]) ?> +
+
+ 'polnogramma-type-filter', + 'data' => ['min' => 'min', 'max' => 'max'], + 'options' => ['placeholder' => 'Тип п-ма', 'id' => 'polnogramma-type'], + 'pluginOptions' => ['allowClear' => true], + ]) ?> +
+
+ 'btn btn-apply btn-primary', 'style' => 'width:100%']); ?> +
+
+
+
+ 'week-filter', + 'data' => ['1' => '1', '2' => '2'], + 'options' => ['placeholder' => 'Неделя', 'id' => 'week'], + 'pluginOptions' => ['allowClear' => true], + ]) ?> +
+
+ 'region-filter', + 'data' => ArrayHelper::map(StoreCityList::findAll(['type' => StoreCityList::TYPE_REGION]), 'id', 'name'), + 'options' => ['placeholder' => 'Регион', 'id' => 'region'], + 'pluginOptions' => ['allowClear' => true], + ]) ?> +
+
+
+
+ 'bush_chef_florist', + 'value' => null, + 'data' => ArrayHelper::map(Admin::findAll(['group_id' => AdminGroup::GROUP_BUSH_CHEF_FLORIST]), 'id', 'name'), + 'options' => [ + 'placeholder' => 'Кустовой шеф-флорист', + 'class' => 'form-select', + 'id' => 'bush_chef_florist', + ], + 'pluginOptions' => [ + 'allowClear' => true, + ], + ]); ?> +
+
+
+
+
+
+
+ +
+
+ 'district-filter', + 'data' => ArrayHelper::map(StoreCityList::findAll(['type' => StoreCityList::TYPE_DISTRICT]), 'id', 'name'), + 'options' => ['placeholder' => 'Район', 'id' => 'district'], + 'pluginOptions' => ['allowClear' => true], + ]) ?> +
+
+
+
+
+ 'btn btn-success btn-save', 'style' => 'width:100%']); ?> +
+
-
-
- -
++
++
++
++ +
+
+
+
+ + + + + + + + + + + + $subcategories): ?> + + + + + $products): ?> + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
-
- 'btn btn-success ml-auto']) ?> - 'btn btn-success ml-auto']) ?> ++
++ 'btn btn-success ms-1']) ?> ++ 'btn btn-success ms-1']) ?> +
+
+ 'writing-mode: sideways-lr; text-align: center; white-space: nowrap; + font-weight: bold; transform-origin: left bottom; padding-right: 7%;' + ]) ?> +
+ + ▲ + +
+ + ▶ + +
+ + + + +
+ 'btn btn-primary input', + 'data-bs-toggle' => 'tooltip', + 'data-bs-placement' => 'top', + 'title' => $tooltipText, + ]) ?> + +
+
+
+
+ + +