diff --git a/app/Imports/AlternativeInvestmentFundImport.php b/app/Imports/AlternativeInvestmentFundImport.php index fcd2e76..798b38a 100644 --- a/app/Imports/AlternativeInvestmentFundImport.php +++ b/app/Imports/AlternativeInvestmentFundImport.php @@ -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, diff --git a/app/Imports/FundImport.php b/app/Imports/FundImport.php index 2b2f35b..c959c7f 100644 --- a/app/Imports/FundImport.php +++ b/app/Imports/FundImport.php @@ -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) { diff --git a/app/Imports/RealEstateImport.php b/app/Imports/RealEstateImport.php index 08d568a..42a5f76 100644 --- a/app/Imports/RealEstateImport.php +++ b/app/Imports/RealEstateImport.php @@ -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, diff --git a/app/Models/AlternativeInvestmentFund.php b/app/Models/AlternativeInvestmentFund.php index 1992072..b79074e 100644 --- a/app/Models/AlternativeInvestmentFund.php +++ b/app/Models/AlternativeInvestmentFund.php @@ -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) 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 23eb236..e8cffdb 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 @@ -295,7 +295,7 @@

Return on investment

- {{ $longOnlyEquityFund->return_on_investment ?? '-' }} + {{ $longOnlyEquityFund->return_on_investment_irr_dpi_rvpi_tvpi ?? '-' }}
@@ -315,6 +315,11 @@

Valuation per sector

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

Valuation per security (NAV)

+ {{ $productData->valuation_per_security_nav ?? '-' }} +
@@ -333,6 +338,10 @@

Trading strategy

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

Trading Strategy Used

+ {{ $productData->trading_strategy_used ?? '-' }} +
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php index 9a44320..f7faf5e 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php @@ -108,7 +108,7 @@
- @if ($productData && $productData->product_images != null) + @if ($productData && $productData->product_images->toArray() != null)
@@ -186,9 +186,10 @@

Built Up Area

{{ $realEstate->built_up_area ?? '-' }}
+ {{-- @dd($realEstate->carpet_area); --}}

Carpet area

- carpet_area ?? '-' }}> + {{ $realEstate->carpet_area ?? '-' }}