ERP-329 Новый интерфейс для работы с заказами мп и амо

diff --git a/erp24/controllers/ShipmentController.php b/erp24/controllers/ShipmentController.php
index 2fc8f12811edd687ba79e73132102363288aab99..9bc3b5845c8762d8809b88219483287e6fa9f68f 100755 (executable)
--- a/erp24/controllers/ShipmentController.php
+++ b/erp24/controllers/ShipmentController.php
@@ -4,6 +4,7 @@ namespace app\controllers;
 
 use yii\web\Controller;
 use yii_app\records\Products1c;
+use yii_app\records\Products1cNomenclature;
 
 class ShipmentController extends Controller
 {
@@ -41,7 +42,7 @@ class ShipmentController extends Controller
     public function actionAutoPolnogramma() {
 
         return $this->render('auto-polnogramma', [
-            'groups' => Products1c::findAll(['tip' => Products1c::TYPE_PRODUCTS_GROUP])
+            'categories' => Products1cNomenclature::find()->select('type_num')->groupBy('type_num')->all()
         ]);
     }
 }
\ No newline at end of file

diff --git a/erp24/views/shipment/auto-polnogramma.php b/erp24/views/shipment/auto-polnogramma.php
index 50d8502b5d7925b4332f9b7297d37dc283d51ec6..aa536f07a91aa1ef45b9f24a929361ef28e4db65 100644 (file)
--- a/erp24/views/shipment/auto-polnogramma.php
+++ b/erp24/views/shipment/auto-polnogramma.php
@@ -68,40 +68,57 @@ use sjaakp\bandoneon\Bandoneon;
                 <?= Html::submitButton('Применить', ['class' => 'btn btn-apply btn-primary', 'style' => 'width:100%']);?>
             </div>
         </div>
-        <div class="row">
+        <div class="row py-3">
             <div class="col-md d-flex">
                 <?= Select2::widget([
-                    'name' => 'polnogramma-type-filter',
-                    'data' => ['min' => 'min', 'max' => 'max'],
-                    'options' => ['placeholder' => 'Тип п-ма', 'id' => 'polnogramma-type'],
+                    'name' => 'week-filter',
+                    'data' => ['1' => '1', '2' => '2'],
+                    'options' => ['placeholder' => 'Ð\9dеделÑ\8f', 'id' => 'week'],
                     'pluginOptions' => ['allowClear' => true],
                 ]) ?>
             </div>
             <div class="col-md d-flex">
                 <?= Select2::widget([
-                    'name' => 'city-filter',
+                    'name' => 'region-filter',
                     'data' => ArrayHelper::map(StoreCityList::findAll(['type' => StoreCityList::TYPE_REGION]), 'id', 'name'),
-                    'options' => ['placeholder' => 'Ð\93оÑ\80од', 'id' => 'city'],
+                    'options' => ['placeholder' => 'Регион', 'id' => 'region'],
                     'pluginOptions' => ['allowClear' => true],
                 ]) ?>
             </div>
-            <div class="col-md"></div>
-            <div class="col-md-">
-                
+            <div class="col-md d-flex">
+<!--                ttr-->
+            </div>
+            <div class="col-md d-flex">
+                <?= Select2::widget([
+                    'name' => '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,
+                    ],
+                ]); ?>
+            </div>
+            <div class="col-md d-flex">
+                <!--                ttr-->
+            </div>
+            <div class="col-md d-flex">
+                <?= Html::button('Сохранить', ['class' => 'btn btn-apply btn-save', 'style' => 'width:100%']);?>
             </div>
         </div>
     </div>
     <div class="row">
         <div class="col-md-5">
-
-            <?php Bandoneon::begin() ?>
-            <?php
-            foreach ($groups as $group) {
-                echo "<h4>$group->name</h4>";
-                echo "<div 'class' => 'group-{$group->id}></div>";
-            } ?>
-            <?php Bandoneon::end() ?>
-
+            <?php Bandoneon::begin();
+            foreach ($categories as $category) {
+                echo "<h4>$category->type_num</h4>";
+                echo "<div class=\"group-{$category->id}\"></div>";
+            }
+            Bandoneon::end() ?>
         </div>
     </div>