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.

Replace MediatR with in-house Grand.Mediator (#753)

Krzysztof Pajake79c5fa1d737
diff --git a/.ai/constraints.md b/.ai/constraints.md
index ac56cb0c6..c699a5fa1 100644
--- a/.ai/constraints.md
+++ b/.ai/constraints.md
@@ -13,7 +13,7 @@ Central package management is on (`ManagePackageVersionsCentrally=true`). An inl
→ Add `<PackageVersion>` to `Directory.Packages.props`, reference without a version.
### Never add a package for a capability the repository already has
-MediatR, FluentValidation, `Grand.Mapping`, `MongoDB.Driver`, `StackExchange.Redis`, DotLiquid, Scryber, ImageSharp, MailKit, Scrutor are already present. Adding a second library for the same job splits the codebase.
+`Grand.Mediator`, FluentValidation, `Grand.Mapping`, `MongoDB.Driver`, `StackExchange.Redis`, DotLiquid, Scryber, ImageSharp, MailKit, Scrutor are already present. Adding a second library for the same job splits the codebase.
→ See the table in `.ai/standards/dependencies.md`.
### Never use Newtonsoft.Json
@@ -97,7 +97,7 @@ Prices, ids, and stored strings must not depend on the request's culture.
## Web layer
### Never put business logic in a controller
-→ A MediatR command or query handler.
+→ A `Grand.Mediator` command or query handler.
### Never trust an id from a request
A posted `vendorId`, `storeId`, or `customerId` is attacker-controlled.
diff --git a/.ai/examples/cached-store-scoped-service.md b/.ai/examples/cached-store-scoped-service.md
index 047b788e9..16dd57961 100644
--- a/.ai/examples/cached-store-scoped-service.md
+++ b/.ai/examples/cached-store-scoped-service.md
@@ -117,7 +117,7 @@ Every public method is `virtual`. That is deliberate — plugins replace core se
| Not here | Where it belongs |
|---|---|
-| View models | `Grand.Web/Models` + a MediatR handler |
+| View models | `Grand.Web/Models` + a mediator handler |
| `IWorkContext` | the caller — the service takes `storeId` explicitly |
| MongoDB filters and collections | inside `IRepository<T>` |
| Authorization checks | the controller's `[PermissionAuthorize]` attribute |
diff --git a/.ai/knowledge/architecture.md b/.ai/knowledge/architecture.md
index 8fda72c86..85378a58a 100644
--- a/.ai/knowledge/architecture.md
+++ b/.ai/knowledge/architecture.md
@@ -24,7 +24,7 @@ Grand.SharedKernel — Interfaces and utilities shared across all la
Rules:
- Domain has no dependencies on infrastructure or business layers.
- Business layer depends on Domain and Data abstractions (`IRepository<T>`), not on concrete Mongo types.
-- Controllers delegate to MediatR — never contain business logic.
+- Controllers delegate to the mediator — never contain business logic.
- Infrastructure registrations go in `IStartupApplication`, not `Program.cs`.
- Dependencies point inward. Core, business, and web projects never reference a plugin.
@@ -67,7 +67,7 @@ public class StartupApplication : IStartupApplication
---
-## MediatR — Commands and Queries
+## Grand.Mediator — Commands and Queries
All mutations (writes) go through commands; all reads go through queries. Controllers only call `_mediator.Send(...)`.
@@ -137,6 +137,6 @@ Handler failure semantics, re-entrancy, and the missing-ambient-context trap are
| Injecting `IMongoDatabase` into a business service | Inject `IRepository<T>` |
| Forgetting `_mediator.EntityUpdated` after `_repo.UpdateAsync` | Always publish after every mutation |
| Singleton service with `IRepository<T>` dependency | `IRepository<T>` is Scoped — its consumer must also be Scoped |
-| Caching in a controller or MediatR handler | Cache in the business service, around the repository call |
+| Caching in a controller or mediator handler | Cache in the business service, around the repository call |
| Reading `IWorkContext` from a scheduled task or migration | Pass store/customer explicitly — there is no ambient context |
| A cache key that omits the store id for store-scoped data | Include every variable that changes the result |
diff --git a/.ai/knowledge/async.md b/.ai/knowledge/async.md
index 0869a83b9..7c69a6808 100644
--- a/.ai/knowledge/async.md
+++ b/.ai/knowledge/async.md
@@ -20,7 +20,7 @@ public async void HandleAsync() { ... }
### Accept and forward CancellationToken throughout the call chain
-Every MediatR handler already accepts `CancellationToken`. Pass it to every async call you make.
+Every mediator handler already accepts `CancellationToken`. Pass it to every async call you make.
```csharp
public async Task<int?> Handle(MaxOrderNumberCommand request, CancellationToken cancellationToken)
diff --git a/.ai/knowledge/caching.md b/.ai/knowledge/caching.md
index 5663fe228..8e2f5b0c7 100644
--- a/.ai/knowledge/caching.md
+++ b/.ai/knowledge/caching.md
@@ -93,7 +93,7 @@ When adding a cached family, ask what *else* embeds this data in a cached projec
| Layer | Caches? |
|---|---|
| Controller | No |
-| MediatR handler | No — a handler may compose cached services, but does not own a cache key |
+| Mediator handler | No — a handler may compose cached services, but does not own a cache key |
| Business service | **Yes** — this is the only layer that calls `ICacheBase` |
| Repository | No |
diff --git a/.ai/knowledge/domain-events.md b/.ai/knowledge/domain-events.md
index 7462357c0..902e0f68a 100644
--- a/.ai/knowledge/domain-events.md
+++ b/.ai/knowledge/domain-events.md
@@ -1,6 +1,6 @@
# Domain Events and Notifications
-GrandNode uses MediatR for three distinct things. Keeping them apart matters, because they have different failure semantics.
+GrandNode uses `Grand.Mediator` (`src/Core/Grand.Mediator`, in-house) for three distinct things. Keeping them apart matters, because they have different failure semantics.
| Kind | Interface | Handlers | Failure |
|---|---|---|---|
@@ -64,7 +64,7 @@ Handlers are discovered by assembly scanning, including in plugins. This is the
### Handler rules
-1. **A handler must not throw.** MediatR's default publisher runs handlers sequentially; an exception aborts the remaining handlers and surfaces in the caller's write path. Catch, log, and return.
+1. **A handler must not throw.** `Publish` runs handlers sequentially and fails fast; an exception aborts the remaining handlers and surfaces in the caller's write path. Catch, log, and return.
2. A handler must be fast. It runs inline in the request. Long work belongs in a scheduled task — see `.ai/skills/scheduled-task.md`.
3. A handler must not assume ambient context. Entity events fire from scheduled tasks and migrations too, where `IWorkContext` is null. Read what you need off the entity, or take it as an explicit parameter. See `.ai/knowledge/scoping.md`.
4. A handler that writes the same entity type it subscribes to will re-enter itself. Guard it or restructure.
diff --git a/.ai/knowledge/repository-map.md b/.ai/knowledge/repository-map.md
index 84cbd65b6..1d68a4f17 100644
--- a/.ai/knowledge/repository-map.md
+++ b/.ai/knowledge/repository-map.md
@@ -17,7 +17,7 @@
- .NET and ASP.NET Core.
- MongoDB through repository/data abstractions.
- Redis for caching and data protection integration.
-- MediatR for commands, queries, and events.
+- Custom mediator in `Grand.Mediator` for commands, queries, and events, with a MediatR-compatible API (`IRequest`, `IRequestHandler`, `INotification`, `INotificationHandler`, `IMediator`). MediatR package is not used.
- FluentValidation for validators.
- Custom mapping framework in `Grand.Mapping` with an AutoMapper-compatible profile API (`Profile`, `CreateMap`, `ForMember`). AutoMapper package is not used.
- Razor views, partials, view components, and tag helpers.
@@ -75,6 +75,10 @@ Use this area for:
### `src/Core/Grand.Mapping`
Use for shared mapping infrastructure and mapping support.
+### `src/Core/Grand.Mediator`
+Use for the mediator itself — request/notification abstractions, dispatch, and handler registration.
+Handlers and the messages they handle belong to the owning project, never here.
+
### `src/Core/Grand.SharedKernel`
Use for low-level shared primitives, attributes, extensions, and small cross-cutting helpers.
@@ -254,6 +258,7 @@ Choose the closest test project by target ownership:
- Domain changes: `Grand.Domain.Tests`
- Infrastructure changes: `Grand.Infrastructure.Tests`
- Mapping changes: `Grand.Mapping.Tests`
+- Mediator changes: `Grand.Mediator.Tests`
- Module changes: `Grand.Modules.Tests` or module-specific tests
- API changes: `Grand.Module.Api.Tests`
- Web common changes: `Grand.Web.Common.Tests`
diff --git a/.ai/knowledge/request-lifecycle.md b/.ai/knowledge/request-lifecycle.md
index 37aecd006..0f7fd2833 100644
--- a/.ai/knowledge/request-lifecycle.md
+++ b/.ai/knowledge/request-lifecycle.md
@@ -104,7 +104,7 @@ Controller action
Rules that fall out of this:
-1. Controllers hold no business logic. They resolve input, send a MediatR request, and return a result.
+1. Controllers hold no business logic. They resolve input, send a mediator request, and return a result.
2. Query handlers live in `Features/Handlers/`, command handlers in `Commands/Handler/`, mirroring the request type's folder.
3. Handlers prepare view models. Business services do not know about view models.
4. Caching sits in the business service, wrapping the repository call — not in the handler or controller.
@@ -119,7 +119,7 @@ The active theme's `IThemeView.GetViewLocations()` is consulted before the defau
| You are adding | Put it in |
|---|---|
-| A page | controller action + MediatR query + handler + view model + view |
+| A page | controller action + mediator query + handler + view model + view |
| A cross-cutting request concern | middleware registered from an `IStartupApplication` |
| Service registration | `IStartupApplication.ConfigureServices` in the owning project |
| Something that must run before auth | `IStartupApplication` with `BeforeConfigure = true` and a low `Priority` |
diff --git a/.ai/principles.md b/.ai/principles.md
index a32b2108a..c601cf9d9 100644
--- a/.ai/principles.md
+++ b/.ai/principles.md
@@ -14,7 +14,7 @@ Every query, cache key, and setting read carries its scope. When in doubt about
## 2. The domain has no dependencies
-`Grand.Domain` knows nothing about MongoDB, HTTP, Razor, or MediatR. Business logic that belongs to the domain lives with the entity; business logic about a use case lives in `Grand.Business.*`.
+`Grand.Domain` knows nothing about MongoDB, HTTP, Razor, or the mediator. Business logic that belongs to the domain lives with the entity; business logic about a use case lives in `Grand.Business.*`.
Infrastructure never leaks inward. A `MongoDB.Driver` type in a business service signature, a `HttpContext` in a domain method, or a view model in a service is the same mistake in three places.
diff --git a/.ai/prompts/explore-repository.md b/.ai/prompts/explore-repository.md
index 370f1f74a..9ea2a9d3d 100644
--- a/.ai/prompts/explore-repository.md
+++ b/.ai/prompts/explore-repository.md
@@ -23,7 +23,7 @@ Answer "where does X live" and "how does X work" questions about GrandNode witho
| "Which permission guards this?" | `.ai/skills/permission-navigation.md`, then grep the `PermissionSystemName` |
| "How do I extend this?" | `.ai/skills/project-structure.md` |
-3. Follow the chain forward: controller → MediatR request → handler → business service → repository → domain entity.
+3. Follow the chain forward: controller → mediator request → handler → business service → repository → domain entity.
4. Confirm each claim by opening the file. Do not report a path you have not read.
5. When the question is about a plugin or theme, check `src/Plugins/` before assuming the behavior lives in core.
diff --git a/.ai/prompts/implement-feature.md b/.ai/prompts/implement-feature.md
index d81f1c302..cb19f2f38 100644
--- a/.ai/prompts/implement-feature.md
+++ b/.ai/prompts/implement-feature.md
@@ -20,7 +20,7 @@ Implement a new feature or change an existing one in GrandNode without breaking
1. Domain entity or settings class in `Grand.Domain`.
2. Repository access through `IRepository<T>` in the business layer.
3. Business service + interface in `Grand.Business.Core` / `Grand.Business.*`.
- 4. MediatR command/query + handler for the web layer.
+ 4. Mediator command/query + handler for the web layer.
5. FluentValidation validator.
6. Controller action with the correct authorization attribute.
7. View model, Razor view, and localization keys.
@@ -33,7 +33,7 @@ Implement a new feature or change an existing one in GrandNode without breaking
## Mandatory Rules
-1. Do not add business logic to controllers — delegate to MediatR or a business service.
+1. Do not add business logic to controllers — delegate to the mediator or a business service.
2. Do not reference concrete MongoDB types from the business layer; use `IRepository<T>`.
3. Do not register services in `Program.cs`; use `IStartupApplication` in the owning project.
4. Do not add a NuGet package version inline; add it to `Directory.Packages.props`.
diff --git a/.ai/skills/message-notification.md b/.ai/skills/message-notification.md
index bdb30abc7..0507064a9 100644
--- a/.ai/skills/message-notification.md
+++ b/.ai/skills/message-notification.md
@@ -4,7 +4,7 @@
Create, modify, and review GrandNode email message templates, DotLiquid tokens, message sending flows, queued email lifecycle, and domain event notification handlers.
## When To Use
-Use this skill when adding or changing a message template, adding new DotLiquid tokens or drop properties, triggering a new email notification from business code, seeding message templates in the installer, extending an existing `Liquid*` drop class, or wiring a MediatR event handler that sends a notification.
+Use this skill when adding or changing a message template, adding new DotLiquid tokens or drop properties, triggering a new email notification from business code, seeding message templates in the installer, extending an existing `Liquid*` drop class, or wiring a mediator event handler that sends a notification.
## When Not To Use
Do not use this skill for general admin UI work, settings, or localization changes beyond message template resource keys; combine it with `admin-area-changes` or `settings-and-localization` when those are also involved.
@@ -47,8 +47,8 @@ Do not use this skill as the primary review for MongoDB queries or security; com
#### DotLiquid Drops and Tokens
10. Add new token properties to an existing `Liquid*` drop class in `src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/` when the data already belongs to that drop's entity. Do not add properties that require loading additional entities unless those are already available in the drop constructor.
-11. Add a new drop class inheriting from `DotLiquid.Drop` only when the new template uses a domain entity that has no existing drop. Place it in the drops folder and wire it via a new MediatR `GetXxxTokensCommand` following the pattern of existing token commands under `src/Business/Grand.Business.Core/Commands/Messages/Tokens/`.
-12. Handle `MessageTokensAddedEvent` in a MediatR `INotificationHandler` to inject extra tokens from a plugin without modifying core drop classes. The event carries the `MessageTemplate` name and the current `LiquidObject`.
+11. Add a new drop class inheriting from `DotLiquid.Drop` only when the new template uses a domain entity that has no existing drop. Place it in the drops folder and wire it via a new `GetXxxTokensCommand` following the pattern of existing token commands under `src/Business/Grand.Business.Core/Commands/Messages/Tokens/`.
+12. Handle `MessageTokensAddedEvent` in an `INotificationHandler` to inject extra tokens from a plugin without modifying core drop classes. The event carries the `MessageTemplate` name and the current `LiquidObject`.
13. Never access `ITranslationService`, repositories, or services directly from inside a `Liquid*` drop property getter. Populate all values in the command handler that constructs the drop.
#### Queued Emails
@@ -59,7 +59,7 @@ Do not use this skill as the primary review for MongoDB queries or security; com
#### Domain Events and Handlers
17. Raise domain events via `IMediator.Publish(new XxxEvent(...))` after the triggering business action completes. Do not publish inside a repository or data layer.
18. Implement `INotificationHandler<TEvent>` in the relevant `Grand.Business.*` project when the notification should be sent in response to a domain event.
-19. Register event handlers automatically — MediatR scans assemblies registered in startup. No explicit handler registration is required beyond ensuring the assembly is included.
+19. Register event handlers automatically — `Grand.Mediator` scans assemblies registered in startup. No explicit handler registration is required beyond ensuring the assembly is included.
### Recommendations
1. Prefer adding a property to an existing drop over creating a new drop when the entity is already available in the build pipeline.
diff --git a/.ai/standards/dependencies.md b/.ai/standards/dependencies.md
index 332646d82..b03c9ab24 100644
--- a/.ai/standards/dependencies.md
+++ b/.ai/standards/dependencies.md
@@ -10,11 +10,11 @@ Consequences:
- Project files reference packages **without** a version:
```xml
- <PackageReference Include="MediatR" />
+ <PackageReference Include="FluentValidation" />
```
- Versions are declared once, in `Directory.Packages.props`:
```xml
- <PackageVersion Include="MediatR" Version="12.5.0" />
+ <PackageVersion Include="FluentValidation" Version="12.1.1" />
```
- Adding a version attribute in a `.csproj` is a build error, not a style issue.
- Bumping a version affects every project — call it out explicitly in the PR.
@@ -23,7 +23,7 @@ Do not add a new third-party package when the repository already has a capabilit
| Need | Already present |
|---|---|
-| Mediator / CQRS | `MediatR` |
+| Mediator / CQRS | `Grand.Mediator` (in-house; MediatR is **not** referenced) |
| Validation | `FluentValidation` |
| Object mapping | `Grand.Mapping` (AutoMapper-compatible API; AutoMapper itself is **not** referenced) |
| MongoDB | `MongoDB.Driver` |
diff --git a/.ai/standards/naming.md b/.ai/standards/naming.md
index 2f92de749..e60c4cc7a 100644
--- a/.ai/standards/naming.md
+++ b/.ai/standards/naming.md
@@ -29,9 +29,9 @@ Plugin group prefixes are fixed: `Payments`, `Shipping`, `Tax`, `Widgets`, `Auth
| Plugin entry point | `{Feature}Plugin` | inherits `BasePlugin` |
| Plugin constants | `{Feature}Defaults` | static class of system names, resource keys, URLs |
| Theme view | `{Name}ThemeView` | implements `IThemeView` |
-| MediatR query | `Get{Thing}Query` / `Get{Thing}` | matches the handler name |
-| MediatR command | `{Verb}{Thing}Command` | `InsertBlogCommentCommand` |
-| MediatR handler | `{RequestName}Handler` | `GetBlogPostHandler`, `ContactUsCommandHandler` |
+| Mediator query | `Get{Thing}Query` / `Get{Thing}` | matches the handler name |
+| Mediator command | `{Verb}{Thing}Command` | `InsertBlogCommentCommand` |
+| Mediator handler | `{RequestName}Handler` | `GetBlogPostHandler`, `ContactUsCommandHandler` |
| Validator | `{Model}Validator` | `AbstractValidator<T>` |
| Validator input record | `{Name}ValidatorRecord` | positional record |
| View model | `{Thing}Model` | lives in the web project, never in `Grand.Domain` |
diff --git a/.ai/workflows/fix-bug.md b/.ai/workflows/fix-bug.md
index c80a81afb..b22946411 100644
--- a/.ai/workflows/fix-bug.md
+++ b/.ai/workflows/fix-bug.md
@@ -24,7 +24,7 @@ If you cannot reproduce it, stop and report what you tried and what information
Goal: an explanation that accounts for **every** observation from phase 1, including the cases that work.
-1. Trace the path: controller → MediatR request → handler → business service → cache → repository. See `.ai/knowledge/request-lifecycle.md`.
+1. Trace the path: controller → mediator request → handler → business service → cache → repository. See `.ai/knowledge/request-lifecycle.md`.
2. Check the usual causes before the unusual ones — in this codebase, in this order:
- a cache key missing store id, language id, or another result-changing variable
- a query missing a store or vendor filter
diff --git a/.ai/workflows/upgrade-dependency.md b/.ai/workflows/upgrade-dependency.md
index b98a5fa3e..838e146fc 100644
--- a/.ai/workflows/upgrade-dependency.md
+++ b/.ai/workflows/upgrade-dependency.md
@@ -40,7 +40,6 @@ A dependency upgrade compiles and then behaves differently. Check the areas that
| Library | Verify |
|---|---|
| MongoDB driver | queries, serialization of `string` ids, date handling, aggregations |
-| MediatR | handler discovery, notification ordering, registration in plugins |
| FluentValidation | validator discovery, message text, rule chaining semantics |
| Serialization | round-trip of persisted documents, API request/response shapes |
| ASP.NET Core / SDK | middleware order, routing, model binding, antiforgery, auth |
diff --git a/AGENTS.md b/AGENTS.md
index 1af87ff58..9451ee8d2 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -65,7 +65,7 @@ Use a workflow when the answer is not known at the start. Each ends by handing o
- Use `.ai/knowledge/mongodb.md` for IRepository<T> usage, query patterns, partial updates, and write conventions.
- Use `.ai/knowledge/performance.md` for ICacheBase, CacheKey constants, cache invalidation, pagination, and partial field writes.
- Use `.ai/knowledge/security.md` for authorization checks, FluentValidation patterns, guard clauses, HTML encoding, and safe MongoDB queries.
-- Use `.ai/knowledge/architecture.md` for layering rules, DI lifetimes, MediatR commands/queries, and domain events.
+- Use `.ai/knowledge/architecture.md` for layering rules, DI lifetimes, mediator commands/queries, and domain events.
- Use `.ai/knowledge/request-lifecycle.md` for startup, IStartupApplication priorities, middleware order, ContextMiddleware, and the controller-to-view path.
- Use `.ai/knowledge/scoping.md` for store, vendor, customer group, language, and currency boundaries, and for code that runs without ambient context.
- Use `.ai/knowledge/caching.md` for ICacheBase, CacheKey constants, key composition, and invalidation including cross-family clearing.
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 000000000..b927366a4
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,7 @@
+<!--
+Adapter only. All agent instructions live in AGENTS.md, which is the single source of truth
+across tools. Claude Code auto-loads CLAUDE.md but not AGENTS.md, so this file imports it.
+Do not add rules here - add them to AGENTS.md.
+-->
+
diff --git a/Directory.Packages.props b/Directory.Packages.props
index ad4c653a6..24c8ecc1b 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -33,7 +33,6 @@
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.10" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.6.0" />
- <PackageVersion Include="MediatR" Version="12.5.0" />
<PackageVersion Include="Scrutor" Version="7.0.0" />
<PackageVersion Include="StackExchange.Redis" Version="3.0.17" />
<PackageVersion Include="FluentValidation" Version="12.1.1" />
diff --git a/GrandNode.sln b/GrandNode.sln
index 176e625e4..1d44f0a7b 100644
--- a/GrandNode.sln
+++ b/GrandNode.sln
@@ -41,6 +41,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Infrastructure", "src
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Mapping", "src\Core\Grand.Mapping\Grand.Mapping.csproj", "{D4E5F6A7-B8C9-4D0E-A236-B4C5D6E7F8A9}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Mediator", "src\Core\Grand.Mediator\Grand.Mediator.csproj", "{A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D}"
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{F6F48227-B3C5-4A51-B33F-FF9AD96352DB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication.Facebook", "src\Plugins\Authentication.Facebook\Authentication.Facebook.csproj", "{BA4579AF-9C20-477A-891B-926968B11C68}"
@@ -149,6 +151,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Web.AdminShared", "sr
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Mapping.Tests", "src\Tests\Grand.Mapping.Tests\Grand.Mapping.Tests.csproj", "{396E6929-5365-4116-8AA8-DF5327247798}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Mediator.Tests", "src\Tests\Grand.Mediator.Tests\Grand.Mediator.Tests.csproj", "{B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E}"
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CEA09484-30F6-4D44-02F6-822E06DBC57C}"
@@ -353,6 +357,18 @@ Global
{D4E5F6A7-B8C9-4D0E-A236-B4C5D6E7F8A9}.Release|x64.Build.0 = Release|Any CPU
{D4E5F6A7-B8C9-4D0E-A236-B4C5D6E7F8A9}.Release|x86.ActiveCfg = Release|Any CPU
{D4E5F6A7-B8C9-4D0E-A236-B4C5D6E7F8A9}.Release|x86.Build.0 = Release|Any CPU
+ {A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D}.Debug|x64.Build.0 = Debug|Any CPU
+ {A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D}.Debug|x86.Build.0 = Debug|Any CPU
+ {A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D}.Release|x64.ActiveCfg = Release|Any CPU
+ {A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D}.Release|x64.Build.0 = Release|Any CPU
+ {A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D}.Release|x86.ActiveCfg = Release|Any CPU
+ {A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D}.Release|x86.Build.0 = Release|Any CPU
{BA4579AF-9C20-477A-891B-926968B11C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BA4579AF-9C20-477A-891B-926968B11C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BA4579AF-9C20-477A-891B-926968B11C68}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -905,6 +921,18 @@ Global
{396E6929-5365-4116-8AA8-DF5327247798}.Release|x64.Build.0 = Release|Any CPU
{396E6929-5365-4116-8AA8-DF5327247798}.Release|x86.ActiveCfg = Release|Any CPU
{396E6929-5365-4116-8AA8-DF5327247798}.Release|x86.Build.0 = Release|Any CPU
+ {B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E}.Debug|x64.Build.0 = Debug|Any CPU
+ {B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E}.Debug|x86.Build.0 = Debug|Any CPU
+ {B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E}.Release|x64.ActiveCfg = Release|Any CPU
+ {B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E}.Release|x64.Build.0 = Release|Any CPU
+ {B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E}.Release|x86.ActiveCfg = Release|Any CPU
+ {B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E}.Release|x86.Build.0 = Release|Any CPU
{5819B37B-4972-4BBC-B51C-57B0028EF869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5819B37B-4972-4BBC-B51C-57B0028EF869}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5819B37B-4972-4BBC-B51C-57B0028EF869}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -961,6 +989,7 @@ Global
{1A6A0104-F610-4DD3-88BE-C4029034E5DA} = {BF4543A8-0731-4FDD-BB6B-0ADB9561F981}
{34A46D97-5996-46B3-BDCA-631EDAA0E210} = {FA350BD6-C29D-40D9-BA47-FE5FBDFC84A0}
{D4E5F6A7-B8C9-4D0E-A236-B4C5D6E7F8A9} = {FA350BD6-C29D-40D9-BA47-FE5FBDFC84A0}
+ {A1B2C3D4-5E6F-4A7B-9C8D-0E1F2A3B4C5D} = {FA350BD6-C29D-40D9-BA47-FE5FBDFC84A0}
{BA4579AF-9C20-477A-891B-926968B11C68} = {F6F48227-B3C5-4A51-B33F-FF9AD96352DB}
{6F24BF9C-EA4E-42AB-A9A8-435CE69362B8} = {F6F48227-B3C5-4A51-B33F-FF9AD96352DB}
{64775F93-5A04-495F-97C6-BDB3835B18F6} = {F6F48227-B3C5-4A51-B33F-FF9AD96352DB}
@@ -1006,6 +1035,7 @@ Global
{136F1E35-8B20-465C-8D42-30A5A0D0DA1F} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
{12C4A556-E62E-4EC0-BCD9-E9D4E1F3D430} = {BF4543A8-0731-4FDD-BB6B-0ADB9561F981}
{396E6929-5365-4116-8AA8-DF5327247798} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8}
+ {B2C3D4E5-6F7A-4B8C-9D0E-1F2A3B4C5D6E} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8}
{CEA09484-30F6-4D44-02F6-822E06DBC57C} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{5819B37B-4972-4BBC-B51C-57B0028EF869} = {CEA09484-30F6-4D44-02F6-822E06DBC57C}
{8D626EA8-CB54-BC41-363A-217881BEBA6E} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
diff --git a/src/Business/Grand.Business.Authentication/Events/CustomerDeletedEventHandler.cs b/src/Business/Grand.Business.Authentication/Events/CustomerDeletedEventHandler.cs
index 16fa0d150..cd0913f5f 100644
--- a/src/Business/Grand.Business.Authentication/Events/CustomerDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Authentication/Events/CustomerDeletedEventHandler.cs
@@ -1,7 +1,7 @@
using Grand.Data;
using Grand.Domain.Customers;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Authentication.Events;
diff --git a/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs
index c7043a835..adbc4e11a 100644
--- a/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs
@@ -12,7 +12,7 @@ using Grand.Domain.Stores;
using Grand.Infrastructure;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Business.Authentication.Services;
diff --git a/src/Business/Grand.Business.Catalog/Commands/UpdateProductReviewTotalsCommandHandler.cs b/src/Business/Grand.Business.Catalog/Commands/UpdateProductReviewTotalsCommandHandler.cs
index ee2fa7673..89f292eef 100644
--- a/src/Business/Grand.Business.Catalog/Commands/UpdateProductReviewTotalsCommandHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Commands/UpdateProductReviewTotalsCommandHandler.cs
@@ -4,7 +4,7 @@ using Grand.Data;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Commands;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/BrandDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/BrandDeletedEventHandler.cs
index a93adb30e..c38d92c5d 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/BrandDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/BrandDeletedEventHandler.cs
@@ -1,7 +1,7 @@
using Grand.Data;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Events.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/CategoryDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/CategoryDeletedEventHandler.cs
index 97afce02c..55fb24117 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/CategoryDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/CategoryDeletedEventHandler.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Seo;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Events.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/CollectionDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/CollectionDeletedEventHandler.cs
index 364edbab8..9cc174423 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/CollectionDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/CollectionDeletedEventHandler.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Seo;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Events.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/DeleteMeasureUnitOnProductEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/DeleteMeasureUnitOnProductEventHandler.cs
index 5eb980509..4d1513b75 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/DeleteMeasureUnitOnProductEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/DeleteMeasureUnitOnProductEventHandler.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Directory;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Events.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/DeliveryDateDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/DeliveryDateDeletedEventHandler.cs
index 3d0c9428d..a3e2fc910 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/DeliveryDateDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/DeliveryDateDeletedEventHandler.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Events.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/DiscountDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/DiscountDeletedEventHandler.cs
index 0a50058de..44f6954e2 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/DiscountDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/DiscountDeletedEventHandler.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Vendors;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Events.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs
index b215aabbf..a159f684a 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Seo;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using System.Text.Json;
namespace Grand.Business.Catalog.Events.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductPublishEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductPublishEventHandler.cs
index a64f360cc..e44861576 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductPublishEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductPublishEventHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Events.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Events.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductUnPublishEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductUnPublishEventHandler.cs
index 60043dfd3..2d21cc16c 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductUnPublishEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductUnPublishEventHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Events.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Events.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/TaxCategoryDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/TaxCategoryDeletedEventHandler.cs
index b13a28223..42437cb00 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/TaxCategoryDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/TaxCategoryDeletedEventHandler.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Tax;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Events.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs
index a88d2d8f2..58a066c13 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Events.Catalog;
using Grand.Data;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Events.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/WarehouseDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/WarehouseDeletedEventHandler.cs
index f5a361aef..5c2b1fcff 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/WarehouseDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/WarehouseDeletedEventHandler.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Events.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetDiscountAmountProviderHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetDiscountAmountProviderHandler.cs
index 63e0b91b8..e43259244 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetDiscountAmountProviderHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetDiscountAmountProviderHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Queries.Catalog;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Discounts;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetDiscountUsageHistoryQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetDiscountUsageHistoryQueryHandler.cs
index 76fe942ea..d4c230245 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetDiscountUsageHistoryQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetDiscountUsageHistoryQueryHandler.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain;
using Grand.Domain.Discounts;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs
index a9dbdc34d..809098400 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs
index 10c09ae01..01c0c2c06 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs
@@ -3,7 +3,7 @@ using Grand.Data;
using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs
index 6614bf31a..e9ca46e3f 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Queries.Catalog;
using Grand.Data;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs
index 0d928772c..e9b9eb426 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs
index 98015117a..7326acf50 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs
@@ -5,7 +5,7 @@ using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Infrastructure.Configuration;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs
index dbb2688be..3aa1bebb5 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs
index 93d07b5b2..ce8bdf5da 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Queries.Catalog;
using Grand.Data;
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs
index 528ad87f7..61fd12dc5 100644
--- a/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Brands;
diff --git a/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs b/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs
index d63bdc2c0..465b32556 100644
--- a/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs
@@ -8,7 +8,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Brands;
diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs
index eaa268e59..152ba9350 100644
--- a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Categories;
diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs
index 2c3eed6d4..46cee17da 100644
--- a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs
@@ -11,7 +11,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Categories;
diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs
index 6efcd5511..b1f751e9f 100644
--- a/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs
@@ -9,7 +9,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Categories;
diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs
index 5a03a2391..b9ceb2a53 100644
--- a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Collections;
diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs
index a16a8c05c..db6a655ee 100644
--- a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs
@@ -9,7 +9,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Collections;
diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs
index 6d343809e..7f12a6ebd 100644
--- a/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs
@@ -9,7 +9,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Collections;
diff --git a/src/Business/Grand.Business.Catalog/Services/Directory/MeasureService.cs b/src/Business/Grand.Business.Catalog/Services/Directory/MeasureService.cs
index b10fb42f2..c91719194 100644
--- a/src/Business/Grand.Business.Catalog/Services/Directory/MeasureService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Directory/MeasureService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Directory;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Directory;
diff --git a/src/Business/Grand.Business.Catalog/Services/Directory/SearchTermService.cs b/src/Business/Grand.Business.Catalog/Services/Directory/SearchTermService.cs
index ae832ed4e..7f79b3a21 100644
--- a/src/Business/Grand.Business.Catalog/Services/Directory/SearchTermService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Directory/SearchTermService.cs
@@ -4,7 +4,7 @@ using Grand.Data;
using Grand.Domain;
using Grand.Domain.Common;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Directory;
diff --git a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs
index fb3bb627f..c33785698 100644
--- a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs
@@ -11,7 +11,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Discounts;
diff --git a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountValidationService.cs b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountValidationService.cs
index 46f0ecabd..12eff48fb 100644
--- a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountValidationService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountValidationService.cs
@@ -8,7 +8,7 @@ using Grand.Domain.Discounts;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Discounts;
diff --git a/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs b/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs
index e12616b22..4e49fb590 100644
--- a/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs
@@ -12,7 +12,7 @@ using Grand.Domain.Directory;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Infrastructure;
-using MediatR;
+using Grand.Mediator;
using System.Globalization;
namespace Grand.Business.Catalog.Services.Prices;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs b/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs
index 938c29163..5ddd03063 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs
@@ -9,7 +9,7 @@ using Grand.Domain.Stores;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Products;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs
index 47eea7c08..fc1120737 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Products;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs b/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs
index fbccaf55f..2fbb0cf59 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs
@@ -8,7 +8,7 @@ using Grand.Domain.Shipping;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Products;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs b/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs
index 0614a1a46..94eaa9bf4 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs
@@ -5,7 +5,7 @@ using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Products;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs
index 1ee0bd2f8..e35ebfe4e 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs
@@ -6,7 +6,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Products;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs
index 9908147c2..4b49a8433 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Products;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs
index 09cd45aa6..c2e3e2d93 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs
@@ -3,7 +3,7 @@ using Grand.Data;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Products;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs
index db897ef61..432521fa1 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs
@@ -3,7 +3,7 @@ using Grand.Data;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Products;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs
index 5873d3006..a72285354 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs
@@ -11,7 +11,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
using System.Linq.Expressions;
namespace Grand.Business.Catalog.Services.Products;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs
index b1b00c524..a06fa9cda 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Products;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs b/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs
index 836107001..e2b1f8359 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs
@@ -6,7 +6,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Products;
diff --git a/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs
index 83fb9d5bd..bb526d847 100644
--- a/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Tax;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Catalog.Services.Tax;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ActivatedValueForPurchasedVouchersCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ActivatedValueForPurchasedVouchersCommandHandler.cs
index f2889a90f..a58a51574 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ActivatedValueForPurchasedVouchersCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ActivatedValueForPurchasedVouchersCommandHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddCustomerReservationCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddCustomerReservationCommandHandler.cs
index 512be8213..a17e54e79 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddCustomerReservationCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddCustomerReservationCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddRequiredProductsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddRequiredProductsCommandHandler.cs
index d6328953f..48167b835 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddRequiredProductsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddRequiredProductsCommandHandler.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandler.cs
index f970b6c12..aaa7c116d 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs
index 17d49fc39..86f34c5e9 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Commands.Checkout.Orders;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderCommandHandler.cs
index 1cbec94e7..a107d2778 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderCommandHandler.cs
@@ -6,7 +6,7 @@ using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderItemCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderItemCommandHandler.cs
index ea37fa62a..5c6c7664b 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderItemCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderItemCommandHandler.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs
index f87a44d31..233e3f790 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs
@@ -6,7 +6,7 @@ using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Payments;
using Grand.SharedKernel;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CheckOrderStatusCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CheckOrderStatusCommandHandler.cs
index a5b3eb9aa..1c9c3a6e1 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CheckOrderStatusCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CheckOrderStatusCommandHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderCommandHandler.cs
index cc5ba3c14..a6f399bf2 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderCommandHandler.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderItemCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderItemCommandHandler.cs
index f51da453b..60c02a60d 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderItemCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderItemCommandHandler.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/InsertOrderItemCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/InsertOrderItemCommandHandler.cs
index ae3962d50..5442ff830 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/InsertOrderItemCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/InsertOrderItemCommandHandler.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandler.cs
index bd8cf57aa..b8966a89a 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Events.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsPaidCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsPaidCommandHandler.cs
index f897a9b06..9b450cfd7 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsPaidCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsPaidCommandHandler.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.SharedKernel;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs
index d26f90ba3..e22ce1417 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Commands.Checkout.Orders;
using Grand.Data;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderNotificationCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderNotificationCommandHandler.cs
index 95206a61a..66eb921ee 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderNotificationCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderNotificationCommandHandler.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Messages;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderStatusCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderStatusCommandHandler.cs
index 71db7cc7d..187d065e0 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderStatusCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderStatusCommandHandler.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Common.Pdf;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandler.cs
index 96ff52b63..a0cfbf79b 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandler.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using Grand.SharedKernel;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundCommandHandler.cs
index dfae48ddf..e70b434b0 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundCommandHandler.cs
@@ -8,7 +8,7 @@ using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Localization;
using Grand.Domain.Payments;
using Grand.SharedKernel;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandler.cs
index 063e34464..efc467951 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandler.cs
@@ -7,7 +7,7 @@ using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Localization;
using Grand.Domain.Payments;
using Grand.SharedKernel;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs
index 55c8236a6..f2e326ed2 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs
@@ -27,7 +27,7 @@ using Grand.Domain.Tax;
using Grand.Infrastructure;
using Grand.SharedKernel;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PrepareOrderCodeCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PrepareOrderCodeCommandHandler.cs
index c515ff3c6..759f618eb 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PrepareOrderCodeCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PrepareOrderCodeCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Commands.Checkout.Orders;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ProcessOrderPaidCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ProcessOrderPaidCommandHandler.cs
index 2caa80281..419c773a9 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ProcessOrderPaidCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ProcessOrderPaidCommandHandler.cs
@@ -6,7 +6,7 @@ using Grand.Business.Core.Interfaces.Messages;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReOrderCommandHandler.cs
index d9e378406..56dca1e45 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReOrderCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReOrderCommandHandler.cs
@@ -6,7 +6,7 @@ using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Grand.Domain.Tax;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandler.cs
index 493767031..a9604af1c 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundCommandHandler.cs
index 0871726ec..abe5eee38 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundCommandHandler.cs
@@ -6,7 +6,7 @@ using Grand.Business.Core.Interfaces.Messages;
using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Localization;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundOfflineCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundOfflineCommandHandler.cs
index 8c86788db..89b145a4f 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundOfflineCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundOfflineCommandHandler.cs
@@ -7,7 +7,7 @@ using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Localization;
using Grand.Domain.Payments;
using Grand.SharedKernel;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandler.cs
index 9f2ba4a0e..75015db67 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Commands.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Common.Localization;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/UpdateOrderItemCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/UpdateOrderItemCommandHandler.cs
index 1dd533b2b..972fed8b9 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/UpdateOrderItemCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/UpdateOrderItemCommandHandler.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandler.cs
index fd34fac9e..eef41cfe9 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Commands.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs
index 1e249c8bd..426030624 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs
@@ -6,7 +6,7 @@ using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Payments;
using Grand.SharedKernel;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidOfflineCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidOfflineCommandHandler.cs
index 35eda61ac..e17722eef 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidOfflineCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidOfflineCommandHandler.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using Grand.SharedKernel;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs
index 6aae6ef31..a342c673f 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs
@@ -6,7 +6,7 @@ using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Shipping;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs
index 9f242199c..92c991b42 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs
@@ -6,7 +6,7 @@ using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Commands.Handlers.Shipping;
diff --git a/src/Business/Grand.Business.Checkout/Events/Customers/CustomerRegisteredEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Customers/CustomerRegisteredEventHandler.cs
index 7d3b527fa..dbcaf218d 100644
--- a/src/Business/Grand.Business.Checkout/Events/Customers/CustomerRegisteredEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Customers/CustomerRegisteredEventHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Events.Customers;
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnDeletedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnDeletedEventHandler.cs
index 083ccf4a6..cef8e366b 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnDeletedEventHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Events.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnInsertEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnInsertEventHandler.cs
index 8e5b7584f..9b1fc21d6 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnInsertEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnInsertEventHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Events.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs
index 919c2623b..f3f4876e4 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Events.Checkout.Orders;
using Grand.Data;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Events.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs
index 8fb2c7ee7..98930e4c1 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Customers;
using Grand.Data;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Events.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeletedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeletedEventHandler.cs
index 5b7f9c716..c58c16216 100644
--- a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeletedEventHandler.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Events.Shipping;
diff --git a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentInsertedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentInsertedEventHandler.cs
index a240ddad6..dabdb186d 100644
--- a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentInsertedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentInsertedEventHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Events.Shipping;
diff --git a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/CustomerLoggedInEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/ShoppingCart/CustomerLoggedInEventHandler.cs
index 58b827bc3..ffcb5d67c 100644
--- a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/CustomerLoggedInEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/ShoppingCart/CustomerLoggedInEventHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Events.Customers;
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Infrastructure;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Events.ShoppingCart;
diff --git a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartItemDeletedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartItemDeletedEventHandler.cs
index 7de8b4c64..682ebfb13 100644
--- a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartItemDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartItemDeletedEventHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Orders;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Events.ShoppingCart;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs
index eb5578514..e35ffea43 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCaptureQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCaptureQueryHandler.cs
index 1bc949680..3a935dedc 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCaptureQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCaptureQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs
index 59c366fe1..ada781f39 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsPaidQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsPaidQueryHandler.cs
index 7f7ed5b45..94e4f2ffb 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsPaidQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsPaidQueryHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyPaidOfflineQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyPaidOfflineQueryHandler.cs
index ba957fc03..cfea3b883 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyPaidOfflineQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyPaidOfflineQueryHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundOfflineQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundOfflineQueryHandler.cs
index f190910d3..8bea950d2 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundOfflineQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundOfflineQueryHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundQueryHandler.cs
index 07d8cc683..1bb47807c 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundOfflineQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundOfflineQueryHandler.cs
index 2410c5987..6360c43d1 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundOfflineQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundOfflineQueryHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundQueryHandler.cs
index 957b66d9f..1ed4b14a7 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidOfflineQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidOfflineQueryHandler.cs
index 03b7eb756..5492f260c 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidOfflineQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidOfflineQueryHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidQueryHandler.cs
index 60289c3cb..00c19c1f7 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs
index aba41138c..6451e680c 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Data;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs
index dab2e3bbe..ba56c53b3 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Data;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs
index bf91a6b5a..60bac28b5 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Data;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs
index cae94b410..bc72b9b89 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Data;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs
index 96417bf34..9ab570074 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Data;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPickupPointByIdQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPickupPointByIdQueryHandler.cs
index 55ec16231..56593cbb7 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPickupPointByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPickupPointByIdQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetVendorsInOrderQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetVendorsInOrderQueryHandler.cs
index ac6585120..2daebb929 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetVendorsInOrderQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetVendorsInOrderQueryHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/IsMerchandiseReturnAllowedQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/IsMerchandiseReturnAllowedQueryHandler.cs
index 0a5a4a90a..73c55839c 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/IsMerchandiseReturnAllowedQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/IsMerchandiseReturnAllowedQueryHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Queries.Handlers.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs
index 45c37dd04..8bc0f11af 100644
--- a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.CheckoutAttributes;
diff --git a/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs b/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs
index 86aac0163..74e979316 100644
--- a/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs
@@ -4,7 +4,7 @@ using Grand.Data;
using Grand.Domain;
using Grand.Domain.Orders;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.GiftVouchers;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs
index b2a693a08..11d3e48ec 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Orders;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs
index 9643f7424..9c424c583 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Orders;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs
index 692bcf68c..7635f9941 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs
index 7e2ce57e1..8dcc49ffa 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Orders;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs
index fcf3ea57a..b854cfab7 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Orders;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs
index df1047e02..068209b50 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs
@@ -10,7 +10,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Infrastructure;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
index fb59abede..92bc00b3a 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
@@ -8,7 +8,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs
index bddcadecb..3b97018ff 100644
--- a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs
@@ -4,7 +4,7 @@ using Grand.Data;
using Grand.Domain;
using Grand.Domain.Payments;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.Payments;
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs
index eba13f0e7..158739e31 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Shipping;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.Shipping;
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs
index 137023b7e..a006b4d31 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Shipping;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.Shipping;
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs
index a9196ce1c..6f2f81c64 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs
@@ -3,7 +3,7 @@ using Grand.Data;
using Grand.Domain;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.Shipping;
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs
index 064ab2785..59eae7116 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Shipping;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.Shipping;
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs
index ab8bfaa2a..a720c13e9 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Shipping;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Checkout.Services.Shipping;
diff --git a/src/Business/Grand.Business.Cms/Events/BlogPostDeletedEventHandler.cs b/src/Business/Grand.Business.Cms/Events/BlogPostDeletedEventHandler.cs
index 2ec6f2845..e1261c80f 100644
--- a/src/Business/Grand.Business.Cms/Events/BlogPostDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Cms/Events/BlogPostDeletedEventHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Domain.Blogs;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Cms.Events;
diff --git a/src/Business/Grand.Business.Cms/Services/BlogService.cs b/src/Business/Grand.Business.Cms/Services/BlogService.cs
index 83d1764a7..2562d5844 100644
--- a/src/Business/Grand.Business.Cms/Services/BlogService.cs
+++ b/src/Business/Grand.Business.Cms/Services/BlogService.cs
@@ -4,7 +4,7 @@ using Grand.Domain;
using Grand.Domain.Blogs;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Cms.Services;
diff --git a/src/Business/Grand.Business.Cms/Services/KnowledgebaseService.cs b/src/Business/Grand.Business.Cms/Services/KnowledgebaseService.cs
index ff69bad9d..be239f5ca 100644
--- a/src/Business/Grand.Business.Cms/Services/KnowledgebaseService.cs
+++ b/src/Business/Grand.Business.Cms/Services/KnowledgebaseService.cs
@@ -10,7 +10,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Cms.Services;
diff --git a/src/Business/Grand.Business.Cms/Services/NewsService.cs b/src/Business/Grand.Business.Cms/Services/NewsService.cs
index 567b7a9d1..435b10b88 100644
--- a/src/Business/Grand.Business.Cms/Services/NewsService.cs
+++ b/src/Business/Grand.Business.Cms/Services/NewsService.cs
@@ -6,7 +6,7 @@ using Grand.Domain.News;
using Grand.Infrastructure;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Cms.Services;
diff --git a/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs b/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs
index acd49de2b..7692742c0 100644
--- a/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs
+++ b/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Pages;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Cms.Services;
diff --git a/src/Business/Grand.Business.Cms/Services/PageService.cs b/src/Business/Grand.Business.Cms/Services/PageService.cs
index aaaac3b65..6d0a8c112 100644
--- a/src/Business/Grand.Business.Cms/Services/PageService.cs
+++ b/src/Business/Grand.Business.Cms/Services/PageService.cs
@@ -8,7 +8,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Cms.Services;
diff --git a/src/Business/Grand.Business.Cms/Services/RobotsTxtService.cs b/src/Business/Grand.Business.Cms/Services/RobotsTxtService.cs
index db9469005..27c69982c 100644
--- a/src/Business/Grand.Business.Cms/Services/RobotsTxtService.cs
+++ b/src/Business/Grand.Business.Cms/Services/RobotsTxtService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Common;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Cms.Services;
diff --git a/src/Business/Grand.Business.Common/Events/GroupDeletedEventHandler.cs b/src/Business/Grand.Business.Common/Events/GroupDeletedEventHandler.cs
index 9ce788530..5c39d4f46 100644
--- a/src/Business/Grand.Business.Common/Events/GroupDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Common/Events/GroupDeletedEventHandler.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Common.Events;
diff --git a/src/Business/Grand.Business.Common/Events/LanguageDeletedEventHandler.cs b/src/Business/Grand.Business.Common/Events/LanguageDeletedEventHandler.cs
index 309eb5084..293138a7a 100644
--- a/src/Business/Grand.Business.Common/Events/LanguageDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Common/Events/LanguageDeletedEventHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Localization;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Common.Events;
diff --git a/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs b/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs
index d889008c7..aa84feb8f 100644
--- a/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs
+++ b/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs
@@ -5,7 +5,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Common.Services.Addresses;
diff --git a/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs b/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs
index a7c848fef..e1ff3b1a0 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs
@@ -6,7 +6,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Common.Services.Directory;
diff --git a/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs b/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs
index 4584fc3b0..2a7c0fc4f 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs
@@ -6,7 +6,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Common.Services.Directory;
diff --git a/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs b/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs
index 7d7e72b0b..b36cdebc1 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs
@@ -6,7 +6,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Common.Services.Directory;
diff --git a/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs b/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs
index aae8703de..a2cb520a0 100644
--- a/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs
+++ b/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Localization;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Common.Services.Localization;
diff --git a/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs b/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs
index 9e531bb0f..edab4d138 100644
--- a/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs
+++ b/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using System.Collections.Concurrent;
using System.Xml;
diff --git a/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs b/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs
index 9ede97eba..9585f22b8 100644
--- a/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs
+++ b/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Stores;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Common.Services.Stores;
diff --git a/src/Business/Grand.Business.Core/Commands/Catalog/SendNotificationsToSubscribersCommand.cs b/src/Business/Grand.Business.Core/Commands/Catalog/SendNotificationsToSubscribersCommand.cs
index dd0d224fd..325943bb8 100644
--- a/src/Business/Grand.Business.Core/Commands/Catalog/SendNotificationsToSubscribersCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Catalog/SendNotificationsToSubscribersCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Catalog;
diff --git a/src/Business/Grand.Business.Core/Commands/Catalog/SendOutBidCustomerCommand.cs b/src/Business/Grand.Business.Core/Commands/Catalog/SendOutBidCustomerCommand.cs
index 449251e0d..719307abf 100644
--- a/src/Business/Grand.Business.Core/Commands/Catalog/SendOutBidCustomerCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Catalog/SendOutBidCustomerCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Catalog;
diff --git a/src/Business/Grand.Business.Core/Commands/Catalog/SendQuantityBelowStoreOwnerCommand.cs b/src/Business/Grand.Business.Core/Commands/Catalog/SendQuantityBelowStoreOwnerCommand.cs
index bdd7febc7..082ba0053 100644
--- a/src/Business/Grand.Business.Core/Commands/Catalog/SendQuantityBelowStoreOwnerCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Catalog/SendQuantityBelowStoreOwnerCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Catalog;
diff --git a/src/Business/Grand.Business.Core/Commands/Catalog/UpdateProductReviewTotalsCommand.cs b/src/Business/Grand.Business.Core/Commands/Catalog/UpdateProductReviewTotalsCommand.cs
index e65995a43..b90fb9861 100644
--- a/src/Business/Grand.Business.Core/Commands/Catalog/UpdateProductReviewTotalsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Catalog/UpdateProductReviewTotalsCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Catalog;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ActivatedValueForPurchasedVouchersCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ActivatedValueForPurchasedVouchersCommand.cs
index 4a606541f..988e3c1b4 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ActivatedValueForPurchasedVouchersCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ActivatedValueForPurchasedVouchersCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AddCustomerReservationCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AddCustomerReservationCommand.cs
index 312d71290..bfec495a5 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AddCustomerReservationCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AddCustomerReservationCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AddRequiredProductsCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AddRequiredProductsCommand.cs
index 3768e6126..763c3747e 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AddRequiredProductsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AddRequiredProductsCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AwardLoyaltyPointsCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AwardLoyaltyPointsCommand.cs
index c8c968401..1ae197db8 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AwardLoyaltyPointsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AwardLoyaltyPointsCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CalculateLoyaltyPointsCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CalculateLoyaltyPointsCommand.cs
index 2c32e664d..b300ac68d 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CalculateLoyaltyPointsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CalculateLoyaltyPointsCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderCommand.cs
index 98ab540fd..d10cb1db9 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderItemCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderItemCommand.cs
index 360046ad5..8f16ad25a 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderItemCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderItemCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CaptureCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CaptureCommand.cs
index de1cb0b65..07b7af4a6 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CaptureCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CaptureCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CheckOrderStatusCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CheckOrderStatusCommand.cs
index 4c5531f0c..b4ffd4d99 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CheckOrderStatusCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CheckOrderStatusCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderCommand.cs
index ec03354dd..f46ca3017 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderItemCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderItemCommand.cs
index 9bfd9b2de..6a3f8d121 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderItemCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderItemCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/InsertOrderItemCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/InsertOrderItemCommand.cs
index a6e3edcd2..e8fafd6cd 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/InsertOrderItemCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/InsertOrderItemCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsAuthorizedCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsAuthorizedCommand.cs
index 435646b6c..390a4633f 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsAuthorizedCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsAuthorizedCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsPaidCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsPaidCommand.cs
index 9c25e39b6..d00dce33b 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsPaidCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsPaidCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MaxOrderNumberCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MaxOrderNumberCommand.cs
index 19e2b062c..ae5c4cc00 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MaxOrderNumberCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MaxOrderNumberCommand.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyPaidOfflineCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyPaidOfflineCommand.cs
index 8aa858f7a..d79e2a41a 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyPaidOfflineCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyPaidOfflineCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundCommand.cs
index 2af5169dc..e76d5ef03 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundOfflineCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundOfflineCommand.cs
index 606a19af3..c2cb19d7a 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundOfflineCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundOfflineCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PlaceOrderCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PlaceOrderCommand.cs
index 53aac17b8..057eaf52d 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PlaceOrderCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PlaceOrderCommand.cs
@@ -1,5 +1,5 @@
using Grand.Business.Core.Utilities.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PrepareOrderCodeCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PrepareOrderCodeCommand.cs
index 9858f4045..1bb55d148 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PrepareOrderCodeCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PrepareOrderCodeCommand.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ProcessOrderPaidCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ProcessOrderPaidCommand.cs
index e18c3b4a4..e0890a5c0 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ProcessOrderPaidCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ProcessOrderPaidCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReOrderCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReOrderCommand.cs
index f72f239da..87655bb25 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReOrderCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReOrderCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReduceLoyaltyPointsCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReduceLoyaltyPointsCommand.cs
index 8b2df6554..fe160e9d2 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReduceLoyaltyPointsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReduceLoyaltyPointsCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundCommand.cs
index d57364541..b3df52c6a 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundOfflineCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundOfflineCommand.cs
index ceee391ff..bbed38c35 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundOfflineCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundOfflineCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReturnBackRedeemedLoyaltyPointsCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReturnBackRedeemedLoyaltyPointsCommand.cs
index ce517d3b9..61c1b263d 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReturnBackRedeemedLoyaltyPointsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReturnBackRedeemedLoyaltyPointsCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/SetOrderStatusCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/SetOrderStatusCommand.cs
index 2b3f92316..c76dc2c47 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/SetOrderStatusCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/SetOrderStatusCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/UpdateOrderItemCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/UpdateOrderItemCommand.cs
index 09a43ab3f..2c6450815 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/UpdateOrderItemCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/UpdateOrderItemCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs
index 0193571e7..0a17cbd40 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidCommand.cs
index ac3cc0863..c5e70c6c7 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidOfflineCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidOfflineCommand.cs
index bd9383484..0b2cfd3e7 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidOfflineCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidOfflineCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Shipping/DeliveryCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Shipping/DeliveryCommand.cs
index 967e0cae9..a61d8885e 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Shipping/DeliveryCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Shipping/DeliveryCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Shipping;
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Shipping/ShipCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Shipping/ShipCommand.cs
index 24fa59db4..2717abf1e 100644
--- a/src/Business/Grand.Business.Core/Commands/Checkout/Shipping/ShipCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Shipping/ShipCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Checkout.Shipping;
diff --git a/src/Business/Grand.Business.Core/Commands/Customers/ActiveVendorCommand.cs b/src/Business/Grand.Business.Core/Commands/Customers/ActiveVendorCommand.cs
index aed60b24f..4705c3d86 100644
--- a/src/Business/Grand.Business.Core/Commands/Customers/ActiveVendorCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Customers/ActiveVendorCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Customers;
diff --git a/src/Business/Grand.Business.Core/Commands/Customers/RegisteredByExternalMethod.cs b/src/Business/Grand.Business.Core/Commands/Customers/RegisteredByExternalMethod.cs
index ac1f03ede..682be79f1 100644
--- a/src/Business/Grand.Business.Core/Commands/Customers/RegisteredByExternalMethod.cs
+++ b/src/Business/Grand.Business.Core/Commands/Customers/RegisteredByExternalMethod.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Utilities.Authentication;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Customers;
diff --git a/src/Business/Grand.Business.Core/Commands/Messages/Common/InsertContactUsCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Common/InsertContactUsCommand.cs
index 1d4f7c85b..25a613aac 100644
--- a/src/Business/Grand.Business.Core/Commands/Messages/Common/InsertContactUsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Common/InsertContactUsCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Messages.Common;
diff --git a/src/Business/Grand.Business.Core/Commands/Messages/Common/OrderNotificationCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Common/OrderNotificationCommand.cs
index 4b4203588..c079e614b 100644
--- a/src/Business/Grand.Business.Core/Commands/Messages/Common/OrderNotificationCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Common/OrderNotificationCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Orders;
using Grand.Infrastructure;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Messages.Common;
diff --git a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAttributeCombinationTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAttributeCombinationTokensCommand.cs
index c4c081bf1..9aa1fdebe 100644
--- a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAttributeCombinationTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAttributeCombinationTokensCommand.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Messages.Tokens;
diff --git a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAuctionTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAuctionTokensCommand.cs
index 2649c8913..1fe9b3452 100644
--- a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAuctionTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAuctionTokensCommand.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Messages.Tokens;
diff --git a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetGiftVoucherTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetGiftVoucherTokensCommand.cs
index bb2c4303d..8143c90ce 100644
--- a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetGiftVoucherTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetGiftVoucherTokensCommand.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Messages.Tokens;
diff --git a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetMerchandiseReturnTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetMerchandiseReturnTokensCommand.cs
index 41b4e371b..ff6244cd1 100644
--- a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetMerchandiseReturnTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetMerchandiseReturnTokensCommand.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Messages.Tokens;
diff --git a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetOrderTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetOrderTokensCommand.cs
index de3361880..3040105f0 100644
--- a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetOrderTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetOrderTokensCommand.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Messages.Tokens;
diff --git a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShipmentTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShipmentTokensCommand.cs
index 4f6e14825..b089fcb63 100644
--- a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShipmentTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShipmentTokensCommand.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Domain.Stores;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Messages.Tokens;
diff --git a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShoppingCartTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShoppingCartTokensCommand.cs
index 291d8093f..4b4102795 100644
--- a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShoppingCartTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShoppingCartTokensCommand.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Messages.Tokens;
diff --git a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetStoreTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetStoreTokensCommand.cs
index 345436876..88931dc96 100644
--- a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetStoreTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetStoreTokensCommand.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Messages;
using Grand.Domain.Stores;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Messages.Tokens;
diff --git a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetVendorTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetVendorTokensCommand.cs
index 8381e6cd5..a8ef8a478 100644
--- a/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetVendorTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetVendorTokensCommand.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using Grand.Domain.Localization;
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.Messages.Tokens;
diff --git a/src/Business/Grand.Business.Core/Commands/System/Common/ClearMostViewedCommand.cs b/src/Business/Grand.Business.Core/Commands/System/Common/ClearMostViewedCommand.cs
index 22a3cb029..5daa7a47f 100644
--- a/src/Business/Grand.Business.Core/Commands/System/Common/ClearMostViewedCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/System/Common/ClearMostViewedCommand.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.System.Common;
diff --git a/src/Business/Grand.Business.Core/Commands/System/Common/GetSitemapXmlCommand.cs b/src/Business/Grand.Business.Core/Commands/System/Common/GetSitemapXmlCommand.cs
index c59adfd35..f942f4a03 100644
--- a/src/Business/Grand.Business.Core/Commands/System/Common/GetSitemapXmlCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/System/Common/GetSitemapXmlCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Commands.System.Common;
diff --git a/src/Business/Grand.Business.Core/Events/Catalog/ProductPublishEvent.cs b/src/Business/Grand.Business.Core/Events/Catalog/ProductPublishEvent.cs
index ea7f1a073..2622be5e0 100644
--- a/src/Business/Grand.Business.Core/Events/Catalog/ProductPublishEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Catalog/ProductPublishEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Catalog;
diff --git a/src/Business/Grand.Business.Core/Events/Catalog/ProductReviewApprovedEvent.cs b/src/Business/Grand.Business.Core/Events/Catalog/ProductReviewApprovedEvent.cs
index 569e4661f..3d86c4633 100644
--- a/src/Business/Grand.Business.Core/Events/Catalog/ProductReviewApprovedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Catalog/ProductReviewApprovedEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Catalog;
diff --git a/src/Business/Grand.Business.Core/Events/Catalog/ProductUnPublishEvent.cs b/src/Business/Grand.Business.Core/Events/Catalog/ProductUnPublishEvent.cs
index 3fc9305e3..fdac20956 100644
--- a/src/Business/Grand.Business.Core/Events/Catalog/ProductUnPublishEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Catalog/ProductUnPublishEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Catalog;
diff --git a/src/Business/Grand.Business.Core/Events/Catalog/UpdateProductOnCartEvent.cs b/src/Business/Grand.Business.Core/Events/Catalog/UpdateProductOnCartEvent.cs
index 531caebd3..5fddabe47 100644
--- a/src/Business/Grand.Business.Core/Events/Catalog/UpdateProductOnCartEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Catalog/UpdateProductOnCartEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Catalog;
diff --git a/src/Business/Grand.Business.Core/Events/Catalog/UpdateStockEvent.cs b/src/Business/Grand.Business.Core/Events/Catalog/UpdateStockEvent.cs
index 97143b12c..75e1bc07d 100644
--- a/src/Business/Grand.Business.Core/Events/Catalog/UpdateStockEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Catalog/UpdateStockEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Catalog;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/Orders/CapturePaymentTransactionDetailsEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/CapturePaymentTransactionDetailsEvent.cs
index 76da87a8c..ba6d5ca11 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/Orders/CapturePaymentTransactionDetailsEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/CapturePaymentTransactionDetailsEvent.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderCancelledEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderCancelledEvent.cs
index 3dfa61efe..c6b67c6bb 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderCancelledEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderCancelledEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderDeletedEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderDeletedEvent.cs
index 9910a71f0..2e8f5664c 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderDeletedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderDeletedEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPaidEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPaidEvent.cs
index a461053fc..b606b3664 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPaidEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPaidEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPlacedEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPlacedEvent.cs
index 565fd82de..f23eb7111 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPlacedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPlacedEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionMarkAsAuthorizedEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionMarkAsAuthorizedEvent.cs
index 3a716d27d..0dcaa5697 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionMarkAsAuthorizedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionMarkAsAuthorizedEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionRefundedEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionRefundedEvent.cs
index 5fb051273..a9debcd4d 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionRefundedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionRefundedEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionVoidOfflineEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionVoidOfflineEvent.cs
index cf4f24b3f..bdd99d5f1 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionVoidOfflineEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionVoidOfflineEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/Orders/PlaceOrderDetailsEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PlaceOrderDetailsEvent.cs
index c1e682af7..708520c7d 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/Orders/PlaceOrderDetailsEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PlaceOrderDetailsEvent.cs
@@ -1,5 +1,5 @@
using Grand.Business.Core.Utilities.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/Orders/VoidPaymentTransactionDetailsEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/VoidPaymentTransactionDetailsEvent.cs
index 5966f8f87..f73ae20a0 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/Orders/VoidPaymentTransactionDetailsEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/VoidPaymentTransactionDetailsEvent.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentDeliveredEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentDeliveredEvent.cs
index a2a6fbebe..db6d6d288 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentDeliveredEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentDeliveredEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.Shipping;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentSentEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentSentEvent.cs
index 8dac8fae7..dacf4d067 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentSentEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentSentEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.Shipping;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/AddToCartEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/AddToCartEvent.cs
index c69f9b555..e42035cb5 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/AddToCartEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/AddToCartEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.ShoppingCart;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartItemWarningsEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartItemWarningsEvent.cs
index ea9e94310..a422b61d4 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartItemWarningsEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartItemWarningsEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.ShoppingCart;
diff --git a/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartWarningsEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartWarningsEvent.cs
index 9be4c0126..638dbf5b8 100644
--- a/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartWarningsEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartWarningsEvent.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Common;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Checkout.ShoppingCart;
diff --git a/src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedInEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedInEvent.cs
index ec21fcf93..adeda2f2e 100644
--- a/src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedInEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedInEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Customers;
diff --git a/src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedOutEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedOutEvent.cs
index f21b93f3a..aada13679 100644
--- a/src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedOutEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedOutEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Customers;
diff --git a/src/Business/Grand.Business.Core/Events/Customers/CustomerLoginFailedEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/CustomerLoginFailedEvent.cs
index c1e352f78..22c4a0600 100644
--- a/src/Business/Grand.Business.Core/Events/Customers/CustomerLoginFailedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Customers/CustomerLoginFailedEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Customers;
diff --git a/src/Business/Grand.Business.Core/Events/Customers/CustomerRegisteredEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/CustomerRegisteredEvent.cs
index 7f866bf48..5815ae0e0 100644
--- a/src/Business/Grand.Business.Core/Events/Customers/CustomerRegisteredEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Customers/CustomerRegisteredEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Customers;
diff --git a/src/Business/Grand.Business.Core/Events/Customers/CustomerRegistrationEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/CustomerRegistrationEvent.cs
index dfcb342c7..6dcb4be51 100644
--- a/src/Business/Grand.Business.Core/Events/Customers/CustomerRegistrationEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Customers/CustomerRegistrationEvent.cs
@@ -1,5 +1,5 @@
using Grand.Business.Core.Utilities.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Customers;
diff --git a/src/Business/Grand.Business.Core/Events/Customers/VendorActivationEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/VendorActivationEvent.cs
index 2930c856f..cee6b71b3 100644
--- a/src/Business/Grand.Business.Core/Events/Customers/VendorActivationEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Customers/VendorActivationEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Customers;
diff --git a/src/Business/Grand.Business.Core/Events/Customers/VendorReviewApprovedEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/VendorReviewApprovedEvent.cs
index 70e021151..6c06b218e 100644
--- a/src/Business/Grand.Business.Core/Events/Customers/VendorReviewApprovedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Customers/VendorReviewApprovedEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Customers;
diff --git a/src/Business/Grand.Business.Core/Events/Marketing/CustomerCoordinatesEvent.cs b/src/Business/Grand.Business.Core/Events/Marketing/CustomerCoordinatesEvent.cs
index d83b3ff25..43c755dac 100644
--- a/src/Business/Grand.Business.Core/Events/Marketing/CustomerCoordinatesEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Marketing/CustomerCoordinatesEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Marketing;
diff --git a/src/Business/Grand.Business.Core/Events/Marketing/EmailSubscribedEvent.cs b/src/Business/Grand.Business.Core/Events/Marketing/EmailSubscribedEvent.cs
index 21ef99e2a..72a7a0e3a 100644
--- a/src/Business/Grand.Business.Core/Events/Marketing/EmailSubscribedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Marketing/EmailSubscribedEvent.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Marketing;
diff --git a/src/Business/Grand.Business.Core/Events/Marketing/EmailUnsubscribedEvent.cs b/src/Business/Grand.Business.Core/Events/Marketing/EmailUnsubscribedEvent.cs
index a6ddfb592..40917716b 100644
--- a/src/Business/Grand.Business.Core/Events/Marketing/EmailUnsubscribedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Marketing/EmailUnsubscribedEvent.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Marketing;
diff --git a/src/Business/Grand.Business.Core/Events/Messages/EntityTokensAddedEvent.cs b/src/Business/Grand.Business.Core/Events/Messages/EntityTokensAddedEvent.cs
index 36b97cb01..96a5f3290 100644
--- a/src/Business/Grand.Business.Core/Events/Messages/EntityTokensAddedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Messages/EntityTokensAddedEvent.cs
@@ -1,7 +1,7 @@
using DotLiquid;
using Grand.Domain;
using Grand.Domain.Messages;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Messages;
diff --git a/src/Business/Grand.Business.Core/Events/Messages/MessageTokensAddedEvent.cs b/src/Business/Grand.Business.Core/Events/Messages/MessageTokensAddedEvent.cs
index 89cd28119..f07d833af 100644
--- a/src/Business/Grand.Business.Core/Events/Messages/MessageTokensAddedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Messages/MessageTokensAddedEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Messages;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Events.Messages;
diff --git a/src/Business/Grand.Business.Core/Extensions/CustomerEventsExtensions.cs b/src/Business/Grand.Business.Core/Extensions/CustomerEventsExtensions.cs
index b28002ec0..5bb5ea4b9 100644
--- a/src/Business/Grand.Business.Core/Extensions/CustomerEventsExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/CustomerEventsExtensions.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Events.Customers;
using Grand.Business.Core.Utilities.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Extensions;
diff --git a/src/Business/Grand.Business.Core/Extensions/MessagesEventPublisherExtensions.cs b/src/Business/Grand.Business.Core/Extensions/MessagesEventPublisherExtensions.cs
index 5096752ab..922920efb 100644
--- a/src/Business/Grand.Business.Core/Extensions/MessagesEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/MessagesEventPublisherExtensions.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Events.Messages;
using Grand.Domain;
using Grand.Domain.Messages;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Extensions;
diff --git a/src/Business/Grand.Business.Core/Extensions/OrderEventPublisherExtensions.cs b/src/Business/Grand.Business.Core/Extensions/OrderEventPublisherExtensions.cs
index 9be7d06cf..a261f9a01 100644
--- a/src/Business/Grand.Business.Core/Extensions/OrderEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/OrderEventPublisherExtensions.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Events.Checkout.Orders;
using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Extensions;
diff --git a/src/Business/Grand.Business.Core/Extensions/ShippingEventPublisherExtensions.cs b/src/Business/Grand.Business.Core/Extensions/ShippingEventPublisherExtensions.cs
index 535da70ce..3931cb911 100644
--- a/src/Business/Grand.Business.Core/Extensions/ShippingEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/ShippingEventPublisherExtensions.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Events.Checkout.Shipping;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Extensions;
diff --git a/src/Business/Grand.Business.Core/Extensions/ShoppingCartEventPublisherExtensions.cs b/src/Business/Grand.Business.Core/Extensions/ShoppingCartEventPublisherExtensions.cs
index 0a45e2f34..7b5625eaa 100644
--- a/src/Business/Grand.Business.Core/Extensions/ShoppingCartEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/ShoppingCartEventPublisherExtensions.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Extensions;
diff --git a/src/Business/Grand.Business.Core/Queries/Catalog/GetDiscountAmountProvider.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetDiscountAmountProvider.cs
index f971f8672..49c02d34b 100644
--- a/src/Business/Grand.Business.Core/Queries/Catalog/GetDiscountAmountProvider.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetDiscountAmountProvider.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Discounts;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Catalog;
diff --git a/src/Business/Grand.Business.Core/Queries/Catalog/GetDiscountUsageHistoryQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetDiscountUsageHistoryQuery.cs
index 1888cd63e..f6fea16de 100644
--- a/src/Business/Grand.Business.Core/Queries/Catalog/GetDiscountUsageHistoryQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetDiscountUsageHistoryQuery.cs
@@ -1,6 +1,6 @@
using Grand.Domain;
using Grand.Domain.Discounts;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Catalog;
diff --git a/src/Business/Grand.Business.Core/Queries/Catalog/GetPersonalizedProductsQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetPersonalizedProductsQuery.cs
index 7a1e42927..4d01c5bd6 100644
--- a/src/Business/Grand.Business.Core/Queries/Catalog/GetPersonalizedProductsQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetPersonalizedProductsQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Catalog;
diff --git a/src/Business/Grand.Business.Core/Queries/Catalog/GetPriceByCustomerProductQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetPriceByCustomerProductQuery.cs
index 90c8024bd..e8593047d 100644
--- a/src/Business/Grand.Business.Core/Queries/Catalog/GetPriceByCustomerProductQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetPriceByCustomerProductQuery.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Catalog;
diff --git a/src/Business/Grand.Business.Core/Queries/Catalog/GetProductArchByIdQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetProductArchByIdQuery.cs
index f0f1da189..1daee0782 100644
--- a/src/Business/Grand.Business.Core/Queries/Catalog/GetProductArchByIdQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetProductArchByIdQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Catalog;
diff --git a/src/Business/Grand.Business.Core/Queries/Catalog/GetRecommendedProductsQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetRecommendedProductsQuery.cs
index 45a1b8d4c..3439150c7 100644
--- a/src/Business/Grand.Business.Core/Queries/Catalog/GetRecommendedProductsQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetRecommendedProductsQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Catalog;
diff --git a/src/Business/Grand.Business.Core/Queries/Catalog/GetSearchProductsQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetSearchProductsQuery.cs
index 5c6bd5b27..92df83218 100644
--- a/src/Business/Grand.Business.Core/Queries/Catalog/GetSearchProductsQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetSearchProductsQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Catalog;
diff --git a/src/Business/Grand.Business.Core/Queries/Catalog/GetSuggestedProductsQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetSuggestedProductsQuery.cs
index a3530b390..9cfc0382a 100644
--- a/src/Business/Grand.Business.Core/Queries/Catalog/GetSuggestedProductsQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetSuggestedProductsQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Catalog;
diff --git a/src/Business/Grand.Business.Core/Queries/Catalog/GetVendorByIdQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetVendorByIdQuery.cs
index c30b4cf7f..d3b661c2a 100644
--- a/src/Business/Grand.Business.Core/Queries/Catalog/GetVendorByIdQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetVendorByIdQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Catalog;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCancelOrderQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCancelOrderQuery.cs
index 12fbc5a5e..fb5b7afb9 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCancelOrderQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCancelOrderQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCaptureQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCaptureQuery.cs
index 068d9ebb8..8535a10f3 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCaptureQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCaptureQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsAuthorizedQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsAuthorizedQuery.cs
index e53041b1e..fcff7f0de 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsAuthorizedQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsAuthorizedQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsPaidQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsPaidQuery.cs
index 1a781e1a0..3d4f72f4a 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsPaidQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsPaidQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyPaidOfflineQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyPaidOfflineQuery.cs
index 9db49f23b..a57120b80 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyPaidOfflineQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyPaidOfflineQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundOfflineQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundOfflineQuery.cs
index 4afbdb0cd..3da0cbee0 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundOfflineQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundOfflineQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundQuery.cs
index e530cb57d..d3cec90db 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundOfflineQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundOfflineQuery.cs
index 294f3769a..2bfc40d19 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundOfflineQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundOfflineQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundQuery.cs
index ee5ef8fe3..deafc6e8b 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidOfflineQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidOfflineQuery.cs
index 4cfcc730c..fd6ad884d 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidOfflineQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidOfflineQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidQuery.cs
index e09ba31da..e60b82288 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetGiftVoucherQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetGiftVoucherQuery.cs
index e4e71a5fe..2ae6adf70 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetGiftVoucherQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetGiftVoucherQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnCountQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnCountQuery.cs
index 5472ebf6d..7712bca65 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnCountQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnCountQuery.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnQuery.cs
index c11355194..5f884987c 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetOrderQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetOrderQuery.cs
index bcf9bb879..71d2fd780 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetOrderQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetOrderQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPaymentTransactionQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPaymentTransactionQuery.cs
index a5a17639a..206e3d3db 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPaymentTransactionQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPaymentTransactionQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPickupPointById.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPickupPointById.cs
index 66c9271db..64a8a1092 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPickupPointById.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPickupPointById.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetVendorsInOrderQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetVendorsInOrderQuery.cs
index d9720f33e..114e539a0 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetVendorsInOrderQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetVendorsInOrderQuery.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Orders;
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/IsMerchandiseReturnAllowedQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/IsMerchandiseReturnAllowedQuery.cs
index a01fb661a..338568e53 100644
--- a/src/Business/Grand.Business.Core/Queries/Checkout/Orders/IsMerchandiseReturnAllowedQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/IsMerchandiseReturnAllowedQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Core/Queries/Customers/GetCustomerQuery.cs b/src/Business/Grand.Business.Core/Queries/Customers/GetCustomerQuery.cs
index d5db68e8f..fd4d7d4f8 100644
--- a/src/Business/Grand.Business.Core/Queries/Customers/GetCustomerQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Customers/GetCustomerQuery.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
using System.Linq.Expressions;
namespace Grand.Business.Core.Queries.Customers;
diff --git a/src/Business/Grand.Business.Core/Queries/Customers/GetGroupBySystemNameQuery.cs b/src/Business/Grand.Business.Core/Queries/Customers/GetGroupBySystemNameQuery.cs
index 0e3e868d5..077d92ac0 100644
--- a/src/Business/Grand.Business.Core/Queries/Customers/GetGroupBySystemNameQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Customers/GetGroupBySystemNameQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Customers;
diff --git a/src/Business/Grand.Business.Core/Queries/Customers/GetPasswordIsExpiredQuery.cs b/src/Business/Grand.Business.Core/Queries/Customers/GetPasswordIsExpiredQuery.cs
index 2ca4e80ce..a848bb4d9 100644
--- a/src/Business/Grand.Business.Core/Queries/Customers/GetPasswordIsExpiredQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Customers/GetPasswordIsExpiredQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Customers;
diff --git a/src/Business/Grand.Business.Core/Queries/Messages/GetBidsByProductIdQuery.cs b/src/Business/Grand.Business.Core/Queries/Messages/GetBidsByProductIdQuery.cs
index 6dd93c09f..8a14a5eb7 100644
--- a/src/Business/Grand.Business.Core/Queries/Messages/GetBidsByProductIdQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Messages/GetBidsByProductIdQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Messages;
diff --git a/src/Business/Grand.Business.Core/Queries/Messages/GetCustomerByIdQuery.cs b/src/Business/Grand.Business.Core/Queries/Messages/GetCustomerByIdQuery.cs
index 03ca4c73a..451f174d2 100644
--- a/src/Business/Grand.Business.Core/Queries/Messages/GetCustomerByIdQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Messages/GetCustomerByIdQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Messages;
diff --git a/src/Business/Grand.Business.Core/Queries/Messages/GetProductByIdQuery.cs b/src/Business/Grand.Business.Core/Queries/Messages/GetProductByIdQuery.cs
index eb68f8435..ea406bc15 100644
--- a/src/Business/Grand.Business.Core/Queries/Messages/GetProductByIdQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Messages/GetProductByIdQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Messages;
diff --git a/src/Business/Grand.Business.Core/Queries/Messages/GetVendorByIdQuery.cs b/src/Business/Grand.Business.Core/Queries/Messages/GetVendorByIdQuery.cs
index 38b7be19f..af75f1082 100644
--- a/src/Business/Grand.Business.Core/Queries/Messages/GetVendorByIdQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Messages/GetVendorByIdQuery.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Queries.Messages;
diff --git a/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidObjectBuilder.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidObjectBuilder.cs
index 3c4b3ac2a..86bd80f41 100644
--- a/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidObjectBuilder.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidObjectBuilder.cs
@@ -11,7 +11,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
diff --git a/src/Business/Grand.Business.Customers/Commands/Handlers/ActiveVendorCommandHandler.cs b/src/Business/Grand.Business.Customers/Commands/Handlers/ActiveVendorCommandHandler.cs
index 734beabf5..65ca6515a 100644
--- a/src/Business/Grand.Business.Customers/Commands/Handlers/ActiveVendorCommandHandler.cs
+++ b/src/Business/Grand.Business.Customers/Commands/Handlers/ActiveVendorCommandHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Events.Customers;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Customers.Commands.Handlers;
diff --git a/src/Business/Grand.Business.Customers/Events/Handlers/CustomerLoggedInEventHandler.cs b/src/Business/Grand.Business.Customers/Events/Handlers/CustomerLoggedInEventHandler.cs
index 821c32cc6..06aac3d5d 100644
--- a/src/Business/Grand.Business.Customers/Events/Handlers/CustomerLoggedInEventHandler.cs
+++ b/src/Business/Grand.Business.Customers/Events/Handlers/CustomerLoggedInEventHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Events.Customers;
using Grand.Business.Core.Interfaces.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Customers.Events.Handlers;
diff --git a/src/Business/Grand.Business.Customers/Events/Handlers/CustomerLoginFailedEventHandler.cs b/src/Business/Grand.Business.Customers/Events/Handlers/CustomerLoginFailedEventHandler.cs
index eedfe3949..bd35af01d 100644
--- a/src/Business/Grand.Business.Customers/Events/Handlers/CustomerLoginFailedEventHandler.cs
+++ b/src/Business/Grand.Business.Customers/Events/Handlers/CustomerLoginFailedEventHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Events.Customers;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Customers.Events.Handlers;
diff --git a/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs b/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs
index 6b00a282b..659171758 100644
--- a/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs
+++ b/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Queries.Customers;
using Grand.Data;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
using System.Linq.Expressions;
namespace Grand.Business.Customers.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Customers/Queries/Handlers/GetGroupBySystemNameQueryHandler.cs b/src/Business/Grand.Business.Customers/Queries/Handlers/GetGroupBySystemNameQueryHandler.cs
index dba7b7f94..e370eaa87 100644
--- a/src/Business/Grand.Business.Customers/Queries/Handlers/GetGroupBySystemNameQueryHandler.cs
+++ b/src/Business/Grand.Business.Customers/Queries/Handlers/GetGroupBySystemNameQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Queries.Customers;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Customers.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Customers/Queries/Handlers/GetPasswordIsExpiredQueryHandler.cs b/src/Business/Grand.Business.Customers/Queries/Handlers/GetPasswordIsExpiredQueryHandler.cs
index 444f5083a..723de0e2c 100644
--- a/src/Business/Grand.Business.Customers/Queries/Handlers/GetPasswordIsExpiredQueryHandler.cs
+++ b/src/Business/Grand.Business.Customers/Queries/Handlers/GetPasswordIsExpiredQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Queries.Customers;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Customers.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Customers/Services/AffiliateService.cs b/src/Business/Grand.Business.Customers/Services/AffiliateService.cs
index c759339a0..326b778b4 100644
--- a/src/Business/Grand.Business.Customers/Services/AffiliateService.cs
+++ b/src/Business/Grand.Business.Customers/Services/AffiliateService.cs
@@ -4,7 +4,7 @@ using Grand.Domain;
using Grand.Domain.Affiliates;
using Grand.Domain.Orders;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Customers.Services;
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs b/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs
index 3cf66a89b..e51e83740 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs
@@ -5,7 +5,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Customers.Services;
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs b/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs
index eb0421a99..61f7cebd7 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Customers;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Customers.Services;
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs b/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs
index 20d39143f..7768df188 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.SharedKernel;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Customers.Services;
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs b/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs
index 318020435..f3d4edf75 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Customers;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Customers.Services;
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerService.cs b/src/Business/Grand.Business.Customers/Services/CustomerService.cs
index a4d47570a..b1a7ea782 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerService.cs
@@ -12,7 +12,7 @@ using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using System.Linq.Expressions;
namespace Grand.Business.Customers.Services;
diff --git a/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs b/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs
index 27ea5c60f..5acf1e824 100644
--- a/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs
+++ b/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Customers.Services;
diff --git a/src/Business/Grand.Business.Customers/Services/UserApiService.cs b/src/Business/Grand.Business.Customers/Services/UserApiService.cs
index 40535f587..73678e965 100644
--- a/src/Business/Grand.Business.Customers/Services/UserApiService.cs
+++ b/src/Business/Grand.Business.Customers/Services/UserApiService.cs
@@ -3,7 +3,7 @@ using Grand.Data;
using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Customers.Services;
diff --git a/src/Business/Grand.Business.Customers/Services/VendorService.cs b/src/Business/Grand.Business.Customers/Services/VendorService.cs
index 611e82775..616cceb60 100644
--- a/src/Business/Grand.Business.Customers/Services/VendorService.cs
+++ b/src/Business/Grand.Business.Customers/Services/VendorService.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Vendors;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Customers.Services;
diff --git a/src/Business/Grand.Business.Marketing/Extensions/NewsletterPublisherExtensions.cs b/src/Business/Grand.Business.Marketing/Extensions/NewsletterPublisherExtensions.cs
index c2f3fb7d7..9e891640a 100644
--- a/src/Business/Grand.Business.Marketing/Extensions/NewsletterPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Marketing/Extensions/NewsletterPublisherExtensions.cs
@@ -1,5 +1,5 @@
using Grand.Business.Core.Events.Marketing;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Extensions;
diff --git a/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs b/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs
index df835ea0c..e8eeb4ed8 100644
--- a/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs
@@ -10,7 +10,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Messages;
using Grand.Infrastructure;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Campaigns;
diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs
index 12f984d9f..390ea74f1 100644
--- a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Contacts;
diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs
index f9bdad1b0..301b00e48 100644
--- a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs
@@ -3,7 +3,7 @@ using Grand.Data;
using Grand.Domain;
using Grand.Domain.Messages;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Contacts;
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs
index 2ca1a416b..93799967c 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Courses;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Courses;
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs
index 62ebfff3b..650d6dc85 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Courses;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Courses;
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs
index 771eae14d..80416fa54 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Courses;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Courses;
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs
index ad0f16cf6..bc2c6db22 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Courses;
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs
index 8818453db..e23238f35 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Courses;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Courses;
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs
index 15f549276..b4e4bd615 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs
@@ -4,7 +4,7 @@ using Grand.Data;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Infrastructure;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Customers;
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs
index d719be646..a61e431d9 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Customers;
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs
index 91694f454..52be576d2 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Customers;
diff --git a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs
index 4584ff9a4..2bfae3c4d 100644
--- a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs
@@ -4,7 +4,7 @@ using Grand.Domain;
using Grand.Domain.Common;
using Grand.Domain.Documents;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Documents;
diff --git a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs
index 976a98c2c..e21244cb6 100644
--- a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Documents;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Documents;
diff --git a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs
index 8430a85c2..1b2dc9704 100644
--- a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Messages;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using System.IO;
namespace Grand.Business.Marketing.Services.Newsletters;
diff --git a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs
index a6d24002b..f104217cd 100644
--- a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Messages;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Marketing.Services.Newsletters;
diff --git a/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs b/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs
index 6f3ce00fc..9821c1f57 100644
--- a/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs
@@ -4,7 +4,7 @@ using Grand.Data;
using Grand.Domain;
using Grand.Domain.PushNotifications;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
using System.Text.Json;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
index bed805612..7babf6826 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.ScheduledTasks.Commands.Handlers.Catalog;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
index 7b698bb66..599567da1 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Commands.Catalog;
using Grand.Business.Core.Interfaces.Messages;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.ScheduledTasks.Commands.Handlers.Catalog;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
index aadec6fe5..4dc66b0af 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Commands.Catalog;
using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Localization;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.ScheduledTasks.Commands.Handlers.Catalog;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs
index f713ad6b4..2af32de71 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Commands.System.Common;
using Grand.Data;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Commands.Handlers.Common;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs
index f6730cd41..4b89039f8 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs
@@ -13,7 +13,7 @@ using Grand.Domain.Localization;
using Grand.Domain.News;
using Grand.Domain.Stores;
using Grand.Infrastructure.Configuration;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using System.Text.RegularExpressions;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs
index b8a992b59..ce4fc9a93 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Commands.Messages.Common;
using Grand.Data;
using Grand.Domain.Messages;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Commands.Handlers.Common;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs
index ed28c8944..edd148815 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Commands.Handlers.Messages;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs
index d227da0db..50b849411 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Catalog.Prices;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
-using MediatR;
+using Grand.Mediator;
using System.Globalization;
namespace Grand.Business.Messages.Commands.Handlers.Messages;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs
index 24532ed65..20020d96a 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Catalog.Prices;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Commands.Handlers.Messages;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
index 03a96fb8d..74bbd7d22 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Commands.Handlers.Messages;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
index 7a9125eda..2642d7bab 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
@@ -12,7 +12,7 @@ using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Grand.Domain.Tax;
-using MediatR;
+using Grand.Mediator;
using System.Globalization;
using System.Net;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
index 6a9ff9433..7a93bffdf 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Commands.Messages.Tokens;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Commands.Handlers.Messages;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
index b8a0b7a0f..0edac22ad 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Storage;
using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Commands.Handlers.Messages;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs
index bf27d7462..81abfca6c 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Commands.Messages.Tokens;
using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using Grand.Domain.Stores;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Commands.Handlers.Messages;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs
index 7a6799f98..1db3411b2 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Extensions;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Commands.Handlers.Messages;
diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs
index 690236b9f..c0388e509 100644
--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Queries.Messages;
using Grand.Data;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs
index 7feece9c6..e8ccda7b4 100644
--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Queries.Messages;
using Grand.Data;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs
index a510c7cff..94aa53bb2 100644
--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Queries.Messages;
using Grand.Data;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs
index 2f4042a53..ba1bf86f8 100644
--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Queries.Messages;
using Grand.Data;
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Queries.Handlers;
diff --git a/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs b/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs
index 5275730b6..6b1a4a575 100644
--- a/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs
+++ b/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Services;
diff --git a/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs b/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
index 21fa6f7de..71f990e6e 100644
--- a/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
+++ b/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
@@ -20,7 +20,7 @@ using Grand.Domain.Stores;
using Grand.Domain.Vendors;
using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using System.Net;
namespace Grand.Business.Messages.Services;
diff --git a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs
index acabdda17..3467c6e51 100644
--- a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs
+++ b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Services;
diff --git a/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs b/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs
index 7770ebafa..a49a003c9 100644
--- a/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs
+++ b/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs
@@ -4,7 +4,7 @@ using Grand.Domain;
using Grand.Domain.Common;
using Grand.Domain.Messages;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Messages.Services;
diff --git a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs
index 7309befe7..eedd296ce 100644
--- a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs
@@ -8,7 +8,7 @@ using Grand.Data;
using Grand.Domain.Media;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
using System.Net;
diff --git a/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs b/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs
index b58e403d7..0caaab2f0 100644
--- a/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs
@@ -6,7 +6,7 @@ using Grand.Data;
using Grand.Domain.Media;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
namespace Grand.Business.Storage.Services;
diff --git a/src/Business/Grand.Business.Storage/Services/DownloadService.cs b/src/Business/Grand.Business.Storage/Services/DownloadService.cs
index 447e28ad1..9cdde9132 100644
--- a/src/Business/Grand.Business.Storage/Services/DownloadService.cs
+++ b/src/Business/Grand.Business.Storage/Services/DownloadService.cs
@@ -2,7 +2,7 @@ using Grand.Business.Core.Interfaces.Storage;
using Grand.Data;
using Grand.Domain.Media;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Business.Storage.Services;
diff --git a/src/Business/Grand.Business.Storage/Services/PictureService.cs b/src/Business/Grand.Business.Storage/Services/PictureService.cs
index e3594919c..2524e0f05 100644
--- a/src/Business/Grand.Business.Storage/Services/PictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/PictureService.cs
@@ -8,7 +8,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
using SkiaSharp;
using System.Linq.Expressions;
diff --git a/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs b/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs
index 9e9779c73..ce61ca8d2 100644
--- a/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs
+++ b/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Primitives;
using System.Collections.Concurrent;
diff --git a/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs b/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs
index 954162361..69db0109e 100644
--- a/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs
+++ b/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure.Caching.Message;
using Grand.Infrastructure.Configuration;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Caching.Memory;
namespace Grand.Infrastructure.Caching.Redis;
diff --git a/src/Core/Grand.Infrastructure/Events/EntityCacheEvent.cs b/src/Core/Grand.Infrastructure/Events/EntityCacheEvent.cs
index 733509289..64e505fa1 100644
--- a/src/Core/Grand.Infrastructure/Events/EntityCacheEvent.cs
+++ b/src/Core/Grand.Infrastructure/Events/EntityCacheEvent.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Infrastructure.Events;
diff --git a/src/Core/Grand.Infrastructure/Events/EntityDeleted.cs b/src/Core/Grand.Infrastructure/Events/EntityDeleted.cs
index ee5dd1ae2..bdcedf351 100644
--- a/src/Core/Grand.Infrastructure/Events/EntityDeleted.cs
+++ b/src/Core/Grand.Infrastructure/Events/EntityDeleted.cs
@@ -1,5 +1,5 @@
using Grand.Domain;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Infrastructure.Events;
diff --git a/src/Core/Grand.Infrastructure/Events/EntityInserted.cs b/src/Core/Grand.Infrastructure/Events/EntityInserted.cs
index b0e946957..5938b1729 100644
--- a/src/Core/Grand.Infrastructure/Events/EntityInserted.cs
+++ b/src/Core/Grand.Infrastructure/Events/EntityInserted.cs
@@ -1,5 +1,5 @@
using Grand.Domain;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Infrastructure.Events;
diff --git a/src/Core/Grand.Infrastructure/Events/EntityUpdated.cs b/src/Core/Grand.Infrastructure/Events/EntityUpdated.cs
index 49a4dc7e9..673b5beaf 100644
--- a/src/Core/Grand.Infrastructure/Events/EntityUpdated.cs
+++ b/src/Core/Grand.Infrastructure/Events/EntityUpdated.cs
@@ -1,5 +1,5 @@
using Grand.Domain;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Infrastructure.Events;
diff --git a/src/Core/Grand.Infrastructure/Extensions/EventPublisherExtensions.cs b/src/Core/Grand.Infrastructure/Extensions/EventPublisherExtensions.cs
index 2d799658d..a9610e42e 100644
--- a/src/Core/Grand.Infrastructure/Extensions/EventPublisherExtensions.cs
+++ b/src/Core/Grand.Infrastructure/Extensions/EventPublisherExtensions.cs
@@ -1,6 +1,6 @@
using Grand.Domain;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Infrastructure.Extensions;
diff --git a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj
index c2d4600b1..6c0003b5e 100644
--- a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj
+++ b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj
@@ -10,7 +10,6 @@
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
- <PackageReference Include="MediatR" />
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" />
<PackageReference Include="Scrutor" />
<PackageReference Include="StackExchange.Redis" />
@@ -20,5 +19,6 @@
<ProjectReference Include="..\Grand.Data\Grand.Data.csproj" />
<ProjectReference Include="..\Grand.Domain\Grand.Domain.csproj" />
<ProjectReference Include="..\Grand.Mapping\Grand.Mapping.csproj" />
+ <ProjectReference Include="..\Grand.Mediator\Grand.Mediator.csproj" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Core/Grand.Infrastructure/StartupBase.cs b/src/Core/Grand.Infrastructure/StartupBase.cs
index 539bfc929..3c279689f 100644
--- a/src/Core/Grand.Infrastructure/StartupBase.cs
+++ b/src/Core/Grand.Infrastructure/StartupBase.cs
@@ -1,5 +1,6 @@
using Grand.Data;
using Grand.Mapping;
+using Grand.Mediator;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
using Grand.Infrastructure.Mapper;
@@ -144,21 +145,13 @@ public static class StartupBase
}
/// <summary>
- /// Adds services for mediatR
+ /// Adds the mediator and every request/notification handler found in the loaded assemblies
/// </summary>
/// <param name="services">Collection of service descriptors</param>
/// <param name="typeSearcher"></param>
private static void AddMediator(this IServiceCollection services, ITypeSearcher typeSearcher)
{
- var assemblies = typeSearcher.GetAssemblies().ToArray();
-
- foreach (var assembly in assemblies)
- {
- services.AddMediatR(options =>
- {
- options.RegisterServicesFromAssembly(assembly);
- });
- }
+ services.AddGrandMediator(typeSearcher.GetAssemblies());
}
/// <summary>
diff --git a/src/Core/Grand.Mediator/Grand.Mediator.csproj b/src/Core/Grand.Mediator/Grand.Mediator.csproj
new file mode 100644
index 000000000..6f9930b85
--- /dev/null
+++ b/src/Core/Grand.Mediator/Grand.Mediator.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <ItemGroup>
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+ </ItemGroup>
+</Project>
diff --git a/src/Core/Grand.Mediator/IBaseRequest.cs b/src/Core/Grand.Mediator/IBaseRequest.cs
new file mode 100644
index 000000000..e728e9afd
--- /dev/null
+++ b/src/Core/Grand.Mediator/IBaseRequest.cs
@@ -0,0 +1,7 @@
+namespace Grand.Mediator;
+
+/// <summary>
+/// Marker shared by every request, regardless of whether it returns a response.
+/// Used to validate the weakly typed <see cref="IMediator.Send(object, CancellationToken)" /> overload.
+/// </summary>
+public interface IBaseRequest;
diff --git a/src/Core/Grand.Mediator/IMediator.cs b/src/Core/Grand.Mediator/IMediator.cs
new file mode 100644
index 000000000..d48c0bbcf
--- /dev/null
+++ b/src/Core/Grand.Mediator/IMediator.cs
@@ -0,0 +1,48 @@
+namespace Grand.Mediator;
+
+/// <summary>
+/// Sends requests to a single handler and publishes notifications to every subscribed handler.
+/// </summary>
+public interface IMediator
+{
+ /// <summary>
+ /// Sends a request to its single handler
+ /// </summary>
+ /// <typeparam name="TResponse">Response type</typeparam>
+ /// <param name="request">Request</param>
+ /// <param name="cancellationToken">Cancellation token</param>
+ /// <returns>Response from the handler</returns>
+ Task<TResponse> Send<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken = default);
+
+ /// <summary>
+ /// Sends a request that returns no response to its single handler
+ /// </summary>
+ /// <typeparam name="TRequest">Request type</typeparam>
+ /// <param name="request">Request</param>
+ /// <param name="cancellationToken">Cancellation token</param>
+ Task Send<TRequest>(TRequest request, CancellationToken cancellationToken = default) where TRequest : IRequest;
+
+ /// <summary>
+ /// Sends a request whose type is only known at runtime
+ /// </summary>
+ /// <param name="request">Request</param>
+ /// <param name="cancellationToken">Cancellation token</param>
+ /// <returns>Response from the handler, or null for a request returning no response</returns>
+ Task<object> Send(object request, CancellationToken cancellationToken = default);
+
+ /// <summary>
+ /// Publishes a notification to all of its handlers, sequentially
+ /// </summary>
+ /// <typeparam name="TNotification">Notification type</typeparam>
+ /// <param name="notification">Notification</param>
+ /// <param name="cancellationToken">Cancellation token</param>
+ Task Publish<TNotification>(TNotification notification, CancellationToken cancellationToken = default)
+ where TNotification : INotification;
+
+ /// <summary>
+ /// Publishes a notification whose type is only known at runtime
+ /// </summary>
+ /// <param name="notification">Notification</param>
+ /// <param name="cancellationToken">Cancellation token</param>
+ Task Publish(object notification, CancellationToken cancellationToken = default);
+}
diff --git a/src/Core/Grand.Mediator/INotification.cs b/src/Core/Grand.Mediator/INotification.cs
new file mode 100644
index 000000000..6a11e1872
--- /dev/null
+++ b/src/Core/Grand.Mediator/INotification.cs
@@ -0,0 +1,6 @@
+namespace Grand.Mediator;
+
+/// <summary>
+/// An event published to zero or more handlers.
+/// </summary>
+public interface INotification;
diff --git a/src/Core/Grand.Mediator/INotificationHandler.cs b/src/Core/Grand.Mediator/INotificationHandler.cs
new file mode 100644
index 000000000..746921d39
--- /dev/null
+++ b/src/Core/Grand.Mediator/INotificationHandler.cs
@@ -0,0 +1,14 @@
+namespace Grand.Mediator;
+
+/// <summary>
+/// Handles a published notification. Any number of handlers may subscribe to the same notification.
+/// </summary>
+public interface INotificationHandler<in TNotification> where TNotification : INotification
+{
+ /// <summary>
+ /// Handles the notification
+ /// </summary>
+ /// <param name="notification">Notification</param>
+ /// <param name="cancellationToken">Cancellation token</param>
+ Task Handle(TNotification notification, CancellationToken cancellationToken);
+}
diff --git a/src/Core/Grand.Mediator/IRequest.cs b/src/Core/Grand.Mediator/IRequest.cs
new file mode 100644
index 000000000..091f801d9
--- /dev/null
+++ b/src/Core/Grand.Mediator/IRequest.cs
@@ -0,0 +1,16 @@
+namespace Grand.Mediator;
+
+/// <summary>
+/// A request handled by exactly one handler and returning no response.
+/// </summary>
+public interface IRequest : IBaseRequest;
+
+/// <summary>
+/// A request handled by exactly one handler and returning <typeparamref name="TResponse" />.
+/// </summary>
+/// <typeparam name="TResponse">Response type</typeparam>
+/// <remarks>
+/// Deliberately not derived from <see cref="IRequest" /> - the two are disjoint so that the
+/// Send overloads resolve unambiguously.
+/// </remarks>
+public interface IRequest<out TResponse> : IBaseRequest;
diff --git a/src/Core/Grand.Mediator/IRequestHandler.cs b/src/Core/Grand.Mediator/IRequestHandler.cs
new file mode 100644
index 000000000..e3f5933d1
--- /dev/null
+++ b/src/Core/Grand.Mediator/IRequestHandler.cs
@@ -0,0 +1,28 @@
+namespace Grand.Mediator;
+
+/// <summary>
+/// Handles a request returning <typeparamref name="TResponse" />.
+/// </summary>
+public interface IRequestHandler<in TRequest, TResponse> where TRequest : IRequest<TResponse>
+{
+ /// <summary>
+ /// Handles the request
+ /// </summary>
+ /// <param name="request">Request</param>
+ /// <param name="cancellationToken">Cancellation token</param>
+ /// <returns>Response</returns>
+ Task<TResponse> Handle(TRequest request, CancellationToken cancellationToken);
+}
+
+/// <summary>
+/// Handles a request returning no response.
+/// </summary>
+public interface IRequestHandler<in TRequest> where TRequest : IRequest
+{
+ /// <summary>
+ /// Handles the request
+ /// </summary>
+ /// <param name="request">Request</param>
+ /// <param name="cancellationToken">Cancellation token</param>
+ Task Handle(TRequest request, CancellationToken cancellationToken);
+}
diff --git a/src/Core/Grand.Mediator/Internal/HandlerNotFoundException.cs b/src/Core/Grand.Mediator/Internal/HandlerNotFoundException.cs
new file mode 100644
index 000000000..8fe8f4af3
--- /dev/null
+++ b/src/Core/Grand.Mediator/Internal/HandlerNotFoundException.cs
@@ -0,0 +1,14 @@
+namespace Grand.Mediator.Internal;
+
+/// <summary>
+/// Thrown when a request reaches the mediator with no handler registered for it.
+/// </summary>
+internal static class HandlerNotFoundException
+{
+ public static InvalidOperationException For(Type requestType)
+ {
+ return new InvalidOperationException(
+ $"Handler was not found for request of type {requestType}. Register your handlers with the container. " +
+ "See the samples in Grand.Infrastructure.StartupBase.");
+ }
+}
diff --git a/src/Core/Grand.Mediator/Internal/NotificationHandlerWrapper.cs b/src/Core/Grand.Mediator/Internal/NotificationHandlerWrapper.cs
new file mode 100644
index 000000000..23af38fd5
--- /dev/null
+++ b/src/Core/Grand.Mediator/Internal/NotificationHandlerWrapper.cs
@@ -0,0 +1,20 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Grand.Mediator.Internal;
+
+internal abstract class NotificationHandlerWrapper
+{
+ public abstract Task Handle(object notification, IServiceProvider provider, CancellationToken cancellationToken);
+}
+
+internal sealed class NotificationHandlerWrapperImpl<TNotification> : NotificationHandlerWrapper
+ where TNotification : INotification
+{
+ public override async Task Handle(object notification, IServiceProvider provider,
+ CancellationToken cancellationToken)
+ {
+ //sequential, fail fast - a throwing handler aborts the remaining ones and surfaces in the caller
+ foreach (var handler in provider.GetServices<INotificationHandler<TNotification>>())
+ await handler.Handle((TNotification)notification, cancellationToken);
+ }
+}
diff --git a/src/Core/Grand.Mediator/Internal/RequestHandlerWrapper.cs b/src/Core/Grand.Mediator/Internal/RequestHandlerWrapper.cs
new file mode 100644
index 000000000..9f68eea51
--- /dev/null
+++ b/src/Core/Grand.Mediator/Internal/RequestHandlerWrapper.cs
@@ -0,0 +1,73 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Grand.Mediator.Internal;
+
+/// <summary>
+/// Non-generic entry point used by the weakly typed Send overload.
+/// </summary>
+internal abstract class RequestHandlerBase
+{
+ public abstract Task<object> Handle(object request, IServiceProvider provider,
+ CancellationToken cancellationToken);
+}
+
+/// <summary>
+/// Bridges the statically known response type to a handler resolved at runtime.
+/// </summary>
+internal abstract class RequestHandlerWrapper<TResponse> : RequestHandlerBase
+{
+ public abstract Task<TResponse> HandleTyped(object request, IServiceProvider provider,
+ CancellationToken cancellationToken);
+}
+
+internal sealed class RequestHandlerWrapperImpl<TRequest, TResponse> : RequestHandlerWrapper<TResponse>
+ where TRequest : IRequest<TResponse>
+{
+ public override Task<TResponse> HandleTyped(object request, IServiceProvider provider,
+ CancellationToken cancellationToken)
+ {
+ return Resolve(provider).Handle((TRequest)request, cancellationToken);
+ }
+
+ public override async Task<object> Handle(object request, IServiceProvider provider,
+ CancellationToken cancellationToken)
+ {
+ return await Resolve(provider).Handle((TRequest)request, cancellationToken);
+ }
+
+ private static IRequestHandler<TRequest, TResponse> Resolve(IServiceProvider provider)
+ {
+ return provider.GetService<IRequestHandler<TRequest, TResponse>>() ??
+ throw HandlerNotFoundException.For(typeof(TRequest));
+ }
+}
+
+/// <summary>
+/// Wrapper for requests that return no response.
+/// </summary>
+internal abstract class VoidRequestHandlerWrapper : RequestHandlerBase
+{
+ public abstract Task HandleVoid(object request, IServiceProvider provider, CancellationToken cancellationToken);
+}
+
+internal sealed class VoidRequestHandlerWrapperImpl<TRequest> : VoidRequestHandlerWrapper
+ where TRequest : IRequest
+{
+ public override Task HandleVoid(object request, IServiceProvider provider, CancellationToken cancellationToken)
+ {
+ return Resolve(provider).Handle((TRequest)request, cancellationToken);
+ }
+
+ public override async Task<object> Handle(object request, IServiceProvider provider,
+ CancellationToken cancellationToken)
+ {
+ await Resolve(provider).Handle((TRequest)request, cancellationToken);
+ return null;
+ }
+
+ private static IRequestHandler<TRequest> Resolve(IServiceProvider provider)
+ {
+ return provider.GetService<IRequestHandler<TRequest>>() ??
+ throw HandlerNotFoundException.For(typeof(TRequest));
+ }
+}
diff --git a/src/Core/Grand.Mediator/Mediator.cs b/src/Core/Grand.Mediator/Mediator.cs
new file mode 100644
index 000000000..564a6bcfd
--- /dev/null
+++ b/src/Core/Grand.Mediator/Mediator.cs
@@ -0,0 +1,120 @@
+using System.Collections.Concurrent;
+using Grand.Mediator.Internal;
+
+namespace Grand.Mediator;
+
+/// <summary>
+/// Default <see cref="IMediator" /> implementation.
+/// </summary>
+/// <remarks>
+/// Handlers are always resolved through <see cref="IServiceProvider" /> rather than an internal registry,
+/// so hand-written registrations (see Grand.Module.Api, which registers closed generic handlers as scoped)
+/// are honoured alongside the ones found by assembly scanning.
+/// </remarks>
+public sealed class Mediator : IMediator
+{
+ private static readonly ConcurrentDictionary<(Type RequestType, Type ResponseType), RequestHandlerBase>
+ RequestHandlers = new();
+
+ private static readonly ConcurrentDictionary<Type, RequestHandlerBase> VoidRequestHandlers = new();
+ private static readonly ConcurrentDictionary<Type, NotificationHandlerWrapper> NotificationHandlers = new();
+
+ private readonly IServiceProvider _provider;
+
+ public Mediator(IServiceProvider provider)
+ {
+ ArgumentNullException.ThrowIfNull(provider);
+ _provider = provider;
+ }
+
+ public Task<TResponse> Send<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken = default)
+ {
+ ArgumentNullException.ThrowIfNull(request);
+
+ var wrapper = (RequestHandlerWrapper<TResponse>)RequestHandlers.GetOrAdd(
+ (request.GetType(), typeof(TResponse)),
+ static key => CreateWrapper(typeof(RequestHandlerWrapperImpl<,>), key.RequestType, key.ResponseType));
+
+ return wrapper.HandleTyped(request, _provider, cancellationToken);
+ }
+
+ public Task Send<TRequest>(TRequest request, CancellationToken cancellationToken = default)
+ where TRequest : IRequest
+ {
+ ArgumentNullException.ThrowIfNull(request);
+
+ var wrapper = (VoidRequestHandlerWrapper)VoidRequestHandlers.GetOrAdd(
+ request.GetType(),
+ static requestType => CreateWrapper(typeof(VoidRequestHandlerWrapperImpl<>), requestType));
+
+ return wrapper.HandleVoid(request, _provider, cancellationToken);
+ }
+
+ public Task<object> Send(object request, CancellationToken cancellationToken = default)
+ {
+ ArgumentNullException.ThrowIfNull(request);
+
+ var requestType = request.GetType();
+ if (request is not IBaseRequest)
+ throw new ArgumentException($"{requestType} does not implement {nameof(IRequest)}", nameof(request));
+
+ var responseType = ResponseTypeOf(requestType);
+
+ var wrapper = responseType is null
+ ? VoidRequestHandlers.GetOrAdd(requestType,
+ static type => CreateWrapper(typeof(VoidRequestHandlerWrapperImpl<>), type))
+ : RequestHandlers.GetOrAdd((requestType, responseType),
+ static key => CreateWrapper(typeof(RequestHandlerWrapperImpl<,>), key.RequestType, key.ResponseType));
+
+ return wrapper.Handle(request, _provider, cancellationToken);
+ }
+
+ public Task Publish<TNotification>(TNotification notification, CancellationToken cancellationToken = default)
+ where TNotification : INotification
+ {
+ ArgumentNullException.ThrowIfNull(notification);
+ return PublishNotification(notification, cancellationToken);
+ }
+
+ public Task Publish(object notification, CancellationToken cancellationToken = default)
+ {
+ ArgumentNullException.ThrowIfNull(notification);
+
+ if (notification is not INotification)
+ throw new ArgumentException(
+ $"{notification.GetType()} does not implement {nameof(INotification)}", nameof(notification));
+
+ return PublishNotification(notification, cancellationToken);
+ }
+
+ /// <summary>
+ /// Dispatches on the runtime type of the notification, so generic events such as EntityInserted&lt;Product&gt;
+ /// reach handlers registered for the closed type.
+ /// </summary>
+ private Task PublishNotification(object notification, CancellationToken cancellationToken)
+ {
+ var wrapper = NotificationHandlers.GetOrAdd(
+ notification.GetType(),
+ static notificationType => (NotificationHandlerWrapper)Activator.CreateInstance(
+ typeof(NotificationHandlerWrapperImpl<>).MakeGenericType(notificationType))!);
+
+ return wrapper.Handle(notification, _provider, cancellationToken);
+ }
+
+ /// <summary>
+ /// Returns the response type of a request, or null when the request returns none.
+ /// </summary>
+ private static Type ResponseTypeOf(Type requestType)
+ {
+ foreach (var contract in requestType.GetInterfaces())
+ if (contract.IsGenericType && contract.GetGenericTypeDefinition() == typeof(IRequest<>))
+ return contract.GenericTypeArguments[0];
+
+ return null;
+ }
+
+ private static RequestHandlerBase CreateWrapper(Type openWrapperType, params Type[] typeArguments)
+ {
+ return (RequestHandlerBase)Activator.CreateInstance(openWrapperType.MakeGenericType(typeArguments))!;
+ }
+}
diff --git a/src/Core/Grand.Mediator/MediatorServiceCollectionExtensions.cs b/src/Core/Grand.Mediator/MediatorServiceCollectionExtensions.cs
new file mode 100644
index 000000000..d9936f38b
--- /dev/null
+++ b/src/Core/Grand.Mediator/MediatorServiceCollectionExtensions.cs
@@ -0,0 +1,81 @@
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Grand.Mediator;
+
+public static class MediatorServiceCollectionExtensions
+{
+ private static readonly Type[] RequestHandlerTypes = [typeof(IRequestHandler<,>), typeof(IRequestHandler<>)];
+
+ /// <summary>
+ /// Registers <see cref="IMediator" /> and every request/notification handler found in the assembly.
+ /// </summary>
+ /// <param name="services">Collection of service descriptors</param>
+ /// <param name="assembly">Assembly to scan</param>
+ /// <remarks>
+ /// Safe to call repeatedly, including for the same assembly - every registration goes through TryAdd.
+ /// </remarks>
+ public static IServiceCollection AddGrandMediator(this IServiceCollection services, Assembly assembly)
+ {
+ ArgumentNullException.ThrowIfNull(services);
+ ArgumentNullException.ThrowIfNull(assembly);
+
+ services.TryAddTransient<IMediator, Mediator>();
+
+ foreach (var type in GetTypes(assembly))
+ {
+ if (!type.IsClass || type.IsAbstract) continue;
+
+ //open generic handlers are skipped on purpose - the only one in the solution
+ //(Grand.Module.Api GetGenericQueryHandler<T, C>) is registered by hand, closed over each entity pair
+ if (type.ContainsGenericParameters) continue;
+
+ foreach (var contract in type.GetInterfaces())
+ {
+ if (!contract.IsGenericType) continue;
+
+ var definition = contract.GetGenericTypeDefinition();
+
+ //a request has exactly one handler - the first registration wins
+ if (RequestHandlerTypes.Contains(definition))
+ services.TryAddTransient(contract, type);
+
+ //a notification has any number of handlers - TryAddEnumerable dedupes by (service, implementation)
+ else if (definition == typeof(INotificationHandler<>))
+ services.TryAddEnumerable(ServiceDescriptor.Transient(contract, type));
+ }
+ }
+
+ return services;
+ }
+
+ /// <summary>
+ /// Registers <see cref="IMediator" /> and every handler found in the assemblies.
+ /// </summary>
+ public static IServiceCollection AddGrandMediator(this IServiceCollection services,
+ IEnumerable<Assembly> assemblies)
+ {
+ ArgumentNullException.ThrowIfNull(assemblies);
+
+ foreach (var assembly in assemblies)
+ services.AddGrandMediator(assembly);
+
+ return services;
+ }
+
+ /// <summary>
+ /// A partially loadable assembly still yields the types that did load
+ /// </summary>
+ private static IEnumerable<Type> GetTypes(Assembly assembly)
+ {
+ try
+ {
+ return assembly.GetTypes();
+ }
+ catch (ReflectionTypeLoadException ex)
+ {
+ return ex.Types.Where(type => type != null);
+ }
+ }
+}
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
index b9b342216..d30ce0fda 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
@@ -3,7 +3,7 @@ using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Brands;
using Grand.Business.Core.Interfaces.Common.Seo;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
index c20025971..0d466c635 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
@@ -3,7 +3,7 @@ using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Business.Core.Interfaces.Common.Seo;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
index 565527d57..e4aaf0577 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
@@ -3,7 +3,7 @@ using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Business.Core.Interfaces.Common.Seo;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
index 39ab60b34..8d3760eeb 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
index 8bb9d2024..f33dbe721 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
index e406fb699..a0e011446 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
index 1f7e44d94..d4a345d3d 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
index 074f3fd2e..83a3219fb 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
@@ -3,7 +3,7 @@ using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Seo;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
index 1140e5fe0..e84bf8ab6 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
index 8793f3643..a4cef5854 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
index 43dc331ef..c6218fbcb 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
index 61cfbcfa4..a54b19aae 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
index b417c460f..bdae2dc39 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Catalog.Brands;
using Grand.Module.Api.Commands.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
index bae2bd4c0..7f8276e3c 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Module.Api.Commands.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
index 0412e26f5..c6a70b26d 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Module.Api.Commands.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
index e1ea8ef1b..d5f377e1c 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Module.Api.Commands.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
index 6cec095f1..870aa0505 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
index 33b644709..ec6be2493 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
index 6e6508aad..93ae9d4ee 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
index 29943013f..270726a39 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Module.Api.Commands.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
index 76d5d16cb..9eebb32dd 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
index 31147a698..f84c26598 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
index db0539864..487eaa52f 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
index 4f1f3462e..e4a09a9f1 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Module.Api.Commands.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
index 977a93820..879bc36be 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
@@ -4,7 +4,7 @@ using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Brands;
using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Business.Core.Interfaces.Storage;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
index e146903c9..b558dc776 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
@@ -4,7 +4,7 @@ using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Business.Core.Interfaces.Storage;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
index e4b5cb81b..02d6fac82 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
@@ -4,7 +4,7 @@ using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Business.Core.Interfaces.Storage;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
index 6ad6ffad6..70b9affa1 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
index 5002b92a1..55e96a958 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
index 485d51756..3e9a6de81 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
index 7e7db843e..f2d1a2a10 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
index ee2ea8d66..8c47c7c8b 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Events.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
index e1434f190..b1e73b5d2 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
index 1758f06c5..9a14ecbf4 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
index 27548936d..17e3be19f 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using Grand.Module.Api.Commands.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
index 77cfa2b2c..abaebeea3 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
index 593ac9775..00e57774b 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
index 59e718a80..72f7c1dc8 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.DTOs.Common;
using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Storage;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Common;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
index 980390d46..a46aef8a3 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Module.Api.Commands.Models.Common;
using Grand.Business.Core.Interfaces.Storage;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Common;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs
index 5263d8257..74384a78e 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.Infrastructure.Extensions;
using Grand.Module.Api.Jwt;
using Grand.Infrastructure.Configuration;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Common;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs
index c3591d952..1b4605ccf 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.Infrastructure.Extensions;
using Grand.Module.Api.Jwt;
using Grand.Infrastructure.Configuration;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Common;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
index 348c50249..df702edaa 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Module.Api.Commands.Models.Common;
using Grand.Business.Core.Interfaces.Storage;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Common;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
index d820660bc..e78a015d2 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.DTOs.Customers;
using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
index bbdc2b223..64c0ce88d 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
@@ -4,7 +4,7 @@ using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
index 013bb8b95..4ff1384db 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.Commands.Models.Customers;
using Grand.Module.Api.DTOs.Customers;
using Grand.Module.Api.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
index a82782fe8..98c96cf25 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Module.Api.Commands.Models.Customers;
using Grand.Business.Core.Interfaces.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
index 4e4f2db57..e6faddb1d 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Infrastructure.Configuration;
using Grand.Module.Api.Commands.Models.Customers;
using Grand.SharedKernel;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
index c5f7808de..fc8a9dc47 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Module.Api.Commands.Models.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
index 18b6e9586..86ba2601c 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.DTOs.Customers;
using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
index 52f29dc79..9eca850bc 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
@@ -4,7 +4,7 @@ using Grand.Module.Api.Extensions;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
index 21baf951c..22890709f 100644
--- a/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.Commands.Models.Customers;
using Grand.Module.Api.DTOs.Customers;
using Grand.Module.Api.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Handlers.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddBrandCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddBrandCommand.cs
index 39c0e1bb8..86bbb4855 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddBrandCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddBrandCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCategoryCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCategoryCommand.cs
index 5844c9580..490c7b123 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCategoryCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCategoryCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCollectionCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCollectionCommand.cs
index da40324d6..bd597bf31 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCollectionCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddCollectionCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeCommand.cs
index 4de3ff2a5..4d0dd468d 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeMappingCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeMappingCommand.cs
index 76f4be55e..42bceec1b 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeMappingCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductAttributeMappingCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCategoryCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCategoryCommand.cs
index 7fa1209dc..351b4f72a 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCategoryCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCategoryCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCollectionCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCollectionCommand.cs
index fedccd9fa..534dab475 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCollectionCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCollectionCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCommand.cs
index 54d5612cb..ac5b0057c 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductPictureCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductPictureCommand.cs
index aa179b99e..4d9c7dd18 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductPictureCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductPictureCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductSpecificationCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductSpecificationCommand.cs
index d0f732074..3ac29dbeb 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductSpecificationCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductSpecificationCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductTierPriceCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductTierPriceCommand.cs
index 6012d5d6a..d3a83c7af 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductTierPriceCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddProductTierPriceCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddSpecificationAttributeCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddSpecificationAttributeCommand.cs
index 7c072e405..59bc6e2e0 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddSpecificationAttributeCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/AddSpecificationAttributeCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteBrandCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteBrandCommand.cs
index a591a6f4b..c580781e8 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteBrandCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteBrandCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCategoryCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCategoryCommand.cs
index 999b29f86..3898d5e38 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCategoryCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCategoryCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCollectionCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCollectionCommand.cs
index 051d757ff..e8e1a9592 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCollectionCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteCollectionCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeCommand.cs
index a660ae4eb..767d9354f 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeMappingCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeMappingCommand.cs
index 8cc021537..1b0f3327f 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeMappingCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductAttributeMappingCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCategoryCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCategoryCommand.cs
index 15ac79847..7a68fbc7e 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCategoryCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCategoryCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCollectionCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCollectionCommand.cs
index ad9bc721f..27724a324 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCollectionCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCollectionCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCommand.cs
index 4cbae1e52..d27c8a836 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductPictureCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductPictureCommand.cs
index 36ebd2818..82e51af7d 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductPictureCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductPictureCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductSpecificationCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductSpecificationCommand.cs
index 7c90195ef..827f800b7 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductSpecificationCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductSpecificationCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductTierPriceCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductTierPriceCommand.cs
index 39ce8a6a7..b01d6cca4 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductTierPriceCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteProductTierPriceCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteSpecificationAttributeCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteSpecificationAttributeCommand.cs
index 8c6eb4e90..baad40af1 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteSpecificationAttributeCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/DeleteSpecificationAttributeCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateBrandCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateBrandCommand.cs
index 4cd9eb83e..d493439c0 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateBrandCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateBrandCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCategoryCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCategoryCommand.cs
index 773427830..035283aa7 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCategoryCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCategoryCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCollectionCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCollectionCommand.cs
index 3a4877fe7..ef473c820 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCollectionCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateCollectionCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeCommand.cs
index 6e24dcf5c..acafa6b91 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeMappingCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeMappingCommand.cs
index 23daa7534..3d6a21472 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeMappingCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductAttributeMappingCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCategoryCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCategoryCommand.cs
index 1c3f14d15..e0ce0a125 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCategoryCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCategoryCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCollectionCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCollectionCommand.cs
index 5dcdb5eba..66f2cf92a 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCollectionCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCollectionCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCommand.cs
index 868093ffc..8694b967e 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductPictureCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductPictureCommand.cs
index 2e6da60d8..ba1757c07 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductPictureCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductPictureCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductSpecificationCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductSpecificationCommand.cs
index 99504687e..37d98b16d 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductSpecificationCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductSpecificationCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductStockCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductStockCommand.cs
index 06f6a9c37..4210e30fc 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductStockCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductStockCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductTierPriceCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductTierPriceCommand.cs
index 00d57efb3..0e1a5151c 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductTierPriceCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateProductTierPriceCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateSpecificationAttributeCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateSpecificationAttributeCommand.cs
index f8ffcb97f..d367f6ebe 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateSpecificationAttributeCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Catalog/UpdateSpecificationAttributeCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Catalog;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Common/AddPictureCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Common/AddPictureCommand.cs
index 984cdd281..c449df96c 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Common/AddPictureCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Common/AddPictureCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Common;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Common/DeletePictureCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Common/DeletePictureCommand.cs
index 7c25bc991..1a09d8b53 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Common/DeletePictureCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Common/DeletePictureCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Common;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenCommand.cs
index 831941b78..f57a9164c 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenCommand.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Common;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenWebCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenWebCommand.cs
index 7c4242788..fb95cc704 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenWebCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Common/GenerateTokenWebCommand.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Common;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Common/UpdatePictureCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Common/UpdatePictureCommand.cs
index 7ff8eea65..2ae3626cb 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Common/UpdatePictureCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Common/UpdatePictureCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Common;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerAddressCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerAddressCommand.cs
index 5d352bd7d..69618d651 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerAddressCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerAddressCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerCommand.cs
index 3283703c4..db532a54a 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerGroupCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerGroupCommand.cs
index 9a799c135..0f6ca9174 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerGroupCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/AddCustomerGroupCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerAddressCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerAddressCommand.cs
index f48893cbb..f39dadb84 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerAddressCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerAddressCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerCommand.cs
index c3ed2c5e7..36acf3293 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerCommand.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerGroupCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerGroupCommand.cs
index 9062a46bd..ffe0c2862 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerGroupCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/DeleteCustomerGroupCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerAddressCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerAddressCommand.cs
index 6003f9223..9f571389c 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerAddressCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerAddressCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerCommand.cs
index 138d01c63..e5004cff9 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Customers;
diff --git a/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerGroupCommand.cs b/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerGroupCommand.cs
index 90ea94349..1ece7616f 100644
--- a/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerGroupCommand.cs
+++ b/src/Modules/Grand.Module.Api/Commands/Models/Customers/UpdateCustomerGroupCommand.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Commands.Models.Customers;
diff --git a/src/Modules/Grand.Module.Api/Controllers/BrandController.cs b/src/Modules/Grand.Module.Api/Controllers/BrandController.cs
index 2bfc81ef2..c7798196d 100644
--- a/src/Modules/Grand.Module.Api/Controllers/BrandController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/BrandController.cs
@@ -4,7 +4,7 @@ using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.JsonPatch.SystemTextJson;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Http;
diff --git a/src/Modules/Grand.Module.Api/Controllers/BrandLayoutController.cs b/src/Modules/Grand.Module.Api/Controllers/BrandLayoutController.cs
index caf1e5e57..65227d353 100644
--- a/src/Modules/Grand.Module.Api/Controllers/BrandLayoutController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/BrandLayoutController.cs
@@ -3,7 +3,7 @@ using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Grand.Module.Api.Attributes;
using Microsoft.AspNetCore.Http;
diff --git a/src/Modules/Grand.Module.Api/Controllers/CategoryController.cs b/src/Modules/Grand.Module.Api/Controllers/CategoryController.cs
index c41b54cd3..34a4f3226 100644
--- a/src/Modules/Grand.Module.Api/Controllers/CategoryController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/CategoryController.cs
@@ -4,7 +4,7 @@ using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.JsonPatch.SystemTextJson;
using Microsoft.AspNetCore.Mvc;
using Grand.Module.Api.Attributes;
diff --git a/src/Modules/Grand.Module.Api/Controllers/CategoryLayoutController.cs b/src/Modules/Grand.Module.Api/Controllers/CategoryLayoutController.cs
index ab2ea31a0..fd993e5fb 100644
--- a/src/Modules/Grand.Module.Api/Controllers/CategoryLayoutController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/CategoryLayoutController.cs
@@ -3,7 +3,7 @@ using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Grand.Module.Api.Attributes;
using Microsoft.AspNetCore.Http;
diff --git a/src/Modules/Grand.Module.Api/Controllers/CollectionController.cs b/src/Modules/Grand.Module.Api/Controllers/CollectionController.cs
index e396d3cbf..69b71d0d3 100644
--- a/src/Modules/Grand.Module.Api/Controllers/CollectionController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/CollectionController.cs
@@ -5,7 +5,7 @@ using Grand.Module.Api.Attributes;
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.JsonPatch.SystemTextJson;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Modules/Grand.Module.Api/Controllers/CollectionLayoutController.cs b/src/Modules/Grand.Module.Api/Controllers/CollectionLayoutController.cs
index 7ccbed467..55805b07b 100644
--- a/src/Modules/Grand.Module.Api/Controllers/CollectionLayoutController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/CollectionLayoutController.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Permissions;
using Grand.Module.Api.Attributes;
using Grand.Module.Api.DTOs.Common;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Modules/Grand.Module.Api/Controllers/CountryController.cs b/src/Modules/Grand.Module.Api/Controllers/CountryController.cs
index 52f1961bb..c61208493 100644
--- a/src/Modules/Grand.Module.Api/Controllers/CountryController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/CountryController.cs
@@ -3,7 +3,7 @@ using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Directory;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Grand.Module.Api.Attributes;
using Microsoft.AspNetCore.Http;
diff --git a/src/Modules/Grand.Module.Api/Controllers/CurrencyController.cs b/src/Modules/Grand.Module.Api/Controllers/CurrencyController.cs
index d89df9483..6dcfd0db3 100644
--- a/src/Modules/Grand.Module.Api/Controllers/CurrencyController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/CurrencyController.cs
@@ -3,7 +3,7 @@ using Grand.Module.Api.Queries.Models.Common;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Permissions;
using Grand.Domain.Directory;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Grand.Module.Api.Attributes;
using Microsoft.AspNetCore.Http;
diff --git a/src/Modules/Grand.Module.Api/Controllers/CustomerController.cs b/src/Modules/Grand.Module.Api/Controllers/CustomerController.cs
index 08b368bda..0ed7c0b4c 100644
--- a/src/Modules/Grand.Module.Api/Controllers/CustomerController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/CustomerController.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Permissions;
using Grand.Module.Api.Commands.Models.Customers;
using Grand.Module.Api.DTOs.Customers;
using Grand.Module.Api.Queries.Models.Customers;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Modules/Grand.Module.Api/Controllers/CustomerGroupController.cs b/src/Modules/Grand.Module.Api/Controllers/CustomerGroupController.cs
index 286b754b6..cecbae825 100644
--- a/src/Modules/Grand.Module.Api/Controllers/CustomerGroupController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/CustomerGroupController.cs
@@ -5,7 +5,7 @@ using Grand.Module.Api.Attributes;
using Grand.Module.Api.Commands.Models.Customers;
using Grand.Module.Api.DTOs.Customers;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.JsonPatch.SystemTextJson;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Modules/Grand.Module.Api/Controllers/DeliveryDateController.cs b/src/Modules/Grand.Module.Api/Controllers/DeliveryDateController.cs
index 789406a0c..b586f8129 100644
--- a/src/Modules/Grand.Module.Api/Controllers/DeliveryDateController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/DeliveryDateController.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Shipping;
using Grand.Module.Api.Attributes;
using Grand.Module.Api.DTOs.Shipping;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Modules/Grand.Module.Api/Controllers/LanguageController.cs b/src/Modules/Grand.Module.Api/Controllers/LanguageController.cs
index 60968e7c0..b5a1ed847 100644
--- a/src/Modules/Grand.Module.Api/Controllers/LanguageController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/LanguageController.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Permissions;
using Grand.Module.Api.Attributes;
using Grand.Module.Api.DTOs.Common;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Modules/Grand.Module.Api/Controllers/PickupPointController.cs b/src/Modules/Grand.Module.Api/Controllers/PickupPointController.cs
index 2d8bfdccb..e5d0837a0 100644
--- a/src/Modules/Grand.Module.Api/Controllers/PickupPointController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/PickupPointController.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Shipping;
using Grand.Module.Api.Attributes;
using Grand.Module.Api.DTOs.Shipping;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Modules/Grand.Module.Api/Controllers/PictureController.cs b/src/Modules/Grand.Module.Api/Controllers/PictureController.cs
index b00d63fc2..fba3f7328 100644
--- a/src/Modules/Grand.Module.Api/Controllers/PictureController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/PictureController.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Permissions;
using Grand.Module.Api.Commands.Models.Common;
using Grand.Module.Api.DTOs.Common;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Modules/Grand.Module.Api/Controllers/ProductAttributeController.cs b/src/Modules/Grand.Module.Api/Controllers/ProductAttributeController.cs
index 1122c1ceb..ddebfc964 100644
--- a/src/Modules/Grand.Module.Api/Controllers/ProductAttributeController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/ProductAttributeController.cs
@@ -5,7 +5,7 @@ using Grand.Module.Api.Attributes;
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.JsonPatch.SystemTextJson;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Modules/Grand.Module.Api/Controllers/ProductController.cs b/src/Modules/Grand.Module.Api/Controllers/ProductController.cs
index 9ec2af815..5358e0e63 100644
--- a/src/Modules/Grand.Module.Api/Controllers/ProductController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/ProductController.cs
@@ -5,7 +5,7 @@ using Grand.Module.Api.Attributes;
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.JsonPatch.SystemTextJson;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Modules/Grand.Module.Api/Controllers/ProductLayoutController.cs b/src/Modules/Grand.Module.Api/Controllers/ProductLayoutController.cs
index 8a859ef6d..cac55c151 100644
--- a/src/Modules/Grand.Module.Api/Controllers/ProductLayoutController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/ProductLayoutController.cs
@@ -5,7 +5,7 @@ using Grand.Module.Api.Attributes;
using Grand.Module.Api.Constants;
using Grand.Module.Api.DTOs.Common;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Modules/Grand.Module.Api/Controllers/ShippingMethodController.cs b/src/Modules/Grand.Module.Api/Controllers/ShippingMethodController.cs
index 59dae844a..4163a9f9d 100644
--- a/src/Modules/Grand.Module.Api/Controllers/ShippingMethodController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/ShippingMethodController.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Shipping;
using Grand.Module.Api.Attributes;
using Grand.Module.Api.DTOs.Shipping;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Modules/Grand.Module.Api/Controllers/SpecificationAttributeController.cs b/src/Modules/Grand.Module.Api/Controllers/SpecificationAttributeController.cs
index 4c7dca241..5f7f4caf4 100644
--- a/src/Modules/Grand.Module.Api/Controllers/SpecificationAttributeController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/SpecificationAttributeController.cs
@@ -5,7 +5,7 @@ using Grand.Module.Api.Attributes;
using Grand.Module.Api.Commands.Models.Catalog;
using Grand.Module.Api.DTOs.Catalog;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.JsonPatch.SystemTextJson;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Modules/Grand.Module.Api/Controllers/StoreController.cs b/src/Modules/Grand.Module.Api/Controllers/StoreController.cs
index d250b98ba..919c621bb 100644
--- a/src/Modules/Grand.Module.Api/Controllers/StoreController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/StoreController.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Stores;
using Grand.Module.Api.Attributes;
using Grand.Module.Api.DTOs.Common;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Modules/Grand.Module.Api/Controllers/TokenController.cs b/src/Modules/Grand.Module.Api/Controllers/TokenController.cs
index 095fb9ef9..36ee6c2b9 100644
--- a/src/Modules/Grand.Module.Api/Controllers/TokenController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/TokenController.cs
@@ -1,7 +1,7 @@
using Grand.Module.Api.Commands.Models.Common;
using Grand.Module.Api.Models.Common;
using Grand.Business.Core.Interfaces.Customers;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Modules/Grand.Module.Api/Controllers/TokenWebController.cs b/src/Modules/Grand.Module.Api/Controllers/TokenWebController.cs
index fc560f3fe..5f03284bd 100644
--- a/src/Modules/Grand.Module.Api/Controllers/TokenWebController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/TokenWebController.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using Grand.Infrastructure.Configuration;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Antiforgery;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Modules/Grand.Module.Api/Controllers/VendorController.cs b/src/Modules/Grand.Module.Api/Controllers/VendorController.cs
index f442a6990..57a36c49d 100644
--- a/src/Modules/Grand.Module.Api/Controllers/VendorController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/VendorController.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Vendors;
using Grand.Module.Api.Attributes;
using Grand.Module.Api.DTOs.Customers;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Modules/Grand.Module.Api/Controllers/WarehouseController.cs b/src/Modules/Grand.Module.Api/Controllers/WarehouseController.cs
index 8031215a5..44ebe3597 100644
--- a/src/Modules/Grand.Module.Api/Controllers/WarehouseController.cs
+++ b/src/Modules/Grand.Module.Api/Controllers/WarehouseController.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Shipping;
using Grand.Module.Api.Attributes;
using Grand.Module.Api.DTOs.Shipping;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Modules/Grand.Module.Api/Extensions/ServiceCollectionExtensions.cs b/src/Modules/Grand.Module.Api/Extensions/ServiceCollectionExtensions.cs
index 6afdfbcee..c5f97c374 100644
--- a/src/Modules/Grand.Module.Api/Extensions/ServiceCollectionExtensions.cs
+++ b/src/Modules/Grand.Module.Api/Extensions/ServiceCollectionExtensions.cs
@@ -12,7 +12,7 @@ using Grand.Module.Api.DTOs.Customers;
using Grand.Module.Api.DTOs.Shipping;
using Grand.Module.Api.Queries.Handlers.Common;
using Grand.Module.Api.Queries.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.DependencyInjection;
namespace Grand.Module.Api.Infrastructure.Extensions
diff --git a/src/Modules/Grand.Module.Api/Queries/Handlers/Common/GetGenericQueryHandler.cs b/src/Modules/Grand.Module.Api/Queries/Handlers/Common/GetGenericQueryHandler.cs
index befbdebfc..33f12c9c5 100644
--- a/src/Modules/Grand.Module.Api/Queries/Handlers/Common/GetGenericQueryHandler.cs
+++ b/src/Modules/Grand.Module.Api/Queries/Handlers/Common/GetGenericQueryHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.Queries.Models.Common;
using Grand.Data;
using Grand.Domain;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Queries.Handlers.Common;
diff --git a/src/Modules/Grand.Module.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs b/src/Modules/Grand.Module.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
index c906b1101..6e1235e93 100644
--- a/src/Modules/Grand.Module.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
+++ b/src/Modules/Grand.Module.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
@@ -2,7 +2,7 @@
using Grand.Module.Api.Extensions;
using Grand.Module.Api.Queries.Models.Customers;
using Grand.Business.Core.Interfaces.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Queries.Handlers.Customers;
diff --git a/src/Modules/Grand.Module.Api/Queries/Models/Common/GetGenericQuery.cs b/src/Modules/Grand.Module.Api/Queries/Models/Common/GetGenericQuery.cs
index db80d9d4a..94152c599 100644
--- a/src/Modules/Grand.Module.Api/Queries/Models/Common/GetGenericQuery.cs
+++ b/src/Modules/Grand.Module.Api/Queries/Models/Common/GetGenericQuery.cs
@@ -1,6 +1,6 @@
using Grand.Module.Api.Models;
using Grand.Domain;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Queries.Models.Common;
diff --git a/src/Modules/Grand.Module.Api/Queries/Models/Common/GetQuery.cs b/src/Modules/Grand.Module.Api/Queries/Models/Common/GetQuery.cs
index 1cc837f87..4e5ece0ee 100644
--- a/src/Modules/Grand.Module.Api/Queries/Models/Common/GetQuery.cs
+++ b/src/Modules/Grand.Module.Api/Queries/Models/Common/GetQuery.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Queries.Models.Common;
diff --git a/src/Modules/Grand.Module.Api/Queries/Models/Customers/GetCustomerQuery.cs b/src/Modules/Grand.Module.Api/Queries/Models/Customers/GetCustomerQuery.cs
index dbe04f6f7..f586a312c 100644
--- a/src/Modules/Grand.Module.Api/Queries/Models/Customers/GetCustomerQuery.cs
+++ b/src/Modules/Grand.Module.Api/Queries/Models/Customers/GetCustomerQuery.cs
@@ -1,5 +1,5 @@
using Grand.Module.Api.DTOs.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.Api.Queries.Models.Customers;
diff --git a/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/GenerateSitemapXmlTask.cs b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/GenerateSitemapXmlTask.cs
index 2eee3feff..0bffc3c2d 100644
--- a/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/GenerateSitemapXmlTask.cs
+++ b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/GenerateSitemapXmlTask.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Business.Core.Interfaces.Storage;
using Grand.Business.Core.Interfaces.System.ScheduleTasks;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Module.ScheduledTasks.BackgroundServices;
diff --git a/src/Plugins/Authentication.Facebook/Infrastructure/Cache/FacebookAuthenticationEventConsumer.cs b/src/Plugins/Authentication.Facebook/Infrastructure/Cache/FacebookAuthenticationEventConsumer.cs
index 9c6432e3f..3bef435ae 100644
--- a/src/Plugins/Authentication.Facebook/Infrastructure/Cache/FacebookAuthenticationEventConsumer.cs
+++ b/src/Plugins/Authentication.Facebook/Infrastructure/Cache/FacebookAuthenticationEventConsumer.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Customers;
using Grand.Domain.Stores;
using Grand.Infrastructure;
-using MediatR;
+using Grand.Mediator;
using System.Security.Claims;
namespace Authentication.Facebook.Infrastructure.Cache;
diff --git a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationEventConsumer.cs b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationEventConsumer.cs
index 2a8292768..bfb44a73e 100644
--- a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationEventConsumer.cs
+++ b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationEventConsumer.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Customers;
using Grand.Domain.Stores;
using Grand.Infrastructure;
-using MediatR;
+using Grand.Mediator;
using System.Security.Claims;
namespace Authentication.Google.Infrastructure;
diff --git a/src/Plugins/Payments.StripeCheckout/Services/StripeCheckoutService.cs b/src/Plugins/Payments.StripeCheckout/Services/StripeCheckoutService.cs
index f25399af6..0f1b8c1bb 100644
--- a/src/Plugins/Payments.StripeCheckout/Services/StripeCheckoutService.cs
+++ b/src/Plugins/Payments.StripeCheckout/Services/StripeCheckoutService.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Domain.Orders;
using Grand.Infrastructure;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
using Stripe;
using Stripe.Checkout;
diff --git a/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.cs b/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.cs
index c46bec235..44f31f610 100644
--- a/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.cs
+++ b/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Tax.CountryStateZip.Domain;
namespace Tax.CountryStateZip.Infrastructure.Cache;
diff --git a/src/Plugins/Tax.CountryStateZip/Services/TaxRateService.cs b/src/Plugins/Tax.CountryStateZip/Services/TaxRateService.cs
index cb0cd9c3b..b7922872b 100644
--- a/src/Plugins/Tax.CountryStateZip/Services/TaxRateService.cs
+++ b/src/Plugins/Tax.CountryStateZip/Services/TaxRateService.cs
@@ -2,7 +2,7 @@ using Grand.Data;
using Grand.Domain;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
using Tax.CountryStateZip.Domain;
namespace Tax.CountryStateZip.Services;
diff --git a/src/Tests/Grand.Business.Authentication.Tests/Services/ExternalAuthenticationServiceTests.cs b/src/Tests/Grand.Business.Authentication.Tests/Services/ExternalAuthenticationServiceTests.cs
index 9d6ba9974..fa5d1810a 100644
--- a/src/Tests/Grand.Business.Authentication.Tests/Services/ExternalAuthenticationServiceTests.cs
+++ b/src/Tests/Grand.Business.Authentication.Tests/Services/ExternalAuthenticationServiceTests.cs
@@ -8,7 +8,7 @@ using Grand.Data.Tests.MongoDb;
using Grand.Domain.Customers;
using Grand.Domain.Stores;
using Grand.Infrastructure;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CategoryDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CategoryDeletedEventHandlerTests.cs
index 7dfdf5235..c61ee81b5 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CategoryDeletedEventHandlerTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CategoryDeletedEventHandlerTests.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CollectionDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CollectionDeletedEventHandlerTests.cs
index 1f286aff2..3c9d80f23 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CollectionDeletedEventHandlerTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CollectionDeletedEventHandlerTests.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DiscountDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DiscountDeletedEventHandlerTests.cs
index 147bb622b..40c57ecf8 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DiscountDeletedEventHandlerTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DiscountDeletedEventHandlerTests.cs
@@ -8,7 +8,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandLayoutServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandLayoutServiceTests.cs
index 4489846c8..da0b6017d 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandLayoutServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandLayoutServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandServiceTests.cs
index 1f07b7d96..e49faab2e 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandServiceTests.cs
@@ -8,7 +8,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceDbTest.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceDbTest.cs
index 7a9478349..eca77b900 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceDbTest.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceDbTest.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceTest.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceTest.cs
index cfa4309d3..4443810e7 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceTest.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryLayoutServiceTest.cs
@@ -3,7 +3,7 @@ using Grand.Data;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceDbTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceDbTests.cs
index a03f29eba..bf8f0484a 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceDbTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceDbTests.cs
@@ -10,7 +10,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.cs
index e6f7cc705..109237f30 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.cs
@@ -10,7 +10,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/ProductCategoryServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/ProductCategoryServiceTests.cs
index 129bbeb9d..4be5c2083 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/ProductCategoryServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/ProductCategoryServiceTests.cs
@@ -8,7 +8,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionLayoutServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionLayoutServiceTests.cs
index a27535845..99f70dd23 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionLayoutServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionLayoutServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionServiceTests.cs
index f7e2fa6bc..352fc287e 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionServiceTests.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/ProductCollectionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/ProductCollectionServiceTests.cs
index 3cb5bbe6d..0880d3435 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/ProductCollectionServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/ProductCollectionServiceTests.cs
@@ -8,7 +8,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/MeasureServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/MeasureServiceTests.cs
index 8070d763d..f0d68a373 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/MeasureServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/MeasureServiceTests.cs
@@ -3,7 +3,7 @@ using Grand.Data;
using Grand.Domain.Directory;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/SearchTermServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/SearchTermServiceTests.cs
index 06d11fc21..fb4a6b47d 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/SearchTermServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/SearchTermServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Common;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.cs
index 706a96652..4d2c8f33c 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.cs
@@ -15,7 +15,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs
index ce73aed85..90dd49d9b 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs
@@ -20,7 +20,7 @@ using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Mapper;
using Grand.Infrastructure.Tests.Caching;
using Grand.Infrastructure.TypeSearch;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs
index e83a9ac9a..978923252 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs
@@ -21,7 +21,7 @@ using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Mapper;
using Grand.Infrastructure.Tests.Caching;
using Grand.Infrastructure.TypeSearch;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs
index 17c0d396e..48286ab80 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs
@@ -21,7 +21,7 @@ using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Mapper;
using Grand.Infrastructure.Tests.Caching;
using Grand.Infrastructure.TypeSearch;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs
index 98660c4e5..adb1088f0 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs
@@ -31,7 +31,7 @@ using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Mapper;
using Grand.Infrastructure.Tests.Caching;
using Grand.Infrastructure.TypeSearch;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs
index 0d9ccd9af..3e4199f54 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs
@@ -12,7 +12,7 @@ using Grand.Domain.Tax;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using System.Globalization;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs
index 73370e55c..96953aa04 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs
@@ -18,7 +18,7 @@ using Grand.Domain.Stores;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.cs
index 046934c9e..5b3f885f6 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.cs
@@ -9,7 +9,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CustomerGroupProductServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CustomerGroupProductServiceTests.cs
index cf0503e9e..3070b8a24 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CustomerGroupProductServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CustomerGroupProductServiceTests.cs
@@ -3,7 +3,7 @@ using Grand.Data;
using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.cs
index 35a7a2091..9547eee7d 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.cs
@@ -10,7 +10,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.cs
index f23e214a8..c4ae4a77b 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.cs
@@ -4,7 +4,7 @@ using Grand.Data;
using Grand.Data.Tests.MongoDb;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeFormatterTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeFormatterTests.cs
index a281d1e0e..182c42140 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeFormatterTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeFormatterTests.cs
@@ -11,7 +11,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Stores;
using Grand.Infrastructure;
using Grand.Infrastructure.Configuration;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeServiceTests.cs
index ea606f7d3..64b1b8b07 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductLayoutServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductLayoutServiceTests.cs
index 8dd4f78c0..1be813510 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductLayoutServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductLayoutServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReservationServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReservationServiceTests.cs
index eb2542cd4..a1c7d0343 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReservationServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReservationServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Data.Tests.MongoDb;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.cs
index 904995b35..4e2a4a39b 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Data.Tests.MongoDb;
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.cs
index 9305e18cd..c134491da 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.cs
@@ -12,7 +12,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductTagServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductTagServiceTests.cs
index 5dbf11d26..ded3fb879 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductTagServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductTagServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/RecentlyViewedProductsServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/RecentlyViewedProductsServiceTests.cs
index 3403dd54b..89e1febfe 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/RecentlyViewedProductsServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/RecentlyViewedProductsServiceTests.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/SpecificationAttributeServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/SpecificationAttributeServiceTests.cs
index 3b7422f54..7d9ef088f 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/SpecificationAttributeServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/SpecificationAttributeServiceTests.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxCategoryServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxCategoryServiceTests.cs
index 6da3c5893..0145ca177 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxCategoryServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxCategoryServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Tax;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandlerTests.cs
index 055bdb310..d1055d0dc 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandlerTests.cs
@@ -7,7 +7,7 @@ using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CancelOrderCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CancelOrderCommandHandlerTests.cs
index 7adfc0cde..ae5a3738b 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CancelOrderCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CancelOrderCommandHandlerTests.cs
@@ -8,7 +8,7 @@ using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CancelOrderItemCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CancelOrderItemCommandHandlerTests.cs
index 3af844ed9..f1085b7b6 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CancelOrderItemCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CancelOrderItemCommandHandlerTests.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CaptureCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CaptureCommandHandlerTests.cs
index 812d6516e..5383ad0af 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CaptureCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CaptureCommandHandlerTests.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CheckOrderStatusCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CheckOrderStatusCommandHandlerTests.cs
index 4b958ea58..86a4d8096 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CheckOrderStatusCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CheckOrderStatusCommandHandlerTests.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Commands.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderCommandHandlerTests.cs
index af890174c..59883920a 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderCommandHandlerTests.cs
@@ -6,7 +6,7 @@ using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderItemCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderItemCommandHandlerTests.cs
index b5d2ec362..37ff8093b 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderItemCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderItemCommandHandlerTests.cs
@@ -7,7 +7,7 @@ using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/InsertOrderItemCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/InsertOrderItemCommandHandlerTests.cs
index cdbd26666..8b931c2bd 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/InsertOrderItemCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/InsertOrderItemCommandHandlerTests.cs
@@ -6,7 +6,7 @@ using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandlerTests.cs
index f8a71c2d2..125145125 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandlerTests.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsPaidCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsPaidCommandHandlerTests.cs
index f258fde11..7970037b6 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsPaidCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsPaidCommandHandlerTests.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/OrderStatusCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/OrderStatusCommandHandlerTests.cs
index e120951bd..41ad3261c 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/OrderStatusCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/OrderStatusCommandHandlerTests.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Common.Pdf;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandlerTests.cs
index 9e1dad389..d72d79010 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandlerTests.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundCommandHandlerTests.cs
index 86d9b5b27..230fae2a7 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundCommandHandlerTests.cs
@@ -8,7 +8,7 @@ using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandlerTests.cs
index 8405cc64b..85b4b2492 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandlerTests.cs
@@ -7,7 +7,7 @@ using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandlerTests.cs
index c642699f6..ccc1885de 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandlerTests.cs
@@ -7,7 +7,7 @@ using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/RefundCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/RefundCommandHandlerTests.cs
index b18a85f07..e5e8cf9c6 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/RefundCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/RefundCommandHandlerTests.cs
@@ -8,7 +8,7 @@ using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/UpdateOrderItemCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/UpdateOrderItemCommandHandlerTests.cs
index 770a5a5f6..7c450e081 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/UpdateOrderItemCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/UpdateOrderItemCommandHandlerTests.cs
@@ -7,7 +7,7 @@ using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidCommandHandlerTests.cs
index 4fcf142cb..15e6ba97a 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidCommandHandlerTests.cs
@@ -7,7 +7,7 @@ using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidOfflineCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidOfflineCommandHandlerTests.cs
index 12d019fd7..fa74dda5d 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidOfflineCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidOfflineCommandHandlerTests.cs
@@ -6,7 +6,7 @@ using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/DeliveryCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/DeliveryCommandHandlerTests.cs
index c1370f3b5..4da86b4ff 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/DeliveryCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/DeliveryCommandHandlerTests.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/ShipCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/ShipCommandHandlerTests.cs
index 20e61309e..6ff29336e 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/ShipCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/ShipCommandHandlerTests.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs
index b683294ba..5c5131eec 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs
@@ -10,7 +10,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs
index e319f3496..71eff8af8 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs
@@ -6,7 +6,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs
index 55b89fff7..56f9c3d96 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
using Grand.Data;
using Grand.Domain.Orders;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.cs
index 8099a53c2..562e75d3c 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.cs
@@ -3,7 +3,7 @@ using Grand.Data;
using Grand.Data.Tests.MongoDb;
using Grand.Domain.Orders;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/MerchandiseReturnServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/MerchandiseReturnServiceTests.cs
index 070f0c08d..0ebf575d6 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/MerchandiseReturnServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/MerchandiseReturnServiceTests.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Orders;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs
index 6069d45aa..626742ab2 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Orders;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs
index cc838c23e..f2348df29 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs
@@ -3,7 +3,7 @@ using Grand.Data;
using Grand.Domain.Orders;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderTagServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderTagServiceTests.cs
index cdfd4c615..65020667f 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderTagServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderTagServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Orders;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/ShoppingCartServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/ShoppingCartServiceTests.cs
index a096302ef..46ede9fa4 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/ShoppingCartServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/ShoppingCartServiceTests.cs
@@ -11,7 +11,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Infrastructure;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs
index 173a1ab16..339443752 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Payments;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs
index 2595c5a31..ec401e13f 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs
@@ -4,7 +4,7 @@ using Grand.Data;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs
index f819102eb..33a358581 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs
@@ -4,7 +4,7 @@ using Grand.Data;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShipmentServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShipmentServiceTests.cs
index 7ed2b5624..4c483065e 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShipmentServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShipmentServiceTests.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Data;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs
index 5e1695f33..82b81d325 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs
@@ -4,7 +4,7 @@ using Grand.Data;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs
index 22027f47f..e80013143 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs
@@ -4,7 +4,7 @@ using Grand.Data;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs
index 1ef3cc8bb..43dda539b 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Blogs;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/KnowledgebaseServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/KnowledgebaseServiceTests.cs
index 4f460672e..ffeeef6b6 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Services/KnowledgebaseServiceTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Services/KnowledgebaseServiceTests.cs
@@ -8,7 +8,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/NewsServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/NewsServiceTests.cs
index 47528fcfd..35fa9df10 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Services/NewsServiceTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Services/NewsServiceTests.cs
@@ -6,7 +6,7 @@ using Grand.Domain.News;
using Grand.Domain.Stores;
using Grand.Infrastructure;
using Grand.Infrastructure.Configuration;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/PageLayoutServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/PageLayoutServiceTests.cs
index dac559341..54083d1bc 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Services/PageLayoutServiceTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Services/PageLayoutServiceTests.cs
@@ -8,7 +8,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/PageServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/PageServiceTests.cs
index 5927a31ee..9be7c35db 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Services/PageServiceTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Services/PageServiceTests.cs
@@ -10,7 +10,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/RobotsTxtServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/RobotsTxtServiceTests.cs
index c09e13f0f..cd3593d22 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Services/RobotsTxtServiceTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Services/RobotsTxtServiceTests.cs
@@ -8,7 +8,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Common.Tests/Events/GroupDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Common.Tests/Events/GroupDeletedEventHandlerTests.cs
index e01969c9e..773e0ebff 100644
--- a/src/Tests/Grand.Business.Common.Tests/Events/GroupDeletedEventHandlerTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Events/GroupDeletedEventHandlerTests.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs
index 9b74cb9f5..403ebfc8c 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs
@@ -6,7 +6,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CountryServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CountryServiceTests.cs
index c063279a0..34a997889 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CountryServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CountryServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Directory;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs
index a9e5a3deb..1681901bb 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs
@@ -8,7 +8,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
using Grand.SharedKernel;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/GroupServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/GroupServiceTests.cs
index 0bd31e995..880196b1b 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/GroupServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/GroupServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.cs
index b07a6fa89..679939fff 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.cs
@@ -8,7 +8,7 @@ using Grand.Domain.Directory;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Localization/LanguageServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Localization/LanguageServiceTests.cs
index d791134ef..8ebef531f 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Localization/LanguageServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Localization/LanguageServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Localization;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Localization/TranslationServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Localization/TranslationServiceTests.cs
index 99755b90a..ab8d26531 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Localization/TranslationServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Localization/TranslationServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Infrastructure;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugServiceTests.cs
index 3a52d1db6..53c7e24f4 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugServiceTests.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Seo;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Stores/StoreServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Stores/StoreServiceTests.cs
index aeb3d2668..19d750ab4 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Stores/StoreServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Stores/StoreServiceTests.cs
@@ -3,7 +3,7 @@ using Grand.Data;
using Grand.Domain.Stores;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Customers.Tests/Handler/ActiveVendorCommandHandlerTests.cs b/src/Tests/Grand.Business.Customers.Tests/Handler/ActiveVendorCommandHandlerTests.cs
index a6b34ff65..129763b74 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Handler/ActiveVendorCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Handler/ActiveVendorCommandHandlerTests.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Customers;
using Grand.Business.Customers.Commands.Handlers;
using Grand.Domain.Customers;
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs
index 630afd8a5..1b8e2a00d 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs
@@ -4,7 +4,7 @@ using Grand.Data;
using Grand.Domain.Affiliates;
using Grand.Domain.Orders;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeServiceTests.cs
index e085167e3..9f1fde811 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeServiceTests.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerHistoryPasswordServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerHistoryPasswordServiceTests.cs
index 98b129c34..1ad3bff02 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerHistoryPasswordServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerHistoryPasswordServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Data.Tests.MongoDb;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerManagerServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerManagerServiceTests.cs
index 8164a0832..c9137a7e3 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerManagerServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerManagerServiceTests.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Customers;
using Grand.Business.Core.Utilities.Customers;
using Grand.Business.Customers.Services;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerNoteServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerNoteServiceTests.cs
index d295b3aef..93ef2543b 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerNoteServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerNoteServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Customers;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerServiceTests.cs
index 11bb8e2f9..152491ba3 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerServiceTests.cs
@@ -8,7 +8,7 @@ using Grand.Domain.Orders;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/SalesEmployeeServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/SalesEmployeeServiceTests.cs
index 48d3ee5e3..bdf18e115 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/SalesEmployeeServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/SalesEmployeeServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/UserApiServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/UserApiServiceTests.cs
index 511f3b368..11303c545 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/UserApiServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/UserApiServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Customers;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/VendorServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/VendorServiceTests.cs
index 6f9b6429c..ae4cf73ba 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/VendorServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/VendorServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using System.Linq.Expressions;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Campaigns/CampaignServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Campaigns/CampaignServiceTests.cs
index b49efd4ee..99a643c39 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Campaigns/CampaignServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Campaigns/CampaignServiceTests.cs
@@ -10,7 +10,7 @@ using Grand.Domain.Messages;
using Grand.Domain.Stores;
using Grand.Infrastructure;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeServiceTests.cs
index 9d78b46e4..62c5404d2 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeServiceTests.cs
@@ -8,7 +8,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactUsServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactUsServiceTests.cs
index 321290ae4..0a6b83b91 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactUsServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactUsServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Data.Tests.MongoDb;
using Grand.Domain.Messages;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseActionServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseActionServiceTests.cs
index 20bfd34ee..7fc360bae 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseActionServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseActionServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Courses;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.cs
index 14fd9a22d..f923a5191 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Data.Tests.MongoDb;
using Grand.Domain.Courses;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLevelServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLevelServiceTests.cs
index 1acf1c878..0fbb4d18f 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLevelServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLevelServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Data.Tests.MongoDb;
using Grand.Domain.Courses;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseSubjectServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseSubjectServiceTests.cs
index 428dceb6d..28cbc7c96 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseSubjectServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseSubjectServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Data.Tests.MongoDb;
using Grand.Domain.Courses;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CoursesServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CoursesServiceTests.cs
index 73fc30b5b..de6a18c76 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CoursesServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CoursesServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Courses;
using Grand.Domain.Orders;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerCoordinatesServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerCoordinatesServiceTests.cs
index d2fed8f51..5cfb41752 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerCoordinatesServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerCoordinatesServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Data.Tests.MongoDb;
using Grand.Domain.Customers;
using Grand.Domain.Stores;
using Grand.Infrastructure;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerProductServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerProductServiceTests.cs
index 05c10f096..6e193cbde 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerProductServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerProductServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.cs
index dabbb7ec4..68e776e7d 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Tests.Caching;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentServiceTests.cs
index 985995ed0..9939b3538 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Documents;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs
index 9cde1c476..a1da74cd1 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs
@@ -4,7 +4,7 @@ using Grand.Data.Mongo;
using Grand.Domain.Documents;
using Grand.Infrastructure.Events;
using Grand.SharedKernel.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs
index 03f65314a..cd785c93f 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs
@@ -7,7 +7,7 @@ using Grand.Domain;
using Grand.Domain.Messages;
using Grand.Infrastructure.Events;
using Grand.SharedKernel;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs
index 82bc575a2..b06710e02 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Messages;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/PushNotifications/PushNotificationsServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/PushNotifications/PushNotificationsServiceTests.cs
index a3177b1e1..b1f294009 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/PushNotifications/PushNotificationsServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/PushNotifications/PushNotificationsServiceTests.cs
@@ -3,7 +3,7 @@ using Grand.Business.Marketing.Utilities;
using Grand.Data;
using Grand.Data.Tests.MongoDb;
using Grand.Domain.PushNotifications;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/EmailAccountServiceTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/EmailAccountServiceTests.cs
index 83650685c..9b0258d5e 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/EmailAccountServiceTests.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/EmailAccountServiceTests.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Messages;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
using Grand.SharedKernel;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs
index 657121713..a179ec04d 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs b/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs
index 7566cd2b8..087d81651 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs
@@ -13,7 +13,7 @@ using Grand.Domain.Messages;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
using Grand.Infrastructure;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs
index 1d296a708..34a7209db 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Messages;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/QueuedEmailServiceTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/QueuedEmailServiceTests.cs
index 1bf4c0437..d4478561e 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/QueuedEmailServiceTests.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/QueuedEmailServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Messages;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Storage.Tests/Services/DownloadServiceTests.cs b/src/Tests/Grand.Business.Storage.Tests/Services/DownloadServiceTests.cs
index de8fc9013..a4c6e6d81 100644
--- a/src/Tests/Grand.Business.Storage.Tests/Services/DownloadServiceTests.cs
+++ b/src/Tests/Grand.Business.Storage.Tests/Services/DownloadServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Data;
using Grand.Domain.Media;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs b/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs
index 75575bbff..c537f5f1c 100644
--- a/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs
+++ b/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Media;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Infrastructure.Tests/Caching/MemoryCacheBaseTests.cs b/src/Tests/Grand.Infrastructure.Tests/Caching/MemoryCacheBaseTests.cs
index 08b4f626c..475ed1f93 100644
--- a/src/Tests/Grand.Infrastructure.Tests/Caching/MemoryCacheBaseTests.cs
+++ b/src/Tests/Grand.Infrastructure.Tests/Caching/MemoryCacheBaseTests.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Infrastructure.Tests/Caching/Redis/RedisMessageCacheManagerTests.cs b/src/Tests/Grand.Infrastructure.Tests/Caching/Redis/RedisMessageCacheManagerTests.cs
index cc2c7b064..4740578c9 100644
--- a/src/Tests/Grand.Infrastructure.Tests/Caching/Redis/RedisMessageCacheManagerTests.cs
+++ b/src/Tests/Grand.Infrastructure.Tests/Caching/Redis/RedisMessageCacheManagerTests.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure.Caching.Message;
using Grand.Infrastructure.Caching.Redis;
using Grand.Infrastructure.Configuration;
-using MediatR;
+using Grand.Mediator;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Mediator.Tests/Fixtures.cs b/src/Tests/Grand.Mediator.Tests/Fixtures.cs
new file mode 100644
index 000000000..7f1d2f254
--- /dev/null
+++ b/src/Tests/Grand.Mediator.Tests/Fixtures.cs
@@ -0,0 +1,180 @@
+namespace Grand.Mediator.Tests;
+
+/// <summary>
+/// Records what ran, so tests assert on ordering without static state
+/// </summary>
+public class ExecutionLog
+{
+ public List<string> Entries { get; } = [];
+}
+
+#region Requests
+
+public class PingQuery : IRequest<string>
+{
+ public string Message { get; set; }
+}
+
+public class PingQueryHandler : IRequestHandler<PingQuery, string>
+{
+ public Task<string> Handle(PingQuery request, CancellationToken cancellationToken)
+ {
+ return Task.FromResult($"pong:{request.Message}");
+ }
+}
+
+public class UnhandledQuery : IRequest<string>;
+
+public class VoidCommand : IRequest;
+
+public class VoidCommandHandler : IRequestHandler<VoidCommand>
+{
+ private readonly ExecutionLog _log;
+
+ public VoidCommandHandler(ExecutionLog log)
+ {
+ _log = log;
+ }
+
+ public Task Handle(VoidCommand request, CancellationToken cancellationToken)
+ {
+ _log.Entries.Add(nameof(VoidCommandHandler));
+ return Task.CompletedTask;
+ }
+}
+
+public class UnhandledCommand : IRequest;
+
+/// <summary>
+/// Mirrors Grand.Module.Api, which registers this shape closed over each entity pair, by hand and as scoped
+/// </summary>
+public class GenericQuery<T> : IRequest<IList<T>>;
+
+public class GenericQueryHandler<T> : IRequestHandler<GenericQuery<T>, IList<T>>
+{
+ public Task<IList<T>> Handle(GenericQuery<T> request, CancellationToken cancellationToken)
+ {
+ return Task.FromResult<IList<T>>([default]);
+ }
+}
+
+#endregion
+
+#region Notifications
+
+public class SampleEvent : INotification;
+
+public class FirstSampleEventHandler : INotificationHandler<SampleEvent>
+{
+ private readonly ExecutionLog _log;
+
+ public FirstSampleEventHandler(ExecutionLog log)
+ {
+ _log = log;
+ }
+
+ public Task Handle(SampleEvent notification, CancellationToken cancellationToken)
+ {
+ _log.Entries.Add(nameof(FirstSampleEventHandler));
+ return Task.CompletedTask;
+ }
+}
+
+public class SecondSampleEventHandler : INotificationHandler<SampleEvent>
+{
+ private readonly ExecutionLog _log;
+
+ public SecondSampleEventHandler(ExecutionLog log)
+ {
+ _log = log;
+ }
+
+ public Task Handle(SampleEvent notification, CancellationToken cancellationToken)
+ {
+ _log.Entries.Add(nameof(SecondSampleEventHandler));
+ return Task.CompletedTask;
+ }
+}
+
+public class UnobservedEvent : INotification;
+
+/// <summary>
+/// Mirrors the shape of EntityInserted&lt;T&gt; - published as a closed generic, handled per entity
+/// </summary>
+public class EntityChanged<T> : INotification
+{
+ public EntityChanged(T entity)
+ {
+ Entity = entity;
+ }
+
+ public T Entity { get; }
+}
+
+public class EntityChangedStringHandler : INotificationHandler<EntityChanged<string>>
+{
+ private readonly ExecutionLog _log;
+
+ public EntityChangedStringHandler(ExecutionLog log)
+ {
+ _log = log;
+ }
+
+ public Task Handle(EntityChanged<string> notification, CancellationToken cancellationToken)
+ {
+ _log.Entries.Add($"{nameof(EntityChangedStringHandler)}:{notification.Entity}");
+ return Task.CompletedTask;
+ }
+}
+
+public class EntityChangedIntHandler : INotificationHandler<EntityChanged<int>>
+{
+ private readonly ExecutionLog _log;
+
+ public EntityChangedIntHandler(ExecutionLog log)
+ {
+ _log = log;
+ }
+
+ public Task Handle(EntityChanged<int> notification, CancellationToken cancellationToken)
+ {
+ _log.Entries.Add($"{nameof(EntityChangedIntHandler)}:{notification.Entity}");
+ return Task.CompletedTask;
+ }
+}
+
+public class FailingEvent : INotification;
+
+public class ThrowingEventHandler : INotificationHandler<FailingEvent>
+{
+ private readonly ExecutionLog _log;
+
+ public ThrowingEventHandler(ExecutionLog log)
+ {
+ _log = log;
+ }
+
+ public Task Handle(FailingEvent notification, CancellationToken cancellationToken)
+ {
+ _log.Entries.Add(nameof(ThrowingEventHandler));
+ throw new InvalidTimeZoneException("handler failed");
+ }
+}
+
+public class NeverReachedEventHandler : INotificationHandler<FailingEvent>
+{
+ private readonly ExecutionLog _log;
+
+ public NeverReachedEventHandler(ExecutionLog log)
+ {
+ _log = log;
+ }
+
+ public Task Handle(FailingEvent notification, CancellationToken cancellationToken)
+ {
+ _log.Entries.Add(nameof(NeverReachedEventHandler));
+ return Task.CompletedTask;
+ }
+}
+
+#endregion
diff --git a/src/Tests/Grand.Mediator.Tests/Grand.Mediator.Tests.csproj b/src/Tests/Grand.Mediator.Tests/Grand.Mediator.Tests.csproj
new file mode 100644
index 000000000..60bfea3a4
--- /dev/null
+++ b/src/Tests/Grand.Mediator.Tests/Grand.Mediator.Tests.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <IsPackable>false</IsPackable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.NET.Test.Sdk" />
+ <PackageReference Include="Moq" />
+ <PackageReference Include="MSTest.TestAdapter" />
+ <PackageReference Include="MSTest.TestFramework" />
+ <PackageReference Include="coverlet.collector">
+ <PrivateAssets>all</PrivateAssets>
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ </PackageReference>
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\Core\Grand.Mediator\Grand.Mediator.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git a/src/Tests/Grand.Mediator.Tests/MediatorPublishTests.cs b/src/Tests/Grand.Mediator.Tests/MediatorPublishTests.cs
new file mode 100644
index 000000000..d4e937ea5
--- /dev/null
+++ b/src/Tests/Grand.Mediator.Tests/MediatorPublishTests.cs
@@ -0,0 +1,123 @@
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Grand.Mediator.Tests;
+
+[TestClass]
+public class MediatorPublishTests
+{
+ private ExecutionLog _log;
+ private ServiceProvider _provider;
+
+ [TestInitialize]
+ public void Init()
+ {
+ var services = new ServiceCollection();
+ services.AddSingleton<ExecutionLog>();
+ services.AddGrandMediator(Assembly.GetExecutingAssembly());
+ _provider = services.BuildServiceProvider();
+ _log = _provider.GetRequiredService<ExecutionLog>();
+ }
+
+ [TestCleanup]
+ public void Cleanup()
+ {
+ _provider.Dispose();
+ }
+
+ private IMediator Mediator => _provider.GetRequiredService<IMediator>();
+
+ [TestMethod]
+ public async Task Publish_InvokesEveryHandler()
+ {
+ await Mediator.Publish(new SampleEvent());
+
+ CollectionAssert.AreEquivalent(
+ new[] { nameof(FirstSampleEventHandler), nameof(SecondSampleEventHandler) }, _log.Entries);
+ }
+
+ [TestMethod]
+ public async Task Publish_WithoutHandlers_DoesNothing()
+ {
+ await Mediator.Publish(new UnobservedEvent());
+
+ Assert.AreEqual(0, _log.Entries.Count);
+ }
+
+ /// <summary>
+ /// Handlers run in registration order, sequentially - this is the contract documented for domain events
+ /// </summary>
+ [TestMethod]
+ public async Task Publish_RunsHandlersSequentiallyInRegistrationOrder()
+ {
+ var services = new ServiceCollection();
+ services.AddSingleton<ExecutionLog>();
+ services.AddTransient<INotificationHandler<SampleEvent>, SecondSampleEventHandler>();
+ services.AddTransient<INotificationHandler<SampleEvent>, FirstSampleEventHandler>();
+ services.AddTransient<IMediator, Mediator>();
+
+ await using var provider = services.BuildServiceProvider();
+ await provider.GetRequiredService<IMediator>().Publish(new SampleEvent());
+
+ CollectionAssert.AreEqual(
+ new[] { nameof(SecondSampleEventHandler), nameof(FirstSampleEventHandler) },
+ provider.GetRequiredService<ExecutionLog>().Entries);
+ }
+
+ /// <summary>
+ /// A throwing handler aborts the remaining ones and surfaces in the caller
+ /// </summary>
+ [TestMethod]
+ public async Task Publish_ThrowingHandler_AbortsRemainingAndPropagates()
+ {
+ var services = new ServiceCollection();
+ services.AddSingleton<ExecutionLog>();
+ services.AddTransient<INotificationHandler<FailingEvent>, ThrowingEventHandler>();
+ services.AddTransient<INotificationHandler<FailingEvent>, NeverReachedEventHandler>();
+ services.AddTransient<IMediator, Mediator>();
+
+ await using var provider = services.BuildServiceProvider();
+
+ await Assert.ThrowsExactlyAsync<InvalidTimeZoneException>(
+ async () => await provider.GetRequiredService<IMediator>().Publish(new FailingEvent()));
+
+ CollectionAssert.AreEqual(new[] { nameof(ThrowingEventHandler) },
+ provider.GetRequiredService<ExecutionLog>().Entries);
+ }
+
+ /// <summary>
+ /// Generic events such as EntityInserted&lt;T&gt; must dispatch on the runtime type
+ /// </summary>
+ [TestMethod]
+ public async Task Publish_DispatchesOnRuntimeTypeOfGenericNotification()
+ {
+ await Mediator.Publish(new EntityChanged<string>("product"));
+ await Mediator.Publish(new EntityChanged<int>(42));
+
+ CollectionAssert.AreEqual(
+ new[] { $"{nameof(EntityChangedStringHandler)}:product", $"{nameof(EntityChangedIntHandler)}:42" },
+ _log.Entries);
+ }
+
+ [TestMethod]
+ public async Task Publish_WeaklyTyped_InvokesHandlers()
+ {
+ await Mediator.Publish((object)new EntityChanged<string>("weak"));
+
+ CollectionAssert.AreEqual(new[] { $"{nameof(EntityChangedStringHandler)}:weak" }, _log.Entries);
+ }
+
+ [TestMethod]
+ public async Task Publish_WeaklyTyped_NonNotification_Throws()
+ {
+ await Assert.ThrowsExactlyAsync<ArgumentException>(async () => await Mediator.Publish(new object()));
+ }
+
+ [TestMethod]
+ public async Task Publish_Null_Throws()
+ {
+ await Assert.ThrowsExactlyAsync<ArgumentNullException>(
+ async () => await Mediator.Publish((SampleEvent)null));
+ }
+}
diff --git a/src/Tests/Grand.Mediator.Tests/MediatorRegistrationTests.cs b/src/Tests/Grand.Mediator.Tests/MediatorRegistrationTests.cs
new file mode 100644
index 000000000..4c8f95f8d
--- /dev/null
+++ b/src/Tests/Grand.Mediator.Tests/MediatorRegistrationTests.cs
@@ -0,0 +1,86 @@
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Grand.Mediator.Tests;
+
+[TestClass]
+public class MediatorRegistrationTests
+{
+ private static readonly Assembly Current = Assembly.GetExecutingAssembly();
+
+ [TestMethod]
+ public void AddGrandMediator_RegistersMediator()
+ {
+ var services = new ServiceCollection();
+ services.AddGrandMediator(Current);
+
+ Assert.AreEqual(1, services.Count(x => x.ServiceType == typeof(IMediator)));
+ Assert.AreEqual(typeof(Mediator), services.Single(x => x.ServiceType == typeof(IMediator))
+ .ImplementationType);
+ }
+
+ [TestMethod]
+ public void AddGrandMediator_RegistersRequestHandlerAsTransient()
+ {
+ var services = new ServiceCollection();
+ services.AddGrandMediator(Current);
+
+ var descriptor = services.Single(x => x.ServiceType == typeof(IRequestHandler<PingQuery, string>));
+
+ Assert.AreEqual(typeof(PingQueryHandler), descriptor.ImplementationType);
+ Assert.AreEqual(ServiceLifetime.Transient, descriptor.Lifetime);
+ }
+
+ [TestMethod]
+ public void AddGrandMediator_RegistersEveryNotificationHandler()
+ {
+ var services = new ServiceCollection();
+ services.AddGrandMediator(Current);
+
+ var implementations = services
+ .Where(x => x.ServiceType == typeof(INotificationHandler<SampleEvent>))
+ .Select(x => x.ImplementationType)
+ .ToList();
+
+ CollectionAssert.AreEquivalent(
+ new[] { typeof(FirstSampleEventHandler), typeof(SecondSampleEventHandler) }, implementations);
+ }
+
+ /// <summary>
+ /// StartupBase registers assembly by assembly and may see the same assembly more than once
+ /// </summary>
+ [TestMethod]
+ public void AddGrandMediator_IsIdempotent()
+ {
+ var once = new ServiceCollection();
+ once.AddGrandMediator(Current);
+
+ var twice = new ServiceCollection();
+ twice.AddGrandMediator(Current);
+ twice.AddGrandMediator(Current);
+
+ Assert.AreEqual(once.Count, twice.Count);
+ }
+
+ /// <summary>
+ /// Open generic handlers are left to the hand-written registrations that close them
+ /// </summary>
+ [TestMethod]
+ public void AddGrandMediator_SkipsOpenGenericHandlers()
+ {
+ var services = new ServiceCollection();
+ services.AddGrandMediator(Current);
+
+ Assert.IsFalse(services.Any(x => x.ImplementationType == typeof(GenericQueryHandler<>)));
+ }
+
+ [TestMethod]
+ public void AddGrandMediator_AcceptsAssemblyCollection()
+ {
+ var services = new ServiceCollection();
+ services.AddGrandMediator([Current, Current]);
+
+ Assert.IsTrue(services.Any(x => x.ServiceType == typeof(IRequestHandler<PingQuery, string>)));
+ }
+}
diff --git a/src/Tests/Grand.Mediator.Tests/MediatorSendTests.cs b/src/Tests/Grand.Mediator.Tests/MediatorSendTests.cs
new file mode 100644
index 000000000..72428e67b
--- /dev/null
+++ b/src/Tests/Grand.Mediator.Tests/MediatorSendTests.cs
@@ -0,0 +1,111 @@
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Grand.Mediator.Tests;
+
+[TestClass]
+public class MediatorSendTests
+{
+ private ExecutionLog _log;
+ private ServiceProvider _provider;
+
+ [TestInitialize]
+ public void Init()
+ {
+ var services = new ServiceCollection();
+ services.AddSingleton<ExecutionLog>();
+ services.AddGrandMediator(Assembly.GetExecutingAssembly());
+ _provider = services.BuildServiceProvider();
+ _log = _provider.GetRequiredService<ExecutionLog>();
+ }
+
+ [TestCleanup]
+ public void Cleanup()
+ {
+ _provider.Dispose();
+ }
+
+ private IMediator Mediator => _provider.GetRequiredService<IMediator>();
+
+ [TestMethod]
+ public async Task Send_ReturnsResponseFromHandler()
+ {
+ var result = await Mediator.Send(new PingQuery { Message = "hello" });
+
+ Assert.AreEqual("pong:hello", result);
+ }
+
+ [TestMethod]
+ public async Task Send_WithoutResponse_InvokesHandler()
+ {
+ await Mediator.Send(new VoidCommand());
+
+ CollectionAssert.AreEqual(new[] { nameof(VoidCommandHandler) }, _log.Entries);
+ }
+
+ [TestMethod]
+ public async Task Send_WithoutHandler_Throws()
+ {
+ await Assert.ThrowsExactlyAsync<InvalidOperationException>(
+ async () => await Mediator.Send(new UnhandledQuery()));
+ }
+
+ [TestMethod]
+ public async Task Send_WithoutResponseAndWithoutHandler_Throws()
+ {
+ await Assert.ThrowsExactlyAsync<InvalidOperationException>(
+ async () => await Mediator.Send(new UnhandledCommand()));
+ }
+
+ [TestMethod]
+ public async Task Send_Null_Throws()
+ {
+ await Assert.ThrowsExactlyAsync<ArgumentNullException>(
+ async () => await Mediator.Send((IRequest<string>)null));
+ }
+
+ [TestMethod]
+ public async Task Send_WeaklyTyped_ReturnsResponse()
+ {
+ var result = await Mediator.Send((object)new PingQuery { Message = "weak" });
+
+ Assert.AreEqual("pong:weak", result);
+ }
+
+ [TestMethod]
+ public async Task Send_WeaklyTyped_WithoutResponse_ReturnsNull()
+ {
+ var result = await Mediator.Send((object)new VoidCommand());
+
+ Assert.IsNull(result);
+ CollectionAssert.AreEqual(new[] { nameof(VoidCommandHandler) }, _log.Entries);
+ }
+
+ [TestMethod]
+ public async Task Send_WeaklyTyped_NonRequest_Throws()
+ {
+ await Assert.ThrowsExactlyAsync<ArgumentException>(async () => await Mediator.Send(new object()));
+ }
+
+ /// <summary>
+ /// Grand.Module.Api registers closed generic handlers by hand and as scoped - the mediator must resolve
+ /// them through the container rather than from an internal registry built by scanning
+ /// </summary>
+ [TestMethod]
+ public async Task Send_ResolvesHandRegisteredScopedClosedGeneric()
+ {
+ var services = new ServiceCollection();
+ services.AddGrandMediator(Assembly.GetExecutingAssembly());
+ services.AddScoped(typeof(IRequestHandler<GenericQuery<string>, IList<string>>),
+ typeof(GenericQueryHandler<string>));
+
+ await using var provider = services.BuildServiceProvider();
+ using var scope = provider.CreateScope();
+
+ var result = await scope.ServiceProvider.GetRequiredService<IMediator>()
+ .Send(new GenericQuery<string>());
+
+ Assert.AreEqual(1, result.Count);
+ }
+}
diff --git a/src/Tests/Grand.Module.Api.Tests/Controllers/TokenWebControllerTests.cs b/src/Tests/Grand.Module.Api.Tests/Controllers/TokenWebControllerTests.cs
index 8acaa1854..a18c59d78 100644
--- a/src/Tests/Grand.Module.Api.Tests/Controllers/TokenWebControllerTests.cs
+++ b/src/Tests/Grand.Module.Api.Tests/Controllers/TokenWebControllerTests.cs
@@ -9,7 +9,7 @@ using Grand.Module.Api.Commands.Models.Common;
using Grand.Module.Api.Controllers;
using Grand.Module.Api.DTOs;
using Grand.Module.Api.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Antiforgery;
using Microsoft.AspNetCore.Mvc;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Module.Api.Tests/Grand.Module.Api.Tests.csproj b/src/Tests/Grand.Module.Api.Tests/Grand.Module.Api.Tests.csproj
index 4ecd9d8a6..ea169c0d9 100644
--- a/src/Tests/Grand.Module.Api.Tests/Grand.Module.Api.Tests.csproj
+++ b/src/Tests/Grand.Module.Api.Tests/Grand.Module.Api.Tests.csproj
@@ -8,7 +8,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="FluentValidation" />
- <PackageReference Include="MediatR" />
<PackageReference Include="MongoDB.Bson" />
<PackageReference Include="Moq" />
<PackageReference Include="MSTest.TestAdapter" />
diff --git a/src/Tests/Grand.Web.Common.Tests/Services/Admin/AdminSiteMapServiceTests.cs b/src/Tests/Grand.Web.Common.Tests/Services/Admin/AdminSiteMapServiceTests.cs
index f84f797ff..90e0b9d7e 100644
--- a/src/Tests/Grand.Web.Common.Tests/Services/Admin/AdminSiteMapServiceTests.cs
+++ b/src/Tests/Grand.Web.Common.Tests/Services/Admin/AdminSiteMapServiceTests.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Admin;
using Grand.Infrastructure.Caching;
using Grand.Web.Common.Menu;
-using MediatR;
+using Grand.Mediator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Web.Tests/Grand.Web.Tests.csproj b/src/Tests/Grand.Web.Tests/Grand.Web.Tests.csproj
index edd2a8c96..a11510fad 100644
--- a/src/Tests/Grand.Web.Tests/Grand.Web.Tests.csproj
+++ b/src/Tests/Grand.Web.Tests/Grand.Web.Tests.csproj
@@ -8,7 +8,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="FluentValidation" />
- <PackageReference Include="MediatR" />
<PackageReference Include="MongoDB.Bson" />
<PackageReference Include="Moq" />
<PackageReference Include="MSTest.TestAdapter" />
diff --git a/src/Tests/Grand.Web.Tests/Validators/Customer/CustomerValidatorsStoreScopingTests.cs b/src/Tests/Grand.Web.Tests/Validators/Customer/CustomerValidatorsStoreScopingTests.cs
index 89017bcb7..943686c5e 100644
--- a/src/Tests/Grand.Web.Tests/Validators/Customer/CustomerValidatorsStoreScopingTests.cs
+++ b/src/Tests/Grand.Web.Tests/Validators/Customer/CustomerValidatorsStoreScopingTests.cs
@@ -12,7 +12,7 @@ using Grand.SharedKernel.Captcha;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using Grand.Web.Validators.Customer;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs b/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs
index d5f3a3e9d..d74c11b91 100644
--- a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs
@@ -17,7 +17,7 @@ using Grand.Web.AdminShared.Models.Catalog;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Grand.Web.AdminShared.Models.Discounts;
using Grand.Web.AdminShared.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/HomeController.cs b/src/Web/Grand.Web.Admin/Controllers/HomeController.cs
index 0cca1e8da..46cc4a423 100644
--- a/src/Web/Grand.Web.Admin/Controllers/HomeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/HomeController.cs
@@ -11,7 +11,7 @@ using Grand.Domain.Orders;
using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
using Grand.Web.AdminShared.Models.Home;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Admin.Controllers;
diff --git a/src/Web/Grand.Web.Admin/Controllers/LoginController.cs b/src/Web/Grand.Web.Admin/Controllers/LoginController.cs
index f249a8ee6..91df581fb 100644
--- a/src/Web/Grand.Web.Admin/Controllers/LoginController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/LoginController.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
using Grand.Web.AdminShared.Controllers;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Admin.Controllers;
diff --git a/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs b/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs
index 94fb53504..e083dc097 100644
--- a/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs
@@ -14,7 +14,7 @@ using Grand.Web.AdminShared.Models.Common;
using Grand.Web.AdminShared.Models.Directory;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
diff --git a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
index 412c3758f..bf23eb73c 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
@@ -17,7 +17,7 @@ using Grand.Web.AdminShared.Interfaces;
using Grand.Web.AdminShared.Models.Orders;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Admin.Controllers;
diff --git a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs
index c8cc05bdd..e41a6a57d 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs
@@ -11,7 +11,7 @@ using Grand.Web.AdminShared.Models.Orders;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Localization;
using Grand.Web.Common.Security.Authorization;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
diff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
index e5e682b73..321b657be 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
@@ -34,7 +34,7 @@ using Grand.Web.Common.Localization;
using Grand.Web.Common.Security.Authorization;
using Grand.Web.Common.Security.Captcha;
using Grand.Web.Common.Themes;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using OperatingSystem = Grand.Infrastructure.OperatingSystem;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs b/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs
index c52e622a1..cd8348952 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs
@@ -14,7 +14,7 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Admin.Controllers;
diff --git a/src/Web/Grand.Web.Admin/Controllers/VendorController.cs b/src/Web/Grand.Web.Admin/Controllers/VendorController.cs
index b18f0ce99..f289b6064 100644
--- a/src/Web/Grand.Web.Admin/Controllers/VendorController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/VendorController.cs
@@ -9,7 +9,7 @@ using Grand.Web.AdminShared.Models.Vendors;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Admin.Controllers;
diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseLoginController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseLoginController.cs
index 7d39fd990..ae7ff62dd 100644
--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseLoginController.cs
+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseLoginController.cs
@@ -8,7 +8,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure;
using Grand.Web.AdminShared.Models.Common;
using Grand.Web.Common.Controllers;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.AdminShared/Services/DiscountViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/DiscountViewModelService.cs
index 5075c9d92..581d3608e 100644
--- a/src/Web/Grand.Web.AdminShared/Services/DiscountViewModelService.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/DiscountViewModelService.cs
@@ -20,7 +20,7 @@ using Grand.Web.AdminShared.Models.Catalog;
using Grand.Web.AdminShared.Models.Discounts;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Localization;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.AdminShared.Services;
diff --git a/src/Web/Grand.Web.AdminShared/Services/OrderViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/OrderViewModelService.cs
index fc87bfb8a..3b86f2975 100644
--- a/src/Web/Grand.Web.AdminShared/Services/OrderViewModelService.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/OrderViewModelService.cs
@@ -29,7 +29,7 @@ using Grand.Web.AdminShared.Extensions.Mapping;
using Grand.Web.AdminShared.Interfaces;
using Grand.Web.AdminShared.Models.Orders;
using Grand.Web.Common.Localization;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
using System.Net;
using ProductExtensions = Grand.Domain.Catalog.ProductExtensions;
diff --git a/src/Web/Grand.Web.AdminShared/Services/ProductReviewViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/ProductReviewViewModelService.cs
index a94ead0cb..4a75e29d6 100644
--- a/src/Web/Grand.Web.AdminShared/Services/ProductReviewViewModelService.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/ProductReviewViewModelService.cs
@@ -11,7 +11,7 @@ using Grand.Web.AdminShared.Extensions.Mapping;
using Grand.Web.AdminShared.Interfaces;
using Grand.Web.AdminShared.Models.Catalog;
using Grand.Web.Common.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.AdminShared.Services;
diff --git a/src/Web/Grand.Web.AdminShared/Services/VendorViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/VendorViewModelService.cs
index 9795a9425..eae43ce80 100644
--- a/src/Web/Grand.Web.AdminShared/Services/VendorViewModelService.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/VendorViewModelService.cs
@@ -15,7 +15,7 @@ using Grand.Web.AdminShared.Extensions.Mapping;
using Grand.Web.AdminShared.Interfaces;
using Grand.Web.AdminShared.Models.Common;
using Grand.Web.AdminShared.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.AdminShared.Services;
diff --git a/src/Web/Grand.Web.AdminShared/Validators/Affiliate/AffiliateDeleteValidator.cs b/src/Web/Grand.Web.AdminShared/Validators/Affiliate/AffiliateDeleteValidator.cs
index 29c283b29..37d23d090 100644
--- a/src/Web/Grand.Web.AdminShared/Validators/Affiliate/AffiliateDeleteValidator.cs
+++ b/src/Web/Grand.Web.AdminShared/Validators/Affiliate/AffiliateDeleteValidator.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Business.Core.Queries.Customers;
using Grand.Infrastructure.Validators;
using Grand.Web.AdminShared.Models.Affiliates;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.AdminShared.Validators.Affiliate;
diff --git a/src/Web/Grand.Web.AdminShared/Validators/Common/LoginValidator.cs b/src/Web/Grand.Web.AdminShared/Validators/Common/LoginValidator.cs
index 404aa782c..ba09dd1a5 100644
--- a/src/Web/Grand.Web.AdminShared/Validators/Common/LoginValidator.cs
+++ b/src/Web/Grand.Web.AdminShared/Validators/Common/LoginValidator.cs
@@ -11,7 +11,7 @@ using Grand.Infrastructure.Validators;
using Grand.SharedKernel.Captcha;
using Grand.Web.AdminShared.Models.Common;
using Grand.Web.Common.Validators;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Web/Grand.Web.Common/Events/ActionExecutingContextNotification.cs b/src/Web/Grand.Web.Common/Events/ActionExecutingContextNotification.cs
index 2053a42a9..36f03620a 100644
--- a/src/Web/Grand.Web.Common/Events/ActionExecutingContextNotification.cs
+++ b/src/Web/Grand.Web.Common/Events/ActionExecutingContextNotification.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Filters;
namespace Grand.Web.Common.Events;
diff --git a/src/Web/Grand.Web.Common/Events/AdminTabStripCreated.cs b/src/Web/Grand.Web.Common/Events/AdminTabStripCreated.cs
index bbffd53e0..b67cd41ce 100644
--- a/src/Web/Grand.Web.Common/Events/AdminTabStripCreated.cs
+++ b/src/Web/Grand.Web.Common/Events/AdminTabStripCreated.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Html;
namespace Grand.Web.Common.Events;
diff --git a/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs b/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs
index 329a70bb2..a65f59b20 100644
--- a/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Queries.Customers;
using Grand.Data;
using Grand.Infrastructure;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Filters;
diff --git a/src/Web/Grand.Web.Common/Menu/AdminSiteMapService.cs b/src/Web/Grand.Web.Common/Menu/AdminSiteMapService.cs
index afb3c4870..cc6c70455 100644
--- a/src/Web/Grand.Web.Common/Menu/AdminSiteMapService.cs
+++ b/src/Web/Grand.Web.Common/Menu/AdminSiteMapService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Admin;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Common.Menu;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripTagHelper.cs
index cdaed8498..c8b002a83 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripTagHelper.cs
@@ -1,5 +1,5 @@
using Grand.Web.Common.Events;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
diff --git a/src/Web/Grand.Web.Store/Controllers/DiscountController.cs b/src/Web/Grand.Web.Store/Controllers/DiscountController.cs
index 06ae7fbec..eddbc4cd2 100644
--- a/src/Web/Grand.Web.Store/Controllers/DiscountController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/DiscountController.cs
@@ -17,7 +17,7 @@ using Grand.Web.AdminShared.Models.Discounts;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Store.Controllers;
diff --git a/src/Web/Grand.Web.Store/Controllers/LoginController.cs b/src/Web/Grand.Web.Store/Controllers/LoginController.cs
index 89d24b4d6..d37841368 100644
--- a/src/Web/Grand.Web.Store/Controllers/LoginController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/LoginController.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure;
using Grand.Web.AdminShared.Controllers;
using Grand.Web.Store.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Store.Controllers;
diff --git a/src/Web/Grand.Web.Store/Controllers/OrderController.cs b/src/Web/Grand.Web.Store/Controllers/OrderController.cs
index b12da8a1e..460ae46b9 100644
--- a/src/Web/Grand.Web.Store/Controllers/OrderController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/OrderController.cs
@@ -14,7 +14,7 @@ using Grand.Web.AdminShared.Interfaces;
using Grand.Web.AdminShared.Models.Orders;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Store.Controllers;
diff --git a/src/Web/Grand.Web.Store/Controllers/PaymentTransactionController.cs b/src/Web/Grand.Web.Store/Controllers/PaymentTransactionController.cs
index 93db21582..d029eb564 100644
--- a/src/Web/Grand.Web.Store/Controllers/PaymentTransactionController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/PaymentTransactionController.cs
@@ -12,7 +12,7 @@ using Grand.Web.AdminShared.Models.Orders;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Localization;
using Grand.Web.Common.Security.Authorization;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
diff --git a/src/Web/Grand.Web.Store/Controllers/ShipmentController.cs b/src/Web/Grand.Web.Store/Controllers/ShipmentController.cs
index eb3ea3fae..0e9c542ae 100644
--- a/src/Web/Grand.Web.Store/Controllers/ShipmentController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/ShipmentController.cs
@@ -14,7 +14,7 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Store.Controllers;
diff --git a/src/Web/Grand.Web.Vendor/Controllers/LoginController.cs b/src/Web/Grand.Web.Vendor/Controllers/LoginController.cs
index e4ee9b923..8d9faf1db 100644
--- a/src/Web/Grand.Web.Vendor/Controllers/LoginController.cs
+++ b/src/Web/Grand.Web.Vendor/Controllers/LoginController.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure;
using Grand.Web.AdminShared.Controllers;
using Grand.Web.Vendor.Extensions;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Vendor.Controllers;
diff --git a/src/Web/Grand.Web.Vendor/Controllers/ShipmentController.cs b/src/Web/Grand.Web.Vendor/Controllers/ShipmentController.cs
index 4fb395e44..7f23e0dd1 100644
--- a/src/Web/Grand.Web.Vendor/Controllers/ShipmentController.cs
+++ b/src/Web/Grand.Web.Vendor/Controllers/ShipmentController.cs
@@ -15,7 +15,7 @@ using Grand.Web.Common.Security.Authorization;
using Grand.Web.Vendor.Extensions;
using Grand.Web.Vendor.Interfaces;
using Grand.Web.Vendor.Models.Shipment;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Vendor.Controllers;
diff --git a/src/Web/Grand.Web.Vendor/Services/VendorReviewViewModelService.cs b/src/Web/Grand.Web.Vendor/Services/VendorReviewViewModelService.cs
index 9086f1258..03ed96498 100644
--- a/src/Web/Grand.Web.Vendor/Services/VendorReviewViewModelService.cs
+++ b/src/Web/Grand.Web.Vendor/Services/VendorReviewViewModelService.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
using Grand.Web.Vendor.Interfaces;
using Grand.Web.Vendor.Models.VendorReview;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Vendor.Services;
diff --git a/src/Web/Grand.Web/Commands/Handler/Blogs/InsertBlogCommentCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Blogs/InsertBlogCommentCommandHandler.cs
index 14eabf264..33507ac32 100644
--- a/src/Web/Grand.Web/Commands/Handler/Blogs/InsertBlogCommentCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Blogs/InsertBlogCommentCommandHandler.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Blogs;
using Grand.Domain.Localization;
using Grand.Infrastructure;
using Grand.Web.Commands.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Blogs;
diff --git a/src/Web/Grand.Web/Commands/Handler/Contact/ContactAttributeChangeCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Contact/ContactAttributeChangeCommandHandler.cs
index d70defa47..81f66e0af 100644
--- a/src/Web/Grand.Web/Commands/Handler/Contact/ContactAttributeChangeCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Contact/ContactAttributeChangeCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Web.Commands.Models.Contact;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Contact;
diff --git a/src/Web/Grand.Web/Commands/Handler/Contact/ContactUsCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Contact/ContactUsCommandHandler.cs
index 91b878535..f8f95eef6 100644
--- a/src/Web/Grand.Web/Commands/Handler/Contact/ContactUsCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Contact/ContactUsCommandHandler.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Messages;
using Grand.Web.Commands.Models.Contact;
using Grand.Web.Common.Security.Captcha;
using Grand.Web.Models.Contact;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Contact;
diff --git a/src/Web/Grand.Web/Commands/Handler/Contact/ContactUsSendCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Contact/ContactUsSendCommandHandler.cs
index 0cb3a943b..f710d92e0 100644
--- a/src/Web/Grand.Web/Commands/Handler/Contact/ContactUsSendCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Contact/ContactUsSendCommandHandler.cs
@@ -6,7 +6,7 @@ using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
using Grand.Web.Commands.Models.Contact;
using Grand.Web.Models.Contact;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Contact;
diff --git a/src/Web/Grand.Web/Commands/Handler/Courses/CourseLessonApprovedCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Courses/CourseLessonApprovedCommandHandler.cs
index f031c1f6c..25ad86df8 100644
--- a/src/Web/Grand.Web/Commands/Handler/Courses/CourseLessonApprovedCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Courses/CourseLessonApprovedCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Marketing.Courses;
using Grand.Domain.Courses;
using Grand.Web.Commands.Models.Courses;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Courses;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/CurrentPositionCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/CurrentPositionCommandHandler.cs
index 5aed9b047..9d8323675 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/CurrentPositionCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/CurrentPositionCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Web.Commands.Models.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Customers;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/CustomerRegisteredCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/CustomerRegisteredCommandHandler.cs
index 8bf0078a6..89411e723 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/CustomerRegisteredCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/CustomerRegisteredCommandHandler.cs
@@ -10,7 +10,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Messages;
using Grand.Domain.Tax;
using Grand.Web.Commands.Models.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Customers;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/DeleteAccountCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/DeleteAccountCommandHandler.cs
index 3a66b9fb2..1fb4e1aff 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/DeleteAccountCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/DeleteAccountCommandHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Marketing.Newsletters;
using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Localization;
using Grand.Web.Commands.Models.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Customers;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/PasswordRecoverySendCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/PasswordRecoverySendCommandHandler.cs
index 82936a151..efd8583a6 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/PasswordRecoverySendCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/PasswordRecoverySendCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Customers;
using Grand.Web.Commands.Models.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Customers;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs
index 970f0a0a8..66f249673 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Utilities.Customers;
using Grand.Domain.Customers;
using Grand.Web.Commands.Models.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Customers;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountDeleteCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountDeleteCommandHandler.cs
index 8c1e4281e..31026f5bf 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountDeleteCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountDeleteCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Customers;
using Grand.Web.Commands.Models.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Customers;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountEditCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountEditCommandHandler.cs
index 134e5dcf4..32555ba9c 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountEditCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountEditCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Utilities.Customers;
using Grand.Domain.Customers;
using Grand.Web.Commands.Models.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Customers;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/UpdateCustomerInfoCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/UpdateCustomerInfoCommandHandler.cs
index 6c4719b59..08b64e22c 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/UpdateCustomerInfoCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/UpdateCustomerInfoCommandHandler.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Messages;
using Grand.Domain.Tax;
using Grand.Web.Commands.Models.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Customers;
diff --git a/src/Web/Grand.Web/Commands/Handler/News/InsertNewsCommentCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/News/InsertNewsCommentCommandHandler.cs
index de8fca0cc..7f48ff0f8 100644
--- a/src/Web/Grand.Web/Commands/Handler/News/InsertNewsCommentCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/News/InsertNewsCommentCommandHandler.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Localization;
using Grand.Domain.News;
using Grand.Infrastructure;
using Grand.Web.Commands.Models.News;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.News;
diff --git a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscribeNewsletterHandler.cs b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscribeNewsletterHandler.cs
index 2e2789ece..0ac363c1d 100644
--- a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscribeNewsletterHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscribeNewsletterHandler.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
using Grand.Web.Commands.Models.Newsletter;
using Grand.Web.Models.Newsletter;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Newsletter;
diff --git a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionActivationHandler.cs b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionActivationHandler.cs
index 3b123f9a7..2b00372b1 100644
--- a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionActivationHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionActivationHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Marketing.Newsletters;
using Grand.Web.Commands.Models.Newsletter;
using Grand.Web.Models.Newsletter;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Newsletter;
diff --git a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs
index 6fbc0b224..4ac13b2e4 100644
--- a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Marketing.Newsletters;
using Grand.Web.Commands.Models.Newsletter;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Newsletter;
diff --git a/src/Web/Grand.Web/Commands/Handler/Orders/InsertOrderNoteCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Orders/InsertOrderNoteCommandHandler.cs
index ecf16b213..d9874ab64 100644
--- a/src/Web/Grand.Web/Commands/Handler/Orders/InsertOrderNoteCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Orders/InsertOrderNoteCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Orders;
using Grand.Web.Commands.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Orders;
diff --git a/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs
index 5413257d6..a078dfe56 100644
--- a/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Infrastructure;
using Grand.Web.Commands.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Orders;
diff --git a/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs
index 63744fb78..a5c6d75f8 100644
--- a/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Web.Commands.Models.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Products;
diff --git a/src/Web/Grand.Web/Commands/Handler/Products/SendProductAskQuestionMessageCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Products/SendProductAskQuestionMessageCommandHandler.cs
index 59a2b2a4b..83520d81e 100644
--- a/src/Web/Grand.Web/Commands/Handler/Products/SendProductAskQuestionMessageCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Products/SendProductAskQuestionMessageCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Messages;
using Grand.SharedKernel.Extensions;
using Grand.Web.Commands.Models.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Products;
diff --git a/src/Web/Grand.Web/Commands/Handler/Products/SendProductEmailAFriendMessageCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Products/SendProductEmailAFriendMessageCommandHandler.cs
index ed66e6e1c..1b0727422 100644
--- a/src/Web/Grand.Web/Commands/Handler/Products/SendProductEmailAFriendMessageCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Products/SendProductEmailAFriendMessageCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Messages;
using Grand.SharedKernel.Extensions;
using Grand.Web.Commands.Models.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Products;
diff --git a/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs
index df6036c50..0a01f349a 100644
--- a/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Web.Commands.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.ShoppingCart;
public class SaveCheckoutAttributesCommandHandler : IRequestHandler<SaveCheckoutAttributesCommand, IList<CustomAttribute>>
diff --git a/src/Web/Grand.Web/Commands/Handler/Vendors/ContactVendorCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Vendors/ContactVendorCommandHandler.cs
index 4ad0d48fb..146dc5690 100644
--- a/src/Web/Grand.Web/Commands/Handler/Vendors/ContactVendorCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Vendors/ContactVendorCommandHandler.cs
@@ -5,7 +5,7 @@ using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
using Grand.Web.Commands.Models.Vendors;
using Grand.Web.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Vendors;
diff --git a/src/Web/Grand.Web/Commands/Handler/Vendors/InsertVendorReviewCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Vendors/InsertVendorReviewCommandHandler.cs
index 24fe5189f..5a211190f 100644
--- a/src/Web/Grand.Web/Commands/Handler/Vendors/InsertVendorReviewCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Vendors/InsertVendorReviewCommandHandler.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Vendors;
using Grand.Infrastructure;
using Grand.Web.Commands.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Vendors;
diff --git a/src/Web/Grand.Web/Commands/Handler/Vendors/SetVendorReviewHelpfulnessCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Vendors/SetVendorReviewHelpfulnessCommandHandler.cs
index e18c8f54d..32d6be8e9 100644
--- a/src/Web/Grand.Web/Commands/Handler/Vendors/SetVendorReviewHelpfulnessCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Vendors/SetVendorReviewHelpfulnessCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Vendors;
using Grand.Web.Commands.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Handler.Vendors;
diff --git a/src/Web/Grand.Web/Commands/Models/Blogs/InsertBlogCommentCommand.cs b/src/Web/Grand.Web/Commands/Models/Blogs/InsertBlogCommentCommand.cs
index 96c01f87a..1848da494 100644
--- a/src/Web/Grand.Web/Commands/Models/Blogs/InsertBlogCommentCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Blogs/InsertBlogCommentCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Blogs;
using Grand.Web.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Blogs;
diff --git a/src/Web/Grand.Web/Commands/Models/Contact/ContactAttributeChangeCommand.cs b/src/Web/Grand.Web/Commands/Models/Contact/ContactAttributeChangeCommand.cs
index 0c72b8ed1..398a6449a 100644
--- a/src/Web/Grand.Web/Commands/Models/Contact/ContactAttributeChangeCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Contact/ContactAttributeChangeCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Web.Common.Models;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Contact;
diff --git a/src/Web/Grand.Web/Commands/Models/Contact/ContactUsCommand.cs b/src/Web/Grand.Web/Commands/Models/Contact/ContactUsCommand.cs
index 47b03cbbc..f80dc1e92 100644
--- a/src/Web/Grand.Web/Commands/Models/Contact/ContactUsCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Contact/ContactUsCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Web.Models.Contact;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Contact;
diff --git a/src/Web/Grand.Web/Commands/Models/Contact/ContactUsSendCommand.cs b/src/Web/Grand.Web/Commands/Models/Contact/ContactUsSendCommand.cs
index 7f74be437..57e33054e 100644
--- a/src/Web/Grand.Web/Commands/Models/Contact/ContactUsSendCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Contact/ContactUsSendCommand.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Contact;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Contact;
diff --git a/src/Web/Grand.Web/Commands/Models/Courses/CourseLessonApprovedCommand.cs b/src/Web/Grand.Web/Commands/Models/Courses/CourseLessonApprovedCommand.cs
index 22a584276..d0ee07965 100644
--- a/src/Web/Grand.Web/Commands/Models/Courses/CourseLessonApprovedCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Courses/CourseLessonApprovedCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Courses;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Courses;
diff --git a/src/Web/Grand.Web/Commands/Models/Customers/CurrentPositionCommand.cs b/src/Web/Grand.Web/Commands/Models/Customers/CurrentPositionCommand.cs
index fd2ce5466..e77c1820a 100644
--- a/src/Web/Grand.Web/Commands/Models/Customers/CurrentPositionCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Customers/CurrentPositionCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Web.Models.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Customers;
diff --git a/src/Web/Grand.Web/Commands/Models/Customers/CustomerRegisteredCommand.cs b/src/Web/Grand.Web/Commands/Models/Customers/CustomerRegisteredCommand.cs
index 364800e76..c47d5ac0a 100644
--- a/src/Web/Grand.Web/Commands/Models/Customers/CustomerRegisteredCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Customers/CustomerRegisteredCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Customers;
diff --git a/src/Web/Grand.Web/Commands/Models/Customers/DeleteAccountCommand.cs b/src/Web/Grand.Web/Commands/Models/Customers/DeleteAccountCommand.cs
index 33040d4bd..7eae751cc 100644
--- a/src/Web/Grand.Web/Commands/Models/Customers/DeleteAccountCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Customers/DeleteAccountCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Customers;
diff --git a/src/Web/Grand.Web/Commands/Models/Customers/PasswordRecoverySendCommand.cs b/src/Web/Grand.Web/Commands/Models/Customers/PasswordRecoverySendCommand.cs
index a05506551..e53ffd43c 100644
--- a/src/Web/Grand.Web/Commands/Models/Customers/PasswordRecoverySendCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Customers/PasswordRecoverySendCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Customers;
diff --git a/src/Web/Grand.Web/Commands/Models/Customers/SubAccountAddCommand.cs b/src/Web/Grand.Web/Commands/Models/Customers/SubAccountAddCommand.cs
index 903a76ede..010e15d2c 100644
--- a/src/Web/Grand.Web/Commands/Models/Customers/SubAccountAddCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Customers/SubAccountAddCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Customers;
diff --git a/src/Web/Grand.Web/Commands/Models/Customers/SubAccountDeleteCommand.cs b/src/Web/Grand.Web/Commands/Models/Customers/SubAccountDeleteCommand.cs
index 960d4ad2f..1a8cc1d27 100644
--- a/src/Web/Grand.Web/Commands/Models/Customers/SubAccountDeleteCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Customers/SubAccountDeleteCommand.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Customers;
diff --git a/src/Web/Grand.Web/Commands/Models/Customers/SubAccountEditCommand.cs b/src/Web/Grand.Web/Commands/Models/Customers/SubAccountEditCommand.cs
index de42db97b..2dd63836f 100644
--- a/src/Web/Grand.Web/Commands/Models/Customers/SubAccountEditCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Customers/SubAccountEditCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Customers;
diff --git a/src/Web/Grand.Web/Commands/Models/Customers/UpdateCustomerInfoCommand.cs b/src/Web/Grand.Web/Commands/Models/Customers/UpdateCustomerInfoCommand.cs
index 103505c05..769bae340 100644
--- a/src/Web/Grand.Web/Commands/Models/Customers/UpdateCustomerInfoCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Customers/UpdateCustomerInfoCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Customers;
diff --git a/src/Web/Grand.Web/Commands/Models/News/InsertNewsCommentCommand.cs b/src/Web/Grand.Web/Commands/Models/News/InsertNewsCommentCommand.cs
index 39e535b84..0f1214fe1 100644
--- a/src/Web/Grand.Web/Commands/Models/News/InsertNewsCommentCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/News/InsertNewsCommentCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.News;
using Grand.Web.Models.News;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.News;
diff --git a/src/Web/Grand.Web/Commands/Models/Newsletter/SubscribeNewsletterCommand.cs b/src/Web/Grand.Web/Commands/Models/Newsletter/SubscribeNewsletterCommand.cs
index d5fd210f6..73d93598e 100644
--- a/src/Web/Grand.Web/Commands/Models/Newsletter/SubscribeNewsletterCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Newsletter/SubscribeNewsletterCommand.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Newsletter;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Newsletter;
diff --git a/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionActivationCommand.cs b/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionActivationCommand.cs
index fce72069b..1d64a38be 100644
--- a/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionActivationCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionActivationCommand.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Newsletter;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Newsletter;
diff --git a/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionCategoryCommand.cs b/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionCategoryCommand.cs
index 33f4d63ef..891d3cfac 100644
--- a/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionCategoryCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionCategoryCommand.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Newsletter;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Newsletter;
diff --git a/src/Web/Grand.Web/Commands/Models/Orders/InsertOrderNoteCommand.cs b/src/Web/Grand.Web/Commands/Models/Orders/InsertOrderNoteCommand.cs
index 1cf87eb6e..423c0477f 100644
--- a/src/Web/Grand.Web/Commands/Models/Orders/InsertOrderNoteCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Orders/InsertOrderNoteCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Orders;
diff --git a/src/Web/Grand.Web/Commands/Models/Orders/MerchandiseReturnSubmitCommand.cs b/src/Web/Grand.Web/Commands/Models/Orders/MerchandiseReturnSubmitCommand.cs
index 6e3255004..b9573c79b 100644
--- a/src/Web/Grand.Web/Commands/Models/Orders/MerchandiseReturnSubmitCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Orders/MerchandiseReturnSubmitCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Common;
using Grand.Domain.Orders;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Orders;
diff --git a/src/Web/Grand.Web/Commands/Models/Products/InsertProductReviewCommand.cs b/src/Web/Grand.Web/Commands/Models/Products/InsertProductReviewCommand.cs
index f08ae9a04..02c723b8c 100644
--- a/src/Web/Grand.Web/Commands/Models/Products/InsertProductReviewCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Products/InsertProductReviewCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Products;
diff --git a/src/Web/Grand.Web/Commands/Models/Products/SendProductAskQuestionMessageCommand.cs b/src/Web/Grand.Web/Commands/Models/Products/SendProductAskQuestionMessageCommand.cs
index 9a8d56a3d..723807d45 100644
--- a/src/Web/Grand.Web/Commands/Models/Products/SendProductAskQuestionMessageCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Products/SendProductAskQuestionMessageCommand.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Products;
diff --git a/src/Web/Grand.Web/Commands/Models/Products/SendProductEmailAFriendMessageCommand.cs b/src/Web/Grand.Web/Commands/Models/Products/SendProductEmailAFriendMessageCommand.cs
index f64173c09..2716b1252 100644
--- a/src/Web/Grand.Web/Commands/Models/Products/SendProductEmailAFriendMessageCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Products/SendProductEmailAFriendMessageCommand.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Products;
diff --git a/src/Web/Grand.Web/Commands/Models/ShoppingCart/SaveCheckoutAttributesCommand.cs b/src/Web/Grand.Web/Commands/Models/ShoppingCart/SaveCheckoutAttributesCommand.cs
index 3083f6eff..729fd47f4 100644
--- a/src/Web/Grand.Web/Commands/Models/ShoppingCart/SaveCheckoutAttributesCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/ShoppingCart/SaveCheckoutAttributesCommand.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Common.Models;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Commands/Models/Vendors/ContactVendorSendCommand.cs b/src/Web/Grand.Web/Commands/Models/Vendors/ContactVendorSendCommand.cs
index 47df125c5..af3d20e5c 100644
--- a/src/Web/Grand.Web/Commands/Models/Vendors/ContactVendorSendCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Vendors/ContactVendorSendCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Stores;
using Grand.Web.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Vendors;
diff --git a/src/Web/Grand.Web/Commands/Models/Vendors/InsertVendorReviewCommand.cs b/src/Web/Grand.Web/Commands/Models/Vendors/InsertVendorReviewCommand.cs
index 96f639e91..e8c5e6c26 100644
--- a/src/Web/Grand.Web/Commands/Models/Vendors/InsertVendorReviewCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Vendors/InsertVendorReviewCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
using Grand.Web.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Vendors;
diff --git a/src/Web/Grand.Web/Commands/Models/Vendors/SetVendorReviewHelpfulnessCommand.cs b/src/Web/Grand.Web/Commands/Models/Vendors/SetVendorReviewHelpfulnessCommand.cs
index 10d3b33b9..00785c399 100644
--- a/src/Web/Grand.Web/Commands/Models/Vendors/SetVendorReviewHelpfulnessCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Vendors/SetVendorReviewHelpfulnessCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Commands.Models.Vendors;
diff --git a/src/Web/Grand.Web/Components/BlogCategories.cs b/src/Web/Grand.Web/Components/BlogCategories.cs
index b12c1c2a5..0a7afe87e 100644
--- a/src/Web/Grand.Web/Components/BlogCategories.cs
+++ b/src/Web/Grand.Web/Components/BlogCategories.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Blogs;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/BlogMonths.cs b/src/Web/Grand.Web/Components/BlogMonths.cs
index 3f582b175..44b508f6a 100644
--- a/src/Web/Grand.Web/Components/BlogMonths.cs
+++ b/src/Web/Grand.Web/Components/BlogMonths.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Blogs;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/BlogPostProducts.cs b/src/Web/Grand.Web/Components/BlogPostProducts.cs
index 28453589e..f27d51166 100644
--- a/src/Web/Grand.Web/Components/BlogPostProducts.cs
+++ b/src/Web/Grand.Web/Components/BlogPostProducts.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Cms;
using Grand.Domain.Catalog;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/BlogTags.cs b/src/Web/Grand.Web/Components/BlogTags.cs
index 96c36f52b..c22f80fa3 100644
--- a/src/Web/Grand.Web/Components/BlogTags.cs
+++ b/src/Web/Grand.Web/Components/BlogTags.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Blogs;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/CategoryFeaturedProducts.cs b/src/Web/Grand.Web/Components/CategoryFeaturedProducts.cs
index 0c0313747..ab8fb5e65 100644
--- a/src/Web/Grand.Web/Components/CategoryFeaturedProducts.cs
+++ b/src/Web/Grand.Web/Components/CategoryFeaturedProducts.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/CategoryNavigation.cs b/src/Web/Grand.Web/Components/CategoryNavigation.cs
index 25060bdf3..309cda7ad 100644
--- a/src/Web/Grand.Web/Components/CategoryNavigation.cs
+++ b/src/Web/Grand.Web/Components/CategoryNavigation.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/CollectionFeaturedProducts.cs b/src/Web/Grand.Web/Components/CollectionFeaturedProducts.cs
index f673bca78..c57c37373 100644
--- a/src/Web/Grand.Web/Components/CollectionFeaturedProducts.cs
+++ b/src/Web/Grand.Web/Components/CollectionFeaturedProducts.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/CollectionNavigation.cs b/src/Web/Grand.Web/Components/CollectionNavigation.cs
index 834ddf046..9c838284a 100644
--- a/src/Web/Grand.Web/Components/CollectionNavigation.cs
+++ b/src/Web/Grand.Web/Components/CollectionNavigation.cs
@@ -2,7 +2,7 @@
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/CrossSellProducts.cs b/src/Web/Grand.Web/Components/CrossSellProducts.cs
index 529449782..60944daa6 100644
--- a/src/Web/Grand.Web/Components/CrossSellProducts.cs
+++ b/src/Web/Grand.Web/Components/CrossSellProducts.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Orders;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/CustomerNavigation.cs b/src/Web/Grand.Web/Components/CustomerNavigation.cs
index be55f32c0..6959b525a 100644
--- a/src/Web/Grand.Web/Components/CustomerNavigation.cs
+++ b/src/Web/Grand.Web/Components/CustomerNavigation.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Customers;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/CustomerRecommendedProducts.cs b/src/Web/Grand.Web/Components/CustomerRecommendedProducts.cs
index ead1f492b..845b420cc 100644
--- a/src/Web/Grand.Web/Components/CustomerRecommendedProducts.cs
+++ b/src/Web/Grand.Web/Components/CustomerRecommendedProducts.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/EstimateShipping.cs b/src/Web/Grand.Web/Components/EstimateShipping.cs
index 882fad957..a718f516e 100644
--- a/src/Web/Grand.Web/Components/EstimateShipping.cs
+++ b/src/Web/Grand.Web/Components/EstimateShipping.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Orders;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/HomePageBestSellers.cs b/src/Web/Grand.Web/Components/HomePageBestSellers.cs
index faf8abc38..aa370725e 100644
--- a/src/Web/Grand.Web/Components/HomePageBestSellers.cs
+++ b/src/Web/Grand.Web/Components/HomePageBestSellers.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Common.Components;
using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/HomePageBlog.cs b/src/Web/Grand.Web/Components/HomePageBlog.cs
index 17fff467b..b04d82386 100644
--- a/src/Web/Grand.Web/Components/HomePageBlog.cs
+++ b/src/Web/Grand.Web/Components/HomePageBlog.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Blogs;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/HomePageBrands.cs b/src/Web/Grand.Web/Components/HomePageBrands.cs
index acef2075a..00aae1fbe 100644
--- a/src/Web/Grand.Web/Components/HomePageBrands.cs
+++ b/src/Web/Grand.Web/Components/HomePageBrands.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/HomePageCategories.cs b/src/Web/Grand.Web/Components/HomePageCategories.cs
index 753a4a525..0ac01e67a 100644
--- a/src/Web/Grand.Web/Components/HomePageCategories.cs
+++ b/src/Web/Grand.Web/Components/HomePageCategories.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/HomePageCollections.cs b/src/Web/Grand.Web/Components/HomePageCollections.cs
index 3d53f13b7..291285a15 100644
--- a/src/Web/Grand.Web/Components/HomePageCollections.cs
+++ b/src/Web/Grand.Web/Components/HomePageCollections.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/HomePageNewProducts.cs b/src/Web/Grand.Web/Components/HomePageNewProducts.cs
index bb447cc3a..a4f97a879 100644
--- a/src/Web/Grand.Web/Components/HomePageNewProducts.cs
+++ b/src/Web/Grand.Web/Components/HomePageNewProducts.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/HomePageNews.cs b/src/Web/Grand.Web/Components/HomePageNews.cs
index 3c6f59552..b7440a794 100644
--- a/src/Web/Grand.Web/Components/HomePageNews.cs
+++ b/src/Web/Grand.Web/Components/HomePageNews.cs
@@ -1,7 +1,7 @@
using Grand.Domain.News;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.News;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/HomePageProducts.cs b/src/Web/Grand.Web/Components/HomePageProducts.cs
index 3982a0455..8dc02c759 100644
--- a/src/Web/Grand.Web/Components/HomePageProducts.cs
+++ b/src/Web/Grand.Web/Components/HomePageProducts.cs
@@ -4,7 +4,7 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Common.Components;
using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/Menu.cs b/src/Web/Grand.Web/Components/Menu.cs
index 31c435c5f..9fdee0708 100644
--- a/src/Web/Grand.Web/Components/Menu.cs
+++ b/src/Web/Grand.Web/Components/Menu.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Permissions;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/PageBlock.cs b/src/Web/Grand.Web/Components/PageBlock.cs
index d6f02619f..944d634a7 100644
--- a/src/Web/Grand.Web/Components/PageBlock.cs
+++ b/src/Web/Grand.Web/Components/PageBlock.cs
@@ -1,6 +1,6 @@
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Pages;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/PersonalizedProducts.cs b/src/Web/Grand.Web/Components/PersonalizedProducts.cs
index 81f9e5da0..ad01ad3ac 100644
--- a/src/Web/Grand.Web/Components/PersonalizedProducts.cs
+++ b/src/Web/Grand.Web/Components/PersonalizedProducts.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/PopularProductTags.cs b/src/Web/Grand.Web/Components/PopularProductTags.cs
index eace15d1e..f53a5ddff 100644
--- a/src/Web/Grand.Web/Components/PopularProductTags.cs
+++ b/src/Web/Grand.Web/Components/PopularProductTags.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/ProductReviews.cs b/src/Web/Grand.Web/Components/ProductReviews.cs
index db4c6e15f..a47109d29 100644
--- a/src/Web/Grand.Web/Components/ProductReviews.cs
+++ b/src/Web/Grand.Web/Components/ProductReviews.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/ProductsAlsoPurchased.cs b/src/Web/Grand.Web/Components/ProductsAlsoPurchased.cs
index 49309d9fa..4d2fd13e2 100644
--- a/src/Web/Grand.Web/Components/ProductsAlsoPurchased.cs
+++ b/src/Web/Grand.Web/Components/ProductsAlsoPurchased.cs
@@ -6,7 +6,7 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Common.Components;
using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/RecentlyViewedProductsBlock.cs b/src/Web/Grand.Web/Components/RecentlyViewedProductsBlock.cs
index 3c25e3505..ecec6506e 100644
--- a/src/Web/Grand.Web/Components/RecentlyViewedProductsBlock.cs
+++ b/src/Web/Grand.Web/Components/RecentlyViewedProductsBlock.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/RecommendedProducts.cs b/src/Web/Grand.Web/Components/RecommendedProducts.cs
index 9af35dddd..9c5a32639 100644
--- a/src/Web/Grand.Web/Components/RecommendedProducts.cs
+++ b/src/Web/Grand.Web/Components/RecommendedProducts.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Catalog;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/RelatedProducts.cs b/src/Web/Grand.Web/Components/RelatedProducts.cs
index 9641f7543..139ecd33f 100644
--- a/src/Web/Grand.Web/Components/RelatedProducts.cs
+++ b/src/Web/Grand.Web/Components/RelatedProducts.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Catalog;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/SearchBox.cs b/src/Web/Grand.Web/Components/SearchBox.cs
index 2d8d05c35..1a010bba4 100644
--- a/src/Web/Grand.Web/Components/SearchBox.cs
+++ b/src/Web/Grand.Web/Components/SearchBox.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/SimilarProducts.cs b/src/Web/Grand.Web/Components/SimilarProducts.cs
index ce6ea4cda..75f013a01 100644
--- a/src/Web/Grand.Web/Components/SimilarProducts.cs
+++ b/src/Web/Grand.Web/Components/SimilarProducts.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Catalog;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/SuggestedProducts.cs b/src/Web/Grand.Web/Components/SuggestedProducts.cs
index 3db0d9134..0953f7de9 100644
--- a/src/Web/Grand.Web/Components/SuggestedProducts.cs
+++ b/src/Web/Grand.Web/Components/SuggestedProducts.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/VendorNavigation.cs b/src/Web/Grand.Web/Components/VendorNavigation.cs
index 7c5eeb33b..3ce156de7 100644
--- a/src/Web/Grand.Web/Components/VendorNavigation.cs
+++ b/src/Web/Grand.Web/Components/VendorNavigation.cs
@@ -2,7 +2,7 @@
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Components/VendorReviews.cs b/src/Web/Grand.Web/Components/VendorReviews.cs
index 5e2421ebc..fae68d479 100644
--- a/src/Web/Grand.Web/Components/VendorReviews.cs
+++ b/src/Web/Grand.Web/Components/VendorReviews.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Vendors;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Components;
diff --git a/src/Web/Grand.Web/Controllers/AccountController.cs b/src/Web/Grand.Web/Controllers/AccountController.cs
index 683cfe44e..3317f5fcc 100644
--- a/src/Web/Grand.Web/Controllers/AccountController.cs
+++ b/src/Web/Grand.Web/Controllers/AccountController.cs
@@ -23,7 +23,7 @@ using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Common;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Controllers;
diff --git a/src/Web/Grand.Web/Controllers/ActionCartController.cs b/src/Web/Grand.Web/Controllers/ActionCartController.cs
index a82a44923..0ecb50ebc 100644
--- a/src/Web/Grand.Web/Controllers/ActionCartController.cs
+++ b/src/Web/Grand.Web/Controllers/ActionCartController.cs
@@ -15,7 +15,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.Products;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using System.Globalization;
diff --git a/src/Web/Grand.Web/Controllers/BlogController.cs b/src/Web/Grand.Web/Controllers/BlogController.cs
index 083bcf71e..e1d9ffe06 100644
--- a/src/Web/Grand.Web/Controllers/BlogController.cs
+++ b/src/Web/Grand.Web/Controllers/BlogController.cs
@@ -12,7 +12,7 @@ using Grand.Web.Common.Filters;
using Grand.Web.Events;
using Grand.Web.Features.Models.Blogs;
using Grand.Web.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Grand.SharedKernel.Attributes;
diff --git a/src/Web/Grand.Web/Controllers/CatalogController.cs b/src/Web/Grand.Web/Controllers/CatalogController.cs
index 953f1b310..e9b1b1b93 100644
--- a/src/Web/Grand.Web/Controllers/CatalogController.cs
+++ b/src/Web/Grand.Web/Controllers/CatalogController.cs
@@ -18,7 +18,7 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Vendors;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Grand.SharedKernel.Attributes;
diff --git a/src/Web/Grand.Web/Controllers/CheckoutController.cs b/src/Web/Grand.Web/Controllers/CheckoutController.cs
index 435758473..bb3746636 100644
--- a/src/Web/Grand.Web/Controllers/CheckoutController.cs
+++ b/src/Web/Grand.Web/Controllers/CheckoutController.cs
@@ -23,7 +23,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.Checkout;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ModelBinding;
diff --git a/src/Web/Grand.Web/Controllers/CommonController.cs b/src/Web/Grand.Web/Controllers/CommonController.cs
index 8b385a0d5..43ed98a57 100644
--- a/src/Web/Grand.Web/Controllers/CommonController.cs
+++ b/src/Web/Grand.Web/Controllers/CommonController.cs
@@ -21,7 +21,7 @@ using Grand.Web.Common.Themes;
using Grand.Web.Events;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System.Net;
diff --git a/src/Web/Grand.Web/Controllers/ContactController.cs b/src/Web/Grand.Web/Controllers/ContactController.cs
index 206ebc5ef..9f0f9c956 100644
--- a/src/Web/Grand.Web/Controllers/ContactController.cs
+++ b/src/Web/Grand.Web/Controllers/ContactController.cs
@@ -14,7 +14,7 @@ using Grand.Web.Common.Extensions;
using Grand.Web.Common.Filters;
using Grand.Web.Events;
using Grand.Web.Models.Contact;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Controllers;
diff --git a/src/Web/Grand.Web/Controllers/CountryController.cs b/src/Web/Grand.Web/Controllers/CountryController.cs
index 36129eaa1..a01ac7285 100644
--- a/src/Web/Grand.Web/Controllers/CountryController.cs
+++ b/src/Web/Grand.Web/Controllers/CountryController.cs
@@ -4,7 +4,7 @@ using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Controllers;
diff --git a/src/Web/Grand.Web/Controllers/CourseController.cs b/src/Web/Grand.Web/Controllers/CourseController.cs
index ec9d45c2b..9d96de0e3 100644
--- a/src/Web/Grand.Web/Controllers/CourseController.cs
+++ b/src/Web/Grand.Web/Controllers/CourseController.cs
@@ -10,7 +10,7 @@ using Grand.Infrastructure;
using Grand.Web.Commands.Models.Courses;
using Grand.Web.Common.Controllers;
using Grand.Web.Features.Models.Courses;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Grand.SharedKernel.Attributes;
diff --git a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs
index 61e0fd2a8..3d57264db 100644
--- a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs
+++ b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs
@@ -14,7 +14,7 @@ using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Common;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Controllers;
diff --git a/src/Web/Grand.Web/Controllers/NewsController.cs b/src/Web/Grand.Web/Controllers/NewsController.cs
index 2b7694469..936c695fd 100644
--- a/src/Web/Grand.Web/Controllers/NewsController.cs
+++ b/src/Web/Grand.Web/Controllers/NewsController.cs
@@ -12,7 +12,7 @@ using Grand.Web.Common.Filters;
using Grand.Web.Events;
using Grand.Web.Features.Models.News;
using Grand.Web.Models.News;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Grand.SharedKernel.Attributes;
diff --git a/src/Web/Grand.Web/Controllers/NewsletterController.cs b/src/Web/Grand.Web/Controllers/NewsletterController.cs
index 8a8077185..53c3c16d3 100644
--- a/src/Web/Grand.Web/Controllers/NewsletterController.cs
+++ b/src/Web/Grand.Web/Controllers/NewsletterController.cs
@@ -3,7 +3,7 @@ using Grand.Web.Commands.Models.Newsletter;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Web.Models.Newsletter;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Controllers;
diff --git a/src/Web/Grand.Web/Controllers/OrderController.cs b/src/Web/Grand.Web/Controllers/OrderController.cs
index 647be5489..9e4cf9c13 100644
--- a/src/Web/Grand.Web/Controllers/OrderController.cs
+++ b/src/Web/Grand.Web/Controllers/OrderController.cs
@@ -20,7 +20,7 @@ using Grand.Web.Events;
using Grand.Web.Extensions;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Controllers;
diff --git a/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs b/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs
index 3e54c6ed8..0e0d8ed20 100644
--- a/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs
+++ b/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs
@@ -11,7 +11,7 @@ using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Controllers;
diff --git a/src/Web/Grand.Web/Controllers/PageController.cs b/src/Web/Grand.Web/Controllers/PageController.cs
index 921699cfc..47555e519 100644
--- a/src/Web/Grand.Web/Controllers/PageController.cs
+++ b/src/Web/Grand.Web/Controllers/PageController.cs
@@ -6,7 +6,7 @@ using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Web.Features.Models.Pages;
using Grand.Web.Models.Pages;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Controllers;
diff --git a/src/Web/Grand.Web/Controllers/ProductController.cs b/src/Web/Grand.Web/Controllers/ProductController.cs
index d751d31c3..c78d5f150 100644
--- a/src/Web/Grand.Web/Controllers/ProductController.cs
+++ b/src/Web/Grand.Web/Controllers/ProductController.cs
@@ -21,7 +21,7 @@ using Grand.Web.Events;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Grand.SharedKernel.Attributes;
using Grand.SharedKernel.Extensions;
diff --git a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs b/src/Web/Grand.Web/Controllers/ShoppingCartController.cs
index e1fc0fd35..07baa8ad1 100644
--- a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs
+++ b/src/Web/Grand.Web/Controllers/ShoppingCartController.cs
@@ -21,7 +21,7 @@ using Grand.Web.Common.Extensions;
using Grand.Web.Common.Filters;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
using Grand.SharedKernel.Extensions;
diff --git a/src/Web/Grand.Web/Controllers/VendorController.cs b/src/Web/Grand.Web/Controllers/VendorController.cs
index 7f2c04cf2..929b92e4c 100644
--- a/src/Web/Grand.Web/Controllers/VendorController.cs
+++ b/src/Web/Grand.Web/Controllers/VendorController.cs
@@ -19,7 +19,7 @@ using Grand.Web.Common.Security.Captcha;
using Grand.Web.Extensions;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Controllers;
diff --git a/src/Web/Grand.Web/Controllers/WishlistController.cs b/src/Web/Grand.Web/Controllers/WishlistController.cs
index 9965c0485..5afe8ecc0 100644
--- a/src/Web/Grand.Web/Controllers/WishlistController.cs
+++ b/src/Web/Grand.Web/Controllers/WishlistController.cs
@@ -14,7 +14,7 @@ using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Controllers;
diff --git a/src/Web/Grand.Web/Events/BlogCommentEvent.cs b/src/Web/Grand.Web/Events/BlogCommentEvent.cs
index d622602b0..9f74959b1 100644
--- a/src/Web/Grand.Web/Events/BlogCommentEvent.cs
+++ b/src/Web/Grand.Web/Events/BlogCommentEvent.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Blogs;
using Grand.Web.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events;
diff --git a/src/Web/Grand.Web/Events/Cache/BlogCategoryNotificatioHandler.cs b/src/Web/Grand.Web/Events/Cache/BlogCategoryNotificatioHandler.cs
index 2b98455b2..3bed29bb8 100644
--- a/src/Web/Grand.Web/Events/Cache/BlogCategoryNotificatioHandler.cs
+++ b/src/Web/Grand.Web/Events/Cache/BlogCategoryNotificatioHandler.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Blogs;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events.Cache;
diff --git a/src/Web/Grand.Web/Events/Cache/BlogPostNotificatioHandler.cs b/src/Web/Grand.Web/Events/Cache/BlogPostNotificatioHandler.cs
index 9f9b28006..d956cf28a 100644
--- a/src/Web/Grand.Web/Events/Cache/BlogPostNotificatioHandler.cs
+++ b/src/Web/Grand.Web/Events/Cache/BlogPostNotificatioHandler.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Blogs;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events.Cache;
diff --git a/src/Web/Grand.Web/Events/Cache/NewsItemNotificatioHandler.cs b/src/Web/Grand.Web/Events/Cache/NewsItemNotificatioHandler.cs
index d7ee3a088..f57487a52 100644
--- a/src/Web/Grand.Web/Events/Cache/NewsItemNotificatioHandler.cs
+++ b/src/Web/Grand.Web/Events/Cache/NewsItemNotificatioHandler.cs
@@ -1,7 +1,7 @@
using Grand.Domain.News;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events.Cache;
diff --git a/src/Web/Grand.Web/Events/Cache/VendorNotificatioHandler.cs b/src/Web/Grand.Web/Events/Cache/VendorNotificatioHandler.cs
index 73d830dbc..5bcaeacaa 100644
--- a/src/Web/Grand.Web/Events/Cache/VendorNotificatioHandler.cs
+++ b/src/Web/Grand.Web/Events/Cache/VendorNotificatioHandler.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Events;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events.Cache;
diff --git a/src/Web/Grand.Web/Events/ChangeCurrencyEvent.cs b/src/Web/Grand.Web/Events/ChangeCurrencyEvent.cs
index 5897bfa31..f4deabff3 100644
--- a/src/Web/Grand.Web/Events/ChangeCurrencyEvent.cs
+++ b/src/Web/Grand.Web/Events/ChangeCurrencyEvent.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Directory;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events;
diff --git a/src/Web/Grand.Web/Events/ChangeLanguageEvent.cs b/src/Web/Grand.Web/Events/ChangeLanguageEvent.cs
index b9f345148..819b6a7b3 100644
--- a/src/Web/Grand.Web/Events/ChangeLanguageEvent.cs
+++ b/src/Web/Grand.Web/Events/ChangeLanguageEvent.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Localization;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events;
diff --git a/src/Web/Grand.Web/Events/ChangeStoreEvent.cs b/src/Web/Grand.Web/Events/ChangeStoreEvent.cs
index c03e6e90d..e37128329 100644
--- a/src/Web/Grand.Web/Events/ChangeStoreEvent.cs
+++ b/src/Web/Grand.Web/Events/ChangeStoreEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events;
diff --git a/src/Web/Grand.Web/Events/ChangeTaxTypeEvent.cs b/src/Web/Grand.Web/Events/ChangeTaxTypeEvent.cs
index 96fee7730..77249c48e 100644
--- a/src/Web/Grand.Web/Events/ChangeTaxTypeEvent.cs
+++ b/src/Web/Grand.Web/Events/ChangeTaxTypeEvent.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Tax;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events;
diff --git a/src/Web/Grand.Web/Events/ChangeThemeEvent.cs b/src/Web/Grand.Web/Events/ChangeThemeEvent.cs
index 29c9b1dea..97a6f1c39 100644
--- a/src/Web/Grand.Web/Events/ChangeThemeEvent.cs
+++ b/src/Web/Grand.Web/Events/ChangeThemeEvent.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events;
diff --git a/src/Web/Grand.Web/Events/ContactUsEvent.cs b/src/Web/Grand.Web/Events/ContactUsEvent.cs
index ae8e0425b..613f8d821 100644
--- a/src/Web/Grand.Web/Events/ContactUsEvent.cs
+++ b/src/Web/Grand.Web/Events/ContactUsEvent.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Web.Models.Contact;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events;
diff --git a/src/Web/Grand.Web/Events/NewsCommentEvent.cs b/src/Web/Grand.Web/Events/NewsCommentEvent.cs
index 4689c482f..c2c358001 100644
--- a/src/Web/Grand.Web/Events/NewsCommentEvent.cs
+++ b/src/Web/Grand.Web/Events/NewsCommentEvent.cs
@@ -1,6 +1,6 @@
using Grand.Domain.News;
using Grand.Web.Models.News;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events;
diff --git a/src/Web/Grand.Web/Events/OrderNoteEvent.cs b/src/Web/Grand.Web/Events/OrderNoteEvent.cs
index eb20a500d..3a3947163 100644
--- a/src/Web/Grand.Web/Events/OrderNoteEvent.cs
+++ b/src/Web/Grand.Web/Events/OrderNoteEvent.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Orders;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events;
diff --git a/src/Web/Grand.Web/Events/ProductReviewEvent.cs b/src/Web/Grand.Web/Events/ProductReviewEvent.cs
index aeb100249..60d3eaf50 100644
--- a/src/Web/Grand.Web/Events/ProductReviewEvent.cs
+++ b/src/Web/Grand.Web/Events/ProductReviewEvent.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Events;
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostCategoryHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostCategoryHandler.cs
index 725d5ef60..23e407920 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostCategoryHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostCategoryHandler.cs
@@ -5,7 +5,7 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Blogs;
using Grand.Web.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Blogs;
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs
index 93a84f808..b13f2aab5 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs
@@ -12,7 +12,7 @@ using Grand.Infrastructure;
using Grand.Web.Features.Models.Blogs;
using Grand.Web.Models.Blogs;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Blogs;
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
index e73e56fda..7bb767361 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
@@ -10,7 +10,7 @@ using Grand.Infrastructure;
using Grand.Web.Features.Models.Blogs;
using Grand.Web.Models.Blogs;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Blogs;
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostTagListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostTagListHandler.cs
index 643cff7d3..de8fc2985 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostTagListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostTagListHandler.cs
@@ -5,7 +5,7 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Blogs;
using Grand.Web.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Blogs;
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostYearHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostYearHandler.cs
index a5262487d..ee624d976 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostYearHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostYearHandler.cs
@@ -5,7 +5,7 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Blogs;
using Grand.Web.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Blogs;
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs
index fed1088f6..fa8453a79 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs
@@ -11,7 +11,7 @@ using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Blogs;
using Grand.Web.Models.Blogs;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Blogs;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs
index b21429556..f99800fd1 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs
@@ -8,7 +8,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandHandler.cs
index 8e3db89ef..ab7802782 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandHandler.cs
@@ -5,7 +5,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http.Extensions;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandLayoutViewPathHandler.cs
index 7b2aa38f2..5b73f2610 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandLayoutViewPathHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Catalog.Brands;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryAllHandler.cs
index 55336e6f7..125b5a10f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryAllHandler.cs
@@ -8,7 +8,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs
index 749f048b0..404986e42 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs
@@ -14,7 +14,7 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs
index 9d708c7b0..88615fd48 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs
@@ -15,7 +15,7 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http.Extensions;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryLayoutViewPathHandler.cs
index f1127ea08..01faf0b3f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryLayoutViewPathHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryNavigationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryNavigationHandler.cs
index 26d604c78..85c34dd2d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryNavigationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryNavigationHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategorySimpleHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategorySimpleHandler.cs
index 241b28ee8..c20d4560b 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategorySimpleHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategorySimpleHandler.cs
@@ -10,7 +10,7 @@ using Grand.Infrastructure.Configuration;
using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetChildCategoryIdsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetChildCategoryIdsHandler.cs
index dced2ca90..5b50bbc1f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetChildCategoryIdsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetChildCategoryIdsHandler.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs
index 082f4937c..75bdf8e9b 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs
@@ -8,7 +8,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs
index 28bff30fd..810727fe6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs
@@ -14,7 +14,7 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionHandler.cs
index c1ede9e07..3687d1bc5 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionHandler.cs
@@ -9,7 +9,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http.Extensions;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionLayoutViewPathHandler.cs
index f46860e60..17e07e7aa 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionLayoutViewPathHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionNavigationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionNavigationHandler.cs
index 30f078098..df5254db4 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionNavigationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionNavigationHandler.cs
@@ -6,7 +6,7 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCompareProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCompareProductsHandler.cs
index fe075d9cb..d904bfe6d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCompareProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCompareProductsHandler.cs
@@ -6,7 +6,7 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetFormatBasePriceHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetFormatBasePriceHandler.cs
index 1b3b748d7..255e386ab 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetFormatBasePriceHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetFormatBasePriceHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Catalog.Prices;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageBrandsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageBrandsHandler.cs
index 8b61054bc..81fb2b4a7 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageBrandsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageBrandsHandler.cs
@@ -8,7 +8,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs
index 2a0cab052..bcea87513 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs
@@ -10,7 +10,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCollectionsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCollectionsHandler.cs
index a21f93779..be8e0c12c 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCollectionsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCollectionsHandler.cs
@@ -8,7 +8,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetMenuHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetMenuHandler.cs
index 2e2b267af..34c7ff2d3 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetMenuHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetMenuHandler.cs
@@ -14,7 +14,7 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetPopularProductTagsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetPopularProductTagsHandler.cs
index 09c226ff7..2a1b658dd 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetPopularProductTagsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetPopularProductTagsHandler.cs
@@ -5,7 +5,7 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductAttributeHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductAttributeHandler.cs
index 1140b374a..3ea294cf3 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductAttributeHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductAttributeHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using Grand.Web.Features.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductTagsAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductTagsAllHandler.cs
index 5ca803df4..1ca59a8dc 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductTagsAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductTagsAllHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductsByTagHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductsByTagHandler.cs
index 13af4d068..cd55f14a5 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductsByTagHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductsByTagHandler.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Catalog;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
index d87498018..a58f1b49c 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
@@ -18,7 +18,7 @@ using Grand.Infrastructure.Configuration;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchBoxHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchBoxHandler.cs
index a346061b9..2a9bd5ad0 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchBoxHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchBoxHandler.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchHandler.cs
index b96426dd0..d77864c19 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchHandler.cs
@@ -16,7 +16,7 @@ using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.AspNetCore.Mvc.Rendering;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorAllHandler.cs
index fc567edb6..d6791d712 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorAllHandler.cs
@@ -9,7 +9,7 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorHandler.cs
index cff9f763c..2b65bb006 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorHandler.cs
@@ -12,7 +12,7 @@ using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http.Extensions;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorNavigationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorNavigationHandler.cs
index b7eb6ba57..4b13b4240 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorNavigationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorNavigationHandler.cs
@@ -5,7 +5,7 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs
index e51db69e2..84e285c85 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs
@@ -4,7 +4,7 @@ using Grand.Infrastructure.Extensions;
using Grand.Web.Common.Localization;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.AspNetCore.Mvc.Rendering;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
index bf7882b87..80771d502 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Common;
using Grand.Web.Features.Models.Checkout;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Checkout;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetConfirmOrderHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetConfirmOrderHandler.cs
index f7e84c120..4ae07890d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetConfirmOrderHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetConfirmOrderHandler.cs
@@ -9,7 +9,7 @@ using Grand.Web.Features.Models.Checkout;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Checkout;
using Grand.Web.Models.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Checkout;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetIsPaymentWorkflowRequiredHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetIsPaymentWorkflowRequiredHandler.cs
index 1aa4a5448..45a14863a 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetIsPaymentWorkflowRequiredHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetIsPaymentWorkflowRequiredHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Payments;
using Grand.Web.Features.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Checkout;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetMinOrderPlaceIntervalValidHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetMinOrderPlaceIntervalValidHandler.cs
index a9be6c54c..2d03cbd23 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetMinOrderPlaceIntervalValidHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetMinOrderPlaceIntervalValidHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Web.Features.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Checkout;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentInfoHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentInfoHandler.cs
index eec232dbb..d517b3787 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentInfoHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentInfoHandler.cs
@@ -1,6 +1,6 @@
using Grand.Web.Features.Models.Checkout;
using Grand.Web.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Checkout;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentMethodHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentMethodHandler.cs
index b781f736e..37ae97c59 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentMethodHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentMethodHandler.cs
@@ -10,7 +10,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Web.Features.Models.Checkout;
using Grand.Web.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Checkout;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
index dd7d47f35..9f7bb660a 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
@@ -9,7 +9,7 @@ using Grand.Domain.Shipping;
using Grand.Web.Features.Models.Checkout;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Checkout;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingMethodHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingMethodHandler.cs
index a40562637..c890deeae 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingMethodHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingMethodHandler.cs
@@ -8,7 +8,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Shipping;
using Grand.Web.Features.Models.Checkout;
using Grand.Web.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Checkout;
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs
index 66a7e8bca..ec07a4ae3 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs
@@ -9,7 +9,7 @@ using Grand.Domain.Directory;
using Grand.Domain.Localization;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Common;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.Features.Handlers.Common;
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetParseCustomAddressAttributesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetParseCustomAddressAttributesHandler.cs
index 933b38933..90c64d10d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetParseCustomAddressAttributesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetParseCustomAddressAttributesHandler.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Infrastructure;
using Grand.Web.Features.Models.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Common;
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetPrivacyPreferenceModelHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetPrivacyPreferenceModelHandler.cs
index a76ae5936..0c061a277 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetPrivacyPreferenceModelHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetPrivacyPreferenceModelHandler.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Common;
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs
index 12a70cb20..ae8c77169 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Cms;
using Grand.Web.Features.Models.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Common;
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs
index fcbf06616..9ec7f376b 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs
@@ -17,7 +17,7 @@ using Grand.Web.Models.Catalog;
using Grand.Web.Models.Common;
using Grand.Web.Models.Knowledgebase;
using Grand.Web.Models.Pages;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Common;
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs
index 368ceefa5..a5195acd1 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Common;
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs
index 0d2d30d80..a5a50e705 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Directory;
using Grand.Domain.Vendors;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.Features.Handlers.Common;
diff --git a/src/Web/Grand.Web/Features/Handlers/Courses/GetCheckOrderHandler.cs b/src/Web/Grand.Web/Features/Handlers/Courses/GetCheckOrderHandler.cs
index eb564c506..4a8fb36ce 100644
--- a/src/Web/Grand.Web/Features/Handlers/Courses/GetCheckOrderHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Courses/GetCheckOrderHandler.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Payments;
using Grand.Web.Features.Models.Courses;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Courses;
diff --git a/src/Web/Grand.Web/Features/Handlers/Courses/GetCourseHandler.cs b/src/Web/Grand.Web/Features/Handlers/Courses/GetCourseHandler.cs
index cf8500cbb..9812a87d1 100644
--- a/src/Web/Grand.Web/Features/Handlers/Courses/GetCourseHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Courses/GetCourseHandler.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Media;
using Grand.Web.Extensions;
using Grand.Web.Features.Models.Courses;
using Grand.Web.Models.Course;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Courses;
diff --git a/src/Web/Grand.Web/Features/Handlers/Courses/GetLessonHandler.cs b/src/Web/Grand.Web/Features/Handlers/Courses/GetLessonHandler.cs
index d804665bd..eb92da073 100644
--- a/src/Web/Grand.Web/Features/Handlers/Courses/GetLessonHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Courses/GetLessonHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Storage;
using Grand.Web.Extensions;
using Grand.Web.Features.Models.Courses;
using Grand.Web.Models.Course;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Courses;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs
index a3dd79570..bd5bff318 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Common;
using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetAuctionsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetAuctionsHandler.cs
index b20769e63..82a42cdf2 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetAuctionsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetAuctionsHandler.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetCoursesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetCoursesHandler.cs
index 6b7e7a0d5..0439e7b79 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetCoursesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetCoursesHandler.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Courses;
using Grand.Domain.Customers;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomAttributesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomAttributesHandler.cs
index dbd46195c..bc23b18ff 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomAttributesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomAttributesHandler.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Customers;
using Grand.Infrastructure;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomerDataHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomerDataHandler.cs
index 48e789249..3bb6bfd44 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomerDataHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomerDataHandler.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Web.Features.Models.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs
index 213323871..6822662a8 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Documents;
using Grand.Web.Common.Localization;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
using Document = Grand.Web.Models.Customer.Document;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs
index e45f84d4a..3ef356bfb 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs
index e90e23652..e72b013f5 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs
@@ -10,7 +10,7 @@ using Grand.Web.Common.Localization;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using Grand.Web.Models.Newsletter;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetNavigationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetNavigationHandler.cs
index 9722edc2b..0bfd6ed72 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetNavigationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetNavigationHandler.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Vendors;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetNotesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetNotesHandler.cs
index 1c9c66afb..08e3535a9 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetNotesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetNotesHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Customers;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetParseCustomAttributesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetParseCustomAttributesHandler.cs
index 5e3a7b546..470d6aed8 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetParseCustomAttributesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetParseCustomAttributesHandler.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Infrastructure;
using Grand.Web.Features.Models.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetPasswordRecoveryConfirmHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetPasswordRecoveryConfirmHandler.cs
index 2b33ad21e..88802f146 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetPasswordRecoveryConfirmHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetPasswordRecoveryConfirmHandler.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Customers;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs
index 4017120e3..8807094a6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs
@@ -8,7 +8,7 @@ using Grand.Domain.Tax;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using Grand.Web.Models.Newsletter;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetReviewsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetReviewsHandler.cs
index a3fd39cb0..860c47c99 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetReviewsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetReviewsHandler.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountHandler.cs
index 364f0b61a..0be4202e6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountHandler.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountsHandler.cs
index 24cd8440e..c262e478a 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountsHandler.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetTwoFactorAuthenticationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetTwoFactorAuthenticationHandler.cs
index 522b8f12e..b29874e5d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetTwoFactorAuthenticationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetTwoFactorAuthenticationHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Customers;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetUserAgreementHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetUserAgreementHandler.cs
index eb0ba58c8..00a2279b0 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetUserAgreementHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetUserAgreementHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/News/GetHomePageNewsItemsHandler.cs b/src/Web/Grand.Web/Features/Handlers/News/GetHomePageNewsItemsHandler.cs
index 0ed11ad2f..7cfde319e 100644
--- a/src/Web/Grand.Web/Features/Handlers/News/GetHomePageNewsItemsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/News/GetHomePageNewsItemsHandler.cs
@@ -11,7 +11,7 @@ using Grand.Web.Events.Cache;
using Grand.Web.Features.Models.News;
using Grand.Web.Models.Media;
using Grand.Web.Models.News;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.News;
diff --git a/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemHandler.cs b/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemHandler.cs
index 3ab884cf7..23af7a9b4 100644
--- a/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemHandler.cs
@@ -11,7 +11,7 @@ using Grand.Infrastructure;
using Grand.Web.Features.Models.News;
using Grand.Web.Models.Media;
using Grand.Web.Models.News;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.News;
diff --git a/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemListHandler.cs b/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemListHandler.cs
index 62af08b44..c46145f34 100644
--- a/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemListHandler.cs
@@ -9,7 +9,7 @@ using Grand.Infrastructure;
using Grand.Web.Features.Models.News;
using Grand.Web.Models.Media;
using Grand.Web.Models.News;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.News;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerLoyaltyPointsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerLoyaltyPointsHandler.cs
index 07dff1b35..d560672d4 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerLoyaltyPointsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerLoyaltyPointsHandler.cs
@@ -4,7 +4,7 @@ using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Orders;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs
index bbbe7d7c2..cb1a43c56 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Orders;
using Grand.Web.Common.Localization;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnDetailsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnDetailsHandler.cs
index 1fbe541cc..984768414 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnDetailsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnDetailsHandler.cs
@@ -9,7 +9,7 @@ using Grand.Infrastructure;
using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs
index f3469b3f6..7655268c1 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs
@@ -13,7 +13,7 @@ using Grand.Infrastructure;
using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs
index d6e5bc143..1c2fc7941 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Tax;
using Grand.Web.Common.Localization;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs
index 121f59741..da95c2db5 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs
@@ -22,7 +22,7 @@ using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Media;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetShipmentDetailsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetShipmentDetailsHandler.cs
index 0334afe6e..d9cf05d7b 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetShipmentDetailsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetShipmentDetailsHandler.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Shipping;
using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Pages/GetPageBlockHandler.cs b/src/Web/Grand.Web/Features/Handlers/Pages/GetPageBlockHandler.cs
index 44ea87f6c..ffab3d602 100644
--- a/src/Web/Grand.Web/Features/Handlers/Pages/GetPageBlockHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Pages/GetPageBlockHandler.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Pages;
using Grand.Infrastructure;
using Grand.Web.Features.Models.Pages;
using Grand.Web.Models.Pages;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Pages;
diff --git a/src/Web/Grand.Web/Features/Handlers/Pages/GetPageLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Pages/GetPageLayoutViewPathHandler.cs
index 248962758..7eed828d9 100644
--- a/src/Web/Grand.Web/Features/Handlers/Pages/GetPageLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Pages/GetPageLayoutViewPathHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Cms;
using Grand.Web.Features.Models.Pages;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Pages;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs
index f6aaabf71..b3525754a 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs
@@ -14,7 +14,7 @@ using Grand.Web.Features.Models.Products;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Products;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
index 80df51449..190fe6370 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
@@ -28,7 +28,7 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
using System.Globalization;
using ProductExtensions = Grand.Domain.Catalog.ProductExtensions;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductLayoutViewPathHandler.cs
index 4b8193931..4e4e56ffc 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductLayoutViewPathHandler.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Web.Features.Models.Products;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Products;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
index bc1e28090..293045c3f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
@@ -16,7 +16,7 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Products;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewOverviewHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewOverviewHandler.cs
index 2aeca349f..fd81ee6d5 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewOverviewHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewOverviewHandler.cs
@@ -1,6 +1,6 @@
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Products;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs
index c9e3c29e8..6f824788d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Products;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs
index 4741673a1..4bf56aefa 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
using System.Net;
namespace Grand.Web.Features.Handlers.Products;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs
index f9bdedf9b..0a1c5afaa 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs
@@ -13,7 +13,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.Media;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs
index 1ab0ef024..925e5e86d 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.Features.Handlers.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingResultHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingResultHandler.cs
index 7a355a96c..7d6d78446 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingResultHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingResultHandler.cs
@@ -8,7 +8,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs
index 1a0ffccfb..4261e5d2e 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs
@@ -17,7 +17,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.Media;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniWishlistHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniWishlistHandler.cs
index 556cd1c65..1d14f97d0 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniWishlistHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniWishlistHandler.cs
@@ -12,7 +12,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.Media;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetOrderTotalsHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetOrderTotalsHandler.cs
index 323e11916..077054a8e 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetOrderTotalsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetOrderTotalsHandler.cs
@@ -12,7 +12,7 @@ using Grand.Domain.Shipping;
using Grand.Domain.Tax;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs
index f4071f9c5..f892a6e63 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Web.Features.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
index b6f908e4f..2a7fd36a2 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
@@ -24,7 +24,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.Media;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.Features.Handlers.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
index cc3d64b7b..ebb9de49f 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
@@ -18,7 +18,7 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.Media;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.Features.Handlers.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/Vendors/GetVendorReviewsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Vendors/GetVendorReviewsHandler.cs
index cc73e6642..c54967c49 100644
--- a/src/Web/Grand.Web/Features/Handlers/Vendors/GetVendorReviewsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Vendors/GetVendorReviewsHandler.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Vendors;
using Grand.Infrastructure;
using Grand.Web.Features.Models.Vendors;
using Grand.Web.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Handlers.Vendors;
diff --git a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPost.cs b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPost.cs
index fdf6160db..c33714554 100644
--- a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPost.cs
+++ b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPost.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Blogs;
using Grand.Web.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Blogs;
diff --git a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostCategory.cs b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostCategory.cs
index 762f20cfb..933b0ce9a 100644
--- a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostCategory.cs
+++ b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostCategory.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Blogs;
diff --git a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostList.cs b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostList.cs
index 452d2b05d..f5a5124e8 100644
--- a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostList.cs
+++ b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostList.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Blogs;
diff --git a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostTagList.cs b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostTagList.cs
index 2c83e1581..0c2d2cedc 100644
--- a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostTagList.cs
+++ b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostTagList.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Blogs;
diff --git a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostYear.cs b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostYear.cs
index df42a06d7..47ae5cebd 100644
--- a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostYear.cs
+++ b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostYear.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Blogs;
diff --git a/src/Web/Grand.Web/Features/Models/Blogs/GetHomePageBlog.cs b/src/Web/Grand.Web/Features/Models/Blogs/GetHomePageBlog.cs
index df36cc0e7..c0d9c7207 100644
--- a/src/Web/Grand.Web/Features/Models/Blogs/GetHomePageBlog.cs
+++ b/src/Web/Grand.Web/Features/Models/Blogs/GetHomePageBlog.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Blogs;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Blogs;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetBrand.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetBrand.cs
index be2fbfa96..71356d117 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetBrand.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetBrand.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Directory;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetBrandAll.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetBrandAll.cs
index daa929381..bff1dec90 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetBrandAll.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetBrandAll.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetBrandLayoutViewPath.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetBrandLayoutViewPath.cs
index ca1c35bb2..2fa91dd20 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetBrandLayoutViewPath.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetBrandLayoutViewPath.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCategory.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCategory.cs
index bccdaf7e9..95eb4a509 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCategory.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCategory.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Directory;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryAll.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryAll.cs
index 766c0cdb5..ff068ab80 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryAll.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryAll.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryFeaturedProducts.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryFeaturedProducts.cs
index a1c13aa82..a3de360b2 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryFeaturedProducts.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryFeaturedProducts.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryLayoutViewPath.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryLayoutViewPath.cs
index b588ebcb5..6c92e263f 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryLayoutViewPath.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryLayoutViewPath.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryNavigation.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryNavigation.cs
index f9c676622..ee5b60749 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryNavigation.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryNavigation.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCategorySimple.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCategorySimple.cs
index 3386d026e..e8357b890 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCategorySimple.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCategorySimple.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetChildCategoryIds.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetChildCategoryIds.cs
index bd6e40880..886b1d17a 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetChildCategoryIds.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetChildCategoryIds.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Stores;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCollection.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCollection.cs
index 2bd7e4748..8e2b07f52 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCollection.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCollection.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Directory;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionAll.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionAll.cs
index 1bb7b38f8..cd63f5894 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionAll.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionAll.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionFeaturedProducts.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionFeaturedProducts.cs
index b8caec851..2a9343ab1 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionFeaturedProducts.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionFeaturedProducts.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionLayoutViewPath.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionLayoutViewPath.cs
index f0b5ed443..22b2f06c1 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionLayoutViewPath.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionLayoutViewPath.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionNavigation.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionNavigation.cs
index 2fdd9c3a1..307bdbdb9 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionNavigation.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionNavigation.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCompareProducts.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCompareProducts.cs
index 9f665d2a8..52f0600f7 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCompareProducts.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCompareProducts.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetComparedProducts.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetComparedProducts.cs
index 5a9261f5d..5493bf7f4 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetComparedProducts.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetComparedProducts.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetFormatBasePrice.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetFormatBasePrice.cs
index 910f68bd7..c211f7a91 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetFormatBasePrice.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetFormatBasePrice.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Directory;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageBrands.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageBrands.cs
index d82fecd9c..73237f6cf 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageBrands.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageBrands.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCategory.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCategory.cs
index 696072572..cc7aadf4d 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCategory.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCategory.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCollections.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCollections.cs
index 2712a2def..ab631c33c 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCollections.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCollections.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetMenu.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetMenu.cs
index fa54cfd08..2a37f0b1c 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetMenu.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetMenu.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetPopularProductTags.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetPopularProductTags.cs
index 7b6332e32..f78da4562 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetPopularProductTags.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetPopularProductTags.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetProductAttribute.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetProductAttribute.cs
index 84d441c00..da07aca06 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetProductAttribute.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetProductAttribute.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetProductTagsAll.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetProductTagsAll.cs
index 9fafc6b58..4f0061092 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetProductTagsAll.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetProductTagsAll.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetProductsByTag.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetProductsByTag.cs
index 67ed97162..c71232c70 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetProductsByTag.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetProductsByTag.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetSearch.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetSearch.cs
index 90da20b94..ce087637a 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetSearch.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetSearch.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Directory;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetSearchAutoComplete.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetSearchAutoComplete.cs
index bd02efa61..af5dcbb02 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetSearchAutoComplete.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetSearchAutoComplete.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Directory;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetSearchBox.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetSearchBox.cs
index 65be4fee1..ba9436d14 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetSearchBox.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetSearchBox.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetVendor.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetVendor.cs
index d37e06814..8564e1006 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetVendor.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetVendor.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetVendorAll.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetVendorAll.cs
index 71b38a447..dcda911e7 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetVendorAll.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetVendorAll.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Localization;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetVendorNavigation.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetVendorNavigation.cs
index caa939156..eadaccd35 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetVendorNavigation.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetVendorNavigation.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Localization;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetViewSortSizeOptions.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetViewSortSizeOptions.cs
index 1fd9b724b..3d149c5d1 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetViewSortSizeOptions.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetViewSortSizeOptions.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Localization;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetBillingAddress.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetBillingAddress.cs
index a197aeee7..3f783d906 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetBillingAddress.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetBillingAddress.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Checkout;
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetConfirmOrder.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetConfirmOrder.cs
index a875159ad..3df8ec766 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetConfirmOrder.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetConfirmOrder.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Checkout;
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetIsPaymentWorkflowRequired.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetIsPaymentWorkflowRequired.cs
index c52640848..228a8576f 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetIsPaymentWorkflowRequired.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetIsPaymentWorkflowRequired.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Checkout;
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetMinOrderPlaceIntervalValid.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetMinOrderPlaceIntervalValid.cs
index a841fe1b4..207a099e2 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetMinOrderPlaceIntervalValid.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetMinOrderPlaceIntervalValid.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Stores;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Checkout;
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentInfo.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentInfo.cs
index 9e16a2972..9d6b7a567 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentInfo.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentInfo.cs
@@ -1,6 +1,6 @@
using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Web.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Checkout;
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentMethod.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentMethod.cs
index d0ba60581..0db29fdae 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentMethod.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentMethod.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Checkout;
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetShippingAddress.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetShippingAddress.cs
index e2d0ee53d..dfd8ceaf6 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetShippingAddress.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetShippingAddress.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Directory;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Checkout;
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetShippingMethod.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetShippingMethod.cs
index 9b4afb012..84014f498 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetShippingMethod.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetShippingMethod.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.Checkout;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Checkout;
diff --git a/src/Web/Grand.Web/Features/Models/Common/GetAddressModel.cs b/src/Web/Grand.Web/Features/Models/Common/GetAddressModel.cs
index 1faa52187..8e03aeed9 100644
--- a/src/Web/Grand.Web/Features/Models/Common/GetAddressModel.cs
+++ b/src/Web/Grand.Web/Features/Models/Common/GetAddressModel.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Directory;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Common;
diff --git a/src/Web/Grand.Web/Features/Models/Common/GetParseCustomAddressAttributes.cs b/src/Web/Grand.Web/Features/Models/Common/GetParseCustomAddressAttributes.cs
index fb6e9ea1c..c70be8179 100644
--- a/src/Web/Grand.Web/Features/Models/Common/GetParseCustomAddressAttributes.cs
+++ b/src/Web/Grand.Web/Features/Models/Common/GetParseCustomAddressAttributes.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Common;
using Grand.Web.Common.Models;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Common;
diff --git a/src/Web/Grand.Web/Features/Models/Common/GetPrivacyPreference.cs b/src/Web/Grand.Web/Features/Models/Common/GetPrivacyPreference.cs
index 77dcdea70..eafa9cd99 100644
--- a/src/Web/Grand.Web/Features/Models/Common/GetPrivacyPreference.cs
+++ b/src/Web/Grand.Web/Features/Models/Common/GetPrivacyPreference.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Stores;
using Grand.Web.Models.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Common;
diff --git a/src/Web/Grand.Web/Features/Models/Common/GetRobotsTextFile.cs b/src/Web/Grand.Web/Features/Models/Common/GetRobotsTextFile.cs
index 907d79f34..e8af46dbe 100644
--- a/src/Web/Grand.Web/Features/Models/Common/GetRobotsTextFile.cs
+++ b/src/Web/Grand.Web/Features/Models/Common/GetRobotsTextFile.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Common;
diff --git a/src/Web/Grand.Web/Features/Models/Common/GetSitemap.cs b/src/Web/Grand.Web/Features/Models/Common/GetSitemap.cs
index 3bbb4f0f4..c55a4b5c8 100644
--- a/src/Web/Grand.Web/Features/Models/Common/GetSitemap.cs
+++ b/src/Web/Grand.Web/Features/Models/Common/GetSitemap.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Common;
diff --git a/src/Web/Grand.Web/Features/Models/Common/GetStatesProvince.cs b/src/Web/Grand.Web/Features/Models/Common/GetStatesProvince.cs
index 8dc6b7afc..d19e3da72 100644
--- a/src/Web/Grand.Web/Features/Models/Common/GetStatesProvince.cs
+++ b/src/Web/Grand.Web/Features/Models/Common/GetStatesProvince.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Common;
diff --git a/src/Web/Grand.Web/Features/Models/Common/GetVendorAddress.cs b/src/Web/Grand.Web/Features/Models/Common/GetVendorAddress.cs
index 7da0a5eea..6b3430bd9 100644
--- a/src/Web/Grand.Web/Features/Models/Common/GetVendorAddress.cs
+++ b/src/Web/Grand.Web/Features/Models/Common/GetVendorAddress.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Localization;
using Grand.Web.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Common;
diff --git a/src/Web/Grand.Web/Features/Models/Courses/GetCheckOrder.cs b/src/Web/Grand.Web/Features/Models/Courses/GetCheckOrder.cs
index f7161deb4..09434b072 100644
--- a/src/Web/Grand.Web/Features/Models/Courses/GetCheckOrder.cs
+++ b/src/Web/Grand.Web/Features/Models/Courses/GetCheckOrder.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Courses;
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Courses;
diff --git a/src/Web/Grand.Web/Features/Models/Courses/GetCourse.cs b/src/Web/Grand.Web/Features/Models/Courses/GetCourse.cs
index 89ad366d6..bd5859b8c 100644
--- a/src/Web/Grand.Web/Features/Models/Courses/GetCourse.cs
+++ b/src/Web/Grand.Web/Features/Models/Courses/GetCourse.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Web.Models.Course;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Courses;
diff --git a/src/Web/Grand.Web/Features/Models/Courses/GetLesson.cs b/src/Web/Grand.Web/Features/Models/Courses/GetLesson.cs
index aa7521178..bec44091b 100644
--- a/src/Web/Grand.Web/Features/Models/Courses/GetLesson.cs
+++ b/src/Web/Grand.Web/Features/Models/Courses/GetLesson.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Web.Models.Course;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Courses;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetAddressList.cs b/src/Web/Grand.Web/Features/Models/Customers/GetAddressList.cs
index 6c53fc24d..c04b8732a 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetAddressList.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetAddressList.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetAuctions.cs b/src/Web/Grand.Web/Features/Models/Customers/GetAuctions.cs
index 34e2a8908..2f8f6dcaa 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetAuctions.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetAuctions.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetCourses.cs b/src/Web/Grand.Web/Features/Models/Customers/GetCourses.cs
index 25b87d2ff..c02666254 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetCourses.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetCourses.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Stores;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetCustomAttributes.cs b/src/Web/Grand.Web/Features/Models/Customers/GetCustomAttributes.cs
index 988199149..e15f8497e 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetCustomAttributes.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetCustomAttributes.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetCustomerData.cs b/src/Web/Grand.Web/Features/Models/Customers/GetCustomerData.cs
index 3873d3f83..bdc44c689 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetCustomerData.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetCustomerData.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Customers;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetDocuments.cs b/src/Web/Grand.Web/Features/Models/Customers/GetDocuments.cs
index a29b763d9..65512cce2 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetDocuments.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetDocuments.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetDownloadableProducts.cs b/src/Web/Grand.Web/Features/Models/Customers/GetDownloadableProducts.cs
index f7a7b8d72..01f5f77d2 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetDownloadableProducts.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetDownloadableProducts.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetInfo.cs b/src/Web/Grand.Web/Features/Models/Customers/GetInfo.cs
index c27422cf7..cc4011df4 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetInfo.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetInfo.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetNavigation.cs b/src/Web/Grand.Web/Features/Models/Customers/GetNavigation.cs
index d74bc7bb4..819a24d1f 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetNavigation.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetNavigation.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetNotes.cs b/src/Web/Grand.Web/Features/Models/Customers/GetNotes.cs
index ad062ca77..63b4314c1 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetNotes.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetNotes.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetParseCustomAttributes.cs b/src/Web/Grand.Web/Features/Models/Customers/GetParseCustomAttributes.cs
index 56cfcbd85..e11e09d34 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetParseCustomAttributes.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetParseCustomAttributes.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Common;
using Grand.Web.Common.Models;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetPasswordRecoveryConfirm.cs b/src/Web/Grand.Web/Features/Models/Customers/GetPasswordRecoveryConfirm.cs
index da25b2f80..46e4c7e2d 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetPasswordRecoveryConfirm.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetPasswordRecoveryConfirm.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetRegister.cs b/src/Web/Grand.Web/Features/Models/Customers/GetRegister.cs
index 09f7283bb..f2d282330 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetRegister.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetRegister.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetReviews.cs b/src/Web/Grand.Web/Features/Models/Customers/GetReviews.cs
index fc11b53f1..abf180dab 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetReviews.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetReviews.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetSubAccount.cs b/src/Web/Grand.Web/Features/Models/Customers/GetSubAccount.cs
index f8c0af3ed..2d11850e8 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetSubAccount.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetSubAccount.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetSubAccounts.cs b/src/Web/Grand.Web/Features/Models/Customers/GetSubAccounts.cs
index 662d618cc..d4045e599 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetSubAccounts.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetSubAccounts.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetTwoFactorAuthentication.cs b/src/Web/Grand.Web/Features/Models/Customers/GetTwoFactorAuthentication.cs
index b6eabafa6..8643c1e40 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetTwoFactorAuthentication.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetTwoFactorAuthentication.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetUserAgreement.cs b/src/Web/Grand.Web/Features/Models/Customers/GetUserAgreement.cs
index 1a473372e..d915d9d9b 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetUserAgreement.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetUserAgreement.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Models/News/GetHomePageNewsItems.cs b/src/Web/Grand.Web/Features/Models/News/GetHomePageNewsItems.cs
index 054325eae..3849b7d51 100644
--- a/src/Web/Grand.Web/Features/Models/News/GetHomePageNewsItems.cs
+++ b/src/Web/Grand.Web/Features/Models/News/GetHomePageNewsItems.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.News;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.News;
diff --git a/src/Web/Grand.Web/Features/Models/News/GetNewsItem.cs b/src/Web/Grand.Web/Features/Models/News/GetNewsItem.cs
index e19267130..feeeac056 100644
--- a/src/Web/Grand.Web/Features/Models/News/GetNewsItem.cs
+++ b/src/Web/Grand.Web/Features/Models/News/GetNewsItem.cs
@@ -1,6 +1,6 @@
using Grand.Domain.News;
using Grand.Web.Models.News;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.News;
diff --git a/src/Web/Grand.Web/Features/Models/News/GetNewsItemList.cs b/src/Web/Grand.Web/Features/Models/News/GetNewsItemList.cs
index 8f91b49b8..af42b5f4f 100644
--- a/src/Web/Grand.Web/Features/Models/News/GetNewsItemList.cs
+++ b/src/Web/Grand.Web/Features/Models/News/GetNewsItemList.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.News;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.News;
diff --git a/src/Web/Grand.Web/Features/Models/Orders/GetCustomerLoyaltyPoints.cs b/src/Web/Grand.Web/Features/Models/Orders/GetCustomerLoyaltyPoints.cs
index d61631edf..ed6cfd7df 100644
--- a/src/Web/Grand.Web/Features/Models/Orders/GetCustomerLoyaltyPoints.cs
+++ b/src/Web/Grand.Web/Features/Models/Orders/GetCustomerLoyaltyPoints.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Directory;
using Grand.Domain.Stores;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Orders;
diff --git a/src/Web/Grand.Web/Features/Models/Orders/GetCustomerOrderList.cs b/src/Web/Grand.Web/Features/Models/Orders/GetCustomerOrderList.cs
index 35a5873d7..4bda0ced3 100644
--- a/src/Web/Grand.Web/Features/Models/Orders/GetCustomerOrderList.cs
+++ b/src/Web/Grand.Web/Features/Models/Orders/GetCustomerOrderList.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Orders;
diff --git a/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturn.cs b/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturn.cs
index d72a545f2..0e2c1bea9 100644
--- a/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturn.cs
+++ b/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturn.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Orders;
diff --git a/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturnDetails.cs b/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturnDetails.cs
index e36836fa5..948aca00a 100644
--- a/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturnDetails.cs
+++ b/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturnDetails.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Orders;
diff --git a/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturns.cs b/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturns.cs
index 409d515c7..4860b1f9f 100644
--- a/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturns.cs
+++ b/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturns.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Orders;
diff --git a/src/Web/Grand.Web/Features/Models/Orders/GetOrderDetails.cs b/src/Web/Grand.Web/Features/Models/Orders/GetOrderDetails.cs
index d691bbd6e..b8edf0493 100644
--- a/src/Web/Grand.Web/Features/Models/Orders/GetOrderDetails.cs
+++ b/src/Web/Grand.Web/Features/Models/Orders/GetOrderDetails.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Orders;
diff --git a/src/Web/Grand.Web/Features/Models/Orders/GetShipmentDetails.cs b/src/Web/Grand.Web/Features/Models/Orders/GetShipmentDetails.cs
index cd058cf81..7241c5d11 100644
--- a/src/Web/Grand.Web/Features/Models/Orders/GetShipmentDetails.cs
+++ b/src/Web/Grand.Web/Features/Models/Orders/GetShipmentDetails.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Orders;
diff --git a/src/Web/Grand.Web/Features/Models/Pages/GetPageBlock.cs b/src/Web/Grand.Web/Features/Models/Pages/GetPageBlock.cs
index d0addb94c..c37409c05 100644
--- a/src/Web/Grand.Web/Features/Models/Pages/GetPageBlock.cs
+++ b/src/Web/Grand.Web/Features/Models/Pages/GetPageBlock.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Pages;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Pages;
diff --git a/src/Web/Grand.Web/Features/Models/Pages/GetPageLayoutViewPath.cs b/src/Web/Grand.Web/Features/Models/Pages/GetPageLayoutViewPath.cs
index 2a5992a51..0c00b63fb 100644
--- a/src/Web/Grand.Web/Features/Models/Pages/GetPageLayoutViewPath.cs
+++ b/src/Web/Grand.Web/Features/Models/Pages/GetPageLayoutViewPath.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Pages;
diff --git a/src/Web/Grand.Web/Features/Models/Products/GetProductDetailsAttributeChange.cs b/src/Web/Grand.Web/Features/Models/Products/GetProductDetailsAttributeChange.cs
index 2438d788d..1936bafc7 100644
--- a/src/Web/Grand.Web/Features/Models/Products/GetProductDetailsAttributeChange.cs
+++ b/src/Web/Grand.Web/Features/Models/Products/GetProductDetailsAttributeChange.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Products;
diff --git a/src/Web/Grand.Web/Features/Models/Products/GetProductDetailsPage.cs b/src/Web/Grand.Web/Features/Models/Products/GetProductDetailsPage.cs
index 0f5ad2659..d3ecce236 100644
--- a/src/Web/Grand.Web/Features/Models/Products/GetProductDetailsPage.cs
+++ b/src/Web/Grand.Web/Features/Models/Products/GetProductDetailsPage.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Products;
diff --git a/src/Web/Grand.Web/Features/Models/Products/GetProductLayoutViewPath.cs b/src/Web/Grand.Web/Features/Models/Products/GetProductLayoutViewPath.cs
index c8a768163..1b98863ab 100644
--- a/src/Web/Grand.Web/Features/Models/Products/GetProductLayoutViewPath.cs
+++ b/src/Web/Grand.Web/Features/Models/Products/GetProductLayoutViewPath.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Products;
diff --git a/src/Web/Grand.Web/Features/Models/Products/GetProductOverview.cs b/src/Web/Grand.Web/Features/Models/Products/GetProductOverview.cs
index 178be4076..5b769cb48 100644
--- a/src/Web/Grand.Web/Features/Models/Products/GetProductOverview.cs
+++ b/src/Web/Grand.Web/Features/Models/Products/GetProductOverview.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Products;
diff --git a/src/Web/Grand.Web/Features/Models/Products/GetProductReviewOverview.cs b/src/Web/Grand.Web/Features/Models/Products/GetProductReviewOverview.cs
index 7e5ff2553..f9f8ba7f4 100644
--- a/src/Web/Grand.Web/Features/Models/Products/GetProductReviewOverview.cs
+++ b/src/Web/Grand.Web/Features/Models/Products/GetProductReviewOverview.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Products;
diff --git a/src/Web/Grand.Web/Features/Models/Products/GetProductReviews.cs b/src/Web/Grand.Web/Features/Models/Products/GetProductReviews.cs
index cb692ff65..d402c376e 100644
--- a/src/Web/Grand.Web/Features/Models/Products/GetProductReviews.cs
+++ b/src/Web/Grand.Web/Features/Models/Products/GetProductReviews.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Products;
diff --git a/src/Web/Grand.Web/Features/Models/Products/GetProductSpecification.cs b/src/Web/Grand.Web/Features/Models/Products/GetProductSpecification.cs
index a5a32862e..57448fb6f 100644
--- a/src/Web/Grand.Web/Features/Models/Products/GetProductSpecification.cs
+++ b/src/Web/Grand.Web/Features/Models/Products/GetProductSpecification.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Web.Models.Catalog;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Products;
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetAddToCart.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetAddToCart.cs
index 45c270f9b..87b258028 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetAddToCart.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetAddToCart.cs
@@ -7,7 +7,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShipping.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShipping.cs
index 9028aa331..ad6351d7b 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShipping.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShipping.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShippingResult.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShippingResult.cs
index ded678cca..11390c905 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShippingResult.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShippingResult.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Directory;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetMiniShoppingCart.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetMiniShoppingCart.cs
index eb6f38d6e..5c1967976 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetMiniShoppingCart.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetMiniShoppingCart.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetMiniWishlist.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetMiniWishlist.cs
index 625f14d3d..a90480f3e 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetMiniWishlist.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetMiniWishlist.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetOrderTotals.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetOrderTotals.cs
index 6153ad987..b611f89bb 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetOrderTotals.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetOrderTotals.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetParseProductAttributes.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetParseProductAttributes.cs
index 138da1478..3220f8271 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetParseProductAttributes.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetParseProductAttributes.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Web.Common.Models;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetShoppingCart.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetShoppingCart.cs
index c2a36f38c..6094ecc7e 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetShoppingCart.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetShoppingCart.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetWishlist.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetWishlist.cs
index f64394702..9b7cf35fd 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetWishlist.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetWishlist.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Models/Vendors/GetVendorReviews.cs b/src/Web/Grand.Web/Features/Models/Vendors/GetVendorReviews.cs
index d245cdab0..a5f7210b0 100644
--- a/src/Web/Grand.Web/Features/Models/Vendors/GetVendorReviews.cs
+++ b/src/Web/Grand.Web/Features/Models/Vendors/GetVendorReviews.cs
@@ -1,5 +1,5 @@
using Grand.Web.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Features.Models.Vendors;
diff --git a/src/Web/Grand.Web/Validators/Common/AddressValidator.cs b/src/Web/Grand.Web/Validators/Common/AddressValidator.cs
index 9d972e025..89d46fcfe 100644
--- a/src/Web/Grand.Web/Validators/Common/AddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Common/AddressValidator.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Validators.Common;
diff --git a/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs b/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs
index 243906f4b..c002a9972 100644
--- a/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure.Validators;
using Grand.Web.Models.Checkout;
using Grand.Web.Models.Common;
using Grand.Web.Validators.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Validators.Customer;
diff --git a/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs b/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs
index a47274e2b..103840d98 100644
--- a/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure.Validators;
using Grand.Web.Models.Checkout;
using Grand.Web.Models.Common;
using Grand.Web.Validators.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Validators.Customer;
diff --git a/src/Web/Grand.Web/Validators/Customer/CustomerAddressEditValidator.cs b/src/Web/Grand.Web/Validators/Customer/CustomerAddressEditValidator.cs
index 78c6d63df..f55a12783 100644
--- a/src/Web/Grand.Web/Validators/Customer/CustomerAddressEditValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CustomerAddressEditValidator.cs
@@ -7,7 +7,7 @@ using Grand.Infrastructure.Validators;
using Grand.Web.Models.Common;
using Grand.Web.Models.Customer;
using Grand.Web.Validators.Common;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Validators.Customer;
diff --git a/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs b/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs
index e302bff96..528e915db 100644
--- a/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs
@@ -9,7 +9,7 @@ using Grand.Infrastructure.Validators;
using Grand.SharedKernel.Extensions;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Validators.Customer;
diff --git a/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs b/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs
index 58e7029b2..cf29f3b84 100644
--- a/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs
@@ -13,7 +13,7 @@ using Grand.Infrastructure.Validators;
using Grand.SharedKernel.Captcha;
using Grand.Web.Common.Validators;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Validators.Customer;
diff --git a/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs b/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs
index bc088eee9..b3fa34b12 100644
--- a/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs
@@ -13,7 +13,7 @@ using Grand.SharedKernel.Extensions;
using Grand.Web.Common.Validators;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Validators.Customer;
diff --git a/src/Web/Grand.Web/Validators/Orders/MerchandiseReturnValidator.cs b/src/Web/Grand.Web/Validators/Orders/MerchandiseReturnValidator.cs
index ed1533238..6fe192140 100644
--- a/src/Web/Grand.Web/Validators/Orders/MerchandiseReturnValidator.cs
+++ b/src/Web/Grand.Web/Validators/Orders/MerchandiseReturnValidator.cs
@@ -8,7 +8,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Orders;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Validators.Orders;
diff --git a/src/Web/Grand.Web/Validators/ShoppingCart/GiftVoucherCouponValidator.cs b/src/Web/Grand.Web/Validators/ShoppingCart/GiftVoucherCouponValidator.cs
index 96fabda63..84e2fc0ab 100644
--- a/src/Web/Grand.Web/Validators/ShoppingCart/GiftVoucherCouponValidator.cs
+++ b/src/Web/Grand.Web/Validators/ShoppingCart/GiftVoucherCouponValidator.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Orders;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Models.ShoppingCart;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Validators.ShoppingCart;
diff --git a/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs b/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs
index e70eda3bc..8716069f8 100644
--- a/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs
+++ b/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs
@@ -12,7 +12,7 @@ using Grand.Infrastructure.Validators;
using Grand.SharedKernel.Captcha;
using Grand.Web.Common.Validators;
using Grand.Web.Models.Vendors;
-using MediatR;
+using Grand.Mediator;
namespace Grand.Web.Validators.Vendors;