From 323665c463d367b99ffd14db3fe54ee02a8fa24f Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 15 Oct 2024 12:39:35 +0300
Subject: [PATCH] =?utf8?q?[ERP-147]=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?utf8?q?=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=B0=D1=82=D0=B5=D0=B3=D0=BE=D1=80?=
 =?utf8?q?=D0=B8=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D1=82=D0=BE=D0=B2=D0=B0?=
 =?utf8?q?=D1=80=D0=BE=D0=B2=20=D0=BC=D0=B0=D1=80=D0=BA=D0=B5=D1=82=D0=BF?=
 =?utf8?q?=D0=BB=D0=B5=D0=B9=D1=81=D0=B0=20=D0=B8=20=D0=B4=D0=BE=D0=BF.?=
 =?utf8?q?=D1=82=D0=BE=D0=B2=D0=B0=D1=80=D0=BE=D0=B2=20=D0=BC=D0=B0=D1=80?=
 =?utf8?q?=D0=BA=D0=B5=D1=82=D0=BF=D0=BB=D0=B5=D0=B9=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/modul/products/ajax_group_config.php | 3 ++-
 erp24/modul/products/products_1c.php       | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/erp24/modul/products/ajax_group_config.php b/erp24/modul/products/ajax_group_config.php
index dd62da5e..f5ff6baf 100644
--- a/erp24/modul/products/ajax_group_config.php
+++ b/erp24/modul/products/ajax_group_config.php
@@ -11,7 +11,8 @@ $data = $db::getRows($q,[$id]);
  foreach ($data as $row)  $data2[$row["tip"]] = $id;   
 
 
-$array=["wrap"=>"Упаковка","potted"=>"Горшечка", "services"=>"Услуги", "services_delivery"=>"Услуги по доставке", "salut"=>"Пиротехника", "matrix"=>"Матрица", "related"=>"Сопутка", "other_items"=>"Номенклатура 1%"];
+$array=["wrap"=>"Упаковка","potted"=>"Горшечка", "services"=>"Услуги", "services_delivery"=>"Услуги по доставке", "salut"=>"Пиротехника",
+    "matrix"=>"Матрица", "marketplace" => "Товары для маркетплейсов", "marketplace_additional" => "Доп. товары для маркетплейсов", "related"=>"Сопутка", "other_items"=>"Номенклатура 1%"];
 echo'<table class=""><tbody>';
 
   foreach($array as $k => $arr) {
diff --git a/erp24/modul/products/products_1c.php b/erp24/modul/products/products_1c.php
index a205bcaf..e86d7379 100644
--- a/erp24/modul/products/products_1c.php
+++ b/erp24/modul/products/products_1c.php
@@ -21,7 +21,9 @@ foreach ($data as $row) $prices[$row['product_id']]= $row['price'];
 
 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"=>"Матрица", "related"=>"Сопутка", "other_items"=>"Номенклатура 1%"];
+  $products_class=["wrap"=>"Упаковка","potted"=>"Горшечка", "services"=>"Услуги", "services_delivery"=>"Услуги по доставке",
+      "salut"=>"Пиротехника", "matrix"=>"Матрица", "marketplace" => "Товары для маркетплейсов", "marketplace_additional" => "Доп. товары для маркетплейсов",
+      "related"=>"Сопутка", "other_items"=>"Номенклатура 1%"];
    
     
  //   if(is_array($cats) and isset($cats[$parent_id])){
-- 
2.39.5