diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php index c001d31..493c2a0 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php @@ -871,7 +871,7 @@ class ManageFreeUInvestmentController extends Controller ]); $estate = RealEstate::find($request->realEstates); - $type = Product::where('id', $estate->products_id)->update(['type' => $request->type]); + $type = Product::where('id', $estate->products_id)->update(['type' => $request->type, 'description'=>$request->description]); $photos = $request->photos; $documents = $request->documents; diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php index a39ca8b..bec6e49 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php @@ -135,7 +135,7 @@ class FractionalRealEstateController extends Controller 'companies_id' => $request->companies_id, 'geographic_focus' => $request->geographic_focus, 'property_name_and_location' => $request->property_name_and_location, - 'property_description' => $request->property_description ?? null, + 'property_description' => $request->description ?? null, 'property_grade' => $request->property_grade, 'asset_type' => $request->asset_type, 'tenant' => $request->tenant, diff --git a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php index af84017..ee94f64 100644 --- a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php +++ b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php @@ -238,7 +238,7 @@ class AlternativeInvestmentFundController extends Controller ->get(); $productData = AlternativeInvestmentFund::where('slug', '=', $slug)->first(); $productData = Product::with('product_images')->where('id', '=', $productData->products_id)->first(); - // dd($productData); + // dd($fundForDistressedAsset); return view('Frontend.Pages.alternative-investment-fund.fund-for-distressed-asset-product', compact('fundForDistressedAsset', 'otherFFDA', 'productData')); } @@ -277,7 +277,7 @@ class AlternativeInvestmentFundController extends Controller public function privateInvestmentPublicEquityProduct($slug) { $pipe = $this->pipeData($slug)->getData()->data; - // dd($pipe); + // return $pipe; $otherPIPE = AlternativeInvestmentFund::query() ->join('products', 'alternative_investment_funds.products_id', 'products.id') ->where(['status' => true, 'categories_id' => 35]) @@ -530,7 +530,7 @@ class AlternativeInvestmentFundController extends Controller public function pipeData($slug) { try { - return (new PrivateInvestmentInPublicEquityFundResource(AlternativeInvestmentFund::with('product')->where('slug', $slug)->first())) + return (new PrivateInvestmentInPublicEquityFundResource(AlternativeInvestmentFund::where('slug', $slug)->first())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -600,7 +600,6 @@ class AlternativeInvestmentFundController extends Controller public function privateCreditFundProduct($slug) { $privateCreditFund = $this->privateCreditFundProductData($slug)->getData()->data; - // dd($privateCreditFund); $otherPEF = AlternativeInvestmentFund::query() ->join('products', 'alternative_investment_funds.products_id', 'products.id') ->join('companies', 'alternative_investment_funds.companies_id', 'companies.id') diff --git a/app/Http/Controllers/Frontend/HandpickedInvestmentController.php b/app/Http/Controllers/Frontend/HandpickedInvestmentController.php index e6e4474..68c2ff5 100644 --- a/app/Http/Controllers/Frontend/HandpickedInvestmentController.php +++ b/app/Http/Controllers/Frontend/HandpickedInvestmentController.php @@ -73,9 +73,9 @@ class HandpickedInvestmentController extends Controller ]; $products = Product::query() - ->select(DB::raw('products.id, products.categories_id as category_id, coalesce(fre.property_name_and_location,aif.fund_name,re.property_name,funds.fund_name) as product_name'), DB::raw('coalesce(companies.company_logo) as company_logo'), DB::raw('coalesce(fre.slug,aif.slug,re.slug, funds.slug) as slug'), DB::raw('coalesce(fre.geographic_focus,aif.geographic_focus,re.geographic_focus, funds.geographic_focus) as geographic_focus'), DB::raw('coalesce(aif.minimum_capital_commitment,fre.minimum_investment,funds.minimum_investment,re.total_price) as minimum_investment'), + ->select(DB::raw('products.id,products.description, products.categories_id as category_id, coalesce(fre.property_name_and_location,aif.fund_name,re.property_name,funds.fund_name) as product_name'), DB::raw('coalesce(companies.company_logo) as company_logo'), DB::raw('coalesce(fre.slug,aif.slug,re.slug, funds.slug) as slug'), DB::raw('coalesce(fre.geographic_focus,aif.geographic_focus,re.geographic_focus, funds.geographic_focus) as geographic_focus'), DB::raw('coalesce(aif.minimum_capital_commitment,fre.minimum_investment,funds.minimum_investment,re.total_price) as minimum_investment'), // DB::raw('coalesce(aif.description,fre.property_description,re.remarks,funds.fund_description) as description'), - DB::raw('coalesce(fre.property_description,products.description) as description'), + // DB::raw('coalesce(products.description) as description'), // 'products.description', DB::raw('coalesce(categories.category_name) as category_name')) ->leftJoin('fractional_real_estates as fre', 'products.id', 'fre.products_id') diff --git a/app/Imports/FractionalRealEstateImport.php b/app/Imports/FractionalRealEstateImport.php index 38ccf07..8580416 100644 --- a/app/Imports/FractionalRealEstateImport.php +++ b/app/Imports/FractionalRealEstateImport.php @@ -95,7 +95,7 @@ class FractionalRealEstateImport implements ToCollection, WithHeadingRow 'total_views' => 0, // 'status' => 1, 'created_by' => auth()->user()->id, - 'description'=> $row['property_description'] ?? null, + 'description'=> $row['description'] ?? null, ]); $count = FractionalRealEstate::where('property_name_and_location',$row['property_name_and_location'])->count(); FractionalRealEstate::create([ @@ -103,7 +103,7 @@ class FractionalRealEstateImport implements ToCollection, WithHeadingRow // 'companies_id' => $row['companies_id'], 'slug' => Str::slug($row['property_name_and_location']).'-'.$count+1, 'property_name_and_location' => $row['property_name_and_location'], - 'property_description' => $row['property_description'], + 'property_description' => $row['description'], 'property_grade' => $row['property_grade'], 'asset_type' => $row['asset_type'], 'tenant' => $row['tenant'], diff --git a/app/Imports/RealEstateImport.php b/app/Imports/RealEstateImport.php index cb62028..08d568a 100644 --- a/app/Imports/RealEstateImport.php +++ b/app/Imports/RealEstateImport.php @@ -43,7 +43,8 @@ class RealEstateImport implements ToCollection, WithHeadingRow public function rules(): array { return [ - '*.property_name' => 'required|unique:real_estates,property_name' + '*.property_name' => 'required', + // '*.property_name' => 'required|unique:real_estates,property_name' // '*.property_name' => 'required|unique:fractional_real_estates,property_name' // '*.min_investment' => 'required', // '*.return_rate' => 'required', diff --git a/app/Models/FractionalRealEstate.php b/app/Models/FractionalRealEstate.php index 6be0ded..6068782 100644 --- a/app/Models/FractionalRealEstate.php +++ b/app/Models/FractionalRealEstate.php @@ -12,7 +12,7 @@ class FractionalRealEstate extends Model protected $hidden = ['created_at','updated_at']; - protected $fillable = ['products_id','companies_id','property_image','slug','property_name_and_location','property_description','property_grade','asset_type','tenant','deal_size_in_crore','coupon_rate_on_ccd','rental_escalation','capital_appreciation','expected_irr','cagr','minimum_investment_lockin','tenant_lease_term','tenant_lock_in','tenant_security_deposit','annual_management_fee','performance_fees','hurdle_rate','minimum_investment_in_int']; + protected $fillable = ['products_id','companies_id','property_image','slug','property_name_and_location','property_description','property_grade','asset_type','tenant','deal_size_in_crore','coupon_rate_on_ccd','rental_escalation','capital_appreciation','expected_irr','cagr','minimum_investment','minimum_investment_lockin','tenant_lease_term','tenant_lock_in','tenant_security_deposit','annual_management_fee','performance_fees','hurdle_rate','minimum_investment_in_int']; // const path = 'https://jerichoalternatives.in/public/uploads/fractional_real_estate/property_image/'; diff --git a/public/excel-template/InternationalCommercialRealEstateTemplate.xlsx b/public/excel-template/InternationalCommercialRealEstateTemplate.xlsx index 525bd48..3d5cd89 100644 Binary files a/public/excel-template/InternationalCommercialRealEstateTemplate.xlsx and b/public/excel-template/InternationalCommercialRealEstateTemplate.xlsx differ diff --git a/public/excel-template/InternationalPrivateCreditFundTemplate.xlsx b/public/excel-template/InternationalPrivateCreditFundTemplate.xlsx index 942cb79..2d48c23 100644 Binary files a/public/excel-template/InternationalPrivateCreditFundTemplate.xlsx and b/public/excel-template/InternationalPrivateCreditFundTemplate.xlsx differ diff --git a/public/excel-template/InternationalPrivateEquityFundTemplate.xlsx b/public/excel-template/InternationalPrivateEquityFundTemplate.xlsx index 1b8d35c..6c4fa9b 100644 Binary files a/public/excel-template/InternationalPrivateEquityFundTemplate.xlsx and b/public/excel-template/InternationalPrivateEquityFundTemplate.xlsx differ diff --git a/public/excel-template/InternationalVentureCapitalFundTemplate.xlsx b/public/excel-template/InternationalVentureCapitalFundTemplate.xlsx index 1b8d35c..d5fc279 100644 Binary files a/public/excel-template/InternationalVentureCapitalFundTemplate.xlsx and b/public/excel-template/InternationalVentureCapitalFundTemplate.xlsx differ 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 2de5ced..00d9ad9 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 @@ -1156,6 +1156,28 @@ +
+ + + + + + + + + + + + + +
+

