Merge pull request #766 from openclassify/dia

#2529 e-madencilik ilan verme

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');
+
+    $("<input />").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 = '<button type="submit" class="btn-1">'+response['continueBtn']+'</button>';
                     if (response['link']) {
-                        btn = "<a class='link-unstyled btn-1 text-white' href='"+response['link']+"' role='button'>"+response['continueBtn']+"</a>";
+                        const res = response['link']
+                        if (Array.isArray(res)) {
+                            btn = '';
+                            res.forEach(function (link) {
+                                btn += `
+                                    <input type="submit" data-pack-id="${link.packID}" class="btn-1 mb-2"
+                                        value="${response['continueBtn']}` + ' ' + `(${link.price})" />
+                                `
+                            })
+                        } else {
+                            btn = "<a class='link-unstyled btn-1 text-white' href='"+res+"' role='button'>"+response['continueBtn']+"</a>";
+                        }
                     }
                     let content;
                     if (response['msg']) {

addons/default/visiosoft/advs-module/resources/views/new-ad/post-cat.twig

@@ -12,7 +12,7 @@
                 <img src="{{ img('visiosoft.module.advs::images/ascend.svg').url }}" class="step-icon mr-1">
                 {{ trans('visiosoft.module.advs::field.select_category_step_by_step') }}
             </h5>
-            <form action="{{ url_route('visiosoft.module.advs::post_cat') }}" method="post">
+            <form action="{{ url_route('visiosoft.module.advs::post_cat') }}" method="post" id="catSelectionStepForm">
                 {% for i in 1..10 %}
                     <input type="hidden" name="cat{{ i }}">
                 {% endfor %}

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('advs_preview', [$request->update_id]));
-                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]));
-            }
         }
 
-        /* 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);
     }