diff --git a/packages/Webkul/Admin/src/Http/Middleware/Locale.php b/packages/Webkul/Admin/src/Http/Middleware/Locale.php deleted file mode 100644 index 7f9b80cc0..000000000 --- a/packages/Webkul/Admin/src/Http/Middleware/Locale.php +++ /dev/null @@ -1,52 +0,0 @@ -locale = $locale; - } - - /** - * Handle an incoming request. - * - * @param \Illuminate\Http\Request $request - * @param \Closure $next - * @return mixed - */ - public function handle($request, Closure $next) - { - $locale = request()->get('admin_locale'); - - if ($locale) { - if ($this->locale->findOneByField('code', $locale)) { - app()->setLocale($locale); - - session()->put('admin_locale', $locale); - } - } else { - if ($locale = session()->get('admin_locale')) { - app()->setLocale($locale); - } else { - app()->setLocale(app()->getLocale()); - } - } - - unset($request['admin_locale']); - - return $next($request); - } -} diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index b8b37e056..c9e92f3e6 100755 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -1,6 +1,6 @@ ['web', 'admin_locale']], function () { +Route::group(['middleware' => ['web']], function () { Route::prefix(config('app.admin_url'))->group(function () { Route::get('/', 'Webkul\Admin\Http\Controllers\Controller@redirectToLogin'); diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index 5e56d6782..ce0abf143 100755 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -3,8 +3,6 @@ namespace Webkul\Admin\Providers; use Illuminate\Support\ServiceProvider; -use Illuminate\Routing\Router; -use Webkul\Admin\Http\Middleware\Locale; use Webkul\Core\Tree; class AdminServiceProvider extends ServiceProvider @@ -14,7 +12,7 @@ class AdminServiceProvider extends ServiceProvider * * @return void */ - public function boot(Router $router) + public function boot() { $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php'); @@ -31,8 +29,6 @@ class AdminServiceProvider extends ServiceProvider $this->registerACL(); - $router->aliasMiddleware('admin_locale', Locale::class); - $this->app->register(EventServiceProvider::class); } diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php index 788c95d21..48e7c9ce6 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php @@ -16,42 +16,6 @@ - get('admin_locale') ?: app()->getLocale();?> - -
- - - -
-