From c879be178440babdeb9cb868b2f97f38e8154a64 Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Mon, 17 Jun 2024 19:24:17 +0530 Subject: [PATCH 1/4] fixing data display issue --- .../Frontend/GlobalHedgeFundController.php | 2 +- .../GlobalPrivateEquityFundController.php | 2 +- .../Frontend/GlobalVentureCapitalFund.php | 2 +- .../GlobalPrivateCreditController.php | 2 +- .../companies.blade.php | 4 +-- .../Pages/hedge-funds/product.blade.php | 29 +++++++++++++++-- .../private-equity-funds/product.blade.php | 31 +++++++++++++++++-- .../venture-capital-funds/product.blade.php | 29 +++++++++++++++-- 8 files changed, 88 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/Frontend/GlobalHedgeFundController.php b/app/Http/Controllers/Frontend/GlobalHedgeFundController.php index e23134a..995ad12 100644 --- a/app/Http/Controllers/Frontend/GlobalHedgeFundController.php +++ b/app/Http/Controllers/Frontend/GlobalHedgeFundController.php @@ -24,7 +24,7 @@ class GlobalHedgeFundController extends Controller public function product($slug = '') { - $hedgeFund = Fund::where('slug',$slug)->first(); + $hedgeFund = Fund::with('returns')->where('slug',$slug)->first(); $productData = Fund::where('slug','=',$slug)->first(); $productData = Product::with('product_images')->where('id','=',$productData->products_id)->first(); // dd($hedgeFund); diff --git a/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php b/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php index b9613f7..6f171b9 100644 --- a/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php +++ b/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php @@ -37,7 +37,7 @@ class GlobalPrivateEquityFundController extends Controller public function product($slug = '') { - $privateEquityFund = Fund::where('slug', $slug)->first(); + $privateEquityFund = Fund::with('returns')->where('slug', $slug)->first(); $productData = Fund::where('slug', '=', $slug)->first(); $productData = Product::with('product_images')->where('id', '=', $productData->products_id)->first(); // dd($privateEquityFund); diff --git a/app/Http/Controllers/Frontend/GlobalVentureCapitalFund.php b/app/Http/Controllers/Frontend/GlobalVentureCapitalFund.php index d257083..1055200 100644 --- a/app/Http/Controllers/Frontend/GlobalVentureCapitalFund.php +++ b/app/Http/Controllers/Frontend/GlobalVentureCapitalFund.php @@ -25,7 +25,7 @@ class GlobalVentureCapitalFund extends Controller public function product($slug = '') { - $ventureCapitalFund = Fund::where('slug',$slug)->first(); + $ventureCapitalFund = Fund::with('returns')->where('slug',$slug)->first(); $productData = Fund::where('slug','=',$slug)->first(); $productData = Product::where('id','=',$productData->products_id)->first(); // dd($ventureCapitalFund); diff --git a/app/Http/Controllers/GlobalPrivateCreditController.php b/app/Http/Controllers/GlobalPrivateCreditController.php index f2db3f0..94e806b 100644 --- a/app/Http/Controllers/GlobalPrivateCreditController.php +++ b/app/Http/Controllers/GlobalPrivateCreditController.php @@ -24,7 +24,7 @@ class GlobalPrivateCreditController extends Controller public function getGlobalPrivateCreditFundProduct($slug) { - $ventureCapitalFund = Fund::where('slug', $slug)->first(); + $ventureCapitalFund = Fund::with('returns')->where('slug', $slug)->first(); $productData = Fund::where('slug', '=', $slug)->first(); $productData = Product::with('product_images')->where('id', '=', $productData->products_id)->first(); // dd($ventureCapitalFund); diff --git a/resources/views/Admin/manage-freeu-investments/companies.blade.php b/resources/views/Admin/manage-freeu-investments/companies.blade.php index f3bcba5..8c36f2e 100644 --- a/resources/views/Admin/manage-freeu-investments/companies.blade.php +++ b/resources/views/Admin/manage-freeu-investments/companies.blade.php @@ -102,14 +102,14 @@ - + --}}

1 Year Return

- {{ $hedgeFund->year1_return ?? 'N/A' }} + {{ $hedgeFund->year1_return.' %' ?? 'N/A' }}

3 Year Return

- {{ $hedgeFund->year3_return ?? 'N/A' }} + {{ $hedgeFund->year3_return.' %' ?? 'N/A' }}
+ @if($hedgeFund->returns) + @php($count = count($hedgeFund->returns)) +
+
+
+ @for($i=0; $i<($count > 3 ? 3 :$count); $i++) +
+

{{$hedgeFund->returns[$i]->label}}

+ {{$hedgeFund->returns[$i]->value.' %'}} +
+ @endfor +
+ @if($count > 3) +
+ @for($i=3; $i<$count; $i++) +
+

{{$hedgeFund->returns[$i]->label}}

+ {{$hedgeFund->returns[$i]->value.' %'}} +
+ @endfor +
+ @endif +
+
+ @endif @include('Frontend.Pages.alternative-investment-fund.presentation-factsheet') 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 24f5573..6fac81d 100644 --- a/resources/views/Frontend/Pages/private-equity-funds/product.blade.php +++ b/resources/views/Frontend/Pages/private-equity-funds/product.blade.php @@ -92,7 +92,7 @@
-
+

About Issuer

{{ $privateEquityFund->about_issuer ?? 'N/A' }}
@@ -167,15 +167,40 @@

1 Year Return

- {{ $privateEquityFund->year1_return ?? 'N/A' }} + {{ $privateEquityFund->year1_return.' %' ?? 'N/A' }}

3 Year Return

- {{ $privateEquityFund->year3_return ?? 'N/A' }} + {{ $privateEquityFund->year3_return.' %' ?? 'N/A' }}
+ @if($privateEquityFund->returns) + @php($count = count($privateEquityFund->returns)) +
+
+
+ @for($i=0; $i<($count > 3 ? 3 :$count); $i++) +
+

{{$privateEquityFund->returns[$i]->label}}

+ {{$privateEquityFund->returns[$i]->value.' %'}} +
+ @endfor +
+ @if($count > 3) +
+ @for($i=3; $i<$count; $i++) +
+

{{$privateEquityFund->returns[$i]->label}}

+ {{$privateEquityFund->returns[$i]->value.' %'}} +
+ @endfor +
+ @endif +
+
+ @endif @include('Frontend.Pages.alternative-investment-fund.presentation-factsheet') 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 9f21d6d..bdb5545 100644 --- a/resources/views/Frontend/Pages/venture-capital-funds/product.blade.php +++ b/resources/views/Frontend/Pages/venture-capital-funds/product.blade.php @@ -167,15 +167,40 @@

1 Year Return

- {{ $ventureCapitalFund->year1_return ?? 'N/A' }} + {{ $ventureCapitalFund->year1_return.' %' ?? 'N/A' }}

3 Year Return

- {{ $ventureCapitalFund->year3_return ?? 'N/A' }} + {{ $ventureCapitalFund->year3_return.' %' ?? 'N/A' }}
+ @if($ventureCapitalFund->returns) + @php($count = count($ventureCapitalFund->returns)) +
+
+
+ @for($i=0; $i<($count > 3 ? 3 :$count); $i++) +
+

{{$ventureCapitalFund->returns[$i]->label}}

+ {{$ventureCapitalFund->returns[$i]->value.' %'}} +
+ @endfor +
+ @if($count > 3) +
+ @for($i=3; $i<$count; $i++) +
+

{{$ventureCapitalFund->returns[$i]->label}}

+ {{$ventureCapitalFund->returns[$i]->value.' %'}} +
+ @endfor +
+ @endif +
+
+ @endif + @if($fund->funds->returns) + @php($count = count($fund->funds->returns)) + @for($i=0; $i<($count > 3 ? 3 :$count); $i++) + {{--
+

{{$ventureCapitalFund->returns[$i]->label}}

+ {{$ventureCapitalFund->returns[$i]->value.' %'}} +
--}} +
+ + + + + + + + + + + + + +
+ @endfor + {{-- @if($count > 3) +
+ @for($i=3; $i<$count; $i++) +
+

{{$ventureCapitalFund->returns[$i]->label}}

+ {{$ventureCapitalFund->returns[$i]->value.' %'}} +
+ @endfor +
+ @endif --}} + @endif
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php index ac97dbf..92a1938 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php @@ -379,11 +379,11 @@

Focused Real Estate Sectors

{{ $angelFund->focused_real_estate_sectors ?? 'N/A' }}
-
+ {{--

Trading Strategy Used

{{ $productData->trading_strategy_used ?? 'N/A' }} -
+
--}} diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/fund-for-distressed-asset-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/fund-for-distressed-asset-product.blade.php index 3921d0e..aa7dad9 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/fund-for-distressed-asset-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/fund-for-distressed-asset-product.blade.php @@ -600,13 +600,13 @@ {{ $productData->focused_real_estate_sectors ?? 'N/A' }} -
+ {{--

Trading Strategy Used

{{ $productData->trading_strategy_used ?? '-' }} -
+
--}} diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/hedge-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/hedge-fund-product.blade.php index 4070832..05568a9 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/hedge-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/hedge-fund-product.blade.php @@ -321,11 +321,10 @@ {{-- @dd($productData) --}} {{ $productData->focused_sectors_industries ?? 'N/A' }} -
+ {{--

Trading Strategy Used

- {{-- @dd($productData) --}} {{ $productData->trading_strategy_used ?? '-' }} -
+
--}} diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php index 7da4d98..ab957e9 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php @@ -376,10 +376,10 @@

Regions Covered (Geographical Locations covered by the fund)

{{ $infrastructureFund->regions_covered ?? 'N/A' }} -
+ {{--

Trading Strategy Used

{{ $productData->trading_strategy_used ?? '-' }} -
+
--}} diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php index f12aa89..bfa8d2a 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php @@ -348,10 +348,10 @@

Trading strategy

{{ $longOnlyEquityFund->trading_strategy ?? 'N/A' }} -
+ {{--

Trading Strategy Used

{{ $longOnlyEquityFund->trading_strategy_used ?? 'N/A' }} -
+
--}} 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 4daa192..996b53c 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 @@ -140,10 +140,10 @@

Involved in short selling

{{ $privateCreditFund->involved_in_short_selling ?? 'N/A' }}

-
+ {{--

Trading strategy used

{{ $privateCreditFund->trading_strategy_used ?? '-' }}

-
+
--}} {{--
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php index a47161a..fb5cc09 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php @@ -363,10 +363,10 @@

Trading Strategy

{{ $product->trading_strategy ?? 'N/A' }}
-
+ {{--

Trading Strategy Used

{{ $product->trading_strategy_used ?? 'N/A' }} -
+
--}}

Involved In Short Selling

{{ $product->involved_in_short_selling ?? 'N/A' }} diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/private-investment-public-equity-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/private-investment-public-equity-product.blade.php index 8c2ccd2..c3f14c2 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/private-investment-public-equity-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/private-investment-public-equity-product.blade.php @@ -373,10 +373,10 @@

ISIN Code

{{ $productData->isin_code ?? 'N/A' }}
-
+ {{--

Trading Strategy Used

{{ $productData->trading_strategy_used ?? 'N/A' }} -
+
--}}
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/private-real-estate-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/private-real-estate-fund-product.blade.php index 881a60f..b6df5df 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/private-real-estate-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/private-real-estate-fund-product.blade.php @@ -685,10 +685,10 @@

Involved In Short Selling

{{ $productData->involved_in_short_selling }} -
+ {{--

Trading Strategy Used

{{ $productData->trading_strategy_used }} -
+
--}} diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php index 9371fb4..bca21d7 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php @@ -399,10 +399,10 @@

Involved In Short Selling

{{ $ventureCapitalFund->involved_in_short_selling ?? "N/A" }} -
+ {{--

Trading Strategy Used

{{ $ventureCapitalFund->trading_strategy_used ?? '-' }} -
+
--}} From e26e8f07d87eb54b8200a94a63e671ec20d4a3fe Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Tue, 18 Jun 2024 11:36:38 +0530 Subject: [PATCH 3/4] fixed testimonial issue --- public/assets/css/FrontendCss/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/css/FrontendCss/style.css b/public/assets/css/FrontendCss/style.css index ababb43..4759b6d 100644 --- a/public/assets/css/FrontendCss/style.css +++ b/public/assets/css/FrontendCss/style.css @@ -4921,7 +4921,7 @@ span.color-red { } .testi_slider_sec p { - text-align: center; + text-align: center !important; color: #b18f62; font-size: 20px; font-weight: 500; From 3a49d194b2f14e3b174e43869eabf90a7f40c798 Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Tue, 18 Jun 2024 12:10:27 +0530 Subject: [PATCH 4/4] added anchor tag to website of the fund --- .../angel-fund-product.blade.php | 8 +++++++- .../fund-for-distressed-asset-product.blade.php | 9 ++++++++- .../hedge-fund-product.blade.php | 9 ++++++++- .../infrastructure-fund-product.blade.php | 9 ++++++++- .../long-only-equity-fund-product.blade.php | 9 ++++++++- .../private-credit-fund-product.blade.php | 9 ++++++++- .../private-equity-fund-product.blade.php | 9 ++++++++- .../private-investment-public-equity-product.blade.php | 9 ++++++++- .../private-real-estate-fund-product.blade.php | 9 ++++++++- .../venture-capital-fund-product.blade.php | 9 ++++++++- resources/views/Frontend/Pages/testimonial.blade.php | 2 +- 11 files changed, 80 insertions(+), 11 deletions(-) diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php index 92a1938..8db06b5 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php @@ -186,7 +186,13 @@

Website of the fund

- {{ $angelFund->website_of_the_fund ?? 'N/A' }} + + @if($angelFund->website_of_the_fund) + {{$angelFund->website_of_the_fund}} + @else + {{'N/A'}} + @endif +
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/hedge-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/hedge-fund-product.blade.php index 05568a9..eb74733 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/hedge-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/hedge-fund-product.blade.php @@ -189,7 +189,14 @@
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php index ab957e9..9231aa5 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php @@ -187,7 +187,14 @@
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 996b53c..9e43870 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 @@ -183,7 +183,14 @@
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php index fb5cc09..645a401 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php @@ -153,7 +153,14 @@
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/private-investment-public-equity-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/private-investment-public-equity-product.blade.php index c3f14c2..ec0f48a 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/private-investment-public-equity-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/private-investment-public-equity-product.blade.php @@ -183,7 +183,14 @@
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php index bca21d7..24910a7 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php @@ -196,7 +196,14 @@
diff --git a/resources/views/Frontend/Pages/testimonial.blade.php b/resources/views/Frontend/Pages/testimonial.blade.php index e5d18d9..3ed0e66 100644 --- a/resources/views/Frontend/Pages/testimonial.blade.php +++ b/resources/views/Frontend/Pages/testimonial.blade.php @@ -10,7 +10,7 @@
{{-- --}} -

{{ $singleTestimonial->description }}

+

"{{ $singleTestimonial->description }}"

{{ $singleTestimonial->client_name }}
{{ $singleTestimonial->client_designation_company_name }}