From 23a3a8cdafb95c177e153f2677cf73783ffe30c0 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 4 Feb 2021 10:42:41 +0300
Subject: [PATCH] Move The Buy Package Screen To The End

---
 .../advs-module/resources/views/new-ad/preview/preview.twig   | 4 +++-
 .../advs-module/src/Http/Controller/advsController.php        | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig
index 2945d4193..f90ae9fb3 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig
@@ -11,7 +11,9 @@
         </p>
     </div>
     <div class="preview-actions text-center">
-        {% if isActiveDopings %}
+        {% if isActive('packages') and setting_value('visiosoft.module.packages::move_the_buy_package_to_the_end') %}
+            {% set continueLink = url_route('visiosoft.module.packages::add_package', [adv.id]) %}
+        {% elseif isActive('dopings') %}
             {% set continueLink = url_route('add_doping', [adv.id]) %}
         {% else %}
             {% set continueLink = url_route('adv_detail_seo', [adv.slug, adv.id]) %}
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 e7d890c00..87d3e99c3 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -674,8 +674,7 @@ class AdvsController extends PublicController
 
     public function getCatsForNewAd($id)
     {
-
-        if ($this->adv_model->is_enabled('packages')) {
+        if ($this->adv_model->is_enabled('packages') and !setting_value('visiosoft.module.packages::move_the_buy_package_to_the_end')) {
             $cats = app('Visiosoft\PackagesModule\Http\Controller\PackageFEController')->AdLimitForCategorySelection($id);
         } else {
             $cats = $this->getCats($id);