diff --git a/app/Http/Controllers/Admin/ManageFaqController.php b/app/Http/Controllers/Admin/ManageFaqController.php index eaed5c8..c3d5327 100644 --- a/app/Http/Controllers/Admin/ManageFaqController.php +++ b/app/Http/Controllers/Admin/ManageFaqController.php @@ -198,6 +198,7 @@ class ManageFaqController extends Controller $tags = $this->tagWithFaqs()->getData(); // $tagName = Tag::has('faq')->orderBy('tag_name','ASC')->get(['id', 'tag_name']); $tagName = Tag::has('faq')->orderBy(\DB::raw('(id = 49) DESC, tag_name, id'))->get(['id', 'tag_name']); + // dd($tags,$tagName); return view('Frontend.Pages.resources.faqs', ['tags' => $tags->data, 'tagName' => $tagName]); } @@ -218,12 +219,13 @@ class ManageFaqController extends Controller public function getAllTagsRelatedToFaq() { - $tags = Tag::query() - ->join('faq', 'tags.id', 'faq.tag_id') - ->where('is_active', true) - ->select('tags.id', 'tag_name') - ->distinct('id', 'tag_name') - ->get(); + // $tags = Tag::query() + // ->join('faq', 'tags.id', 'faq.tag_id') + // ->where('is_active', true) + // ->select('tags.id', 'tag_name') + // ->distinct('id', 'tag_name') + // ->get(); + $tags = Tag::has('faq')->orderBy(\DB::raw('(id = 49) DESC, tag_name, id'))->get(['id', 'tag_name']); if ($tags) { return response()->json([ "status" => "success", diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php index 4204b7f..d9e263a 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php @@ -323,7 +323,7 @@ class ManageFreeUInvestmentController extends Controller 'geographic_focus' => 'required', ], [ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png", ]); @@ -466,7 +466,7 @@ class ManageFreeUInvestmentController extends Controller 'geographic_focus' => 'required', ], [ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); @@ -646,7 +646,7 @@ class ManageFreeUInvestmentController extends Controller 'geographic_focus' => 'required', ], [ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); @@ -802,7 +802,7 @@ class ManageFreeUInvestmentController extends Controller 'geographic_focus' => 'required', ], [ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/CleanAndGreenAssetsController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/CleanAndGreenAssetsController.php index 274598f..b63cdc7 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/CleanAndGreenAssetsController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/CleanAndGreenAssetsController.php @@ -99,10 +99,10 @@ class CleanAndGreenAssetsController extends Controller $validate = Validator::make($request->all(),[ 'project_name' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php index d9dd180..0487186 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php @@ -108,7 +108,7 @@ class FractionalRealEstateController extends Controller 'geographic_focus' => 'required', ], [ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/HighYieldFinanceController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/HighYieldFinanceController.php index 7b774b9..350c51f 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/HighYieldFinanceController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/HighYieldFinanceController.php @@ -98,10 +98,10 @@ class HighYieldFinanceController extends Controller $validate = Validator::make($request->all(),[ 'security_name' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/InvoiceDiscountingController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/InvoiceDiscountingController.php index ed5a259..4bef7bf 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/InvoiceDiscountingController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/InvoiceDiscountingController.php @@ -97,10 +97,10 @@ class InvoiceDiscountingController extends Controller $validate = Validator::make($request->all(),[ 'company_name' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/LeaseBasedFinancingController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/LeaseBasedFinancingController.php index f53ded3..f18b57e 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/LeaseBasedFinancingController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/LeaseBasedFinancingController.php @@ -96,10 +96,10 @@ class LeaseBasedFinancingController extends Controller $validate = Validator::make($request->all(),[ 'company' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/PeerToPeerLendingController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/PeerToPeerLendingController.php index fd96a99..f9fbb88 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/PeerToPeerLendingController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/PeerToPeerLendingController.php @@ -102,10 +102,10 @@ class PeerToPeerLendingController extends Controller $validate = Validator::make($request->all(),[ 'scheme' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/SecuritizedDebtInstrumentController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/SecuritizedDebtInstrumentController.php index a3e5e4c..570e3a7 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/SecuritizedDebtInstrumentController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/SecuritizedDebtInstrumentController.php @@ -96,10 +96,10 @@ class SecuritizedDebtInstrumentController extends Controller $validate = Validator::make($request->all(),[ 'product_name' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php index 4c764fd..6f45b33 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php @@ -110,7 +110,7 @@ class VentureCapitalFundController extends Controller 'geographic_focus' => 'required', ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png", ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureDebtController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureDebtController.php index 4c34346..de17c68 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureDebtController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureDebtController.php @@ -97,10 +97,10 @@ class VentureDebtController extends Controller $validate = Validator::make($request->all(),[ 'company_name' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index df725d0..d14bb47 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -466,14 +466,28 @@ class AuthController extends Controller if ($validationMessage) { return response()->json(['status' => 400, 'message' => $validationMessage], 400); } - if(strlen($request->otp) < 4) - { + if (strlen($request->otp) < 4) { return response()->json(['status' => 401, 'message' => 'Please enter 4 digit OTP']); } $otp = (int) $request->otp; if (Session::has('user-registration')) { // $user = Session::get('user-registration'); if (Session::get('user-registration')['otp'] == $otp) { + + $mobile_otp = $this->otpGenerate(Session::get('user-registration')['contact_number']); + $this->thirdPartyOTP(Session::get('user-registration')['contact_number'], $mobile_otp); + $userRegistration = Session::get('user-registration'); + + // Add the new value to the session data + $userRegistration['mobile_otp'] = $mobile_otp; + + // Put the updated session data back into the session + Session::put('user-registration', $userRegistration); + + // $userCreated = Session::put('user-registration'['mobile_otp'], $mobile_otp); + //here i have to send mobile OTP in this session + //updated by hritik on 17-04-2024 + return response()->json(['status' => 200, 'message' => 'OTP verified']); } return response()->json(['status' => 401, 'message' => 'Invalid OTP!']); @@ -566,7 +580,7 @@ class AuthController extends Controller Session::forget('user-registration'); $otp = $this->otpGenerate($request->email); - $mobile_otp = $this->otpGenerate($request->contact_number); + // $mobile_otp = $this->otpGenerate($request->contact_number); $userRegistration = [ 'name' => $request->name, 'user_type' => 'Investor', @@ -575,7 +589,7 @@ class AuthController extends Controller 'password' => bcrypt($request->password), 'contact_number' => $request->contact_number, 'otp' => $otp, - 'mobile_otp' => $mobile_otp, + // 'mobile_otp' => $mobile_otp, ]; $userCreated = Session::put('user-registration', $userRegistration); $mailData = [ @@ -583,7 +597,7 @@ class AuthController extends Controller 'body' => 'This is for testing email using smtp.' ]; Mail::to($request->email)->send(new OtpMail($mailData, $otp)); - $this->thirdPartyOTP($request->contact_number, $mobile_otp); + // $this->thirdPartyOTP($request->contact_number, $mobile_otp); } // $name = $request->name; @@ -646,7 +660,7 @@ class AuthController extends Controller } else { Session::forget('user-registration'); $otp = $this->otpGenerate($request->email); - $mobile_otp = $this->otpGenerate($validated['contact_number2']); + // $mobile_otp = $this->otpGenerate($validated['contact_number2']); $userRegistration = [ 'name' => $validated['name2'], 'user_type' => 'Asset Manager', @@ -655,7 +669,7 @@ class AuthController extends Controller 'contact_number' => $validated['contact_number2'], 'password' => bcrypt($validated['password2']), 'otp' => $otp, - 'mobile_otp' => $mobile_otp, + // 'mobile_otp' => $mobile_otp, ]; $userCreated = Session::put('user-registration', $userRegistration); $mailData = [ @@ -663,8 +677,11 @@ class AuthController extends Controller 'body' => 'This is for testing email using smtp.' ]; Mail::to($validated['email2'])->send(new OtpMail($mailData, $otp)); - $this->thirdPartyOTP($validated['contact_number2'], $mobile_otp); + + + // $this->thirdPartyOTP($validated['contact_number2'], $mobile_otp); // Mail::to('yadavritikesh29@gmail.com')->send(new OtpMail($mailData, $otp)); + return response()->json(['status' => 200, 'message' => 'OTP has been sent to your email']); } // $name = $request->name; // $email = $request->email; @@ -756,56 +773,56 @@ class AuthController extends Controller try { $isOtpVerificationFor = $request->isOtpVerificationFor; // $validated = $request->validated(); - if ($isOtpVerificationFor == 1) { + if ($isOtpVerificationFor == 1) { - $emailOtp = $request->email_otp; + $emailOtp = $request->email_otp; - $emailToAdd = $request->email2; + $emailToAdd = $request->email2; - $userEmailOtpData = UserOtp::where('email', $emailToAdd)->where('otp', $emailOtp)->first(); // checking user email otp data + $userEmailOtpData = UserOtp::where('email', $emailToAdd)->where('otp', $emailOtp)->first(); // checking user email otp data // dd($userEmailOtpData); - if (!$userEmailOtpData) { - return response()->json(['status' => 400, 'message' => 'Email OTP Did Not Matched!'], 400); + if (!$userEmailOtpData) { + return response()->json(['status' => 400, 'message' => 'Email OTP Did Not Matched!'], 400); + } + if (now() > $userEmailOtpData->expire_at) { + return response()->json(['status' => 400, 'message' => 'OTP has been expired!'], 400); + } + if ($userEmailOtpData) { + return response()->json(['status' => 200, 'message' => 'Email OTP verified Successfully']); + } } - if (now() > $userEmailOtpData->expire_at) { - return response()->json(['status' => 400, 'message' => 'OTP has been expired!'], 400); - } - if ($userEmailOtpData) { - return response()->json(['status' => 200, 'message' => 'Email OTP verified Successfully']); - } - } - if ($isOtpVerificationFor == 2) { - $contactOtp = $request->contact_otp; - $contactToAdd = $request->contact_number2; + if ($isOtpVerificationFor == 2) { + $contactOtp = $request->contact_otp; + $contactToAdd = $request->contact_number2; - $userContactOtpData = UserOtp::where('contact_number', $contactToAdd)->where('contact_otp', $contactOtp)->first(); - - if (!$userContactOtpData) { - return response()->json(['status' => 400, 'message' => 'Contact OTP Did Not Matched!'], 400); - } - if (now() > $userContactOtpData->expire_at) { - return response()->json(['status' => 400, 'message' => 'OTP has been expired!'], 400); - } + $userContactOtpData = UserOtp::where('contact_number', $contactToAdd)->where('contact_otp', $contactOtp)->first(); - $userCreated = User::create([ - 'name' => $request->name2, - 'user_type' => 'Asset Manager', - 'authorized_representative_name' => $request->authorized_representative_name, - 'email' => $request->email2, - 'contact_number' => $request->contact_number2, - 'password' => bcrypt($request->password2), - ]); - if (!$userCreated) { - return response()->json(['status' => 400, 'message' => 'Error creating user!'])->setStatusCode(400); - } else { - $user = User::where('email', $request->email2)->first(); - $userToken = $user->createToken('apiToken')->plainTextToken; - return response()->json(['status' => 200, 'message' => 'User Created', 'token' => $userToken, 'data' => $user]); + if (!$userContactOtpData) { + return response()->json(['status' => 400, 'message' => 'Contact OTP Did Not Matched!'], 400); + } + if (now() > $userContactOtpData->expire_at) { + return response()->json(['status' => 400, 'message' => 'OTP has been expired!'], 400); + } + + $userCreated = User::create([ + 'name' => $request->name2, + 'user_type' => 'Asset Manager', + 'authorized_representative_name' => $request->authorized_representative_name, + 'email' => $request->email2, + 'contact_number' => $request->contact_number2, + 'password' => bcrypt($request->password2), + ]); + if (!$userCreated) { + return response()->json(['status' => 400, 'message' => 'Error creating user!'])->setStatusCode(400); + } else { + $user = User::where('email', $request->email2)->first(); + $userToken = $user->createToken('apiToken')->plainTextToken; + return response()->json(['status' => 200, 'message' => 'User Created', 'token' => $userToken, 'data' => $user]); + } } - } } catch (\Exception $e) { - return response()->json(['status' => 400, 'message' => 'Error While Registation Details!'.$e->getMessage()], 400); + return response()->json(['status' => 400, 'message' => 'Error While Registation Details!' . $e->getMessage()], 400); } } @@ -834,10 +851,10 @@ class AuthController extends Controller $validator = Validator::make($request->all(), [ 'user' => 'required', 'password' => [ - 'required', - // 'min:8', - // 'regex:/^.*(?=.{3,})(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[\d\x])(?=.*[!$#%@]).*$/' - ], + 'required', + // 'min:8', + // 'regex:/^.*(?=.{3,})(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[\d\x])(?=.*[!$#%@]).*$/' + ], ]); // if ($validator->fails()) { @@ -918,8 +935,7 @@ class AuthController extends Controller if ($validationMessage) { return response()->json(['status' => 400, 'message' => $validationMessage], 400); } - if(strlen($request->otp) < 4) - { + if (strlen($request->otp) < 4) { return response()->json(['status' => 401, 'message' => 'Please enter 4 digit OTP']); } $otp = (int) $request->otp; diff --git a/app/Http/Resources/GlobalFundResource.php b/app/Http/Resources/GlobalFundResource.php index 9bd0d22..529a295 100644 --- a/app/Http/Resources/GlobalFundResource.php +++ b/app/Http/Resources/GlobalFundResource.php @@ -16,9 +16,19 @@ class GlobalFundResource extends JsonResource */ public function toArray($request) { + $images = ProductImage::where('product_xid', $this->products_id)->get(); + $imagePaths = []; + if (!empty($images)) { + foreach ($images as $imageItem) { + $path = asset('public/' . $imageItem['images']); + $imagePaths[] = $path; + } + + } return [ 'id' => $this->id, 'products_id' => $this->products_id, + 'product_images' => $imagePaths, 'presentation' => Product::find($this->products_id) ? Product::find($this->products_id)->value('presentation') : null, 'fact_sheet' => Product::find($this->products_id) ? Product::find($this->products_id)->value('fact_sheet') : null, 'slug' => $this->slug, @@ -40,7 +50,7 @@ class GlobalFundResource extends JsonResource 'year1_return' => $this->year1_return, 'year3_return' => $this->year3_return, 'returns' => $this->returns, - 'product_images' => ProductImage::where('product_xid',$this->products_id)->get(), + // 'product_images' => ProductImage::where('product_xid',$this->products_id)->get(), ]; } diff --git a/app/Imports/AlternativeInvestmentFundImport.php b/app/Imports/AlternativeInvestmentFundImport.php index 7af15ad..9132846 100644 --- a/app/Imports/AlternativeInvestmentFundImport.php +++ b/app/Imports/AlternativeInvestmentFundImport.php @@ -66,7 +66,7 @@ class AlternativeInvestmentFundImport implements ToCollection, WithHeadingRow AlternativeInvestmentFund::create([ 'products_id' => $product->id, - 'slug' => Str::slug($row['name_of_the_fund']).'-'.$count+1, + 'slug' => $count < 1 ? Str::slug($row['name_of_the_fund']) : Str::slug($row['name_of_the_fund']).'-'.$count+1, 'fund_name' => $row['name_of_the_fund'], 'registration_number' => $row['registration_no'] ?? null, 'fund_category' => $row['fund_category_iiiiii'], diff --git a/public/assets/css/FrontendCss/style.css b/public/assets/css/FrontendCss/style.css index 45cdba0..34581af 100644 --- a/public/assets/css/FrontendCss/style.css +++ b/public/assets/css/FrontendCss/style.css @@ -4541,6 +4541,14 @@ span.start { } /* */ + .chksb p { + font-style: normal; + font-size: 18px; + color: #1B243D; + margin: 0; + font-weight: 600; + } + /*======responsive=====*/ @media (max-width: 2560px) { @@ -4977,6 +4985,7 @@ span.start { } } @media (max-width: 767px) { + .investor-profile .profile-img img { width: 70px; } @@ -5554,8 +5563,17 @@ span.start { @media (max-width: 420px) { } @media (max-width: 380px) { + + .chksb p { + font-style: normal; + font-size: 14px; + color: #1B243D; + margin: 0; + font-weight: 600; +} } @media (max-width: 360px) { } @media (max-width: 320px) { + } diff --git a/public/assets/css/FrontendCss/style2.css b/public/assets/css/FrontendCss/style2.css index ea344fa..2b7e468 100644 --- a/public/assets/css/FrontendCss/style2.css +++ b/public/assets/css/FrontendCss/style2.css @@ -183,13 +183,13 @@ button.accordion-button.collapsed:focus { margin-bottom: 15px; } -.chksb p { +/* .chksb p { font-style: normal; font-size: 18px; color: #1B243D; margin: 0; font-weight: 600; -} +} */ .chksb input[type=checkbox] { position: relative; @@ -670,3 +670,4 @@ a.golden-btn { + diff --git a/public/assets/js/FrontendJs/register/registered.js b/public/assets/js/FrontendJs/register/registered.js index ac70e5b..0c8585f 100644 --- a/public/assets/js/FrontendJs/register/registered.js +++ b/public/assets/js/FrontendJs/register/registered.js @@ -241,11 +241,8 @@ $(document).ready(function () { url: "api/sign-up-2", type: "POST", - data: formData, - processData: false, - contentType: false, dataType: "json", success: function (data) { @@ -259,10 +256,10 @@ $(document).ready(function () { // customClass: { confirmButton: "btn yellow-btn popup-button" }, // }).then(function (t) { // if (t.isConfirmed) { - // let url = "register_otp"; + let url = "register_otp"; - // window.location.replace(url); - // } + window.location.replace(url); + // } // }); } else if (data.error.email) { $("#error").remove(); diff --git a/public/assets/uploads/product_images/202404151340_1711435445_factsheet.jpg b/public/assets/uploads/product_images/202404151340_1711435445_factsheet.jpg new file mode 100644 index 0000000..e22ed82 Binary files /dev/null and b/public/assets/uploads/product_images/202404151340_1711435445_factsheet.jpg differ diff --git a/public/assets/uploads/product_images/202404151340_Woka FM_MASILA_player with characters.png b/public/assets/uploads/product_images/202404151340_Woka FM_MASILA_player with characters.png new file mode 100644 index 0000000..2c2ce6c Binary files /dev/null and b/public/assets/uploads/product_images/202404151340_Woka FM_MASILA_player with characters.png differ diff --git a/public/assets/uploads/product_images/202404151340_Woka FM_MASILA_player with characters_01.png b/public/assets/uploads/product_images/202404151340_Woka FM_MASILA_player with characters_01.png new file mode 100644 index 0000000..4556200 Binary files /dev/null and b/public/assets/uploads/product_images/202404151340_Woka FM_MASILA_player with characters_01.png differ diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php index 6d4fc9b..58e5b24 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php @@ -123,15 +123,15 @@
-
+

