Чистка легаси кода

diff --git a/erp24/controllers/ProductsController.php b/erp24/controllers/ProductsController.php
index b7269e4dda00aa50b2a3e012b77c1a98023b1807..ae01caab33b3ae6a817aa5ee64936897224b0d2a 100755 (executable)
--- a/erp24/controllers/ProductsController.php
+++ b/erp24/controllers/ProductsController.php
@@ -276,36 +276,9 @@ class ProductsController extends Controller
                     ->indexBy('product_id')
                     ->column();
 
-                $providers = ShipmentProviders::find()
-                    ->select(['id', 'name'])
-                    ->indexBy('id')
-                    ->column();
-
-                $optionsData = Products1cOptions::find()
-                    ->select(['id', 'colors'])
-                    ->all();
-
-                $colorsProducts = [];
-                foreach ($optionsData as $option) {
-                    $colorsProducts[$option->id] = explode(';', $option->colors);
-                }
-
-                $varietiesData = ProductsVarieties::find()
-                    ->select(['product_id', 'color', 'name'])
-                    ->orderBy(['posit' => SORT_DESC])
-                    ->all();
-
-                $products_varieties = [];
-                foreach ($varietiesData as $variety) {
-                    $products_varieties[$variety->product_id][$variety->color][] = $variety->name;
-                }
-
                 return $this->asJson([
                     'data' => $data,
                     'prices' => $prices,
-                    'providers' => $providers,
-                    'colorsProducts' => $colorsProducts,
-                    'productsVarieties' => $products_varieties,
                     'parent_id' => $parent_id,
                 ]);
             }

diff --git a/erp24/web/js/products/products-1c.js b/erp24/web/js/products/products-1c.js
index f917471ee83dd8c836d2e37b220f919cc908eba3..f62146798e4dfb4c0f4f0e890c3b0327d3a9dbba 100644 (file)
--- a/erp24/web/js/products/products-1c.js
+++ b/erp24/web/js/products/products-1c.js
@@ -130,45 +130,20 @@ function ajax_products_in_group(parent_id){
                 return;
             }
 
-            const {data, prices, providers, colorsProducts, productsVarieties} = response;
+            const {data, prices} = response;
 
             let tableHtml = '<table class="table table-sm table-hover"><tbody>';
 
             data.forEach((row) => {
                 const isHidden = row.view === 0 ? '<span class="btn btn-sm btn-danger">скрыто</span>' : '';
-                /*const providerButton = `<div id="provider_${row.id}" class="btn btn-sm btn-warning"
-            onclick="ajax_product_provider('${row.id}');">
-            + поставщика ${providers[row.id] ? providers[row.id] : ''}</div>`;*/
+
                 const addCharButton = `<div id="provider_${row.id}" class="btn btn-sm btn-primary" 
                 onclick="ajax_product_characteristics('${row.id}');">
                 Доп. характеристики </div>`;
 
-                let colorsHtml = '';
-                if (colorsProducts[row.id]) {
-                    colorsProducts[row.id].forEach((color) => {
-                        color = color.trim();
-                        if (color) {
-                            colorsHtml += `<span class="btn btn-sm btn-info me-1 mt-1 mb-1">${color}</span>`;
-                            if (productsVarieties[row.id] && productsVarieties[row.id][color]) {
-                                productsVarieties[row.id][color].forEach((variety) => {
-                                    colorsHtml += `<span class="btn btn-sm btn-warning me-2">${variety}</span>`;
-                                });
-                            }
-                        }
-                    });
-
-                    if (colorsHtml) {
-                        colorsHtml += `<a href="/products/productVarieties/?id=${row.id}" target="_new" class="btn btn-info btn-sm">+ добавить сорта</a>`;
-                    }
-                }
-                const price = `<div id="diver_${row.id}" class="btn btn-primary">
+                 const price = `<div id="diver_${row.id}" class="btn btn-primary">
                 Цена: ${prices[row.id] || 'Нет цены'}</div>`;
 
-                const removeProductButtons = row.entity_id
-                    ? `<div id="diver_${row.id}" class="btn btn-sm btn-danger" onclick="ajax_remove_product('${row.id}');">удалить продукт</div>
-                       <div id="diver2_${row.id}" class="btn btn-sm btn-danger" onclick="ajaxRemoveExport('${row.id}');">удалить только связь</div>`
-                    : '';
-
                 tableHtml += `
                     <tr class="${row.entity_id ? '' : 'bg-gray-500'}">
                         <td>