From d1755496182185348fba8af769d4b53fef0873b9 Mon Sep 17 00:00:00 2001 From: marina Date: Mon, 5 May 2025 10:11:30 +0300 Subject: [PATCH] =?utf8?q?ERP-402=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?utf8?q?=D1=82=D1=8C=20=D0=B2=20=D0=9B=D0=9A=20=D0=A4=D0=BB=D0=BE=D1=80?= =?utf8?q?=D0=B8=D1=81=D1=82=D0=B0=20=D1=80=D0=B0=D1=81=D1=87=D1=91=D1=82?= =?utf8?q?=20=D0=BF=D1=80=D0=B5=D0=BC=D0=B8=D0=B8=20=D0=B7=D0=B0=20=D0=B0?= =?utf8?q?=D0=B2=D1=82=D0=BE=D1=80=D1=81=D0=BA=D0=B8=D0=B5=20=D0=B1=D1=83?= =?utf8?q?=D0=BA=D0=B5=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/modul/products/products_1c.php | 2 +- erp24/records/ProductsClass.php | 1 + erp24/views/shift-transfer/update.php | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/erp24/modul/products/products_1c.php b/erp24/modul/products/products_1c.php index e86d7379..aa2f3043 100644 --- 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 939f040c..477efdf6 100755 --- 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 395ae244..f26fcf49 100644 --- 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') +
+
+ 'Авторский букет'] ?> + field($shiftTransfer, 'groups2')->checkboxList($hints2, ['checked' => 1, + 'onclick' => '$("#acceptDiv").removeClass("d-none");']) ?> +
+
groups1) ? 'open' : '' ?> > + Другие +
+ + field($shiftTransfer, 'groups1')->checkboxList($hints1, ['checked' => 1, + 'onclick' => '$("#acceptDiv").removeClass("d-none");']) ?> +
+
+
+
'btn btn-secondary', -- 2.39.5