Registration Number

{{ $angelFund->registration_number ?? '-' }}
-
+

Fund category (I/II/II)

{{ $angelFund->fund_category ?? '-' }}
-
+

Fund structure

{{ $angelFund->fund_structure ?? '-' }}
@@ -145,43 +145,43 @@
-
+

Fund domicile

{{ $angelFund->fund_domicile ?? '-' }}
-
+

Fund manager name

{{ $angelFund->fund_manager_name ?? '-' }}
-
+

Website of the fund

{{ $angelFund->website_of_the_fund ?? '-' }}
-
+

Fund manager experience

{{ $angelFund->fund_manager_experience ?? '-' }}
-
+

Sponsor

{{ $angelFund->sponsor ?? '-' }}
-
+

Manager

{{ $angelFund->manager ?? '-' }}
-
+

Trustee

{{ $angelFund->trustee ?? '-' }}
-
+

Auditor

{{ $angelFund->auditor ?? '-' }}
-
+

Valuer / Tax Advisory

{{ $angelFund->valuer_tax_advisor ?? '-' }}
@@ -191,29 +191,29 @@
-
+

Credit rating (if any)

{{ $angelFund->credit_rating ?? '-' }}
-
+

Open date

{{ $angelFund->open_date ?? '-' }}
-
+

