Merge branch 'main' of https://github.com/Ritikeshyadav/my-freeu into adarshFreeu

app/Imports/AlternativeInvestmentFundImport.php

@@ -107,6 +107,9 @@ class AlternativeInvestmentFundImport implements ToCollection, WithHeadingRow
                 'trading_strategy' => $row['trading_strategy'] ?? null,
                 'involved_in_short_selling' => $row['involved_in_short_selling'] ?? null,
                 'minimum_investment' => $row['minimum_investment'] ?? null,
+                'return_on_investment_irr_dpi_rvpi_tvpi' => $row['return_on_investment_irr_dpi_rvpi_tvpi'] ?? null,
+                'valuation_per_security_nav' => $row['valuation_per_security_nav'] ?? null,
+                'trading_strategy_used' => $row['trading_strategy_used'] ?? null,
             ]);
         }
     }

app/Models/AlternativeInvestmentFund.php

@@ -11,7 +11,7 @@ class AlternativeInvestmentFund extends Model
 
     protected $hidden = ['created_at','updated_at'];
 
-    protected $fillable = ['products_id','fund_name','slug','registration_number','fund_category','fund_structure','fund_strategy','fund_domicile','fund_manager_name','website_of_the_fund','fund_manager_experience','sponsor','manager','trustee','auditor','valuer_tax_advisor','credit_rating','open_date','first_close_date','final_close_date','tenure_from_final_date','commitment_period','native_currency','target_corpus','investment_manager_contribution','minimum_capital_commitment','intial_drawdown','accepting_overseas_investment','target_irr','management_fees_and_carry','hurdle_rate','other_expenses','focused_sectors_industries','regions_covered','isin_code','focused_real_estate_sectors','rera_complied_property','return_on_investment','valuation_per_sector','focused_funds','trading_strategy','involved_in_short_selling','minimum_investment'];
+    protected $fillable = ['products_id','fund_name','slug','registration_number','return_on_investment_irr_dpi_rvpi_tvpi','valuation_per_security_nav','trading_strategy_used','fund_category','fund_structure','fund_strategy','fund_domicile','fund_manager_name','website_of_the_fund','fund_manager_experience','sponsor','manager','trustee','auditor','valuer_tax_advisor','credit_rating','open_date','first_close_date','final_close_date','tenure_from_final_date','commitment_period','native_currency','target_corpus','investment_manager_contribution','minimum_capital_commitment','intial_drawdown','accepting_overseas_investment','target_irr','management_fees_and_carry','hurdle_rate','other_expenses','focused_sectors_industries','regions_covered','isin_code','focused_real_estate_sectors','rera_complied_property','return_on_investment','valuation_per_sector','focused_funds','trading_strategy','involved_in_short_selling','minimum_investment'];
 
     public function companies(){
         return $this->hasOne(Company::class,'id','companies_id');