filters

app/Http/Controllers/ProductController.php

@@ -60,7 +60,7 @@ class ProductController extends Controller
 
     public function index(Request $request)
     {
-        session(['gp_catalog' => $request->query()]);
+        session(['gp_products' => $request->query()]);
         $model = new Product;
         // fill filters
         $this->createFilters($model, 'type_tz', 'type', 'certificate_id');
@@ -96,21 +96,21 @@ class ProductController extends Controller
     public function store(StoreProductRequest $request)
     {
         Product::create($request->validated());
-        $previous_url = $request->get('previous_url') ?? route('catalog.index', session('gp_catalog'));
+        $previous_url = $request->get('previous_url') ?? route('catalog.index', session('gp_products'));
         return redirect()->to($previous_url);
     }
 
     public function update(StoreProductRequest $request, Product $product)
     {
         $product->update($request->validated());
-        $previous_url = $request->get('previous_url') ?? route('catalog.index', session('gp_catalog'));
+        $previous_url = $request->get('previous_url') ?? route('catalog.index', session('gp_products'));
         return redirect()->to($previous_url);
     }
 
     public function delete(Product $product)
     {
         $product->delete();
-        return redirect()->route('catalog.index', session('gp_catalog'));
+        return redirect()->route('catalog.index', session('gp_products'));
     }
 
     /**
@@ -131,7 +131,7 @@ class ProductController extends Controller
         // dispatch job
         ImportCatalog::dispatch($path, year(), $request->user()->id);
         Log::info('ImportCatalog job created!');
-        return redirect()->route('catalog.index', session('gp_catalog'))->with(['success' => 'Задача импорта успешно создана!']);
+        return redirect()->route('catalog.index', session('gp_products'))->with(['success' => 'Задача импорта успешно создана!']);
     }
 
     public function export(Request $request)
@@ -150,7 +150,7 @@ class ProductController extends Controller
         Log::info('ExportCatalog job created!');
 
 
-        return redirect()->route('catalog.index', session('gp_catalog'))->with(['success' => 'Задача экспорта успешно создана!']);
+        return redirect()->route('catalog.index', session('gp_products'))->with(['success' => 'Задача экспорта успешно создана!']);
     }
 
     /**

app/Http/Controllers/ProductSKUController.php

@@ -54,7 +54,7 @@ class ProductSKUController extends Controller
     ];
     public function index(Request $request)
     {
-        session(['gp_sku' => $request->all()]);
+        session(['gp_product_sku' => $request->all()]);
         $model = new MafView;
 
         $fil = array_keys($this->data['header']);
@@ -78,7 +78,7 @@ class ProductSKUController extends Controller
 
     public function update(ProductSKUStoreRequest $request, ProductSKU $product_sku)
     {
-        $url = $request->previous_url ?? route('product_sku.index', session('gp_sku'));
+        $url = $request->previous_url ?? route('product_sku.index', session('gp_product_sku'));
 
         $product_sku->update($request->validated());
         return redirect($url);

resources/views/layouts/app.blade.php

@@ -173,6 +173,5 @@
 
 
     </script>
-
 </body>
 </html>

resources/views/layouts/menu.blade.php

@@ -3,9 +3,9 @@
 
     @if(hasRole('admin,manager'))
         <li class="nav-item"><a class="nav-link @if($active == 'product_sku') active @endif"
-                                href="{{ route('product_sku.index', session('gp_sku')) }}">МАФ</a></li>
+                                href="{{ route('product_sku.index', session('gp_product_sku')) }}">МАФ</a></li>
         <li class="nav-item"><a class="nav-link @if($active == 'catalog') active @endif"
-                                href="{{ route('catalog.index', session('gp_catalog')) }}">Каталог</a></li>
+                                href="{{ route('catalog.index', session('gp_products')) }}">Каталог</a></li>
         <li class="nav-item"><a class="nav-link @if($active == 'reports') active @endif"
                                 href="{{ route('reports.index', session('gp_reports')) }}">Отчёты</a></li>
         <li class="nav-item"><a class="nav-link" href="{{ route('responsible.index') }}">Ответственные</a></li>