1st close date

{{ $angelFund->first_close_date ?? '-' }}
-
+

Final close date

{{ $angelFund->final_close_date ?? '-' }}
-
+

Tenure from final close

{{ $angelFund->tenure_from_final_date ?? '-' }}
-
+

Commitment period

{{ $angelFund->commitment_period ?? '-' }}
@@ -223,15 +223,15 @@
-
+

Native currency

{{ $angelFund->native_currency ?? '-' }}
-
+

Target IRR

{{ $angelFund->target_irr ?? '-' }}
-
+

Initial drawdown

{{ $angelFund->intial_drawdown ?? '-' }}
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/debt-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/debt-fund-product.blade.php index bfdd1c2..77caa05 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/debt-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/debt-fund-product.blade.php @@ -125,15 +125,15 @@
-
+

Registration Number

{{$debtFund->registration_number ?? '-'}}
-
+

Fund category (I/II/II)

{{$debtFund->fund_category ?? '-'}}
-
+

Fund structure

{{$debtFund->fund_structure ?? '-'}}
@@ -145,35 +145,35 @@
-
+

Fund domicile

{{$debtFund->fund_domicile ?? '-'}}
-
+

Fund manager name

{{$debtFund->fund_manager_name ?? '-'}}
-
+

Sponsor

{{$debtFund->sponsor ?? '-'}}
-
+

