diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index d1a4c24..9c8da02 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -34,21 +34,26 @@ class DashboardController extends Controller $user = $this->getUser()->data; $currentInvestmentProduct = $this->view_investors_details('Holding'); $reedemedInvestmentProduct = $this->view_investors_details('Reedemed'); - // watchlist + + // investment on watchlist $aifInvestmentWatchlist = $this->aifInvestmentWatchlist()['data']; $freInvestmentWatchlist = $this->freInvestmentWatchlist()['data']; $opInvestmentWatchlist = $this->opInvestmentWatchlist()['data']; - // sold + // dd($freInvestmentWatchlist); + // investment on bought $aifSoldInvestmentWatchlist = $this->aifSoldInvestmentWatchlist()['data']; $freSoldInvestmentWatchlist = $this->freSoldInvestmentWatchlist()['data']; $opSoldInvestmentWatchlist = $this->opSoldInvestmentWatchlist()['data']; + // bought $aifInvestmentListed = $this->aifInvestmentListed()['data']; $freInvestmentListed = $this->freInvestmentListed()['data']; $opInvestmentListed = $this->opInvestmentListed()['data']; - // + + // investment on sale $marketPlaceAIFSellerData = $this->getMarketplaceAIFSellerData(1); $marketPlaceFRESellerData = $this->getMarketplaceFRESellerData(1); + // dd($marketPlaceFRESellerData); $marketPlaceOPSellerData = $this->getMarketplaceOPSellerData(); $totalInvestmentTillDate = '₹ ' . $this->IND_money_format($currentInvestmentProduct['totalInvestmentInInt'] + $reedemedInvestmentProduct['totalInvestmentInInt']); @@ -128,7 +133,19 @@ class DashboardController extends Controller // } // return $market_place_data; $sellerData = MarketplaceSellerForm::with('fre')->where('users_id',$id)->get(); - // dd(count($sellerData->toArray())); + // dd($sellerData); + $sellerData->each(function($value){ + $value->fre->each(function($fre){ + // dd($fre); + if($fre) + { + $fre['company_name'] = Company::where('id',$fre->fractional_real_estate_platform)->value('company_name'); + } + + }); + // dd($value->fre[0]->fractional_real_estate_platform); + }); + // dd($sellerData->toArray()); if($api == null) { $data['data'] = $sellerData; @@ -777,11 +794,19 @@ class DashboardController extends Controller public function freInvestmentWatchlist() { $data['data'] = MarketplaceBuyerForm::query() + // ->leftJoin('compaines', 'marketplace_fre_sellers.fractional_real_estate_platform', 'compaines.id') ->join('marketplace_fre_sellers', 'marketplace_buyer_forms.associated_id', 'marketplace_fre_sellers.id') + // ->with('compaines') ->fractionalRealEstate() ->where('listing_status', '!=', 'Hide') ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price') ->get(); + $data['data']->each(function($value){ + if($value->fractional_real_estate_platform != null) + { + $value->company_name = Company::where('id',$value->fractional_real_estate_platform)->value('company_name'); + } + }); return $data; } @@ -820,6 +845,12 @@ class DashboardController extends Controller // ->where('marketplace_fre_sellers.listing_status', 'Hide') ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price') ->get(); + $data['data']->each(function($value){ + if($value->fractional_real_estate_platform != null) + { + $value->company_name = Company::where('id',$value->fractional_real_estate_platform)->value('company_name'); + } + }); return $data; } diff --git a/app/Models/MarketplaceBuyerForm.php b/app/Models/MarketplaceBuyerForm.php index fb3eced..8c33aa4 100644 --- a/app/Models/MarketplaceBuyerForm.php +++ b/app/Models/MarketplaceBuyerForm.php @@ -44,7 +44,7 @@ class MarketplaceBuyerForm extends Model } public function getFundCategoryAttribute($value){ - return 123; + // return 123; return $this->attributes['name_of_the_aif_fund']; // return $this->get_money_format($value); @@ -96,4 +96,9 @@ class MarketplaceBuyerForm extends Model public function aifSellerData(){ return $this->hasOne(MarketplaceAlternativeInvestmentFundSeller::class,'id','associated_id'); } + + // public function compaines() + // { + // return $this->belongsTo(Company::class,'platform'); + // } } diff --git a/app/Models/MarketplaceSellerForm.php b/app/Models/MarketplaceSellerForm.php index 72716f3..a59a147 100644 --- a/app/Models/MarketplaceSellerForm.php +++ b/app/Models/MarketplaceSellerForm.php @@ -24,6 +24,9 @@ class MarketplaceSellerForm extends Model public function fre(){ // return $this->hasMany(MarketplaceFractionalRealEstateSeller::class,'seller_forms_id')->where('listing_status', '!=','Hide')->where('status','Approved'); return $this->hasMany(MarketplaceFractionalRealEstateSeller::class,'seller_forms_id')->where('status','Approved'); + // $data = $this->hasMany(MarketplaceFractionalRealEstateSeller::class,'seller_forms_id')->where('status','Approved'); + // dd($data); + } public function op(){ diff --git a/resources/views/Frontend/Pages/handpicked-investment.blade.php b/resources/views/Frontend/Pages/handpicked-investment.blade.php index 6466592..6698d39 100644 --- a/resources/views/Frontend/Pages/handpicked-investment.blade.php +++ b/resources/views/Frontend/Pages/handpicked-investment.blade.php @@ -334,7 +334,7 @@ function fetch_data(page, query, categories, assetType, geographicFocus) { $.ajax({ type: 'get', - url: "/primary-investment/fetch_data?page=" + + url: "http://localhost/jericho_28_march/primary-investment/fetch_data?page=" + page + "&query=" + query + "&categories=" + categories + "&assetType=" + assetType + diff --git a/resources/views/Frontend/Pages/profile/dashboard.blade.php b/resources/views/Frontend/Pages/profile/dashboard.blade.php index 8d4977c..9824242 100644 --- a/resources/views/Frontend/Pages/profile/dashboard.blade.php +++ b/resources/views/Frontend/Pages/profile/dashboard.blade.php @@ -275,7 +275,7 @@ {{ $data->getAttributes()['property_address'] }} {{ $data->property_grade }} {{ $data->asset_type }} - {{ $data->fractional_real_estate_platform }} + {{ $data->company_name }} {{ $data->expected_selling_price }} @endforeach @@ -403,7 +403,7 @@ {{ $data->getAttributes()['property_address'] }} {{ $data->property_grade }} {{ $data->asset_type }} - {{ $data->fractional_real_estate_platform }} + {{ $data->company_name }} {{ IND_money_format($data->expected_selling_price) }} @endforeach @@ -517,7 +517,7 @@ {{ $item['asset_type'] }} - {{ $item['fractional_real_estate_platform'] }} + {{ $item['company_name'] }} {{ $item['expected_selling_price'] }}