From 8b793f2cbbb2c99c399831b0d2308df1678a16fa Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 18 Jun 2024 12:25:18 +0300
Subject: [PATCH] =?utf8?q?=D0=92=20color=5Fpercent=20=D0=B1=D1=8B=D0=BB=20?=
 =?utf8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B9=20=D1=83=D1=80=D0=BE=D0=B2?=
 =?utf8?q?=D0=B5=D0=BD=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/modul/shipment/fields/color_percent.php | 2 +-
 erp24/modul/shipment/functionsShipment.php    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/erp24/modul/shipment/fields/color_percent.php b/erp24/modul/shipment/fields/color_percent.php
index 46c87759..55d027c0 100644
--- a/erp24/modul/shipment/fields/color_percent.php
+++ b/erp24/modul/shipment/fields/color_percent.php
@@ -48,7 +48,7 @@ $html = '';
                   else $percentColor=0;
                  // округляем до сотых
                   $percentColor=round($percentColor,2);
-                $data_up["color_percent"][$productId][$storeId][$color]=$percentColor;
+                $data_up[$productId][$storeId][$color]=$percentColor;
                  $html .="<tr><td>$color</td><td>".$storesArrayAll[$storeId]."</td><td>".$store_planogram[$productId][$storeId]."</td><td>".$store_planogram_colors[$productId][$storeId][$color]."</td>
                   <td>$percentColor</td></tr>";
                   
diff --git a/erp24/modul/shipment/functionsShipment.php b/erp24/modul/shipment/functionsShipment.php
index e7d17531..facf7118 100644
--- a/erp24/modul/shipment/functionsShipment.php
+++ b/erp24/modul/shipment/functionsShipment.php
@@ -732,7 +732,7 @@ function insert_store_orders_fields($massivSQL,$field_name,$massivTitle=[], $pri
     }
 
     foreach($massivSQL as $productId =>$array) {
-        echo "PRODUCTID: " . $productId . " ||| ";
+//        echo "PRODUCTID: " . $productId . " ||| ";
         foreach($array as $storeId =>$valueArr) {
             foreach($valueArr as $color =>$value) {
                 //  if(empty($color) or $storeId=="NULL") $color="";
@@ -771,7 +771,7 @@ function insert_store_orders_fields($massivSQL,$field_name,$massivTitle=[], $pri
                           VALUES (?,?,?,?,?,?,?,?,'-1',NOW(),?)  ON CONFLICT (order_id, product_id, store_id, field_id, field_name, color) DO UPDATE SET value=?, hand=0, value_text=?, date_update=NOW(), title=?";
                            //$sql2 = "INSERT INTO store_orders_fields_data (product_id, order_id, store_id, field_name, field_id, value, value_text, color,hand,date_update, title)
                           //VALUES ('$productId','$orderId','$storeId','$field_name','$field_id','$value','$value_text','$color','-1',NOW(),'$title')  ON CONFLICT (order_id, product_id, store_id, field_id, field_name, color) DO UPDATE SET value='$value', hand=0, value_text='$value_text', date_update=NOW(), title='$title'";
-                           var_dump($value); var_dump($field_name);
+//                           var_dump($value); var_dump($field_name);
 //                           var_dump([$productId, $orderId, $storeId, $field_name, $field_id, $value, $value_text, $color, $title, $value, $value_text, $title]);
                            $db::sql($sql, [$productId, $orderId, $storeId, $field_name, $field_id, $value, $value_text, $color, $title, $value, $value_text, $title]);
                        }
-- 
2.39.5