diff --git a/app/Http/Controllers/Frontend/MarketPlaceController.php b/app/Http/Controllers/Frontend/MarketPlaceController.php index 1c3c838..e9a2685 100644 --- a/app/Http/Controllers/Frontend/MarketPlaceController.php +++ b/app/Http/Controllers/Frontend/MarketPlaceController.php @@ -19,6 +19,7 @@ class MarketPlaceController extends Controller { $spotlightMarketPlaceListed = $this->spotlightInvestment()['data']; $featuredMarketplaceListed = $this->featuredInvestments(); + // dd($featuredMarketplaceListed); $nonFeaturedMarketplaceListed = $this->nonFeaturedInvestments(); return view('Frontend.Pages.marketplace.index', compact('spotlightMarketPlaceListed', 'featuredMarketplaceListed', 'nonFeaturedMarketplaceListed')); } @@ -70,6 +71,7 @@ class MarketPlaceController extends Controller array_push($marketplaceListed, $freMarketplace); array_push($marketplaceListed, $aifMarketplace); array_push($marketplaceListed, $opMarketplace); + // dd($freMarketplace['fractional-real-estate']); // $marketplaceListed = []; diff --git a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php index 0b8c46b..a9b8e1c 100644 --- a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php +++ b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php @@ -127,36 +127,26 @@ class MarketplaceAlternativeInvestmentFundSeller extends Model public function getBidAttribute($id) { $values = MarketplaceAlternativeInvestmentFundSeller::where('id', $this->id)->first(); - // dd("values",$values); $bids = MarketplaceBuyerForm::where(['associated_id' => $this->id, 'table' => 'marketplace_aif_sellers'])->where('status','!=','Sold')->get(); // $bids = MarketplaceBuyerForm::where(['associated_id' => $this->id, 'table' => 'marketplace_aif_sellers'])->get(); - // dd($bids); - // dd($bids[0]->total_purchase_value); $bidArray = collect(); $bids->each(function($value) use ($bidArray,$values){ - // dd(); - // dd($value->getAttributes()['total_purchase_value']); if($value->no_of_units_you_wish_to_buy < $values->no_of_units_you_wish_to_sell) { - $bidArray->push($value->getAttributes()['total_purchase_value']); + // $bidArray->push($value->getAttributes()['total_purchase_value']); + $bidArray->push($value->getAttributes()['offer_price_per_unit']); } }); - -// dd($values); - $noOfUnitHeld = $values->current_or_latest_nav; - // dd( $noOfUnitHeld, intval($values->no_of_units_held) * intval($values->current_or_latest_nav)); - $nav = intval($noOfUnitHeld) * intval($values->current_or_latest_nav); - // $highestBid = intval($bids[0]->bidMaxValue); - - + $noOfUnitHeld = (int)$values->current_or_latest_nav; + // $nav = intval($noOfUnitHeld) * intval($values->current_or_latest_nav); $highestBid = intval($bidArray->max()); - - // dd($nav,$highestBid, ($highestBid - $nav)/(int)$nav * 100, count($bids)); - $bid = ($highestBid - $nav)/(int)$nav * 100 ; + // $bid = ($highestBid - $nav)/(int)$nav * 100 ; + $bid = ($highestBid - $noOfUnitHeld)/(int)$noOfUnitHeld * 100 ; if(count($bids)) { return round($bid,3); } + // dd($bids->toArray()); // $bidArr = []; // foreach ($bids as $bid) { diff --git a/app/Models/MarketplaceFractionalRealEstateSeller.php b/app/Models/MarketplaceFractionalRealEstateSeller.php index 91e12bd..28ac5ae 100644 --- a/app/Models/MarketplaceFractionalRealEstateSeller.php +++ b/app/Models/MarketplaceFractionalRealEstateSeller.php @@ -48,7 +48,7 @@ class MarketplaceFractionalRealEstateSeller extends Model public function getBidAttribute($id){ $values = MarketplaceFractionalRealEstateSeller::where('id', $this->id)->first(); - $bids = MarketplaceBuyerForm::where(['associated_id' => $this->id, 'table' => 'marketplace_fre_sellers'])->get(); + $bids = MarketplaceBuyerForm::where(['associated_id' => $this->id, 'table' => 'marketplace_fre_sellers'])->where('status','!=','Sold')->get(); $bidArr = []; foreach($bids as $bid){ $bidArr[] = round(($bid->getAttributes()['total_purchase_value'] - $this->current_market_value_of_the_property)/$this->current_market_value_of_the_property * 100,3); @@ -62,23 +62,23 @@ class MarketplaceFractionalRealEstateSeller extends Model public function getSoldStatusAttribute($id) { return MarketplaceBuyerForm::where('associated_id', $id)->where('status', 'Sold')->exists() ? 'SOLD' : 'OPEN'; - // $buyerData = MarketplaceBuyerForm::where('associated_id', $id)->where('status', 'Sold')->get(); - // $totalSellUnits = 0; - // $buyerData->each(function($data) use($totalSellUnits){ - // return $totalSellUnits += (int)$data->no_of_units_you_wish_to_buy; - // }); - // if(MarketplaceFractionalRealEstateSeller::where('id',$buyerData->associated_id)->exists()) - // { - // $getAIFData = MarketplaceFractionalRealEstateSeller::where('id',$buyerData->associated_id)->first(); - // $aifData = (int)$getAIFData->no_of_units_you_wish_to_sell; - // $remainUnits = $aifData - $totalSellUnits; - // if($remainUnits < 0) - // { - // return 'SOLD'; - // } - // return 'OPEN'; - // }else{ - // return 'OPEN'; - // } + $buyerData = MarketplaceBuyerForm::where('associated_id', $id)->where('status', 'Sold')->get(); + $totalSellUnits = 0; + $buyerData->each(function($data) use($totalSellUnits){ + return $totalSellUnits += (int)$data->no_of_units_you_wish_to_buy; + }); + if(MarketplaceFractionalRealEstateSeller::where('id',$buyerData->associated_id)->exists()) + { + $getAIFData = MarketplaceFractionalRealEstateSeller::where('id',$buyerData->associated_id)->first(); + $aifData = (int)$getAIFData->no_of_units_you_wish_to_sell; + $remainUnits = $aifData - $totalSellUnits; + if($remainUnits < 0) + { + return 'SOLD'; + } + return 'OPEN'; + }else{ + return 'OPEN'; + } } } \ No newline at end of file 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 fe64d6b..c5f824d 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 @@ -891,8 +891,8 @@ }); function holdingStatus(id, status, count = null, profitSharing, customId, categories, productId) { - // alert(typeof(profitSharing)) - if (profitSharing && status == 'Holding') { + // alert(profitSharing) + if (profitSharing <= 0 && status == 'Holding') { $('#id').val(id); $('#product_id').val(productId); $('#status').val(status); diff --git a/resources/views/Admin/Pages/pre_owned_investment/partial/overview-row.blade.php b/resources/views/Admin/Pages/pre_owned_investment/partial/overview-row.blade.php index b72259d..745b6c4 100644 --- a/resources/views/Admin/Pages/pre_owned_investment/partial/overview-row.blade.php +++ b/resources/views/Admin/Pages/pre_owned_investment/partial/overview-row.blade.php @@ -57,6 +57,10 @@ @endif @if($rejectedTable) + + + +

Contact No

-

Number

+

022-62396024

@@ -125,6 +125,7 @@ @foreach ($featuredMarketplaceListed['data'] as $freData) @if (array_key_exists('fractional-real-estate', $freData)) @foreach ($freData['fractional-real-estate'] as $data) + {{-- @dd($data) --}} @php($true = false) diff --git a/resources/views/Frontend/menu-after-lg.blade.php b/resources/views/Frontend/menu-after-lg.blade.php index 16d1bf9..e839131 100644 --- a/resources/views/Frontend/menu-after-lg.blade.php +++ b/resources/views/Frontend/menu-after-lg.blade.php @@ -367,8 +367,7 @@ -
  • List Your Asset
    • +
  • List Your Asset
    • {{-- href="{{ route('market-list') }}" --}}