Manager

{{$debtFund->manager ?? '-'}}
-
+

Trustee

{{$debtFund->trustee ?? '-'}}
-
+

Auditor

{{$debtFund->auditor ?? '-'}}
-
+

Valuer / Tax Advisory

{{$debtFund->valuer_tax_advisor ?? '-'}}
@@ -197,29 +197,29 @@
-
+

Credit rating (if any)

{{$debtFund->credit_rating ?? '-'}}
-
+

Open date

{{$debtFund->open_date ?? '-'}}
-
+

1st close date

{{$debtFund->first_close_date ?? '-'}}
-
+

Final close date

{{$debtFund->final_close_date ?? '-'}}
-
+

Tenure from final close

{{$debtFund->tenure_from_final_date ?? '-'}}
-
+

Commitment period

{{$debtFund->commitment_period ?? '-'}}
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/hedge-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/hedge-fund-product.blade.php index 0d34dae..778a319 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/hedge-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/hedge-fund-product.blade.php @@ -123,15 +123,15 @@
-
+

Registration Number

{{ $hedgeFund->registration_number ?? '-' }}
-
+

Fund category (I/II/II)

{{ $hedgeFund->fund_category ?? '-' }}
-
+

Fund structure

{{ $hedgeFund->fund_structure ?? '-' }}
@@ -145,43 +145,43 @@
-
+

