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

Merge pull request #209 from Ritikeshyadav/freeuChirag

Browse Source 
Freeu chirag
This commit is contained in:
Ritikeshyadav
2024-05-30 12:26:40 +05:30
committed by GitHub
parent b20f0833d7 37e6560797
commit 200d0a38ae
7 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Imports/AlternativeInvestmentFundImport.php
View File

@@ -82,8 +82,8 @@ class AlternativeInvestmentFundImport implements ToCollection, WithHeadingRow
'manager' => $row['manager'],
'trustee' => $row['trustee'],
'auditor' => $row['auditor'],
'valuer_tax_advisor' => $row['valuertax_advisor'] ?? null,
'credit_rating' => $row['credit_rating_if_any'] ?? null,
'valuer_tax_advisor' => $row['valuertax_advisor'] ?? $row['valuer_tax_advisor'] ?? null,
'credit_rating' => $row['credit_rating_if_any'] ?? $row['credit_rating'] ?? null,
'open_date' => getConvertedDate($row['open_date']),
'first_close_date' => getConvertedDate($row['1st_close_date']),
'final_close_date' => getConvertedDate($row['final_close_date']),
@@ -104,7 +104,7 @@ class AlternativeInvestmentFundImport implements ToCollection, WithHeadingRow
'isin_code' => $row['isin_code'] ?? null,
'focused_real_estate_sectors' => $row['focused_real_estate_sectors'] ?? null,
'rera_complied_property' => $row['rera_compiled_propertyyesno'] ?? null,
'return_on_investment' => $row['return_on_investment'] ?? null,
'return_on_investment' => $row['return_on_investment'] ?? null,
'valuation_per_sector' => $row['valuation_per_sector'] ?? null,
'focused_funds' => $row['focused_funds'] ?? null,
'trading_strategy' => $row['trading_strategy'] ?? null,

4
app/Imports/FundImport.php
View File

@@ -101,7 +101,7 @@ class FundImport implements ToCollection, WithHeadingRow
'annualized_volatility' => $row['annualized_volatility'],
'max_dropdown' => $row['max_drawdown'],
'isin' => $row['isin'],
'inception_date' => $row['inception_date'],
'inception_date' => getConvertedDate($row['inception_date']),
'fund_aum' => $row['fund_aum'],
'expense_ratio' => $row['expense_ratio'],
'nav_per_unit' => $row['nav_per_unit_usd'],
@@ -109,7 +109,7 @@ class FundImport implements ToCollection, WithHeadingRow
'ytd' => $row['ytd'],
'year1_return' => $row['1_year_return'],
'year3_return' => $row['3_year_return'],
'data_as_on' => $row['data_as_on'] ?? null,
// 'data_as_on' => getConvertedDate($row['data_as_on']) ?? null,
]);
if ($returns) {
foreach ($returns as $key => $value) {

6
app/Imports/RealEstateImport.php
View File

@@ -82,8 +82,10 @@ class RealEstateImport implements ToCollection, WithHeadingRow
'built_up_area' => $row['built_up_area'] ?? null,
'carpet_area' => $row['carpet_area'] ?? null,
'construction_status' => $row['construction_status'] ?? null,
'launch_date' => $row['launch_date'] ?? null,
'completed_in' => $row['completed_in'] ?? null,
// 'launch_date' => getConvertedDate($row['launch_date']) ?? null,
// 'completed_in' => getConvertedDate($row['completed_in']) ?? null,
'launch_date' => $row['launch_date'] ? getConvertedDate($row['launch_date']) : null,
'completed_in' => $row['completed_in'] ? getConvertedDate($row['completed_in']) : null,
'total_units' => $row['total_units'] ?? null,
'unit_type' => $row['unit_type'] ?? null,
'no_of_restrooms' => $row['no_of_restrooms'] ?? null,

3
app/Models/AlternativeInvestmentFund.php
View File

@@ -25,7 +25,8 @@ class AlternativeInvestmentFund extends Model
public function getTargetIrrAttribute($value)
{
// dd($);
return $value == null ? '--' : $value.' %';
// return $value == null ? '--' : $value.' %';
return $value;
}
public function getTenureFromFinalDateAttribute($value)

11
resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php
View File

@@ -295,7 +295,7 @@
</div>
<div class="col-md-4">
<p>Return on investment</p>
<span>{{ $longOnlyEquityFund->return_on_investment ?? '-' }}</span>
<span>{{ $longOnlyEquityFund->return_on_investment_irr_dpi_rvpi_tvpi ?? '-' }}</span>
</div>
</div>
</div>
@@ -315,6 +315,11 @@
<p>Valuation per sector</p>
<span>{{ $longOnlyEquityFund->valuation_per_sector ?? '-' }}</span>
</div>
<div class="col-md-4">
<p>Valuation per security (NAV)</p>
<span>{{ $productData->valuation_per_security_nav ?? '-' }}</span>
</div>
</div>
</div>
</div>
@@ -333,6 +338,10 @@
<p>Trading strategy</p>
<span>{{ $longOnlyEquityFund->trading_strategy ?? '-' }}</span>
</div>
<div class="col-md-4">
<p>Trading Strategy Used</p>
<span>{{ $productData->trading_strategy_used ?? '-' }}</span>
</div>
</div>
</div>
</div>

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

@@ -108,7 +108,7 @@
<!--</div>-->
<div class="table-invest">
<div class="container">
@if ($productData && $productData->product_images != null)
@if ($productData && $productData->product_images->toArray() != null)
<div id="carouselExampleIndicators" class="carousel slide" data-bs-ride="carousel">
<div class="carousel-indicators">
@foreach ($productData->product_images as $key => $image)

5
resources/views/Frontend/Pages/indian-real-estate/product.blade.php
View File

@@ -174,7 +174,7 @@
</div>
<div class="col-md-4">
<p>Launch Date</p>
<span{{ $realEstate->launch_date ?? '-' }}></span>
<span>{{ $realEstate->launch_date ?? '-' }}</span>
</div>
</div>
<div class="tables row">
@@ -186,9 +186,10 @@
<p>Built Up Area</p>
<span>{{ $realEstate->built_up_area ?? '-' }}</span>
</div>
{{-- @dd($realEstate->carpet_area); --}}
<div class="col-md-4">
<p>Carpet area</p>
<span{{ $realEstate->carpet_area ?? '-' }}></span>
<span>{{ $realEstate->carpet_area ?? '-' }}</span>
</div>
</div>
</div>