diff --git a/addons/default/visiosoft/advs-module/resources/js/cats.js b/addons/default/visiosoft/advs-module/resources/js/cats.js index 5b12fb73e..d6d3d2921 100644 --- a/addons/default/visiosoft/advs-module/resources/js/cats.js +++ b/addons/default/visiosoft/advs-module/resources/js/cats.js @@ -5,6 +5,20 @@ function showLoader() { function hideLoader() { $('.loading-cart').remove(); } +$("#catSelectionStepForm").submit(function(e) { + var val = $("input[type=submit][clicked=true]").data('pack-id'); + + $("").attr("type", "hidden") + .attr("name", "pack_id") + .attr("value", val) + .appendTo(this); + + return true; +}); +$("#catSelectionStepForm").on('click', 'input[type=submit]', function() { + $("input[type=submit]", $(this).parents("form")).removeAttr("clicked"); + $(this).attr("clicked", "true"); +}); $(document).ready(function () { $('select[name="cat1"], select[name="cat2"], select[name="cat3"], select[name="cat4"], select[name="cat5"], ' + @@ -26,7 +40,18 @@ $(document).ready(function () { let btn = ''; if (response['link']) { - btn = ""+response['continueBtn']+""; + const res = response['link'] + if (Array.isArray(res)) { + btn = ''; + res.forEach(function (link) { + btn += ` + + ` + }) + } else { + btn = ""+response['continueBtn']+""; + } } let content; if (response['msg']) { 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 19550cb57..1a317cc9b 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 @@ -12,7 +12,7 @@ {{ trans('visiosoft.module.advs::field.select_category_step_by_step') }} -
+ {% for i in 1..10 %} {% endfor %} 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 855a517a7..9357e4c1d 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -843,17 +843,27 @@ class AdvsController extends PublicController return redirect('/advs/edit_advs/' . $request->update_id)->with('cats_d', $cats_d)->with('request', $request); } event(new CreatedAd($adv)); - if ($allowPendingAdCreation) { - return redirect(route("visiosoft.module.packages::buy_package") . '?ad_id=' . $adv->id . '&category_id=' . $adv->cat1); - } else { - return redirect(route('advs_preview', [$request->update_id])); - } + return redirect(route('advs_preview', [$request->update_id])); } - /* New Create Adv */ + /* New Create Adv */ $request->publish_at = date('Y-m-d H:i:s'); $all = $request->all(); + + $packageEnabled = $advModel->is_enabled('packages'); + if ($packageEnabled) { + unset($all['pack_id']); + } + $new = AdvModel::query()->create($all); + + 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); + } + return redirect('/advs/edit_advs/' . $new->id); }