From a478ad95bb14655c851ce9221a7dcfa36502eda9 Mon Sep 17 00:00:00 2001 From: meghamalore Date: Mon, 29 Apr 2024 14:43:29 +0530 Subject: [PATCH 1/2] new commit lead form View --- app/Http/Controllers/Admin/ManageLeadController.php | 1 + app/Models/Lead.php | 5 +++++ app/Services/Admin/LeadService.php | 2 +- .../views/Admin/Pages/manage_leads/edit-lead.blade.php | 4 ++-- .../views/Admin/Pages/manage_leads/view-lead.blade.php | 9 ++++++--- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Admin/ManageLeadController.php b/app/Http/Controllers/Admin/ManageLeadController.php index bc6169e..f300099 100644 --- a/app/Http/Controllers/Admin/ManageLeadController.php +++ b/app/Http/Controllers/Admin/ManageLeadController.php @@ -108,6 +108,7 @@ class ManageLeadController extends Controller public function viewLead($id) { + // dd($this->lead->show($id)); return view('Admin.Pages.manage_leads.view-lead', [ 'lead' => $this->lead->show($id) ]); diff --git a/app/Models/Lead.php b/app/Models/Lead.php index b6cd5cc..8f141cc 100644 --- a/app/Models/Lead.php +++ b/app/Models/Lead.php @@ -47,4 +47,9 @@ class Lead extends Model public function owner(){ return $this->belongsTo(User::class, 'lead_owner'); } + + // public function leadsource(){ + // return $this->belongsTo(User::class, 'lead_source'); + // } + } diff --git a/app/Services/Admin/LeadService.php b/app/Services/Admin/LeadService.php index 889d6e4..4959c7a 100644 --- a/app/Services/Admin/LeadService.php +++ b/app/Services/Admin/LeadService.php @@ -88,7 +88,7 @@ class LeadService{ } public function show($id){ - return Lead::with('user', 'owner', 'notes.admin', 'attachment.admin', 'tasks_meetings.admin', 'calls.admin', 'product.category')->FindOrFail($id); + return Lead::with('user', 'owner', 'notes.admin', 'attachment.admin', 'tasks_meetings.admin', 'calls.admin', 'product.category','leadSource')->FindOrFail($id); } public function edit($id){ diff --git a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php index aa5c006..21cdb80 100644 --- a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php +++ b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php @@ -1764,9 +1764,9 @@ + --> diff --git a/resources/views/Admin/Pages/manage_leads/view-lead.blade.php b/resources/views/Admin/Pages/manage_leads/view-lead.blade.php index 7a623a5..68939d6 100644 --- a/resources/views/Admin/Pages/manage_leads/view-lead.blade.php +++ b/resources/views/Admin/Pages/manage_leads/view-lead.blade.php @@ -458,6 +458,7 @@ + {{-- @dd($lead); --}}
@@ -508,8 +509,9 @@ {{$lead->first_name ? $lead->first_name:'--'}} {{$lead->phone ? $lead->phone:'--'}} {{$lead->mobile ? $lead->mobile:'--'}} - {{$lead->lead_source ? $lead->lead_source:'--'}} - {{ date('Y-m-d', strtotime($lead->created_at ?? '--')) }} + {{-- @dd($lead->lead_source) --}} + {{$lead->leadSource != null ? $lead->leadSource->name : '--'}} + {{ date('Y-m-d', strtotime($lead->updated_at ?? '--')) }} @@ -548,7 +550,8 @@ {{$lead->email ? $lead->email:'--'}} {{$lead->website ? $lead->website:'--'}} {{$lead->lead_status ? $lead->lead_status.' Lead':'--'}} - {{$lead->lead_owner ? $lead->lead_owner:'--'}} + {{-- {{$lead->lead_owner ? $lead->lead_owner:'--'}} --}} + {{ date('Y-m-d', strtotime($lead->created_at ?? '--')) }} From 86b158a1bf6977daa345209f8bf0af375cb1aa62 Mon Sep 17 00:00:00 2001 From: meghamalore Date: Mon, 29 Apr 2024 14:57:10 +0530 Subject: [PATCH 2/2] new commit lead form View --- .../Pages/manage_leads/view-lead.blade.php | 145 ++---------------- 1 file changed, 11 insertions(+), 134 deletions(-) diff --git a/resources/views/Admin/Pages/manage_leads/view-lead.blade.php b/resources/views/Admin/Pages/manage_leads/view-lead.blade.php index 221743c..8be1c5c 100644 --- a/resources/views/Admin/Pages/manage_leads/view-lead.blade.php +++ b/resources/views/Admin/Pages/manage_leads/view-lead.blade.php @@ -458,28 +458,7 @@

View Lead Details

- Back -
- -
- {{-- @dd($lead); --}} - -
- -
-
@@ -503,36 +482,13 @@
-
-
-
- - - - - - - - - - - - - - - {{-- --}} - - - - - - {{-- @dd($lead->lead_source) --}} - - - - - -
Lead OwnerCategoryTitleNamePhoneMobileLead SourceModified By
{{optional($lead->owner)->name ? $lead->owner->name:'--'}}{{$lead->product->category->category_name ? $lead->product->category->category_name:'--'}}{{ $lead->product->category->category_name ?? 'NA' }}{{$lead->title ? $lead->title:'--'}}{{$lead->first_name ? $lead->first_name:'--'}}{{$lead->phone ? $lead->phone:'--'}}{{$lead->mobile ? $lead->mobile:'--'}}{{$lead->leadSource != null ? $lead->leadSource->name : '--'}}{{ date('Y-m-d', strtotime($lead->updated_at ?? '--')) }}
+ + +
+
+
+

Lead Information

@@ -564,7 +520,7 @@ {{ $lead->mobile ? $lead->mobile : '--' }} - {{ $lead->lead_source ? $lead->lead_source : '--' }} + {{ $lead->leadSource ? $lead->leadSource->name : '--' }} {{ $lead->modified_by ?? '--' }} @@ -692,87 +648,8 @@ {{ $data->created_at->format('H:i:s d/m/y') }} @endforeach - @else - -- - @endif - {{$lead->lead_company ? $lead->lead_company:'--'}} - {{$lead->advisor ? $lead->advisor:'--'}} - {{$lead->email ? $lead->email:'--'}} - {{$lead->website ? $lead->website:'--'}} - {{$lead->lead_status ? $lead->lead_status.' Lead':'--'}} - {{-- {{$lead->lead_owner ? $lead->lead_owner:'--'}} --}} - {{ date('Y-m-d', strtotime($lead->created_at ?? '--')) }} - - - -
-
-

Address Information

-
-
- - - - - - - - - - - - - -
StreetStateCountry
{{$lead->street ? $lead->street : '--'}}{{$lead->state ? $lead->state : '--'}}{{$lead->country ? $lead->country : '--'}}
-
-
-
-
- - - - - - - - - - - -
CityZip Code
{{$lead->city ? $lead->city : '--'}}{{$lead->zip_code ? $lead->zip_code : '--'}}
-
-
-

Product Information

-
-
- - - - - - - - - - -
Description
{{$lead->description ? $lead->description : '--'}}
-
-
-
-
- - - - -
-
-
- - -
-
-
-

Notes

+ +