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.

Add store-scoped discount management to Grand.Web.Store (#706)

Copilotd80527f21e46
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 1e7e528b7..bfb6469e1 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -11,16 +11,16 @@
<PackageVersion Include="Scalar.AspNetCore" Version="2.14.14" />
<PackageVersion Include="Scryber.Core" Version="9.5.0" />
<PackageVersion Include="Scryber.Core.OpenType" Version="9.2.0" />
- <PackageVersion Include="MailKit" Version="4.16.0" />
- <PackageVersion Include="AWSSDK.Core" Version="4.0.7.1" />
- <PackageVersion Include="AWSSDK.S3" Version="4.0.23.3" />
+ <PackageVersion Include="MailKit" Version="4.17.0" />
+ <PackageVersion Include="AWSSDK.Core" Version="4.0.7.5" />
+ <PackageVersion Include="AWSSDK.S3" Version="4.0.24" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.28.0" />
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.12" />
- <PackageVersion Include="SkiaSharp" Version="3.119.2" />
- <PackageVersion Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.2" />
+ <PackageVersion Include="SkiaSharp" Version="3.119.4" />
+ <PackageVersion Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.4" />
<PackageVersion Include="LiteDB" Version="5.0.21" />
- <PackageVersion Include="MongoDB.Bson" Version="3.8.1" />
- <PackageVersion Include="MongoDB.Driver" Version="3.8.1" />
+ <PackageVersion Include="MongoDB.Bson" Version="3.9.0" />
+ <PackageVersion Include="MongoDB.Driver" Version="3.9.0" />
<PackageVersion Include="DotLiquid" Version="2.3.197" />
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1" />
<PackageVersion Include="GoogleAuthenticator" Version="3.2.0" />
@@ -33,7 +33,7 @@
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.3.0" />
<PackageVersion Include="MediatR" Version="12.5.0" />
<PackageVersion Include="Scrutor" Version="7.0.0" />
- <PackageVersion Include="StackExchange.Redis" Version="2.13.1" />
+ <PackageVersion Include="StackExchange.Redis" Version="2.13.17" />
<PackageVersion Include="FluentValidation" Version="12.1.1" />
<PackageVersion Include="Microsoft.AspNetCore.JsonPatch.SystemTextJson" Version="10.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="10.0.8" />
@@ -55,15 +55,15 @@
<PackageVersion Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.3.1" />
<PackageVersion Include="Wangkanai.Detection" Version="8.20.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.8" />
- <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
+ <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="MSTest.TestAdapter" Version="4.2.3" />
<PackageVersion Include="MSTest.TestFramework" Version="4.2.3" />
- <PackageVersion Include="coverlet.collector" Version="10.0.0" />
- <PackageVersion Include="NUnit" Version="4.6.0" />
- <PackageVersion Include="Verify.MSTest" Version="31.16.3" />
- <PackageVersion Include="Aspire.Hosting.AppHost" Version="13.3.3" />
- <PackageVersion Include="Aspire.Hosting.MongoDB" Version="13.3.3" />
+ <PackageVersion Include="coverlet.collector" Version="10.0.1" />
+ <PackageVersion Include="NUnit" Version="4.6.1" />
+ <PackageVersion Include="Verify.MSTest" Version="31.19.0" />
+ <PackageVersion Include="Aspire.Hosting.AppHost" Version="13.4.1" />
+ <PackageVersion Include="Aspire.Hosting.MongoDB" Version="13.4.1" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.6.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.6.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
@@ -75,7 +75,7 @@
<PackageVersion Include="Aspire.Hosting.Orchestration.$(NETCoreSdkRuntimeIdentifier)" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
- <PackageVersion Update="Aspire.Dashboard.Sdk.win-x64" Version="13.3.3" />
- <PackageVersion Update="Aspire.Hosting.Orchestration.win-x64" Version="13.3.3" />
+ <PackageVersion Update="Aspire.Dashboard.Sdk.win-x64" Version="13.4.1" />
+ <PackageVersion Update="Aspire.Hosting.Orchestration.win-x64" Version="13.4.1" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Plugins/DiscountRules.Standard/Controllers/BaseDiscountRulePluginController.cs b/src/Plugins/DiscountRules.Standard/Controllers/BaseDiscountRulePluginController.cs
new file mode 100644
index 000000000..806f0fc74
--- /dev/null
+++ b/src/Plugins/DiscountRules.Standard/Controllers/BaseDiscountRulePluginController.cs
@@ -0,0 +1,9 @@
+using Grand.Web.Common.Controllers;
+using Grand.Web.Common.Filters;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DiscountRules.Standard.Controllers;
+
+[AuthorizeAdminOrStore]
+[AutoValidateAntiforgeryToken]
+public abstract class BaseDiscountRulePluginController : BaseController;
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesCustomerGroupsController.cs
similarity index 94%
rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
rename to src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesCustomerGroupsController.cs
index 375e4362a..f4c836c94 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
+++ b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesCustomerGroupsController.cs
@@ -1,22 +1,21 @@
-using DiscountRules.Standard.Models;
+using DiscountRules.Standard.Models;
using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Discounts;
-using Grand.Web.Common.Controllers;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-namespace DiscountRules.Standard.Areas.Admin.Controllers;
+namespace DiscountRules.Standard.Controllers;
-public class CustomerGroupsController : BaseAdminPluginController
+public class DiscountRulesCustomerGroupsController : BaseDiscountRulePluginController
{
private readonly IDiscountService _discountService;
private readonly IGroupService _groupService;
private readonly IPermissionService _permissionService;
- public CustomerGroupsController(
+ public DiscountRulesCustomerGroupsController(
IDiscountService discountService,
IGroupService groupService,
IPermissionService permissionService)
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHadSpentAmountController.cs
similarity index 93%
rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
rename to src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHadSpentAmountController.cs
index 2a0372642..818f39afc 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
+++ b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHadSpentAmountController.cs
@@ -1,20 +1,19 @@
-using DiscountRules.Standard.Models;
+using DiscountRules.Standard.Models;
using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Discounts;
-using Grand.Web.Common.Controllers;
using Microsoft.AspNetCore.Mvc;
using System.Globalization;
-namespace DiscountRules.Standard.Areas.Admin.Controllers;
+namespace DiscountRules.Standard.Controllers;
-public class HadSpentAmountController : BaseAdminPluginController
+public class DiscountRulesHadSpentAmountController : BaseDiscountRulePluginController
{
private readonly IDiscountService _discountService;
private readonly IPermissionService _permissionService;
- public HadSpentAmountController(
+ public DiscountRulesHadSpentAmountController(
IDiscountService discountService,
IPermissionService permissionService)
{
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHasAllProductsController.cs
similarity index 86%
rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
rename to src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHasAllProductsController.cs
index 0d7f5fc4f..16c754fec 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
+++ b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHasAllProductsController.cs
@@ -1,4 +1,4 @@
-using DiscountRules.Standard.Models;
+using DiscountRules.Standard.Models;
using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
@@ -9,15 +9,14 @@ using Grand.Domain.Catalog;
using Grand.Domain.Discounts;
using Grand.Domain.Permissions;
using Grand.Infrastructure;
-using Grand.Web.Common.Controllers;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Localization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-namespace DiscountRules.Standard.Areas.Admin.Controllers;
+namespace DiscountRules.Standard.Controllers;
-public class HasAllProductsController : BaseAdminPluginController
+public class DiscountRulesHasAllProductsController : BaseDiscountRulePluginController
{
private readonly IDiscountService _discountService;
private readonly IPermissionService _permissionService;
@@ -28,8 +27,8 @@ public class HasAllProductsController : BaseAdminPluginController
private readonly IContextAccessor _contextAccessor;
private readonly IEnumTranslationService _enumTranslationService;
-
- public HasAllProductsController(IDiscountService discountService,
+ private string CurrentStoreId => _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
+ public DiscountRulesHasAllProductsController(IDiscountService discountService,
IPermissionService permissionService,
IContextAccessor contextAccessor,
ITranslationService translationService,
@@ -127,22 +126,30 @@ public class HasAllProductsController : BaseAdminPluginController
IsLoggedInAsVendor = _contextAccessor.WorkContext.CurrentVendor != null
};
- //stores
- 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 });
-
- //vendors
- model.AvailableVendors.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });
- foreach (var v in await _vendorService.GetAllVendors(showHidden: true))
- model.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });
+ //stores - when acting as a store manager, scope to their store
+ if (!string.IsNullOrEmpty(CurrentStoreId))
+ {
+ var store = await _storeService.GetStoreById(CurrentStoreId);
+ if (store != null)
+ model.AvailableStores.Add(new SelectListItem { Text = store.Shortcut, Value = store.Id });
+ }
+ else
+ {
+ 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 });
+
+ //vendors (only shown to admins)
+ model.AvailableVendors.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });
+ foreach (var v in await _vendorService.GetAllVendors(showHidden: true))
+ model.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });
+ }
//product types
model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList();
model.AvailableProductTypes.Insert(0,
new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });
-
ViewBag.productIdsInput = productIdsInput;
ViewBag.btnId = btnId;
@@ -159,6 +166,9 @@ public class HasAllProductsController : BaseAdminPluginController
//a vendor should have access only to his products
if (_contextAccessor.WorkContext.CurrentVendor != null) model.SearchVendorId = _contextAccessor.WorkContext.CurrentVendor.Id;
+ //a store manager should only search within their store
+ if (!string.IsNullOrEmpty(CurrentStoreId)) model.SearchStoreId = CurrentStoreId;
+
var searchCategoryIds = new List<string>();
if (!string.IsNullOrEmpty(model.SearchCategoryId))
searchCategoryIds.Add(model.SearchCategoryId);
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHasOneProductController.cs
similarity index 85%
rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
rename to src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHasOneProductController.cs
index 2c4d74dd7..b214e08ad 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
+++ b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHasOneProductController.cs
@@ -1,4 +1,4 @@
-using DiscountRules.Standard.Models;
+using DiscountRules.Standard.Models;
using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
@@ -10,15 +10,14 @@ using Grand.Domain.Discounts;
using Grand.Domain.Permissions;
using Grand.Domain.Vendors;
using Grand.Infrastructure;
-using Grand.Web.Common.Controllers;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Localization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-namespace DiscountRules.Standard.Areas.Admin.Controllers;
+namespace DiscountRules.Standard.Controllers;
-public class HasOneProductController : BaseAdminPluginController
+public class DiscountRulesHasOneProductController : BaseDiscountRulePluginController
{
private readonly IDiscountService _discountService;
private readonly IPermissionService _permissionService;
@@ -30,8 +29,9 @@ public class HasOneProductController : BaseAdminPluginController
private readonly IEnumTranslationService _enumTranslationService;
private Vendor CurrentVendor => _contextAccessor.WorkContext.CurrentVendor;
+ private string CurrentStoreId => _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
- public HasOneProductController(IDiscountService discountService,
+ public DiscountRulesHasOneProductController(IDiscountService discountService,
IPermissionService permissionService,
IContextAccessor contextAccessor,
ITranslationService translationService,
@@ -138,15 +138,24 @@ public class HasOneProductController : BaseAdminPluginController
IsLoggedInAsVendor = CurrentVendor != null
};
- //stores
- 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 });
-
- //vendors
- model.AvailableVendors.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });
- foreach (var v in await _vendorService.GetAllVendors(showHidden: true))
- model.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });
+ //stores - when acting as a store manager, scope to their store
+ if (!string.IsNullOrEmpty(CurrentStoreId))
+ {
+ var store = await _storeService.GetStoreById(CurrentStoreId);
+ if (store != null)
+ model.AvailableStores.Add(new SelectListItem { Text = store.Shortcut, Value = store.Id });
+ }
+ else
+ {
+ 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 });
+
+ //vendors (only shown to admins)
+ model.AvailableVendors.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });
+ foreach (var v in await _vendorService.GetAllVendors(showHidden: true))
+ model.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });
+ }
//product types
model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList();
@@ -169,6 +178,8 @@ public class HasOneProductController : BaseAdminPluginController
//a vendor should have access only to his products
if (CurrentVendor != null) model.SearchVendorId = CurrentVendor.Id;
+ //a store manager should only search within their store
+ if (!string.IsNullOrEmpty(CurrentStoreId)) model.SearchStoreId = CurrentStoreId;
var searchCategoryIds = new List<string>();
if (!string.IsNullOrEmpty(model.SearchCategoryId))
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesShoppingCartAmountController.cs
similarity index 92%
rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
rename to src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesShoppingCartAmountController.cs
index 99d1b911f..c047ba4ef 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
+++ b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesShoppingCartAmountController.cs
@@ -1,20 +1,19 @@
-using DiscountRules.Standard.Models;
+using DiscountRules.Standard.Models;
using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Discounts;
-using Grand.Web.Common.Controllers;
using Microsoft.AspNetCore.Mvc;
using System.Globalization;
-namespace DiscountRules.Standard.Areas.Admin.Controllers;
+namespace DiscountRules.Standard.Controllers;
-public class ShoppingCartAmountController : BaseAdminPluginController
+public class DiscountRulesShoppingCartAmountController : BaseDiscountRulePluginController
{
private readonly IDiscountService _discountService;
private readonly IPermissionService _permissionService;
- public ShoppingCartAmountController(IDiscountService discountService,
+ public DiscountRulesShoppingCartAmountController(IDiscountService discountService,
IPermissionService permissionService)
{
_discountService = discountService;
diff --git a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj
index c130e63e8..d99106c54 100644
--- a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj
+++ b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj
@@ -44,5 +44,5 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
-
+
</Project>
\ No newline at end of file
diff --git a/src/Plugins/DiscountRules.Standard/EndpointProvider.cs b/src/Plugins/DiscountRules.Standard/EndpointProvider.cs
index 47cbed67c..c218ded62 100644
--- a/src/Plugins/DiscountRules.Standard/EndpointProvider.cs
+++ b/src/Plugins/DiscountRules.Standard/EndpointProvider.cs
@@ -10,50 +10,56 @@ public class EndpointProvider : IEndpointProvider
{
//CustomerGroups
endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.CustomerGroups.Configure",
- "Admin/CustomerGroups/Configure",
- new { controller = "CustomerGroups", action = "Configure" }
+ "DiscountRulesCustomerGroups/Configure",
+ new { controller = "DiscountRulesCustomerGroups", action = "Configure" }
);
//HadSpentAmount
endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HadSpentAmount.Configure",
- "Admin/HadSpentAmount/Configure",
- new { controller = "HadSpentAmount", action = "Configure" }
+ "DiscountRulesHadSpentAmount/Configure",
+ new { controller = "DiscountRulesHadSpentAmount", action = "Configure" }
+ );
+
+ //ShoppingCartAmount
+ endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.ShoppingCartAmount.Configure",
+ "DiscountRulesShoppingCartAmount/Configure",
+ new { controller = "DiscountRulesShoppingCartAmount", action = "Configure" }
);
//HasAllProducts
endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasAllProducts.Configure",
- "Admin/HasAllProducts/Configure",
- new { controller = "HasAllProducts", action = "Configure" }
+ "DiscountRulesHasAllProducts/Configure",
+ new { controller = "DiscountRulesHasAllProducts", action = "Configure" }
);
endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasAllProducts.ProductAddPopup",
- "Admin/HasAllProducts/ProductAddPopup",
- new { controller = "HasAllProducts", action = "ProductAddPopup" }
+ "DiscountRulesHasAllProducts/ProductAddPopup",
+ new { controller = "DiscountRulesHasAllProducts", action = "ProductAddPopup" }
);
endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasAllProducts.ProductAddPopupList",
- "Admin/HasAllProducts/ProductAddPopupList",
- new { controller = "HasAllProducts", action = "ProductAddPopupList" }
+ "DiscountRulesHasAllProducts/ProductAddPopupList",
+ new { controller = "DiscountRulesHasAllProducts", action = "ProductAddPopupList" }
);
endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasAllProducts.LoadProductFriendlyNames",
- "Admin/HasAllProducts/LoadProductFriendlyNames",
- new { controller = "HasAllProducts", action = "LoadProductFriendlyNames" }
+ "DiscountRulesHasAllProducts/LoadProductFriendlyNames",
+ new { controller = "DiscountRulesHasAllProducts", action = "LoadProductFriendlyNames" }
);
//HasOneProduct
endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasOneProduct.Configure",
- "Admin/HasOneProduct/Configure",
- new { controller = "HasOneProduct", action = "Configure" }
+ "DiscountRulesHasOneProduct/Configure",
+ new { controller = "DiscountRulesHasOneProduct", action = "Configure" }
);
endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasOneProduct.ProductAddPopup",
- "Admin/HasOneProduct/ProductAddPopup",
- new { controller = "HasOneProduct", action = "ProductAddPopup" }
+ "DiscountRulesHasOneProduct/ProductAddPopup",
+ new { controller = "DiscountRulesHasOneProduct", action = "ProductAddPopup" }
);
endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasOneProduct.ProductAddPopupList",
- "Admin/HasOneProduct/ProductAddPopupList",
- new { controller = "HasOneProduct", action = "ProductAddPopupList" }
+ "DiscountRulesHasOneProduct/ProductAddPopupList",
+ new { controller = "DiscountRulesHasOneProduct", action = "ProductAddPopupList" }
);
endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasOneProduct.LoadProductFriendlyNames",
- "Admin/HasOneProduct/LoadProductFriendlyNames",
- new { controller = "HasOneProduct", action = "LoadProductFriendlyNames" }
+ "DiscountRulesHasOneProduct/LoadProductFriendlyNames",
+ new { controller = "DiscountRulesHasOneProduct", action = "LoadProductFriendlyNames" }
);
}
diff --git a/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs
index ed6a6293c..d0a62c90c 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs
@@ -41,7 +41,7 @@ public class CustomerGroupDiscountRule : IDiscountRule
public string GetConfigurationUrl(string discountId, string discountRequirementId)
{
//configured
- var result = "Admin/CustomerGroups/Configure/?discountId=" + discountId;
+ var result = $"/DiscountRulesCustomerGroups/Configure/?discountId=" + discountId;
if (!string.IsNullOrEmpty(discountRequirementId))
result += $"&discountRequirementId={discountRequirementId}";
return result;
diff --git a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
index 0e70c5ba8..398948168 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
@@ -65,7 +65,7 @@ public class HadSpentAmountDiscountRule : IDiscountRule
public string GetConfigurationUrl(string discountId, string discountRequirementId)
{
//configured
- var result = "Admin/HadSpentAmount/Configure/?discountId=" + discountId;
+ var result = $"/DiscountRulesHadSpentAmount/Configure/?discountId=" + discountId;
if (!string.IsNullOrEmpty(discountRequirementId))
result += $"&discountRequirementId={discountRequirementId}";
return result;
diff --git a/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs
index d8942dadb..89edd276b 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs
@@ -124,7 +124,7 @@ public class HasAllProductsDiscountRule : IDiscountRule
public string GetConfigurationUrl(string discountId, string discountRequirementId)
{
//configured
- var result = "Admin/HasAllProducts/Configure/?discountId=" + discountId;
+ var result = $"/DiscountRulesHasAllProducts/Configure/?discountId=" + discountId;
if (!string.IsNullOrEmpty(discountRequirementId))
result += $"&discountRequirementId={discountRequirementId}";
return result;
diff --git a/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs
index 0ed59bd6f..5ad908b29 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs
@@ -123,7 +123,7 @@ public class HasOneProductDiscountRule : IDiscountRule
public string GetConfigurationUrl(string discountId, string discountRequirementId)
{
//configured
- var result = "Admin/HasOneProduct/Configure/?discountId=" + discountId;
+ var result = $"/DiscountRulesHasOneProduct/Configure/?discountId=" + discountId;
if (!string.IsNullOrEmpty(discountRequirementId))
result += $"&discountRequirementId={discountRequirementId}";
return result;
diff --git a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs
index b5c6c166b..9b584ee8a 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs
@@ -86,7 +86,7 @@ public class ShoppingCartDiscountRule : IDiscountRule
public string GetConfigurationUrl(string discountId, string discountRequirementId)
{
//configured
- var result = "Admin/ShoppingCartAmount/Configure/?discountId=" + discountId;
+ var result = $"/DiscountRulesShoppingCartAmount/Configure/?discountId=" + discountId;
if (!string.IsNullOrEmpty(discountRequirementId))
result += $"&discountRequirementId={discountRequirementId}";
return result;
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/CustomerGroups/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesCustomerGroups/Configure.cshtml
similarity index 96%
rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/CustomerGroups/Configure.cshtml
rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesCustomerGroups/Configure.cshtml
index 6625a1b6f..af9bc57e5 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/CustomerGroups/Configure.cshtml
+++ b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesCustomerGroups/Configure.cshtml
@@ -23,7 +23,7 @@
$.ajax({
cache:false,
type: "POST",
- url: "@Url.Action("Configure", "CustomerGroups")",
+ url: "@Url.Action("Configure", "DiscountRulesCustomerGroups")",
data: postData,
success: function (data) {
$('#pnl-save-requirement-result@(Model.RequirementId)').fadeIn("slow").delay(1000).fadeOut("slow");
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HadSpentAmount/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHadSpentAmount/Configure.cshtml
similarity index 96%
rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HadSpentAmount/Configure.cshtml
rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesHadSpentAmount/Configure.cshtml
index 1ac04e3dc..4000e88a4 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HadSpentAmount/Configure.cshtml
+++ b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHadSpentAmount/Configure.cshtml
@@ -21,7 +21,7 @@
$.ajax({
cache:false,
type: "POST",
- url: "@Url.Action("Configure", "HadSpentAmount")",
+ url: "@Url.Action("Configure", "DiscountRulesHadSpentAmount")",
data: postData,
success: function (data) {
$('#pnl-save-requirement-result@(Model.RequirementId)').fadeIn("slow").delay(1000).fadeOut("slow");
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasAllProducts/Configure.cshtml
similarity index 98%
rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml
rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasAllProducts/Configure.cshtml
index 4dc95039a..905d21e80 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml
+++ b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasAllProducts/Configure.cshtml
@@ -21,7 +21,7 @@
$.ajax({
cache:false,
type: "POST",
- url: "@Url.Action("Configure", "HasAllProducts")",
+ url: "@Url.Action("Configure", "DiscountRulesHasAllProducts")",
data: postData,
success: function (data) {
$('#pnl-save-requirement-result@(Model.RequirementId)').fadeIn("slow").delay(1000).fadeOut("slow");
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasAllProducts/ProductAddPopup.cshtml
similarity index 100%
rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtml
rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasAllProducts/ProductAddPopup.cshtml
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasOneProduct/Configure.cshtml
similarity index 98%
rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml
rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasOneProduct/Configure.cshtml
index 55b30a880..659ea5b18 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml
+++ b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasOneProduct/Configure.cshtml
@@ -21,7 +21,7 @@
$.ajax({
cache:false,
type: "POST",
- url: "@Url.Action("Configure", "HasOneProduct")",
+ url: "@Url.Action("Configure", "DiscountRulesHasOneProduct")",
data: postData,
success: function (data) {
$('#pnl-save-requirement-result@(Model.RequirementId)').fadeIn("slow").delay(1000).fadeOut("slow");
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasOneProduct/ProductAddPopup.cshtml
similarity index 98%
rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml
rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasOneProduct/ProductAddPopup.cshtml
index fc917a7ee..9c4fcbb07 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml
+++ b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasOneProduct/ProductAddPopup.cshtml
@@ -8,7 +8,7 @@
//page title
ViewBag.Title = Loc["Plugins.DiscountRules.HasOneProduct.Fields.Products.Choose"];
}
-<form id="ProductAddPopup" asp-controller="HasOneProduct" asp-action="ProductAddPopup" method="post">
+<form id="ProductAddPopup" asp-controller="DiscountRulesHasOneProduct" asp-action="ProductAddPopup" method="post">
<div class="row">
<div class="col-md-12">
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/ShoppingCartAmount/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesShoppingCartAmount/Configure.cshtml
similarity index 95%
rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/ShoppingCartAmount/Configure.cshtml
rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesShoppingCartAmount/Configure.cshtml
index 3b7e2f03e..d7adccaab 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/ShoppingCartAmount/Configure.cshtml
+++ b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesShoppingCartAmount/Configure.cshtml
@@ -12,7 +12,7 @@
$.ajax({
cache:false,
type: "POST",
- url: "@Url.Action("Configure", "ShoppingCartAmount")",
+ url: "@Url.Action("Configure", "DiscountRulesShoppingCartAmount")",
data: { "discountId": discountId, "discountRequirementId": requirementId, "spentAmount": spentAmount },
success: function (data) {
$('#pnl-save-requirement-result@(Model.RequirementId)').fadeIn("slow").delay(1000).fadeOut("slow");
diff --git a/src/Plugins/DiscountRules.Standard/Views/_ViewImports.cshtml b/src/Plugins/DiscountRules.Standard/Views/_ViewImports.cshtml
new file mode 100644
index 000000000..44d7f0eae
--- /dev/null
+++ b/src/Plugins/DiscountRules.Standard/Views/_ViewImports.cshtml
@@ -0,0 +1,11 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Grand.Web.Common
+@addTagHelper *, Grand.Web
+
+@using Microsoft.AspNetCore.Mvc.ViewFeatures
+@using Grand.Infrastructure.Extensions
+@using Grand.Web.Common
+@using Grand.Web.Common.Localization
+@using Grand.Web.Common.Page
+
+@inject LocService Loc
\ No newline at end of file
diff --git a/src/Web/Grand.Web.AdminShared/Services/DiscountViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/DiscountViewModelService.cs
index 8873e089c..5075c9d92 100644
--- a/src/Web/Grand.Web.AdminShared/Services/DiscountViewModelService.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/DiscountViewModelService.cs
@@ -250,10 +250,7 @@ public class DiscountViewModelService : IDiscountViewModelService
ArgumentNullException.ThrowIfNull(discountRequirementRule);
ArgumentNullException.ThrowIfNull(discount);
- var storeLocation = _contextAccessor.StoreContext.CurrentHost.Url.TrimEnd('/');
-
- var url =
- $"{storeLocation}/{discountRequirementRule.GetConfigurationUrl(discount.Id, discountRequirementId)}";
+ var url = discountRequirementRule.GetConfigurationUrl(discount.Id, discountRequirementId);
return url;
}
diff --git a/src/Web/Grand.Web.Common/Filters/AuthorizeAdminOrStoreAttribute.cs b/src/Web/Grand.Web.Common/Filters/AuthorizeAdminOrStoreAttribute.cs
new file mode 100644
index 000000000..0d95cb234
--- /dev/null
+++ b/src/Web/Grand.Web.Common/Filters/AuthorizeAdminOrStoreAttribute.cs
@@ -0,0 +1,96 @@
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Domain.Permissions;
+using Grand.Data;
+using Grand.Domain.Security;
+using Grand.Infrastructure;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+
+namespace Grand.Web.Common.Filters;
+
+/// <summary>
+/// Represents a filter attribute that grants access to users who have access to either
+/// the admin panel (Grand.Web.Admin) or the store manager panel (Grand.Web.Store).
+/// </summary>
+public class AuthorizeAdminOrStoreAttribute : TypeFilterAttribute
+{
+ /// <summary>
+ /// Create instance of the filter attribute
+ /// </summary>
+ /// <param name="ignore">Whether to ignore the execution of filter actions</param>
+ public AuthorizeAdminOrStoreAttribute(bool ignore = false) : base(typeof(AuthorizeAdminOrStoreFilter))
+ {
+ IgnoreFilter = ignore;
+ Arguments = [ignore];
+ }
+
+ public bool IgnoreFilter { get; }
+
+ #region Filter
+
+ private class AuthorizeAdminOrStoreFilter(
+ bool ignoreFilter,
+ IPermissionService permissionService,
+ SecuritySettings securitySettings,
+ IContextAccessor contextAccessor,
+ IGroupService groupService) : IAsyncAuthorizationFilter
+ {
+ #region Methods
+
+ public async Task OnAuthorizationAsync(AuthorizationFilterContext filterContext)
+ {
+ ArgumentNullException.ThrowIfNull(filterContext);
+
+ //check whether this filter has been overridden for the action
+ var actionFilter = filterContext.ActionDescriptor.FilterDescriptors
+ .Where(f => f.Scope == FilterScope.Action)
+ .Select(f => f.Filter).OfType<AuthorizeAdminOrStoreAttribute>().FirstOrDefault();
+
+ if (actionFilter?.IgnoreFilter ?? ignoreFilter)
+ return;
+
+ if (!DataSettingsManager.DatabaseIsInstalled())
+ return;
+
+ var customer = contextAccessor.WorkContext.CurrentCustomer;
+ var isStoreManager = await groupService.IsStoreManager(customer);
+ var hasStaffStore = !string.IsNullOrEmpty(customer.StaffStoreId);
+
+ // Store manager path: user belongs to the store manager group with an active store assignment
+ if (isStoreManager)
+ {
+ if (!hasStaffStore || !await permissionService.Authorize(StandardPermission.ManageAccessStoreManagerPanel))
+ filterContext.Result = new RedirectToRouteResult("StoreLogin", new RouteValueDictionary());
+ return;
+ }
+
+ // Admin path: user is a regular admin (not a vendor)
+ if (!await permissionService.Authorize(StandardPermission.ManageAccessAdminPanel))
+ {
+ filterContext.Result = new RedirectToRouteResult("AdminLogin", new RouteValueDictionary());
+ return;
+ }
+
+ if (await groupService.IsVendor(customer) || contextAccessor.WorkContext.CurrentVendor is not null)
+ {
+ filterContext.Result = new RedirectToRouteResult("AdminLogin", new RouteValueDictionary());
+ return;
+ }
+
+ // IP address restriction check (admin only)
+ var ipAddresses = securitySettings.AdminAreaAllowedIpAddresses;
+ if (ipAddresses == null || !ipAddresses.Any())
+ return;
+
+ var currentIp = filterContext.HttpContext.Connection.RemoteIpAddress?.ToString();
+ if (!ipAddresses.Any(ip => ip.Equals(currentIp, StringComparison.OrdinalIgnoreCase)))
+ filterContext.Result = new RedirectToRouteResult("AdminLogin", new RouteValueDictionary());
+ }
+
+ #endregion
+ }
+
+ #endregion
+}
diff --git a/src/Web/Grand.Web.Common/Filters/AuthorizeStoreAttribute.cs b/src/Web/Grand.Web.Common/Filters/AuthorizeStoreAttribute.cs
index 0a1c98912..f6d0effab 100644
--- a/src/Web/Grand.Web.Common/Filters/AuthorizeStoreAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/AuthorizeStoreAttribute.cs
@@ -50,9 +50,9 @@ public class AuthorizeStoreAttribute : TypeFilterAttribute
//check whether this filter has been overridden for the Action
var actionFilter = context.ActionDescriptor.FilterDescriptors
.Where(f => f.Scope == FilterScope.Action)
- .Select(f => f.Filter).OfType<AuthorizeVendorAttribute>().FirstOrDefault();
+ .Select(f => f.Filter).OfType<AuthorizeStoreAttribute>().FirstOrDefault();
- //ignore filter (the action is available even if the current customer isn't a vendor)
+ //ignore filter
if (actionFilter?.IgnoreFilter ?? ignoreFilter)
return;
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/BrandAddPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/BrandAddPopup.cshtml
new file mode 100644
index 000000000..0bd06081d
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/BrandAddPopup.cshtml
@@ -0,0 +1,168 @@
+@model DiscountModel.AddBrandToDiscountModel
+@inject AdminAreaSettings adminAreaSettings
+@{
+ Layout = "";
+ ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToBrands.AddNew"];
+}
+
+<form id="BrandAddPopup" asp-area="@Constants.AreaStore" asp-controller="Discount" asp-action="BrandAddPopup" method="post"
+ asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"
+ asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+ asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
+
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-cubes"></i>
+ @Loc["admin.marketing.Discounts.AppliedToBrands.AddNew"]
+ </div>
+ </div>
+ <div class="x_content form">
+ <div class="form-horizontal">
+ <div class="form-body">
+ <div class="main-header col-12 px-0 mb-3">
+ <div class="row align-items-end">
+ <div class="col-md-8 col-sm-12 col-12">
+ <div class="form-group mb-0">
+ <admin-label asp-for="SearchBrandName" class="control-label"/>
+ <admin-input asp-for="SearchBrandName"/>
+ </div>
+ </div>
+ <div class="col-md-4 col-sm-12 col-12">
+ <div class="form-actions">
+ <div class="btn-group btn-group-devided">
+ <button class="btn btn-success filter-submit" id="search-brands">
+ <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]
+ </button>
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="brands-grid"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ var mfp = $.magnificPopup.instance;
+ $("#BrandAddPopup").submit(function (e) {
+ e.preventDefault();
+ var form = $(this);
+ var url = form.attr('action');
+ $.ajax({
+ type: "POST",
+ url: url,
+ data: form.serialize(),
+ success: function (data) {
+ if (data == "") {
+ mfp.close();
+ $('#btnRefreshBrands').click();
+ } else {
+ $.magnificPopup.open({
+ items: {
+ src: data,
+ type: 'inline'
+ },
+ callbacks: {
+ open: function () {
+ $('.mfp-wrap').removeAttr('tabindex');
+ }
+ }
+ });
+ }
+ }
+ });
+ });
+ $("#brands-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("BrandAddPopupList", "Discount", new { area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: additionalData
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors"
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ this.cancelChanges();
+ },
+ pageSize: @(adminAreaSettings.DefaultGridPageSize),
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ pageSizes: [@(adminAreaSettings.GridPageSizes)]
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "Id",
+ headerTemplate: "<input id='mastercheckbox' type='checkbox'/>",
+ headerAttributes: { style: "text-align:center" },
+ template: "<input type='checkbox' name='SelectedBrandIds' value='#=Id#' class='checkboxGroups' />",
+ attributes: { style: "text-align:center" },
+ width: 50
+ }, {
+ field: "Name",
+ title: "@Loc["Admin.Catalog.Brands.Fields.Name"]"
+ }]
+ });
+
+ $('#search-brands').click(function() {
+ var grid = $('#brands-grid').data('kendoGrid');
+ grid.dataSource.page(1);
+ $('.checkboxGroups').prop('checked', false).change();
+ return false;
+ });
+
+ $("#@Html.IdFor(model => model.SearchBrandName)").keydown(function(event) {
+ if (event.keyCode == 13) {
+ $("#search-brands").click();
+ return false;
+ }
+ });
+
+ //wire up checkboxes
+ $('#mastercheckbox').click(function() {
+ $('.checkboxGroups').prop('checked', $(this).is(':checked')).change();
+ });
+
+ $('#brands-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
+ updateMasterCheckbox();
+ });
+
+ function additionalData() {
+ var data = {
+ SearchBrandName: $('#@Html.IdFor(model => model.SearchBrandName)').val(),
+ };
+ addAntiForgeryToken(data);
+ return data;
+ }
+
+ function updateMasterCheckbox() {
+ var numChkBoxes = $('#brands-grid input[type=checkbox][id!=mastercheckbox]').length;
+ var numChkBoxesChecked = $('#brands-grid input[type=checkbox][id!=mastercheckbox]:checked').length;
+ $('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);
+ }
+ </script>
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CategoryAddPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CategoryAddPopup.cshtml
new file mode 100644
index 000000000..bb6502f1f
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CategoryAddPopup.cshtml
@@ -0,0 +1,175 @@
+@model DiscountModel.AddCategoryToDiscountModel
+@inject AdminAreaSettings adminAreaSettings
+@{
+ Layout = "";
+ ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"];
+}
+
+<form id="CategoryAddPopup" asp-area="@Constants.AreaStore" asp-controller="Discount" asp-action="CategoryAddPopup" method="post"
+ asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"
+ asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+ asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
+
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-cubes"></i>
+ @Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"]
+ </div>
+ </div>
+ <div class="x_content form">
+ <div class="form-horizontal">
+ <div class="form-body">
+ <div class="main-header col-12 px-0 mb-3">
+ <div class="row align-items-end">
+ <div class="col-md-8 col-sm-12 col-12">
+ <div class="form-group mb-0">
+ <admin-label asp-for="SearchCategoryName" class="control-label"/>
+ <admin-input asp-for="SearchCategoryName"/>
+ </div>
+ </div>
+ <div class="col-md-4 col-sm-12 col-12">
+ <div class="form-actions">
+ <div class="btn-group btn-group-devided">
+ <button class="btn btn-success filter-submit" id="search-categories">
+ <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]
+ </button>
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="categories-grid"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ var mfp = $.magnificPopup.instance;
+ $("#CategoryAddPopup").submit(function (e) {
+ e.preventDefault();
+ var form = $(this);
+ var url = form.attr('action');
+ $.ajax({
+ type: "POST",
+ url: url,
+ data: form.serialize(),
+ success: function (data) {
+ if (data == "") {
+ mfp.close();
+ $('#btnRefreshCategories').click();
+ } else {
+ $.magnificPopup.open({
+ items: {
+ src: data,
+ type: 'inline'
+ },
+ callbacks: {
+ open: function () {
+ $('.mfp-wrap').removeAttr('tabindex');
+ }
+ }
+ });
+ }
+ }
+ });
+ });
+ $("#categories-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("CategoryAddPopupList", "Discount", new { area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: additionalData
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors"
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ this.cancelChanges();
+ },
+ pageSize: @(adminAreaSettings.DefaultGridPageSize),
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ pageSizes: [@(adminAreaSettings.GridPageSizes)]
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "Id",
+ headerTemplate: "<input id='mastercheckbox' type='checkbox'/>",
+ headerAttributes: { style: "text-align:center" },
+ template: "<input type='checkbox' name='SelectedCategoryIds' value='#=Id#' class='checkboxGroups' />",
+ attributes: { style: "text-align:center" },
+ width: 50
+ }, {
+ field: "Breadcrumb",
+ title: "@Loc["Admin.Catalog.Categories.Fields.Name"]"
+ }, {
+ field: "Published",
+ title: "@Loc["Admin.Catalog.Categories.Fields.Published"]",
+ width: 100,
+ headerAttributes: { style: "text-align:center" },
+ attributes: { style: "text-align:center" },
+ template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'
+ }]
+ });
+
+ $('#search-categories').click(function() {
+ var grid = $('#categories-grid').data('kendoGrid');
+ grid.dataSource.page(1);
+ $('.checkboxGroups').prop('checked', false).change();
+ return false;
+ });
+
+ $("#@Html.IdFor(model => model.SearchCategoryName)").keydown(function(event) {
+ if (event.keyCode == 13) {
+ $("#search-categories").click();
+ return false;
+ }
+ });
+
+ //wire up checkboxes
+ $('#mastercheckbox').click(function() {
+ $('.checkboxGroups').prop('checked', $(this).is(':checked')).change();
+ });
+
+ $('#categories-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
+ updateMasterCheckbox();
+ });
+
+ function additionalData() {
+ var data = {
+ SearchCategoryName: $('#@Html.IdFor(model => model.SearchCategoryName)').val()
+ };
+ addAntiForgeryToken(data);
+ return data;
+ }
+
+ function updateMasterCheckbox() {
+ var numChkBoxes = $('#categories-grid input[type=checkbox][id!=mastercheckbox]').length;
+ var numChkBoxesChecked = $('#categories-grid input[type=checkbox][id!=mastercheckbox]:checked').length;
+ $('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);
+ }
+ </script>
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CollectionAddPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CollectionAddPopup.cshtml
new file mode 100644
index 000000000..0dac9032c
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CollectionAddPopup.cshtml
@@ -0,0 +1,175 @@
+@model DiscountModel.AddCollectionToDiscountModel
+@inject AdminAreaSettings adminAreaSettings
+@{
+ Layout = "";
+ ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"];
+}
+
+<form id="CollectionAddPopup" asp-area="@Constants.AreaStore" asp-controller="Discount" asp-action="CollectionAddPopup" method="post"
+ asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"
+ asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+ asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
+
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-cubes"></i>
+ @Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"]
+ </div>
+ </div>
+ <div class="x_content form">
+ <div class="form-horizontal">
+ <div class="form-body">
+ <div class="main-header col-12 px-0 mb-3">
+ <div class="row align-items-end">
+ <div class="col-md-8 col-sm-12 col-12">
+ <div class="form-group mb-0">
+ <admin-label asp-for="SearchCollectionName" class="control-label"/>
+ <admin-input asp-for="SearchCollectionName"/>
+ </div>
+ </div>
+ <div class="col-md-4 col-sm-12 col-12">
+ <div class="form-actions">
+ <div class="btn-group btn-group-sm btn-group-devided">
+ <button class="btn btn-success filter-submit" id="search-collections">
+ <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]
+ </button>
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="collections-grid"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ var mfp = $.magnificPopup.instance;
+ $("#CollectionAddPopup").submit(function (e) {
+ e.preventDefault();
+ var form = $(this);
+ var url = form.attr('action');
+ $.ajax({
+ type: "POST",
+ url: url,
+ data: form.serialize(),
+ success: function (data) {
+ if (data == "") {
+ mfp.close();
+ $('#btnRefreshCollections').click();
+ } else {
+ $.magnificPopup.open({
+ items: {
+ src: data,
+ type: 'inline'
+ },
+ callbacks: {
+ open: function () {
+ $('.mfp-wrap').removeAttr('tabindex');
+ }
+ }
+ });
+ }
+ }
+ });
+ });
+ $("#collections-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("CollectionAddPopupList", "Discount", new { area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: additionalData
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors"
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ this.cancelChanges();
+ },
+ pageSize: @(adminAreaSettings.DefaultGridPageSize),
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ pageSizes: [@(adminAreaSettings.GridPageSizes)]
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "Id",
+ headerTemplate: "<input id='mastercheckbox' type='checkbox'/>",
+ headerAttributes: { style: "text-align:center" },
+ template: "<input type='checkbox' name='SelectedCollectionIds' value='#=Id#' class='checkboxGroups' />",
+ attributes: { style: "text-align:center" },
+ width: 50
+ }, {
+ field: "Name",
+ title: "@Loc["Admin.Catalog.Collections.Fields.Name"]"
+ }, {
+ field: "Published",
+ title: "@Loc["Admin.Catalog.Collections.Fields.Published"]",
+ width: 100,
+ headerAttributes: { style: "text-align:center" },
+ attributes: { style: "text-align:center" },
+ template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'
+ }]
+ });
+
+ $('#search-collections').click(function() {
+ var grid = $('#collections-grid').data('kendoGrid');
+ grid.dataSource.page(1);
+ $('.checkboxGroups').prop('checked', false).change();
+ return false;
+ });
+
+ $("#@Html.IdFor(model => model.SearchCollectionName)").keydown(function(event) {
+ if (event.keyCode == 13) {
+ $("#search-collections").click();
+ return false;
+ }
+ });
+
+ //wire up checkboxes
+ $('#mastercheckbox').click(function() {
+ $('.checkboxGroups').prop('checked', $(this).is(':checked')).change();
+ });
+
+ $('#collections-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
+ updateMasterCheckbox();
+ });
+
+ function additionalData() {
+ var data = {
+ SearchCollectionName: $('#@Html.IdFor(model => model.SearchCollectionName)').val()
+ };
+ addAntiForgeryToken(data);
+ return data;
+ }
+
+ function updateMasterCheckbox() {
+ var numChkBoxes = $('#collections-grid input[type=checkbox][id!=mastercheckbox]').length;
+ var numChkBoxesChecked = $('#collections-grid input[type=checkbox][id!=mastercheckbox]:checked').length;
+ $('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);
+ }
+ </script>
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Create.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Create.cshtml
new file mode 100644
index 000000000..3ef7f976a
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Create.cshtml
@@ -0,0 +1,35 @@
+@model DiscountModel
+@{
+ ViewBag.Title = Loc["admin.marketing.Discounts.AddNew"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="Discount" asp-action="Create" method="post" id="discount-form">
+
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-tags"></i>
+ @Loc["admin.marketing.Discounts.AddNew"]
+ <small>
+ <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["admin.marketing.Discounts.BackToList"], "List")
+ </small>
+ </div>
+ <div class="actions">
+ <div class="btn-group btn-group-devided">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ <button class="btn btn-success" type="submit" name="save-continue">
+ <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="x_content form">
+ <partial name="Partials/CreateOrUpdate" model="Model"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Edit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Edit.cshtml
new file mode 100644
index 000000000..3d440744f
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Edit.cshtml
@@ -0,0 +1,39 @@
+@model DiscountModel
+@{
+ ViewBag.Title = Loc["admin.marketing.Discounts.EditDiscountDetails"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="Discount" asp-action="Edit" method="post" id="discount-form">
+
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-tags"></i>
+ @Loc["admin.marketing.Discounts.EditDiscountDetails"] - @Model.Name
+ <small>
+ <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["admin.marketing.Discounts.BackToList"], "List")
+ </small>
+ </div>
+ <div class="actions">
+ <div class="btn-group btn-group-devided">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ <button class="btn btn-success" type="submit" name="save-continue">
+ <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
+ </button>
+ <span id="discount-delete" class="btn red">
+ <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]
+ </span>
+ </div>
+ </div>
+ </div>
+ <div class="x_content form">
+ <partial name="Partials/CreateOrUpdate" model="Model"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
+<admin-delete-confirmation button-id="discount-delete"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/List.cshtml
new file mode 100644
index 000000000..3920812d7
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/List.cshtml
@@ -0,0 +1,169 @@
+@model DiscountListModel
+@inject AdminAreaSettings adminAreaSettings
+@{
+ ViewBag.Title = Loc["admin.marketing.Discounts"];
+}
+
+<div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-tags"></i>
+ @Loc["admin.marketing.Discounts"]
+ </div>
+ <div class="actions btn-group btn-group-devided">
+ <a href="@Url.Action("Create", new { area = Constants.AreaStore })" class="btn green">
+ <i class="fa fa-plus"></i><span class="d-none d-sm-inline"> @Loc["Admin.Common.AddNew"] </span>
+ </a>
+ </div>
+ </div>
+ <div class="x_content form">
+ <div class="form-horizontal">
+ <div class="form-body">
+ <div class="row align-items-end">
+ <div class="col-md-3 col-sm-12 col-12">
+ <div class="form-group mb-0">
+ <admin-label asp-for="SearchDiscountName" class="d-flex flex-column align-items-start mw-100 px-0 text-left"/>
+ <admin-input asp-for="SearchDiscountName"/>
+ </div>
+ </div>
+ <div class="col-md-3 col-sm-12 col-12">
+ <div class="form-group mb-0">
+ <admin-label asp-for="SearchDiscountCouponCode" class="d-flex flex-column align-items-start mw-100 px-0 text-left"/>
+ <admin-input asp-for="SearchDiscountCouponCode"/>
+ </div>
+ </div>
+ <div class="col-md-3 col-sm-12 col-12">
+ <div class="form-group mb-0">
+ <admin-label asp-for="SearchDiscountTypeId" class="d-flex flex-column align-items-start mw-100 px-0 text-left"/>
+ <admin-select asp-for="SearchDiscountTypeId" asp-items="Model.AvailableDiscountTypes"/>
+ </div>
+ </div>
+ <div class="col-md-3 col-sm-12 col-12 mt-md-0 mt-3">
+ <div class="form-actions">
+ <button class="btn btn-success filter-submit" id="search-discounts">
+ <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="x_content">
+ <div id="discounts-grid"></div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script>
+ $(document).ready(function () {
+ $("#discounts-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("List", "Discount", new { area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: additionalData
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors"
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ this.cancelChanges();
+ },
+ pageSize: @(adminAreaSettings.DefaultGridPageSize),
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ pageSizes: [@(adminAreaSettings.GridPageSizes)]
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "Name",
+ title: "@Loc["admin.marketing.Discounts.Fields.Name"]",
+ width: 350,
+ template: '<a class="k-link" href="Edit/#=Id#">#=kendo.htmlEncode(Name)#</a>',
+ }, {
+ field: "DiscountTypeName",
+ title: "@Loc["admin.marketing.Discounts.Fields.DiscountType"]",
+ width: 250
+ }, {
+ field: "DiscountAmount",
+ title: "@Loc["admin.marketing.Discounts.Fields.Discount"]",
+ width: 200,
+ template: '# if(!CalculateByPlugin) { if(UsePercentage) {# #=DiscountPercentage# % #} else {# #=DiscountAmount# #=CurrencyCode# #} } # '
+ }, {
+ field: "StartDate",
+ title: "@Loc["admin.marketing.Discounts.Fields.StartDate"]",
+ width: 200,
+ type: "date",
+ format: "{0:G}"
+ }, {
+ field: "EndDate",
+ title: "@Loc["admin.marketing.Discounts.Fields.EndDate"]",
+ width: 200,
+ type: "date",
+ format: "{0:G}"
+ }, {
+ field: "TimesUsed",
+ title: "@Loc["admin.marketing.Discounts.Fields.TimesUsed"]",
+ width: 200
+ }, {
+ field: "IsEnabled",
+ title: "@Loc["admin.marketing.Discounts.Fields.IsEnabled"]",
+ width: 100,
+ headerAttributes: { style: "text-align:center" },
+ attributes: { style: "text-align:center" },
+ template: '# if(IsEnabled) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'
+ }]
+ });
+ });
+</script>
+<script>
+ $(document).ready(function () {
+ $('#search-discounts').click(function () {
+ var grid = $('#discounts-grid').data('kendoGrid');
+ grid.dataSource.page(1);
+ return false;
+ });
+ });
+
+ $("#@Html.IdFor(model => model.SearchDiscountName)").keydown(function (event) {
+ if (event.keyCode == 13) {
+ $("#search-discounts").click();
+ return false;
+ }
+ });
+
+ $("#@Html.IdFor(model => model.SearchDiscountCouponCode)").keydown(function (event) {
+ if (event.keyCode == 13) {
+ $("#search-discounts").click();
+ return false;
+ }
+ });
+
+ function additionalData() {
+ var data = {
+ SearchDiscountTypeId: $('#@Html.IdFor(model => model.SearchDiscountTypeId)').val(),
+ SearchDiscountCouponCode: $('#@Html.IdFor(model => model.SearchDiscountCouponCode)').val(),
+ SearchDiscountName: $('#@Html.IdFor(model => model.SearchDiscountName)').val()
+ };
+ addAntiForgeryToken(data);
+ return data;
+ }
+</script>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToBrands.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToBrands.cshtml
new file mode 100644
index 000000000..e40b3c89f
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToBrands.cshtml
@@ -0,0 +1,107 @@
+@model DiscountModel
+@{
+ if (!string.IsNullOrEmpty(Model.Id))
+ {
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div id="brands-grid"></div>
+ </div>
+ <div class="panel-footer">
+ <a id="btnAddNewBrand" href="@(Url.Action("BrandAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshBrands", formId = "discount-form", area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Marketing.Discounts.AppliedToBrands.AddNew"]</a>
+ <input type="submit" id="btnRefreshBrands" style="display: none"/>
+ </div>
+ </div>
+
+ <script>
+ $(document).ready(function () {
+ $('#btnAddNewBrand').magnificPopup({
+ type: 'ajax',
+ settings: { cache: false, async: false },
+ midClick: true,
+ callbacks: {
+ parseAjax: function (mfpResponse) {
+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+ },
+ ajaxContentAdded: function () {
+ $('.mfp-wrap').removeAttr('tabindex');
+ }
+ }
+ });
+ $("#brands-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("BrandList", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ },
+ destroy: {
+ url: "@Html.Raw(Url.Action("BrandDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors",
+ model: {
+ id: "BrandId",
+ fields: {
+ BrandName: {editable: false, type: "string" },
+ BrandId: {editable: false, type: "string" }
+ }
+ }
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ this.cancelChanges();
+ },
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ numeric: false,
+ previousNext: false,
+ info: false
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "BrandName",
+ title: "@Loc["admin.marketing.Discounts.AppliedToBrands.Brand"]",
+ template: '<a class="k-link" href="@Url.Action("Edit", "Brand", new { area = Constants.AreaStore })/#=BrandId#">#=kendo.htmlEncode(BrandName)#</a>',
+ }, {
+ command: [{
+ name: "destroy",
+ text: "@Loc["Admin.Common.Delete"]"
+ }],
+ width: 150
+ }]
+ });
+ });
+ </script>
+ <script>
+ $(document).ready(function () {
+ $('#btnRefreshBrands').click(function () {
+ var grid = $("#brands-grid").data('kendoGrid');
+ grid.dataSource.read();
+ return false;
+ });
+ });
+ </script>
+ }
+ else
+ {
+ <div class="note note-info">
+ @Loc["admin.marketing.Discounts.AppliedToBrands.SaveBeforeEdit"]
+ </div>
+ }
+}
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCategories.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCategories.cshtml
new file mode 100644
index 000000000..569fc171a
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCategories.cshtml
@@ -0,0 +1,107 @@
+@model DiscountModel
+@{
+ if (!string.IsNullOrEmpty(Model.Id))
+ {
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div id="categories-grid"></div>
+ </div>
+ <div class="panel-footer">
+ <a id="btnAddNewCategory" href="@(Url.Action("CategoryAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCategories", formId = "discount-form", area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"]</a>
+ <input type="submit" id="btnRefreshCategories" style="display: none"/>
+ </div>
+ </div>
+ <script>
+ $(document).ready(function () {
+ $('#btnAddNewCategory').magnificPopup({
+ type: 'ajax',
+ settings: { cache: false, async: false },
+ midClick: true,
+ callbacks: {
+ parseAjax: function (mfpResponse) {
+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+ },
+ ajaxContentAdded: function () {
+ $('.mfp-wrap').removeAttr('tabindex');
+ }
+ }
+ });
+ $("#categories-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("CategoryList", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ },
+ destroy: {
+ url: "@Html.Raw(Url.Action("CategoryDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors",
+ model: {
+ id: "CategoryId",
+ fields: {
+ CategoryName: {editable: false, type: "string" },
+ CategoryId: {editable: false, type: "string" }
+ }
+ }
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ this.cancelChanges();
+ },
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ numeric: false,
+ previousNext: false,
+ info: false
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "CategoryName",
+ title: "@Loc["admin.marketing.Discounts.AppliedToCategories.Category"]",
+ template: '<a class="k-link" href="@Url.Action("Edit", "Category", new { area = Constants.AreaStore })/#=CategoryId#">#=kendo.htmlEncode(CategoryName)#</a>',
+ }, {
+ command: [{
+ name: "destroy",
+ text: "@Loc["Admin.Common.Delete"]"
+ }],
+ width: 150
+ }]
+ });
+ });
+ </script>
+
+ <script>
+ $(document).ready(function () {
+ $('#btnRefreshCategories').click(function () {
+ var grid = $("#categories-grid").data('kendoGrid');
+ grid.dataSource.read();
+ return false;
+ });
+ });
+ </script>
+ }
+ else
+ {
+ <div class="note note-info">
+ @Loc["admin.marketing.Discounts.AppliedToCategories.SaveBeforeEdit"]
+ </div>
+ }
+}
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCollections.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCollections.cshtml
new file mode 100644
index 000000000..c7b638d8f
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCollections.cshtml
@@ -0,0 +1,106 @@
+@model DiscountModel
+@{
+ if (!string.IsNullOrEmpty(Model.Id))
+ {
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div id="collections-grid"></div>
+ </div>
+ <div class="panel-footer">
+ <a id="btnAddNewCollection" href="@(Url.Action("CollectionAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCollections", formId = "discount-form", area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"]</a>
+ <input type="submit" id="btnRefreshCollections" style="display: none"/>
+ </div>
+ </div>
+ <script>
+ $(document).ready(function () {
+ $('#btnAddNewCollection').magnificPopup({
+ type: 'ajax',
+ settings: { cache: false, async: false },
+ midClick: true,
+ callbacks: {
+ parseAjax: function (mfpResponse) {
+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+ },
+ ajaxContentAdded: function () {
+ $('.mfp-wrap').removeAttr('tabindex');
+ }
+ }
+ });
+ $("#collections-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("CollectionList", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ },
+ destroy: {
+ url: "@Html.Raw(Url.Action("CollectionDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors",
+ model: {
+ id: "CollectionId",
+ fields: {
+ CollectionName: {editable: false, type: "string" },
+ CollectionId: {editable: false, type: "string" }
+ }
+ }
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ this.cancelChanges();
+ },
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ numeric: false,
+ previousNext: false,
+ info: false
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "CollectionName",
+ title: "@Loc["admin.marketing.Discounts.AppliedToCollections.Collection"]",
+ template: '<a class="k-link" href="@Url.Action("Edit", "Collection", new { area = Constants.AreaStore })/#=CollectionId#">#=kendo.htmlEncode(CollectionName)#</a>',
+ }, {
+ command: [{
+ name: "destroy",
+ text: "@Loc["Admin.Common.Delete"]"
+ }],
+ width: 150
+ }]
+ });
+ });
+ </script>
+ <script>
+ $(document).ready(function () {
+ $('#btnRefreshCollections').click(function () {
+ var grid = $("#collections-grid").data('kendoGrid');
+ grid.dataSource.read();
+ return false;
+ });
+ });
+ </script>
+ }
+ else
+ {
+ <div class="note note-info">
+ @Loc["admin.marketing.Discounts.AppliedToCollections.SaveBeforeEdit"]
+ </div>
+ }
+}
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToProducts.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToProducts.cshtml
new file mode 100644
index 000000000..ca5710b26
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToProducts.cshtml
@@ -0,0 +1,109 @@
+@model DiscountModel
+@inject AdminAreaSettings adminAreaSettings
+
+@{
+ if (!string.IsNullOrEmpty(Model.Id))
+ {
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div id="products-grid"></div>
+ </div>
+ <div class="panel-footer">
+ <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshProducts", formId = "discount-form", area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"]</a>
+ <input type="submit" id="btnRefreshProducts" style="display: none"/>
+ </div>
+ </div>
+
+ <script>
+ $(document).ready(function () {
+ $('#btnAddNewProduct').magnificPopup({
+ type: 'ajax',
+ settings: { cache: false, async: false },
+ midClick: true,
+ callbacks: {
+ parseAjax: function (mfpResponse) {
+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+ },
+ ajaxContentAdded: function () {
+ $('.mfp-wrap').removeAttr('tabindex');
+ }
+ }
+ });
+ $("#products-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("ProductList", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ },
+ destroy: {
+ url: "@Html.Raw(Url.Action("ProductDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors",
+ model: {
+ id: "ProductId",
+ fields: {
+ ProductName: {editable: false, type: "string" },
+ ProductId: {editable: false, type: "string" }
+ }
+ }
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ this.cancelChanges();
+ },
+ pageSize: @(adminAreaSettings.DefaultGridPageSize),
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ pageSizes: [@(adminAreaSettings.GridPageSizes)]
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "ProductName",
+ title: "@Loc["admin.marketing.Discounts.AppliedToProducts.Product"]",
+ template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area = Constants.AreaStore })/#=ProductId#">#=kendo.htmlEncode(ProductName)#</a>',
+ }, {
+ command: [{
+ name: "destroy",
+ text: "@Loc["Admin.Common.Delete"]"
+ }],
+ width: 150
+ }]
+ });
+ });
+ </script>
+
+ <script>
+ $(document).ready(function () {
+ $('#btnRefreshProducts').click(function () {
+ var grid = $("#products-grid").data('kendoGrid');
+ grid.dataSource.read();
+ return false;
+ });
+ });
+ </script>
+ }
+ else
+ {
+ <div class="note note-info">
+ @Loc["admin.marketing.Discounts.AppliedToProducts.SaveBeforeEdit"]
+ </div>
+ }
+}
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabCouponCodes.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabCouponCodes.cshtml
new file mode 100644
index 000000000..cc95bdf4c
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabCouponCodes.cshtml
@@ -0,0 +1,99 @@
+@model DiscountModel
+@inject AdminAreaSettings adminAreaSettings
+
+@if (!string.IsNullOrEmpty(Model.Id))
+{
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div id="couponcode-grid"></div>
+ </div>
+ </div>
+ <script>
+ $(document).ready(function () {
+ $("#couponcode-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("CouponCodeList", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ },
+ create: {
+ url: "@Html.Raw(Url.Action("CouponCodeInsert", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ },
+ destroy: {
+ url: "@Html.Raw(Url.Action("CouponCodeDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors",
+ model: {
+ id: "Id",
+ fields: {
+ CouponCode: { editable: true, type: "string" },
+ Used: { editable: false, type: "boolean" },
+ }
+ }
+ },
+ requestEnd: function (e) {
+ if (e.type == "create") {
+ this.read();
+ }
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ this.cancelChanges();
+ },
+ pageSize: @(adminAreaSettings.DefaultGridPageSize),
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ pageSizes: [@(adminAreaSettings.GridPageSizes)]
+ },
+ toolbar: [{ name: "create", text: "@Loc["Admin.Common.AddNewRecord"]" }, { name: "save", text: "@Loc["Admin.Common.Save"]" }, { name: "cancel", text: "@Loc["Admin.Common.Cancel"]" }],
+ editable: {
+ confirmation: false,
+ mode: "inline",
+ },
+ scrollable: false,
+ columns: [{
+ field: "CouponCode",
+ title: "@Loc["admin.marketing.Discounts.Fields.CouponCode"]"
+ },
+ {
+ field: "Used",
+ title: "@Loc["admin.marketing.Discounts.Fields.Used"]",
+ width: 100,
+ headerAttributes: { style: "text-align:center" },
+ attributes: { style: "text-align:center" },
+ template: '# if(Used) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'
+ },
+ {
+ command: [{
+ name: "destroy",
+ text: "@Loc["Admin.Common.Delete"]"
+ }],
+ width: 150
+ }]
+ });
+ });
+ </script>
+}
+else
+{
+ <div class="note note-info">
+ @Loc["admin.marketing.Discounts.CouponCodes.SaveBeforeEdit"]
+ </div>
+}
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabHistory.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabHistory.cshtml
new file mode 100644
index 000000000..ad2b4659f
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabHistory.cshtml
@@ -0,0 +1,75 @@
+@model DiscountModel
+@inject AdminAreaSettings adminAreaSettings
+@{
+ <div id="usagehistory-grid"></div>
+ <script>
+ $(document).ready(function () {
+ $("#usagehistory-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("UsageHistoryList", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ },
+ destroy: {
+ url: "@Html.Raw(Url.Action("UsageHistoryDelete", "Discount", new { area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors",
+ model: {
+ id: "Id",
+ fields: {
+ CreatedOn: {type: "date" }
+ }
+ }
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ this.cancelChanges();
+ },
+ pageSize: @(adminAreaSettings.DefaultGridPageSize),
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ pageSizes: [@(adminAreaSettings.GridPageSizes)]
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "CreatedOn",
+ title: "@Loc["admin.marketing.Discounts.History.CreatedOn"]",
+ width: 200,
+ type: "date",
+ format: "{0:G}"
+ }, {
+ field: "OrderId",
+ title: "@Loc["admin.marketing.Discounts.History.Order"]",
+ width: 200,
+ template: '<a class="btn btn-sm btn-default" href="@Url.Action("Edit", "Order", new { area = Constants.AreaStore })/#=OrderId#"><i class="fa fa-search"></i> #=OrderNumber# - @Loc["Admin.Common.View"]</a>'
+ }, {
+ field: "OrderTotal",
+ title: "@Loc["admin.marketing.Discounts.History.OrderTotal"]",
+ width: 200
+ },{
+ command: {name: "destroy", text: "@Loc["Admin.Common.Delete"]"},
+ title: "@Loc["Admin.Common.Delete"]",
+ width: 100
+ }]
+ });
+ });
+ </script>
+}
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabInfo.cshtml
new file mode 100644
index 000000000..14046cf5e
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabInfo.cshtml
@@ -0,0 +1,260 @@
+@using Grand.Domain.Discounts
+@model DiscountModel
+
+<script>
+ $(document).ready(function () {
+ $("#@Html.IdFor(model => model.DiscountTypeId)").change(toggleDiscountType);
+ $("#@Html.IdFor(model => model.UsePercentage)").click(toggleUsePercentage);
+ $("#@Html.IdFor(model => model.RequiresCouponCode)").click(toggleRequiresCouponCode);
+ $("#@Html.IdFor(model => model.DiscountLimitationId)").change(toggleLimitation);
+ $("#@Html.IdFor(model => model.CalculateByPlugin)").click(toggleCalculate);
+
+ toggleDiscountType();
+ toggleLimitation();
+ toggleUsePercentage();
+ toggleRequiresCouponCode();
+ toggleCalculate();
+ });
+
+ function toggleCalculate() {
+ var selectedCalculateByPlugin = $("#@Html.IdFor(model => model.CalculateByPlugin)").is(':checked');
+ if (selectedCalculateByPlugin) {
+ $('#pnlUsePercentage').hide();
+ $('#pnlDiscountAmount').hide();
+ $('#pnlDiscountPercentage').hide();
+ $('#pnlMaximumDiscountAmount').hide();
+ $('#pnlDiscountPluginName').show();
+ }
+ else {
+ $('#pnlUsePercentage').show();
+ $('#pnlDiscountPluginName').hide();
+ toggleUsePercentage();
+ }
+ }
+
+ function toggleDiscountType() {
+ var selectedDiscountTypeId = $("#@Html.IdFor(model => model.DiscountTypeId)").val();
+ if (selectedDiscountTypeId == @(((int)DiscountType.AssignedToCategories).ToString())) {
+ $('#tab-applied-to-categories').show();
+ $('#tab-applied-to-collections').hide();
+ $('#tab-applied-to-products').hide();
+ $('#pnlMaximumDiscountedQuantity').show();
+ $('#tab-applied-to-brands').hide();
+ }
+ else if (selectedDiscountTypeId == @(((int)DiscountType.AssignedToCollections).ToString())) {
+ $('#tab-applied-to-categories').hide();
+ $('#tab-applied-to-collections').show();
+ $('#tab-applied-to-products').hide();
+ $('#pnlMaximumDiscountedQuantity').show();
+ $('#tab-applied-to-brands').hide();
+ }
+ else if (selectedDiscountTypeId == @(((int)DiscountType.AssignedToSkus).ToString())) {
+ $('#tab-applied-to-categories').hide();
+ $('#tab-applied-to-collections').hide();
+ $('#tab-applied-to-products').show();
+ $('#pnlMaximumDiscountedQuantity').show();
+ $('#tab-applied-to-brands').hide();
+ }
+ else if (selectedDiscountTypeId == @(((int)DiscountType.AssignedToBrands).ToString())) {
+ $('#tab-applied-to-categories').hide();
+ $('#tab-applied-to-collections').hide();
+ $('#tab-applied-to-products').hide();
+ $('#pnlMaximumDiscountedQuantity').show();
+ $('#tab-applied-to-brands').show();
+ }
+ else if (selectedDiscountTypeId == @(((int)DiscountType.AssignedToAllProducts).ToString())) {
+ $('#tab-applied-to-categories').hide();
+ $('#tab-applied-to-collections').hide();
+ $('#tab-applied-to-products').hide();
+ $('#pnlMaximumDiscountedQuantity').show();
+ $('#tab-applied-to-brands').hide();
+ }
+ else {
+ $('#tab-applied-to-categories').hide();
+ $('#tab-applied-to-collections').hide();
+ $('#tab-applied-to-products').hide();
+ $('#pnlMaximumDiscountedQuantity').hide();
+ $('#tab-applied-to-brands').hide();
+ }
+ }
+
+ function toggleLimitation() {
+ var selectedDiscountLimitationId = $("#@Html.IdFor(model => model.DiscountLimitationId)").val();
+ if (selectedDiscountLimitationId == @(((int)DiscountLimitationType.NTimes).ToString()) || selectedDiscountLimitationId == @(((int)DiscountLimitationType.NTimesPerUser).ToString())) {
+ $('#pnlLimitationTimes').show();
+ }
+ else {
+ $('#pnlLimitationTimes').hide();
+ }
+ }
+
+ function toggleUsePercentage() {
+ if ($('#@Html.IdFor(model => model.UsePercentage)').is(':checked')) {
+ $('#pnlDiscountPercentage').show();
+ $('#pnlDiscountAmount').hide();
+ $('#pnlMaximumDiscountAmount').show();
+ } else {
+ $('#pnlDiscountPercentage').hide();
+ $('#pnlDiscountAmount').show();
+ $('#pnlMaximumDiscountAmount').hide();
+ }
+ }
+
+ function toggleRequiresCouponCode() {
+ if ($('#@Html.IdFor(model => model.RequiresCouponCode)').is(':checked')) {
+ $('#tab-couponcode').show();
+ $('#pnlReused').show();
+ } else {
+ $('#tab-couponcode').hide();
+ $('#pnlReused').hide();
+ }
+ }
+</script>
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <admin-label asp-for="Name"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="Name"/>
+ <span asp-validation-for="Name"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="DiscountTypeId"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-select asp-for="DiscountTypeId" asp-items="EnumTranslationService.ToSelectList((DiscountType)Model.DiscountTypeId)"/>
+ <span asp-validation-for="DiscountTypeId"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlUsePercentage">
+ <admin-label asp-for="UsePercentage"/>
+ <div class="col-md-9 col-sm-9">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="UsePercentage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="UsePercentage"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlDiscountAmount">
+ <admin-label asp-for="DiscountAmount"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="DiscountAmount"/>
+ <span asp-validation-for="DiscountAmount"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlDiscountPercentage">
+ <admin-label asp-for="DiscountPercentage"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="DiscountPercentage"/>
+ <span asp-validation-for="DiscountPercentage"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="CurrencyCode"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-select asp-for="CurrencyCode" asp-items="Model.AvailableCurrencies"/>
+ <span asp-validation-for="CurrencyCode"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlMaximumDiscountAmount">
+ <admin-label asp-for="MaximumDiscountAmount"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="MaximumDiscountAmount"/>
+ <span asp-validation-for="MaximumDiscountAmount"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlCalculateByPlugin">
+ <admin-label asp-for="CalculateByPlugin"/>
+ <div class="col-md-9 col-sm-9">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CalculateByPlugin"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CalculateByPlugin"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlDiscountPluginName">
+ <admin-label asp-for="DiscountPluginName"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-select asp-for="DiscountPluginName" asp-items="Model.AvailableDiscountAmountProviders"/>
+ <span asp-validation-for="DiscountPluginName"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="StartDate"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="StartDate"/>
+ <span asp-validation-for="StartDate"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="EndDate"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="EndDate"/>
+ <span asp-validation-for="EndDate"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="RequiresCouponCode"/>
+ <div class="col-md-9 col-sm-9">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="RequiresCouponCode"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="RequiresCouponCode"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlReused">
+ <admin-label asp-for="Reused"/>
+ <div class="col-md-9 col-sm-9">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="Reused"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="Reused"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="IsCumulative"/>
+ <div class="col-md-9 col-sm-9">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="IsCumulative"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="IsCumulative"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="DiscountLimitationId"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-select asp-for="DiscountLimitationId" asp-items="EnumTranslationService.ToSelectList((DiscountLimitationType)Model.DiscountLimitationId)"/>
+ <span asp-validation-for="DiscountLimitationId"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlLimitationTimes">
+ <admin-label asp-for="LimitationTimes"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="LimitationTimes"/>
+ <span asp-validation-for="LimitationTimes"></span> @Loc["admin.marketing.Discounts.Fields.LimitationTimes.Times"]
+ </div>
+ </div>
+ <div class="form-group" id="pnlMaximumDiscountedQuantity">
+ <admin-label asp-for="MaximumDiscountedQuantity"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="MaximumDiscountedQuantity"/>
+ <span asp-validation-for="MaximumDiscountedQuantity"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="IsEnabled"/>
+ <div class="col-md-9 col-sm-9">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="IsEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="IsEnabled"></span>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabRequirements.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabRequirements.cshtml
new file mode 100644
index 000000000..fe615efa4
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabRequirements.cshtml
@@ -0,0 +1,207 @@
+@model DiscountModel
+
+@{
+ if (!string.IsNullOrEmpty(Model.Id))
+ {
+ <script>
+
+ $(document).ready(function () {
+
+ $("#@Html.IdFor(model => model.AddDiscountRequirement)").change(loadNewRequirementBox);
+
+ //load add requirement box
+ loadNewRequirementBox();
+
+ //load existing requirements
+ loadExistingRequirements();
+
+ //adding requirement event
+ $("#discountRequirementContainer").bind('grandnewdiscountruleadded', function(event, newRequirementId) {
+
+ var discountId = '@Model.Id';
+
+ var postData = {
+ discountRequirementId: newRequirementId,
+ discountId: discountId
+ };
+ addAntiForgeryToken(postData);
+
+ $.ajax({
+ cache:false,
+ type: "POST",
+ url: "@(Url.Action("GetDiscountRequirementMetaInfo", "Discount", new { area = Constants.AreaStore }))",
+ data: postData,
+ success: function (result) {
+ discountRequirements.push(
+ {
+ discountRequirementId: newRequirementId,
+ ruleName : result.ruleName,
+ url : result.url
+ }
+ );
+ loadExistingRequirements();
+ },
+ error:function (xhr, ajaxOptions, thrownError) {
+ alert('Failed to load new discount requirement info. Please refresh the page');
+ }
+ });
+
+ });
+ });
+
+
+ //load requirement HTML
+ function loadRequirement(configureRuleUrl, placeholderName) {
+ $.ajax({
+ cache:false,
+ url: configureRuleUrl,
+ dataType: "html",
+ success: function (result) {
+ $(placeholderName).html(result);
+ StopPageLoading();
+ },
+ error:function (xhr, ajaxOptions, thrownError) {
+ $(placeholderName).html('Failed to load requirement content.');
+ StopPageLoading();
+ }
+ });
+ }
+
+ //load HTML for adding requirement
+ function loadNewRequirementBox() {
+ StartPageLoading();
+ //load URL
+ var ruleSystemName = $("#@Html.IdFor(model => model.AddDiscountRequirement)").val();
+ var discountId = '@Model.Id';
+ if (ruleSystemName != '') {
+ $.ajax({
+ cache:false,
+ url: "@(Url.Action("GetDiscountRequirementConfigurationUrl", "Discount", new { area = Constants.AreaStore }))",
+ data: { "rulesystemName": ruleSystemName, "discountId": discountId },
+ success: function (result) {
+ var configureRuleUrl = result.url;
+ //now load the content
+ loadRequirement(configureRuleUrl, '#addrequirementplaceholder');
+ },
+ error:function (xhr, ajaxOptions, thrownError){
+ $('#addrequirementplaceholder').html('Failed to load requirement URL');
+ }
+ });
+ }
+ else {
+ $('#addrequirementplaceholder').html('');
+ StopPageLoading();
+ }
+ }
+
+ //array of existing discount requirements
+ var discountRequirements = [
+ @for (var i = 0; i < Model.DiscountRequirementMetaInfos.Count; i++)
+ {
+ var drmi = Model.DiscountRequirementMetaInfos[i];
+ <text>{ discountRequirementId: "@(drmi.DiscountRequirementId)", ruleName: "@(drmi.RuleName)", url: "@(Html.Raw(drmi.ConfigurationUrl))" } </text>
+ if (i != Model.DiscountRequirementMetaInfos.Count - 1)
+ {
+ <text>, </text>
+ }
+ }
+ ];
+
+ //load HTML for existing requirements
+ function loadExistingRequirements() {
+ StartPageLoading();
+ $("#discountRequirementContainer").html('');
+ $("#discountRequirementTemplate").tmpl(discountRequirements).appendTo("#discountRequirementContainer");
+
+ var discountRequirementsLen = discountRequirements.length;
+ for (var i=0; i<discountRequirementsLen; i++) {
+ var url = discountRequirements[i].url;
+ var discountRequirementId = discountRequirements[i].discountRequirementId;
+ var placeholderName = '#editrequirementplaceholder' + discountRequirementId;
+ $(placeholderName).html('loading...');
+ loadRequirement(url, placeholderName);
+ }
+ StopPageLoading();
+ }
+
+ //delete requirement rule
+ function deleteRequirement(discountRequirementId) {
+ var discountId = '@Model.Id';
+
+ var postData = {
+ discountRequirementId: discountRequirementId,
+ discountId: discountId
+ };
+ addAntiForgeryToken(postData);
+
+ $.ajax({
+ cache: false,
+ type: "POST",
+ url: "@(Url.Action("DeleteDiscountRequirement", "Discount", new { area = Constants.AreaStore }))",
+ data: postData,
+ success: function (data) {
+ removeRequirementByElement(discountRequirements, discountRequirementId);
+ loadExistingRequirements();
+ },
+ error:function (xhr, ajaxOptions, thrownError){
+ alert('Failed to delete requirement.');
+ }
+ });
+
+
+ function removeRequirementByElement(arrayName,discountRequirementId) {
+ for(var i=0; i<arrayName.length; i++) {
+ if(arrayName[i].discountRequirementId==discountRequirementId) {
+ arrayName.splice(i,1);
+ }
+ }
+ }
+
+ }
+
+ </script>
+
+ <!-- Template container -->
+ <div class="form-horizontal" id="discountRequirementContainer">
+ </div>
+ <!-- Discount requirement template -->
+ <script id="discountRequirementTemplate" type="text/html">
+ <div class="form-body" id="editrequirement{{= discountRequirementId }}">
+ <div class="note note-info">
+ @Loc["admin.marketing.Discounts.Requirements.DiscountRequirementType"] <strong>{{= ruleName }}</strong>
+ </div>
+ <div class="form-group" id="editrequirementplaceholder{{= discountRequirementId }}"></div>
+ <div class="offset-md-3 offset-sm-3 pb-3">
+ <input type="button" id="deleterequirement{{= discountRequirementId }}" onclick="deleteRequirement('{{= discountRequirementId }}')" class="k-button" value="@Loc["admin.marketing.Discounts.Requirements.Remove"]"/>
+ </div>
+ </div>
+ </script>
+
+ <div class="form-horizontal">
+ <div class="form-body">
+ <div class="note note-info">
+ <strong>@Loc["admin.marketing.Discounts.Requirements.AddNew"]</strong>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="AddDiscountRequirement"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-select asp-for="AddDiscountRequirement" asp-items="Model.AvailableDiscountRequirementRules"/>
+ <span asp-validation-for="AddDiscountRequirement"></span>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="form-horizontal">
+ <div class="form-body">
+ <div id="addrequirementplaceholder">
+ </div>
+ </div>
+ </div>
+ }
+ else
+ {
+ <div class="note note-info">
+ @Loc["admin.marketing.Discounts.Requirements.SaveBeforeEdit"]
+ </div>
+ }
+}
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.cshtml
new file mode 100644
index 000000000..78e3f9b96
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.cshtml
@@ -0,0 +1,67 @@
+@model DiscountModel
+
+<div asp-validation-summary="All"></div>
+<input asp-for="Id" type="hidden"/>
+<admin-tabstrip name="discount-edit">
+ <items>
+ <tabstrip-item text="@Loc["admin.marketing.Discounts.Info"]" tab-index="0">
+ <content>
+ <div>
+ <partial name="Partials/CreateOrUpdate.TabInfo" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["admin.marketing.Discounts.CouponCodes"]" tab-index="1" id="tab-couponcode">
+ <content>
+ <div>
+ <partial name="Partials/CreateOrUpdate.TabCouponCodes" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["admin.marketing.Discounts.Requirements"]" tab-index="2">
+ <content>
+ <div>
+ <partial name="Partials/CreateOrUpdate.TabRequirements" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["admin.marketing.Discounts.AppliedToProducts"]" tab-index="3" id="tab-applied-to-products">
+ <content>
+ <div>
+ <partial name="Partials/CreateOrUpdate.TabAppliedToProducts" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["admin.marketing.Discounts.AppliedToCategories"]" tab-index="4" id="tab-applied-to-categories">
+ <content>
+ <div>
+ <partial name="Partials/CreateOrUpdate.TabAppliedToCategories" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["admin.marketing.Discounts.AppliedToBrands"]" tab-index="5" id="tab-applied-to-brands">
+ <content>
+ <div>
+ <partial name="Partials/CreateOrUpdate.TabAppliedToBrands" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["admin.marketing.Discounts.AppliedToCollections"]" tab-index="6" id="tab-applied-to-collections">
+ <content>
+ <div>
+ <partial name="Partials/CreateOrUpdate.TabAppliedToCollections" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ @if (!string.IsNullOrEmpty(Model.Id))
+ {
+ <tabstrip-item text="@Loc["admin.marketing.Discounts.History"]" tab-index="7">
+ <content>
+ <div>
+ <partial name="Partials/CreateOrUpdate.TabHistory" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ }
+ </items>
+</admin-tabstrip>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/ProductAddPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/ProductAddPopup.cshtml
new file mode 100644
index 000000000..174392a8d
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/ProductAddPopup.cshtml
@@ -0,0 +1,174 @@
+@model DiscountModel.AddProductToDiscountModel
+@inject AdminAreaSettings adminAreaSettings
+@{
+ Layout = "";
+ ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"];
+}
+
+<form id="ProductAddPopup" asp-area="@Constants.AreaStore" asp-controller="Discount" asp-action="ProductAddPopup" method="post"
+ asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"
+ asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+ asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
+
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit popup-window">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-cubes"></i>
+ @Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"]
+ </div>
+ </div>
+ <div class="x_content form">
+ <div class="form-horizontal">
+ <div class="form-body">
+ <div class="main-header col-12 px-0">
+ <div class="row align-items-end">
+ <div class="col-md col-ms-12 col-12">
+ <div class="form-group mb-0">
+ <admin-label asp-for="SearchProductName" class="control-label"/>
+ <admin-input asp-for="SearchProductName"/>
+ </div>
+ </div>
+ <div class="col-md-auto col-sm-12 col-12">
+ <div class="form-actions">
+ <div class="btn-group btn-group-devided">
+ <button class="btn btn-success filter-submit" id="search-products">
+ <i class="fa fa-search"></i>&nbsp; @Loc["Admin.Common.Search"]
+ </button>
+ </div>
+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> &nbsp; @Loc["Admin.Common.Save"] </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="products-grid"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ var mfp = $.magnificPopup.instance;
+ $("#ProductAddPopup").submit(function (e) {
+ e.preventDefault();
+ var form = $(this);
+ var url = form.attr('action');
+ $.ajax({
+ type: "POST",
+ url: url,
+ data: form.serialize(),
+ success: function (data) {
+ if (data == "") {
+ mfp.close();
+ $('#btnRefreshProducts').click();
+ } else {
+ $.magnificPopup.open({
+ items: {
+ src: data,
+ type: 'inline'
+ },
+ callbacks: {
+ open: function () {
+ $('.mfp-wrap').removeAttr('tabindex');
+ }
+ }
+ });
+ }
+ }
+ });
+ });
+
+ $("#products-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("ProductAddPopupList", "Discount", new { area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: additionalData
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors"
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ this.cancelChanges();
+ },
+ pageSize: @(adminAreaSettings.DefaultGridPageSize),
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ pageSizes: [@(adminAreaSettings.GridPageSizes)]
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "Id",
+ headerTemplate: "<input id='mastercheckbox' type='checkbox'/>",
+ headerAttributes: { style: "text-align:center" },
+ template: "<input type='checkbox' name='SelectedProductIds' value='#=Id#' class='checkboxGroups' />",
+ attributes: { style: "text-align:center" },
+ width: 50
+ }, {
+ field: "Name",
+ title: "@Loc["Admin.Catalog.Products.Fields.Name"]"
+ }, {
+ field: "Published",
+ title: "@Loc["Admin.Catalog.Products.Fields.Published"]",
+ width: 100,
+ headerAttributes: { style: "text-align:center" },
+ attributes: { style: "text-align:center" },
+ template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'
+ }]
+ });
+
+ $('#search-products').click(function() {
+ var grid = $('#products-grid').data('kendoGrid');
+ grid.dataSource.page(1);
+ $('.checkboxGroups').prop('checked', false).change();
+ return false;
+ });
+
+ $("#@Html.IdFor(model => model.SearchProductName)").keydown(function(event) {
+ if (event.keyCode == 13) {
+ $("#search-products").click();
+ return false;
+ }
+ });
+
+ //wire up checkboxes
+ $('#mastercheckbox').click(function() {
+ $('.checkboxGroups').prop('checked', $(this).is(':checked')).change();
+ });
+
+ $('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
+ updateMasterCheckbox();
+ });
+
+ function additionalData() {
+ var data = {
+ SearchProductName: $('#@Html.IdFor(model => model.SearchProductName)').val(),
+ };
+ addAntiForgeryToken(data);
+ return data;
+ }
+
+ function updateMasterCheckbox() {
+ var numChkBoxes = $('#products-grid input[type=checkbox][id!=mastercheckbox]').length;
+ var numChkBoxesChecked = $('#products-grid input[type=checkbox][id!=mastercheckbox]:checked').length;
+ $('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);
+ }
+ </script>
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml
index 1420c6933..d330949c8 100644
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml
@@ -35,6 +35,7 @@
@using Grand.Web.AdminShared.Models.Pages
@using Grand.Web.AdminShared.Models.Settings
@using Grand.Web.AdminShared.Models.Shipping
+@using Grand.Web.AdminShared.Models.Discounts
@inject LocService Loc
@inject IEnumTranslationService EnumTranslationService
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Controllers/DiscountController.cs b/src/Web/Grand.Web.Store/Controllers/DiscountController.cs
new file mode 100644
index 000000000..06ae7fbec
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Controllers/DiscountController.cs
@@ -0,0 +1,782 @@
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Queries.Catalog;
+using Grand.Domain.Discounts;
+using Grand.Domain.Permissions;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Extensions;
+using Grand.Web.AdminShared.Extensions.Mapping;
+using Grand.Web.AdminShared.Interfaces;
+using Grand.Web.AdminShared.Models.Catalog;
+using Grand.Web.AdminShared.Models.Discounts;
+using Grand.Web.Common.DataSource;
+using Grand.Web.Common.Filters;
+using Grand.Web.Common.Security.Authorization;
+using MediatR;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Grand.Web.Store.Controllers;
+
+[PermissionAuthorize(PermissionSystemName.Discounts)]
+public class DiscountController : BaseStoreController
+{
+ #region Constructors
+
+ public DiscountController(
+ IDiscountViewModelService discountViewModelService,
+ IDiscountService discountService,
+ ITranslationService translationService,
+ IContextAccessor contextAccessor,
+ IDateTimeService dateTimeService,
+ IMediator mediator)
+ {
+ _discountViewModelService = discountViewModelService;
+ _discountService = discountService;
+ _translationService = translationService;
+ _contextAccessor = contextAccessor;
+ _dateTimeService = dateTimeService;
+ _mediator = mediator;
+ }
+
+ #endregion
+
+ #region Fields
+
+ private readonly IDiscountViewModelService _discountViewModelService;
+ private readonly IDiscountService _discountService;
+ private readonly ITranslationService _translationService;
+ private readonly IContextAccessor _contextAccessor;
+ private readonly IDateTimeService _dateTimeService;
+ private readonly IMediator _mediator;
+
+ #endregion
+
+ #region Utilities
+
+ private string CurrentStoreId =>
+ _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
+
+ #endregion
+
+ #region Discounts
+
+ public IActionResult Index()
+ {
+ return RedirectToAction("List");
+ }
+
+ public IActionResult List()
+ {
+ var model = _discountViewModelService.PrepareDiscountListModel();
+ return View(model);
+ }
+
+ [HttpPost]
+ [PermissionAuthorizeAction(PermissionActionName.List)]
+ public async Task<IActionResult> List(DiscountListModel model, DataSourceRequest command)
+ {
+ var (discountModel, totalCount) =
+ await _discountViewModelService.PrepareDiscountModel(model, command.Page, command.PageSize);
+ var gridModel = new DataSourceResult {
+ Data = discountModel.ToList(),
+ Total = totalCount
+ };
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Create)]
+ public async Task<IActionResult> Create()
+ {
+ var model = new DiscountModel();
+ await _discountViewModelService.PrepareDiscountModel(model, null);
+ model.LimitationTimes = 1;
+ return View(model);
+ }
+
+ [HttpPost]
+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
+ [PermissionAuthorizeAction(PermissionActionName.Create)]
+ public async Task<IActionResult> Create(DiscountModel model, bool continueEditing)
+ {
+ if (ModelState.IsValid)
+ {
+ model.Stores = [CurrentStoreId];
+ var discount = await _discountViewModelService.InsertDiscountModel(model);
+ Success(_translationService.GetResource("admin.marketing.discounts.Added"));
+ return continueEditing
+ ? RedirectToAction("Edit", new { id = discount.Id })
+ : RedirectToAction("List");
+ }
+
+ await _discountViewModelService.PrepareDiscountModel(model, null);
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ public async Task<IActionResult> Edit(string id)
+ {
+ var discount = await _discountService.GetDiscountById(id);
+ if (discount == null)
+ return RedirectToAction("List");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return RedirectToAction("List");
+
+ var model = discount.ToModel(_dateTimeService);
+ await _discountViewModelService.PrepareDiscountModel(model, discount);
+ return View(model);
+ }
+
+ [HttpPost]
+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> Edit(DiscountModel model, bool continueEditing)
+ {
+ var discount = await _discountService.GetDiscountById(model.Id);
+ if (discount == null)
+ return RedirectToAction("List");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return RedirectToAction("Edit", new { id = discount.Id });
+
+ if (ModelState.IsValid)
+ {
+ model.Stores = [CurrentStoreId];
+ discount = await _discountViewModelService.UpdateDiscountModel(discount, model);
+ Success(_translationService.GetResource("admin.marketing.discounts.Updated"));
+ if (continueEditing)
+ {
+ await SaveSelectedTabIndex();
+ return RedirectToAction("Edit", new { id = discount.Id });
+ }
+
+ return RedirectToAction("List");
+ }
+
+ await _discountViewModelService.PrepareDiscountModel(model, discount);
+ return View(model);
+ }
+
+ [HttpPost]
+ [PermissionAuthorizeAction(PermissionActionName.Delete)]
+ public async Task<IActionResult> Delete(string id)
+ {
+ var discount = await _discountService.GetDiscountById(id);
+ if (discount == null)
+ return RedirectToAction("List");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return RedirectToAction("Edit", new { id });
+
+ var usageHistory = await _mediator.Send(new GetDiscountUsageHistoryQuery { DiscountId = discount.Id });
+ if (usageHistory.Count > 0)
+ {
+ Error(_translationService.GetResource("admin.marketing.discounts.Deleted.UsageHistory"));
+ return RedirectToAction("Edit", new { id = discount.Id });
+ }
+
+ if (ModelState.IsValid)
+ {
+ await _discountViewModelService.DeleteDiscount(discount);
+ Success(_translationService.GetResource("admin.marketing.discounts.Deleted"));
+ return RedirectToAction("List");
+ }
+
+ Error(ModelState);
+ return RedirectToAction("Edit", new { id = discount.Id });
+ }
+
+ #endregion
+
+ #region Discount coupon codes
+
+ [HttpPost]
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ public async Task<IActionResult> CouponCodeList(DataSourceRequest command, string discountId)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });
+
+ var couponcodes = await _discountService.GetAllCouponCodesByDiscountId(discount.Id,
+ command.Page - 1, command.PageSize);
+ var gridModel = new DataSourceResult {
+ Data = couponcodes.Select(x => new {
+ x.Id,
+ x.CouponCode,
+ x.Used
+ }),
+ Total = couponcodes.TotalCount
+ };
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> CouponCodeDelete(string discountId, string Id)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });
+
+ var coupon = await _discountService.GetDiscountCodeById(Id);
+ if (coupon == null)
+ throw new Exception("No coupon code found with the specified id");
+ if (ModelState.IsValid)
+ {
+ if (!coupon.Used)
+ await _discountService.DeleteDiscountCoupon(coupon);
+ else
+ return new JsonResult(new DataSourceResult
+ { Errors = "You can't delete coupon code, it was used" });
+
+ return new JsonResult("");
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> CouponCodeInsert(string discountId, string couponCode)
+ {
+ if (string.IsNullOrEmpty(couponCode))
+ throw new Exception("Coupon code can't be empty");
+
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });
+
+ couponCode = couponCode.ToUpperInvariant();
+
+ if (await _discountService.GetDiscountByCouponCode(couponCode) != null)
+ return new JsonResult(new DataSourceResult { Errors = "Coupon code exists" });
+ if (ModelState.IsValid)
+ {
+ await _discountViewModelService.InsertCouponCode(discountId, couponCode);
+ return new JsonResult("");
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ #endregion
+
+ #region Discount requirements
+
+ [AcceptVerbs("GET")]
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ public async Task<IActionResult> GetDiscountRequirementConfigurationUrl(string rulesystemName,
+ string discountId, string discountRequirementId,
+ [FromServices] IDiscountProviderLoader discountProviderLoader)
+ {
+ ArgumentNullException.ThrowIfNullOrEmpty(rulesystemName);
+
+ var discountPlugin = discountProviderLoader.LoadDiscountProviderByRuleSystemName(rulesystemName);
+
+ if (discountPlugin == null)
+ throw new ArgumentException("Discount requirement rule could not be loaded");
+
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new ArgumentException("Discount could not be loaded");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ throw new ArgumentException("Access denied");
+
+ var singleRequirement = discountPlugin.GetRequirementRules().FirstOrDefault(x =>
+ x.SystemName.Equals(rulesystemName, StringComparison.OrdinalIgnoreCase));
+ var url = _discountViewModelService.GetRequirementUrlInternal(singleRequirement, discount, discountRequirementId);
+ return Json(new { url });
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ public async Task<IActionResult> GetDiscountRequirementMetaInfo(string discountRequirementId, string discountId,
+ [FromServices] IDiscountProviderLoader discountProviderLoader)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new ArgumentException("Discount could not be loaded");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ throw new ArgumentException("Access denied");
+
+ var discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId);
+ if (discountRequirement == null)
+ throw new ArgumentException("Discount requirement could not be loaded");
+
+ var discountPlugin =
+ discountProviderLoader.LoadDiscountProviderByRuleSystemName(discountRequirement
+ .DiscountRequirementRuleSystemName);
+ if (discountPlugin == null)
+ throw new ArgumentException("Discount requirement rule could not be loaded");
+
+ var discountRequirementRule = discountPlugin.GetRequirementRules()
+ .First(x => x.SystemName == discountRequirement.DiscountRequirementRuleSystemName);
+ var url = _discountViewModelService.GetRequirementUrlInternal(discountRequirementRule, discount, discountRequirementId);
+ var ruleName = discountRequirementRule.FriendlyName;
+
+ return Json(new { url, ruleName });
+ }
+
+ [HttpPost]
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> DeleteDiscountRequirement(string discountRequirementId, string discountId)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new ArgumentException("Discount could not be loaded");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return Json(new { Result = false, Error = "Access denied" });
+
+ var discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId);
+ if (discountRequirement == null)
+ throw new ArgumentException("Discount requirement could not be loaded");
+
+ if (ModelState.IsValid)
+ {
+ await _discountViewModelService.DeleteDiscountRequirement(discountRequirement, discount);
+ return Json(new { Result = true });
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ #endregion
+
+ #region Applied to products
+
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ [HttpPost]
+ public async Task<IActionResult> ProductList(DataSourceRequest command, string discountId,
+ [FromServices] IProductService productService)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });
+
+ var products = await productService.GetProductsByDiscount(discount.Id, command.Page - 1,
+ command.PageSize);
+ var gridModel = new DataSourceResult {
+ Data = products.Select(x => new DiscountModel.AppliedToProductModel {
+ ProductId = x.Id,
+ ProductName = x.Name
+ }),
+ Total = products.TotalCount
+ };
+
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> ProductDelete(string discountId, string productId,
+ [FromServices] IProductService productService)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });
+
+ var product = await productService.GetProductById(productId);
+ if (product == null)
+ throw new Exception("No product found with the specified id");
+
+ if (ModelState.IsValid)
+ {
+ await _discountViewModelService.DeleteProduct(discount, product);
+ return new JsonResult("");
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> ProductAddPopup(string discountId)
+ {
+ var model = await _discountViewModelService.PrepareProductToDiscountModel();
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> ProductAddPopupList(DataSourceRequest command,
+ DiscountModel.AddProductToDiscountModel model)
+ {
+ model.SearchStoreId = CurrentStoreId;
+ var products = await _discountViewModelService.PrepareProductModel(model, command.Page, command.PageSize);
+
+ var gridModel = new DataSourceResult {
+ Data = products.products.ToList(),
+ Total = products.totalCount
+ };
+
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> ProductAddPopup(DiscountModel.AddProductToDiscountModel model)
+ {
+ var discount = await _discountService.GetDiscountById(model.DiscountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return Content("Access denied");
+
+ if (model.SelectedProductIds != null) await _discountViewModelService.InsertProductToDiscountModel(model);
+
+ return Content("");
+ }
+
+ #endregion
+
+ #region Applied to categories
+
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ [HttpPost]
+ public async Task<IActionResult> CategoryList(DataSourceRequest command, string discountId,
+ [FromServices] ICategoryService categoryService)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });
+
+ var categories = await categoryService.GetAllCategoriesByDiscount(discount.Id);
+ var items = new List<DiscountModel.AppliedToCategoryModel>();
+ foreach (var item in categories)
+ items.Add(new DiscountModel.AppliedToCategoryModel {
+ CategoryId = item.Id,
+ CategoryName = await categoryService.GetFormattedBreadCrumb(item)
+ });
+
+ var gridModel = new DataSourceResult {
+ Data = items,
+ Total = categories.Count
+ };
+
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> CategoryDelete(string discountId, string categoryId,
+ [FromServices] ICategoryService categoryService)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });
+
+ var category = await categoryService.GetCategoryById(categoryId);
+ if (category == null)
+ throw new Exception("No category found with the specified id");
+
+ if (ModelState.IsValid)
+ {
+ await _discountViewModelService.DeleteCategory(discount, category);
+ return new JsonResult("");
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public IActionResult CategoryAddPopup(string discountId)
+ {
+ var model = new DiscountModel.AddCategoryToDiscountModel();
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> CategoryAddPopupList(DataSourceRequest command,
+ DiscountModel.AddCategoryToDiscountModel model, [FromServices] ICategoryService categoryService)
+ {
+ var categories = await categoryService.GetAllCategories(categoryName: model.SearchCategoryName,
+ storeId: CurrentStoreId, pageIndex: command.Page - 1, pageSize: command.PageSize, showHidden: true);
+ var items = new List<CategoryModel>();
+ foreach (var item in categories)
+ {
+ var categoryModel = item.ToModel();
+ categoryModel.Breadcrumb = await categoryService.GetFormattedBreadCrumb(item);
+ items.Add(categoryModel);
+ }
+
+ var gridModel = new DataSourceResult {
+ Data = items,
+ Total = categories.TotalCount
+ };
+
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> CategoryAddPopup(DiscountModel.AddCategoryToDiscountModel model)
+ {
+ var discount = await _discountService.GetDiscountById(model.DiscountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return Content("Access denied");
+
+ if (model.SelectedCategoryIds != null) await _discountViewModelService.InsertCategoryToDiscountModel(model);
+
+ return Content("");
+ }
+
+ #endregion
+
+ #region Applied to brands
+
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ [HttpPost]
+ public async Task<IActionResult> BrandList(DataSourceRequest command, string discountId,
+ [FromServices] IBrandService brandService)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });
+
+ var brands = await brandService.GetAllBrandsByDiscount(discount.Id);
+ var gridModel = new DataSourceResult {
+ Data = brands.Select(x => new DiscountModel.AppliedToBrandModel {
+ BrandId = x.Id,
+ BrandName = x.Name
+ }),
+ Total = brands.Count
+ };
+
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> BrandDelete(string discountId, string brandId,
+ [FromServices] IBrandService brandService)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });
+
+ var brand = await brandService.GetBrandById(brandId);
+ if (brand == null)
+ throw new Exception("No brand found with the specified id");
+
+ if (ModelState.IsValid)
+ {
+ await _discountViewModelService.DeleteBrand(discount, brand);
+ return new JsonResult("");
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public IActionResult BrandAddPopup(string discountId)
+ {
+ var model = new DiscountModel.AddBrandToDiscountModel();
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> BrandAddPopupList(DataSourceRequest command,
+ DiscountModel.AddBrandToDiscountModel model, [FromServices] IBrandService brandService)
+ {
+ var brands = await brandService.GetAllBrands(model.SearchBrandName,
+ CurrentStoreId, command.Page - 1, command.PageSize, true);
+
+ var gridModel = new DataSourceResult {
+ Data = brands.Select(x => x.ToModel()),
+ Total = brands.TotalCount
+ };
+
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> BrandAddPopup(DiscountModel.AddBrandToDiscountModel model)
+ {
+ var discount = await _discountService.GetDiscountById(model.DiscountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return Content("Access denied");
+
+ if (model.SelectedBrandIds != null) await _discountViewModelService.InsertBrandToDiscountModel(model);
+
+ return Content("");
+ }
+
+ #endregion
+
+ #region Applied to collections
+
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ [HttpPost]
+ public async Task<IActionResult> CollectionList(DataSourceRequest command, string discountId,
+ [FromServices] ICollectionService collectionService)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });
+
+ var collections = await collectionService.GetAllCollectionsByDiscount(discount.Id);
+ var gridModel = new DataSourceResult {
+ Data = collections.Select(x => new DiscountModel.AppliedToCollectionModel {
+ CollectionId = x.Id,
+ CollectionName = x.Name
+ }),
+ Total = collections.Count
+ };
+
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> CollectionDelete(string discountId, string collectionId,
+ [FromServices] ICollectionService collectionService)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });
+
+ var collection = await collectionService.GetCollectionById(collectionId);
+ if (collection == null)
+ throw new Exception("No collection found with the specified id");
+
+ if (ModelState.IsValid)
+ {
+ await _discountViewModelService.DeleteCollection(discount, collection);
+ return new JsonResult("");
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public IActionResult CollectionAddPopup(string discountId)
+ {
+ var model = new DiscountModel.AddCollectionToDiscountModel();
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> CollectionAddPopupList(DataSourceRequest command,
+ DiscountModel.AddCollectionToDiscountModel model, [FromServices] ICollectionService collectionService)
+ {
+ var collections = await collectionService.GetAllCollections(model.SearchCollectionName, CurrentStoreId,
+ command.Page - 1, command.PageSize, true);
+ var gridModel = new DataSourceResult {
+ Data = collections.Select(x => x.ToModel()),
+ Total = collections.TotalCount
+ };
+
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> CollectionAddPopup(DiscountModel.AddCollectionToDiscountModel model)
+ {
+ var discount = await _discountService.GetDiscountById(model.DiscountId);
+ if (discount == null)
+ throw new Exception("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return Content("Access denied");
+
+ if (model.SelectedCollectionIds != null) await _discountViewModelService.InsertCollectionToDiscountModel(model);
+
+ return Content("");
+ }
+
+ #endregion
+
+ #region Discount usage history
+
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ [HttpPost]
+ public async Task<IActionResult> UsageHistoryList(string discountId, DataSourceRequest command)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new ArgumentException("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });
+
+ var (usageHistoryModels, totalCount) =
+ await _discountViewModelService.PrepareDiscountUsageHistoryModel(discount, command.Page,
+ command.PageSize);
+ var gridModel = new DataSourceResult {
+ Data = usageHistoryModels.ToList(),
+ Total = totalCount
+ };
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> UsageHistoryDelete(string discountId, string id)
+ {
+ var discount = await _discountService.GetDiscountById(discountId);
+ if (discount == null)
+ throw new ArgumentException("No discount found with the specified id");
+
+ if (!discount.AccessToEntityByStore(CurrentStoreId))
+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });
+
+ var duh = await _discountService.GetDiscountUsageHistoryById(id);
+ if (duh != null)
+ {
+ if (ModelState.IsValid)
+ await _discountService.DeleteDiscountUsageHistory(duh);
+ else
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ return new JsonResult("");
+ }
+
+ #endregion
+}
diff --git a/src/Web/Grand.Web.Store/Controllers/HomeController.cs b/src/Web/Grand.Web.Store/Controllers/HomeController.cs
index dd733c6c8..6ba8b7bd5 100644
--- a/src/Web/Grand.Web.Store/Controllers/HomeController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/HomeController.cs
@@ -1,5 +1,4 @@
-using Grand.Business.Common.Services.Localization;
-using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Authentication;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Customers;