diff --git a/app/Http/Controllers/Frontend/ProfileController.php b/app/Http/Controllers/Frontend/ProfileController.php index 6e54c41..070ed37 100644 --- a/app/Http/Controllers/Frontend/ProfileController.php +++ b/app/Http/Controllers/Frontend/ProfileController.php @@ -102,7 +102,7 @@ class ProfileController extends Controller $validationMessage = $this->validationError($validator); if ($validationMessage) { - return response()->json(['status' => 400, 'message' => $validationMessage], 400); + return response()->json(['status' => 400, 'message' => $validationMessage], 402); } $user = User::find($request->user()->id); @@ -140,7 +140,7 @@ class ProfileController extends Controller ]); $validationMessage = $this->validationError($validator); if ($validationMessage) { - return response()->json(['status' => 400, 'message' => $validationMessage],400); + return response()->json(['status' => 400, 'message' => $validationMessage],402); } // dd('both'); $emailotp = rand(1000, 9999); @@ -189,7 +189,7 @@ class ProfileController extends Controller ]); $validationMessage = $this->validationError($validator); if ($validationMessage) { - return response()->json(['status' => 400, 'message' => $validationMessage],400); + return response()->json(['status' => 400, 'message' => $validationMessage],402); } // dd('email'); $emailotp = rand(1000, 9999); @@ -220,7 +220,7 @@ class ProfileController extends Controller ]); $validationMessage = $this->validationError($validator); if ($validationMessage) { - return response()->json(['status' => 400, 'message' => $validationMessage],400); + return response()->json(['status' => 400, 'message' => $validationMessage],402); } // dd('mobile'); diff --git a/app/Imports/FundImport.php b/app/Imports/FundImport.php index 26c78cd..45bf6d1 100644 --- a/app/Imports/FundImport.php +++ b/app/Imports/FundImport.php @@ -70,7 +70,7 @@ class FundImport implements ToCollection, WithHeadingRow } else if ($this->category_id == Category::GlobalPrivateEquityFundId) { $init = 18; } else if ($this->category_id == Category::GlobalVentureCapitalFundId) { - $init = 18; + $init = 17; } else if($this->category_id == Category::GlobalHedgeFundId){ $init = 18; } else if($this->category_id == Category::GlobalVentureDebtId){ @@ -112,7 +112,8 @@ class FundImport implements ToCollection, WithHeadingRow 'ytd' => $row['ytd'], 'year1_return' => $row['1_year_return'], 'year3_return' => $row['3_year_return'], - 'date_as_on' => array_key_exists('data_as_on',$row->toArray()) ? getConvertedDate($row['data_as_on']) ?? null : null, + // 'date_as_on' => array_key_exists('data_as_on',$row->toArray()) ? getConvertedDate($row['data_as_on']) ?? null : null, + 'date_as_on' => getConvertedDate($row['data_as_on']) ?? null , ]); if ($returns) { foreach ($returns as $key => $value) { diff --git a/app/Models/Fund.php b/app/Models/Fund.php index f902cfb..fee5137 100644 --- a/app/Models/Fund.php +++ b/app/Models/Fund.php @@ -10,7 +10,7 @@ class Fund extends Model { use HasFactory, SoftDeletes; - protected $fillable = ['products_id','slug','issuer','fund_name','fund_type','about_issuer','fund_description','sharpe_ratio','annualized_volatility','max_dropdown','isin','inception_date','fund_aum','expense_ratio','nav_per_unit','minimum_investment','ytd','year1_return','year3_return', 'data_as_on','geographic_focus']; + protected $fillable = ['products_id','slug','issuer','fund_name','fund_type','about_issuer','fund_description','sharpe_ratio','annualized_volatility','max_dropdown','isin','inception_date','fund_aum','expense_ratio','nav_per_unit','minimum_investment','ytd','year1_return','year3_return', 'date_as_on','geographic_focus']; protected $with = ['returns']; diff --git a/public/assets/css/style.bundle.css b/public/assets/css/style.bundle.css index 02446af..6e6663e 100644 --- a/public/assets/css/style.bundle.css +++ b/public/assets/css/style.bundle.css @@ -57987,4 +57987,7 @@ label.error { } .ck-blurred.ck.ck-content.ck-editor__editable.ck-rounded-corners.ck-editor__editable_inline { height: 300px; +} +.ck.ck-content.ck-focused { + height: 300px; } \ No newline at end of file diff --git a/public/assets/css/style.css b/public/assets/css/style.css index 68bd39b..1ad1dfd 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -1421,4 +1421,7 @@ label.error { } .ck-blurred.ck.ck-content.ck-editor__editable.ck-rounded-corners.ck-editor__editable_inline { height: 300px; +} +.ck.ck-content.ck-focused { + height: 300px; } \ No newline at end of file diff --git a/resources/views/Admin/Pages/contact_form_leads/mail_reply.blade.php b/resources/views/Admin/Pages/contact_form_leads/mail_reply.blade.php index abdb5da..32016be 100644 --- a/resources/views/Admin/Pages/contact_form_leads/mail_reply.blade.php +++ b/resources/views/Admin/Pages/contact_form_leads/mail_reply.blade.php @@ -199,8 +199,8 @@ diff --git a/resources/views/Admin/Pages/manage_freeu_investment/view-product/funds.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/view-product/funds.blade.php index d812236..05b113d 100644 --- a/resources/views/Admin/Pages/manage_freeu_investment/view-product/funds.blade.php +++ b/resources/views/Admin/Pages/manage_freeu_investment/view-product/funds.blade.php @@ -153,7 +153,7 @@
- +