From 2acf1f75ab6d8ee9085bde2ae8df9acad5ccc8e7 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 31 Mar 2020 16:59:23 +0200
Subject: [PATCH] wait #3521 @2

---
 resources/js/components/ProductsFilters.vue   |  5 ++++-
 resources/views/pages/category.blade.php      | 21 ++++++++++---------
 .../views/pages/category_group.blade.php      |  1 -
 3 files changed, 15 insertions(+), 12 deletions(-)
 delete mode 100644 resources/views/pages/category_group.blade.php

diff --git a/resources/js/components/ProductsFilters.vue b/resources/js/components/ProductsFilters.vue
index 9d5f48a..c6b8208 100644
--- a/resources/js/components/ProductsFilters.vue
+++ b/resources/js/components/ProductsFilters.vue
@@ -262,10 +262,13 @@
 
             parseQuerystring() {
                 const $this = this;
-                const querystring = location.search.substring(1); // Get querystring minus first character (?)
+                const querystring = window.baseFilters + '&' + location.search.substring(1); // Get querystring minus first character (?)
 
                 if (querystring.length > 0) {
                     querystring.split('&').forEach(function (pair) {
+                        if (pair === '') {
+                            return;
+                        }
 
                         let [key, value] = pair.split('=');
 
diff --git a/resources/views/pages/category.blade.php b/resources/views/pages/category.blade.php
index d2142c2..acd3dc9 100644
--- a/resources/views/pages/category.blade.php
+++ b/resources/views/pages/category.blade.php
@@ -1,8 +1,9 @@
-
-
 @extends('layouts/app')
 
 @section('content')
+    <script>
+        window.baseFilters = "{{$page->get('filter')}}";
+    </script>
     @intro(['padding' => 'pb-1v'])
 
     <full-width class="bg-grey-100" padding="pt-1v pb-2v">
@@ -19,16 +20,16 @@
                                     'results' => __('résultats'),
                                     'no_results' => __('Aucun produit ne correspond aux filtres sélectionnés')
                                 ])'>
-            @endif
+                    @endif
 
-                {{-- Product Grid --}}
-                <grid cols="auto" class="products-grid mt-6 sm:mt-2">
-                    @foreach($products as $id => $product)
-                        @include('partials.product-link', ['id' => $id, 'product' => $product])
-                    @endforeach
-                </grid>
+                    {{-- Product Grid --}}
+                    <grid cols="auto" class="products-grid mt-6 sm:mt-2">
+                        @foreach($products as $id => $product)
+                            @include('partials.product-link', ['id' => $id, 'product' => $product])
+                        @endforeach
+                    </grid>
 
-            @if ($filters && $filter_results)
+                    @if ($filters && $filter_results)
                 </products-filters>
             @endif
 
diff --git a/resources/views/pages/category_group.blade.php b/resources/views/pages/category_group.blade.php
deleted file mode 100644
index b3d9bbc..0000000
--- a/resources/views/pages/category_group.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php
-- 
2.39.5