#5006 Fixed problem with the logic in CreateOrUpadeteShipping

nopSolutions · Sep 14, 2020 · f0d926d · f0d926d
1 parent 655d47e
commit f0d926d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Plugins/Nop.Plugin.Shipping.ShipStation/Services/ShipStationService.cs b/src/Plugins/Nop.Plugin.Shipping.ShipStation/Services/ShipStationService.cs
@@ -447,6 +447,8 @@ public void CreateOrUpadeteShipping(string orderNumber, string carrier, string s
 
                     decimal totalWeight = 0;
 
+                    _shipmentService.InsertShipment(shipment);
+
                     foreach (var orderItem in _orderService.GetOrderItems(order.Id))
                     {
                         var product = _productService.GetProductById(orderItem.ProductId);
@@ -473,15 +475,16 @@ public void CreateOrUpadeteShipping(string orderNumber, string carrier, string s
                         {
                             OrderItemId = orderItem.Id,
                             Quantity = orderItem.Quantity,
-                            WarehouseId = warehouseId
+                            WarehouseId = warehouseId,
+                            ShipmentId = shipment.Id
                         };
 
                         _shipmentService.InsertShipmentItem(shipmentItem);
                     }
 
                     shipment.TotalWeight = totalWeight;
 
-                    _shipmentService.InsertShipment(shipment);
+                    _shipmentService.UpdateShipment(shipment);
                 }
                 else
                 {

diff --git a/src/Plugins/Nop.Plugin.Shipping.ShipStation/plugin.json b/src/Plugins/Nop.Plugin.Shipping.ShipStation/plugin.json
@@ -2,7 +2,7 @@
   "Group": "Shipping rate computation",
   "FriendlyName": "ShipStation",
   "SystemName": "Shipping.ShipStation",
-  "Version": "1.06",
+  "Version": "1.07",
   "SupportedVersions": [ "4.40" ],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,