diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php
index 965a02e..2139dab 100644
--- a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php
+++ b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php
@@ -42,6 +42,7 @@ use App\Models\ProductPhotoDocuments;
use Illuminate\Support\Facades\Validator;
use File;
use App\Models\Company;
+use App\Models\FundReturn;
class ManageFreeUInvestmentController extends Controller
{
@@ -465,7 +466,7 @@ class ManageFreeUInvestmentController extends Controller
public function updateFundProduct(Request $request)
{
- // dd($request->description);
+ // dd($request->return2019);
// $request->validate([
// 'issuer' => 'required'
// ]);
@@ -522,6 +523,26 @@ class ManageFreeUInvestmentController extends Controller
'year3_return' => $request->year3_return,
]);
+ if($request->return2019 || $request->return2020 || $request->return2021 || $request->return2022 )
+ {
+ if($request->return2019)
+ {
+ FundReturn::where(['funds_id'=>$request->fund_id,'label'=>2019])->update(['value'=>$request->return2019]);
+ }
+ if($request->return2020)
+ {
+ FundReturn::where(['funds_id'=>$request->fund_id,'label'=>2020])->update(['value'=>$request->return2020]);
+ }
+ if($request->return2021)
+ {
+ FundReturn::where(['funds_id'=>$request->fund_id,'label'=>2021])->update(['value'=>$request->return2021]);
+ }
+ if($request->return2022)
+ {
+ FundReturn::where(['funds_id'=>$request->fund_id,'label'=>2022])->update(['value'=>$request->return2022]);
+ }
+ }
+
$product = Product::where('id', (int)$request->product_fund_id)->first();
// dd($product);
if ($request->has('presentation')) {
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/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;
diff --git a/resources/views/Admin/Pages/manage_freeu_investment/edit-product/funds.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/edit-product/funds.blade.php
index 3018391..5c35c91 100644
--- a/resources/views/Admin/Pages/manage_freeu_investment/edit-product/funds.blade.php
+++ b/resources/views/Admin/Pages/manage_freeu_investment/edit-product/funds.blade.php
@@ -578,6 +578,46 @@
+ @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
+
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 @@
-
+ --}}
@@ -379,11 +385,11 @@
Focused Real Estate Sectors
{{ $angelFund->focused_real_estate_sectors ?? 'N/A' }}
+ {{--
Trading Strategy Used
{{ $productData->trading_strategy_used ?? 'N/A' }}
-
+
Website of the fund
- {{ $fundForDistressedAsset->website_of_the_fund ?? 'N/A' }}
+ {{-- {{ $fundForDistressedAsset->website_of_the_fund ?? 'N/A' }} --}}
+
+ @if($fundForDistressedAsset->website_of_the_fund)
+ {{$fundForDistressedAsset->website_of_the_fund}}
+ @else
+ {{'N/A'}}
+ @endif
+
@@ -600,13 +607,13 @@
{{ $productData->focused_real_estate_sectors ?? 'N/A' }}
-
+ {{--
Trading Strategy Used
{{ $productData->trading_strategy_used ?? '-' }}
-
+
@@ -321,11 +328,10 @@
{{-- @dd($productData) --}}
{{ $productData->focused_sectors_industries ?? 'N/A' }}
-
+ {{--
Trading Strategy Used
- {{-- @dd($productData) --}}
{{ $productData->trading_strategy_used ?? '-' }}
-
+
Sponsor
@@ -376,10 +383,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 f426b53..5ebaa95 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
@@ -199,7 +199,14 @@
@@ -348,10 +355,10 @@
Trading strategy
{{ $longOnlyEquityFund->trading_strategy ?? 'N/A' }}
+ {{--
Trading Strategy Used
{{ $longOnlyEquityFund->trading_strategy_used ?? 'N/A' }}
-
+
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..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 @@
@@ -363,10 +370,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 22a9ab1..862ef95 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 @@
@@ -373,10 +380,10 @@
ISIN Code
{{ $productData->isin_code ?? 'N/A' }}
+ {{--
Trading Strategy Used
{{ $productData->trading_strategy_used ?? 'N/A' }}
-
+
Website of the fund
- {{ $realEstate->website_of_the_fund ?? 'N/A' }}
+ {{-- {{ $realEstate->website_of_the_fund ?? 'N/A' }} --}}
+
+ @if($realEstate->website_of_the_fund)
+ {{$realEstate->website_of_the_fund}}
+ @else
+ {{'N/A'}}
+ @endif
+
@@ -685,10 +692,10 @@
Involved In Short Selling
{{ $productData->involved_in_short_selling }}
-
+ {{--
Trading Strategy Used
{{ $productData->trading_strategy_used }}
-
+
@@ -399,10 +406,10 @@
Involved In Short Selling
{{ $ventureCapitalFund->involved_in_short_selling ?? "N/A" }}
+ {{--
Trading Strategy Used
{{ $ventureCapitalFund->trading_strategy_used ?? '-' }}
-
+
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
+
+
-
+
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
+
+
{{--
--}}
-
{{ $singleTestimonial->description }}
+
"{{ $singleTestimonial->description }}"
{{ $singleTestimonial->client_name }}
{{ $singleTestimonial->client_designation_company_name }}
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
+
+