Merge pull request #2204 from suraj-webkul/issue#2158

Issue #2158 has been fixed.

Author: VikassWebkul214254

packages/Webkul/Admin/src/Http/Controllers/Quote/QuoteController.php

@@ -66,8 +66,10 @@ public function store(AttributeForm $request): RedirectResponse
 
         $quote = $this->quoteRepository->create($request->all());
 
-        if (request('lead_id')) {
-            $lead = $this->leadRepository->find(request('lead_id'));
+        $leadId = request('lead_id');
+
+        if ($leadId) {
+            $lead = $this->leadRepository->find($leadId);
 
             $lead->quotes()->attach($quote->id);
         }
@@ -76,7 +78,9 @@ public function store(AttributeForm $request): RedirectResponse
 
         session()->flash('success', trans('admin::app.quotes.index.create-success'));
 
-        return redirect()->route('admin.quotes.index');
+        return request()->query('from') === 'lead' && $leadId
+            ? redirect()->route('admin.leads.view', ['id' => $leadId, 'from' => 'quotes'])
+            : redirect()->route('admin.quotes.index');
     }
 
     /**
@@ -100,8 +104,10 @@ public function update(AttributeForm $request, int $id): RedirectResponse
 
         $quote->leads()->detach();
 
-        if (request('lead_id')) {
-            $lead = $this->leadRepository->find(request('lead_id'));
+        $leadId = request('lead_id');
+
+        if ($leadId) {
+            $lead = $this->leadRepository->find($leadId);
 
             $lead->quotes()->attach($quote->id);
         }
@@ -110,7 +116,9 @@ public function update(AttributeForm $request, int $id): RedirectResponse
 
         session()->flash('success', trans('admin::app.quotes.index.update-success'));
 
-        return redirect()->route('admin.quotes.index');
+        return request()->query('from') === 'lead' && $leadId
+            ? redirect()->route('admin.leads.view', ['id' => $leadId, 'from' => 'quotes'])
+            : redirect()->route('admin.quotes.index');
     }
 
     /**

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

@@ -86,7 +86,7 @@
                     {!! view_render_event('admin.leads.view.actions.after', ['lead' => $lead]) !!}
                 </div>
             </div>
-            
+
             <!-- Lead Attributes -->
             @include ('admin::leads.view.attributes')
 
@@ -97,7 +97,7 @@
         {!! view_render_event('admin.leads.view.left.after', ['lead' => $lead]) !!}
 
         {!! view_render_event('admin.leads.view.right.before', ['lead' => $lead]) !!}
-        
+
         <!-- Right Panel -->
         <div class="flex w-full flex-col gap-4 rounded-lg">
             <!-- Stages Navigation -->
@@ -109,6 +109,7 @@
             <x-admin::activities
                 :endpoint="route('admin.leads.activities.index', $lead->id)"
                 :email-detach-endpoint="route('admin.leads.emails.detach', $lead->id)"
+                :activeType="request()->query('from') === 'quotes' ? 'quotes' : 'all'"
                 :extra-types="[
                     ['name' => 'description', 'label' => trans('admin::app.leads.view.tabs.description')],
                     ['name' => 'products', 'label' => trans('admin::app.leads.view.tabs.products')],
@@ -137,5 +138,5 @@
         </div>
 
         {!! view_render_event('admin.leads.view.right.after', ['lead' => $lead]) !!}
-    </div>    
-</x-admin::layouts>
+    </div>
+</x-admin::layouts>

packages/Webkul/Admin/src/Resources/views/leads/view/quotes.blade.php

@@ -88,7 +88,7 @@
                                             {!! view_render_event('admin.leads.view.quotes.table.table_body.dropdown.item.before', ['lead' => $lead]) !!}
 
                                             <x-admin::dropdown.menu.item>
-                                                <a :href="'{{ route('admin.quotes.edit') }}/' + quote.id">
+                                                <a :href="'{{ route('admin.quotes.edit') }}/' + quote.id + '?from=lead&lead_id={{ $lead->id }}'">
                                                     <div class="flex items-center gap-2">
                                                         <span class="icon-edit text-2xl"></span>
 
@@ -162,7 +162,7 @@ class="dark:mix-blend-exclusion dark:invert"
 
                         <a
                             class="secondary-button"
-                            href="{{ route('admin.quotes.create', $lead->id) }}"
+                            href="{{ route('admin.quotes.create', $lead->id) }}?from=lead"
                         >
                             @lang('admin::app.leads.view.quotes.add-btn')
                         </a>

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

@@ -17,7 +17,12 @@
 
     {!! view_render_event('admin.contacts.quotes.create.form_controls.before') !!}
 
-    <x-admin::form :action="route('admin.quotes.store')">
+    <x-admin::form
+        :action="route('admin.quotes.store').'?'.http_build_query(array_merge(
+            request()->route()->parameters(),
+            request()->all()
+        ))"
+    >
         <div class="flex flex-col gap-4">
             <div class="flex items-center justify-between rounded-lg border border-gray-200 bg-white px-4 py-2 text-sm dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300">
                 <div class="flex flex-col gap-2">
@@ -170,7 +175,7 @@ class="flex flex-col gap-4"
                                 <x-admin::attributes.edit.lookup />
 
                                 @php
-                                    $lookUpEntityData = app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpEntity('leads', request('id'));
+                                    $lookUpEntityData = app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpEntity('leads', request('lead_id'));
                                 @endphp
 
                                 <x-admin::form.control-group class="w-full">

packages/Webkul/Admin/src/Resources/views/quotes/edit.blade.php

@@ -6,7 +6,10 @@
     {!! view_render_event('admin.contacts.quotes.edit.form_controls.before', ['quote' => $quote]) !!}
 
     <x-admin::form
-        :action="route('admin.quotes.update', $quote->id)"
+        :action="route('admin.quotes.update', $quote->id) . '?' . http_build_query(array_merge(
+            request()->route()->parameters(),
+            request()->all()
+        ))"
         method="PUT"
     >
         <div class="flex flex-col gap-4">
@@ -159,7 +162,7 @@ class="flex flex-col gap-4"
                                 <x-admin::attributes.edit.lookup />
 
                                 @php
-                                    $leadId = old('lead-id') ?? optional($quote->leads->first())->id;
+                                    $leadId = old('lead_id') ?? optional($quote->leads->first())->id;
 
                                     $lookUpEntityData = app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpEntity('leads', $leadId);
                                 @endphp

packages/Webkul/Admin/src/Routes/Admin/quote-routes.php

@@ -6,7 +6,7 @@
 Route::controller(QuoteController::class)->prefix('quotes')->group(function () {
     Route::get('', 'index')->name('admin.quotes.index');
 
-    Route::get('create/{id?}', 'create')->name('admin.quotes.create');
+    Route::get('create/{lead_id?}', 'create')->name('admin.quotes.create');
 
     Route::post('create', 'store')->name('admin.quotes.store');