Merge remote-tracking branch 'origin/main' into issue/OCC-121

Author: sarahelsaig

src/Modules/OrchardCore.Commerce/Handlers/TaxPartAndPricePartHandler.cs

@@ -41,16 +41,20 @@ public override async Task UpdatedAsync(UpdateContentContext context, PricePart
         var isGrossPricePresent = taxPart.GrossPrice?.Amount.IsValid == true;
         var isTaxRatePresent = taxRate > 0;
 
-        if (isGrossPricePresent && isTaxRatePresent)
+        if (taxRate < 0)
+        {
+            _updateModelAccessor.ModelUpdater.ModelState.AddModelError(
+                nameof(TaxPart.TaxRate),
+                T["Tax Rate can't be negative."]);
+        }
+        else if (isGrossPricePresent)
         {
             await UpdatePricePartAsync(part.ContentItem, taxPart.GrossPrice.Amount, taxRate);
         }
-        else if (isGrossPricePresent ^ isTaxRatePresent)
+        else if (isTaxRatePresent)
         {
             await InvalidateUnevenStateAsync();
         }
-
-        return;
     }
 
     private Task UpdatePricePartAsync(ContentItem contentItem, Amount grossPrice, decimal taxRate)

src/Modules/OrchardCore.Commerce/Services/LocalTaxProvider.cs

@@ -40,5 +40,5 @@ public Task<PromotionAndTaxProviderContext> UpdateAsync(PromotionAndTaxProviderC
     public Task<bool> IsApplicableAsync(PromotionAndTaxProviderContext model) =>
         ITaxProvider.AllOrNoneAsync(model, items => items
             .Select(item => item.Content.ContentItem.As<TaxPart>())
-            .Count(taxPart => taxPart?.GrossPrice?.Amount.IsValid == true && taxPart.TaxRate.Value > 0));
+            .Count(taxPart => taxPart?.GrossPrice?.Amount.IsValid == true && taxPart.TaxRate.Value >= 0));
 }

src/Modules/OrchardCore.Commerce/Services/TaxRateTaxProvider.cs

@@ -36,6 +36,9 @@ public async Task<PromotionAndTaxProviderContext> UpdateAsync(PromotionAndTaxPro
                     item.Content.As<TaxPart>()?.ProductTaxCode?.Text,
                     model.VatNumber,
                     model.IsCorporation);
+
+                if (taxRate <= 0) return item;
+
                 var multiplier = (taxRate / 100m) + 1;
                 return item with { UnitPrice = item.UnitPrice * multiplier };
             })
@@ -57,7 +60,7 @@ public Task<bool> IsApplicableAsync(PromotionAndTaxProviderContext model) =>
                     model.ShippingAddress,
                     item.Content.As<TaxPart>()?.ProductTaxCode?.Text,
                     model.VatNumber,
-                    model.IsCorporation) > 0);
+                    model.IsCorporation) >= 0);
         });
 
     private static bool IsMatchingOrEmptyPattern(string pattern, string text) =>
@@ -93,6 +96,6 @@ private static decimal MatchTaxRate(
                 IsMatchingOrEmptyPattern(rate.TaxCode, taxCode);
         });
 
-        return matchingTaxRate?.TaxRate ?? 0;
+        return matchingTaxRate == null ? -1 : matchingTaxRate.TaxRate;
     }
 }