diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php index 6c0e1e9..2bd9ce9 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php @@ -40,6 +40,8 @@ use App\Models\MonthlyUpdateMaster; use Illuminate\Support\Str; use App\Models\ProductPhotoDocuments; use Illuminate\Support\Facades\Validator; +use File; +use App\Models\Company; class ManageFreeUInvestmentController extends Controller { @@ -453,11 +455,12 @@ class ManageFreeUInvestmentController extends Controller public function editFundProduct($id) { + $companies = Company::active()->pluck('company_name', 'id'); // $categories = Category::all(); // $products = Product::with('category', 'fractional_real_estate.companies')->fractionalrealestate()->find($id); $fund = Product::with('category', 'funds.returns', 'product_images')->funds()->find($id); // dd($fund); - return view('Admin.Pages.manage_freeu_investment.edit-product.funds', compact('fund')); + return view('Admin.Pages.manage_freeu_investment.edit-product.funds', compact('fund','companies')); } public function updateFundProduct(Request $request) @@ -501,6 +504,7 @@ class ManageFreeUInvestmentController extends Controller 'fund_name' => $request->fund_name, 'geographic_focus' => $request->geographic_focus, 'fund_type' => $request->fund_type, + 'platform_partner' =>$request->companies_id, 'about_issuer' => $request->about_issuer, 'fund_description' => $request->description, 'sharpe_ratio' => $request->sharpe_ratio, @@ -772,6 +776,8 @@ class ManageFreeUInvestmentController extends Controller return view('Admin.Pages.manage_freeu_investment.upload-product.real-estate', compact('text', 'category_id', 'excelName')); } + + public function uploadRealEstateFile(Request $request) { request()->validate([ @@ -792,9 +798,12 @@ class ManageFreeUInvestmentController extends Controller public function editRealEstateProduct($id) { + $companies = Company::active()->pluck('company_name', 'id'); + // dd($companies); $categories = Category::all(); - $products = Product::with('category', 'realEstates', 'product_images')->realestates()->find($id); - return view('Admin.Pages.manage_freeu_investment.edit-product.real-estate', compact('products', 'categories')); + $products = Product::with('category','realEstates', 'product_images')->realestates()->find($id); + // dd($products); + return view('Admin.Pages.manage_freeu_investment.edit-product.real-estate', compact('products', 'categories','companies')); } public function updateRealEstateProduct(Request $request) @@ -834,7 +843,7 @@ class ManageFreeUInvestmentController extends Controller $realEstate = RealEstate::where('id', $request->realEstates)->update([ 'property_name' => $request->property_name, 'slug' => $count < 2 ? Str::slug($request->property_name) : Str::slug($request->property_name).'-'.$count+1, - // 'companies_id' => $request->companies_id, + 'platform_partner' => $request->companies_id, 'geographic_focus' => $request->geographic_focus, 'price_per_sq_ft' => $request->price_per_sq_ft, 'property_location' => $request->property_location, @@ -1475,7 +1484,7 @@ class ManageFreeUInvestmentController extends Controller public function updateAIFProduct(Request $request) { - dd($request->all()); + // dd($request->all()); $request->validate([ 'fund_name' => 'required' ]); diff --git a/app/Http/Controllers/Admin/ManageUserProductController.php b/app/Http/Controllers/Admin/ManageUserProductController.php index 595496a..7a450c4 100644 --- a/app/Http/Controllers/Admin/ManageUserProductController.php +++ b/app/Http/Controllers/Admin/ManageUserProductController.php @@ -194,19 +194,7 @@ class ManageUserProductController extends Controller ->join('user_kycs', 'users.id', 'user_kycs.users_id') ->where('user_kycs.status', 'Approved') ->pluck('users.name', 'users.id'); - $aifProductNames = $this->getAllProductNames([ - Category::VentureCapitalFundId, - Category::AngelFundId, - Category::InfrastructureFundId, - Category::FundForDistressedAssetId, - Category::PrivateCreditFundId, - Category::PrivateRealEstateFundId, - Category::PrivateEquityFundId, - Category::HedgeFundId, - Category::PrivateInvestmentInPublicEquityFundId, - Category::LongOnlyFundId, - ]); - // dd($aifProductNames->toArray()); + $aifProductNames = $this->getAllProductNames([Category::VentureCapitalFundId, Category::InfrastructureFundId, Category::AngelFundId, Category::PrivateEquityFundId, Category::DebtFundId, Category::PrivateRealEstateFundId, Category::PrivateInvestmentInPublicEquityFundId,Category::LongOnlyFundId,Category::PrivateCreditFundId]); $freProductNames = $this->getAllProductNames([Category::FractionalRealEstateId]); // $p2pProductNames = $this->getAllProductNames(Category::PeerToPeerLendingId); // $ifaProductNames = $this->getAllProductNames(Category::InvoiceDiscountingId, Category::CleanAndGreenAssetsId, Category::VentureDebtId, Category::HighYieldFinanceId, Category::SecuritizedDebtInstrumentId, Category::LeaseBasedFinancingId, Category::RevenueBasedFinancingId); diff --git a/app/Http/Controllers/Frontend/GlobalHedgeFundController.php b/app/Http/Controllers/Frontend/GlobalHedgeFundController.php index 256253e..fece0f5 100644 --- a/app/Http/Controllers/Frontend/GlobalHedgeFundController.php +++ b/app/Http/Controllers/Frontend/GlobalHedgeFundController.php @@ -13,9 +13,9 @@ class GlobalHedgeFundController extends Controller { public function index(){ $hedgeFunds = $this->hedgeFundAllData()->getData(); - $openGHF = Product::has('funds')->with('funds','categorys')->globalHedgeFund()->open()->active()->latest()->get(); - $resaleGHF = Product::has('funds')->with('funds','categorys')->globalHedgeFund()->fullyFunded()->active()->latest()->get(); - $fullyFundedGHF = Product::has('funds')->with('funds','categorys')->globalHedgeFund()->fullyFunded()->active()->latest()->get(); + $openGHF = Product::has('funds')->with('funds.companies','categorys')->globalHedgeFund()->open()->active()->latest()->get(); + $resaleGHF = Product::has('funds')->with('funds.companies','categorys')->globalHedgeFund()->fullyFunded()->active()->latest()->get(); + $fullyFundedGHF = Product::has('funds')->with('funds.companies','categorys')->globalHedgeFund()->fullyFunded()->active()->latest()->get(); $learnMore = (new FractionalRealEstateFrontendController)->globalHedgeFundQuestionAndAnswer()->getData(); // $faqs = (new FractionalRealEstateFrontendController)->globalHedgeFundQuestionAndAnswerFaqs()->getData(); // dd($openGHF); diff --git a/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php b/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php index 5fb8ec4..fbfebdd 100644 --- a/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php +++ b/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php @@ -14,9 +14,9 @@ class GlobalPrivateEquityFundController extends Controller public function index() { $privateEquity = $this->privateEquityFundAllData()->getData(); - $openGPEF = Product::has('funds')->with('funds', 'categorys')->funds()->privateEquityFund()->open()->active()->latest()->get(); - $resaleGPEF = Product::has('funds')->with('funds', 'categorys')->funds()->privateEquityFund()->resale()->active()->latest()->get(); - $fullyFundedGPEF = Product::has('funds')->with('funds', 'categorys')->funds()->privateEquityFund()->fullyFunded()->active()->latest()->get(); + $openGPEF = Product::has('funds')->with('funds','companies', 'categorys')->funds()->privateEquityFund()->open()->active()->latest()->get(); + $resaleGPEF = Product::has('funds')->with('funds','companies', 'categorys')->funds()->privateEquityFund()->resale()->active()->latest()->get(); + $fullyFundedGPEF = Product::has('funds')->with('funds','companies', 'categorys')->funds()->privateEquityFund()->fullyFunded()->active()->latest()->get(); $learnMore = (new FractionalRealEstateFrontendController)->globalPrivateEquityFundQuestionAndAnswer()->getData(); // $faqs = (new FractionalRealEstateFrontendController)->globalPrivateEquityFundQuestionAndAnswerFaqs()->getData(); // dd($openGPEF); diff --git a/app/Http/Controllers/Frontend/IndianRealAssetController.php b/app/Http/Controllers/Frontend/IndianRealAssetController.php index 1b5d10c..3c1b125 100644 --- a/app/Http/Controllers/Frontend/IndianRealAssetController.php +++ b/app/Http/Controllers/Frontend/IndianRealAssetController.php @@ -21,9 +21,9 @@ class IndianRealAssetController extends Controller public function industrial() { $realEstate = $this->indianIndustrialRealEstateAllData()->getData(); - $openIIRE = Product::has('realEstate')->with('realEstate','categorys')->indianIndustrialRealEstate()->open()->active()->get(); - $resaleIIRE = Product::has('realEstate')->with('realEstate','categorys')->indianIndustrialRealEstate()->resale()->active()->get(); - $fullyFundedIIRE = Product::has('realEstate')->with('realEstate','categorys')->indianIndustrialRealEstate()->fullyFunded()->active()->get(); + $openIIRE = Product::has('realEstate')->with('realEstate.companies','categorys')->indianIndustrialRealEstate()->open()->active()->get(); + $resaleIIRE = Product::has('realEstate')->with('realEstate.companies','categorys')->indianIndustrialRealEstate()->resale()->active()->get(); + $fullyFundedIIRE = Product::has('realEstate')->with('realEstate.companies','categorys')->indianIndustrialRealEstate()->fullyFunded()->active()->get(); $learnMore = (new FractionalRealEstateFrontendController)->indianIndustrialRealEstateQuestionAndAnswer()->getData(); // dd($realEstate); return view('Frontend.Pages.indian-real-estate.industrial', compact('realEstate', 'learnMore', 'openIIRE', 'resaleIIRE', 'fullyFundedIIRE')); @@ -32,9 +32,9 @@ class IndianRealAssetController extends Controller public function residential() { $realEstate = $this->indianResidentialRealEstateAllData()->getData(); - $openIRRE = Product::has('realEstate')->with('realEstate','categorys')->indianResidentialRealEstate()->open()->active()->get(); - $resaleIRRE = Product::has('realEstate')->with('realEstate','categorys')->indianResidentialRealEstate()->resale()->active()->get(); - $fullyFundedIRRE = Product::has('realEstate')->with('realEstate','categorys')->indianResidentialRealEstate()->fullyFunded()->active()->get(); + $openIRRE = Product::has('realEstate')->with('realEstate.companies','categorys')->indianResidentialRealEstate()->open()->active()->get(); + $resaleIRRE = Product::has('realEstate')->with('realEstate.companies','categorys')->indianResidentialRealEstate()->resale()->active()->get(); + $fullyFundedIRRE = Product::has('realEstate')->with('realEstate.companies','categorys')->indianResidentialRealEstate()->fullyFunded()->active()->get(); $learnMore = (new FractionalRealEstateFrontendController)->indianResidentialRealEstateQuestionAndAnswer()->getData(); // dd($openIRRE); return view('Frontend.Pages.indian-real-estate.residential', compact('realEstate', 'learnMore', 'openIRRE', 'resaleIRRE', 'fullyFundedIRRE')); @@ -43,9 +43,9 @@ class IndianRealAssetController extends Controller public function commercial() { $realEstate = $this->indianCommercialRealEstateAllData()->getData(); - $openICRE = Product::has('realEstate')->with('realEstate','categorys')->indianCommercialRealEstate()->open()->active()->get(); - $resaleICRE = Product::has('realEstate')->with('realEstate','categorys')->indianCommercialRealEstate()->resale()->active()->get(); - $fullyFundedICRE = Product::has('realEstate')->with('realEstate','categorys')->indianCommercialRealEstate()->fullyFunded()->active()->get(); + $openICRE = Product::has('realEstate')->with('realEstate.companies','categorys')->indianCommercialRealEstate()->open()->active()->get(); + $resaleICRE = Product::has('realEstate')->with('realEstate.companies','categorys')->indianCommercialRealEstate()->resale()->active()->get(); + $fullyFundedICRE = Product::has('realEstate')->with('realEstate.companies','categorys')->indianCommercialRealEstate()->fullyFunded()->active()->get(); $learnMore = (new FractionalRealEstateFrontendController)->indianCommercialRealEstateQuestionAndAnswer()->getData(); // dd($openICRE); return view('Frontend.Pages.indian-real-estate.commercial', compact('realEstate', 'learnMore', 'openICRE', 'resaleICRE', 'fullyFundedICRE')); diff --git a/app/Http/Controllers/GlobalPrivateCreditController.php b/app/Http/Controllers/GlobalPrivateCreditController.php index 555608a..d242061 100644 --- a/app/Http/Controllers/GlobalPrivateCreditController.php +++ b/app/Http/Controllers/GlobalPrivateCreditController.php @@ -16,9 +16,9 @@ class GlobalPrivateCreditController extends Controller $learnMore = (new FractionalRealEstateFrontendController)->globalPCFQuestionAndAnswer()->getData(); return view('Frontend.Pages.dummy.global-private-credit', [ 'learnMore' => $learnMore, - 'openGPCF' => Product::has('funds')->with('funds','categorys')->funds()->globalPrivateCreditFund()->open()->active()->latest()->get(), + 'openGPCF' => Product::has('funds')->with('funds.companies','categorys')->funds()->globalPrivateCreditFund()->open()->active()->latest()->get(), // 'resaleGPCF' => Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies', 'categorys')->globalPrivateCreditFund()->resale()->active()->latest()->get(), - 'resaleGPCF' => Product::has('funds')->with('funds','categorys')->funds()->globalPrivateCreditFund()->fullyFunded()->active()->latest()->get(), + 'resaleGPCF' => Product::has('funds')->with('funds.companies','categorys')->funds()->globalPrivateCreditFund()->fullyFunded()->active()->latest()->get(), ]); } diff --git a/app/Http/Requests/StoreCompanyKYC.php b/app/Http/Requests/StoreCompanyKYC.php index f262753..e1a78fa 100644 --- a/app/Http/Requests/StoreCompanyKYC.php +++ b/app/Http/Requests/StoreCompanyKYC.php @@ -28,9 +28,9 @@ class StoreCompanyKYC extends FormRequest 'mobile_number' => 'required|regex:/^(\+\d{1,3}[- ]?)?\d{10,12}$/|unique:user_kycs,mobile_number,' . auth()->guard('users')->user()->id . ',users_id', 'email' => 'required|regex:/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/|unique:user_kycs,email,' . auth()->guard('users')->user()->id . ',users_id', 'dob' => 'required', - 'occupation' => 'required|regex:/^[a-zA-Z\s]+$/', - 'place_of_birth' => 'required|regex:/^[a-zA-Z\s]+$/', - 'gross_annual_income' => 'required|regex:/^[0-9]+$/', + 'occupation' => 'regex:/^[a-zA-Z\s]+$/', + 'place_of_birth' => 'regex:/^[a-zA-Z\s]+$/', + 'gross_annual_income' => 'regex:/^[0-9]+$/', 'memorandum_or_articles_of_association' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'company_pan' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'certificate_of_incorporation' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', diff --git a/app/Http/Requests/StoreIndividualKYC.php b/app/Http/Requests/StoreIndividualKYC.php index 4530937..19bff59 100644 --- a/app/Http/Requests/StoreIndividualKYC.php +++ b/app/Http/Requests/StoreIndividualKYC.php @@ -28,11 +28,11 @@ class StoreIndividualKYC extends FormRequest 'mobile_number' => 'required|regex:/^(\+\d{1,3}[- ]?)?\d{10,12}$/|unique:user_kycs,mobile_number,'.auth()->guard('users')->user()->id.',users_id', 'email' => 'required|regex:/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/|unique:user_kycs,email,'.auth()->guard('users')->user()->id.',users_id', 'dob' => 'required', - 'occupation' => 'required|regex:/^[a-zA-Z\s]+$/', + 'occupation' => 'regex:/^[a-zA-Z\s]+$/', 'father_name' => 'required|regex:/^[a-zA-Z\s]+$/', 'mother_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'place_of_birth' => 'required|regex:/^[a-zA-Z\s]+$/', - 'gross_annual_income' => 'required|regex:/^[0-9]+$/', + 'place_of_birth' => 'regex:/^[a-zA-Z\s]+$/', + 'gross_annual_income' => 'regex:/^[0-9]+$/', 'pan_card' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'proof_of_address' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'Photograph' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', diff --git a/app/Http/Requests/StoreNRIKYC.php b/app/Http/Requests/StoreNRIKYC.php index 1242230..ddc4e03 100644 --- a/app/Http/Requests/StoreNRIKYC.php +++ b/app/Http/Requests/StoreNRIKYC.php @@ -25,14 +25,14 @@ class StoreNRIKYC extends FormRequest { return [ 'name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'mobile_number' => 'required|regex:/^(\+\d{1,3}[- ]?)?\d{10,12}$/|unique:user_kycs,mobile_number,'.auth()->guard('users')->user()->id.',users_id', - 'email' => 'required|regex:/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/|unique:user_kycs,email,'.auth()->guard('users')->user()->id.',users_id', + 'mobile_number' => 'required|regex:/^(\+\d{1,3}[- ]?)?\d{10,12}$/|unique:user_kycs,mobile_number,' . auth()->guard('users')->user()->id . ',users_id', + 'email' => 'required|regex:/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/|unique:user_kycs,email,' . auth()->guard('users')->user()->id . ',users_id', 'dob' => 'required', - 'father_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'mother_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'occupation' => 'required|regex:/^[a-zA-Z\s]+$/', - 'place_of_birth' => 'required|regex:/^[a-zA-Z\s]+$/', - 'gross_annual_income' => 'required|regex:/^[0-9]+$/', + 'father_name' => 'regex:/^[a-zA-Z\s]+$/', + 'mother_name' => 'regex:/^[a-zA-Z\s]+$/', + 'occupation' => 'regex:/^[a-zA-Z\s]+$/', + 'place_of_birth' => 'regex:/^[a-zA-Z\s]+$/', + 'gross_annual_income' => 'regex:/^[0-9]+$/', 'passport' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'pio_oci_card' => 'mimes:jpeg,png,jpg,pdf|max:2048', // 'tin' => 'required', @@ -41,7 +41,7 @@ class StoreNRIKYC extends FormRequest 'utility' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'rental_agreement' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'passport_size_photograph' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', - 'cancelled_cheque' => 'mimes:jpeg,png,jpg,pdf|max:2048', + 'cancelled_cheque' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'copy_of_cml' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'trc_copy' => 'mimes:jpeg,png,jpg,pdf|max:2048', 'form_10f' => 'mimes:jpeg,png,jpg,pdf|max:2048', @@ -49,7 +49,8 @@ class StoreNRIKYC extends FormRequest ]; } - public function messages(){ + public function messages() + { return [ 'required' => 'This :attribute field is required', 'unique' => "This :attribute field must be unique", diff --git a/app/Http/Requests/StoreOtherKYC.php b/app/Http/Requests/StoreOtherKYC.php index 7a7bf54..019a845 100644 --- a/app/Http/Requests/StoreOtherKYC.php +++ b/app/Http/Requests/StoreOtherKYC.php @@ -28,11 +28,11 @@ class StoreOtherKYC extends FormRequest 'mobile_number' => 'required|regex:/^(\+\d{1,3}[- ]?)?\d{10,12}$/|unique:user_kycs,mobile_number,'.auth()->guard('users')->user()->id.',users_id', 'email' => 'required|regex:/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/|unique:user_kycs,email,'.auth()->guard('users')->user()->id.',users_id', 'dob' => 'required', - 'father_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'mother_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'occupation' => 'required|regex:/^[a-zA-Z\s]+$/', - 'place_of_birth' => 'required|regex:/^[a-zA-Z\s]+$/', - 'gross_annual_income' => 'required|regex:/^[0-9]+$/', + 'father_name' => 'regex:/^[a-zA-Z\s]+$/', + 'mother_name' => 'regex:/^[a-zA-Z\s]+$/', + 'occupation' => 'regex:/^[a-zA-Z\s]+$/', + 'place_of_birth' => 'regex:/^[a-zA-Z\s]+$/', + 'gross_annual_income' => 'regex:/^[0-9]+$/', 'proof_of_identity_pan_card' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'addressproof_bank_statement_or_utility_bill' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'certificate_of_registration' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', diff --git a/app/Http/Requests/StorePartnerShipKYC.php b/app/Http/Requests/StorePartnerShipKYC.php index cbfb579..15f7268 100644 --- a/app/Http/Requests/StorePartnerShipKYC.php +++ b/app/Http/Requests/StorePartnerShipKYC.php @@ -28,11 +28,11 @@ class StorePartnerShipKYC extends FormRequest 'mobile_number' => 'required|regex:/^(\+\d{1,3}[- ]?)?\d{10,12}$/|unique:user_kycs,mobile_number,'.auth()->guard('users')->user()->id.',users_id', 'email' => 'required|regex:/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/|unique:user_kycs,email,'.auth()->guard('users')->user()->id.',users_id', 'dob' => 'required', - 'father_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'mother_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'occupation' => 'required|regex:/^[a-zA-Z\s]+$/', - 'place_of_birth' => 'required|regex:/^[a-zA-Z\s]+$/', - 'gross_annual_income' => 'required|regex:/^[0-9]+$/', + 'father_name' => 'regex:/^[a-zA-Z\s]+$/', + 'mother_name' => 'regex:/^[a-zA-Z\s]+$/', + 'occupation' => 'regex:/^[a-zA-Z\s]+$/', + 'place_of_birth' => 'regex:/^[a-zA-Z\s]+$/', + 'gross_annual_income' => 'regex:/^[0-9]+$/', 'true_copy_of_partnership_deed' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'registration_certificate' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'pan_card' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', diff --git a/app/Models/Fund.php b/app/Models/Fund.php index 5b9080d..7bc621c 100644 --- a/app/Models/Fund.php +++ b/app/Models/Fund.php @@ -18,4 +18,9 @@ class Fund extends Model { return $this->hasMany(FundReturn::class, 'funds_id', 'id'); } + + public function companies(){ + return $this->belongsTo(Company::class,'platform_partner'); + } + } diff --git a/app/Models/RealEstate.php b/app/Models/RealEstate.php index 5dbcb87..db82f80 100644 --- a/app/Models/RealEstate.php +++ b/app/Models/RealEstate.php @@ -23,4 +23,10 @@ class RealEstate extends Model public function realEstateDocuments(){ return $this->hasMany(ProductPhotoDocuments::class,'real_estates_id')->where('type',1); } + + public function companies(){ + return $this->belongsTo(Company::class,'platform_partner'); + } + + } diff --git a/app/Services/Frontend/GlobalRealEstateService.php b/app/Services/Frontend/GlobalRealEstateService.php index c6bb1d8..38425c0 100644 --- a/app/Services/Frontend/GlobalRealEstateService.php +++ b/app/Services/Frontend/GlobalRealEstateService.php @@ -13,47 +13,47 @@ class GlobalRealEstateService{ public function openGIRE() { - return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalIndustrialRealEstate()->open()->active()->get()); + return $this->returnResponse(Product::has('realEstate')->with('realEstate.companies','categorys')->globalIndustrialRealEstate()->open()->active()->get()); } public function fullyFundedGIRE() { - return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalIndustrialRealEstate()->open()->active()->get()); + return $this->returnResponse(Product::has('realEstate')->with('realEstate.companies','categorys')->globalIndustrialRealEstate()->open()->active()->get()); } public function resaleGIRE() { - return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalIndustrialRealEstate()->open()->active()->get()); + return $this->returnResponse(Product::has('realEstate')->with('realEstate.companies','categorys')->globalIndustrialRealEstate()->open()->active()->get()); } public function openGCRE() { - return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalCommercialRealEstate()->open()->active()->get()); + return $this->returnResponse(Product::has('realEstate')->with('realEstate.companies','categorys')->globalCommercialRealEstate()->open()->active()->get()); } public function fullyFundedGCRE() { - return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalCommercialRealEstate()->fullyFunded()->active()->get()); + return $this->returnResponse(Product::has('realEstate')->with('realEstate.companies','categorys')->globalCommercialRealEstate()->fullyFunded()->active()->get()); } public function resaleGCRE() { - return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalCommercialRealEstate()->resale()->active()->get()); + return $this->returnResponse(Product::has('realEstate')->with('realEstate.companies','categorys')->globalCommercialRealEstate()->resale()->active()->get()); } public function openGRRE() { - return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalResidentialRealEstate()->open()->active()->get()); + return $this->returnResponse(Product::has('realEstate')->with('realEstate.companies','categorys')->globalResidentialRealEstate()->open()->active()->get()); } public function fullyFundedGRRE() { - return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalResidentialRealEstate()->fullyFunded()->active()->get()); + return $this->returnResponse(Product::has('realEstate')->with('realEstate.companies','categorys')->globalResidentialRealEstate()->fullyFunded()->active()->get()); } public function resaleGRRE() { - return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalResidentialRealEstate()->resale()->active()->get()); + return $this->returnResponse(Product::has('realEstate')->with('realEstate.companies','categorys')->globalResidentialRealEstate()->resale()->active()->get()); } public function globalCommercialRealEstateLearnMore(){ diff --git a/app/helper.php b/app/helper.php index 4d0fd11..8ff61fd 100644 --- a/app/helper.php +++ b/app/helper.php @@ -70,7 +70,7 @@ function imagePath($path = null) $finalPath = "https://staging.jerichoalternatives.in/"; } if (env('APP_ENV') == 'local') { - $finalPath = "http://localhost/my-freeu/"; + $finalPath = "http://localhost/new_freeu/my-freeu/"; } return $finalPath . $path; } diff --git a/database/migrations/2024_06_10_192122_add_platform_partner_to_real_estates.php b/database/migrations/2024_06_10_192122_add_platform_partner_to_real_estates.php new file mode 100644 index 0000000..bb9c40e --- /dev/null +++ b/database/migrations/2024_06_10_192122_add_platform_partner_to_real_estates.php @@ -0,0 +1,36 @@ +unsignedBigInteger('platform_partner')->after('products_id'); + $table->foreign('platform_partner')->references('id')->on('companies')->onDelete('cascade'); + + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('real_estates', function (Blueprint $table) { + // + }); + } +} diff --git a/public/assets/uploads/real-estate_images/202406101241_login-img.png b/public/assets/uploads/real-estate_images/202406101241_login-img.png new file mode 100644 index 0000000..ae0d698 Binary files /dev/null and b/public/assets/uploads/real-estate_images/202406101241_login-img.png differ diff --git a/public/uploads/product/fact_sheet/1718003682_factsheet.pdf b/public/uploads/product/fact_sheet/1718003682_factsheet.pdf new file mode 100644 index 0000000..36464c7 Binary files /dev/null and b/public/uploads/product/fact_sheet/1718003682_factsheet.pdf differ diff --git a/public/uploads/product/presentation/1718003682_presentation.pdf b/public/uploads/product/presentation/1718003682_presentation.pdf new file mode 100644 index 0000000..36464c7 Binary files /dev/null and b/public/uploads/product/presentation/1718003682_presentation.pdf differ diff --git a/public/uploads/real_estate/documents/1718002762.documents1jpg b/public/uploads/real_estate/documents/1718002762.documents1jpg new file mode 100644 index 0000000..5c9d211 Binary files /dev/null and b/public/uploads/real_estate/documents/1718002762.documents1jpg differ diff --git a/public/uploads/real_estate/photos/1718002699.photos1jpg b/public/uploads/real_estate/photos/1718002699.photos1jpg new file mode 100644 index 0000000..5c9d211 Binary files /dev/null and b/public/uploads/real_estate/photos/1718002699.photos1jpg differ diff --git a/resources/views/Admin/Pages/manage_freeu_investment/edit-product/funds.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/edit-product/funds.blade.php index 7437194..096ccf0 100644 --- a/resources/views/Admin/Pages/manage_freeu_investment/edit-product/funds.blade.php +++ b/resources/views/Admin/Pages/manage_freeu_investment/edit-product/funds.blade.php @@ -166,6 +166,34 @@ --}} + +
+ + +
+ + + +
+ +
diff --git a/resources/views/Admin/Pages/manage_freeu_investment/edit-product/real-estate.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/edit-product/real-estate.blade.php index 00d9ad9..150fcd2 100644 --- a/resources/views/Admin/Pages/manage_freeu_investment/edit-product/real-estate.blade.php +++ b/resources/views/Admin/Pages/manage_freeu_investment/edit-product/real-estate.blade.php @@ -166,6 +166,34 @@
--}} +
+ + +
+ + + +
+ +
+
@@ -1119,7 +1147,7 @@
-
+ {{--
-
+
--}} + {{--
+
--}}
- @dd
diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php index f4215e8..785f287 100644 --- a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php +++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php @@ -191,6 +191,7 @@ {{ $data->created_at->format('d/m/Y H:i:s') }} + {{-- @dd($data) --}} companies && $data->companies->company_name) { $companyName = $data->companies->company_name; @@ -342,11 +343,23 @@
- {{--
+
+ +
+
+ +
-
--}} +
+ +
+ +
+
{{-- @endforeach --}}
@@ -409,14 +422,14 @@
-
@@ -424,27 +437,27 @@
-
-
-
-
@@ -453,19 +466,19 @@
-
-
@@ -473,12 +486,12 @@ -
-
+
@@ -734,6 +747,17 @@ }) }); + function hideDiv(assignData,divId,assignId) + { + if(assignData == ''); + { + $(divId).addClass('d-none'); + } + if(assignData != ''){ + $(assignId).val(assignData); + } + } + $(document).ready(function() { // alert("hello"); $('.action_edit').click(function() { diff --git a/resources/views/Frontend/Pages/indian-real-estate/product.blade.php b/resources/views/Frontend/Pages/indian-real-estate/product.blade.php index d17c7ad..e48e26a 100644 --- a/resources/views/Frontend/Pages/indian-real-estate/product.blade.php +++ b/resources/views/Frontend/Pages/indian-real-estate/product.blade.php @@ -53,12 +53,13 @@

@endif + @if($realEstate->property_location || $realEstate->project_type ||$realEstate->current_status )
-
property_location)}}> +

