From eef0dc8ad8ab04af2697e3446ab225ddfd13495c Mon Sep 17 00:00:00 2001 From: support Date: Wed, 8 Nov 2023 20:38:44 +0100 Subject: [PATCH] Typo fix --- .../CreateOrUpdate.TabActivityLog.cshtml | 4 +-- .../Partials/OrderDetails.Shipment.cshtml | 4 +-- .../Controllers/BlogController.cs | 4 +-- .../Controllers/BrandController.cs | 2 +- .../Controllers/CategoryController.cs | 2 +- .../Controllers/CollectionController.cs | 2 +- .../Controllers/CourseController.cs | 8 ++--- .../Controllers/DiscountController.cs | 2 +- .../Controllers/ProductController.cs | 34 +++++++++---------- .../AddAssociatedProductModelValidator.cs | 2 +- .../Catalog/AddBundleProductModelValidator.cs | 2 +- .../AddCategoryProductModelValidator.cs | 2 +- .../AddCollectionProductModelValidator.cs | 2 +- .../AddCrossSellProductModelValidator.cs | 2 +- ...uctSpecificationAttributeModelValidator.cs | 2 +- .../AddRelatedProductModelValidator.cs | 2 +- .../AddSimilarProductModelValidator.cs | 2 +- .../AssociatedProductModelValidator.cs | 2 +- .../Catalog/BundleProductModelValidator.cs | 2 +- .../Catalog/CategoryProductModelValidator.cs | 2 +- .../CollectionProductModelValidator.cs | 2 +- .../Catalog/CrossSellProductModelValidator.cs | 2 +- .../ProductAttributeMappingModelValidator.cs | 2 +- .../ProductAttributeValueModelValidator.cs | 2 +- .../Catalog/ProductCategoryModelValidator.cs | 2 +- .../ProductCollectionModelValidator.cs | 2 +- .../Catalog/ProductPictureModelValidator.cs | 2 +- ...uctSpecificationAttributeModelValidator.cs | 2 +- .../Catalog/RelatedProductModelValidator.cs | 2 +- .../Catalog/SimilarProductModelValidator.cs | 2 +- .../Catalog/TierPriceModelValidator.cs | 2 +- .../Partials/OrderDetails.Shipment.cshtml | 4 +-- .../Catalog/BundleProductModelValidator.cs | 2 +- .../Validators/Catalog/ProductValidVendor.cs | 4 +-- .../App_Data/Resources/DefaultLanguage.xml | 18 +++++----- .../App_Data/Resources/Upgrade/en_220.xml | 29 +++++++++++++++- 36 files changed, 95 insertions(+), 68 deletions(-) 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.cshtml index 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 @@ } - @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)) {
@Loc["Admin.System.QueuedEmails"] 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.cshtml index 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; @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)) {
diff --git a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs b/src/Web/Grand.Web.Admin/Controllers/BlogController.cs index 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 @@ public async Task Edit(string id) if (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 @@ public async Task CategoryEdit(string id) if (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.cs index 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 @@ public async Task Edit(string id) if (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.cs index 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 @@ public async Task Edit(string id) if (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.cs index 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 @@ public async Task Edit(string id) if (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.cs index 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 @@ public async Task Edit(string id) if (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 @@ public async Task CreateLesson(string courseId) if (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 @@ public async Task CreateLesson(CourseLessonModel model, bool cont if (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 @@ public async Task EditLesson(string id) if (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.cs index 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 @@ public async Task Edit(string id) if (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.cs index 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 @@ public async Task Edit(string id) if (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 @@ public async Task ProductAttributeMappingDelete(string id, string if (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 @@ public async Task ProductAttributeConditionPopup(ProductAttribute if (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 @@ public async Task ProductAttributeValueDelete(string id, string p if (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 @@ public async Task ProductAttributeCombinationDelete(string id, st if (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 @@ public async Task AttributeCombinationPopup(string productId, if (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 @@ public async Task GenerateAllAttributeCombinations(string product if (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 @@ public async Task ClearAllAttributeCombinations(string productId, if (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 @@ public async Task ProductAttributeCombinationTierPriceInsert(stri if (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 @@ public async Task ProductAttributeCombinationTierPriceUpdate(stri if (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 @@ public async Task ProductAttributeCombinationTierPriceDelete(stri if (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 @@ public async Task GenerateCalendar(string productId, ProductModel if (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 @@ public async Task ClearCalendar(string productId) if (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 @@ public async Task ClearOld(string productId) if (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 @@ public async Task ProductReservationDelete(ProductModel.Reservati if (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 @@ public async Task ListBids(DataSourceRequest command, string prod if (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 @@ public async Task BidDelete(ProductModel.BidModel model, [FromSer if (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.cs index 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 @@ public AddAssociatedProductModelValidator( return 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.cs index 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 @@ public AddBundleProductModelValidator( return 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.cs index 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 @@ public AddCategoryProductModelValidator( return 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.cs index 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 @@ public AddCollectionProductModelValidator( return 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.cs index 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 @@ public AddCrossSellProductModelValidator( return 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.cs index 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 @@ public AddProductSpecificationAttributeModelValidator( return 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.cs index 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 @@ public AddRelatedProductModelValidator( return 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.cs index 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 @@ public AddSimilarProductModelValidator( return 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.cs index 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 @@ public AssociatedProductModelValidator( return 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.cs index 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 @@ public BundleProductModelValidator( return 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.cs index 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 @@ public CategoryProductModelValidator( return 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.cs index 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 @@ public CollectionProductModelValidator( return 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.cs index 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 @@ public CrossSellProductModelValidator( return 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.cs index 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 @@ public ProductAttributeMappingModelValidator( return 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.cs index 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 @@ public ProductAttributeValueModelValidator( return 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.cs index 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 @@ public ProductCategoryModelValidator( return 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.cs index 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 @@ public ProductCollectionModelValidator( return 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.cs index 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 @@ public ProductPictureModelValidator( return 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.cs index 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 @@ public ProductSpecificationAttributeModelValidator( return 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.cs index 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 @@ public RelatedProductModelValidator( return 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.cs index 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 @@ public SimilarProductModelValidator( return 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.cs index 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 @@ public TierPriceModelValidator( return 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.cshtml index 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; @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)) {
diff --git a/src/Web/Grand.Web.Vendor/Validators/Catalog/BundleProductModelValidator.cs b/src/Web/Grand.Web.Vendor/Validators/Catalog/BundleProductModelValidator.cs index 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 @@ public BundleProductModelValidator( var 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 file diff --git a/src/Web/Grand.Web.Vendor/Validators/Catalog/ProductValidVendor.cs b/src/Web/Grand.Web.Vendor/Validators/Catalog/ProductValidVendor.cs index 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 ProductValidVendor( 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 ProductRelatedValidVendor( var 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 file diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml index 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 @@ Store - + You can't edit this brand, because it can be used in many stores. @@ -2316,7 +2316,7 @@ Manage Categories - + You can't edit this category, because it can be used in many stores. @@ -2487,7 +2487,7 @@ Store - + You can't edit this collection, because it can be used in many stores. @@ -3360,7 +3360,7 @@ Mappings - + You can't edit this product, because it is not yours. @@ -5490,7 +5490,7 @@ Info - + You can't edit this category blog, because it can be used in many stores. @@ -5598,7 +5598,7 @@ Info - + You can't edit this blog post, because it can be used in many stores. @@ -6288,7 +6288,7 @@ Manage course - + You can't edit this course, because it can be used in many stores. @@ -8064,7 +8064,7 @@ Discount type - + You can't edit this discount, because it can be used in many stores. @@ -16713,7 +16713,7 @@ Mappings - + You can't edit this product, because it is not yours. 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.xml index 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 @@ Mappings - + You can't edit this product, because it is not yours. @@ -1885,4 +1885,31 @@ Vendor portal + + You can't edit this brand, because it can be used in many stores. + + + You can't edit this category, because it can be used in many stores. + + + You can't edit this collection, because it can be used in many stores. + + + You can't edit this product, because it is not yours. + + + You can't edit this category blog, because it can be used in many stores. + + + You can't edit this blog post, because it can be used in many stores. + + + You can't edit this course, because it can be used in many stores. + + + You can't edit this discount, because it can be used in many stores. + + + You can't edit this product, because it is not yours. + \ No newline at end of file