From 67b331e4f727abd05c3e7bdb772a66b0d8b5fcf2 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 14 Apr 2021 12:15:09 +0300
Subject: [PATCH] fixed upgrade errors && cat icon fixed

---
 .../views/list/partials/price-filter.twig          |  4 +---
 .../views/partials/categories-mobile.twig          |  4 +---
 .../resources/views/partials/categories-web.twig   |  4 +---
 .../views/ads-list/partials/cat-filter.twig        |  7 ++-----
 .../cats-module/src/Category/CategoryModel.php     |  5 +++++
 .../src/Category/CategoryRepository.php            |  1 +
 .../src/Category/Contract/CategoryInterface.php    |  2 ++
 .../Http/Controller/Admin/CategoryController.php   | 14 ++++++++++++--
 8 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig
index d00cd19a7..dac50a6d4 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig
@@ -9,10 +9,8 @@
         {% endif %}
     {% endfor %}
 {% endif %}
+{% if setting_value('visiosoft.module.advs::hide_price_filter') == false and not isHidden %}
 
-{% if setting_value('visiosoft.module.advs::hide_price_filter') == false and not isHidden%}
-    {% set hidePriceCats = setting_value('visiosoft.module.advs::hide_price_categories') %}
-    {% set cats = entries('cats','category').whereIn('id', hidePriceCats).get() %}
     {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %}
 
     <div id="price" class="border rounded filter-box p-3 mb-3">
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig
index d1400708b..bbab72351 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig
@@ -1,9 +1,7 @@
 <ul class="categories-list px-0 mr-2 d-block d-sm-none">
     <li class="categories-list-li category-icon text-truncate category-{{ main_category.slug }}">
         <a href="{{ url_route('adv_list_seo', [main_category.slug]) }}" class="main-category">
-            {% set icon = img(url('local://category_icon/'~main_category.id~'.png')) %}
-            {% set categoryIcon = (icon.data()) ? icon.url() : img('visiosoft.theme.base::images/default-categories-icon.png').url %}
-
+            {% set categoryIcon = (main_category.icon) ? main_category.icon : img('visiosoft.theme.base::images/default-categories-icon.png').url %}
             <img src="{{ categoryIcon }}" alt="{{ main_category.name }}" class="img-responsive">
             <span>{{ main_category.name }}</span>
             <p class="p-0 sub-categories">
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig
index 8732d7aaa..8bbda877b 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig
@@ -1,8 +1,6 @@
 <ul class="categories-list p-0 d-none d-sm-block">
     <li class="categories-list-li category-icon category-{{ main_category.slug }}">
-
-        {% set icon = img(url('local://category_icon/'~main_category.id~'.png')) %}
-        {% set categoryIcon = (icon.data()) ? icon.url() : img('visiosoft.theme.base::images/default-categories-icon.png').url %}
+        {% set categoryIcon = (main_category.icon) ? main_category.icon : img('visiosoft.theme.base::images/default-categories-icon.png').url %}
 
         <img src="{{ categoryIcon }}" alt="{{ main_category.name }}" class="img-responsive">
         <a href="{{ url_route('adv_list_seo', [main_category.slug]) }}" class="main-category">
diff --git a/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/cat-filter.twig b/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/cat-filter.twig
index 03438614f..d557860fb 100644
--- a/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/cat-filter.twig
+++ b/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/cat-filter.twig
@@ -5,11 +5,8 @@
         <li>
             <div class="d-flex">
                 {% if (not categoryId) or (loop.first and categoryId) %}
-                    {#                    {% if maincat.icon %}#}
-                    {#                        <img src="{{ maincat.icon.url }}" alt="{{ maincat.name }}">#}
-                    {#                    {% else %}#}
-                    {{ img('visiosoft.module.advs::images/listing/sample-cat-icon.svg').data|raw }}
-                    {#                    {% endif %}#}
+                    {% set categoryIcon = (maincat.icon) ? maincat.icon : img('visiosoft.module.advs::images/listing/sample-cat-icon.svg').url %}
+                    <img src="{{ categoryIcon }}" alt="{{ main_category.name }}" class="img-responsive">
                 {% endif %}
                 <div class="{{ not loop.first and categoryId ? 'sub-cat' : 'ml-2' }}" style="{{ not loop.first and categoryId ? 'padding-left: ' ~ (loop.index - 1) * 0.5 ~ 'rem;' }}">
                     <a href="{{ appendRequestURL(request_query(),url_route('adv_list_seo', [maincat.slug, cityId.slug]),{},['page']) }}">
diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
index 81e1c678d..3710ce233 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
@@ -59,4 +59,9 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface
         unset($categories[count($categories) - 1]);
         return $categories;
     }
+
+    public function setCategoryIconUrl($url)
+    {
+        $this->update(['icon' => $url]);
+    }
 }
diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php b/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php
index cac78b4b2..597e08e6c 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php
@@ -48,6 +48,7 @@ class CategoryRepository extends EntryRepository implements CategoryRepositoryIn
             ->select(
                 DB::raw('c1.id'),
                 DB::raw('c1.slug'),
+                DB::raw('c1.icon'),
                 DB::raw('c1.count'),
                 DB::raw('c1.parent_category_id'),
                 DB::raw('t1.name'),
diff --git a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php
index f607252d3..f18190b63 100644
--- a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php
+++ b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php
@@ -11,4 +11,6 @@ interface CategoryInterface extends EntryInterface
     public function getParent();
 
     public function getMains($id);
+
+    public function setCategoryIconUrl($url);
 }
diff --git a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
index 2c37c2de5..ac9e18ca2 100644
--- a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
+++ b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
@@ -248,18 +248,28 @@ class CategoryController extends AdminController
         $folderRepository = app(FolderRepositoryInterface::class);
         $manager = app(MountManager::class);
 
-        if ($file = $this->request->file('icon') and $folder = $folderRepository->findBySlug('category_icon')) {
+        if ($file = $this->request->file('icon') and $folder = $folderRepository->findBySlug('category_icon') and $category = $this->categoryRepository->find($category_id)) {
 
             $type = explode('.', $file->getClientOriginalName());
             $type = end($type);
 
             $file_location = $folder->getDisk()->getSlug() . '://' . $folder->getSlug() . '/' . FileSanitizer::clean($category_id . "." . $type);
 
+            $file_url = '/files/' . $folder->getSlug() . '/' . FileSanitizer::clean($category_id . "." . $type);
+
             if (Storage::exists($file_location)) {
                 Storage::delete($file_location);
             }
 
-            $manager->put($file_location, file_get_contents($file->getRealPath()));
+            try {
+                $manager->put($file_location, file_get_contents($file->getRealPath()));
+
+                $category->setCategoryIconUrl($file_url);
+
+            } catch (\Exception $exception) {
+                $this->messages->error([$exception->getMessage()]);
+            }
+
         }
     }