Fund domicile

{{ $hedgeFund->fund_domicile ?? '-' }}
-
+

Fund manager name

{{ $hedgeFund->fund_manager_name ?? '-' }}
-
+

Website of the fund

{{ $hedgeFund->website_of_the_fund ?? '-' }}
-
+

Fund manager experience

{{ $hedgeFund->fund_manager_experience ?? '-' }}
-
+

Sponsor

{{ $hedgeFund->sponsor ?? '-' }}
-
+

Manager

{{ $hedgeFund->manager ?? '-' }}
-
+

Trustee

{{ $hedgeFund->trustee ?? '-' }}
-
+

Auditor

{{ $hedgeFund->auditor ?? '-' }}
-
+

Valuer / Tax Advisory

{{ $hedgeFund->valuer_tax_advisor ?? '-' }}
@@ -191,29 +191,29 @@
-
+

Credit rating (if any)

{{ $hedgeFund->credit_rating ?? '-' }}
-
+

Open date

{{ $hedgeFund->open_date ?? '-' }}
-
+

1st close date

{{ $hedgeFund->first_close_date ?? '-' }}
-
+

Final close date

{{ $hedgeFund->final_close_date ?? '-' }}
-
+

Tenure from final close

{{ $hedgeFund->tenure_from_final_date ?? '-' }}
-
+

