diff --git a/app/Imports/AlternativeInvestmentFundImport.php b/app/Imports/AlternativeInvestmentFundImport.php index 798b38a..75cb9f3 100644 --- a/app/Imports/AlternativeInvestmentFundImport.php +++ b/app/Imports/AlternativeInvestmentFundImport.php @@ -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, diff --git a/app/Imports/ImportMontlyUpdateAlternativeInvestmentFund.php b/app/Imports/ImportMontlyUpdateAlternativeInvestmentFund.php index e13105e..6c80d5a 100644 --- a/app/Imports/ImportMontlyUpdateAlternativeInvestmentFund.php +++ b/app/Imports/ImportMontlyUpdateAlternativeInvestmentFund.php @@ -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, diff --git a/public/excel-template/LongOnlyFundsTemplate.xlsx b/public/excel-template/LongOnlyFundsTemplate.xlsx index 14e6e5d..73c632c 100644 Binary files a/public/excel-template/LongOnlyFundsTemplate.xlsx and b/public/excel-template/LongOnlyFundsTemplate.xlsx differ 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 5502801..3aff881 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 @@ -334,10 +334,10 @@

Minimum Investment

{{ $longOnlyEquityFund->minimum_investment ?? '-' }} -
+ {{--

Trading strategy

{{ $longOnlyEquityFund->trading_strategy ?? '-' }} -
+
--}}

Trading Strategy Used

{{ $productData->trading_strategy_used ?? '-' }} @@ -350,7 +350,7 @@

Hurdle rate

- {{ $longOnlyEquityFund->hurdle_rate ?? '-' }} + {{ $longOnlyEquityFund->hurdle_rate.' %' ?? '-' }}

Other expenses

diff --git a/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php b/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php index 946250e..ea8a0c1 100644 --- a/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php +++ b/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php @@ -151,13 +151,13 @@

Deal size

- {{ IND_money_format($fractionalRealEstate->deal_size_in_crore) ?? '-' }} + {{ IND_money_format((int)$fractionalRealEstate->deal_size_in_crore) ?? '-' }}
-
+ {{--

Property details

{{ $fractionalRealEstate->property_description ?? '-' }}

-
+
--}}
@@ -209,13 +209,13 @@

Expected IRR

- {{ $fractionalRealEstate->expected_irr ?? '-' }} + {{ $fractionalRealEstate->expected_irr.' %' ?? '-' }}

CAGR

- {{ $fractionalRealEstate->cagr ?? '-' }} + {{ $fractionalRealEstate->cagr.' %' ?? '-' }}

Minimum investor Lockin

@@ -241,7 +241,7 @@

Hurdle rate

- {{ $fractionalRealEstate->hurdle_rate ?? '-' }} + {{ $fractionalRealEstate->hurdle_rate.' %' ?? '-' }}
@@ -251,7 +251,7 @@

Performance fees

- {{ $fractionalRealEstate->performance_fees ?? '-' }} + {{ $fractionalRealEstate->performance_fees.' %' ?? '-' }}
diff --git a/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php b/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php index 7339a18..b858381 100644 --- a/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php +++ b/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php @@ -177,7 +177,7 @@