Merge branch '4.40-bug-fixes' into develop

nopSolutions · May 21, 2021 · dfe9812 · dfe9812
2 parents dc0dec5 + 2569a15
commit dfe9812
Show file tree

Hide file tree

Showing 2 changed files with 3 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
@@ -321,7 +321,7 @@ protected virtual async Task WriteAddressToXmlAsync(XmlWriter writer, bool isBil
             await writer.WriteElementStringAsync("Address2", address.Address2);
             await writer.WriteElementStringAsync("City", address.City);
             await writer.WriteElementStringAsync("State", (await _stateProvinceService.GetStateProvinceByAddressAsync(address))?.Name ?? string.Empty);
-            await writer.WriteElementStringAsync("PostalCode ", address.ZipPostalCode);
+            await writer.WriteElementStringAsync("PostalCode", address.ZipPostalCode);
             await writer.WriteElementStringAsync("Country", (await _countryService.GetCountryByAddressAsync(address)).TwoLetterIsoCode);
         }
 
@@ -405,7 +405,7 @@ protected virtual async Task WriteOrderToXmlAsync(XmlWriter writer, Order order)
             await writer.WriteElementStringAsync("OrderID", order.Id.ToString());
             await writer.WriteElementStringAsync("OrderNumber", order.OrderGuid.ToString());
             await writer.WriteElementStringAsync("OrderDate", order.CreatedOnUtc.ToString(DATE_FORMAT));
-            await writer.WriteElementStringAsync("OrderStatus ", GetOrderStatus(order));
+            await writer.WriteElementStringAsync("OrderStatus", GetOrderStatus(order));
             await writer.WriteElementStringAsync("LastModified", DateTime.Now.ToString(DATE_FORMAT));
             await writer.WriteElementStringAsync("OrderTotal", order.OrderTotal.ToString(CultureInfo.InvariantCulture));
             await writer.WriteElementStringAsync("ShippingAmount", (order.CustomerTaxDisplayType == TaxDisplayType.IncludingTax ? order.OrderShippingInclTax : order.OrderShippingExclTax).ToString(CultureInfo.InvariantCulture));

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.15",
+  "Version": "1.16",
   "SupportedVersions": [ "4.40" ],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,