Merge pull request #528 from openclassify/dia

#1123 tregtaret.com search search bar changes.

addons/default/visiosoft/advs-module/resources/js/filter_modal.js

@@ -7,7 +7,6 @@ $('.edit-category-filter-modal').on('click', function () {
     $('#categoryModal').modal('toggle');
 })
 
-
 function crud(params, url, type, callback) {
     $.ajax({
         type: type,
@@ -143,7 +142,3 @@ $('.set_category').on('click', function () {
     $('#filterModal').find('form').attr("action", '/advs/list');
     $('#filterModal').modal('toggle');
 })
-
-
-
-

addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig

@@ -63,11 +63,13 @@
         </div>
     </div>
 </div>
-<script>
+{% if not allCats %}
-    var key = 1;
+    <script>
+        var key = 1;
 
-    $.each({{ mainCats|json_encode|raw }}, function (index, value) {
+        $.each({{ mainCats|json_encode|raw }}, function (index, value) {
-        categories['cat' + key] = value.id;
+            categories['cat' + key] = value.id;
-        key++;
+            key++;
-    });
+        });
-</script>
+    </script>
+{% endif %}

addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig

@@ -30,6 +30,7 @@
                         'checkboxes':checkboxes,
                         'topfields' : topfields,
                         'selectRange' : selectRange,
+                        'selectImage' : selectImage,
                         'radio':radio,
                         'countries':countries,
                         'cities':cities,

addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php

@@ -60,15 +60,6 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
      * @type array|null
      */
     protected $routes = [
-        // 'admin/advs/cf_values'           => 'Visiosoft\AdvsModule\Http\Controller\Admin\CfValuesController@index',
-        // 'admin/advs/cf_values/create'    => 'Visiosoft\AdvsModule\Http\Controller\Admin\CfValuesController@create',
-        // 'admin/advs/cf_values/edit/{id}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\CfValuesController@edit',
-        // 'admin/advs/custom_field_advs'           => 'Visiosoft\AdvsModule\Http\Controller\Admin\CustomFieldAdvsController@index',
-        // 'admin/advs/custom_field_advs/create'    => 'Visiosoft\AdvsModule\Http\Controller\Admin\CustomFieldAdvsController@create',
-        // 'admin/advs/custom_field_advs/edit/{id}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\CustomFieldAdvsController@edit',
-        // 'admin/advs/custom_fields'           => 'Visiosoft\AdvsModule\Http\Controller\Admin\CustomFieldsController@index',
-        // 'admin/advs/custom_fields/create'    => 'Visiosoft\AdvsModule\Http\Controller\Admin\CustomFieldsController@create',
-        // 'admin/advs/custom_fields/edit/{id}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\CustomFieldsController@edit',
         'admin/advs/advs' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@index',
         'admin/advs/advs/create' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@create',
         'admin/advs/advs/edit/{id}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@edit',

addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php

@@ -257,6 +257,7 @@ class AdvsController extends PublicController
             $subCats = $this->category_repository->getSubCatById($categoryId->id);
         } else {
             $mainCats = $this->category_repository->mainCats();
+            $allCats = true;
         }
 
         if ($isActiveCustomFields) {
@@ -264,6 +265,7 @@ class AdvsController extends PublicController
             $checkboxes = $returnvalues['checkboxes'];
             $topfields = $returnvalues['topfields'];
             $selectRange = $returnvalues['selectRange'];
+            $selectImage = $returnvalues['selectImage'];
             $ranges = $returnvalues['ranges'];
             $radio = $returnvalues['radio'];
         }
@@ -277,8 +279,8 @@ class AdvsController extends PublicController
         $viewType = $this->requestHttp->cookie('viewType');
 
         $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'request', 'param',
-            'user', 'featured_advs', 'viewType', 'topfields', 'selectRange', 'ranges', 'seenList', 'searchedCountry',
+            'user', 'featured_advs', 'viewType', 'topfields', 'selectRange', 'selectImage', 'ranges', 'seenList',
-            'radio', 'categoryId', 'cityId');
+            'searchedCountry', 'radio', 'categoryId', 'cityId', 'allCats');
 
         return $this->viewTypeBasedRedirect($viewType, $compact);
     }

addons/default/visiosoft/media-field_type/resources/css/imgList.css

@@ -1,6 +1,6 @@
-
 .ads-box-image {
     padding: 5px;
+    transition: transform 0.2s;
 }
 
 .ads-responsive-image {