From 20783a69deada3a9bbda7f3c0d15d054a4bfaaf3 Mon Sep 17 00:00:00 2001 From: cj201199 Date: Thu, 16 May 2024 15:40:08 +0530 Subject: [PATCH] bugs solving --- .../Controllers/Admin/DashboardController.php | 2 +- .../Frontend/DashboardController.php | 28 +++++++++---------- app/Services/Admin/LeadService.php | 2 +- .../Pages/manage_leads/edit-lead.blade.php | 20 +++++++++---- .../Pages/manage_leads/manage_leads.blade.php | 2 +- .../views/Admin/personal-dashboard.blade.php | 2 +- ...und-for-distressed-asset-product.blade.php | 2 +- .../private-credit-fund-product.blade.php | 18 +++++++++--- .../private-equity-funds/product.blade.php | 17 ++++++++--- .../alternative-investment-fund.blade.php | 24 ++++++++-------- .../venture-capital-funds/product.blade.php | 19 +++++++++---- 11 files changed, 87 insertions(+), 49 deletions(-) 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}}
+

Description

diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/private-credit-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/private-credit-fund-product.blade.php index 1f47f91..b0cac8b 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/private-credit-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/private-credit-fund-product.blade.php @@ -135,10 +135,7 @@
-
-

Description

-

{{ $productData->description ?? '-' }}

-
+

Involved in short selling

{{ $productData->involved_in_short_selling ?? '-' }}

@@ -160,6 +157,19 @@
+ +
+
+
+
+

Description

+

{{ $productData->description ?? '-' }}

+
+
+
+
+ +
diff --git a/resources/views/Frontend/Pages/private-equity-funds/product.blade.php b/resources/views/Frontend/Pages/private-equity-funds/product.blade.php index 5f585df..8e736c2 100644 --- a/resources/views/Frontend/Pages/private-equity-funds/product.blade.php +++ b/resources/views/Frontend/Pages/private-equity-funds/product.blade.php @@ -66,10 +66,7 @@

About Issuer

{{ $privateEquityFund->about_issuer ?? '-' }}
-
-

Description

- {{ $productData->description ?? '-' }} -
+

Sharpe Ratio

{{ $privateEquityFund->sharpe_ratio ?? '-' }} @@ -101,6 +98,18 @@
+ +
+
+
+
+

Description

+ {{ $productData->description ?? '-' }} +
+
+
+
+
diff --git a/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php b/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php index 7cab277..052f34a 100644 --- a/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php +++ b/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php @@ -213,16 +213,16 @@ type_of_fund: "required", fund_strategy: "required", // type_of_fund: "required", - fund_strategy: "required", - fund_manager_name: "required", - sponsor: "required", + // fund_strategy: "required", + // fund_manager_name: "required", + // sponsor: "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", declaration: "required", @@ -235,16 +235,16 @@ type_of_fund: 'Please select type of fund', fund_strategy: 'Please enter fund strategy', // type_of_fund: 'Please select type of fund', - fund_strategy: 'Please enter fund strategy', - fund_manager_name: 'Please enter fund manager name', - sponsor: 'Please enter sponsor', + // fund_strategy: 'Please enter fund strategy', + // fund_manager_name: 'Please enter fund manager name', + // sponsor: 'Please enter sponsor', total_capital_commitment: 'Please enter total capital commitment', uncalled_capital_commitment: 'Please enter uncalled capital commitment', - date_of_final_close: 'Please enter date of final close', - tenure_from_final_close: 'Please enter tenure from final close', + // date_of_final_close: 'Please enter date of final close', + // tenure_from_final_close: 'Please enter tenure from final close', current_or_latest_nav: 'Please enter current or latest nav', no_of_units_held: 'Please enter no. of units held', - no_of_units_you_wish_to_sell: 'Please enter no. of units you wish to sell', + // no_of_units_you_wish_to_sell: 'Please enter no. of units you wish to sell', expected_sale_per_unit: 'Please enter expected sale per unit', latest_valuation_date: 'Please select latest valuation date', declaration: 'Please check this box', diff --git a/resources/views/Frontend/Pages/venture-capital-funds/product.blade.php b/resources/views/Frontend/Pages/venture-capital-funds/product.blade.php index 078bc46..f5ef05e 100644 --- a/resources/views/Frontend/Pages/venture-capital-funds/product.blade.php +++ b/resources/views/Frontend/Pages/venture-capital-funds/product.blade.php @@ -92,14 +92,11 @@
-
+

About Issuer

{{ $ventureCapitalFund->about_issuer ?? '-' }}
-
-

Description

- {{ $productData->description ?? '-' }} -
+

Sharpe Ratio

{{ $ventureCapitalFund->sharpe_ratio ?? '-' }} @@ -131,6 +128,18 @@
+ +
+
+
+
+

Description

+ {{ $productData->description ?? '-' }} +
+
+
+
+