Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Typo fix
supporteef0dc8ad8ab
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/Partials/CreateOrUpdate.TabActivityLog.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/Partials/CreateOrUpdate.TabActivityLog.cshtmlindex de1a90596..81ebe2916 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/Partials/CreateOrUpdate.TabActivityLog.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/Partials/CreateOrUpdate.TabActivityLog.cshtml@@ -1,6 +1,6 @@@model CustomerModel@inject AdminAreaSettings adminAreaSettings-@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permisionService+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService@{var defaultGridPageSize = adminAreaSettings.DefaultGridPageSize;var gridPageSizes = adminAreaSettings.GridPageSizes;@@ -157,7 +157,7 @@</script>}- @if (await permisionService.Authorize(Grand.Business.Core.Utilities.Common.Security.PermissionSystemName.MessageQueue) && !string.IsNullOrEmpty(Model.Email))+ @if (await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.PermissionSystemName.MessageQueue) && !string.IsNullOrEmpty(Model.Email)){<br /><strong>@Loc["Admin.System.QueuedEmails"]</strong>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Shipment.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Shipment.cshtmlindex 1e86f4781..066475e51 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Shipment.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Shipment.cshtml@@ -1,9 +1,9 @@@model OrderModel-@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permisionService;+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService;<vc:admin-widget widget-zone="order_details_address_top" additional-data="Model" />@if (Model.IsShippable){- @if (await permisionService.Authorize(Grand.Business.Core.Utilities.Common.Security.PermissionSystemName.Shipments))+ @if (await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.PermissionSystemName.Shipments)){<div class="card col-md-12"><div class="card-body">diff --git a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs b/src/Web/Grand.Web.Admin/Controllers/BlogController.csindex 2c2153025..2685eae04 100644--- a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/BlogController.cs@@ -130,7 +130,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer)){if (!blogPost.LimitedToStores || (blogPost.LimitedToStores && blogPost.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && blogPost.Stores.Count > 1))- Warning(_translationService.GetResource("Admin.Content.Blog.BlogPosts.Permisions"));+ Warning(_translationService.GetResource("Admin.Content.Blog.BlogPosts.Permissions"));else{if (!blogPost.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))@@ -340,7 +340,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer)){if (!blogCategory.LimitedToStores || (blogCategory.LimitedToStores && blogCategory.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && blogCategory.Stores.Count > 1))- Warning(_translationService.GetResource("Admin.Content.Blog.BlogCategory.Permisions"));+ Warning(_translationService.GetResource("Admin.Content.Blog.BlogCategory.Permissions"));else{if (!blogCategory.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))diff --git a/src/Web/Grand.Web.Admin/Controllers/BrandController.cs b/src/Web/Grand.Web.Admin/Controllers/BrandController.csindex 0b05c935f..07b4c3109 100644--- a/src/Web/Grand.Web.Admin/Controllers/BrandController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/BrandController.cs@@ -176,7 +176,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer)){if (!brand.LimitedToStores || (brand.LimitedToStores && brand.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && brand.Stores.Count > 1))- Warning(_translationService.GetResource("Admin.Catalog.Brands.Permisions"));+ Warning(_translationService.GetResource("Admin.Catalog.Brands.Permissions"));else{if (!brand.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))diff --git a/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs b/src/Web/Grand.Web.Admin/Controllers/CategoryController.csindex 0fe938202..23fdbd933 100644--- a/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs@@ -148,7 +148,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer)){if (!category.LimitedToStores || (category.LimitedToStores && category.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && category.Stores.Count > 1))- Warning(_translationService.GetResource("Admin.Catalog.Categories.Permisions"));+ Warning(_translationService.GetResource("Admin.Catalog.Categories.Permissions"));else{if (!category.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))diff --git a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs b/src/Web/Grand.Web.Admin/Controllers/CollectionController.csindex 04765322c..b35982b82 100644--- a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs@@ -176,7 +176,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer)){if (!collection.LimitedToStores || (collection.LimitedToStores && collection.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && collection.Stores.Count > 1))- Warning(_translationService.GetResource("Admin.Catalog.Collections.Permisions"));+ Warning(_translationService.GetResource("Admin.Catalog.Collections.Permissions"));else{if (!collection.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))diff --git a/src/Web/Grand.Web.Admin/Controllers/CourseController.cs b/src/Web/Grand.Web.Admin/Controllers/CourseController.csindex 81a71aa3a..d96c4dafe 100644--- a/src/Web/Grand.Web.Admin/Controllers/CourseController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CourseController.cs@@ -182,7 +182,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer)){if (!course.LimitedToStores || (course.LimitedToStores && course.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && course.Stores.Count > 1))- Warning(_translationService.GetResource("Admin.Courses.Course.Permisions"));+ Warning(_translationService.GetResource("Admin.Courses.Course.Permissions"));else{if (!course.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))@@ -406,7 +406,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer)){if (!course.LimitedToStores || (course.LimitedToStores && course.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && course.Stores.Count > 1))- Warning(_translationService.GetResource("Admin.Courses.Course.Permisions"));+ Warning(_translationService.GetResource("Admin.Courses.Course.Permissions"));else{if (!course.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))@@ -431,7 +431,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer)){if (!course.LimitedToStores || (course.LimitedToStores && course.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && course.Stores.Count > 1))- Warning(_translationService.GetResource("Admin.Courses.Course.Permisions"));+ Warning(_translationService.GetResource("Admin.Courses.Course.Permissions"));else{if (!course.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))@@ -469,7 +469,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer)){if (!course.LimitedToStores || (course.LimitedToStores && course.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && course.Stores.Count > 1))- Warning(_translationService.GetResource("Admin.Courses.Course.Permisions"));+ Warning(_translationService.GetResource("Admin.Courses.Course.Permissions"));else{if (!course.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))diff --git a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs b/src/Web/Grand.Web.Admin/Controllers/DiscountController.csindex d24242a26..768afab04 100644--- a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs@@ -124,7 +124,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer)){if (!discount.LimitedToStores || (discount.LimitedToStores && discount.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && discount.Stores.Count > 1))- Warning(_translationService.GetResource("admin.marketing.discounts.Permisions"));+ Warning(_translationService.GetResource("admin.marketing.discounts.Permissions"));else{if (!discount.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductController.csindex ee8dcbe4e..bbb414ca9 100644--- a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs@@ -178,7 +178,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer)){if (!product.LimitedToStores || (product.LimitedToStores && product.Stores.Contains(_workContext.CurrentCustomer.StaffStoreId) && product.Stores.Count > 1))- Warning(_translationService.GetResource("Admin.Catalog.Products.Permisions"));+ Warning(_translationService.GetResource("Admin.Catalog.Products.Permissions"));else{if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))@@ -1899,7 +1899,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return ErrorForKendoGridJson(_translationService.GetResource("Admin.Catalog.Products.Permisions"));+ return ErrorForKendoGridJson(_translationService.GetResource("Admin.Catalog.Products.Permissions"));await productAttributeService.DeleteProductAttributeMapping(productAttributeMapping, product.Id);return new JsonResult("");@@ -1982,7 +1982,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return Content(_translationService.GetResource("Admin.Catalog.Products.Permisions"));+ return Content(_translationService.GetResource("Admin.Catalog.Products.Permissions"));await _productViewModelService.UpdateProductAttributeConditionModel(product, productAttributeMapping, model);return Content("");@@ -2154,7 +2154,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- throw new ArgumentException(_translationService.GetResource("Admin.Catalog.Products.Permisions"));+ throw new ArgumentException(_translationService.GetResource("Admin.Catalog.Products.Permissions"));if (ModelState.IsValid){@@ -2230,7 +2230,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return Content(_translationService.GetResource("Admin.Catalog.Products.Permisions"));+ return Content(_translationService.GetResource("Admin.Catalog.Products.Permissions"));await productAttributeService.DeleteProductAttributeCombination(combination, productId);if (product.ManageInventoryMethodId == ManageInventoryMethod.ManageStockByAttributes)@@ -2271,7 +2271,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return Content(_translationService.GetResource("Admin.Catalog.Products.Permisions"));+ return Content(_translationService.GetResource("Admin.Catalog.Products.Permissions"));var warnings = await _productViewModelService.InsertOrUpdateProductAttributeCombinationPopup(product, model);if (!warnings.Any())@@ -2294,7 +2294,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return Content(_translationService.GetResource("Admin.Catalog.Products.Permisions"));+ return Content(_translationService.GetResource("Admin.Catalog.Products.Permissions"));await _productViewModelService.GenerateAllAttributeCombinations(product);@@ -2311,7 +2311,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- throw new ArgumentException(_translationService.GetResource("Admin.Catalog.Products.Permisions"));+ throw new ArgumentException(_translationService.GetResource("Admin.Catalog.Products.Permissions"));if (ModelState.IsValid){@@ -2359,7 +2359,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return Content("", _translationService.GetResource("Admin.Catalog.Products.Permisions"));+ return Content("", _translationService.GetResource("Admin.Catalog.Products.Permissions"));var combination = product.ProductAttributeCombinations.FirstOrDefault(x => x.Id == productAttributeCombinationId);if (combination != null)@@ -2378,7 +2378,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return Content("", _translationService.GetResource("Admin.Catalog.Products.Permisions"));+ return Content("", _translationService.GetResource("Admin.Catalog.Products.Permissions"));var combination = product.ProductAttributeCombinations.FirstOrDefault(x => x.Id == productAttributeCombinationId);if (combination != null)@@ -2397,7 +2397,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return ErrorForKendoGridJson(_translationService.GetResource("Admin.Catalog.Products.Permisions"));+ return ErrorForKendoGridJson(_translationService.GetResource("Admin.Catalog.Products.Permissions"));var combination = product.ProductAttributeCombinations.FirstOrDefault(x => x.Id == productAttributeCombinationId);if (combination != null)@@ -2478,7 +2478,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return Json(new { errors = _translationService.GetResource("Admin.Catalog.Products.Permisions") });+ return Json(new { errors = _translationService.GetResource("Admin.Catalog.Products.Permissions") });var reservations = await _productReservationService.GetProductReservationsByProductId(productId, null, null);if (reservations.Any())@@ -2623,7 +2623,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return Json(new { errors = _translationService.GetResource("Admin.Catalog.Products.Permisions") });+ return Json(new { errors = _translationService.GetResource("Admin.Catalog.Products.Permissions") });var toDelete = await _productReservationService.GetProductReservationsByProductId(productId, true, null);foreach (var record in toDelete)@@ -2643,7 +2643,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return Json(new { errors = _translationService.GetResource("Admin.Catalog.Products.Permisions") });+ return Json(new { errors = _translationService.GetResource("Admin.Catalog.Products.Permissions") });var toDelete = (await _productReservationService.GetProductReservationsByProductId(productId, true, null)).Where(x => x.Date < DateTime.UtcNow);foreach (var record in toDelete)@@ -2664,7 +2664,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return ErrorForKendoGridJson(_translationService.GetResource("Admin.Catalog.Products.Permisions"));+ return ErrorForKendoGridJson(_translationService.GetResource("Admin.Catalog.Products.Permissions"));var toDelete = await _productReservationService.GetProductReservation(model.ReservationId);if (toDelete != null)@@ -2692,7 +2692,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return Json(new { errors = _translationService.GetResource("Admin.Catalog.Products.Permisions") });+ return Json(new { errors = _translationService.GetResource("Admin.Catalog.Products.Permissions") });var (bidModels, totalCount) = await _productViewModelService.PrepareBidMode(productId, command.Page, command.PageSize);var gridModel = new DataSourceResult {@@ -2712,7 +2712,7 @@ namespace Grand.Web.Admin.Controllersif (await _groupService.IsStaff(_workContext.CurrentCustomer))if (!product.AccessToEntityByStore(_workContext.CurrentCustomer.StaffStoreId))- return Json(new DataSourceResult { Errors = _translationService.GetResource("Admin.Catalog.Products.Permisions") });+ return Json(new DataSourceResult { Errors = _translationService.GetResource("Admin.Catalog.Products.Permissions") });var toDelete = await _auctionService.GetBid(model.BidId);if (toDelete != null)diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.csindex aaefd3e91..afa57535b 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.csindex c128edcd3..87aeec2e6 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.csindex 567fcb876..095d9b3a7 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Categories.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Categories.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.csindex 26a29a820..1cd7c0ece 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.csindex a58f31212..cf2680532 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.csindex eb3aca267..3930a504f 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs@@ -26,7 +26,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}RuleFor(x => x).MustAsync(async (x, _, _) =>{diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.csindex 77e48acbc..0c50bd9df 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.csindex 78f17efea..86000115e 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.csindex 6148c8e13..8ddca5283 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.csindex 98dae05b8..23053ba5c 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.csindex e9ff88af4..e7091c0d4 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Categories.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Categories.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.csindex 7fdd06597..306de890b 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Collections.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Collections.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.csindex 178c9d52f..d64ae34f3 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.csindex 833723ee0..bc4ce7118 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.csindex 43c42f63b..7663fed92 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs@@ -35,7 +35,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}RuleFor(x => x).CustomAsync(async (x, context, _) =>{diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.csindex 7883bcda4..b26e3ae11 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.csindex a52d34464..1751c2cff 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.csindex b0d22df78..7af94519a 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.csindex 998a5bd6f..e2cdfccd8 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.csindex d93b45783..c640c0cb5 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.csindex 412d84be9..a229de1d9 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.csindex dee4deb47..11ccefe05 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs@@ -25,7 +25,7 @@ namespace Grand.Web.Admin.Validators.Catalogreturn false;return true;- }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permissions"));}}}diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/OrderDetails.Shipment.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/OrderDetails.Shipment.cshtmlindex a28be4ce0..db37c07cb 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/OrderDetails.Shipment.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/OrderDetails.Shipment.cshtml@@ -1,9 +1,9 @@@model OrderModel-@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permisionService;+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService;<vc:vendor-widget widget-zone="vendor_order_details_address_top" additional-data="Model" />@if (Model.IsShippable){- @if (await permisionService.Authorize(Grand.Business.Core.Utilities.Common.Security.PermissionSystemName.Shipments))+ @if (await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.PermissionSystemName.Shipments)){<div class="card col-md-12"><div class="card-body">diff --git a/src/Web/Grand.Web.Vendor/Validators/Catalog/BundleProductModelValidator.cs b/src/Web/Grand.Web.Vendor/Validators/Catalog/BundleProductModelValidator.csindex 3838b5bf1..74c75e81d 100644--- a/src/Web/Grand.Web.Vendor/Validators/Catalog/BundleProductModelValidator.cs+++ b/src/Web/Grand.Web.Vendor/Validators/Catalog/BundleProductModelValidator.cs@@ -19,7 +19,7 @@ namespace Grand.Web.Vendor.Validators.Catalogvar product = await productService.GetProductById(x.ProductBundleId);if (product == null) return true;return product.VendorId == workContext.CurrentVendor.Id;- }).WithMessage(translationService.GetResource("Vendor.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Vendor.Catalog.Products.Permissions"));}}}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Validators/Catalog/ProductValidVendor.cs b/src/Web/Grand.Web.Vendor/Validators/Catalog/ProductValidVendor.csindex 5c1b6abea..03edcf8b6 100644--- a/src/Web/Grand.Web.Vendor/Validators/Catalog/ProductValidVendor.cs+++ b/src/Web/Grand.Web.Vendor/Validators/Catalog/ProductValidVendor.cs@@ -19,7 +19,7 @@ public class ProductValidVendor: BaseGrandValidator<IProductValidVendor>var product = await productService.GetProductById(x.ProductId);if (product == null) return true;return product.VendorId == workContext.CurrentVendor.Id;- }).WithMessage(translationService.GetResource("Vendor.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Vendor.Catalog.Products.Permissions"));}}@@ -37,6 +37,6 @@ public class ProductRelatedValidVendor: BaseGrandValidator<IProductRelatedValidVvar product2 = await productService.GetProductById(x.ProductId2);if (product2 == null) return true;return product1.VendorId == workContext.CurrentVendor.Id || product2.VendorId == workContext.CurrentVendor.Id;- }).WithMessage(translationService.GetResource("Vendor.Catalog.Products.Permisions"));+ }).WithMessage(translationService.GetResource("Vendor.Catalog.Products.Permissions"));}}\ No newline at end of filediff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex 5bd871ca9..f9e37ade5 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -2094,7 +2094,7 @@<Resource Name="Admin.Catalog.Brands.List.SearchStore" Area="Admin"><Value>Store</Value></Resource>- <Resource Name="Admin.Catalog.Brands.Permisions" Area="Admin">+ <Resource Name="Admin.Catalog.Brands.Permissions" Area="Admin"><Value>You can't edit this brand, because it can be used in many stores.</Value></Resource><Resource Name="Admin.Catalog.Brands.Updated" Area="Admin">@@ -2316,7 +2316,7 @@<Resource Name="Admin.Catalog.Categories.Manage" Area="Admin"><Value>Manage Categories</Value></Resource>- <Resource Name="Admin.Catalog.Categories.Permisions" Area="Admin">+ <Resource Name="Admin.Catalog.Categories.Permissions" Area="Admin"><Value>You can't edit this category, because it can be used in many stores.</Value></Resource><Resource Name="Admin.Catalog.Categories.Products" Area="Admin">@@ -2487,7 +2487,7 @@<Resource Name="Admin.Catalog.Collections.List.SearchStore" Area="Admin"><Value>Store</Value></Resource>- <Resource Name="Admin.Catalog.Collections.Permisions" Area="Admin">+ <Resource Name="Admin.Catalog.Collections.Permissions" Area="Admin"><Value>You can't edit this collection, because it can be used in many stores.</Value></Resource><Resource Name="Admin.Catalog.Collections.Products" Area="Admin">@@ -3360,7 +3360,7 @@<Resource Name="Admin.Catalog.Products.Mappings" Area="Admin"><Value>Mappings</Value></Resource>- <Resource Name="Admin.Catalog.Products.Permisions" Area="Admin">+ <Resource Name="Admin.Catalog.Products.Permissions" Area="Admin"><Value>You can't edit this product, because it is not yours.</Value></Resource><Resource Name="Admin.Catalog.Products.Pictures" Area="Admin">@@ -5490,7 +5490,7 @@<Resource Name="Admin.Content.blog.blogcategory.info" Area="Admin"><Value>Info</Value></Resource>- <Resource Name="Admin.Content.Blog.BlogCategory.Permisions" Area="Admin">+ <Resource Name="Admin.Content.Blog.BlogCategory.Permissions" Area="Admin"><Value>You can't edit this category blog, because it can be used in many stores.</Value></Resource><Resource Name="Admin.Content.blog.blogcategory.posts" Area="Admin">@@ -5598,7 +5598,7 @@<Resource Name="Admin.Content.Blog.BlogPosts.Info" Area="Admin"><Value>Info</Value></Resource>- <Resource Name="Admin.Content.Blog.BlogPosts.Permisions" Area="Admin">+ <Resource Name="Admin.Content.Blog.BlogPosts.Permissions" Area="Admin"><Value>You can't edit this blog post, because it can be used in many stores.</Value></Resource><Resource Name="Admin.Content.Blog.BlogPosts.Products" Area="Admin">@@ -6288,7 +6288,7 @@<Resource Name="Admin.Courses.Course.Manage" Area="Admin"><Value>Manage course</Value></Resource>- <Resource Name="Admin.Courses.Course.Permisions" Area="Admin">+ <Resource Name="Admin.Courses.Course.Permissions" Area="Admin"><Value>You can't edit this course, because it can be used in many stores.</Value></Resource><Resource Name="Admin.Courses.Course.Subject.Fields.CourseId.Required" Area="Admin">@@ -8064,7 +8064,7 @@<Resource Name="Admin.Marketing.Discounts.List.SearchDiscountType" Area="Admin"><Value>Discount type</Value></Resource>- <Resource Name="Admin.Marketing.Discounts.Permisions" Area="Admin">+ <Resource Name="Admin.Marketing.Discounts.Permissions" Area="Admin"><Value>You can't edit this discount, because it can be used in many stores.</Value></Resource><Resource Name="Admin.Marketing.Discounts.Requirements" Area="Admin">@@ -16713,7 +16713,7 @@<Resource Name="Vendor.Catalog.Products.Mappings" Area="Vendor"><Value>Mappings</Value></Resource>- <Resource Name="Vendor.Catalog.Products.Permisions" Area="Vendor">+ <Resource Name="Vendor.Catalog.Products.Permissions" Area="Vendor"><Value>You can't edit this product, because it is not yours.</Value></Resource><Resource Name="Vendor.Catalog.Products.Pictures" Area="Vendor">diff --git a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xml b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xmlindex 7c58be8d7..5874c9ca5 100644--- a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xml+++ b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xml@@ -811,7 +811,7 @@<Resource Name="Vendor.Catalog.Products.Mappings" Area="Vendor"><Value>Mappings</Value></Resource>- <Resource Name="Vendor.Catalog.Products.Permisions" Area="Vendor">+ <Resource Name="Vendor.Catalog.Products.Permissions" Area="Vendor"><Value>You can't edit this product, because it is not yours.</Value></Resource><Resource Name="Vendor.Catalog.Products.Pictures" Area="Vendor">@@ -1885,4 +1885,31 @@<Resource Name="Vendor.Portal" Area="Front"><Value>Vendor portal</Value></Resource>+ <Resource Name="Admin.Catalog.Brands.Permissions" Area="Admin">+ <Value>You can't edit this brand, because it can be used in many stores.</Value>+ </Resource>+ <Resource Name="Admin.Catalog.Categories.Permissions" Area="Admin">+ <Value>You can't edit this category, because it can be used in many stores.</Value>+ </Resource>+ <Resource Name="Admin.Catalog.Collections.Permissions" Area="Admin">+ <Value>You can't edit this collection, because it can be used in many stores.</Value>+ </Resource>+ <Resource Name="Admin.Catalog.Products.Permissions" Area="Admin">+ <Value>You can't edit this product, because it is not yours.</Value>+ </Resource>+ <Resource Name="Admin.Content.Blog.BlogCategory.Permissions" Area="Admin">+ <Value>You can't edit this category blog, because it can be used in many stores.</Value>+ </Resource>+ <Resource Name="Admin.Content.Blog.BlogPosts.Permissions" Area="Admin">+ <Value>You can't edit this blog post, because it can be used in many stores.</Value>+ </Resource>+ <Resource Name="Admin.Courses.Course.Permissions" Area="Admin">+ <Value>You can't edit this course, because it can be used in many stores.</Value>+ </Resource>+ <Resource Name="Admin.Marketing.Discounts.Permissions" Area="Admin">+ <Value>You can't edit this discount, because it can be used in many stores.</Value>+ </Resource>+ <Resource Name="Vendor.Catalog.Products.Permissions" Area="Vendor">+ <Value>You can't edit this product, because it is not yours.</Value>+ </Resource></Language>\ No newline at end of file