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
Change store - more user friendly URL address #145
KrzysztofPajak9a213a76133d
diff --git a/src/Web/Grand.Web/Controllers/CommonController.cs b/src/Web/Grand.Web/Controllers/CommonController.csindex 813f64cb0..7e45e2ec8 100644--- a/src/Web/Grand.Web/Controllers/CommonController.cs+++ b/src/Web/Grand.Web/Controllers/CommonController.cs@@ -245,31 +245,26 @@ namespace Grand.Web.Controllers[FromServices] IStoreService storeService,[FromServices] IStoreHelper _storeHelper,[FromServices] CommonSettings commonSettings,- string store, string returnUrl = "")+ string shortcut, string returnUrl = ""){- var currentstoreid = _workContext.CurrentStore.Id;- if (currentstoreid != store)+ var currentstoreShortcut = _workContext.CurrentStore.Shortcut;+ if (currentstoreShortcut != shortcut){if (commonSettings.AllowToSelectStore){- var selectedstore = await storeService.GetStoreById(store);+ var selectedstore = storeService.GetAll().FirstOrDefault(x => x.Shortcut.ToLowerInvariant() == shortcut.ToLowerInvariant());if (selectedstore != null){- await _storeHelper.SetStoreCookie(store);+ await _storeHelper.SetStoreCookie(selectedstore.Id);//notificationawait _mediator.Publish(new ChangeStoreEvent(_workContext.CurrentCustomer, selectedstore));- }- }- }- var prevStore = await storeService.GetStoreById(currentstoreid);- var currStore = await storeService.GetStoreById(store);- if (prevStore != null && currStore != null)- {- if (prevStore.Url != currStore.Url)- {- return Redirect(currStore.SslEnabled ? currStore.SecureUrl : currStore.Url);+ if (selectedstore.Url != _workContext.CurrentStore.Url)+ {+ return Redirect(selectedstore.SslEnabled ? selectedstore.SecureUrl : selectedstore.Url);+ }+ }}}@@ -339,8 +334,7 @@ namespace Grand.Web.Controllersif (closestorepage == null || !closestorepage.AccessibleWhenStoreClosed)return RedirectToRoute("StoreClosed");}- var model = await _mediator.Send(new ContactUsCommand()- {+ var model = await _mediator.Send(new ContactUsCommand() {Customer = _workContext.CurrentCustomer,Language = _workContext.WorkingLanguage,Store = _workContext.CurrentStore@@ -372,8 +366,7 @@ namespace Grand.Web.Controllersif (ModelState.IsValid){- var result = await _mediator.Send(new ContactUsSendCommand()- {+ var result = await _mediator.Send(new ContactUsSendCommand() {CaptchaValid = captchaValid,Form = form,Model = model,@@ -397,8 +390,7 @@ namespace Grand.Web.Controllersreturn View(model);}}- model = await _mediator.Send(new ContactUsCommand()- {+ model = await _mediator.Send(new ContactUsCommand() {Customer = _workContext.CurrentCustomer,Language = _workContext.WorkingLanguage,Store = _workContext.CurrentStore,@@ -416,8 +408,7 @@ namespace Grand.Web.Controllersif (!commonSettings.SitemapEnabled)return RedirectToRoute("HomePage");- var model = await _mediator.Send(new GetSitemap()- {+ var model = await _mediator.Send(new GetSitemap() {Customer = _workContext.CurrentCustomer,Language = _workContext.WorkingLanguage,Store = _workContext.CurrentStore@@ -463,8 +454,7 @@ namespace Grand.Web.Controllers//disabledreturn Json(new { html = "" });- var model = await _mediator.Send(new GetPrivacyPreference()- {+ var model = await _mediator.Send(new GetPrivacyPreference() {Customer = _workContext.CurrentCustomer,Store = _workContext.CurrentStore});@@ -473,7 +463,7 @@ namespace Grand.Web.Controllers{html = await this.RenderPartialViewToString("PrivacyPreference", model, true),model = model,- });+ });}[HttpPost]@@ -531,8 +521,7 @@ namespace Grand.Web.Controllers[HttpPost]public virtual async Task<IActionResult> ContactAttributeChange(IFormCollection form){- var result = await _mediator.Send(new ContactAttributeChangeCommand()- {+ var result = await _mediator.Send(new ContactAttributeChangeCommand() {Form = form,Customer = _workContext.CurrentCustomer,Store = _workContext.CurrentStore@@ -590,7 +579,7 @@ namespace Grand.Web.Controllersvar allowedFileExtensions = attribute.ValidationFileAllowedExtensions.ToLowerInvariant().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();- if(!allowedFileExtensions.Contains(fileExtension.ToLowerInvariant()))+ if (!allowedFileExtensions.Contains(fileExtension.ToLowerInvariant())){return Json(new{@@ -618,8 +607,7 @@ namespace Grand.Web.Controllers}}- var download = new Download- {+ var download = new Download {DownloadGuid = Guid.NewGuid(),UseDownloadUrl = false,DownloadUrl = "",diff --git a/src/Web/Grand.Web/Endpoints/EndpointProvider.cs b/src/Web/Grand.Web/Endpoints/EndpointProvider.csindex 8e06d19b5..e2255ea7c 100644--- a/src/Web/Grand.Web/Endpoints/EndpointProvider.cs+++ b/src/Web/Grand.Web/Endpoints/EndpointProvider.cs@@ -361,7 +361,7 @@ namespace Grand.Web.Endpoints//change storeendpointRouteBuilder.MapControllerRoute("ChangeStore",- pattern + "changestore/{store}",+ pattern + "changestore/{shortcut}",new { controller = "Common", action = "SetStore" });//get state list by country IDdiff --git a/src/Web/Grand.Web/Views/Shared/_Selector_Store.cshtml b/src/Web/Grand.Web/Views/Shared/_Selector_Store.cshtmlindex 12b375e14..12082a48d 100644--- a/src/Web/Grand.Web/Views/Shared/_Selector_Store.cshtml+++ b/src/Web/Grand.Web/Views/Shared/_Selector_Store.cshtml@@ -26,7 +26,7 @@@foreach (var store in availableStores){var className = store.Id == workContext.CurrentStore.Id ? "active" : "";- <b-dropdown-item class="@className" href="@Url.RouteUrl("ChangeStore", new { store = store.Id, returnUrl })">+ <b-dropdown-item class="@className" href="@Url.RouteUrl("ChangeStore", new { shortcut = store.Shortcut, returnUrl })">@store.Name</b-dropdown-item>}