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.

Plugin DiscountRules.Standard - change type of project to Microsoft.NET.Sdk.Razor

KrzysztofPajakd76b6cdae0c2
diff --git a/src/Plugins/DiscountRules.Standard/Controllers/CustomerGroupsController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
similarity index 91%
rename from src/Plugins/DiscountRules.Standard/Controllers/CustomerGroupsController.cs
rename to src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
index 85ce22280..acbb3e4fc 100644
--- a/src/Plugins/DiscountRules.Standard/Controllers/CustomerGroupsController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
@@ -5,10 +5,9 @@ using Grand.Business.Common.Interfaces.Configuration;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Security;
using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Domain.Discounts;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
-using Grand.Domain.Discounts;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using System;
@@ -22,19 +21,17 @@ namespace DiscountRules.CustomerGroups.Controllers
public class CustomerGroupsController : BasePluginController
{
private readonly IDiscountService _discountService;
- private readonly ICustomerService _customerService;
private readonly IGroupService _groupService;
private readonly ISettingService _settingService;
private readonly IPermissionService _permissionService;
- public CustomerGroupsController(IDiscountService discountService,
- ICustomerService customerService,
+ public CustomerGroupsController(
+ IDiscountService discountService,
IGroupService groupService,
ISettingService settingService,
IPermissionService permissionService)
{
_discountService = discountService;
- _customerService = customerService;
_groupService = groupService;
_settingService = settingService;
_permissionService = permissionService;
@@ -71,7 +68,7 @@ namespace DiscountRules.CustomerGroups.Controllers
//add a prefix
ViewData.TemplateInfo.HtmlFieldPrefix = string.Format("DiscountRulesCustomerGroups{0}", !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "");
- return View("~/Plugins/DiscountRules.Standard/Views/CustomerGroups/Configure.cshtml", model);
+ return View(model);
}
[HttpPost]
@@ -97,8 +94,7 @@ namespace DiscountRules.CustomerGroups.Controllers
else
{
//save new rule
- discountRequirement = new DiscountRule
- {
+ discountRequirement = new DiscountRule {
DiscountRequirementRuleSystemName = "DiscountRules.Standard.MustBeAssignedToCustomerGroup"
};
discount.DiscountRules.Add(discountRequirement);
diff --git a/src/Plugins/DiscountRules.Standard/Controllers/HadSpentAmountController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
similarity index 97%
rename from src/Plugins/DiscountRules.Standard/Controllers/HadSpentAmountController.cs
rename to src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
index cd04c94da..5d42e0ce1 100644
--- a/src/Plugins/DiscountRules.Standard/Controllers/HadSpentAmountController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
@@ -57,7 +57,7 @@ namespace DiscountRules.Standard.HadSpentAmount.Controllers
//add a prefix
ViewData.TemplateInfo.HtmlFieldPrefix = string.Format("DiscountRulesHadSpentAmount{0}-{1}", discount.Id, !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "");
- return View("~/Plugins/DiscountRules.Standard/Views/HadSpentAmount/Configure.cshtml", model);
+ return View(model);
}
[HttpPost]
diff --git a/src/Plugins/DiscountRules.Standard/Controllers/HasAllProductsController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
similarity index 98%
rename from src/Plugins/DiscountRules.Standard/Controllers/HasAllProductsController.cs
rename to src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
index 2399abfac..ee18c0dc3 100644
--- a/src/Plugins/DiscountRules.Standard/Controllers/HasAllProductsController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
@@ -82,7 +82,7 @@ namespace DiscountRules.HasAllProducts.Controllers
//add a prefix
ViewData.TemplateInfo.HtmlFieldPrefix = string.Format("DiscountRulesHasAllProducts{0}-{1}", discount.Id, !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "");
- return View("~/Plugins/DiscountRules.Standard/Views/HasAllProducts/Configure.cshtml", model);
+ return View(model);
}
[HttpPost]
@@ -147,7 +147,7 @@ namespace DiscountRules.HasAllProducts.Controllers
ViewBag.productIdsInput = productIdsInput;
ViewBag.btnId = btnId;
- return View("~/Plugins/DiscountRules.Standard/Views/HasAllProducts/ProductAddPopup.cshtml", model);
+ return View(model);
}
[HttpPost]
diff --git a/src/Plugins/DiscountRules.Standard/Controllers/HasOneProductController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
similarity index 98%
rename from src/Plugins/DiscountRules.Standard/Controllers/HasOneProductController.cs
rename to src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
index 4bfe72318..55137f051 100644
--- a/src/Plugins/DiscountRules.Standard/Controllers/HasOneProductController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
@@ -83,7 +83,7 @@ namespace DiscountRules.HasOneProduct.Controllers
//add a prefix
ViewData.TemplateInfo.HtmlFieldPrefix = string.Format("DiscountRulesHasOneProduct{0}-{1}", discount.Id, !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "");
- return View("~/Plugins/DiscountRules.Standard/Views/HasOneProduct/Configure.cshtml", model);
+ return View(model);
}
[HttpPost]
@@ -148,7 +148,7 @@ namespace DiscountRules.HasOneProduct.Controllers
ViewBag.productIdsInput = productIdsInput;
ViewBag.btnId = btnId;
- return View("~/Plugins/DiscountRules.Standard/Views/HasOneProduct/ProductAddPopup.cshtml", model);
+ return View(model);
}
[HttpPost]
diff --git a/src/Plugins/DiscountRules.Standard/Controllers/ShoppingCartAmountController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
similarity index 97%
rename from src/Plugins/DiscountRules.Standard/Controllers/ShoppingCartAmountController.cs
rename to src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
index 771dae94b..314167379 100644
--- a/src/Plugins/DiscountRules.Standard/Controllers/ShoppingCartAmountController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
@@ -57,7 +57,7 @@ namespace DiscountRules.Standard.Controllers
//add a prefix
ViewData.TemplateInfo.HtmlFieldPrefix = string.Format("DiscountRulesShoppingCart{0}", !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "");
- return View("~/Plugins/DiscountRules.Standard/Views/ShoppingCartAmount/Configure.cshtml", model);
+ return View(model);
}
diff --git a/src/Plugins/DiscountRules.Standard/Views/CustomerGroups/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/CustomerGroups/Configure.cshtml
similarity index 100%
rename from src/Plugins/DiscountRules.Standard/Views/CustomerGroups/Configure.cshtml
rename to src/Plugins/DiscountRules.Standard/Areas/Admin/Views/CustomerGroups/Configure.cshtml
diff --git a/src/Plugins/DiscountRules.Standard/Views/HadSpentAmount/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HadSpentAmount/Configure.cshtml
similarity index 100%
rename from src/Plugins/DiscountRules.Standard/Views/HadSpentAmount/Configure.cshtml
rename to src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HadSpentAmount/Configure.cshtml
diff --git a/src/Plugins/DiscountRules.Standard/Views/HasAllProducts/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml
similarity index 100%
rename from src/Plugins/DiscountRules.Standard/Views/HasAllProducts/Configure.cshtml
rename to src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml
diff --git a/src/Plugins/DiscountRules.Standard/Views/HasAllProducts/ProductAddPopup.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtml
similarity index 100%
rename from src/Plugins/DiscountRules.Standard/Views/HasAllProducts/ProductAddPopup.cshtml
rename to src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtml
diff --git a/src/Plugins/DiscountRules.Standard/Views/HasOneProduct/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml
similarity index 100%
rename from src/Plugins/DiscountRules.Standard/Views/HasOneProduct/Configure.cshtml
rename to src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml
diff --git a/src/Plugins/DiscountRules.Standard/Views/HasOneProduct/ProductAddPopup.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml
similarity index 100%
rename from src/Plugins/DiscountRules.Standard/Views/HasOneProduct/ProductAddPopup.cshtml
rename to src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml
diff --git a/src/Plugins/DiscountRules.Standard/Views/ShoppingCartAmount/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/ShoppingCartAmount/Configure.cshtml
similarity index 100%
rename from src/Plugins/DiscountRules.Standard/Views/ShoppingCartAmount/Configure.cshtml
rename to src/Plugins/DiscountRules.Standard/Areas/Admin/Views/ShoppingCartAmount/Configure.cshtml
diff --git a/src/Plugins/DiscountRules.Standard/Views/_ViewImports.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/_ViewImports.cshtml
similarity index 100%
rename from src/Plugins/DiscountRules.Standard/Views/_ViewImports.cshtml
rename to src/Plugins/DiscountRules.Standard/Areas/Admin/Views/_ViewImports.cshtml
diff --git a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj
index b9841a67e..728edf3e9 100644
--- a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj
+++ b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
@@ -7,6 +7,7 @@
<Authors>UNIT-SOFT Sp. z o.o.</Authors>
<PackageProjectUrl>https://grandnode.com/</PackageProjectUrl>
<TieredCompilation>true</TieredCompilation>
+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -71,34 +72,7 @@
<ItemGroup>
<None Update="logo.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
- <None Update="Notes.txt">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
- <None Update="Views\CustomerGroups\Configure.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\HadSpentAmount\Configure.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\HasAllProducts\Configure.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\HasAllProducts\ProductAddPopup.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\HasOneProduct\Configure.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\HasOneProduct\ProductAddPopup.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\ShoppingCartAmount\Configure.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\_ViewImports.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
+ </None>
</ItemGroup>
</Project>
\ No newline at end of file