ERP-402 Добавить в ЛК Флориста расчёт премии за авторские букеты

diff --git a/erp24/modul/products/products_1c.php b/erp24/modul/products/products_1c.php
index e86d73791a6eded69071e8c64f370f41111761af..aa2f3043e718cf804d99b503f36d2b462963498a 100644 (file)
--- a/erp24/modul/products/products_1c.php
+++ b/erp24/modul/products/products_1c.php
@@ -23,7 +23,7 @@ function build_tree($cats,$parent_id,$only_parent = false){
     global $ahref,$group_tpl, $products_class_row;
   $products_class=["wrap"=>"Упаковка","potted"=>"Горшечка", "services"=>"Услуги", "services_delivery"=>"Услуги по доставке",
       "salut"=>"Пиротехника", "matrix"=>"Матрица", "marketplace" => "Товары для маркетплейсов", "marketplace_additional" => "Доп. товары для маркетплейсов",
-      "related"=>"Сопутка", "other_items"=>"Номенклатура 1%"];
+      "related"=>"Сопутка", "other_items"=>"Номенклатура 1%", "author"=>"Авторский букет",];
    
     
  //   if(is_array($cats) and isset($cats[$parent_id])){

diff --git a/erp24/records/ProductsClass.php b/erp24/records/ProductsClass.php
index 939f040cec878f59e06d8642933f6591e525d4d5..477efdf6b77857709884c8446319ff7907852acf 100755 (executable)
--- a/erp24/records/ProductsClass.php
+++ b/erp24/records/ProductsClass.php
@@ -38,6 +38,7 @@ class ProductsClass extends \yii\db\ActiveRecord
             self::HINT_MARKETPLACE_ADDITIONAL => 'Доп. товары для маркетплейсов',
             self::HINT_RELATED => 'Сопутка',
             self::HINT_OTHER_ITEMS => 'Номенклатура 1%',
+            self::HINT_AUTHOR => 'Авторский букет',
         ];
     }
 

diff --git a/erp24/views/shift-transfer/update.php b/erp24/views/shift-transfer/update.php
index 395ae2446898e460ff02577650cbd3c7e8b36001..f26fcf49be5d38586d70cc137f301f7cd45096f9 100644 (file)
--- a/erp24/views/shift-transfer/update.php
+++ b/erp24/views/shift-transfer/update.php
@@ -91,6 +91,22 @@ $this->registerJs('var getMeOut = false;',  \yii\web\View::POS_HEAD, 'getMeOut')
             </div>
         </details>
     </div>
+    <div class="row">
+        <div class="col-2">
+            <?php $hints2 = [ProductsClass::HINT_AUTHOR => 'Авторский букет'] ?>
+            <?= $form->field($shiftTransfer, 'groups2')->checkboxList($hints2, ['checked' => 1,
+                'onclick' => '$("#acceptDiv").removeClass("d-none");']) ?>
+        </div>
+        <details <?= !empty($shiftTransfer->groups1) ? 'open' : '' ?> >
+            <summary>Другие</summary>
+            <div class="col-9">
+                <?php $hints1 = ProductsClass::getHints(); unset($hints1['author']); ?>
+                <?= $form->field($shiftTransfer, 'groups1')->checkboxList($hints1, ['checked' => 1,
+                    'onclick' => '$("#acceptDiv").removeClass("d-none");']) ?>
+            </div>
+        </details>
+    </div>
+
 
     <div id='acceptDiv' class="form-group d-none">
         <?= Html::submitButton('Сформировать список по выбранным группам', ['class' => 'btn btn-secondary',