From 32e5e2e299fb7bba9e7ad39c1340244653768f27 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Mon, 30 Nov 2020 17:27:53 +0300
Subject: [PATCH 1/2] #2773 emlak24 edit all area

---
 .../visiosoft/advs-module/resources/lang/en/message.php      | 2 ++
 .../advs-module/src/Http/Controller/advsController.php       | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/message.php b/addons/default/visiosoft/advs-module/resources/lang/en/message.php
index 2ee555855..f99494a88 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/message.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/message.php
@@ -27,4 +27,6 @@ return [
     'ad_doesnt_exist' => "This ad doesn't exist!",
     'select_location_error' => "Please select a location on the map!",
     'this_ad_is_not_valid_anymore' => "This ad is not valid anymore!",
+    'approve_status_change' => "Your Ad's Status Has Been Set to Active!",
+    'passive_status_change' => "Your Ad's Status Has Been Set to Passive!",
 ];
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 6704aef1d..9cca027ba 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -980,7 +980,10 @@ class AdvsController extends PublicController
 
         $this->adv_model->statusAds($id, $type);
         event(new ChangedStatusAd($ad));//Create Notify
-        $this->messages->success(trans('streams::message.edit_success', ['name' => trans('visiosoft.module.advs::field.status.name')]));
+        $message = $type === 'approved' ?
+            trans('visiosoft.module.advs::message.approve_status_change')
+            : trans('visiosoft.module.advs::message.passive_status_change');
+        $this->messages->success($message);
         return back();
     }
 

From 70677ab331b9e9742d6b77075783f06ceb940e24 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Mon, 30 Nov 2020 17:38:24 +0300
Subject: [PATCH 2/2] #2773 emlak24 edit all area

---
 .../advs-module/src/Http/Controller/advsController.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9cca027ba..1add67b50 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -484,7 +484,7 @@ class AdvsController extends PublicController
 
         $adv = $this->adv_repository->getListItemAdv($id);
 
-        if ($adv && (!$adv->expired() || $adv->created_by_id === \auth()->id())) {
+        if ($adv && ((!$adv->expired() && $adv->getStatus() === 'approved') || $adv->created_by_id === \auth()->id())) {
             // Check if created by exists
             if (!$adv->created_by) {
                 $this->messages->error('visiosoft.module.advs::message.this_ad_is_not_valid_anymore');