From b5a7634fdfac126c342d5fb25a1de412748b9bd2 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Wed, 20 Nov 2019 12:50:07 +0300
Subject: [PATCH 1/2] Default country in listing #152 #153

---
 .../visiosoft/advs-module/src/Adv/AdvModel.php     |  6 +++---
 .../advs-module/src/AdvsModuleServiceProvider.php  | 14 +++++++++++---
 .../src/Http/Controller/CategoriesController.php   | 14 +++++++++++++-
 .../src/Http/Controller/advsController.php         |  4 +++-
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
index cf8394d33..419f54151 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
@@ -228,12 +228,12 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
             $id = $object->id;
             $seo = str_slug($object->name);
             $seo = str_replace('_', '-', $seo);
-            return \route('adv_detail_seo', [$id, $seo]);
+            return \route('adv_detail_seo', [$seo, $id]);
         }
         $id = $object->getObject()->id;
         $seo = str_slug($object->getObject()->name);
         $seo = str_replace('_', '-', $seo);
-        return \route('adv_detail_seo', [$id, $seo]);
+        return \route('adv_detail_seo', [$seo, $id]);
     }
 
     public function getAdvDetailLinkByAdId($id)
@@ -243,7 +243,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
             $id = $adv->id;
             $seo = str_slug($adv->name);
             $seo = str_replace('_', '-', $seo);
-            return \route('adv_detail_seo', [$id, $seo]);
+            return \route('adv_detail_seo', [$seo, $id]);
         }
     }
 
diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
index b97412b8c..15f86fd76 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
@@ -110,11 +110,19 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
         ],
         'getlocations' => 'Visiosoft\AdvsModule\Http\Controller\advsController@getLocations',
         'advs/main' => 'Visiosoft\AdvsModule\Http\Controller\advsController@advsMainPage',
-        'advs/adv/{id}' => [
+//        'advs/adv/{id}' => [
+//            'as' => 'adv_detail',
+//            'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
+//        ],
+//        'advs/adv/{id}/{seo}' => [
+//            'as' => 'adv_detail_seo',
+//            'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
+//        ],
+        'ad/{id}' => [
             'as' => 'adv_detail',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
         ],
-        'advs/adv/{id}/{seo}' => [
+        'ad/{seo}/{id}' => [
             'as' => 'adv_detail_seo',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
         ],
@@ -123,7 +131,7 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@map'
         ],
         'advs/categories' => 'Visiosoft\AdvsModule\Http\Controller\CategoriesController@index',
-        'advs/categories/{cat}' => 'Visiosoft\AdvsModule\Http\Controller\CategoriesController@listByCat',
+        'advs/c/{cat}' => 'Visiosoft\AdvsModule\Http\Controller\CategoriesController@listByCat',
         'advs/module_active' => 'Visiosoft\AdvsModule\Http\Controller\advsController@index',
         'advs/create_adv' => [
             'as' => "create_adv",
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php
index 3329bb931..05d8fba37 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php
@@ -8,12 +8,24 @@ class CategoriesController extends PublicController {
 
     public function listByCat($cat) {
         $advs = DB::table('advs_advs')
-            ->where('category_id', $cat)
+            ->where('cat1', $cat)
+            ->orwhere('cat2', $cat)
+            ->orwhere('cat3', $cat)
+            ->orwhere('cat4', $cat)
+            ->orwhere('cat5', $cat)
+            ->orwhere('cat6', $cat)
+            ->orwhere('cat7', $cat)
             ->leftJoin('users_users as u1', 'advs_advs.created_by_id', '=', 'u1.id')
             ->leftJoin('advs_advs_translations as t1', 'advs_advs.id', '=', 't1.id')
             ->select('advs_advs.*','u1.username as owner', 't1.name as name')
             ->get();
 
+        foreach ($advs as $adv) {
+            if (strpos($adv->cover_photo, 'http') !== 0 && strpos($adv->cover_photo, '/') !== 0) {
+                $adv->cover_photo = "/$adv->cover_photo";
+            }
+        }
+
         return $this->view->make('visiosoft.module.advs::list/list', compact('advs'));
     }
 }
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 f5ed48863..61dad7c5c 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -245,8 +245,10 @@ class AdvsController extends PublicController
         return redirect($this->request->headers->get('referer'));
     }
 
-    public function view($id)
+    public function view($seo, $id = null)
     {
+        $id = is_null($id) ? $seo : $id;
+
         $categories = array();
         $categories_id = array();
         $isActiveComplaints = $this->adv_model->is_enabled('complaints');

From 533609d471145919263e34180d36fd0086fdb6ca Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Wed, 20 Nov 2019 18:41:41 +0300
Subject: [PATCH 2/2] remove comment from link service provider

---
 .../src/AdvsModuleServiceProvider.php            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
index 15f86fd76..029663d5e 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
@@ -110,14 +110,14 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
         ],
         'getlocations' => 'Visiosoft\AdvsModule\Http\Controller\advsController@getLocations',
         'advs/main' => 'Visiosoft\AdvsModule\Http\Controller\advsController@advsMainPage',
-//        'advs/adv/{id}' => [
-//            'as' => 'adv_detail',
-//            'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
-//        ],
-//        'advs/adv/{id}/{seo}' => [
-//            'as' => 'adv_detail_seo',
-//            'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
-//        ],
+        'advs/adv/{id}' => [
+            'as' => 'adv_detail',
+            'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
+        ],
+        'advs/adv/{id}/{seo}' => [
+            'as' => 'adv_detail_seo',
+            'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
+        ],
         'ad/{id}' => [
             'as' => 'adv_detail',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'