From 8a570d33edfd289850e7f8efc93481cbb2e65a2b Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 23 Apr 2024 21:43:28 +0300
Subject: [PATCH] shipment shipment fix 2

---
 erp24/modul/shipment/ajaxField.php | 4 ++--
 erp24/modul/shipment/shipment.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/erp24/modul/shipment/ajaxField.php b/erp24/modul/shipment/ajaxField.php
index 66d215d..648366d 100644
--- a/erp24/modul/shipment/ajaxField.php
+++ b/erp24/modul/shipment/ajaxField.php
@@ -126,8 +126,8 @@ if($name_eng=="quantity_zakup_new") {
  //$db::sql("DELETE FROM store_orders_fields_data WHERE product_id=? AND order_id=? AND store_id=? AND field_name=? AND field_id=? AND color=?",[$product_id,$id,$store_id,$name_eng,$fieldId,$color]);
  //echo"удаление пустой записи";
 
-$upFields = "product_id, order_id, store_id, field_name, field_id, color, date_update, hand, value, title";
-$valuesFields= "'$product_id', '$id', '$store_id', '$name_eng', '$fieldId', '$color', NOW(), 1, 0, 0";
+$upFields = "product_id, order_id, store_id, field_name, field_id, color, date_update, hand, $pole, title";
+$valuesFields= "'$product_id', '$id', '$store_id', '$name_eng', '$fieldId', '$color', NOW(), 1, '$value', 0";
 
 $value_old=$db::getValue("SELECT $pole FROM store_orders_fields_data WHERE product_id=? AND order_id=?
 AND store_id=? AND field_name=? AND field_id=? AND color=? LIMIT 1",[$product_id,$id,$store_id,$name_eng,$fieldId,$color]);
diff --git a/erp24/modul/shipment/shipment.php b/erp24/modul/shipment/shipment.php
index 4017db6..83c1078 100644
--- a/erp24/modul/shipment/shipment.php
+++ b/erp24/modul/shipment/shipment.php
@@ -262,7 +262,7 @@ $sql = "SELECT field_name, sum(value) as value,product_id FROM store_orders_fiel
   AND order_id=". ($orderId ?? 0) . " AND color='' AND store_id!='' group by product_id,field_name";
 $data=$db::getRows($sql);
      foreach($data as $row) {
-            $shipments_group_id=$ProductsOptions[$row["product_id"]]["shipments_group_id"];
+            $shipments_group_id=$ProductsOptions[$row["product_id"]]["shipments_group_id"] ?? 0;
             $data_field[$row["field_name"]][$shipments_group_id] = ($data_field[$row["field_name"]][$shipments_group_id] ?? 0) + $row["value"];
    }  
 
@@ -279,7 +279,7 @@ $data=$db::getRows($sql);
    foreach($shipments_group_products as $shipments_group_id => $name) {
       if($data_field["sales_4weeks_cnt"][$shipments_group_id] ?? false) {
      echo"<tr><td>$name</td>";
-      foreach($field_stats_array as $fieldN)   echo"<td>".$data_field[$fieldN][$shipments_group_id]."</td>"; 
+      foreach($field_stats_array as $fieldN)   echo"<td>".($data_field[$fieldN][$shipments_group_id] ?? '')."</td>";
     echo"</tr>";
        }
 
-- 
2.39.5