Commitment period

{{ $hedgeFund->commitment_period ?? '-' }}
@@ -223,15 +223,15 @@
-
+

Native currency

{{ $hedgeFund->native_currency ?? '-' }}
-
+

Target IRR

{{ $hedgeFund->target_irr ?? '-' }}
-
+

Initial drawdown

{{ $hedgeFund->intial_drawdown ?? '-' }}
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 5321422..a4e8fe5 100644 --- a/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php +++ b/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php @@ -141,15 +141,15 @@
-
+

Property grade

{{ $fractionalRealEstate->property_grade ?? '-' }}
-
+

Asset type

{{ $fractionalRealEstate->asset_type ?? '-' }}
-
+

Deal size

{{ $fractionalRealEstate->deal_size_in_crore ?? '-' }}
@@ -163,43 +163,43 @@
-
+

Tenant

{{ $fractionalRealEstate->tenant ?? '-' }}
-
+

Minimum investment

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

Rental escalation

{{ $fractionalRealEstate->rental_escalation ?? '-' }}
-
+

Capital appreciation

{{ $fractionalRealEstate->capital_appreciation ?? '-' }}
-
+

Coupon rate on CCD

{{ $fractionalRealEstate->coupon_rate_on_ccd ?? '-' }}
-
+

Expected IRR

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

CAGR

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

Minimum investor Lockin

{{ $fractionalRealEstate->minimum_investment_lockin ?? '-' }}
-
+

Tenant lease term

{{ $fractionalRealEstate->tenant_lease_term ?? '-' }}
@@ -209,25 +209,25 @@
-
+

Tenant lock in

{{ $fractionalRealEstate->tenant_lock_in ?? '-' }}
-
+

Tenant security deposit

{{ $fractionalRealEstate->tenant_security_deposit ?? '-' }}
-
+

Hurdle rate

{{ $fractionalRealEstate->hurdle_rate ?? '-' }}
-
+

Annual management fees

{{ $fractionalRealEstate->annual_management_fee ?? '-' }}
-
+

Performance fees

{{ $fractionalRealEstate->performance_fees ?? '-' }}
diff --git a/resources/views/Frontend/Pages/hedge-funds/product.blade.php b/resources/views/Frontend/Pages/hedge-funds/product.blade.php index 4033a28..9f53937 100644 --- a/resources/views/Frontend/Pages/hedge-funds/product.blade.php +++ b/resources/views/Frontend/Pages/hedge-funds/product.blade.php @@ -44,15 +44,15 @@
-
+

Issuer

{{$hedgeFund->issuer ?? '-'}}
-
+

Fund Name

{{$hedgeFund->fund_name ?? '-'}}
-
+

Fund Type

{{$hedgeFund->fund_type ?? '-'}}
@@ -62,39 +62,39 @@
-
+

About Issuer

{{$hedgeFund->about_issuer ?? '-'}}
-
+

Fund Description

{{$hedgeFund->fund_description ?? '-'}}
-
+

Sharpe Ratio

{{$hedgeFund->sharpe_ratio ?? '-'}}
-
+

Annualized Volatility

{{$hedgeFund->annualized_volatility ?? '-'}}
-
+

Max Dropdown

{{$hedgeFund->max_dropdown ?? '-'}}
-
+

ISIN

{{$hedgeFund->isin ?? '-'}}
-
+

Inception Date

{{$hedgeFund->inception_date ?? '-'}}
-
+

Fund AUM

{{$hedgeFund->fund_aum ?? '-'}}
@@ -104,29 +104,29 @@
-
+

Expense Ratio

{{$hedgeFund->expense_ratio ?? '-'}}
-
+

NAV Per Unit

{{$hedgeFund->nav_per_unit ?? '-'}}
-
+

Minimum Investment

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

YTD

{{$hedgeFund->ytd ?? '-'}}
-
+

