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.

Drop storeId params from IProductViewModelService; inject IAdminDataScope<Product> (ARCH-001 Phase 1 Task 9)

KrzysztofPajak06d4c9b4c2c1
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs
index 061a4a504..785128c8d 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs
@@ -449,15 +449,16 @@ public class BaseProductControllerTests
// --- List / Create default store-scoping -----------------------------------------------------------
[TestMethod]
- public async Task List_UsesScopeDefaultStoreId()
+ public async Task List_CallsPrepareProductListModel()
{
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
- _productViewModelServiceMock.Setup(s => s.PrepareProductListModel("store-1")).ReturnsAsync(new ProductListModel());
+ // PrepareProductListModel() now reads scope.DefaultStoreId internally (Task 9) - the controller
+ // no longer threads it through as an argument.
+ _productViewModelServiceMock.Setup(s => s.PrepareProductListModel()).ReturnsAsync(new ProductListModel());
var result = await _controller.List();
Assert.IsInstanceOfType<ViewResult>(result);
- _productViewModelServiceMock.Verify(s => s.PrepareProductListModel("store-1"), Times.Once);
+ _productViewModelServiceMock.Verify(s => s.PrepareProductListModel(), Times.Once);
}
[TestMethod]
@@ -531,32 +532,19 @@ public class BaseProductControllerTests
// --- RequiredProductAddPopup ----------------------------------------------------------------------
[TestMethod]
- public async Task RequiredProductAddPopup_UsesScopeDefaultStoreId()
+ public async Task RequiredProductAddPopup_CallsPrepareAddRequiredProductModel()
{
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
- _productViewModelServiceMock.Setup(s => s.PrepareAddRequiredProductModel("store-1"))
+ // PrepareAddRequiredProductModel() now reads scope internally (Task 9).
+ _productViewModelServiceMock.Setup(s => s.PrepareAddRequiredProductModel())
.ReturnsAsync(new ProductModel.AddRequiredProductModel());
var result = await _controller.RequiredProductAddPopup("input1") as ViewResult;
Assert.IsNotNull(result);
- _productViewModelServiceMock.Verify(s => s.PrepareAddRequiredProductModel("store-1"), Times.Once);
+ _productViewModelServiceMock.Verify(s => s.PrepareAddRequiredProductModel(), Times.Once);
Assert.AreEqual("input1", _controller.ViewBag.productIdsInput);
}
- [TestMethod]
- public async Task RequiredProductAddPopup_NoDefaultStoreId_PassesEmptyString()
- {
- _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
- _productViewModelServiceMock.Setup(s => s.PrepareAddRequiredProductModel(""))
- .ReturnsAsync(new ProductModel.AddRequiredProductModel());
-
- var result = await _controller.RequiredProductAddPopup("input1") as ViewResult;
-
- Assert.IsNotNull(result);
- _productViewModelServiceMock.Verify(s => s.PrepareAddRequiredProductModel(""), Times.Once);
- }
-
// --- RequiredProductAddPopupList -------------------------------------------------------------------
[TestMethod]
@@ -991,10 +979,10 @@ public class BaseProductControllerTests
// --- RelatedProductAddPopup (GET) --------------------------------------------------------------
[TestMethod]
- public async Task RelatedProductAddPopupGet_UsesScopeDefaultStoreId()
+ public async Task RelatedProductAddPopupGet_CallsPrepareRelatedProductModel()
{
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
- _productViewModelServiceMock.Setup(s => s.PrepareRelatedProductModel("store-1"))
+ // PrepareRelatedProductModel() now reads scope internally (Task 9).
+ _productViewModelServiceMock.Setup(s => s.PrepareRelatedProductModel())
.ReturnsAsync(new ProductModel.AddRelatedProductModel());
var result = await _controller.RelatedProductAddPopup("p1") as ViewResult;
@@ -1003,20 +991,7 @@ public class BaseProductControllerTests
var model = result.Model as ProductModel.AddRelatedProductModel;
Assert.IsNotNull(model);
Assert.AreEqual("p1", model.ProductId);
- _productViewModelServiceMock.Verify(s => s.PrepareRelatedProductModel("store-1"), Times.Once);
- }
-
- [TestMethod]
- public async Task RelatedProductAddPopupGet_NoDefaultStoreId_PassesEmptyString()
- {
- _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
- _productViewModelServiceMock.Setup(s => s.PrepareRelatedProductModel(""))
- .ReturnsAsync(new ProductModel.AddRelatedProductModel());
-
- var result = await _controller.RelatedProductAddPopup("p1") as ViewResult;
-
- Assert.IsNotNull(result);
- _productViewModelServiceMock.Verify(s => s.PrepareRelatedProductModel(""), Times.Once);
+ _productViewModelServiceMock.Verify(s => s.PrepareRelatedProductModel(), Times.Once);
}
// --- RelatedProductAddPopupList -----------------------------------------------------------------
@@ -1095,9 +1070,8 @@ public class BaseProductControllerTests
var product = new Product { Id = "p1" };
_productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
_scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
var reprepared = new ProductModel.AddRelatedProductModel();
- _productViewModelServiceMock.Setup(s => s.PrepareRelatedProductModel("store-1")).ReturnsAsync(reprepared);
+ _productViewModelServiceMock.Setup(s => s.PrepareRelatedProductModel()).ReturnsAsync(reprepared);
var model = new ProductModel.AddRelatedProductModel { ProductId = "p1" };
_controller.ModelState.AddModelError("x", "error");
@@ -1208,10 +1182,10 @@ public class BaseProductControllerTests
// --- SimilarProductAddPopup (GET) --------------------------------------------------------------
[TestMethod]
- public async Task SimilarProductAddPopupGet_UsesScopeDefaultStoreId()
+ public async Task SimilarProductAddPopupGet_CallsPrepareSimilarProductModel()
{
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
- _productViewModelServiceMock.Setup(s => s.PrepareSimilarProductModel("store-1"))
+ // PrepareSimilarProductModel() now reads scope internally (Task 9).
+ _productViewModelServiceMock.Setup(s => s.PrepareSimilarProductModel())
.ReturnsAsync(new ProductModel.AddSimilarProductModel());
var result = await _controller.SimilarProductAddPopup("p1") as ViewResult;
@@ -1220,20 +1194,7 @@ public class BaseProductControllerTests
var model = result.Model as ProductModel.AddSimilarProductModel;
Assert.IsNotNull(model);
Assert.AreEqual("p1", model.ProductId);
- _productViewModelServiceMock.Verify(s => s.PrepareSimilarProductModel("store-1"), Times.Once);
- }
-
- [TestMethod]
- public async Task SimilarProductAddPopupGet_NoDefaultStoreId_PassesEmptyString()
- {
- _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
- _productViewModelServiceMock.Setup(s => s.PrepareSimilarProductModel(""))
- .ReturnsAsync(new ProductModel.AddSimilarProductModel());
-
- var result = await _controller.SimilarProductAddPopup("p1") as ViewResult;
-
- Assert.IsNotNull(result);
- _productViewModelServiceMock.Verify(s => s.PrepareSimilarProductModel(""), Times.Once);
+ _productViewModelServiceMock.Verify(s => s.PrepareSimilarProductModel(), Times.Once);
}
// --- SimilarProductAddPopupList -----------------------------------------------------------------
@@ -1312,9 +1273,8 @@ public class BaseProductControllerTests
var product = new Product { Id = "p1" };
_productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
_scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
var reprepared = new ProductModel.AddSimilarProductModel();
- _productViewModelServiceMock.Setup(s => s.PrepareSimilarProductModel("store-1")).ReturnsAsync(reprepared);
+ _productViewModelServiceMock.Setup(s => s.PrepareSimilarProductModel()).ReturnsAsync(reprepared);
var model = new ProductModel.AddSimilarProductModel { ProductId = "p1" };
_controller.ModelState.AddModelError("x", "error");
@@ -1425,10 +1385,10 @@ public class BaseProductControllerTests
// --- BundleProductAddPopup (GET) --------------------------------------------------------------
[TestMethod]
- public async Task BundleProductAddPopupGet_UsesScopeDefaultStoreId()
+ public async Task BundleProductAddPopupGet_CallsPrepareBundleProductModel()
{
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
- _productViewModelServiceMock.Setup(s => s.PrepareBundleProductModel("store-1"))
+ // PrepareBundleProductModel() now reads scope internally (Task 9).
+ _productViewModelServiceMock.Setup(s => s.PrepareBundleProductModel())
.ReturnsAsync(new ProductModel.AddBundleProductModel());
var result = await _controller.BundleProductAddPopup("p1") as ViewResult;
@@ -1437,20 +1397,7 @@ public class BaseProductControllerTests
var model = result.Model as ProductModel.AddBundleProductModel;
Assert.IsNotNull(model);
Assert.AreEqual("p1", model.ProductId);
- _productViewModelServiceMock.Verify(s => s.PrepareBundleProductModel("store-1"), Times.Once);
- }
-
- [TestMethod]
- public async Task BundleProductAddPopupGet_NoDefaultStoreId_PassesEmptyString()
- {
- _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
- _productViewModelServiceMock.Setup(s => s.PrepareBundleProductModel(""))
- .ReturnsAsync(new ProductModel.AddBundleProductModel());
-
- var result = await _controller.BundleProductAddPopup("p1") as ViewResult;
-
- Assert.IsNotNull(result);
- _productViewModelServiceMock.Verify(s => s.PrepareBundleProductModel(""), Times.Once);
+ _productViewModelServiceMock.Verify(s => s.PrepareBundleProductModel(), Times.Once);
}
// --- BundleProductAddPopupList -----------------------------------------------------------------
@@ -1529,9 +1476,8 @@ public class BaseProductControllerTests
var product = new Product { Id = "p1" };
_productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
_scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
var reprepared = new ProductModel.AddBundleProductModel();
- _productViewModelServiceMock.Setup(s => s.PrepareBundleProductModel("store-1")).ReturnsAsync(reprepared);
+ _productViewModelServiceMock.Setup(s => s.PrepareBundleProductModel()).ReturnsAsync(reprepared);
var model = new ProductModel.AddBundleProductModel { ProductId = "p1" };
_controller.ModelState.AddModelError("x", "error");
@@ -1636,10 +1582,10 @@ public class BaseProductControllerTests
// --- CrossSellProductAddPopup (GET) -------------------------------------------------------------
[TestMethod]
- public async Task CrossSellProductAddPopupGet_UsesScopeDefaultStoreId()
+ public async Task CrossSellProductAddPopupGet_CallsPrepareCrossSellProductModel()
{
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
- _productViewModelServiceMock.Setup(s => s.PrepareCrossSellProductModel("store-1"))
+ // PrepareCrossSellProductModel() now reads scope internally (Task 9).
+ _productViewModelServiceMock.Setup(s => s.PrepareCrossSellProductModel())
.ReturnsAsync(new ProductModel.AddCrossSellProductModel());
var result = await _controller.CrossSellProductAddPopup("p1") as ViewResult;
@@ -1648,20 +1594,7 @@ public class BaseProductControllerTests
var model = result.Model as ProductModel.AddCrossSellProductModel;
Assert.IsNotNull(model);
Assert.AreEqual("p1", model.ProductId);
- _productViewModelServiceMock.Verify(s => s.PrepareCrossSellProductModel("store-1"), Times.Once);
- }
-
- [TestMethod]
- public async Task CrossSellProductAddPopupGet_NoDefaultStoreId_PassesEmptyString()
- {
- _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
- _productViewModelServiceMock.Setup(s => s.PrepareCrossSellProductModel(""))
- .ReturnsAsync(new ProductModel.AddCrossSellProductModel());
-
- var result = await _controller.CrossSellProductAddPopup("p1") as ViewResult;
-
- Assert.IsNotNull(result);
- _productViewModelServiceMock.Verify(s => s.PrepareCrossSellProductModel(""), Times.Once);
+ _productViewModelServiceMock.Verify(s => s.PrepareCrossSellProductModel(), Times.Once);
}
// --- CrossSellProductAddPopupList ---------------------------------------------------------------
@@ -1740,9 +1673,8 @@ public class BaseProductControllerTests
var product = new Product { Id = "p1" };
_productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
_scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
var reprepared = new ProductModel.AddCrossSellProductModel();
- _productViewModelServiceMock.Setup(s => s.PrepareCrossSellProductModel("store-1")).ReturnsAsync(reprepared);
+ _productViewModelServiceMock.Setup(s => s.PrepareCrossSellProductModel()).ReturnsAsync(reprepared);
var model = new ProductModel.AddCrossSellProductModel { ProductId = "p1" };
_controller.ModelState.AddModelError("x", "error");
@@ -1848,10 +1780,10 @@ public class BaseProductControllerTests
// --- RecommendedProductAddPopup (GET) -------------------------------------------------------------
[TestMethod]
- public async Task RecommendedProductAddPopupGet_UsesScopeDefaultStoreId()
+ public async Task RecommendedProductAddPopupGet_CallsPrepareRecommendedProductModel()
{
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
- _productViewModelServiceMock.Setup(s => s.PrepareRecommendedProductModel("store-1"))
+ // PrepareRecommendedProductModel() now reads scope internally (Task 9).
+ _productViewModelServiceMock.Setup(s => s.PrepareRecommendedProductModel())
.ReturnsAsync(new ProductModel.AddRecommendedProductModel());
var result = await _controller.RecommendedProductAddPopup("p1") as ViewResult;
@@ -1860,20 +1792,7 @@ public class BaseProductControllerTests
var model = result.Model as ProductModel.AddRecommendedProductModel;
Assert.IsNotNull(model);
Assert.AreEqual("p1", model.ProductId);
- _productViewModelServiceMock.Verify(s => s.PrepareRecommendedProductModel("store-1"), Times.Once);
- }
-
- [TestMethod]
- public async Task RecommendedProductAddPopupGet_NoDefaultStoreId_PassesEmptyString()
- {
- _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
- _productViewModelServiceMock.Setup(s => s.PrepareRecommendedProductModel(""))
- .ReturnsAsync(new ProductModel.AddRecommendedProductModel());
-
- var result = await _controller.RecommendedProductAddPopup("p1") as ViewResult;
-
- Assert.IsNotNull(result);
- _productViewModelServiceMock.Verify(s => s.PrepareRecommendedProductModel(""), Times.Once);
+ _productViewModelServiceMock.Verify(s => s.PrepareRecommendedProductModel(), Times.Once);
}
// --- RecommendedProductAddPopupList ---------------------------------------------------------------
@@ -1952,9 +1871,8 @@ public class BaseProductControllerTests
var product = new Product { Id = "p1" };
_productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
_scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
var reprepared = new ProductModel.AddRecommendedProductModel();
- _productViewModelServiceMock.Setup(s => s.PrepareRecommendedProductModel("store-1")).ReturnsAsync(reprepared);
+ _productViewModelServiceMock.Setup(s => s.PrepareRecommendedProductModel()).ReturnsAsync(reprepared);
var model = new ProductModel.AddRecommendedProductModel { ProductId = "p1" };
_controller.ModelState.AddModelError("x", "error");
@@ -2085,10 +2003,10 @@ public class BaseProductControllerTests
// --- AssociatedProductAddPopup (GET) -------------------------------------------------------------
[TestMethod]
- public async Task AssociatedProductAddPopupGet_UsesScopeDefaultStoreId()
+ public async Task AssociatedProductAddPopupGet_CallsPrepareAssociatedProductModel()
{
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
- _productViewModelServiceMock.Setup(s => s.PrepareAssociatedProductModel("store-1"))
+ // PrepareAssociatedProductModel() now reads scope internally (Task 9).
+ _productViewModelServiceMock.Setup(s => s.PrepareAssociatedProductModel())
.ReturnsAsync(new ProductModel.AddAssociatedProductModel());
var result = await _controller.AssociatedProductAddPopup("p1") as ViewResult;
@@ -2097,20 +2015,7 @@ public class BaseProductControllerTests
var model = result.Model as ProductModel.AddAssociatedProductModel;
Assert.IsNotNull(model);
Assert.AreEqual("p1", model.ProductId);
- _productViewModelServiceMock.Verify(s => s.PrepareAssociatedProductModel("store-1"), Times.Once);
- }
-
- [TestMethod]
- public async Task AssociatedProductAddPopupGet_NoDefaultStoreId_PassesEmptyString()
- {
- _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
- _productViewModelServiceMock.Setup(s => s.PrepareAssociatedProductModel(""))
- .ReturnsAsync(new ProductModel.AddAssociatedProductModel());
-
- var result = await _controller.AssociatedProductAddPopup("p1") as ViewResult;
-
- Assert.IsNotNull(result);
- _productViewModelServiceMock.Verify(s => s.PrepareAssociatedProductModel(""), Times.Once);
+ _productViewModelServiceMock.Verify(s => s.PrepareAssociatedProductModel(), Times.Once);
}
// --- AssociatedProductAddPopupList ---------------------------------------------------------------
@@ -2238,9 +2143,8 @@ public class BaseProductControllerTests
var parent = new Product { Id = "p1" };
_productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(parent);
_scopeMock.Setup(s => s.HasAccess(parent)).ReturnsAsync(true);
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
var reprepared = new ProductModel.AddAssociatedProductModel();
- _productViewModelServiceMock.Setup(s => s.PrepareAssociatedProductModel("store-1")).ReturnsAsync(reprepared);
+ _productViewModelServiceMock.Setup(s => s.PrepareAssociatedProductModel()).ReturnsAsync(reprepared);
var model = new ProductModel.AddAssociatedProductModel { ProductId = "p1" };
_controller.ModelState.AddModelError("x", "error");
@@ -3008,29 +2912,16 @@ public class BaseProductControllerTests
// --- Bulk editing --------------------------------------------------------------------------------
[TestMethod]
- public async Task BulkEdit_UsesScopeDefaultStoreId()
+ public async Task BulkEdit_CallsPrepareBulkEditListModel()
{
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store1");
- _productViewModelServiceMock.Setup(s => s.PrepareBulkEditListModel("store1"))
+ // PrepareBulkEditListModel() now reads scope internally (Task 9).
+ _productViewModelServiceMock.Setup(s => s.PrepareBulkEditListModel())
.ReturnsAsync(new BulkEditListModel());
var result = await _controller.BulkEdit();
Assert.IsInstanceOfType(result, typeof(ViewResult));
- _productViewModelServiceMock.Verify(s => s.PrepareBulkEditListModel("store1"), Times.Once);
- }
-
- [TestMethod]
- public async Task BulkEdit_NullDefaultStoreId_PassesEmptyString()
- {
- // Admin/Vendor: scope.DefaultStoreId is null (Admin is global; Vendor is not store-scoped) -
- // matches Admin's original parameterless call and Vendor's own service's parameterless method.
- _productViewModelServiceMock.Setup(s => s.PrepareBulkEditListModel(""))
- .ReturnsAsync(new BulkEditListModel());
-
- await _controller.BulkEdit();
-
- _productViewModelServiceMock.Verify(s => s.PrepareBulkEditListModel(""), Times.Once);
+ _productViewModelServiceMock.Verify(s => s.PrepareBulkEditListModel(), Times.Once);
}
[TestMethod]
@@ -3335,7 +3226,7 @@ public class BaseProductControllerTests
Assert.IsInstanceOfType<JsonResult>(result);
_translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);
_productViewModelServiceMock.Verify(
- s => s.PrepareTierPriceModel(It.IsAny<Product>(), It.IsAny<string>()), Times.Never);
+ s => s.PrepareTierPriceModel(It.IsAny<Product>()), Times.Never);
}
[TestMethod]
@@ -3354,14 +3245,14 @@ public class BaseProductControllerTests
}
[TestMethod]
- public async Task TierPriceList_ScopeGrantsAccess_UsesScopeDefaultStoreId_ReturnsGrid()
+ public async Task TierPriceList_ScopeGrantsAccess_ReturnsGrid()
{
+ // PrepareTierPriceModel(product) now reads scope internally (Task 9).
var product = new Product { Id = "p1" };
_productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
_scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store1");
var tierPrices = new List<ProductModel.TierPriceModel> { new() { Id = "tp1" } };
- _productViewModelServiceMock.Setup(s => s.PrepareTierPriceModel(product, "store1")).ReturnsAsync(tierPrices);
+ _productViewModelServiceMock.Setup(s => s.PrepareTierPriceModel(product)).ReturnsAsync(tierPrices);
var result = await _controller.TierPriceList(new Grand.Web.Common.DataSource.DataSourceRequest(), "p1");
@@ -3372,33 +3263,17 @@ public class BaseProductControllerTests
Assert.AreEqual(1, gridModel.Total);
}
- [TestMethod]
- public async Task TierPriceList_ScopeGrantsAccess_NullDefaultStoreId_PassesEmptyString()
- {
- var product = new Product { Id = "p1" };
- _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
- _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
- _productViewModelServiceMock.Setup(s => s.PrepareTierPriceModel(product, ""))
- .ReturnsAsync(new List<ProductModel.TierPriceModel>());
-
- var result = await _controller.TierPriceList(new Grand.Web.Common.DataSource.DataSourceRequest(), "p1");
-
- Assert.IsInstanceOfType<JsonResult>(result);
- _productViewModelServiceMock.Verify(s => s.PrepareTierPriceModel(product, ""), Times.Once);
- }
-
// --- TierPriceCreatePopup (GET) ----------------------------------------------------------------
[TestMethod]
- public async Task TierPriceCreatePopup_Get_PreparesModelWithScopeDefaultStoreId()
+ public async Task TierPriceCreatePopup_Get_PreparesModel()
{
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store1");
-
+ // PrepareTierPriceModel(model) now reads scope internally (Task 9).
var result = await _controller.TierPriceCreatePopup("p1");
Assert.IsInstanceOfType<ViewResult>(result);
_productViewModelServiceMock.Verify(
- s => s.PrepareTierPriceModel(It.Is<ProductModel.TierPriceModel>(m => m.ProductId == "p1"), "store1"),
+ s => s.PrepareTierPriceModel(It.Is<ProductModel.TierPriceModel>(m => m.ProductId == "p1")),
Times.Once);
}
@@ -3459,7 +3334,7 @@ public class BaseProductControllerTests
Assert.IsNotNull(content);
Assert.AreEqual("This is not your product", content.Content);
_productViewModelServiceMock.Verify(
- s => s.PrepareTierPriceModel(It.IsAny<ProductModel.TierPriceModel>(), It.IsAny<string>()), Times.Never);
+ s => s.PrepareTierPriceModel(It.IsAny<ProductModel.TierPriceModel>()), Times.Never);
}
[TestMethod]
@@ -3477,19 +3352,19 @@ public class BaseProductControllerTests
}
[TestMethod]
- public async Task TierPriceEditPopup_Get_ScopeGrantsAccess_PreparesModelWithScopeDefaultStoreId()
+ public async Task TierPriceEditPopup_Get_ScopeGrantsAccess_PreparesModel()
{
+ // PrepareTierPriceModel(model) now reads scope internally (Task 9).
var product = new Product { Id = "p1" };
product.TierPrices.Add(new TierPrice { Id = "tp1" });
_productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
_scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store1");
var result = await _controller.TierPriceEditPopup("tp1", "p1");
Assert.IsInstanceOfType<ViewResult>(result);
_productViewModelServiceMock.Verify(
- s => s.PrepareTierPriceModel(It.Is<ProductModel.TierPriceModel>(m => m.ProductId == "p1"), "store1"),
+ s => s.PrepareTierPriceModel(It.Is<ProductModel.TierPriceModel>(m => m.ProductId == "p1")),
Times.Once);
}
@@ -4598,31 +4473,19 @@ public class BaseProductControllerTests
// --- AssociateProductToAttributeValuePopup (GET) ------------------------------------------------
[TestMethod]
- public async Task AssociateProductToAttributeValuePopup_Get_PassesScopeDefaultStoreId()
+ public async Task AssociateProductToAttributeValuePopup_Get_CallsPrepareAssociateProductToAttributeValueModel()
{
- _scopeMock.Setup(s => s.DefaultStoreId).Returns("store1");
- _productViewModelServiceMock.Setup(s => s.PrepareAssociateProductToAttributeValueModel("store1"))
+ // PrepareAssociateProductToAttributeValueModel() now reads scope internally (Task 9).
+ _productViewModelServiceMock.Setup(s => s.PrepareAssociateProductToAttributeValueModel())
.ReturnsAsync(new ProductModel.ProductAttributeValueModel.AssociateProductToAttributeValueModel());
var result = await _controller.AssociateProductToAttributeValuePopup();
Assert.IsInstanceOfType<ViewResult>(result);
- _productViewModelServiceMock.Verify(s => s.PrepareAssociateProductToAttributeValueModel("store1"),
+ _productViewModelServiceMock.Verify(s => s.PrepareAssociateProductToAttributeValueModel(),
Times.Once);
}
- [TestMethod]
- public async Task AssociateProductToAttributeValuePopup_Get_NullDefaultStoreId_PassesEmptyString()
- {
- _productViewModelServiceMock.Setup(s => s.PrepareAssociateProductToAttributeValueModel(""))
- .ReturnsAsync(new ProductModel.ProductAttributeValueModel.AssociateProductToAttributeValueModel());
-
- var result = await _controller.AssociateProductToAttributeValuePopup();
-
- Assert.IsInstanceOfType<ViewResult>(result);
- _productViewModelServiceMock.Verify(s => s.PrepareAssociateProductToAttributeValueModel(""), Times.Once);
- }
-
// --- AssociateProductToAttributeValuePopupList (POST) -------------------------------------------
[TestMethod]
diff --git a/src/Tests/Grand.Web.Admin.Tests/Services/GlobalAdminDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Services/GlobalAdminDataScopeTests.cs
index 18148315e..1f01ea0bd 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Services/GlobalAdminDataScopeTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Services/GlobalAdminDataScopeTests.cs
@@ -39,4 +39,11 @@ public class GlobalAdminDataScopeTests
var scope = new GlobalAdminDataScope<Product>();
Assert.AreEqual("Admin", scope.ResourceKeyPrefix);
}
+
+ [TestMethod]
+ public void ShowStoreSelector_IsTrue()
+ {
+ var scope = new GlobalAdminDataScope<Product>();
+ Assert.IsTrue(scope.ShowStoreSelector);
+ }
}
diff --git a/src/Tests/Grand.Web.Admin.Tests/Services/ProductViewModelServiceTests.cs b/src/Tests/Grand.Web.Admin.Tests/Services/ProductViewModelServiceTests.cs
index 956f0b515..d0b401084 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Services/ProductViewModelServiceTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Services/ProductViewModelServiceTests.cs
@@ -23,6 +23,7 @@ using Grand.Domain.Shipping;
using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Infrastructure;
+using Grand.Web.AdminShared.Interfaces;
using Grand.Web.AdminShared.Models.Catalog;
using Grand.Web.AdminShared.Services;
using Grand.Web.Common.Localization;
@@ -42,6 +43,7 @@ public class ProductViewModelServiceTests
private Mock<IEnumTranslationService> _enumTranslationServiceMock;
private Mock<IMeasureService> _measureServiceMock;
private ProductViewModelService _productViewModelService;
+ private Mock<IAdminDataScope<Product>> _scopeMock;
private Mock<IStoreService> _storeServiceMock;
private Mock<ITaxCategoryService> _taxCategoryServiceMock;
private Mock<ITranslationService> _translationServiceMock;
@@ -98,6 +100,12 @@ public class ProductViewModelServiceTests
.Setup(e => e.ToSelectList(It.IsAny<ProductType>(), It.IsAny<bool>(), It.IsAny<int[]>()))
.Returns(new SelectList(Enumerable.Empty<SelectListItem>()));
+ // Default: Admin's Global scope - no default store, homepage option and store dropdown both show.
+ _scopeMock = new Mock<IAdminDataScope<Product>>();
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+ _scopeMock.Setup(s => s.ResourceKeyPrefix).Returns("Admin");
+ _scopeMock.Setup(s => s.ShowStoreSelector).Returns(true);
+
_productViewModelService = new ProductViewModelService(
new Mock<IProductService>().Object,
new Mock<IInventoryManageService>().Object,
@@ -135,7 +143,8 @@ public class ProductViewModelServiceTests
new Mock<IAuctionService>().Object,
new Mock<IPriceFormatter>().Object,
new Mock<ISeNameService>().Object,
- _enumTranslationServiceMock.Object);
+ _enumTranslationServiceMock.Object,
+ _scopeMock.Object);
}
[TestMethod]
@@ -179,11 +188,12 @@ public class ProductViewModelServiceTests
[TestMethod]
public async Task PrepareProductListModel_UseStoreIdForWarehouses()
{
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns(StaffStoreId);
_warehouseServiceMock
.Setup(w => w.GetAllWarehouses(StaffStoreId, It.IsAny<int>(), It.IsAny<int>()))
.ReturnsAsync(new PagedList<Warehouse> { new() { Id = "warehouseId", Name = "Main" } });
- var model = await _productViewModelService.PrepareProductListModel(StaffStoreId);
+ var model = await _productViewModelService.PrepareProductListModel();
_warehouseServiceMock.Verify(w => w.GetAllWarehouses(StaffStoreId, It.IsAny<int>(), It.IsAny<int>()),
Times.Once);
@@ -193,14 +203,49 @@ public class ProductViewModelServiceTests
[TestMethod]
public async Task PrepareProductListModel_FilterStoresByStoreId()
{
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store1");
_storeServiceMock.Setup(s => s.GetAllStores()).ReturnsAsync(new List<Store> {
new() { Id = "store1", Shortcut = "Store 1" },
new() { Id = "store2", Shortcut = "Store 2" }
});
- var model = await _productViewModelService.PrepareProductListModel("store1");
+ var model = await _productViewModelService.PrepareProductListModel();
Assert.IsTrue(model.AvailableStores.Any(x => x.Value == "store1"));
Assert.IsFalse(model.AvailableStores.Any(x => x.Value == "store2"));
}
+
+ [TestMethod]
+ public async Task PrepareProductListModel_GlobalScope_IncludesHomepageOptionAndStoreDropdown()
+ {
+ // Default Setup() scope: Admin's Global scope (DefaultStoreId null, ShowStoreSelector true).
+ _storeServiceMock.Setup(s => s.GetAllStores()).ReturnsAsync(new List<Store> {
+ new() { Id = "store1", Shortcut = "Store 1" }
+ });
+
+ var model = await _productViewModelService.PrepareProductListModel();
+
+ Assert.IsTrue(model.AvailablePublishedOptions.Any(x => x.Value == "3"),
+ "Admin should offer the 'Show on homepage' option.");
+ Assert.IsTrue(model.AvailableStores.Any(x => x.Value == "store1"),
+ "Admin should offer a store dropdown.");
+ }
+
+ [TestMethod]
+ public async Task PrepareProductListModel_VendorScope_HidesHomepageOptionAndStoreDropdown()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+ _scopeMock.Setup(s => s.ResourceKeyPrefix).Returns("Vendor");
+ _scopeMock.Setup(s => s.ShowStoreSelector).Returns(false);
+ _storeServiceMock.Setup(s => s.GetAllStores()).ReturnsAsync(new List<Store> {
+ new() { Id = "store1", Shortcut = "Store 1" }
+ });
+
+ var model = await _productViewModelService.PrepareProductListModel();
+
+ Assert.IsFalse(model.AvailablePublishedOptions.Any(x => x.Value == "3"),
+ "Vendor can't feature products on the homepage.");
+ Assert.IsFalse(model.AvailableStores.Any(),
+ "Vendor doesn't pick stores - no dropdown should be populated at all.");
+ }
}
diff --git a/src/Tests/Grand.Web.Store.Tests/Services/StoreAdminDataScopeTests.cs b/src/Tests/Grand.Web.Store.Tests/Services/StoreAdminDataScopeTests.cs
index 0b3f56b47..f0326fea8 100644
--- a/src/Tests/Grand.Web.Store.Tests/Services/StoreAdminDataScopeTests.cs
+++ b/src/Tests/Grand.Web.Store.Tests/Services/StoreAdminDataScopeTests.cs
@@ -83,6 +83,13 @@ public class StoreAdminDataScopeTests
Assert.AreEqual("Admin", scope.ResourceKeyPrefix);
}
+ [TestMethod]
+ public void ShowStoreSelector_IsTrue()
+ {
+ var scope = new StoreAdminDataScope<Product>(_contextAccessor.Object);
+ Assert.IsTrue(scope.ShowStoreSelector);
+ }
+
// CanView is deliberately looser than HasAccess: it mirrors Store's original Edit(GET)/CopyProduct
// rule (a global or multi-store product including the staff member's store may be viewed/copied;
// only a product limited to stores that exclude the staff member's store is denied). See the
diff --git a/src/Tests/Grand.Web.Vendor.Tests/Services/VendorProductDataScopeTests.cs b/src/Tests/Grand.Web.Vendor.Tests/Services/VendorProductDataScopeTests.cs
index cbbd94866..39772d5c7 100644
--- a/src/Tests/Grand.Web.Vendor.Tests/Services/VendorProductDataScopeTests.cs
+++ b/src/Tests/Grand.Web.Vendor.Tests/Services/VendorProductDataScopeTests.cs
@@ -73,4 +73,11 @@ public class VendorProductDataScopeTests
var scope = new VendorProductDataScope(_contextAccessor.Object);
Assert.AreEqual("Vendor", scope.ResourceKeyPrefix);
}
+
+ [TestMethod]
+ public void ShowStoreSelector_IsFalse()
+ {
+ var scope = new VendorProductDataScope(_contextAccessor.Object);
+ Assert.IsFalse(scope.ShowStoreSelector);
+ }
}
diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs
index 6bc2ab8cb..2b8476098 100644
--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs
+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs
@@ -94,7 +94,7 @@ public abstract class BaseProductController(
public async Task<IActionResult> List()
{
- var model = await productViewModelService.PrepareProductListModel(scope.DefaultStoreId ?? "");
+ var model = await productViewModelService.PrepareProductListModel();
return View(model);
}
@@ -369,10 +369,10 @@ public abstract class BaseProductController(
[PermissionAuthorizeAction(PermissionActionName.Edit)]
public async Task<IActionResult> RequiredProductAddPopup(string productIdsInput)
{
- // scope.DefaultStoreId already encodes the per-host default exactly: null for Admin (global) and
- // Vendor (not store-scoped), StaffStoreId for Store - matching Store's original
- // PrepareAddRequiredProductModel(StaffStoreId) call and Admin/Vendor's parameterless call.
- var model = await productViewModelService.PrepareAddRequiredProductModel(scope.DefaultStoreId ?? "");
+ // PrepareAddRequiredProductModel() now reads scope internally (Task 9) - the injected
+ // IAdminDataScope<Product> already encodes the per-host default exactly: null for Admin
+ // (global) and Vendor (not store-scoped), StaffStoreId for Store.
+ var model = await productViewModelService.PrepareAddRequiredProductModel();
// Unused by any of the three views (all three read productIdsInput straight off the query string
// via Context.Request.Query, not ViewBag), but Admin and Vendor both set it and Store silently
// drops its own parameter - kept here for parity; it is inert either way.
@@ -657,9 +657,9 @@ public abstract class BaseProductController(
{
// No access check here in any of the three original hosts (Admin/Store/Vendor all open this
// popup unconditionally once the Edit permission is satisfied) - only the mutating POST below
- // ties access to a specific product. scope.DefaultStoreId ?? "" matches Store's
- // PrepareRelatedProductModel(StaffStoreId) call and Admin/Vendor's parameterless call.
- var model = await productViewModelService.PrepareRelatedProductModel(scope.DefaultStoreId ?? "");
+ // ties access to a specific product. PrepareRelatedProductModel() now reads scope
+ // internally (Task 9).
+ var model = await productViewModelService.PrepareRelatedProductModel();
model.ProductId = productId;
return View(model);
}
@@ -710,7 +710,7 @@ public abstract class BaseProductController(
protected virtual async Task<IActionResult> InvalidRelatedProductAddPopupResult(ProductModel.AddRelatedProductModel model)
{
Error(ModelState);
- model = await productViewModelService.PrepareRelatedProductModel(scope.DefaultStoreId ?? "");
+ model = await productViewModelService.PrepareRelatedProductModel();
return View(model);
}
@@ -790,9 +790,9 @@ public abstract class BaseProductController(
{
// No access check here in any of the three original hosts (Admin/Store/Vendor all open this
// popup unconditionally once the Edit permission is satisfied) - only the mutating POST below
- // ties access to a specific product. scope.DefaultStoreId ?? "" matches Store's
- // PrepareSimilarProductModel(StaffStoreId) call and Admin/Vendor's parameterless call.
- var model = await productViewModelService.PrepareSimilarProductModel(scope.DefaultStoreId ?? "");
+ // ties access to a specific product. PrepareSimilarProductModel() now reads scope
+ // internally (Task 9).
+ var model = await productViewModelService.PrepareSimilarProductModel();
model.ProductId = productId;
return View(model);
}
@@ -843,7 +843,7 @@ public abstract class BaseProductController(
protected virtual async Task<IActionResult> InvalidSimilarProductAddPopupResult(ProductModel.AddSimilarProductModel model)
{
Error(ModelState);
- model = await productViewModelService.PrepareSimilarProductModel(scope.DefaultStoreId ?? "");
+ model = await productViewModelService.PrepareSimilarProductModel();
return View(model);
}
@@ -923,9 +923,9 @@ public abstract class BaseProductController(
{
// No access check here in any of the three original hosts (Admin/Store/Vendor all open this
// popup unconditionally once the Edit permission is satisfied) - only the mutating POST below
- // ties access to a specific product. scope.DefaultStoreId ?? "" matches Store's
- // PrepareBundleProductModel(StaffStoreId) call and Admin/Vendor's parameterless call.
- var model = await productViewModelService.PrepareBundleProductModel(scope.DefaultStoreId ?? "");
+ // ties access to a specific product. PrepareBundleProductModel() now reads scope
+ // internally (Task 9).
+ var model = await productViewModelService.PrepareBundleProductModel();
model.ProductId = productId;
return View(model);
}
@@ -976,7 +976,7 @@ public abstract class BaseProductController(
protected virtual async Task<IActionResult> InvalidBundleProductAddPopupResult(ProductModel.AddBundleProductModel model)
{
Error(ModelState);
- model = await productViewModelService.PrepareBundleProductModel(scope.DefaultStoreId ?? "");
+ model = await productViewModelService.PrepareBundleProductModel();
return View(model);
}
@@ -1045,9 +1045,9 @@ public abstract class BaseProductController(
{
// No access check here in any of the three original hosts (Admin/Store/Vendor all open this
// popup unconditionally once the Edit permission is satisfied) - only the mutating POST below
- // ties access to a specific product. scope.DefaultStoreId ?? "" matches Store's
- // PrepareCrossSellProductModel(StaffStoreId) call and Admin/Vendor's parameterless call.
- var model = await productViewModelService.PrepareCrossSellProductModel(scope.DefaultStoreId ?? "");
+ // ties access to a specific product. PrepareCrossSellProductModel() now reads scope
+ // internally (Task 9).
+ var model = await productViewModelService.PrepareCrossSellProductModel();
model.ProductId = productId;
return View(model);
}
@@ -1098,7 +1098,7 @@ public abstract class BaseProductController(
protected virtual async Task<IActionResult> InvalidCrossSellProductAddPopupResult(ProductModel.AddCrossSellProductModel model)
{
Error(ModelState);
- model = await productViewModelService.PrepareCrossSellProductModel(scope.DefaultStoreId ?? "");
+ model = await productViewModelService.PrepareCrossSellProductModel();
return View(model);
}
@@ -1167,9 +1167,9 @@ public abstract class BaseProductController(
{
// No access check here in any of the three original hosts (Admin/Store/Vendor all open this
// popup unconditionally once the Edit permission is satisfied) - only the mutating POST below
- // ties access to a specific product. scope.DefaultStoreId ?? "" matches Store's
- // PrepareRecommendedProductModel(StaffStoreId) call and Admin/Vendor's parameterless call.
- var model = await productViewModelService.PrepareRecommendedProductModel(scope.DefaultStoreId ?? "");
+ // ties access to a specific product. PrepareRecommendedProductModel() now reads scope
+ // internally (Task 9).
+ var model = await productViewModelService.PrepareRecommendedProductModel();
model.ProductId = productId;
return View(model);
}
@@ -1220,7 +1220,7 @@ public abstract class BaseProductController(
protected virtual async Task<IActionResult> InvalidRecommendedProductAddPopupResult(ProductModel.AddRecommendedProductModel model)
{
Error(ModelState);
- model = await productViewModelService.PrepareRecommendedProductModel(scope.DefaultStoreId ?? "");
+ model = await productViewModelService.PrepareRecommendedProductModel();
return View(model);
}
@@ -1315,9 +1315,8 @@ public abstract class BaseProductController(
{
// No access check here in any of the three original hosts (all open this popup unconditionally
// once the Edit permission is satisfied) - only the mutating actions below tie access to a
- // specific product. scope.DefaultStoreId ?? "" matches Store's
- // PrepareAssociatedProductModel(StaffStoreId) call and Admin/Vendor's parameterless call.
- var model = await productViewModelService.PrepareAssociatedProductModel(scope.DefaultStoreId ?? "");
+ // specific product. PrepareAssociatedProductModel() now reads scope internally (Task 9).
+ var model = await productViewModelService.PrepareAssociatedProductModel();
model.ProductId = productId;
return View(model);
}
@@ -1389,7 +1388,7 @@ public abstract class BaseProductController(
// AssociatedProductAddPopup(POST) does not use the Content(ModelState.GetErrors()) shortcut it
// uses in those other regions, so no host-specific hook is needed for this action.
Error(ModelState);
- model = await productViewModelService.PrepareAssociatedProductModel(scope.DefaultStoreId ?? "");
+ model = await productViewModelService.PrepareAssociatedProductModel();
return View(model);
}
@@ -1941,11 +1940,9 @@ public abstract class BaseProductController(
[PermissionAuthorizeAction(PermissionActionName.Preview)]
public async Task<IActionResult> BulkEdit()
{
- // scope.DefaultStoreId already encodes the per-host default: null for Admin/Vendor (Admin's
- // original called PrepareBulkEditListModel() with no storeId; Vendor's own separate service
- // (Grand.Web.Vendor.Interfaces.IProductViewModelService.PrepareBulkEditListModel) takes no
- // storeId parameter at all - not store-scoped), StaffStoreId for Store.
- var model = await productViewModelService.PrepareBulkEditListModel(scope.DefaultStoreId ?? "");
+ // PrepareBulkEditListModel() now reads scope internally (Task 9): null for Admin/Vendor
+ // (not store-scoped), StaffStoreId for Store.
+ var model = await productViewModelService.PrepareBulkEditListModel();
return View(model);
}
@@ -2199,10 +2196,9 @@ public abstract class BaseProductController(
if (!await scope.HasAccess(product))
return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));
- // Old storeId-parameter overload (still present pending Task 9/10); scope.DefaultStoreId is null for
- // Admin/Vendor (Global/VendorProduct scopes) and the staff store for Store, same as the other rows
- // still on this signature.
- var tierPricesModel = await productViewModelService.PrepareTierPriceModel(product, scope.DefaultStoreId ?? "");
+ // PrepareTierPriceModel(product) now reads scope internally (Task 9); scope.DefaultStoreId
+ // is null for Admin/Vendor (Global/VendorProduct scopes) and the staff store for Store.
+ var tierPricesModel = await productViewModelService.PrepareTierPriceModel(product);
var gridModel = new DataSourceResult {
Data = tierPricesModel,
Total = tierPricesModel.Count
@@ -2216,7 +2212,7 @@ public abstract class BaseProductController(
var model = new ProductModel.TierPriceModel {
ProductId = productId
};
- await productViewModelService.PrepareTierPriceModel(model, scope.DefaultStoreId ?? "");
+ await productViewModelService.PrepareTierPriceModel(model);
return View(model);
}
@@ -2243,7 +2239,7 @@ public abstract class BaseProductController(
Error(ModelState);
//If we got this far, something failed, redisplay form
- await productViewModelService.PrepareTierPriceModel(model, scope.DefaultStoreId ?? "");
+ await productViewModelService.PrepareTierPriceModel(model);
return View(model);
}
@@ -2267,7 +2263,7 @@ public abstract class BaseProductController(
var model = tierPrice.ToModel(dateTimeService);
model.ProductId = productId;
- await productViewModelService.PrepareTierPriceModel(model, scope.DefaultStoreId ?? "");
+ await productViewModelService.PrepareTierPriceModel(model);
return View(model);
}
@@ -2297,7 +2293,7 @@ public abstract class BaseProductController(
Error(ModelState);
//stores
- await productViewModelService.PrepareTierPriceModel(model, scope.DefaultStoreId ?? "");
+ await productViewModelService.PrepareTierPriceModel(model);
return View(model);
}
@@ -2767,11 +2763,10 @@ public abstract class BaseProductController(
public async Task<IActionResult> AssociateProductToAttributeValuePopup()
{
- // scope.DefaultStoreId ?? "": matches Store's original (passed StaffStoreId to scope the search to
- // the staff member's store); null for Admin/Vendor (no store concept), matching their originals
- // (no argument, defaulting to "").
+ // PrepareAssociateProductToAttributeValueModel() now reads scope internally (Task 9):
+ // StaffStoreId for Store; null for Admin/Vendor (no store concept).
var model =
- await productViewModelService.PrepareAssociateProductToAttributeValueModel(scope.DefaultStoreId ?? "");
+ await productViewModelService.PrepareAssociateProductToAttributeValueModel();
return View(model);
}
diff --git a/src/Web/Grand.Web.AdminShared/Interfaces/IAdminDataScope.cs b/src/Web/Grand.Web.AdminShared/Interfaces/IAdminDataScope.cs
index 9f50b84ab..d62b6c442 100644
--- a/src/Web/Grand.Web.AdminShared/Interfaces/IAdminDataScope.cs
+++ b/src/Web/Grand.Web.AdminShared/Interfaces/IAdminDataScope.cs
@@ -31,4 +31,11 @@ public interface IAdminDataScope<TEntity>
/// <summary>Prefix used to build host-specific localization keys, e.g. "Admin", "Vendor". Store
/// currently has no distinct resource set and uses "Admin" (see Task 6).</summary>
string ResourceKeyPrefix { get; }
+
+ /// <summary>Whether the host's product list/search screens should offer a store picker at all.
+ /// True for Admin and Store (both operate within a store concept); false for Vendor (vendors don't
+ /// pick stores - the whole point of vendor scope is that it isn't a store id). This is a capability
+ /// flag, deliberately distinct from <see cref="DefaultStoreId"/> being null: DefaultStoreId is also
+ /// null for Admin (global, no default store), where the selector should still show.</summary>
+ bool ShowStoreSelector { get; }
}
diff --git a/src/Web/Grand.Web.AdminShared/Interfaces/IProductViewModelService.cs b/src/Web/Grand.Web.AdminShared/Interfaces/IProductViewModelService.cs
index 36710c8a2..5e6f29876 100644
--- a/src/Web/Grand.Web.AdminShared/Interfaces/IProductViewModelService.cs
+++ b/src/Web/Grand.Web.AdminShared/Interfaces/IProductViewModelService.cs
@@ -19,9 +19,9 @@ public interface IProductViewModelService
Task PrepareAddProductAttributeCombinationModel(ProductAttributeCombinationModel model, Product product);
Task SaveProductWarehouseInventory(Product product, IList<ProductModel.ProductWarehouseInventoryModel> model);
- Task PrepareTierPriceModel(ProductModel.TierPriceModel model, string storeId = "");
+ Task PrepareTierPriceModel(ProductModel.TierPriceModel model);
Task PrepareProductAttributeValueModel(Product product, ProductModel.ProductAttributeValueModel model);
- Task<ProductListModel> PrepareProductListModel(string storeId = "");
+ Task<ProductListModel> PrepareProductListModel();
Task<(IEnumerable<ProductModel> productModels, int totalCount)> PrepareProductsModel(ProductListModel model,
int pageIndex, int pageSize);
@@ -31,7 +31,7 @@ public interface IProductViewModelService
Task<Product> UpdateProductModel(Product product, ProductModel model);
Task DeleteProduct(Product product);
Task DeleteSelected(IEnumerable<string> selectedIds);
- Task<ProductModel.AddRequiredProductModel> PrepareAddRequiredProductModel(string storeId = "");
+ Task<ProductModel.AddRequiredProductModel> PrepareAddRequiredProductModel();
Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddProductModel model,
int pageIndex, int pageSize);
@@ -59,13 +59,13 @@ public interface IProductViewModelService
Task DeleteRecommendedProduct(string productId, string recommendedProductId);
Task InsertAssociatedProductModel(ProductModel.AddAssociatedProductModel model);
Task DeleteAssociatedProduct(Product product);
- Task<ProductModel.AddRelatedProductModel> PrepareRelatedProductModel(string storeId = "");
- Task<ProductModel.AddSimilarProductModel> PrepareSimilarProductModel(string storeId = "");
- Task<ProductModel.AddBundleProductModel> PrepareBundleProductModel(string storeId = "");
- Task<ProductModel.AddCrossSellProductModel> PrepareCrossSellProductModel(string storeId = "");
- Task<ProductModel.AddRecommendedProductModel> PrepareRecommendedProductModel(string storeId = "");
- Task<ProductModel.AddAssociatedProductModel> PrepareAssociatedProductModel(string storeId = "");
- Task<BulkEditListModel> PrepareBulkEditListModel(string storeId = "");
+ Task<ProductModel.AddRelatedProductModel> PrepareRelatedProductModel();
+ Task<ProductModel.AddSimilarProductModel> PrepareSimilarProductModel();
+ Task<ProductModel.AddBundleProductModel> PrepareBundleProductModel();
+ Task<ProductModel.AddCrossSellProductModel> PrepareCrossSellProductModel();
+ Task<ProductModel.AddRecommendedProductModel> PrepareRecommendedProductModel();
+ Task<ProductModel.AddAssociatedProductModel> PrepareAssociatedProductModel();
+ Task<BulkEditListModel> PrepareBulkEditListModel();
Task<(IEnumerable<BulkEditProductModel> bulkEditProductModels, int totalCount)> PrepareBulkEditProductModel(
BulkEditListModel model, int pageIndex, int pageSize);
@@ -75,7 +75,7 @@ public interface IProductViewModelService
Task DeleteBulkEdit(IEnumerable<BulkEditProductModel> products);
//tierprices
- Task<IList<ProductModel.TierPriceModel>> PrepareTierPriceModel(Product product, string storeId = "");
+ Task<IList<ProductModel.TierPriceModel>> PrepareTierPriceModel(Product product);
Task<(IEnumerable<ProductModel.BidModel> bidModels, int totalCount)> PrepareBidMode(string productId, int pageIndex,
int pageSize);
@@ -117,7 +117,7 @@ public interface IProductViewModelService
Task UpdateProductAttributeValueModel(ProductAttributeValue pav, ProductModel.ProductAttributeValueModel model);
Task<ProductModel.ProductAttributeValueModel.AssociateProductToAttributeValueModel>
- PrepareAssociateProductToAttributeValueModel(string storeId = "");
+ PrepareAssociateProductToAttributeValueModel();
Task<IList<ProductModel.ProductAttributeCombinationModel>> PrepareProductAttributeCombinationModel(Product product);
diff --git a/src/Web/Grand.Web.AdminShared/Services/GlobalAdminDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/GlobalAdminDataScope.cs
index 2f28984ca..9c1d85442 100644
--- a/src/Web/Grand.Web.AdminShared/Services/GlobalAdminDataScope.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/GlobalAdminDataScope.cs
@@ -13,4 +13,6 @@ public class GlobalAdminDataScope<TEntity> : IAdminDataScope<TEntity>
public string? DefaultStoreId => null;
public string ResourceKeyPrefix => "Admin";
+
+ public bool ShowStoreSelector => true;
}
diff --git a/src/Web/Grand.Web.AdminShared/Services/ProductViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/ProductViewModelService.cs
index 426490681..fddc9246c 100644
--- a/src/Web/Grand.Web.AdminShared/Services/ProductViewModelService.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/ProductViewModelService.cs
@@ -71,7 +71,8 @@ public class ProductViewModelService(
IAuctionService auctionService,
IPriceFormatter priceFormatter,
ISeNameService seNameService,
- IEnumTranslationService enumTranslationService)
+ IEnumTranslationService enumTranslationService,
+ IAdminDataScope<Product> scope)
: IProductViewModelService
{
public virtual async Task PrepareAddProductAttributeCombinationModel(ProductAttributeCombinationModel model,
@@ -139,8 +140,9 @@ public class ProductViewModelService(
(await currencyService.GetCurrencyById(currencySettings.PrimaryStoreCurrencyId))?.CurrencyCode;
}
- public virtual async Task PrepareTierPriceModel(ProductModel.TierPriceModel model, string storeId = "")
+ public virtual async Task PrepareTierPriceModel(ProductModel.TierPriceModel model)
{
+ var storeId = scope.DefaultStoreId ?? "";
if (string.IsNullOrEmpty(storeId))
model.AvailableStores.Add(new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = " " });
@@ -518,24 +520,30 @@ public class ProductViewModelService(
}
}
- public virtual async Task<ProductListModel> PrepareProductListModel(string storeId = "")
+ public virtual async Task<ProductListModel> PrepareProductListModel()
{
var model = new ProductListModel();
+ var storeId = scope.DefaultStoreId ?? "";
+
+ //stores - Vendor has no store concept at all (ShowStoreSelector is false), so the dropdown
+ //is left empty entirely rather than populated off storeId, which is "" for Vendor same as Admin.
+ if (scope.ShowStoreSelector)
+ {
+ model.AvailableStores.Add(new SelectListItem { Text = translationService.GetResource($"{scope.ResourceKeyPrefix}.Common.All"), Value = " " });
+ foreach (var s in (await storeService.GetAllStores()).Where(x =>
+ x.Id == storeId || string.IsNullOrWhiteSpace(storeId)))
+ model.AvailableStores.Add(new SelectListItem { Text = s.Shortcut, Value = s.Id });
+ }
- //stores
- model.AvailableStores.Add(new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = " " });
- foreach (var s in (await storeService.GetAllStores()).Where(x =>
- x.Id == storeId || string.IsNullOrWhiteSpace(storeId)))
- model.AvailableStores.Add(new SelectListItem { Text = s.Shortcut, Value = s.Id });
//warehouses
- model.AvailableWarehouses.Add(new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = " " });
+ model.AvailableWarehouses.Add(new SelectListItem { Text = translationService.GetResource($"{scope.ResourceKeyPrefix}.Common.All"), Value = " " });
foreach (var wh in await warehouseService.GetAllWarehouses(storeId))
model.AvailableWarehouses.Add(new SelectListItem { Text = wh.Name, Value = wh.Id });
//product types
model.AvailableProductTypes = enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList();
model.AvailableProductTypes.Insert(0,
- new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = "0" });
+ new SelectListItem { Text = translationService.GetResource($"{scope.ResourceKeyPrefix}.Common.All"), Value = "0" });
//"published" property
//0 - all (according to "ShowHidden" parameter)
@@ -543,21 +551,30 @@ public class ProductViewModelService(
//2 - unpublished only
//3 - Show on homepage
//4 - mark as new
- model.AvailablePublishedOptions.Add(new SelectListItem { Text = translationService.GetResource("Admin.Catalog.Products.List.SearchPublished.All"), Value = " " });
+ model.AvailablePublishedOptions.Add(new SelectListItem { Text = translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.List.SearchPublished.All"), Value = " " });
model.AvailablePublishedOptions.Add(new SelectListItem {
- Text = translationService.GetResource("Admin.Catalog.Products.List.SearchPublished.PublishedOnly"),
+ Text = translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.List.SearchPublished.PublishedOnly"),
Value = "1"
});
model.AvailablePublishedOptions.Add(new SelectListItem {
- Text = translationService.GetResource("Admin.Catalog.Products.List.SearchPublished.UnpublishedOnly"),
+ Text = translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.List.SearchPublished.UnpublishedOnly"),
Value = "2"
});
+
+ // Admin/Store show "Show on homepage" (value 3); Vendor's original copy omits it entirely - vendors
+ // can't feature products on the homepage, a real capability difference, not a naming difference.
+ // Using ResourceKeyPrefix as the gate works today (only Vendor differs) but is semantically about
+ // capability, not localization - if a fourth host is ever added, replace this with a proper
+ // bool CanFeatureOnHomepage on IAdminDataScope<TEntity> rather than continuing to overload
+ // ResourceKeyPrefix for behavior gating.
+ if (scope.ResourceKeyPrefix != "Vendor")
+ model.AvailablePublishedOptions.Add(new SelectListItem {
+ Text = translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.List.SearchPublished.ShowOnHomePage"),
+ Value = "3"
+ });
+
model.AvailablePublishedOptions.Add(new SelectListItem {
- Text = translationService.GetResource("Admin.Catalog.Products.List.SearchPublished.ShowOnHomePage"),
- Value = "3"
- });
- model.AvailablePublishedOptions.Add(new SelectListItem {
- Text = translationService.GetResource("Admin.Catalog.Products.List.SearchPublished.MarkAsNew"),
+ Text = translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.List.SearchPublished.MarkAsNew"),
Value = "4"
});
@@ -807,9 +824,9 @@ public class ProductViewModelService(
}
}
- public virtual async Task<ProductModel.AddRequiredProductModel> PrepareAddRequiredProductModel(string storeId = "")
+ public virtual async Task<ProductModel.AddRequiredProductModel> PrepareAddRequiredProductModel()
{
- var model = await PrepareAddProductModel<ProductModel.AddRequiredProductModel>(storeId);
+ var model = await PrepareAddProductModel<ProductModel.AddRequiredProductModel>();
return model;
}
@@ -1155,44 +1172,45 @@ public class ProductViewModelService(
await productService.UpdateAssociatedProduct(product);
}
- public virtual async Task<ProductModel.AddRelatedProductModel> PrepareRelatedProductModel(string storeId = "")
+ public virtual async Task<ProductModel.AddRelatedProductModel> PrepareRelatedProductModel()
{
- var model = await PrepareAddProductModel<ProductModel.AddRelatedProductModel>(storeId);
+ var model = await PrepareAddProductModel<ProductModel.AddRelatedProductModel>();
return model;
}
- public virtual async Task<ProductModel.AddSimilarProductModel> PrepareSimilarProductModel(string storeId = "")
+ public virtual async Task<ProductModel.AddSimilarProductModel> PrepareSimilarProductModel()
{
- var model = await PrepareAddProductModel<ProductModel.AddSimilarProductModel>(storeId);
+ var model = await PrepareAddProductModel<ProductModel.AddSimilarProductModel>();
return model;
}
- public virtual async Task<ProductModel.AddBundleProductModel> PrepareBundleProductModel(string storeId = "")
+ public virtual async Task<ProductModel.AddBundleProductModel> PrepareBundleProductModel()
{
- var model = await PrepareAddProductModel<ProductModel.AddBundleProductModel>(storeId);
+ var model = await PrepareAddProductModel<ProductModel.AddBundleProductModel>();
return model;
}
- public virtual async Task<ProductModel.AddCrossSellProductModel> PrepareCrossSellProductModel(string storeId = "")
+ public virtual async Task<ProductModel.AddCrossSellProductModel> PrepareCrossSellProductModel()
{
- var model = await PrepareAddProductModel<ProductModel.AddCrossSellProductModel>(storeId);
+ var model = await PrepareAddProductModel<ProductModel.AddCrossSellProductModel>();
return model;
}
- public virtual async Task<ProductModel.AddRecommendedProductModel> PrepareRecommendedProductModel(string storeId = "")
+ public virtual async Task<ProductModel.AddRecommendedProductModel> PrepareRecommendedProductModel()
{
- var model = await PrepareAddProductModel<ProductModel.AddRecommendedProductModel>(storeId);
+ var model = await PrepareAddProductModel<ProductModel.AddRecommendedProductModel>();
return model;
}
- public virtual async Task<ProductModel.AddAssociatedProductModel> PrepareAssociatedProductModel(string storeId = "")
+ public virtual async Task<ProductModel.AddAssociatedProductModel> PrepareAssociatedProductModel()
{
- var model = await PrepareAddProductModel<ProductModel.AddAssociatedProductModel>(storeId);
+ var model = await PrepareAddProductModel<ProductModel.AddAssociatedProductModel>();
return model;
}
- public virtual async Task<BulkEditListModel> PrepareBulkEditListModel(string storeId = "")
+ public virtual async Task<BulkEditListModel> PrepareBulkEditListModel()
{
+ var storeId = scope.DefaultStoreId ?? "";
var model = new BulkEditListModel();
//product types
@@ -1200,19 +1218,24 @@ public class ProductViewModelService(
model.AvailableProductTypes.Insert(0,
new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = "0" });
- // avaible stores
- if (!string.IsNullOrEmpty(storeId))
+ // avaible stores - same capability gate as PrepareProductListModel: Vendor's original never
+ // populated a stores dropdown here at all (vendors don't pick stores), so this must not run for
+ // Vendor even though its storeId also resolves to "".
+ if (scope.ShowStoreSelector)
{
- var store = (await storeService.GetAllStores()).FirstOrDefault(x => x.Id == storeId);
- 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 = "" });
+ if (!string.IsNullOrEmpty(storeId))
+ {
+ var store = (await storeService.GetAllStores()).FirstOrDefault(x => x.Id == storeId);
+ 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 });
+ foreach (var s in await storeService.GetAllStores())
+ model.AvailableStores.Add(new SelectListItem { Text = s.Shortcut, Value = s.Id });
+ }
}
return model;
@@ -1296,8 +1319,9 @@ public class ProductViewModelService(
}
}
- public virtual async Task<IList<ProductModel.TierPriceModel>> PrepareTierPriceModel(Product product, string storeId = "")
+ public virtual async Task<IList<ProductModel.TierPriceModel>> PrepareTierPriceModel(Product product)
{
+ var storeId = scope.DefaultStoreId ?? "";
var items = new List<ProductModel.TierPriceModel>();
foreach (var x in product.TierPrices
.Where(x => x.StoreId == storeId || string.IsNullOrWhiteSpace(storeId) ||
@@ -1868,9 +1892,9 @@ public class ProductViewModelService(
model.ProductAttributeMappingId);
}
- public virtual async Task<ProductModel.ProductAttributeValueModel.AssociateProductToAttributeValueModel> PrepareAssociateProductToAttributeValueModel(string storeId = "")
+ public virtual async Task<ProductModel.ProductAttributeValueModel.AssociateProductToAttributeValueModel> PrepareAssociateProductToAttributeValueModel()
{
- var model = await PrepareAddProductModel<ProductModel.ProductAttributeValueModel.AssociateProductToAttributeValueModel>(storeId);
+ var model = await PrepareAddProductModel<ProductModel.ProductAttributeValueModel.AssociateProductToAttributeValueModel>();
return model;
}
@@ -2547,15 +2571,21 @@ public class ProductViewModelService(
}
}
- protected virtual async Task<T> PrepareAddProductModel<T>(string storeId = "") where T : ProductModel.AddProductModel, new()
+ protected virtual async Task<T> PrepareAddProductModel<T>() where T : ProductModel.AddProductModel, new()
{
+ var storeId = scope.DefaultStoreId ?? "";
var model = new T();
- //stores
- model.AvailableStores.Add(new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = " " });
- foreach (var s in (await storeService.GetAllStores()).Where(x =>
- x.Id == storeId || string.IsNullOrWhiteSpace(storeId)))
- model.AvailableStores.Add(new SelectListItem { Text = s.Shortcut, Value = s.Id });
+ //stores - same capability gate as PrepareProductListModel: Vendor's original PrepareAddProductModel<T>
+ //never populated a stores dropdown at all (vendors don't pick stores), so this must not run for
+ //Vendor even though its storeId also resolves to "".
+ if (scope.ShowStoreSelector)
+ {
+ model.AvailableStores.Add(new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = " " });
+ foreach (var s in (await storeService.GetAllStores()).Where(x =>
+ x.Id == storeId || string.IsNullOrWhiteSpace(storeId)))
+ model.AvailableStores.Add(new SelectListItem { Text = s.Shortcut, Value = s.Id });
+ }
//vendors
model.AvailableVendors.Add(new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = " " });
diff --git a/src/Web/Grand.Web.AdminShared/Services/StoreAdminDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/StoreAdminDataScope.cs
index 6e5848922..632fbd17c 100644
--- a/src/Web/Grand.Web.AdminShared/Services/StoreAdminDataScope.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/StoreAdminDataScope.cs
@@ -39,4 +39,6 @@ public class StoreAdminDataScope<TEntity>(IContextAccessor contextAccessor) : IA
public string? DefaultStoreId => contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
public string ResourceKeyPrefix => "Admin";
+
+ public bool ShowStoreSelector => true;
}
diff --git a/src/Web/Grand.Web.AdminShared/Services/VendorProductDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/VendorProductDataScope.cs
index 86e7cce3c..c916139a4 100644
--- a/src/Web/Grand.Web.AdminShared/Services/VendorProductDataScope.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/VendorProductDataScope.cs
@@ -23,4 +23,6 @@ public class VendorProductDataScope(IContextAccessor contextAccessor) : IAdminDa
public string? DefaultStoreId => null;
public string ResourceKeyPrefix => "Vendor";
+
+ public bool ShowStoreSelector => false;
}
diff --git a/src/Web/Grand.Web.Store/Controllers/ProductController.cs b/src/Web/Grand.Web.Store/Controllers/ProductController.cs
index 33c6b0631..a53df58e1 100644
--- a/src/Web/Grand.Web.Store/Controllers/ProductController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/ProductController.cs
@@ -101,7 +101,7 @@ public class ProductController : BaseStoreController
public async Task<IActionResult> List()
{
- var model = await _productViewModelService.PrepareProductListModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ var model = await _productViewModelService.PrepareProductListModel();
return View(model);
}
@@ -368,7 +368,7 @@ public class ProductController : BaseStoreController
[PermissionAuthorizeAction(PermissionActionName.Edit)]
public async Task<IActionResult> RequiredProductAddPopup(string productIdsInput)
{
- var model = await _productViewModelService.PrepareAddRequiredProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ var model = await _productViewModelService.PrepareAddRequiredProductModel();
return View(model);
}
@@ -621,7 +621,7 @@ public class ProductController : BaseStoreController
[PermissionAuthorizeAction(PermissionActionName.Edit)]
public async Task<IActionResult> RelatedProductAddPopup(string productId)
{
- var model = await _productViewModelService.PrepareRelatedProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ var model = await _productViewModelService.PrepareRelatedProductModel();
model.ProductId = productId;
return View(model);
}
@@ -656,7 +656,7 @@ public class ProductController : BaseStoreController
}
Error(ModelState);
- model = await _productViewModelService.PrepareRelatedProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ model = await _productViewModelService.PrepareRelatedProductModel();
return View(model);
}
@@ -729,7 +729,7 @@ public class ProductController : BaseStoreController
[PermissionAuthorizeAction(PermissionActionName.Edit)]
public async Task<IActionResult> SimilarProductAddPopup(string productId)
{
- var model = await _productViewModelService.PrepareSimilarProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ var model = await _productViewModelService.PrepareSimilarProductModel();
model.ProductId = productId;
return View(model);
}
@@ -764,7 +764,7 @@ public class ProductController : BaseStoreController
}
Error(ModelState);
- model = await _productViewModelService.PrepareSimilarProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ model = await _productViewModelService.PrepareSimilarProductModel();
return View(model);
}
@@ -837,7 +837,7 @@ public class ProductController : BaseStoreController
[PermissionAuthorizeAction(PermissionActionName.Edit)]
public async Task<IActionResult> BundleProductAddPopup(string productId)
{
- var model = await _productViewModelService.PrepareBundleProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ var model = await _productViewModelService.PrepareBundleProductModel();
model.ProductId = productId;
return View(model);
}
@@ -872,7 +872,7 @@ public class ProductController : BaseStoreController
}
Error(ModelState);
- model = await _productViewModelService.PrepareBundleProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ model = await _productViewModelService.PrepareBundleProductModel();
return View(model);
}
@@ -931,7 +931,7 @@ public class ProductController : BaseStoreController
[PermissionAuthorizeAction(PermissionActionName.Edit)]
public async Task<IActionResult> CrossSellProductAddPopup(string productId)
{
- var model = await _productViewModelService.PrepareCrossSellProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ var model = await _productViewModelService.PrepareCrossSellProductModel();
model.ProductId = productId;
return View(model);
}
@@ -966,7 +966,7 @@ public class ProductController : BaseStoreController
}
Error(ModelState);
- model = await _productViewModelService.PrepareCrossSellProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ model = await _productViewModelService.PrepareCrossSellProductModel();
return View(model);
}
@@ -1024,7 +1024,7 @@ public class ProductController : BaseStoreController
[PermissionAuthorizeAction(PermissionActionName.Edit)]
public async Task<IActionResult> RecommendedProductAddPopup(string productId)
{
- var model = await _productViewModelService.PrepareRecommendedProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ var model = await _productViewModelService.PrepareRecommendedProductModel();
model.ProductId = productId;
return View(model);
}
@@ -1059,7 +1059,7 @@ public class ProductController : BaseStoreController
}
Error(ModelState);
- model = await _productViewModelService.PrepareRecommendedProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ model = await _productViewModelService.PrepareRecommendedProductModel();
return View(model);
}
@@ -1140,7 +1140,7 @@ public class ProductController : BaseStoreController
[PermissionAuthorizeAction(PermissionActionName.Edit)]
public async Task<IActionResult> AssociatedProductAddPopup(string productId)
{
- var model = await _productViewModelService.PrepareAssociatedProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ var model = await _productViewModelService.PrepareAssociatedProductModel();
model.ProductId = productId;
return View(model);
}
@@ -1187,7 +1187,7 @@ public class ProductController : BaseStoreController
}
Error(ModelState);
- model = await _productViewModelService.PrepareAssociatedProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ model = await _productViewModelService.PrepareAssociatedProductModel();
return View(model);
}
@@ -1545,7 +1545,7 @@ public class ProductController : BaseStoreController
[PermissionAuthorizeAction(PermissionActionName.Preview)]
public async Task<IActionResult> BulkEdit()
{
- var model = await _productViewModelService.PrepareBulkEditListModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ var model = await _productViewModelService.PrepareBulkEditListModel();
return View(model);
}
@@ -1752,7 +1752,7 @@ public class ProductController : BaseStoreController
if (!CanAccessProduct(product))
return ErrorForKendoGridJson(_translationService.GetResource("Admin.Catalog.Products.Permissions"));
- var tierPricesModel = await _productViewModelService.PrepareTierPriceModel(product, _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ var tierPricesModel = await _productViewModelService.PrepareTierPriceModel(product);
var gridModel = new DataSourceResult {
Data = tierPricesModel,
Total = tierPricesModel.Count
@@ -1766,7 +1766,7 @@ public class ProductController : BaseStoreController
var model = new ProductModel.TierPriceModel {
ProductId = productId
};
- await _productViewModelService.PrepareTierPriceModel(model, _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ await _productViewModelService.PrepareTierPriceModel(model);
return View(model);
}
@@ -1791,7 +1791,7 @@ public class ProductController : BaseStoreController
Error(ModelState);
//If we got this far, something failed, redisplay form
- await _productViewModelService.PrepareTierPriceModel(model, _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ await _productViewModelService.PrepareTierPriceModel(model);
return View(model);
}
@@ -1808,7 +1808,7 @@ public class ProductController : BaseStoreController
var model = tierPrice.ToModel(_dateTimeService);
model.ProductId = productId;
- await _productViewModelService.PrepareTierPriceModel(model, _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ await _productViewModelService.PrepareTierPriceModel(model);
return View(model);
}
@@ -1837,7 +1837,7 @@ public class ProductController : BaseStoreController
Error(ModelState);
//stores
- await _productViewModelService.PrepareTierPriceModel(model, _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ await _productViewModelService.PrepareTierPriceModel(model);
return View(model);
}
@@ -2236,7 +2236,7 @@ public class ProductController : BaseStoreController
public async Task<IActionResult> AssociateProductToAttributeValuePopup()
{
- var model = await _productViewModelService.PrepareAssociateProductToAttributeValueModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ var model = await _productViewModelService.PrepareAssociateProductToAttributeValueModel();
return View(model);
}