From 92b9898928f9d3db98018f15e7be4dc12f27644c Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 16 Apr 2024 17:54:34 +0300
Subject: [PATCH] shipment shipment fix p2

---
 erp24/modul/shipment/functionsShipment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erp24/modul/shipment/functionsShipment.php b/erp24/modul/shipment/functionsShipment.php
index d350a36..51e4d74 100644
--- a/erp24/modul/shipment/functionsShipment.php
+++ b/erp24/modul/shipment/functionsShipment.php
@@ -247,7 +247,7 @@ function returnRowCssClassByFieldValue($fieldName,$value){
 function getDataFiledsData($orderId) {
 global $db;
 // готовим массим со всеми данными по столбцам по каждому товару магазину и цвету Если NULL - то это сумма по магазинам и по цветам
-$dataF=$db::getRows("SELECT field_name,product_id,store_id,(CASE WHEN value_text!='' THEN value_text ELSE value END) as value,color FROM store_orders_fields_data
+$dataF=$db::getRows("SELECT field_name,product_id,store_id,(CASE WHEN value_text!='' THEN value_text ELSE value::text END) as value,color FROM store_orders_fields_data
 WHERE order_id=?",[$orderId]);
 $FiledsData = [];
 foreach($dataF as $row) { 
-- 
2.39.5