Merge branch '4.40-bug-fixes' into develop

nopSolutions · Mar 22, 2021 · ecb1bb8 · ecb1bb8
2 parents 6c00db6 + 89b0839
commit ecb1bb8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/Libraries/Nop.Core/NopVersion.cs b/src/Libraries/Nop.Core/NopVersion.cs
@@ -13,7 +13,7 @@ public static class NopVersion
         /// <summary>
         /// Gets the minor store version
         /// </summary>
-        public const string MINOR_VERSION = "1";
+        public const string MINOR_VERSION = "2";
 
         /// <summary>
         /// Gets the full store version

diff --git a/src/Plugins/Nop.Plugin.Shipping.ShipStation/ShipStationComputationMethod.cs b/src/Plugins/Nop.Plugin.Shipping.ShipStation/ShipStationComputationMethod.cs
@@ -108,7 +108,7 @@ public async Task<GetShippingOptionResponse> GetShippingOptionsAsync(GetShipping
             if (getShippingOptionRequest == null)
                 throw new ArgumentNullException(nameof(getShippingOptionRequest));
 
-            return null;
+            return Task.FromResult<decimal?>(null);
         }
 
         /// <summary>

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

diff --git a/src/Plugins/Nop.Plugin.Shipping.UPS/UPSComputationMethod.cs b/src/Plugins/Nop.Plugin.Shipping.UPS/UPSComputationMethod.cs
@@ -76,7 +76,7 @@ public async Task<GetShippingOptionResponse> GetShippingOptionsAsync(GetShipping
         /// </returns>
         public Task<decimal?> GetFixedRateAsync(GetShippingOptionRequest getShippingOptionRequest)
         {
-            return null;
+            return Task.FromResult<decimal?>(null);
         }
 
         /// <summary>

diff --git a/src/Plugins/Nop.Plugin.Shipping.UPS/plugin.json b/src/Plugins/Nop.Plugin.Shipping.UPS/plugin.json
@@ -2,7 +2,7 @@
   "Group": "Shipping rate computation",
   "FriendlyName": "UPS (United Parcel Service)",
   "SystemName": "Shipping.UPS",
-  "Version": "1.64",
+  "Version": "1.65",
   "SupportedVersions": [ "4.40" ],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,