From 7dc34dc411b8d16e174b67fa26b1a9e90813fa2a Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Fri, 6 Dec 2019 16:18:29 +0300
Subject: [PATCH] customfields repair list page && customfields bootsrap 4
 template

---
 .../views/ad-detail/partials/content.twig     |  1 -
 .../views/list/partials/list-filter.twig      |  2 +-
 .../resources/views/list/table.twig           |  2 ++
 .../advs-module/src/Adv/AdvRepository.php     |  6 ++++-
 .../src/Http/Controller/advsController.php    |  5 ++--
 .../src/Category/CategoryModel.php            | 22 +++++++++++++++-
 .../src/Category/CategoryPresenter.php        | 25 ++++---------------
 7 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content.twig
index 33884813e..75afea255 100644
--- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content.twig
@@ -1,7 +1,6 @@
 <div class="description-info">
     <div class="row">
 
-
         <div class="col-md-12">
             <nav>
                 <div class="nav nav-tabs nav-fill ad-detail-tabs" id="nav-tab" role="tablist">
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig
index 6b7438fe6..d81e7f376 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig
@@ -6,7 +6,7 @@
             <div class="row">
                 <div id="filter" class="w-100 mb-3">
 
-                    {{ addBlock('ads-list/partials/list-filter',{'mainCats':mainCats,'subCats':subCats})|raw }}
+                    {{ addBlock('ads-list/partials/list-filter',{'mainCats':mainCats,'subCats':subCats,'ranges':ranges,'checkboxes':checkboxes})|raw }}
 
                     <div class="card mb-3">
                         <div class="card-header breadcrumb mb-0" id="priceHeading">
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/table.twig b/addons/default/visiosoft/advs-module/resources/views/list/table.twig
index 590644f11..6a7ca0ef0 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/table.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/table.twig
@@ -14,6 +14,7 @@
                 <th scope="col"
                     class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }}
                     / {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }}</th>
+                {{ addBlock('ads-list/table-column',{'seenList':seenList})|raw }}
             </tr>
             </thead>
             <tbody>
@@ -43,6 +44,7 @@
                             <small>{{ adv.city_name }} / {{ adv.country_name }}</small>
                         </td>
                     {% endif %}
+                    {{ addBlock('ads-list/table-row',{'seenList':seenList,'adv':adv})|raw }}
                 </tr>
             {% endfor %}
 
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
index 229ade81e..f8182647e 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
@@ -80,7 +80,11 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
         }
         if (!empty($param['cat'])) {
             $cat = new CategoryModel();
-            $catLevel = $cat->getCatLevel($param['cat']);
+            $cat_d = $cat->find($param['cat']);
+            if ($cat_d->parent_category_id == null)
+                $catLevel = 1;
+            else
+                $catLevel = $cat->getCatLevel($param['cat']);
             $catLevel = "cat" . $catLevel;
             $query = $query->where($catLevel, $param['cat']);
         }
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
index b72008eb5..edddf2674 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -194,6 +194,8 @@ class AdvsController extends PublicController
             }
         }
 
+
+
         if (isset($param['cat']) and $param['cat'] != "") {
             $cat = $param['cat'];
             $seo_keywords = $this->category_model->getMeta_keywords($param['cat']);
@@ -214,7 +216,6 @@ class AdvsController extends PublicController
         if ($isActiveCustomFields) {
             $returnvalues = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->index($mainCats, $subCats);
             $checkboxes = $returnvalues['checkboxes'];
-            $textfields = $returnvalues['textfields'];
             $topfields = $returnvalues['topfields'];
             $ranges = $returnvalues['ranges'];
         }
@@ -224,7 +225,7 @@ class AdvsController extends PublicController
             $userProfile = $this->profile_repository->getProfile($user->id);
         }
 
-        $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'textfields', 'checkboxes', 'request',
+        $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'request',
             'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges', 'seenList', 'searchedCountry');
 
         Cookie::queue(Cookie::make('last_search', $this->requestHttp->getRequestUri(), 84000));
diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
index 4077ee784..b5b8f7b5d 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
@@ -104,7 +104,7 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface
 
         $cats = $cats->leftJoin('cats_category_translations', function ($join) {
             $join->on('cats_category.id', '=', 'cats_category_translations.entry_id');
-            $join->where('cats_category_translations.locale', '=', Request()->session()->get('_locale'));
+            $join->where('cats_category_translations.locale', '=', Request()->session()->get('_locale', setting_value('streams::default_locale')));
         });
         $cats = $cats->select('cats_category.*', 'cats_category_translations.name as name');
         $cats = $cats->orderBy('id', 'DESC')
@@ -148,4 +148,24 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface
     {
         return $this->find($cat_id)->name;
     }
+
+    public function getMains($id)
+    {
+        $categories = array();
+        $z = 1;
+        for ($i = 1; $i <= $z; $i++) {
+            $main = $this->find($id);
+            $new = array();
+            $new['id'] = $main->id;
+            $new['val'] = $main->name;
+            $categories[] = $new;
+            if ($main->parent_category_id != null) {
+                $id = $main->parent_category_id;
+                $z++;
+            }
+        }
+        $categories = array_reverse($categories);
+        unset($categories[count($categories) - 1]);
+        return $categories;
+    }
 }
diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryPresenter.php b/addons/default/visiosoft/cats-module/src/Category/CategoryPresenter.php
index 4b8880937..3d1791434 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryPresenter.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryPresenter.php
@@ -5,8 +5,9 @@ use Anomaly\Streams\Platform\Model\Cats\CatsCategoryEntryModel;
 
 class CategoryPresenter extends EntryPresenter
 {
-    public function getAdvsListUrl($attributes) {
-        return \route('visiosoft.module.advs::list', "cat=".$attributes);
+    public function getAdvsListUrl($attributes)
+    {
+        return \route('visiosoft.module.advs::list', "cat=" . $attributes);
     }
 
     public function getCategoryName($id)
@@ -23,23 +24,7 @@ class CategoryPresenter extends EntryPresenter
 
     public function getMains($id)
     {
-        $categories = array();
-        $z = 1;
-        for($i = 1; $i <= $z; $i++)
-        {
-            $main = $this->find($id);
-            $new = array();
-            $new['id'] = $main->id;
-            $new['val'] = $this->getname($main->id);
-            $categories[] = $new;
-            if($main->parent_category_id != null)
-            {
-                $id = $main->parent_category_id;
-                $z++;
-            }
-        }
-        $categories = array_reverse($categories);
-        unset($categories[count($categories)-1]);
-        return $categories;
+        $category_model = new CategoryModel();
+        return $category_model->getMains($id);
     }
 }