From d1a676b40929e406a4275ecbc3cf8127d6f1c559 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 19 Aug 2021 18:05:59 +0300 Subject: [PATCH 1/3] #4452 [evdepismis-theme] Create theme --- .../src/Http/Controller/AjaxController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php b/addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php index 0d804293c..99bcc22a7 100644 --- a/addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php +++ b/addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php @@ -51,6 +51,12 @@ class AjaxController extends PublicController $id = explode(',', $this->request->id); $query = $this->cityRepository->getModel()->whereIn('parent_country_id', $id); + if ($this->request->search) { + $query->where('name', 'like', '%' . $this->request->search . '%'); + } + + $query->get(); + return $this->queryOrder($query, $this->cityRepository); } } @@ -154,4 +160,4 @@ class AjaxController extends PublicController } } -} \ No newline at end of file +} From 4e9c97560e0929b951b756e53aabec7bc1127d50 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 26 Aug 2021 15:07:57 +0300 Subject: [PATCH 2/3] Show Horizontal Menu Icons --- .../cats-module/src/Category/CategoryModel.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php index 24c2fbd02..d2df1bab8 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php @@ -1,10 +1,26 @@ icon === null) { + return $this->dispatch(new MakeImageInstance('visiosoft.module.advs::images/listing/sample-cat-icon.svg', 'img'))->url(); + } + + return url($this->icon); + } + public function getCat($id) { return CategoryModel::query() From 05996ac85558448d28a44a6d93dc95b70715a7a3 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 26 Aug 2021 15:09:35 +0300 Subject: [PATCH 3/3] fix --- .../location-module/src/Http/Controller/AjaxController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php b/addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php index 99bcc22a7..50e5ebc7c 100644 --- a/addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php +++ b/addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php @@ -55,8 +55,6 @@ class AjaxController extends PublicController $query->where('name', 'like', '%' . $this->request->search . '%'); } - $query->get(); - return $this->queryOrder($query, $this->cityRepository); } }