Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Add validation for recurring cycle period #173
KrzysztofPajaka1c2137c4d99
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.csindex 15fa2edd5..417d41ed9 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs@@ -682,8 +682,11 @@ namespace Grand.Business.Checkout.Services.Ordersif (checkoutAttributes == null)checkoutAttributes = new List<CustomAttribute>();- bool hasStandartProducts = false;- bool hasRecurringProducts = false;+ var hasStandartProducts = false;+ var hasRecurringProducts = false;+ var hasRecurringProductsMix = false;++ (RecurringCyclePeriod recurringCyclePeriod, int recurringCycleLength, int recurringTotalCycles)? recurringProducts = null;foreach (var sci in shoppingCart){@@ -695,7 +698,17 @@ namespace Grand.Business.Checkout.Services.Orders}if (product.IsRecurring)+ {hasRecurringProducts = true;+ if (!recurringProducts.HasValue)+ recurringProducts = (product.RecurringCyclePeriodId, product.RecurringCycleLength, product.RecurringTotalCycles);+ else+ if (recurringProducts.Value.recurringCyclePeriod != product.RecurringCyclePeriodId ||+ recurringProducts.Value.recurringCycleLength != product.RecurringCycleLength ||+ recurringProducts.Value.recurringTotalCycles != product.RecurringTotalCycles+ )+ hasRecurringProductsMix = true;+ }elsehasStandartProducts = true;}@@ -704,6 +717,10 @@ namespace Grand.Business.Checkout.Services.Ordersif (hasStandartProducts && hasRecurringProducts)warnings.Add(_translationService.GetResource("ShoppingCart.CannotMixStandardAndAutoshipProducts"));+ //don't mix recurring products+ if (hasRecurringProducts && hasRecurringProductsMix)+ warnings.Add(_translationService.GetResource("ShoppingCart.CannotMixRecurringProducts"));+//validate checkout attributesif (validateCheckoutAttributes){diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.csindex 5cc55c72c..37318df9b 100644--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs@@ -15,7 +15,7 @@ namespace Grand.Business.System.Services.Migrations._1._1{public int Priority => 0;public DbVersion Version => new(1, 1);- public Guid Identity => new("21B022B6-FDA7-4574-A395-613A3FD80F5D");+ public Guid Identity => new("BDB82CDE-7426-49A8-B494-9C31F1374B58");public string Name => "Update resource string for english language";/// <summary>diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex 562d0abb9..c1d347886 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -15978,6 +15978,9 @@<Resource Name="ShoppingCart.CannotLoadProduct"><Value>Product (Id={0}) cannot be loaded</Value></Resource>+ <Resource Name="ShoppingCart.CannotMixRecurringProducts">+ <Value>Your cart has mixed recurring items. Only one recurring type is allowed per order.</Value>+ </Resource><Resource Name="ShoppingCart.CannotMixStandardAndAutoshipProducts"><Value>Your cart has standard and auto-ship (recurring) items. Only one product type is allowed per order.</Value></Resource>diff --git a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_110.xml b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_110.xmlindex 57b404cc2..b8c4f064d 100644--- a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_110.xml+++ b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_110.xml@@ -270,4 +270,7 @@<Resource Name="Wishlist.AddedToCart"><Value>Added to the cart</Value></Resource>+ <Resource Name="ShoppingCart.CannotMixRecurringProducts">+ <Value>Your cart has mixed recurring items. Only one recurring type is allowed per order.</Value>+ </Resource></Language>\ No newline at end of file