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
Allow to limit gift vouchers to the store
KrzysztofPajak8a77eb30d276
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.csindex 54a6dff54..04a96b75a 100644--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs@@ -774,10 +774,10 @@ namespace Grand.Business.Checkout.Commands.Handlers.Ordersprotected virtual async Task GenerateGiftVoucher(PlaceOrderContainter details, ShoppingCartItem sc, Order order, OrderItem orderItem, Product product){_productAttributeParser.GetGiftVoucherAttribute(sc.Attributes,- out string giftVoucherRecipientName, out string giftVoucherRecipientEmail,- out string giftVoucherSenderName, out string giftVoucherSenderEmail, out string giftVoucherMessage);+ out var giftVoucherRecipientName, out var giftVoucherRecipientEmail,+ out var giftVoucherSenderName, out var giftVoucherSenderEmail, out var giftVoucherMessage);- for (int i = 0; i < sc.Quantity; i++)+ for (var i = 0; i < sc.Quantity; i++){var amount = orderItem.UnitPriceInclTax;if (product.OverGiftAmount.HasValue)@@ -797,6 +797,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.OrdersSenderEmail = giftVoucherSenderEmail,Message = giftVoucherMessage,IsRecipientNotified = false,+ StoreId = _orderSettings.GiftVouchers_Assign_StoreId ? _workContext.CurrentStore.Id : string.Empty,CreatedOnUtc = DateTime.UtcNow};await _giftVoucherService.InsertGiftVoucher(gc);diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.csindex 99bf15803..52a88d9d9 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs@@ -19,6 +19,7 @@ using Grand.Domain.Directory;using Grand.Domain.Discounts;using Grand.Domain.Orders;using Grand.Domain.Shipping;+using Grand.Domain.Stores;using Grand.Domain.Tax;using Grand.Infrastructure;using Grand.SharedKernel;@@ -257,7 +258,7 @@ namespace Grand.Business.Checkout.Services.Orders/// </summary>/// <param name="customer">Customer</param>/// <returns>Active gift vouchers</returns>- private async Task<IList<GiftVoucher>> GetActiveGiftVouchers(Customer customer, Currency currency)+ private async Task<IList<GiftVoucher>> GetActiveGiftVouchers(Customer customer, Currency currency, Store store){var result = new List<GiftVoucher>();if (customer == null)@@ -269,7 +270,7 @@ namespace Grand.Business.Checkout.Services.Ordersvar giftVouchers = await _giftVoucherService.GetAllGiftVouchers(isGiftVoucherActivated: true, giftVoucherCouponCode: couponCode);foreach (var gc in giftVouchers){- if (gc.IsGiftVoucherValid(currency))+ if (gc.IsGiftVoucherValid(currency, store))result.Add(gc);}}@@ -885,7 +886,7 @@ namespace Grand.Business.Checkout.Services.Ordersvar appliedGiftVouchers = new List<AppliedGiftVoucher>();//we don't apply gift vouchers for recurring products- var giftVouchers = await GetActiveGiftVouchers(customer, _workContext.WorkingCurrency);+ var giftVouchers = await GetActiveGiftVouchers(customer, _workContext.WorkingCurrency, _workContext.CurrentStore);if (giftVouchers != null)foreach (var gc in giftVouchers)if (resultTemp > 0)diff --git a/src/Core/Grand.Domain/Orders/GiftVoucher.cs b/src/Core/Grand.Domain/Orders/GiftVoucher.csindex 8331abb09..a76e46357 100644--- a/src/Core/Grand.Domain/Orders/GiftVoucher.cs+++ b/src/Core/Grand.Domain/Orders/GiftVoucher.cs@@ -66,6 +66,11 @@ namespace Grand.Domain.Orders/// </summary>public bool IsRecipientNotified { get; set; }+ /// <summary>+ /// Gets or sets the store identifier+ /// </summary>+ public string StoreId { get; set; }+/// <summary>/// Gets or sets the date and time of instance creation/// </summary>diff --git a/src/Core/Grand.Domain/Orders/GiftVoucherExtensions.cs b/src/Core/Grand.Domain/Orders/GiftVoucherExtensions.csindex 58f2c9cfd..aadd182a9 100644--- a/src/Core/Grand.Domain/Orders/GiftVoucherExtensions.cs+++ b/src/Core/Grand.Domain/Orders/GiftVoucherExtensions.cs@@ -1,4 +1,5 @@using Grand.Domain.Directory;+using Grand.Domain.Stores;namespace Grand.Domain.Orders{@@ -28,8 +29,10 @@ namespace Grand.Domain.Orders/// Is gift voucher valid/// </summary>/// <param name="giftVoucher">Gift voucher</param>+ /// <param name="currency">Currency</param>+ /// <param name="store">Store</param>/// <returns>Result</returns>- public static bool IsGiftVoucherValid(this GiftVoucher giftVoucher, Currency currency)+ public static bool IsGiftVoucherValid(this GiftVoucher giftVoucher, Currency currency, Store store){if (!giftVoucher.IsGiftVoucherActivated)return false;@@ -40,6 +43,9 @@ namespace Grand.Domain.Ordersif(giftVoucher.ValidTo.HasValue && giftVoucher.ValidTo.Value <= System.DateTime.UtcNow)return false;+ if(!string.IsNullOrEmpty(giftVoucher.StoreId) && giftVoucher.StoreId!=store.Id)+ return false;+double remainingAmount = giftVoucher.GetGiftVoucherRemainingAmount();if (remainingAmount > 0)return true;diff --git a/src/Core/Grand.Domain/Orders/OrderSettings.cs b/src/Core/Grand.Domain/Orders/OrderSettings.csindex 1befe28f6..52316d61a 100644--- a/src/Core/Grand.Domain/Orders/OrderSettings.cs+++ b/src/Core/Grand.Domain/Orders/OrderSettings.cs@@ -99,6 +99,12 @@ namespace Grand.Domain.Orders/// Gets or sets a value indicating whether to deactivate related gift vouchers after deleting the order/// </summary>public bool DeactivateGiftVouchersAfterDeletingOrder { get; set; }++ /// <summary>+ /// Gift vouchers are assigned to the current store+ /// </summary>+ public bool GiftVouchers_Assign_StoreId { get; set; }+/// <summary>/// Gets or sets an order placement interval in seconds (prevent 2 orders being placed within an X seconds time frame)./// </summary>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/GiftVoucher/_CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/GiftVoucher/_CreateOrUpdate.TabInfo.cshtmlindex 8faef8180..36d28325b 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/GiftVoucher/_CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/GiftVoucher/_CreateOrUpdate.TabInfo.cshtml@@ -68,6 +68,13 @@</div></div>}+ <div class="form-group">+ <admin-label asp-for="StoreId" class="col-sm-3 control-label" />+ <div class="col-md-9 col-sm-9">+ <admin-select asp-for="StoreId" asp-items="Model.AvailableStores" />+ <span asp-validation-for="StoreId"></span>+ </div>+ </div><div class="form-group"><admin-label asp-for="IsGiftVoucherActivated" /><div class="col-md-9 col-sm-9">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Sales.TabOrderSettings.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Sales.TabOrderSettings.cshtmlindex 3bfd11e71..7a7621890 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Sales.TabOrderSettings.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Sales.TabOrderSettings.cshtml@@ -163,6 +163,18 @@<span asp-validation-for="OrderSettings.DeactivateGiftVouchersAfterDeletingOrder"></span></div></div>+ <div class="form-group">+ <div class="col-8 col-md-4 col-sm-4 text-right">+ <admin-label asp-for="OrderSettings.GiftVouchers_Assign_StoreId" class="control-label" />+ </div>+ <div class="col-4 col-md-8 col-sm-8">+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <admin-input asp-for="OrderSettings.GiftVouchers_Assign_StoreId" />+ <div class="control__indicator"></div>+ </label>+ <span asp-validation-for="OrderSettings.GiftVouchers_Assign_StoreId"></span>+ </div>+ </div><div class="form-group"><div class="col-8 col-md-4 col-sm-4 text-right"><admin-label asp-for="OrderSettings.CompleteOrderWhenDelivered" class="control-label" />diff --git a/src/Web/Grand.Web.Admin/Interfaces/IGiftVoucherViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IGiftVoucherViewModelService.csindex 733ed07a0..9d34be755 100644--- a/src/Web/Grand.Web.Admin/Interfaces/IGiftVoucherViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Interfaces/IGiftVoucherViewModelService.cs@@ -8,8 +8,7 @@ namespace Grand.Web.Admin.Interfacespublic interface IGiftVoucherViewModelService{GiftVoucherListModel PrepareGiftVoucherListModel();- Task<GiftVoucherModel> PrepareGiftVoucherModel();- Task<GiftVoucherModel> PrepareGiftVoucherModel(GiftVoucherModel model);+ Task<GiftVoucherModel> PrepareGiftVoucherModel(GiftVoucherModel model = null);Task<(IEnumerable<GiftVoucherModel> giftVoucherModels, int totalCount)> PrepareGiftVoucherModel(GiftVoucherListModel model, int pageIndex, int pageSize);Task<Order> FillGiftVoucherModel(GiftVoucher giftVoucher, GiftVoucherModel model);Task NotifyRecipient(GiftVoucher giftVoucher, GiftVoucherModel model);diff --git a/src/Web/Grand.Web.Admin/Mapper/GiftVoucherProfile.cs b/src/Web/Grand.Web.Admin/Mapper/GiftVoucherProfile.csindex a8b62c85a..f4c1a761a 100644--- a/src/Web/Grand.Web.Admin/Mapper/GiftVoucherProfile.cs+++ b/src/Web/Grand.Web.Admin/Mapper/GiftVoucherProfile.cs@@ -14,6 +14,7 @@ namespace Grand.Web.Admin.Mapper.ForMember(dest => dest.AmountStr, mo => mo.Ignore()).ForMember(dest => dest.RemainingAmountStr, mo => mo.Ignore()).ForMember(dest => dest.AvailableCurrencies, mo => mo.Ignore())+ .ForMember(dest => dest.AvailableStores, mo => mo.Ignore()).ForMember(dest => dest.CreatedOn, mo => mo.Ignore());CreateMap<GiftVoucherModel, GiftVoucher>().ForMember(dest => dest.Id, mo => mo.Ignore())diff --git a/src/Web/Grand.Web.Admin/Models/Orders/GiftVoucherModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/GiftVoucherModel.csindex 9fadc7494..79bf6024c 100644--- a/src/Web/Grand.Web.Admin/Models/Orders/GiftVoucherModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Orders/GiftVoucherModel.cs@@ -12,6 +12,7 @@ namespace Grand.Web.Admin.Models.Orderspublic GiftVoucherModel(){AvailableCurrencies = new List<SelectListItem>();+ AvailableStores = new List<SelectListItem>();}[GrandResourceDisplayName("Admin.GiftVouchers.Fields.GiftVoucherType")]public int GiftVoucherTypeId { get; set; }@@ -27,6 +28,11 @@ namespace Grand.Web.Admin.Models.Orderspublic string CurrencyCode { get; set; }public IList<SelectListItem> AvailableCurrencies { get; set; }+ [GrandResourceDisplayName("Admin.GiftVouchers.Fields.StoreId")]+ public string StoreId { get; set; }++ public IList<SelectListItem> AvailableStores { get; set; }+[GrandResourceDisplayName("Admin.GiftVouchers.Fields.Amount")]public string AmountStr { get; set; }diff --git a/src/Web/Grand.Web.Admin/Models/Settings/SalesSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/SalesSettingsModel.csindex a60e89f81..7c5a8a6a8 100644--- a/src/Web/Grand.Web.Admin/Models/Settings/SalesSettingsModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Settings/SalesSettingsModel.cs@@ -76,7 +76,10 @@ namespace Grand.Web.Admin.Models.Settingspublic bool DeactivateGiftVouchersAfterCancelOrder { get; set; }[GrandResourceDisplayName("Admin.Settings.Order.DeactivateGiftVouchersAfterDeletingOrder")]- public bool DeactivateGiftVouchersAfterDeletingOrder { get; set; }+ public bool DeactivateGiftVouchersAfterDeletingOrder { get; set; }++ [GrandResourceDisplayName("Admin.Settings.Order.GiftVouchers_Assign_StoreId")]+ public bool GiftVouchers_Assign_StoreId { get; set; }[GrandResourceDisplayName("Admin.Settings.Order.CompleteOrderWhenDelivered")]public bool CompleteOrderWhenDelivered { get; set; }diff --git a/src/Web/Grand.Web.Admin/Services/GiftVoucherViewModelService.cs b/src/Web/Grand.Web.Admin/Services/GiftVoucherViewModelService.csindex 33132bb04..4b8a3f5e1 100644--- a/src/Web/Grand.Web.Admin/Services/GiftVoucherViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/GiftVoucherViewModelService.cs@@ -17,6 +17,7 @@ using System.Collections.Generic;using System.Linq;using System.Threading.Tasks;using Microsoft.AspNetCore.Http;+using Grand.Business.Common.Interfaces.Stores;namespace Grand.Web.Admin.Services{@@ -36,6 +37,7 @@ namespace Grand.Web.Admin.Servicesprivate readonly ICustomerActivityService _customerActivityService;private readonly IWorkContext _workContext;private readonly IHttpContextAccessor _httpContextAccessor;+ private readonly IStoreService _storeService;#endregion@@ -49,7 +51,8 @@ namespace Grand.Web.Admin.ServicesLanguageSettings languageSettings,ITranslationService translationService, ILanguageService languageService,ICustomerActivityService customerActivityService, IWorkContext workContext,- IHttpContextAccessor httpContextAccessor)+ IHttpContextAccessor httpContextAccessor,+ IStoreService storeService){_giftVoucherService = giftVoucherService;_orderService = orderService;@@ -63,22 +66,22 @@ namespace Grand.Web.Admin.Services_customerActivityService = customerActivityService;_workContext = workContext;_httpContextAccessor = httpContextAccessor;+ _storeService = storeService;}#endregion- public virtual async Task<GiftVoucherModel> PrepareGiftVoucherModel()- {- var model = new GiftVoucherModel();- foreach (var currency in await _currencyService.GetAllCurrencies())- model.AvailableCurrencies.Add(new SelectListItem { Text = currency.Name, Value = currency.CurrencyCode });- return model;- }- public virtual async Task<GiftVoucherModel> PrepareGiftVoucherModel(GiftVoucherModel model)+ public virtual async Task<GiftVoucherModel> PrepareGiftVoucherModel(GiftVoucherModel model = null){+ model ??= new GiftVoucherModel();+foreach (var currency in await _currencyService.GetAllCurrencies())model.AvailableCurrencies.Add(new SelectListItem { Text = currency.Name, Value = currency.CurrencyCode });+ model.AvailableStores.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });+ foreach (var s in (await _storeService.GetAllStores()))+ model.AvailableStores.Add(new SelectListItem { Text = s.Shortcut, Value = s.Id.ToString() });+return model;}@@ -209,6 +212,7 @@ namespace Grand.Web.Admin.Servicespublic virtual async Task<GiftVoucherModel> PrepareGiftVoucherModel(GiftVoucher giftVoucher){var model = giftVoucher.ToModel(_dateTimeService);+ model = await PrepareGiftVoucherModel(model);Order order = null;if (giftVoucher.PurchasedWithOrderItem != null)order = await _orderService.GetOrderByOrderItemId(giftVoucher.PurchasedWithOrderItem.Id);diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex 1fc80dc89..621e1f699 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -8020,6 +8020,9 @@<Resource Name="Admin.GiftVouchers.Fields.SenderEmail"><Value>Sender's Email</Value></Resource>+ <Resource Name="Admin.GiftVouchers.Fields.StoreId">+ <Value>Store</Value>+ </Resource><Resource Name="Admin.GiftVouchers.Fields.SenderName"><Value>Sender's Name</Value></Resource>@@ -11697,6 +11700,9 @@<Resource Name="Admin.Settings.Order.GiftVouchers_Activated.Pending"><Value>Order status could not be set to Pending</Value></Resource>+ <Resource Name="Admin.Settings.Order.GiftVouchers_Assign_StoreId">+ <Value>Gift voucher assign to the current store</Value>+ </Resource><Resource Name="Admin.Settings.Order.IsReOrderAllowed"><Value>Is re-order allowed</Value></Resource>diff --git a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs b/src/Web/Grand.Web/Controllers/ShoppingCartController.csindex faa4b6c53..0b1509440 100644--- a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs+++ b/src/Web/Grand.Web/Controllers/ShoppingCartController.cs@@ -631,7 +631,9 @@ namespace Grand.Web.Controllersif (!string.IsNullOrWhiteSpace(giftvouchercouponcode)){var giftVoucher = (await _mediator.Send(new GetGiftVoucherQuery() { Code = giftvouchercouponcode, IsGiftVoucherActivated = true })).FirstOrDefault();- bool isGiftVoucherValid = giftVoucher != null && giftVoucher.IsGiftVoucherValid(_workContext.WorkingCurrency);+ var isGiftVoucherValid = giftVoucher != null+ && giftVoucher.IsGiftVoucherValid(_workContext.WorkingCurrency, _workContext.CurrentStore);+if (isGiftVoucherValid){var result = _workContext.CurrentCustomer.ApplyCouponCode(SystemCustomerFieldNames.GiftVoucherCoupons, giftvouchercouponcode.Trim().ToLower());