Skip to content

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.

Update Recurring Info

KrzysztofPajaka4ac8a935760
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.cs
index 37318df9b..68a18537b 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("BDB82CDE-7426-49A8-B494-9C31F1374B58");
+ public Guid Identity => new("136CB337-F46C-4228-96C0-2298E2074A90");
public string Name => "Update resource string for english language";
/// <summary>
diff --git a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
index 10e680a3a..cdbab6b48 100644
--- a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
@@ -790,7 +790,10 @@ namespace Grand.Web.Admin.Services
orderItemModel.AttributeInfo = orderItem.AttributeDescription;
if (product.IsRecurring)
- orderItemModel.RecurringInfo = string.Format(_translationService.GetResource("Admin.Orders.Products.RecurringPeriod"), product.RecurringCycleLength, product.RecurringCyclePeriodId.GetTranslationEnum(_translationService, _workContext));
+ orderItemModel.RecurringInfo = string.Format(_translationService.GetResource("Admin.Orders.Products.RecurringPeriod"),
+ product.RecurringCycleLength,
+ product.RecurringCyclePeriodId.GetTranslationEnum(_translationService, _workContext),
+ product.RecurringTotalCycles);
//merchandise returns
orderItemModel.MerchandiseReturnIds = (await _merchandiseReturnService.SearchMerchandiseReturns(orderItemId: orderItem.Id))
diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
index c1d347886..6332a5a95 100644
--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
@@ -9599,7 +9599,7 @@
<Value>Quantity</Value>
</Resource>
<Resource Name="Admin.Orders.Products.RecurringPeriod">
- <Value>[Auto-ship, Every {0} {1}]</Value>
+ <Value>[Auto-ship, Every {0} {1} ({2})]</Value>
</Resource>
<Resource Name="Admin.Orders.Products.SKU">
<Value>SKU</Value>
@@ -16195,7 +16195,7 @@
<Value>Enter valid recipient name</Value>
</Resource>
<Resource Name="ShoppingCart.RecurringPeriod">
- <Value>[Auto-ship, Every {0} {1}]</Value>
+ <Value>[Auto-ship, Every {0} {1} ({2})]</Value>
</Resource>
<Resource Name="ShoppingCart.Remove">
<Value>Remove</Value>
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.xml
index b8c4f064d..de9da96a3 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
@@ -273,4 +273,10 @@
<Resource Name="ShoppingCart.CannotMixRecurringProducts">
<Value>Your cart has mixed recurring items. Only one recurring type is allowed per order.</Value>
</Resource>
+ <Resource Name="ShoppingCart.RecurringPeriod">
+ <Value>[Auto-ship, Every {0} {1} ({2})]</Value>
+ </Resource>
+ <Resource Name="Admin.Orders.Products.RecurringPeriod">
+ <Value>[Auto-ship, Every {0} {1} ({2})]</Value>
+ </Resource>
</Language>
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
index fd6ec44c4..ac75dee07 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
@@ -389,7 +389,10 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
//recurring info
if (product.IsRecurring)
- cartItemModel.RecurringInfo = string.Format(_translationService.GetResource("ShoppingCart.RecurringPeriod"), product.RecurringCycleLength, product.RecurringCyclePeriodId.GetTranslationEnum(_translationService, request.Language.Id));
+ cartItemModel.RecurringInfo = string.Format(_translationService.GetResource("ShoppingCart.RecurringPeriod"),
+ product.RecurringCycleLength,
+ product.RecurringCyclePeriodId.GetTranslationEnum(_translationService, request.Language.Id),
+ product.RecurringTotalCycles);
//reservation info
if (product.ProductTypeId == ProductType.Reservation)
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
index 836886ffc..32cee7d5a 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
@@ -151,7 +151,10 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
//recurring info
if (product.IsRecurring)
- cartItemModel.RecurringInfo = string.Format(_translationService.GetResource("ShoppingCart.RecurringPeriod"), product.RecurringCycleLength, product.RecurringCyclePeriodId.GetTranslationEnum(_translationService, request.Language.Id));
+ cartItemModel.RecurringInfo = string.Format(_translationService.GetResource("ShoppingCart.RecurringPeriod"),
+ product.RecurringCycleLength,
+ product.RecurringCyclePeriodId.GetTranslationEnum(_translationService, request.Language.Id),
+ product.RecurringTotalCycles);
//unit prices
if (product.CallForPrice)