Vishal.Chandora/freeu-project
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #307 from Ritikeshyadav/megha

Browse Source 
Megha
This commit is contained in:
Ritikeshyadav
2024-06-14 17:39:09 +05:30
committed by GitHub
parent 3638150b63 63211e440d
commit 96f74099a9
11 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php
View File

@@ -241,6 +241,7 @@ class AlternativeInvestmentFundController extends Controller
->get();
$productData = AlternativeInvestmentFund::where('slug', '=', $slug)->first();
$product = Product::with('product_images')->where('id', '=', $productData->products_id)->first();
// dd($fundForDistressedAsset,$productData,$product);
return view('Frontend.Pages.alternative-investment-fund.fund-for-distressed-asset-product', compact('fundForDistressedAsset', 'otherFFDA', 'productData', 'product'));
}
@@ -255,6 +256,7 @@ class AlternativeInvestmentFundController extends Controller
->get();
$productData = AlternativeInvestmentFund::where('slug', '=', $slug)->first();
$product = Product::with('product_images')->where('id', '=', $productData->products_id)->first();
// dd($productData,$product);
return view('Frontend.Pages.alternative-investment-fund.private-real-estate-fund-product', compact('realEstate', 'otherPREF', 'productData', 'product'));
}

1
app/Http/Resources/VentureCapitalFundResource.php
View File

@@ -74,6 +74,7 @@ class VentureCapitalFundResource extends JsonResource
'valuation_per_sector' => $this->valuation_per_sector,
'focused_funds' => $this->focused_funds,
'trading_strategy' => $this->trading_strategy,
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,
];

2
app/Models/Lead.php
View File

@@ -43,7 +43,7 @@ class Lead extends Model
}
public function tasks_meetings(){
return $this->hasMany(LeadTasksMeeting::class,'leads_id');
return $this->hasMany(LeadTasksMeeting::class,'leads_id')->latest();
}
public function calls(){

4
public/assets/css/style.bundle.css
View File

@@ -57980,4 +57980,8 @@ label.error {
}
.btn.btn-color-muted .svg-icon, .btn.btn-color-muted i {
color: #a1a5b7 !important;
}
.form-control {
height: 50px;
line-height: 2;
}

11
resources/views/Frontend/Pages/alternative-investment-fund/fund-for-distressed-asset-product.blade.php
View File

@@ -586,20 +586,27 @@
<div class="tables row">
<div class="col-md-6">
<div class="col-md-4">
<p>Focused Sectors (Industries in which they are investing)</p>
<span>{{ $fundForDistressedAsset->focused_sectors_industries ?? 'N/A' }}</span>
</div>
<div class="col-md-6">
<div class="col-md-4">
<p>Focused Real Estate Sectors</p>
<span>{{ $productData->focused_real_estate_sectors ?? 'N/A' }}</span>
</div>
<div class="col-md-4">
<p>Trading Strategy Used </p>
<span>{{ $productData->trading_strategy_used ?? '-' }}</span>
</div>
</div>

5
resources/views/Frontend/Pages/alternative-investment-fund/hedge-fund-product.blade.php
View File

@@ -321,6 +321,11 @@
{{-- @dd($productData) --}}
<span>{{ $productData->focused_sectors_industries ?? 'N/A' }}</span>
</div>
<div class="col-md-4">
<p>Trading Strategy Used</p>
{{-- @dd($productData) --}}
<span>{{ $productData->trading_strategy_used ?? '-' }}</span>
</div>
</div>
</div>
</div>

8
resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php
View File

@@ -376,10 +376,10 @@
<p>Regions Covered (Geographical Locations covered by the fund)</p>
<span>{{ $infrastructureFund->regions_covered ?? 'N/A' }}</span>
</div>
{{-- <div class="col-md-6">
<p>company</p>
<span>{{ $infrastructureFund->company->company_name ?? 'N/A' }}</span>
</div> --}}
<div class="col-md-6">
<p>Trading Strategy Used</p>
<span>{{ $productData->trading_strategy_used ?? '-' }}</span>
</div>
</div>
</div>
</div>

8
resources/views/Frontend/Pages/alternative-investment-fund/private-credit-fund-product.blade.php
View File

@@ -140,10 +140,10 @@
<p>Involved in short selling</p>
<h4>{{ $privateCreditFund->involved_in_short_selling ?? 'N/A' }}</h4>
</div>
{{-- <div class="col-md-4">
<p>Return on investment irr dpi rvpi tvpi</p>
<h4>{{ $productData->return_on_investment_irr_dpi_rvpi_tvpi ?? 'N/A' }}</h4>
</div> --}}
<div class="col-md-4">
<p>Trading strategy used</p>
<h4>{{ $privateCreditFund->trading_strategy_used ?? '-' }}</h4>
</div>
</div>
{{-- <div class="tables row">
<div class="col-md-4">

6
resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php
View File

@@ -267,10 +267,10 @@
<span>{{ $product->involved_in_short_selling ?? 'N/A' }}</span>
</div>
<div class="col-md-6" style="{{ $product->trading_strategy ? '' : 'display:none;' }}">
{{-- <div class="col-md-6" style="{{ $product->trading_strategy ? '' : 'display:none;' }}">
<p>Trading Strategy</p>
<span>{{ $product->trading_strategy ?? 'N/A' }}</span>
</div>
<span>{{ $product->trading_strategy ?? '-' }}</span>
</div> --}}
<div class="col-md-6" style="{{ $product->focused_funds ? '' : 'display:none;' }}">
<p>Focused Funds</p>

4
resources/views/Frontend/Pages/alternative-investment-fund/private-real-estate-fund-product.blade.php
View File

@@ -685,6 +685,10 @@
<p>Involved In Short Selling</p>
<span>{{ $productData->involved_in_short_selling }}</span>
</div>
<div class="col-md-4" >
<p>Trading Strategy Used</p>
<span>{{ $productData->trading_strategy_used }}</span>
</div>
</div>
</div>

8
resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php
View File

@@ -399,10 +399,10 @@
<p>Involved In Short Selling</p>
<span>{{ $ventureCapitalFund->involved_in_short_selling ?? "N/A" }}</span>
</div>
{{-- <div class="col-md-4">
<p>Description</p>
<span>{{ $alternative_investment_funds->description ?? "N/A" }}</span>
</div> --}}
<div class="col-md-4">
<p>Trading Strategy Used</p>
<span>{{ $ventureCapitalFund->trading_strategy_used ?? '-' }}</span>
</div>
</div>
</div>
</div>