1 Year Return

{{$hedgeFund->year1_return ?? '-'}}
-
+

3 Year Return

{{$hedgeFund->year3_return ?? '-'}}
diff --git a/resources/views/Frontend/Pages/lease-based-financing/product.blade.php b/resources/views/Frontend/Pages/lease-based-financing/product.blade.php index 0fa10ce..6d2ad8b 100644 --- a/resources/views/Frontend/Pages/lease-based-financing/product.blade.php +++ b/resources/views/Frontend/Pages/lease-based-financing/product.blade.php @@ -121,7 +121,7 @@
-
+

Tenure

@@ -129,7 +129,7 @@
-
+

Pre-tax Return

@@ -137,7 +137,7 @@
-
+

Asset Class

@@ -149,7 +149,7 @@
-
+

PayOut Frequency

@@ -157,7 +157,7 @@
-
+

Mobility Platform

@@ -165,7 +165,7 @@
-
+

Underlying Asset

diff --git a/resources/views/Frontend/Pages/private-equity-funds/product.blade.php b/resources/views/Frontend/Pages/private-equity-funds/product.blade.php index fcf7b84..5690a42 100644 --- a/resources/views/Frontend/Pages/private-equity-funds/product.blade.php +++ b/resources/views/Frontend/Pages/private-equity-funds/product.blade.php @@ -43,15 +43,15 @@
-
+

Issuer

{{$privateEquityFund->issuer ?? '-'}}
-
+

Fund Name

{{$privateEquityFund->fund_name ?? '-'}}
-
+

Fund Type

{{$privateEquityFund->fund_type ?? '-'}}
@@ -61,39 +61,39 @@
-
+

About Issuer

{{$privateEquityFund->about_issuer ?? '-'}}
-
+

Fund Description

{{$privateEquityFund->fund_description ?? '-'}}
-
+

Sharpe Ratio

{{$privateEquityFund->sharpe_ratio ?? '-'}}
-
+

Annualized Volatility

{{$privateEquityFund->annualized_volatility ?? '-'}}
-
+

Max Dropdown

{{$privateEquityFund->max_dropdown ?? '-'}}
-
+

ISIN

{{$privateEquityFund->isin ?? '-'}}
-
+

Inception Date

{{$privateEquityFund->inception_date ?? '-'}}
-
+

Fund AUM

{{$privateEquityFund->fund_aum ?? '-'}}
@@ -103,29 +103,29 @@
-
+

Expense Ratio

{{$privateEquityFund->expense_ratio ?? '-'}}
-
+

NAV Per Unit

{{$privateEquityFund->nav_per_unit ?? '-'}}
-
+

Minimum Investment

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

YTD

{{$privateEquityFund->ytd ?? '-'}}
-
+

1 Year Return

{{$privateEquityFund->year1_return ?? '-'}}
-
+

3 Year Return

{{$privateEquityFund->year3_return ?? '-'}}
diff --git a/resources/views/Frontend/Pages/reits/product.blade.php b/resources/views/Frontend/Pages/reits/product.blade.php index 1d5b76a..08f236c 100644 --- a/resources/views/Frontend/Pages/reits/product.blade.php +++ b/resources/views/Frontend/Pages/reits/product.blade.php @@ -44,15 +44,15 @@
-
+

Ticker

{{$reit->ticker ?? '-'}}
-
+

Exchange

{{$reit->exchange ?? '-'}}
-
+

About REIT

{{$reit->about ?? '-'}}
@@ -62,15 +62,15 @@
-
+

Provider

{{$reit->provider ?? '-'}}
-
+

Category

{{$reit->category ?? '-'}}
-
+

Expense Ratio

{{$reit->expense_ratio ?? '-'}}
@@ -84,11 +84,11 @@

Dividend Yield

{{$reit->dividend_yield ?? '-'}}
-
+

Beta

{{$reit->beta ?? '-'}}
-
+

Payouts

@@ -98,15 +98,15 @@
-
+

1 Month Return

{{$reit->month1_return ?? '-'}}
-
+

6 Month Return

{{$reit->month6_return ?? '-'}}
-
+

1 Year Return

{{$reit->year1_return ?? '-'}}
@@ -116,7 +116,7 @@
-
+

3 Year Return

{{$reit->year3_return ?? '-'}}
diff --git a/resources/views/Frontend/Pages/venture-capital-funds/product.blade.php b/resources/views/Frontend/Pages/venture-capital-funds/product.blade.php index 90359f5..e5908e3 100644 --- a/resources/views/Frontend/Pages/venture-capital-funds/product.blade.php +++ b/resources/views/Frontend/Pages/venture-capital-funds/product.blade.php @@ -73,15 +73,15 @@
-
+

Issuer

