From 0f0702c6c7d03781b477433ae9c721ef659c1b03 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 6 Nov 2019 12:44:43 +0300
Subject: [PATCH 1/2] fixed repeated custom fields

---
 .../visiosoft/advs-module/resources/lang/en/field.php     | 6 ++++++
 .../resources/views/ad-detail/partials/content-ad.twig    | 8 +++++---
 .../resources/views/list/partials/list-filter.twig        | 4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php
index ceee1c24f..e73bf6b7f 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php
@@ -206,4 +206,10 @@ return [
         'name' => 'Sold out',
     ],
     'edit_category' => 'Edit Category',
+    'max' => [
+        'name' => 'Max',
+    ],
+    'min' => [
+        'name' => 'Min',
+    ],
 ];
diff --git a/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/content-ad.twig b/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/content-ad.twig
index bd7e8d7ab..6c58bf675 100644
--- a/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/content-ad.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/content-ad.twig
@@ -7,9 +7,11 @@
                                           href="#description">{{ trans('visiosoft.module.advs::field.description.name') }}</a>
                     </li>
                     {% if features != null %}
-                        <li class=""><a data-toggle="tab"
-                                        href="#features">{{ trans('visiosoft.module.advs::field.features') }}</a>
-                        </li>
+                        {% if entries('advs').isEnabled('customfields') %}
+                            <li class=""><a data-toggle="tab"
+                                            href="#features">{{ trans('visiosoft.module.advs::field.features') }}</a>
+                            </li>
+                        {% endif %}
                     {% endif %}
 
                     {% if entries('advs').isEnabled('streetview') and adv.map_Val != "" %}
diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/base-theme/resources/views/list/partials/list-filter.twig
index 1d1997621..76322f159 100644
--- a/addons/default/visiosoft/base-theme/resources/views/list/partials/list-filter.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/list/partials/list-filter.twig
@@ -63,10 +63,10 @@
                                 {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %}
 
                                 <input type="number" class="price-input" value="{{ request.min_price }}"
-                                       name="min_price" min="0" placeholder="Min"> -
+                                       name="min_price" min="0" placeholder="{{ trans('visiosoft.module.advs::field.min.name') }}"> -
 
                                 <input class="price-input" type="number" value="{{ request.max_price }}"
-                                       name="max_price" placeholder="Max">
+                                       name="max_price" placeholder="{{ trans('visiosoft.module.advs::field.max.name') }}">
 
                                 <select name="currency" id="currency">
                                     {% for currency in active_currencies %}

From 379d620d37b6f7bff5bb1c79aa4bd92e450f1a81 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 6 Nov 2019 14:31:04 +0300
Subject: [PATCH 2/2] selected categories for ad edit categories page

---
 .../base-theme/resources/js/edit_cats.js      | 102 +++++++++++-------
 .../visiosoft/base-theme/resources/js/nav.js  |  19 +---
 .../resources/views/new-ad/edit-cat.twig      |  18 ++--
 3 files changed, 72 insertions(+), 67 deletions(-)

