Vishal.Chandora/freeu-project
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing bugs

Browse Source
This commit is contained in:
meghamalore
2024-05-10 11:09:28 +05:30
parent 3268e32299
commit 2fde378902
16 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/ManageFreeUInvestmentController.php
View File

@@ -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;

2
app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php
View File

@@ -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,

7
app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php
View File

@@ -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')

4
app/Http/Controllers/Frontend/HandpickedInvestmentController.php
View File

@@ -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')

4
app/Imports/FractionalRealEstateImport.php
View File

@@ -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'],

3
app/Imports/RealEstateImport.php
View File

@@ -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',

2
app/Models/FractionalRealEstate.php
View File

@@ -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/';

BIN
public/excel-template/InternationalCommercialRealEstateTemplate.xlsx
View File

Binary file not shown.

BIN
public/excel-template/InternationalPrivateCreditFundTemplate.xlsx
View File

Binary file not shown.

BIN
public/excel-template/InternationalPrivateEquityFundTemplate.xlsx
View File

Binary file not shown.

BIN
public/excel-template/InternationalVentureCapitalFundTemplate.xlsx
View File

Binary file not shown.

22
resources/views/Admin/Pages/manage_freeu_investment/edit-product/real-estate.blade.php
View File

@@ -1156,6 +1156,28 @@
<input type="file" class="form-control form-control-solid" name="fact_sheet"/>
</div>
<div class="col-md-6 mt-4">
<!--begin::Label-->
<label class="fs-6 fw-semibold form-label mt-3">
<span class="required">Description</span>
<!-- <i class="fas fa-exclamation-circle ms-1 fs-7" data-bs-toggle="tooltip" title="Enter the contact's name."></i> -->
</label>
<!--end::Label-->
<!--begin::Input-->
<textarea class="form-control form-control-solid" rows="5" name="description" placeholder="Enter description">{{$products->description}}</textarea>
<!--end::Input-->
</div>
<div class="namediv">
<label class="fs-6 fw-semibold form-label mt-3">
<span class="">Gallery</span>

2
resources/views/components/global-commercial-real-estate-product.blade.php
View File

@@ -35,7 +35,7 @@
</div>
<div class="dics">
<h4>Total Price: {{$data->real_estate->total_price}}</h4>
<p>{{$data->real_estate->property_location}}</p>
<p>{{$data->description}}</p>
</div>
</a>
</div>

4
resources/views/components/global-residential-real-estate-product.blade.php
View File

@@ -36,12 +36,14 @@
<div class="dics">
<h4>Total Price: {{$data->real_estate->total_price}}</h4>
<p>{{$data->real_estate->property_location}}</p>
<p>{{$data->description}}</p>
</div>
</a>
</div>
@endforeach
@endforeach
</div>]
</div>
@else
<div class="text-center">
<h4>No investment opportunities available at the moment</h4>

2
resources/views/components/indian-commercial-real-estate-product.blade.php
View File

@@ -34,7 +34,7 @@
</div>
<div class="dics">
<h4>Total Price: {{$data->realEstate->total_price}}</h4>
<p>{{$data->realEstate->facilities_features}}</p>
<p>{{$data->description}}</p>
</div>
</a>
</div>

2
resources/views/components/indian-residential-real-estate-product.blade.php
View File

@@ -34,7 +34,7 @@
</div>
<div class="dics">
<h4>Minimum Investment: {{$ffdaData->realEstate->price_range}}</h4>
<p>{{$ffdaData->realEstate->amenities}}</p>
<p>{{$ffdaData->description}}</p>
</div>
</a>
</div>