diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php
index 033371a..6d17f52 100644
--- a/app/Http/Controllers/Admin/DashboardController.php
+++ b/app/Http/Controllers/Admin/DashboardController.php
@@ -195,7 +195,7 @@ class DashboardController extends Controller
$userCount = User::users()->count();
$investingUserCount = MonthlyUpdateMaster::distinct('users_id')->count('users_id');
$totalProductCount = Product::count();
- $leads = Lead::with('leadSourceName')->where('lead_owner', auth()->user()->id)->latest()->get();
+ $leads = Lead::where('lead_owner', auth()->user()->id)->latest()->get();
// dd($leads->toArray());
$tasks = LeadTasksMeeting::where('owner', auth()->user()->id)->tasks()->get();
$meetings = LeadTasksMeeting::where('host', (string)auth()->user()->id)->meetings()->get();
diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php
index c6d733a..c5bf0ce 100644
--- a/app/Http/Controllers/Frontend/DashboardController.php
+++ b/app/Http/Controllers/Frontend/DashboardController.php
@@ -638,17 +638,17 @@ class DashboardController extends Controller
'fund_category' => 'required',
'fund_structure' => 'required',
'type_of_fund' => 'required',
- 'fund_strategy' => 'required',
- 'fund_manager_name' => 'required',
- 'sponsor' => 'required',
+ // 'fund_strategy' => 'required',
+ // 'fund_manager_name' => 'required',
+ // 'sponsor' => 'required',
// 'credit_rating' => 'required',
'total_capital_commitment' => 'required',
'uncalled_capital_commitment' => 'required',
- 'date_of_final_close' => 'required',
- 'tenure_from_final_close' => 'required',
+ // 'date_of_final_close' => 'required',
+ // 'tenure_from_final_close' => 'required',
'current_or_latest_nav' => 'required',
'no_of_units_held' => 'required',
- 'no_of_units_you_wish_to_sell' => 'required',
+ // 'no_of_units_you_wish_to_sell' => 'required',
'expected_sale_per_unit' => 'required',
'latest_valuation_date' => 'required',
@@ -670,18 +670,18 @@ class DashboardController extends Controller
'fund_category' => $request->fund_category,
'fund_structure' => $request->fund_structure,
'type_of_fund' => $request->type_of_fund,
- 'fund_strategy' => $request->fund_strategy,
- 'fund_manager_name' => $request->fund_manager_name,
- 'sponsor' => $request->sponsor,
- 'credit_rating' => $request->credit_rating,
+ 'fund_strategy' => $request->fund_strategy ?? null,
+ 'fund_manager_name' => $request->fund_manager_name ?? null,
+ 'sponsor' => $request->sponsor ?? null,
+ 'credit_rating' => $request->credit_rating ?? null,
'total_capital_commitment' => $request->total_capital_commitment,
'uncalled_capital_commitment' => $request->uncalled_capital_commitment,
- 'date_of_final_close' => $request->date_of_final_close,
- 'tenure_from_final_close' => $request->tenure_from_final_close,
+ 'date_of_final_close' => $request->date_of_final_close ?? null,
+ 'tenure_from_final_close' => $request->tenure_from_final_close ?? null,
'current_or_latest_nav' => $request->current_or_latest_nav,
'no_of_units_held' => $request->no_of_units_held,
- 'no_of_units_you_wish_to_sell' => $request->no_of_units_you_wish_to_sell,
- 'og_no_of_units_wish_to_sell' => $request->no_of_units_you_wish_to_sell,
+ 'no_of_units_you_wish_to_sell' => $request->no_of_units_you_wish_to_sell ?? null,
+ 'og_no_of_units_wish_to_sell' => $request->no_of_units_you_wish_to_sell ?? null,
'expected_sale_per_unit' => $request->expected_sale_per_unit,
'latest_valuation_date' => $request->latest_valuation_date,
'listing_status' => 'Hide',
diff --git a/app/Services/Admin/LeadService.php b/app/Services/Admin/LeadService.php
index 2c69895..289095d 100644
--- a/app/Services/Admin/LeadService.php
+++ b/app/Services/Admin/LeadService.php
@@ -12,7 +12,7 @@ use Illuminate\Support\Facades\DB;
class LeadService{
public function getAllLeads(){
- return Lead::with('kyc','leadSourceName','user', 'product.category')->latest()->get();
+ return Lead::with('kyc','user', 'product.category')->latest()->get();
}
public function totalLead(){
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 925adc0..eb56f9f 100644
--- a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
+++ b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
@@ -615,13 +615,23 @@
diff --git a/resources/views/Admin/Pages/manage_leads/manage_leads.blade.php b/resources/views/Admin/Pages/manage_leads/manage_leads.blade.php
index d53fdcb..7c3c63e 100644
--- a/resources/views/Admin/Pages/manage_leads/manage_leads.blade.php
+++ b/resources/views/Admin/Pages/manage_leads/manage_leads.blade.php
@@ -281,7 +281,7 @@
{{$lead->kyc == null ? 'No KYC' : $lead->kyc->status }} |
- {{$lead->leadSourceName != null ? $lead->leadSourceName->name : 'No lead assigned'}}
+ {{$lead->lead_source != null ? $lead->lead_source : 'No lead assigned'}}
|
{{ $lead->mobile }} |
{{ $lead->lead_status }} |
diff --git a/resources/views/Admin/personal-dashboard.blade.php b/resources/views/Admin/personal-dashboard.blade.php
index a0b0562..6a97a3b 100644
--- a/resources/views/Admin/personal-dashboard.blade.php
+++ b/resources/views/Admin/personal-dashboard.blade.php
@@ -199,7 +199,7 @@
{{$lead->lead_company ?? 'N/A'}} |
{{$lead->email}} |
{{$lead->mobile}} |
- {{$lead->leadSourceName == null ? 'No Lead Source Assigned' : $lead->leadSourceName->name}} |
+ {{$lead->lead_source == null ? 'No Lead Source Assigned' : $lead->lead_source}} |
|