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.

Task 9 fix round 1: gate PrepareTierPriceModel's store dropdown by ShowStoreSelector; correct report test count

KrzysztofPajak526beee87512
diff --git a/src/Tests/Grand.Web.Admin.Tests/Services/ProductViewModelServiceTests.cs b/src/Tests/Grand.Web.Admin.Tests/Services/ProductViewModelServiceTests.cs
index d0b401084..50862b7de 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Services/ProductViewModelServiceTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Services/ProductViewModelServiceTests.cs
@@ -41,6 +41,7 @@ public class ProductViewModelServiceTests
private Mock<IDiscountService> _discountServiceMock;
private Mock<IEnumTranslationService> _enumTranslationServiceMock;
+ private Mock<IGroupService> _groupServiceMock;
private Mock<IMeasureService> _measureServiceMock;
private ProductViewModelService _productViewModelService;
private Mock<IAdminDataScope<Product>> _scopeMock;
@@ -54,6 +55,7 @@ public class ProductViewModelServiceTests
{
_discountServiceMock = new Mock<IDiscountService>();
_enumTranslationServiceMock = new Mock<IEnumTranslationService>();
+ _groupServiceMock = new Mock<IGroupService>();
_measureServiceMock = new Mock<IMeasureService>();
_storeServiceMock = new Mock<IStoreService>();
_taxCategoryServiceMock = new Mock<ITaxCategoryService>();
@@ -69,6 +71,7 @@ public class ProductViewModelServiceTests
var currencyServiceMock = new Mock<ICurrencyService>();
currencyServiceMock.Setup(c => c.GetCurrencyById(It.IsAny<string>())).ReturnsAsync((Currency)null);
+ currencyServiceMock.Setup(c => c.GetAllCurrencies(It.IsAny<bool>(), It.IsAny<string>())).ReturnsAsync(new List<Currency>());
_measureServiceMock.Setup(m => m.GetMeasureWeightById(It.IsAny<string>())).ReturnsAsync((MeasureWeight)null);
_measureServiceMock.Setup(m => m.GetMeasureDimensionById(It.IsAny<string>()))
.ReturnsAsync((MeasureDimension)null);
@@ -96,6 +99,9 @@ public class ProductViewModelServiceTests
_storeServiceMock.Setup(s => s.GetAllStores()).ReturnsAsync(new List<Store>());
+ _groupServiceMock.Setup(g => g.GetAllCustomerGroups(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<bool>()))
+ .ReturnsAsync(new PagedList<CustomerGroup>());
+
_enumTranslationServiceMock
.Setup(e => e.ToSelectList(It.IsAny<ProductType>(), It.IsAny<bool>(), It.IsAny<int[]>()))
.Returns(new SelectList(Enumerable.Empty<SelectListItem>()));
@@ -124,7 +130,7 @@ public class ProductViewModelServiceTests
productLayoutServiceMock.Object,
new Mock<ISpecificationAttributeService>().Object,
contextAccessorMock.Object,
- new Mock<IGroupService>().Object,
+ _groupServiceMock.Object,
_warehouseServiceMock.Object,
deliveryDateServiceMock.Object,
_taxCategoryServiceMock.Object,
@@ -248,4 +254,36 @@ public class ProductViewModelServiceTests
Assert.IsFalse(model.AvailableStores.Any(),
"Vendor doesn't pick stores - no dropdown should be populated at all.");
}
+
+ [TestMethod]
+ public async Task PrepareTierPriceModel_VendorScope_HidesStoreDropdown()
+ {
+ _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 = new ProductModel.TierPriceModel();
+ await _productViewModelService.PrepareTierPriceModel(model);
+
+ Assert.IsFalse(model.AvailableStores.Any(),
+ "Vendor doesn't pick stores - no dropdown should be populated at all, matching the original Vendor service's PrepareTierPriceModel.");
+ }
+
+ [TestMethod]
+ public async Task PrepareTierPriceModel_GlobalScope_IncludesStoreDropdown()
+ {
+ // 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 = new ProductModel.TierPriceModel();
+ await _productViewModelService.PrepareTierPriceModel(model);
+
+ Assert.IsTrue(model.AvailableStores.Any(x => x.Value == "store1"),
+ "Admin should offer a store dropdown for tier prices.");
+ }
}
diff --git a/src/Web/Grand.Web.AdminShared/Services/ProductViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/ProductViewModelService.cs
index fddc9246c..490573d65 100644
--- a/src/Web/Grand.Web.AdminShared/Services/ProductViewModelService.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/ProductViewModelService.cs
@@ -143,12 +143,19 @@ public class ProductViewModelService(
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 = " " });
- foreach (var store in (await storeService.GetAllStores()).Where(x =>
- x.Id == storeId || string.IsNullOrWhiteSpace(storeId)))
- model.AvailableStores.Add(new SelectListItem { Text = store.Shortcut, Value = store.Id });
+ //stores - same capability gate as PrepareProductListModel: Vendor's original PrepareTierPriceModel
+ //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)
+ {
+ if (string.IsNullOrEmpty(storeId))
+ model.AvailableStores.Add(new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = " " });
+
+ foreach (var store in (await storeService.GetAllStores()).Where(x =>
+ x.Id == storeId || string.IsNullOrWhiteSpace(storeId)))
+ model.AvailableStores.Add(new SelectListItem { Text = store.Shortcut, Value = store.Id });
+ }
//customer groups
model.AvailableCustomerGroups.Add(new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = " " });