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

Merge pull request #249 from Ritikeshyadav/RitikeshFreeu

Browse Source 
fixing issues
This commit is contained in:
Ritikeshyadav
2024-06-07 12:38:53 +05:30
committed by GitHub
parent f345b4aa5d f0f1c155a5
commit 0744c14ec4
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Imports/AlternativeInvestmentFundImport.php
View File

@@ -106,7 +106,7 @@ class AlternativeInvestmentFundImport implements ToCollection, WithHeadingRow
'rera_complied_property' => $row['rera_compiled_propertyyesno'] ?? null,
'return_on_investment' => $row['return_on_investment'] ?? null,
'valuation_per_sector' => $row['valuation_per_sector'] ?? null,
'focused_funds' => $row['focused_funds'] ?? null,
'focused_funds' => $row['focused_funds'] ?? $row['focused_fund'] ?? null,
'trading_strategy' => $row['trading_strategy'] ?? null,
'involved_in_short_selling' => $row['involved_in_short_selling'] ?? null,
'minimum_investment' => $row['minimum_investment'] ?? null,

2
app/Imports/ImportMontlyUpdateAlternativeInvestmentFund.php
View File

@@ -52,7 +52,7 @@ class ImportMontlyUpdateAlternativeInvestmentFund implements ToCollection, With
'contribution_amount' => $row['contribution_amount'] ?? 0,
'contribution_called_amount' => $row['contribution_called_amount'] ?? 0,
'contribution_uncalled_amount' => $row['contribution_uncalled_amount'] ?? 0,
'date_of_initial_contribution' => $row['date_of_initial_contribution'] ?? 0,
'date_of_initial_contribution' => getConvertedDate($row['date_of_initial_contribution']) ?? 0,
'face_value_nav_per_unit' => $row['face_valuenav_per_unit'] ?? 0,
'principal_capital_repaid' => $row['principal_capital_repaid'] ?? 0,
'gross_income' => $row['gross_income'] ?? 0,

BIN
public/excel-template/LongOnlyFundsTemplate.xlsx
View File

Binary file not shown.

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

@@ -334,10 +334,10 @@
<p>Minimum Investment</p>
<span>{{ $longOnlyEquityFund->minimum_investment ?? '-' }}</span>
</div>
<div class="col-md-4">
{{-- <div class="col-md-4">
<p>Trading strategy</p>
<span>{{ $longOnlyEquityFund->trading_strategy ?? '-' }}</span>
</div>
</div> --}}
<div class="col-md-4">
<p>Trading Strategy Used</p>
<span>{{ $productData->trading_strategy_used ?? '-' }}</span>
@@ -350,7 +350,7 @@
<div class="tables row">
<div class="col-md-4">
<p>Hurdle rate</p>
<span>{{ $longOnlyEquityFund->hurdle_rate ?? '-' }}</span>
<span>{{ $longOnlyEquityFund->hurdle_rate.' %' ?? '-' }}</span>
</div>
<div class="col-md-4">
<p>Other expenses</p>

14
resources/views/Frontend/Pages/fractional-real-estate/product.blade.php
View File

@@ -151,13 +151,13 @@
</div>
<div class="col-md-4 mb-2">
<p>Deal size</p>
<span>{{ IND_money_format($fractionalRealEstate->deal_size_in_crore) ?? '-' }}</span>
<span>{{ IND_money_format((int)$fractionalRealEstate->deal_size_in_crore) ?? '-' }}</span>
</div>
</div>
<div class="btm-txt">
{{-- <div class="btm-txt">
<p>Property details</p>
<h4>{{ $fractionalRealEstate->property_description ?? '-' }}</h4>
</div>
</div> --}}
</div>
</div>
<div class="categeory">
@@ -209,13 +209,13 @@
</div>
<div class="col-md-4 mb-2">
<p>Expected IRR</p>
<span>{{ $fractionalRealEstate->expected_irr ?? '-' }}</span>
<span>{{ $fractionalRealEstate->expected_irr.' %' ?? '-' }}</span>
</div>
</div>
<div class="tables row">
<div class="col-md-4 mb-2">
<p>CAGR</p>
<span>{{ $fractionalRealEstate->cagr ?? '-' }}</span>
<span>{{ $fractionalRealEstate->cagr.' %' ?? '-' }}</span>
</div>
<div class="col-md-4 mb-2">
<p>Minimum investor Lockin</p>
@@ -241,7 +241,7 @@
</div>
<div class="col-md-4 mb-2">
<p>Hurdle rate</p>
<span>{{ $fractionalRealEstate->hurdle_rate ?? '-' }}</span>
<span>{{ $fractionalRealEstate->hurdle_rate.' %' ?? '-' }}</span>
</div>
</div>
<div class="tables row">
@@ -251,7 +251,7 @@
</div>
<div class="col-md-4 mb-2">
<p>Performance fees</p>
<span>{{ $fractionalRealEstate->performance_fees ?? '-' }}</span>
<span>{{ $fractionalRealEstate->performance_fees.' %' ?? '-' }}</span>
</div>
<!--<div class="col-md-4">-->
<!-- <p>Commitment period</p>-->

2
resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php
View File

@@ -177,7 +177,7 @@
</div>
<div class="modal-body">
<p>Thank you for submitting the seller form. Our team will promptly review your submission and keep
you informed regarding the status of your product listing."</p>
you informed regarding the status of your product listing.</p>
</div>
<div class="modal-footer" style="margin-bottom: -13px;">
{{-- <button type="button" class="btn btn-secondary close_btn"

2
resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php
View File

@@ -144,7 +144,7 @@
{{-- </a> --}}
</div>
<div class="modal-body">
<p>Thank you for submitting the seller form. Our team will promptly review your submission and keep you informed regarding the status of your product listing."</p>
<p>Thank you for submitting the seller form. Our team will promptly review your submission and keep you informed regarding the status of your product listing.</p>
</div>
<div class="modal-footer" style="margin-bottom: -13px;">
{{-- <button type="button" class="btn btn-secondary close_btn"