From 6ed0baac4a4b6e1b5ebc531011f22c3790d5af13 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 12 Mar 2020 16:47:07 +0300
Subject: [PATCH 1/2] #988

---
 .../advs-module/resources/views/new-ad/new-create.twig          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
index d8c103ae4..d4dac3d87 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
@@ -50,7 +50,7 @@
                                         {{ form.fields.slug|raw }}
                                     </div>
                                 </div>
-                                {{ addBlock('new-ad/fields')|raw }}
+                                {{ addBlock('new-ad/fields',{'adv':adv})|raw }}
                                 <div class="row form-group select-price">
                                     <label class="col-sm-2 col-xs-12">
                                         {{ form.fields.price.label|raw }}

From 11e04efed6e59318e8d3e11ad10a0936a17da61d Mon Sep 17 00:00:00 2001
From: alp <alp@visiosoft.com.tr>
Date: Sat, 14 Mar 2020 14:42:43 +0300
Subject: [PATCH 2/2] Profile ads fixed

---
 .../advs-module/resources/lang/en/field.php      |  7 ++-----
 .../advs-module/resources/lang/tr/field.php      |  7 ++-----
 .../visiosoft/advs-module/src/Adv/AdvModel.php   | 16 ++++------------
 .../src/Http/Controller/AjaxController.php       |  9 ++-------
 .../src/Http/Controller/advsController.php       |  6 ------
 .../profile-module/resources/assets/js/ads.js    | 10 ++++++----
 .../profile-module/resources/lang/tr/button.php  |  2 +-
 .../resources/views/profile/ads.twig             |  8 +-------
 8 files changed, 18 insertions(+), 47 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 ab464270d..f3902def4 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php
