From f97a2f48373235d70cc7a9db2c0a2209c67a1d45 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Fri, 14 Feb 2020 16:40:20 +0300
Subject: [PATCH 1/2] remove old function

---
 .../advs-module/src/Adv/AdvRepository.php     | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
index 72a29e2a8..324072197 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
@@ -142,7 +142,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
         }
 
         if ($this->model->is_enabled('customfields')) {
-            $query = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->filterSearch($customParameters, $query);
+            $query = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->filterSearch($customParameters, $param, $query);
         }
 
 
@@ -160,29 +160,6 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
             $query = $query->whereRaw($column);
         }
 
-        foreach ($param as $para => $value) {
-            if (substr($para, 4, 3) === "cf_") {
-                $id = substr($para, 7);
-                $minmax = substr($para, 0, 3);
-                if ($minmax == 'min') {
-
-                    $num = $param[$minmax . '_cf_' . $id];
-                    $int = (int)$num;
-                    $column = "JSON_EXTRACT(cf_json, '$.cf" . $id . "') >= '" . $int . "'";
-                    $query = $query->whereRaw($column);
-
-                }
-                if ($minmax == 'max') {
-
-                    $num = $param[$minmax . '_cf_' . $id];
-                    $int = (int)$num;
-                    $column = "JSON_EXTRACT(cf_json, '$.cf" . $id . "') <= '" . $int . "'";
-                    $query = $query->whereRaw($column);
-
-                }
-            }
-        }
-
 
 //        //UPDATE `default_advs_advs` SET `coor` = (PointFromText('POINT(41.085022 28.804754)')) WHERE `default_advs_advs`.`id` = 8
 //        //SELECT * FROM `default_advs_advs` WHERE ST_DISTANCE(ST_GeomFromText('POINT(41.0709052 28.829627)'), coor) < 20

From 25e1630b3079ca156498a7ab83f5ed68f52827fd Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Fri, 14 Feb 2020 17:13:15 +0300
Subject: [PATCH 2/2] fixed sort by

---
 .../advs-module/src/Adv/AdvRepository.php        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
index 324072197..7e5532cc1 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
@@ -176,10 +176,10 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
         if (!empty($param['sort_by'])) {
             switch ($param['sort_by']) {
                 case "sort_price_up":
-                    $query = $query->orderBy('price', 'desc');
+                    $query = $query->orderBy('advs_advs.price', 'desc');
                     break;
                 case "sort_price_down":
-                    $query = $query->orderBy('price', 'asc');
+                    $query = $query->orderBy('advs_advs.price', 'asc');
                     break;
                 case "sort_time":
                     $query = $query->orderBy('advs_advs.created_at', 'desc');
@@ -187,12 +187,12 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
             }
         } else {
             $query = $query->orderBy('advs_advs.created_at', 'desc');
-            if ($isActiveDopings) {
-                $query = app('Visiosoft\DopingsModule\Http\Controller\DopingsController')->querySelect($query, $param);
-            } else {
-                $query = $query->select('advs_advs.*', 'advs_advs_translations.name as name',
-                    'advs_advs_translations.advs_desc as advs_desc');
-            }
+        }
+        if ($isActiveDopings) {
+            $query = app('Visiosoft\DopingsModule\Http\Controller\DopingsController')->querySelect($query, $param);
+        } else {
+            $query = $query->select('advs_advs.*', 'advs_advs_translations.name as name',
+                'advs_advs_translations.advs_desc as advs_desc');
         }
 
         if ($type == "list") {