Merge pull request #2254 from suraj-webkul/issue#2234

issue #2234 fixed.

Author: VikassWebkul214254

packages/Webkul/Admin/src/Http/Controllers/Lead/LeadController.php

@@ -157,20 +157,24 @@ public function store(LeadForm $request): RedirectResponse
     {
         Event::dispatch('lead.create.before');
 
-        $data = $request->all();
+        $data = request()->all();
 
         $data['status'] = 1;
 
-        if (isset($data['lead_pipeline_stage_id'])) {
+        if (! empty($data['lead_pipeline_stage_id'])) {
             $stage = $this->stageRepository->findOrFail($data['lead_pipeline_stage_id']);
 
             $data['lead_pipeline_id'] = $stage->lead_pipeline_id;
         } else {
-            $pipeline = $this->pipelineRepository->getDefaultPipeline();
+            if (empty($data['lead_pipeline_id'])) {
+                $pipeline = $this->pipelineRepository->getDefaultPipeline();
 
-            $stage = $pipeline->stages()->first();
+                $data['lead_pipeline_id'] = $pipeline->id;
+            } else {
+                $pipeline = $this->pipelineRepository->findOrFail($data['lead_pipeline_id']);
+            }
 
-            $data['lead_pipeline_id'] = $pipeline->id;
+            $stage = $pipeline->stages()->first();
 
             $data['lead_pipeline_stage_id'] = $stage->id;
         }
@@ -185,7 +189,11 @@ public function store(LeadForm $request): RedirectResponse
 
         session()->flash('success', trans('admin::app.leads.create-success'));
 
-        return redirect()->route('admin.leads.index', $data['lead_pipeline_id']);
+        if (! empty($data['lead_pipeline_id'])) {
+            $params['pipeline_id'] = $data['lead_pipeline_id'];
+        }
+
+        return redirect()->route('admin.leads.index', $params ?? []);
     }
 
     /**

packages/Webkul/Admin/src/Resources/views/leads/create.blade.php

@@ -39,11 +39,20 @@ class="primary-button"
             </div>
 
             @if (request('stage_id'))
-                <input 
-                    type="hidden" 
-                    id="lead_pipeline_stage_id" 
-                    name="lead_pipeline_stage_id" 
-                    value="{{ request('stage_id') }}" 
+                <input
+                    type="hidden"
+                    id="lead_pipeline_stage_id"
+                    name="lead_pipeline_stage_id"
+                    value="{{ request('stage_id') }}"
+                />
+            @endif
+
+            @if (request('pipeline_id'))
+                <input
+                    type="hidden"
+                    id="lead_pipeline_id"
+                    name="lead_pipeline_id"
+                    value="{{ request('pipeline_id') }}"
                 />
             @endif
 
@@ -57,13 +66,13 @@ class="primary-button"
     {!! view_render_event('admin.leads.create.form.after') !!}
 
     @pushOnce('scripts')
-        <script 
+        <script
             type="text/x-template"
             id="v-lead-create-template"
         >
             <div class="box-shadow flex flex-col gap-4 rounded-lg border border-gray-200 bg-white dark:border-gray-800 dark:bg-gray-900">
                 {!! view_render_event('admin.leads.edit.form_controls.before') !!}
-                
+
                 <div class="flex w-full gap-2 border-b border-gray-200 dark:border-gray-800">
                     <!-- Tabs -->
                     <template
@@ -93,8 +102,8 @@ class="primary-button"
                     {!! view_render_event('admin.leads.create.details.before') !!}
 
                     <!-- Details section -->
-                    <div 
-                        class="flex flex-col gap-4" 
+                    <div
+                        class="flex flex-col gap-4"
                         id="lead-details"
                     >
                         <div class="flex flex-col gap-1">
@@ -142,7 +151,7 @@ class="flex flex-col gap-4"
                                         ]"
                                     />
                                 </div>
-                                    
+
                                 <div class="w-full">
                                     <x-admin::attributes
                                         :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
@@ -169,8 +178,8 @@ class="flex flex-col gap-4"
                     {!! view_render_event('admin.leads.create.contact_person.before') !!}
 
                     <!-- Contact Person -->
-                    <div 
-                        class="flex flex-col gap-4" 
+                    <div
+                        class="flex flex-col gap-4"
                         id="contact-person"
                     >
                         <div class="flex flex-col gap-1">
@@ -192,8 +201,8 @@ class="flex flex-col gap-4"
                     {!! view_render_event('admin.leads.create.contact_person.after') !!}
 
                     <!-- Product Section -->
-                    <div 
-                        class="flex flex-col gap-4" 
+                    <div
+                        class="flex flex-col gap-4"
                         id="products"
                     >
                         <div class="flex flex-col gap-1">
@@ -212,7 +221,7 @@ class="flex flex-col gap-4"
                         </div>
                     </div>
                 </div>
-                
+
                 {!! view_render_event('admin.leads.form_controls.after') !!}
             </div>
         </script>
@@ -236,9 +245,9 @@ class="flex flex-col gap-4"
                 methods: {
                     /**
                      * Scroll to the section.
-                     * 
+                     *
                      * @param {String} tabId
-                     * 
+                     *
                      * @returns {void}
                      */
                     scrollToSection(tabId) {
@@ -259,5 +268,5 @@ class="flex flex-col gap-4"
                 scroll-behavior: smooth;
             }
         </style>
-    @endPushOnce    
-</x-admin::layouts>
+    @endPushOnce
+</x-admin::layouts>

packages/Webkul/Admin/src/Resources/views/leads/index.blade.php

@@ -37,7 +37,7 @@
             <div class="flex items-center gap-x-2.5">
                 @if (bouncer()->hasPermission('leads.create'))
                     <a
-                        href="{{ route('admin.leads.create') }}"
+                        href="{{ route('admin.leads.create', request()->query()) }}"
                         class="primary-button"
                     >
                         @lang('admin::app.leads.index.create-btn')