From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 3 Dec 2024 10:57:11 +0000 (+0300)
Subject: Показ цены и форматирование
X-Git-Tag: 1.7~206^2~3
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=091b889a432f1b0eca96263a8cb60c422e7ea825;p=erp24_rep%2Fyii-erp24%2F.git

Показ цены и форматирование
---

diff --git a/erp24/controllers/ProductsController.php b/erp24/controllers/ProductsController.php
index b89bb47f..b7269e4d 100755
--- a/erp24/controllers/ProductsController.php
+++ b/erp24/controllers/ProductsController.php
@@ -272,7 +272,7 @@ class ProductsController extends Controller
                     ->all();
 
                 $prices = Prices::find()
-                    ->select(['product_id', 'price'])
+                    ->select(['price'])
                     ->indexBy('product_id')
                     ->column();
 
diff --git a/erp24/web/js/products/products-1c.js b/erp24/web/js/products/products-1c.js
index 80cab8ac..472f6dde 100644
--- a/erp24/web/js/products/products-1c.js
+++ b/erp24/web/js/products/products-1c.js
@@ -161,16 +161,28 @@ function ajax_products_in_group(parent_id){
                         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">
+                Цена: ${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>
                             ${row.name} ${isHidden}
-                            ${addCharButton}
-                            ${colorsHtml}
+                        </td>
+                        <td>
                             GUID ${row.id}
                         </td>
-                        
+                        <td>
+                            ${addCharButton}
+                        </td>
+                        <td>
+                            ${price}
+                        </td>
                     </tr>`;
             });