From e6b83beb33ff39686080ec4bc290c0280849cfb9 Mon Sep 17 00:00:00 2001
From: AmooAti <adhamiamirhossein@gmail.com>
Date: Fri, 13 Aug 2021 19:19:24 +0430
Subject: [PATCH] Revert "all channels will be add to request through
 middleware for showing all lcoales in category index"

This reverts commit e5338f545188ea3a00deb153d3d35f2f733b0c03.
---
 .../Admin/src/Http/Middleware/CategoryIndex.php  | 16 ----------------
 packages/Webkul/Admin/src/Http/routes.php        |  8 +++-----
 .../Admin/src/Providers/AdminServiceProvider.php |  3 ---
 3 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 packages/Webkul/Admin/src/Http/Middleware/CategoryIndex.php

diff --git a/packages/Webkul/Admin/src/Http/Middleware/CategoryIndex.php b/packages/Webkul/Admin/src/Http/Middleware/CategoryIndex.php
deleted file mode 100644
index 4e234ac66..000000000
--- a/packages/Webkul/Admin/src/Http/Middleware/CategoryIndex.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Webkul\Admin\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-
-
-class CategoryIndex
-{
-    public function handle(Request $request, Closure $next)
-    {
-        $request->query->set('channel','all');
-        return $next($request);
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php
index 77370906e..2bd12a221 100755
--- a/packages/Webkul/Admin/src/Http/routes.php
+++ b/packages/Webkul/Admin/src/Http/routes.php
@@ -336,11 +336,9 @@ Route::group(['middleware' => ['web', 'admin_locale']], function () {
                 ])->name('admin.catalog.products.file.download');
 
                 // Catalog Category Routes
-                Route::middleware([\Webkul\Admin\Http\Middleware\CategoryIndex::class])->group(function() {
-                    Route::get('/categories', 'Webkul\Category\Http\Controllers\CategoryController@index')->defaults('_config', [
-                        'view' => 'admin::catalog.categories.index',
-                    ])->name('admin.catalog.categories.index');
-                });
+                Route::get('/categories', 'Webkul\Category\Http\Controllers\CategoryController@index')->defaults('_config', [
+                    'view' => 'admin::catalog.categories.index',
+                ])->name('admin.catalog.categories.index');
 
                 Route::get('/categories/create', 'Webkul\Category\Http\Controllers\CategoryController@create')->defaults('_config', [
                     'view' => 'admin::catalog.categories.create',
diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
index 5a9629262..0b8a55b59 100755
--- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
+++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
@@ -2,7 +2,6 @@
 
 namespace Webkul\Admin\Providers;
 
-use Webkul\Admin\Http\Middleware\CategoryIndex;
 use Webkul\Core\Tree;
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
@@ -35,8 +34,6 @@ class AdminServiceProvider extends ServiceProvider
 
         $router->aliasMiddleware('admin_locale', Locale::class);
 
-        $router->aliasMiddleware('category_index', CategoryIndex::class);
-
         $this->app->register(EventServiceProvider::class);
     }