diff --git a/addons/default/visiosoft/base-theme/resources/js/edit_cats.js b/addons/default/visiosoft/base-theme/resources/js/edit_cats.js
index f93b3f139..5863add8c 100644
--- a/addons/default/visiosoft/base-theme/resources/js/edit_cats.js
+++ b/addons/default/visiosoft/base-theme/resources/js/edit_cats.js
@@ -1,52 +1,74 @@
-$(document).ready(function () {
-    $('select[name="cat1"], select[name="cat2"], select[name="cat3"], ' +
-        'select[name="cat4"], select[name="cat5"], select[name="cat6"], select[name="cat7"]').on('change', function () {
-        var all = $(this).val();
-        $(this).val(all[all.length-1])
-    })
-
-    const filter = {};
-    filter.getCats = (catId, divId) => {
+function getCats(catId, divId, current = null) {
+    if (divId != "") {
         $.ajax({
             type: 'get',
-            url: '/ajax/getcats/'+ divId,
+            url: '/ajax/getcats/' + divId,
             success: function (response) {
-                if(response.length <= 0){
+                if (response.length <= 0) {
                     $('.cat-item-3').show();
                     stop();
-                }
-                else {
-                    response.forEach(function(options){
-                        $(catId).append("<option value="+options.id+">"+options.name+"</option>").closest('.cat-item-2').show();
+                } else {
+                    response.forEach(function (options) {
+                        $(catId).append("<option value=" + options.id + ">" +
+                            options.name + " </option>").closest('.cat-item-2').show();
                     });
                 }
             }
+        }).promise().done(function () {
+            if (current != null)
+                $(current).val([divId]);
         })
-    };
-
-    filter.hideCats = (num) => {
-        var startNo = num;
-        var endNo = 6;
-
-        while (startNo <= endNo) {
-            $('#cat'+ startNo).html("").closest('.cat-item-2').hide();
-            $('.cat-item-3').hide();
-            startNo++;
-        }
-    };
-
-    for (var i = 1; i <= 6; i++) {
-        (function(){
-            var ii = i;
-            $('#cat'+i).on('change', function (i,e) {
-                divId = $(this).find('option:selected').val();
-                if (divId == 0) {
-                    filter.hideCats(ii+1);
-                }
-                filter.hideCats(ii+1);
-                filter.getCats("#cat"+(ii+1), divId);
-            });
-        })();
     }
 
+};
+
+function hideCats(num) {
+    var startNo = num;
+    var endNo = 6;
+
+    while (startNo <= endNo) {
+        $('#cat' + startNo).html("").closest('.cat-item-2').hide();
+        $('.cat-item-3').hide();
+        startNo++;
+    }
+};
+
+
+jQuery(document).ready(function ($) {
+    $('select[name="cat1"], select[name="cat2"], select[name="cat3"], ' +
+        'select[name="cat4"], select[name="cat5"], select[name="cat6"], select[name="cat7"]').on('change', function () {
+        var all = $(this).val();
+        var data_level = $(this).attr('data-level');
+        $(this).val(all[all.length - 1])
+        divId = $(this).find('option:selected').val();
+        if (divId == 0) {
+            hideCats(parseInt(data_level) + 1);
+        }
+        hideCats(parseInt(data_level) + 1);
+        getCats("#cat" + (parseInt(data_level) + 1), divId);
+
+
+    });
+});
+jQuery(document).promise().done(function () {
+    level = 1;
+    getCats("#cat" + (level + 1), $("#cat" + level).attr('data-value'), "#cat" + level);
+}).promise().done(function () {
+    level = 2;
+    getCats("#cat" + (level + 1), $("#cat" + level).attr('data-value'), "#cat" + level);
+}).promise().done(function () {
+    level = 3;
+    getCats("#cat" + (level + 1), $("#cat" + level).attr('data-value'), "#cat" + level);
+}).promise().done(function () {
+    level = 4;
+    getCats("#cat" + (level + 1), $("#cat" + level).attr('data-value'), "#cat" + level);
+}).promise().done(function () {
+    level = 5;
+    getCats("#cat" + (level + 1), $("#cat" + level).attr('data-value'), "#cat" + level);
+}).promise().done(function () {
+    level = 6;
+    getCats("#cat" + (level + 1), $("#cat" + level).attr('data-value'), "#cat" + level);
+}).promise().done(function () {
+    level = 7;
+    getCats("#cat" + (level + 1), $("#cat" + level).attr('data-value'), "#cat" + level);
 });
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/js/nav.js b/addons/default/visiosoft/base-theme/resources/js/nav.js
index f29ac0aaa..02b8ccba0 100644
--- a/addons/default/visiosoft/base-theme/resources/js/nav.js
+++ b/addons/default/visiosoft/base-theme/resources/js/nav.js
@@ -1,20 +1,6 @@
 $(document).ready(function () {
     const is = {};
 
-    is.Active = (slug) => {
-        $.ajax({
-            type: 'get',
-            url: '/isactive/' + slug,
-            success: function (response) {
-                if (response.isActive === 1) {
-                    $(".profile-dropdown-list #" + slug + "").show();
-                }
-            },
-            error: function (err) {
-                reject(Error("It broke"));
-            }
-        });
-    };
 
     $.ajax({
         type: 'get',
@@ -35,7 +21,7 @@ $(document).ready(function () {
                     }
                 }
                 // add extra parameters here by using is.Active method. div name must be same as slug
-                is.Active('messages');
+                // is.Active('messages');
             } else {
                 $('.login-user-dropdown-menu').hide();
                 $('.profile-navigation-mobile-field , .profile-navigation-field').on('click', function () {
@@ -44,9 +30,6 @@ $(document).ready(function () {
                 $('.login-username-field').hide();
                 $('.login-button-field').attr("style", "display: block !important");
             }
-        },
-        error: function (err) {
-            reject(Error("It broke"));
         }
     });
 
diff --git a/addons/default/visiosoft/base-theme/resources/views/new-ad/edit-cat.twig b/addons/default/visiosoft/base-theme/resources/views/new-ad/edit-cat.twig
index 5f3cb6cac..8dab0e5de 100644
--- a/addons/default/visiosoft/base-theme/resources/views/new-ad/edit-cat.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/new-ad/edit-cat.twig
@@ -1,12 +1,13 @@
 {% extends layout('edit-cat') %}
 
 {% block content %}
+    {% set ad_Detail = adDetail(id) %}
     <section id="main" class="clearfix ad-post-page">
         <div class="container">
             <div class="breadcrumb-section">
                 <ol class="breadcrumb">
                     <li><a href="/">{{ trans('visiosoft.module.advs::field.home') }}</a></li>
-                    <li>{{ adDetail(id).name }}</li>
+                    <li>{{ ad_Detail.name }}</li>
                     <li>{{ trans('visiosoft.module.advs::field.edit_category') }}</li>
                 </ol>
                 <h2 class="title">{{ trans('visiosoft.module.advs::field.home') }}</h2>
@@ -20,7 +21,7 @@
                             <div class="section cat-option select-category post-option">
                                 <h4>{{ trans('visiosoft.module.advs::field.select_a_category') }}</h4>
                                 <ul role="tablist">
-                                    <select class="cat-select" name="cat1" id="cat1" multiple id="">
+                                    <select class="cat-select" name="cat1" id="cat1" data-level="1" data-value="{{ ad_Detail.cat1 }}" multiple id="">
                                         {% for cat in main_cats %}
                                             <option value="{{ cat.id }}"><span
                                                         style="font-size: 20px">{{ cat.name }}</span></option>
@@ -33,7 +34,7 @@
                             <div class="section cat-option select-category post-option">
                                 <h4>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h4>
                                 <ul role="tablist">
-                                    <select class="cat-select" name="cat2" id="cat2" multiple id="">
+                                    <select class="cat-select" name="cat2" id="cat2" data-level="3"  data-value="{{ ad_Detail.cat2 }}" multiple id="">
 
                                     </select>
                                 </ul>
@@ -43,7 +44,7 @@
                             <div class="section cat-option select-category post-option">
                                 <h4>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h4>
                                 <ul role="tablist">
-                                    <select class="cat-select" name="cat3" id="cat3" multiple id="">
+                                    <select class="cat-select" name="cat3" id="cat3" data-level="3"  data-value="{{ ad_Detail.cat3 }}" multiple id="">
 
                                     </select>
                                 </ul>
@@ -53,7 +54,7 @@
                             <div class="section cat-option select-category post-option">
                                 <h4>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h4>
                                 <ul role="tablist">
-                                    <select class="cat-select" name="cat4" id="cat4" multiple id="">
+                                    <select class="cat-select" name="cat4" id="cat4"  data-level="4"  data-value="{{ ad_Detail.cat4 }}" multiple id="">
 
                                     </select>
                                 </ul>
@@ -63,7 +64,7 @@
                             <div class="section cat-option select-category post-option">
                                 <h4>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h4>
                                 <ul role="tablist">
-                                    <select class="cat-select" name="cat5" id="cat5" multiple id="">
+                                    <select class="cat-select" name="cat5" id="cat5"  data-level="5"  data-value="{{ ad_Detail.cat5 }}" multiple id="">
 
                                     </select>
                                 </ul>
@@ -73,7 +74,7 @@
                             <div class="section cat-option select-category post-option">
                                 <h4>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h4>
                                 <ul role="tablist">
-                                    <select class="cat-select" name="cat6" id="cat6" multiple id="">
+                                    <select class="cat-select" name="cat6" id="cat6"  data-level="6" data-value="{{ ad_Detail.cat6 }}" multiple id="">
 
                                     </select>
                                 </ul>
@@ -83,7 +84,7 @@
                             <div class="section cat-option select-category post-option">
                                 <h4>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h4>
                                 <ul role="tablist">
-                                    <select class="cat-select" name="cat7" id="cat7" multiple id="">
+                                    <select class="cat-select" name="cat7" id="cat7" data-level="7"  data-value="{{ ad_Detail.cat7 }}" multiple id="">
 
                                     </select>
                                 </ul>
@@ -108,7 +109,6 @@
             </div>
         </div>
     </section>
-
     {{ asset_add("scripts.js", "visiosoft.theme.base::js/edit_cats.js") }}
     {{ asset_style("visiosoft.theme.base::css/edit_category.css") }}
 {% endblock %}