@@ -93,10 +93,7 @@ return [
         ]
     ],
     'pending_adv' => [
-        'name' => 'Pending Ads'
-    ],
-    'archived_adv' => [
-        'name' => 'Archived Ads'
+        'name' => 'Unpublished'
     ],
     'finish_at' => [
         'name' => 'Finish At'
@@ -202,7 +199,7 @@ return [
     'total' => 'Total',
     'quantity' => 'Quantity',
     'view_cart' => 'View Cart',
-    'no_ads' => 'No Ads!',
+    'no_ads' => 'No Ads found.',
     'show_display_mode' => [
         'map' => 'Map',
         'list' => 'List',
diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
index d87a22dae..1e11cb95e 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
@@ -93,10 +93,7 @@ return [
         ]
     ],
     'pending_adv' => [
-        'name' => 'Bekleyen İlanlar'
-    ],
-    'archived_adv' => [
-        'name' => 'Arşivlenmiş İlanlar'
+        'name' => 'Yayında olmayan'
     ],
     'finish_at' => [
         'name' => 'Bitiş Saati'
@@ -204,7 +201,7 @@ return [
     'total' => 'Genel Toplam',
     'quantity' => 'Adet',
     'view_cart' => 'Sepeti Görüntüle',
-    'no_ads' => 'İlansız!',
+    'no_ads' => 'İlan bulunamadı!',
     'show_display_mode' => [
         'map' => 'harita',
         'list' => 'Liste',
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
index b09c01c22..ead31e33d 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
@@ -95,20 +95,12 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
     public function pendingAdvsByUser()
     {
         return $this->userAdv()
-            ->where('advs_advs.status', '<>', 'approved')
-            ->where('advs_advs.status', '<>', 'declined')
-            ->where('advs_advs.status', '<>', 'passive')
-            ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s'))
-            ->orWhereNull('advs_advs.finish_at');
+                    ->where(function($query) {
+                        $query->where('advs_advs.status', '<>', 'approved');
+                        $query->orWhere('advs_advs.finish_at', '<', date('Y-m-d H:i:s'));
+                     });
     }
 
-    public function archivedAdvsByUser()
-    {
-        return $this->userAdv()
-            ->where('advs_advs.finish_at', '<', date('Y-m-d H:i:s'))
-            ->orWhere('advs_advs.status', 'passive')
-            ->WhereNotNull('advs_advs.finish_at');
-    }
 
     public function favsAdvsByUser($fav_ids)
     {
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/AjaxController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/AjaxController.php
index 901fe5621..33d54e4cb 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/AjaxController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AjaxController.php
@@ -70,17 +70,12 @@ class AjaxController extends PublicController
         if ($type == 'pending') {
             $page_title = trans('visiosoft.module.advs::field.pending_adv.name');
             $my_advs = $my_advs->pendingAdvsByUser();
-
-        } else if ($type == 'passive') {
-            $page_title = trans('visiosoft.module.advs::field.archived_adv.name');
-            $my_advs = $my_advs->archivedAdvsByUser();
-
         } else {
             $page_title = trans('visiosoft.module.advs::field.my_adv.name');
             $my_advs = $my_advs->myAdvsByUser();
         }
-        $my_advs = $my_advs->orderByDesc('id')->select(['id', 'cover_photo', 'slug', 'price',
-            'currency', 'city', 'country_id', 'cat1', 'cat2', 'status']);
+        $my_advs = $my_advs->select(['id', 'cover_photo', 'slug', 'price', 'currency', 'city', 'country_id', 'cat1', 'cat2', 'status'])
+                           ->orderByDesc('id');
         $my_advs = $advRepository->addAttributes($my_advs->get());
 
         foreach ($my_advs as $index => $ad) {
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 101e7f943..57fc649a1 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -818,11 +818,6 @@ class AdvsController extends PublicController
         if ($type == 'pending') {
             $page_title = trans('visiosoft.module.advs::field.pending_adv.name');
             $my_advs = $my_advs->pendingAdvsByUser();
-
-        } else if ($type == 'archived') {
-            $page_title = trans('visiosoft.module.advs::field.archived_adv.name');
-            $my_advs = $my_advs->archivedAdvsByUser();
-
         } else if ($type == 'favs') {
             //Get Favorites Advs
             $isActiveFavs = new AdvModel();
@@ -843,7 +838,6 @@ class AdvsController extends PublicController
         } else {
             $page_title = trans('visiosoft.module.advs::field.my_adv.name');
             $my_advs = $my_advs->myAdvsByUser();
-
         }
         $my_advs = $my_advs->orderByDesc('id');
         $my_advs = $advRepository->addAttributes($my_advs->get());
diff --git a/addons/default/visiosoft/profile-module/resources/assets/js/ads.js b/addons/default/visiosoft/profile-module/resources/assets/js/ads.js
index 8f5acc203..275fe0d78 100644
--- a/addons/default/visiosoft/profile-module/resources/assets/js/ads.js
+++ b/addons/default/visiosoft/profile-module/resources/assets/js/ads.js
@@ -33,6 +33,11 @@ function changePage(page)
 
     listing_table.html("");
 
+    if(objJson.length == 0) {
+        listing_table.html('<div class="alert alert-warning" role="alert">' +
+                            no_ads_message +
+                            '</div>');
+    }
     for (var i = (page-1) * records_per_page; i < (page * records_per_page) && i < objJson.length; i++) {
         listing_table.append(addAdsRow(objJson[i].id, objJson[i].detail_url, objJson[i].cover_photo, objJson[i].name,
             objJson[i].price + " " + objJson[i].currency,
@@ -158,7 +163,4 @@ function dropdownRow(id, type) {
     dropdown += "</div></div>";
     return dropdown;
 
-}
-
-
-
+}
\ No newline at end of file
diff --git a/addons/default/visiosoft/profile-module/resources/lang/tr/button.php b/addons/default/visiosoft/profile-module/resources/lang/tr/button.php
index 8904d19ef..6c7ec8fb1 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/tr/button.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/tr/button.php
@@ -8,7 +8,7 @@ return [
     'update_profile' => 'Profili Güncelle',
     'delete' => 'Sil',
     'extend' => 'Süre Uzat',
-    'extend_all' => 'Tümünü Genişlet',
+    'extend_all' => 'Tümünün Süresini Uzat',
     'edit' => 'Düzenle',
     'go_profile' => 'Profil Detayları',
     'go_user' => 'Kullanıcı Detayları',
diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/ads.twig b/addons/default/visiosoft/profile-module/resources/views/profile/ads.twig
index a52293ce0..1e89c13a1 100644
--- a/addons/default/visiosoft/profile-module/resources/views/profile/ads.twig
+++ b/addons/default/visiosoft/profile-module/resources/views/profile/ads.twig
@@ -23,13 +23,6 @@
                                role="tab" aria-controls="nav-pending" aria-selected="true">
                                 {{ trans('visiosoft.module.advs::field.pending_adv.name') }}
                             </a>
-                            <a class="nav-item nav-link text-dark" data-type="passive" id="nav-archived-tab"
-                               data-toggle="tab"
-                               href="#nav-passive"
-                               role="tab" aria-controls="nav-passive"
-                               aria-selected="true">
-                                {{ trans('visiosoft.module.advs::field.archived_adv.name') }}
-                            </a>
                         </div>
                     </nav>
                     <div class="bg-dark p-2 mt-2 rounded">
@@ -72,6 +65,7 @@
         var extend_ad = "{{ trans('visiosoft.module.profile::button.extend') }}";
         var edit_ad = "{{ trans('visiosoft.module.profile::button.edit') }}";
         var ads_per_page = "{{ setting_value('streams::per_page') }}";
+        var no_ads_message = "{{ trans('visiosoft.module.advs::field.no_ads') }}";
     </script>
     {{ asset_add('scripts.js','visiosoft.module.profile::assets/js/ads.js') }}
 {% endblock %}
\ No newline at end of file