From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 18 Jun 2024 09:33:54 +0000 (+0300)
Subject: Убрал дебаг информацию, лишнюю скобку
X-Git-Tag: 1.3~54^2~2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=e99982032c54bd2980b2d03c3b0480af3cfdb490;p=erp24_rep%2Fyii-erp24%2F.git

Убрал дебаг информацию, лишнюю скобку
---

diff --git a/erp24/modul/shipment/fields/sales_7day_division.php b/erp24/modul/shipment/fields/sales_7day_division.php
index 75d5eaa3..fd5c589f 100644
--- a/erp24/modul/shipment/fields/sales_7day_division.php
+++ b/erp24/modul/shipment/fields/sales_7day_division.php
@@ -25,7 +25,7 @@ foreach($productGroupArray as $group =>$pArray) {
     WHERE s.id=i.check_id AND  i.product_id  in($whereInProductsId_in)  
     AND s.store_id_1c $orderStoresArrayRelation_in
     AND s.date<='$date_start_division 00:00:00'
-    AND s.date>='$date_start_division'::date -interval '$day_sales day' group BY i.product_id, s.store_id_1c, s.operation  ");
+    AND s.date>='$date_start_division'::date -interval '$day_sales day' group BY i.product_id, s.store_id_1c, s.operation  ";
 
         $data2 = $db::getRows($sql);
         foreach ($data2 as $row2) {
diff --git a/erp24/modul/shipment/functionsShipment.php b/erp24/modul/shipment/functionsShipment.php
index facf7118..6bf0818d 100644
--- a/erp24/modul/shipment/functionsShipment.php
+++ b/erp24/modul/shipment/functionsShipment.php
@@ -732,7 +732,6 @@ function insert_store_orders_fields($massivSQL,$field_name,$massivTitle=[], $pri
     }
 
     foreach($massivSQL as $productId =>$array) {
-//        echo "PRODUCTID: " . $productId . " ||| ";
         foreach($array as $storeId =>$valueArr) {
             foreach($valueArr as $color =>$value) {
                 //  if(empty($color) or $storeId=="NULL") $color="";
@@ -769,10 +768,8 @@ function insert_store_orders_fields($massivSQL,$field_name,$massivTitle=[], $pri
                        if($Insert) {
                            $sql = "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 (?,?,?,?,?,?,?,?,'-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([$productId, $orderId, $storeId, $field_name, $field_id, $value, $value_text, $color, $title, $value, $value_text, $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'";
                            $db::sql($sql, [$productId, $orderId, $storeId, $field_name, $field_id, $value, $value_text, $color, $title, $value, $value_text, $title]);
                        }
                     }