From 9dcd66fc9ae87d10017ac1ac1e682855ac52ab55 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Fri, 21 Oct 2016 15:48:33 +0300
Subject: [PATCH] big commti

---
 backend/views/seo-category/index.php       |  4 ++--
 frontend/controllers/CatalogController.php | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/backend/views/seo-category/index.php b/backend/views/seo-category/index.php
index 9e6bda0..70f5bb0 100755
--- a/backend/views/seo-category/index.php
+++ b/backend/views/seo-category/index.php
@@ -47,10 +47,10 @@ $this->params['breadcrumbs'][] = $this->title;
                     'image' => function ($url, $model)
                     {
                         return Html::a (
-                            '<span class="glyphicon glyphicon-picture"></span>',
+                            '<span class="glyphicon glyphicon-list"></span>',
                             Url::toRoute(['seo-dynamic/index', 'seo_category_id' => $model->seo_category_id]),
                             [
-                                'title' => "слайды",
+                                'title' => "Список",
                             ]
                         );
                     },
diff --git a/frontend/controllers/CatalogController.php b/frontend/controllers/CatalogController.php
index cc50d81..b5f727f 100755
--- a/frontend/controllers/CatalogController.php
+++ b/frontend/controllers/CatalogController.php
@@ -155,9 +155,18 @@ class CatalogController extends \yii\web\Controller
 
         ProductHelper::addLastProsucts($product->product_id);
 
+        $category = null;
+        $last_category_id = ProductHelper::getLastCategory();
+        if(!empty($last_category_id)) {
+            $category = $product->getCategory()->andWhere(['category_id' => $last_category_id])->one();
+        }
+        if(empty($category)) {
+            $category = $product->category;
+        }
+
         return $this->render('product', [
             'product' => $product,
-            'category' => $product->category,
+            'category' => $category,
         ]);
     }
 
--
libgit2 0.21.4