Property Location

{{ $realEstate->property_location ?? '-' }}
@@ -162,8 +163,9 @@
@endif
+ @if($realEstate->no_of_bedrooms || $realEstate->no_of_restrooms || $realEstate->no_of_floors || $realEstate->total_towers || $realEstate->builder_details || $realEstate->landmarks || $realEstate->completed_in || $realEstate->total_units || $realEstate->unit_type )
- @if($realEstate->no_of_bedrooms || $realEstate->no_of_restrooms || $realEstate->no_of_floors) +

No. Of Bedrooms

@@ -183,8 +185,8 @@ {{ $realEstate->slug ?? '-' }}
--}}
- @endif - @if($realEstate->total_towers || $realEstate->builder_details || $realEstate->landmarks ) + +

Total Towers

@@ -199,8 +201,7 @@ {{ $realEstate->landmarks ?? '-' }}
- @endif - @if($realEstate->completed_in || $realEstate->total_units || $realEstate->unit_type ) +

Completed In

@@ -210,14 +211,16 @@

Total Units

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

Unit Type

{{ $realEstate->unit_type ?? '-' }}
- @endif +
+ @endif
+
@if($realEstate->electricity_status || $realEstate->fire_safety_measures || $realEstate->water_facility ) diff --git a/resources/views/Frontend/Pages/profile/company.blade.php b/resources/views/Frontend/Pages/profile/company.blade.php index 584d90b..1b7c145 100644 --- a/resources/views/Frontend/Pages/profile/company.blade.php +++ b/resources/views/Frontend/Pages/profile/company.blade.php @@ -74,21 +74,21 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -71,15 +71,15 @@
- +
- +
- +
@@ -87,11 +87,11 @@
- +
- +
@@ -129,15 +129,15 @@
- +
- +
- +
@@ -188,16 +188,16 @@ required: true, ValidEmail: true, }, - father_name: 'required', - mother_name: 'required', + // father_name: 'required', + // mother_name: 'required', dob: 'required', - place_of_birth: 'required', - gross_annual_income: 'required', - occupation: 'required', + // place_of_birth: 'required', + // gross_annual_income: 'required', + // occupation: 'required', passport: 'required', pan_card: 'required', proof_of_address_of_india: 'required', - // proof_of_address_of_foreign: 'required', + proof_of_address_of_foreign: 'required', utility: 'required', rental_agreement: 'required', passport_size_photograph: 'required', diff --git a/resources/views/Frontend/Pages/profile/others.blade.php b/resources/views/Frontend/Pages/profile/others.blade.php index 39d8d57..79b324b 100644 --- a/resources/views/Frontend/Pages/profile/others.blade.php +++ b/resources/views/Frontend/Pages/profile/others.blade.php @@ -52,11 +52,11 @@
- +
- +
@@ -66,15 +66,15 @@
- +
- +
- +
@@ -94,11 +94,11 @@
- +
- +
@@ -118,7 +118,7 @@
-
- +
- +
- +
- +
- +
@if($data->real_estate->geographic_focus == 'India') diff --git a/resources/views/components/global-hedge-fund-product.blade.php b/resources/views/components/global-hedge-fund-product.blade.php index 5416fb6..79b7bbb 100644 --- a/resources/views/components/global-hedge-fund-product.blade.php +++ b/resources/views/components/global-hedge-fund-product.blade.php @@ -4,11 +4,14 @@ @if(count($ghfAllData) && $ghfAllData[0]->categorys->status == 1) {{-- @dd($ghfAllData[0]->categorys->status == 1); --}}
+ {{-- @dd($ghfAllData) --}} @foreach($ghfAllData as $ghfData)
@if($ghfData->funds->slug == 'India') diff --git a/resources/views/components/global-industrial-real-estate-product.blade.php b/resources/views/components/global-industrial-real-estate-product.blade.php index 538dffc..400d6c2 100644 --- a/resources/views/components/global-industrial-real-estate-product.blade.php +++ b/resources/views/components/global-industrial-real-estate-product.blade.php @@ -3,13 +3,15 @@

