Some small fixes.

OrchardCMS · Jul 30, 2023 · b692296 · b692296
1 parent c94b1db
commit b692296
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/Modules/OrchardCore.Commerce/Services/PaymentService.cs b/src/Modules/OrchardCore.Commerce/Services/PaymentService.cs
@@ -7,7 +7,6 @@
 using OrchardCore.Commerce.Extensions;
 using OrchardCore.Commerce.Models;
 using OrchardCore.Commerce.MoneyDataType;
-using OrchardCore.Commerce.MoneyDataType.Extensions;
 using OrchardCore.Commerce.Promotion.Extensions;
 using OrchardCore.Commerce.Tax.Extensions;
 using OrchardCore.Commerce.ViewModels;
@@ -170,8 +169,8 @@ public async Task FinalModificationOfOrderAsync(ContentItem order)
 
             await userService.AlterUserSettingAsync(user, UserAddresses, contentItem =>
             {
-                var part = contentItem.ContainsKey(nameof(UserAddressesPart))
-                    ? contentItem[nameof(UserAddressesPart)].ToObject<UserAddressesPart>()!
+                var part = contentItem.TryGetValue(nameof(UserAddressesPart), out var partJson)
+                    ? partJson.ToObject<UserAddressesPart>()!
                     : new UserAddressesPart();
 
                 part.BillingAndShippingAddressesMatch.Value = isSame;
@@ -207,7 +206,7 @@ public async Task<ContentItem> CreateNoPaymentOrderFromShoppingCartAsync()
             order.As<OrderPart>().ShippingAddress.Address,
             order.As<OrderPart>().BillingAddress.Address);
 
-        if (!cartViewModel.Totals.Any() || cartViewModel.Totals.Sum().Value != 0)
+        if (!cartViewModel.Totals.Any() || cartViewModel.Totals.Any(total => total.Value > 0))
         {
             return null;
         }