From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 16 Apr 2024 14:44:51 +0000 (+0300)
Subject: shipment shipment fix
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=43bf773ac4a0e021c5be43a6daab7ca8b7772c79;p=yii-erp24%2F.git

shipment shipment fix
---

diff --git a/erp24/modul/shipment/functionsShipment.php b/erp24/modul/shipment/functionsShipment.php
index 435d20d..d350a36 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,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) {