{{ $type }}

@if ($gireAllData->data && $gireAllData->data[0]->categorys->status == 1)
+ {{-- @dd($gireAllData); --}} @foreach ($gireAllData as $gireData) @foreach ($gireData as $data)
@if ($data->real_estate->geographic_focus == 'India') diff --git a/resources/views/components/global-private-credit-fund-product.blade.php b/resources/views/components/global-private-credit-fund-product.blade.php index 648cc3e..53f256d 100644 --- a/resources/views/components/global-private-credit-fund-product.blade.php +++ b/resources/views/components/global-private-credit-fund-product.blade.php @@ -4,6 +4,7 @@ @if (count($gpcfAllData) && $gpcfAllData[0]->categorys->status == 1) {{-- @dd($gpcfAllData[0]->categorys->status == 1) --}}
+ {{-- @dd($gpcfAllData) --}} @foreach ($gpcfAllData as $data) {{-- @dd($data) --}} {{-- @foreach ($pefData as $data) --}} @@ -12,8 +13,9 @@ data-route="{{ route('alternative-investment-fund.private-credit-fund-product', $data->funds->slug) }}" class="redirect_to_page">
@if ($data->funds->geographic_focus == 'India') diff --git a/resources/views/components/global-private-equity-fund-product.blade.php b/resources/views/components/global-private-equity-fund-product.blade.php index f5262d6..b025c58 100644 --- a/resources/views/components/global-private-equity-fund-product.blade.php +++ b/resources/views/components/global-private-equity-fund-product.blade.php @@ -7,8 +7,9 @@
diff --git a/resources/views/components/global-residential-real-estate-product.blade.php b/resources/views/components/global-residential-real-estate-product.blade.php index 09b354d..f1b4393 100644 --- a/resources/views/components/global-residential-real-estate-product.blade.php +++ b/resources/views/components/global-residential-real-estate-product.blade.php @@ -8,7 +8,8 @@
@if($data->real_estate->geographic_focus == 'India') diff --git a/resources/views/components/indian-commercial-real-estate-product.blade.php b/resources/views/components/indian-commercial-real-estate-product.blade.php index b7ef84d..686762e 100644 --- a/resources/views/components/indian-commercial-real-estate-product.blade.php +++ b/resources/views/components/indian-commercial-real-estate-product.blade.php @@ -3,11 +3,13 @@

{{$type}}

@if(count($icreAllData))