Remove double error message - checkout page

grandnode · Oct 21, 2021 · 0684210 · 0684210
1 parent 42c3da5
commit 0684210
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/Web/Grand.Web/Controllers/CheckoutController.cs b/src/Web/Grand.Web/Controllers/CheckoutController.cs
@@ -510,6 +510,7 @@ public virtual async Task<IActionResult> SaveBilling(IFormCollection form)
                 else
                 {
                     //new address
+                    ModelState.Clear();
                     var model = new CheckoutBillingAddressModel();
                     await TryUpdateModelAsync(model.NewAddress, "BillingNewAddress");
 
@@ -521,8 +522,6 @@ public virtual async Task<IActionResult> SaveBilling(IFormCollection form)
                         ModelState.AddModelError("", error);
                     }
 
-                    //validate model
-                    TryValidateModel(model.NewAddress);
                     if (!ModelState.IsValid)
                     {
                         //model is not valid. redisplay the form with errors
@@ -675,9 +674,7 @@ public virtual async Task<IActionResult> SaveShipping(CheckoutShippingAddressMod
                         {
                             ModelState.AddModelError("", error);
                         }
-
-                        //validate model
-                        TryValidateModel(model.NewAddress);
+
                         if (!ModelState.IsValid)
                         {
                             var errors = ModelState.Values.SelectMany(v => v.Errors);