shipment shipment fix

diff --git a/erp24/modul/shipment/functionsShipment.php b/erp24/modul/shipment/functionsShipment.php
index 435d20daa07b0dc62c3a41441459f14c3a15b59a..d350a36e8ca30f0d9ec26028c3c26cfbf57d97c2 100644 (file)
--- 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,if(value_text!='',value_text,value) 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 END) as value,color FROM store_orders_fields_data
 WHERE order_id=?",[$orderId]);
 $FiledsData = [];
 foreach($dataF as $row) {