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

diff --git a/erp24/controllers/ProductsController.php b/erp24/controllers/ProductsController.php
index b89bb47f4f0398dfafeb92e489cf27540bbb1a6f..b7269e4dda00aa50b2a3e012b77c1a98023b1807 100755 (executable)
--- 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 80cab8aca58c8d5f907edea068dfdb89e300249c..472f6dde63c4fef34fe665c6d91250713589791d 100644 (file)
--- 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>`;
             });