diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/post-cat.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/post-cat.twig index 1a317cc9b..6c6aba785 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/post-cat.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/post-cat.twig @@ -56,5 +56,8 @@ + + {{ addBlock('post-cat/section') }} + {{ asset_add("scripts.js", "visiosoft.module.advs::js/cats.js") }} {% endblock %} 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 d09874ce9..615f1d37f 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -801,7 +801,13 @@ class AdvsController extends PublicController } // Auto approve - if (setting_value('visiosoft.module.advs::auto_approve') && !$allowPendingAdCreation) { + $autoApprove = true; + if ($allowPendingAdCreation) { + $adLogExists = app('Visiosoft\PackagesModule\AdvsLog\Contract\AdvsLogRepositoryInterface') + ->findByAdID($adv->id); + $autoApprove = $adLogExists ? false : true; + } + if (setting_value('visiosoft.module.advs::auto_approve') && $autoApprove) { $defaultAdPublishTime = setting_value('visiosoft.module.advs::default_published_time'); $adv->update([ 'status' => 'approved', @@ -863,8 +869,12 @@ class AdvsController extends PublicController if ($packageEnabled && \request()->pack_id && setting_value('visiosoft.module.packages::allow_pending_ad_creation')) { - app('Visiosoft\PackagesModule\Http\Controller\PackageFEController') - ->packageAddCart(\request()->pack_id, $new->id); + $package = app('Visiosoft\PackagesModule\Package\Contract\PackageRepositoryInterface') + ->find(\request()->pack_id); + if ($package->price) { + app('Visiosoft\PackagesModule\Http\Controller\PackageFEController') + ->packageAddCart(\request()->pack_id, $new->id); + } } return redirect('/advs/edit_advs/' . $new->id);