{{$ventureCapitalFund->issuer ?? '-'}}
-
+

Fund Name

{{$ventureCapitalFund->fund_name ?? '-'}}
-
+

Fund Type

{{$ventureCapitalFund->fund_type ?? '-'}}
@@ -91,39 +91,39 @@
-
+

About Issuer

{{$ventureCapitalFund->about_issuer ?? '-'}}
-
+

Fund Description

{{$ventureCapitalFund->fund_description ?? '-'}}
-
+

Sharpe Ratio

{{$ventureCapitalFund->sharpe_ratio ?? '-'}}
-
+

Annualized Volatility

{{$ventureCapitalFund->annualized_volatility ?? '-'}}
-
+

Max Dropdown

{{$ventureCapitalFund->max_dropdown ?? '-'}}
-
+

ISIN

{{$ventureCapitalFund->isin ?? '-'}}
-
+

Inception Date

{{$ventureCapitalFund->inception_date ?? '-'}}
-
+

Fund AUM

{{$ventureCapitalFund->fund_aum ?? '-'}}
@@ -133,29 +133,29 @@
-
+

Expense Ratio

{{$ventureCapitalFund->expense_ratio ?? '-'}}
-
+

NAV Per Unit

{{$ventureCapitalFund->nav_per_unit ?? '-'}}
-
+

Minimum Investment

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

YTD

{{$ventureCapitalFund->ytd ?? '-'}}
-
+

1 Year Return

{{$ventureCapitalFund->year1_return ?? '-'}}
-
+

3 Year Return

{{$ventureCapitalFund->year3_return ?? '-'}}
diff --git a/resources/views/Frontend/Pages/venture-debts/product.blade.php b/resources/views/Frontend/Pages/venture-debts/product.blade.php index 1904297..9f03017 100644 --- a/resources/views/Frontend/Pages/venture-debts/product.blade.php +++ b/resources/views/Frontend/Pages/venture-debts/product.blade.php @@ -45,15 +45,15 @@
-
+

Sector

{{$ventureDebts->sector}}
-
+

Minimum Investment

{{$ventureDebts->minimum_investment}}
-
+

Tenure

{{$ventureDebts->tenure}}
@@ -65,25 +65,25 @@
-
+

Total Issue Size

{{$ventureDebts->total_issue_size}}
-
+

Interest Payout

{{$ventureDebts->interest_payout}}
-
+

Principal Payout

{{$ventureDebts->principal_payout}}
-
+

Expected Return

{{$ventureDebts->expected_return}}
-
+

Face Value per unit

{{$ventureDebts->face_per_value_unit}}
@@ -91,21 +91,21 @@
-
+

Instrument Type

{{$ventureDebts->instrument_type}}
-
+

Collateral & Cover Multiple

{{$ventureDebts->collateral_cover_multiple}}
-
+

Prepayment Covenants

{{$ventureDebts->prepayment_covenants}}
-
+

Source of funds for repayment of Debt

{{$ventureDebts->source_of_funds_repayment_debt}}
diff --git a/resources/views/Frontend/Pages/why_freeU.blade.php b/resources/views/Frontend/Pages/why_freeU.blade.php index 014326c..a1ceed1 100644 --- a/resources/views/Frontend/Pages/why_freeU.blade.php +++ b/resources/views/Frontend/Pages/why_freeU.blade.php @@ -13,6 +13,7 @@ +
@@ -54,7 +55,7 @@ he launched Jericho Ventures, a boutique financial services firm catering to high-net-worth individuals. Under his guidance, the firm now oversees assets totaling $34 Million for more than 75 families.

-
+

Before embarking on his entrepreneurial venture, he has worked with top firms like HSBC Bank, Kotak Securities, and Religare Macquarie Private Wealth. Abhishek holds an MBA and a CFP (Certified Financial Planner from FPSB), enhancing his deep understanding of financial services. His career spans various aspects of finance, from investment strategies to client management, demonstrating his comprehensive expertise in the industry.

diff --git a/routes/api.php b/routes/api.php index 0e23c3b..c9bb923 100644 --- a/routes/api.php +++ b/routes/api.php @@ -331,6 +331,7 @@ Route::get('privacy-policy-data', [PrivacypolicyController::class, 'privacyPolic Route::get('terms-condition-data', [PrivacypolicyController::class, 'termsConditionApi']); //API + Route::get("global-private-credit-fund/question-answer", [FractionalRealEstateFontendController::class, 'globalPrivateCreditFundQuestionAndAnswer']); Route::get("private-credit-fund/question-answer", [FractionalRealEstateFontendController::class, 'privateCreditFundQuestionAndAnswer']); Route::get("long-only-equity-fund/question-answer", [FractionalRealEstateFontendController::class, 'longOnlyEquityFundQuestionAndAnswer']);