Merge pull request #6394 from thierrymarianne/display-categories

Displayed categories when product not found
PrestaShop · Sep 20, 2016 · 2f2d76b · 2f2d76b
2 parents a7e80c2 + f62b690
commit 2f2d76b
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 12 deletions.
diff --git a/classes/controller/ProductListingFrontController.php b/classes/controller/ProductListingFrontController.php
@@ -468,7 +468,10 @@ protected function doProductSearch($template, $params = array(), $locale = null)
             die(json_encode($this->getAjaxProductSearchVariables()));
         } else {
             $variables = $this->getProductSearchVariables();
-            if (!empty($variables['products'])) {
+            if (
+                !empty($variables['products'])
+                || $params['entity'] === 'category'
+            ) {
                 $this->context->smarty->assign(array(
                     'listing' => $variables,
                 ));

diff --git a/themes/classic/_dev/css/components/errors.scss b/themes/classic/_dev/css/components/errors.scss
@@ -1,3 +1,4 @@
+#products,
 #pagenotfound {
   #main {
     .page-header {

diff --git a/themes/classic/assets/css/theme.css b/themes/classic/assets/css/theme.css
diff --git a/themes/classic/assets/css/theme.css.map b/themes/classic/assets/css/theme.css.map
diff --git a/themes/classic/templates/catalog/_partials/products.tpl b/themes/classic/templates/catalog/_partials/products.tpl
@@ -49,5 +49,7 @@
         <i class="material-icons">&#xE316;</i>
       </a>
     </div>
+  {else}
+    {include file='errors/not-found.tpl'}
   {/if}
 </section>
diff --git a/themes/classic/templates/errors/404.tpl b/themes/classic/templates/errors/404.tpl
@@ -5,14 +5,5 @@
 {/block}
 
 {block name='page_content_container'}
-  <section id="content" class="page-content page-not-found">
-    <h4>{l s='Sorry for the inconvenience.' d='Shop.Theme'}</h4>
-    <p>{l s='Search again what you are looking for' d='Shop.Theme'}</p>
-
-    {block name='search'}
-      {hook h='displaySearch'}
-    {/block}
-
-    {hook h='displayNotFound'}
-  </section>
+  {include file='errors/not-found.tpl'}
 {/block}
diff --git a/themes/classic/templates/errors/not-found.tpl b/themes/classic/templates/errors/not-found.tpl
@@ -0,0 +1,10 @@
+<section id="content" class="page-content page-not-found">
+  <h4>{l s='Sorry for the inconvenience.' d='Shop.Theme'}</h4>
+  <p>{l s='Search again what you are looking for' d='Shop.Theme'}</p>
+
+  {block name='search'}
+    {hook h='displaySearch'}
+  {/block}
+
+  {hook h='displayNotFound'}
+</section>