Total Price: {{$data->real_estate->total_price}}

-

{{$data->real_estate->property_location}}

+

{{$data->description}}

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 c0d5215..475a2b4 100644 --- a/resources/views/components/global-residential-real-estate-product.blade.php +++ b/resources/views/components/global-residential-real-estate-product.blade.php @@ -36,12 +36,14 @@

Total Price: {{$data->real_estate->total_price}}

{{$data->real_estate->property_location}}

+

{{$data->description}}

+
@endforeach @endforeach - ] + @else

No investment opportunities available at the moment

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 606aeb0..4487662 100644 --- a/resources/views/components/indian-commercial-real-estate-product.blade.php +++ b/resources/views/components/indian-commercial-real-estate-product.blade.php @@ -34,7 +34,7 @@

Total Price: {{$data->realEstate->total_price}}

-

{{$data->realEstate->facilities_features}}

+

{{$data->description}}

diff --git a/resources/views/components/indian-residential-real-estate-product.blade.php b/resources/views/components/indian-residential-real-estate-product.blade.php index 9f2488b..f5f663f 100644 --- a/resources/views/components/indian-residential-real-estate-product.blade.php +++ b/resources/views/components/indian-residential-real-estate-product.blade.php @@ -34,7 +34,7 @@

Minimum Investment: {{$ffdaData->realEstate->price_range}}

-

{{$ffdaData->realEstate->amenities}}

+

{{$ffdaData->description}}