From cb0152bfd2b44a39898daa836cd3fe781049ab1f Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Thu, 28 Jan 2021 13:33:37 +0300
Subject: [PATCH] #3189 emlak24 bugs

---
 .../visiosoft/advs-module/src/Adv/AdvCollection.php    | 10 ++++++++++
 .../visiosoft/advs-module/src/Adv/AdvRepository.php    |  7 ++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php
index 855fa19c0..6fd2e6614 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php
@@ -1,6 +1,7 @@
 <?php namespace Visiosoft\AdvsModule\Adv;
 
 use Anomaly\Streams\Platform\Entry\EntryCollection;
+use Carbon\Carbon;
 use Illuminate\Container\Container;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Pagination\Paginator;
@@ -26,4 +27,13 @@ class AdvCollection extends EntryCollection
             'items', 'total', 'perPage', 'currentPage', 'options'
         ));
     }
+
+    public function nonExpired()
+    {
+        return $this->filter(
+            function ($ad) {
+                return $ad->finish_at->gt(Carbon::now());
+            }
+        );
+    }
 }
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
index 0970d1336..8e220d258 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
@@ -475,15 +475,16 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
     {
         $ads = $this
             ->newQuery()
-            ->whereIn('advs_advs.created_by_id', $usersIDs)
-            ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s'));
+            ->whereIn('advs_advs.created_by_id', $usersIDs);
 
         if ($status) {
             $ads = $ads->where('advs_advs.status', 'approved');
         }
 
         if (!$withDraft) {
-            $ads = $ads->where('advs_advs.slug', '!=', "");
+            $ads = $ads
+                ->where('advs_advs.slug', '!=', "")
+                ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s'));
         }
 
         return $ads;