From 4e5bc7cd4aefc34bb4c5170c78327aae47217090 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Wed, 7 Oct 2020 11:02:19 +0300
Subject: [PATCH] #2278 Emlak24 Bugs 10.5.20

---
 addons/default/visiosoft/advs-module/src/Adv/AdvModel.php   | 6 ++++++
 .../visiosoft/advs-module/src/Adv/Contract/AdvInterface.php | 1 +
 .../advs-module/src/Http/Controller/advsController.php      | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
index 3e0b283ac..bf879d2ad 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
@@ -2,6 +2,7 @@
 
 use Anomaly\Streams\Platform\Image\Command\MakeImageInstance;
 use Anomaly\Streams\Platform\Model\Advs\AdvsCustomFieldsEntryModel;
+use Carbon\Carbon;
 use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -371,4 +372,9 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
         $neighborhood = $neighborhoodModel->newQuery()->find($this->neighborhood);
         return $neighborhood ? $neighborhood->name : false;
     }
+
+    public function expired()
+    {
+        return $this->finish_at ? $this->finish_at < Carbon::now() : true;
+    }
 }
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
index 6f022c006..a9cb314fd 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
@@ -4,4 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
 
 interface AdvInterface extends EntryInterface
 {
+    public function expired();
 }
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 15adeb88b..bea56a763 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -433,7 +433,7 @@ class AdvsController extends PublicController
 
         $adv = $this->adv_repository->getListItemAdv($id);
 
-        if ($adv) {
+        if ($adv && !$adv->expired()) {
 
             if ($this->adv_model->is_enabled('complaints')) {
                 $complaints = ComplaintsComplainTypesEntryModel::all();