From: marina <m.zozirova@gmail.com>
Date: Sat, 27 Apr 2024 15:07:32 +0000 (+0300)
Subject: insert ignore c mysql переведен postgresql правки
X-Git-Tag: 1.1~86^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=235c15d29c2b201cbd36b97b8b697227ac899916;p=erp24_rep%2Fyii-erp24%2F.git

insert ignore c mysql переведен postgresql правки
---

diff --git a/erp24/modul/shipment/functionsShipment.php b/erp24/modul/shipment/functionsShipment.php
index fb5e8425..3a6010eb 100644
--- a/erp24/modul/shipment/functionsShipment.php
+++ b/erp24/modul/shipment/functionsShipment.php
@@ -428,11 +428,10 @@ $status_store="";
 if(!empty($store_id)) {
     
 if(!empty($_GET["status"]) and !empty($store_id) and !empty($orderId)) {
-    $db::sql("INSERT INTO store_order_status_log (order_id, store_id, status_id, status, date, admin_id) 
-                VALUES ('$orderId', '$store_id', $status_order_id, 1, NOW(), " . $_SESSION["admin_id"] . ")
+    $db::sql("INSERT INTO store_order_status_log (order_id, status_id, status, date, admin_id) 
+                VALUES ('$orderId', $status_order_id, 1, NOW(), " . $_SESSION["admin_id"] . ")
                 ON CONFLICT (id) DO UPDATE SET 
                     order_id = '$orderId', 
-                    store_id = '$store_id', 
                     status_id = $status_order_id, 
                     status = 1,
                     date = NOW(),