From cbd046de4bf37c6c534384c3098e26b0e61ace1d Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Fri, 26 Apr 2024 12:23:43 +0530 Subject: [PATCH] fix changes --- .../Controllers/Admin/OverviewController.php | 48 +++++++++++++++++++ .../Frontend/DashboardController.php | 38 +++++++++++---- .../Frontend/MarketPlaceController.php | 29 ++++++++++- ...etplaceAlternativeInvestmentFundSeller.php | 25 +++++++++- .../MarketplaceFractionalRealEstateSeller.php | 18 +++++++ app/Models/MarketplaceSellerForm.php | 3 +- .../interested-buyers.blade.php | 3 ++ .../partial/interested-buyers-row.blade.php | 9 ++++ .../views/Admin/general-dashboard.blade.php | 4 +- .../Pages/profile/dashboard.blade.php | 24 +++++----- 10 files changed, 174 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/Admin/OverviewController.php b/app/Http/Controllers/Admin/OverviewController.php index fadc501..545dc32 100644 --- a/app/Http/Controllers/Admin/OverviewController.php +++ b/app/Http/Controllers/Admin/OverviewController.php @@ -180,6 +180,54 @@ class OverviewController extends Controller // return response()->json(['status' => 400, 'message' => 'This product has already been Sold']); // } // } + // $checkAlreadySold = MarketplaceBuyerForm::where(['id'=>$buyerId,'status'=>'Sold'])->first(); + // if($checkAlreadySold) + // { + // $marketPlaceId = $checkAlreadySold->associated_id; + // if(MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->exists()) + // { + // $getAIFData = MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->first(); + // $oldUnit = (int)$getAIFData->no_of_units_you_wish_to_sell; + // $newUnits = (int)$checkAlreadySold->no_of_units_you_wish_to_buy + $oldUnit; + // $updateUnits = MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->update([ + // 'no_of_units_you_wish_to_sell' => $newUnits, + // ]); + + // } + // // elseif(MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->exists()) + // // { + // // $getAIFData = MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->first(); + // // $oldUnit = (int)$getAIFData->no_of_units_you_wish_to_sell; + // // $newUnits = (int)$checkAlreadySold->no_of_units_you_wish_to_buy + $oldUnit; + // // $updateUnits = MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->update([ + // // 'no_of_units_you_wish_to_sell' => $newUnits, + // // ]); + + // // } + // }else + + + if($status == 'Sold'){ + $getMarketplaceBuyerUnit = MarketplaceBuyerForm::where('id', $buyerId)->first(); + $marketPlaceId = $getMarketplaceBuyerUnit->associated_id; + $getUnits = (int)$getMarketplaceBuyerUnit->no_of_units_you_wish_to_buy; + if(MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->exists()) + { + $getAIFData = MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->first(); + $oldUnit = (int)$getAIFData->no_of_units_you_wish_to_sell; + $newUnits = $oldUnit - (int)$getUnits; + if($newUnits >= 0) + { + $updateUnits = MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->update([ + 'no_of_units_you_wish_to_sell' => $newUnits, + ]); + } + else{ + return response()->json(['status' => 400, 'message' => 'Bid units is more than seller units with '.abs($newUnits).' units']); + } + + } + } $alreadySold = MarketplaceBuyerForm::where('id', $buyerId)->update([ 'status' => $status ]); diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index 6723db6..8992f34 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -57,11 +57,20 @@ class DashboardController extends Controller public function getMarketplaceAIFSellerData() { $id = auth()->guard('users')->user()->id; - $market_place_data = MarketplaceBuyerForm::where(['users_id' => $id, 'status' => 'Sold', 'table' => 'marketplace_aif_sellers'])->get(); - foreach ($market_place_data as $row) { - $row['marketplace_aif_sellers_data'] = MarketplaceAlternativeInvestmentFundSeller::where('id', $row->associated_id)->first(); + // $market_place_data = MarketplaceBuyerForm::where(['users_id' => $id, 'status' => 'Sold', 'table' => 'marketplace_aif_sellers'])->get(); + // foreach ($market_place_data as $row) { + // $row['marketplace_aif_sellers_data'] = MarketplaceAlternativeInvestmentFundSeller::where('id', $row->associated_id)->first(); + // } + // return $market_place_data; + $sellerData = MarketplaceSellerForm::has('aif')->with('aif')->where('users_id',$id)->get(); + // return $sellerData[0]->aif['name_of_the_aif_fund']; + if(count($sellerData->toArray())) + { + $market_place_data = $sellerData[0]->aif->toArray(); + return $market_place_data; } - return $market_place_data; + return $sellerData; + } public function aifSoldInvestment() @@ -103,11 +112,20 @@ class DashboardController extends Controller public function getMarketplaceFRESellerData() { $id = auth()->guard('users')->user()->id; - $market_place_data = MarketplaceBuyerForm::where(['users_id' => $id, 'status' => 'Sold', 'table' => 'marketplace_fre_sellers'])->get(); - foreach ($market_place_data as $row) { - $row['marketplace_fre_sellers_data'] = MarketplaceFractionalRealEstateSeller::where('id', $row->associated_id)->first(); + // $market_place_data = MarketplaceBuyerForm::where(['users_id' => $id, 'status' => 'Sold', 'table' => 'marketplace_fre_sellers'])->get(); + // foreach ($market_place_data as $row) { + // $row['marketplace_fre_sellers_data'] = MarketplaceFractionalRealEstateSeller::where('id', $row->associated_id)->first(); + // } + // return $market_place_data; + $sellerData = MarketplaceSellerForm::has('fre')->with('fre')->where('users_id',$id)->get(); + // dd(count($sellerData->toArray())); + if(count($sellerData->toArray())) + { + $market_place_data = $sellerData[0]->fre->toArray(); + return $market_place_data; } - return $market_place_data; + return $sellerData; + // if($sellerData->toArray()->count()) } public function getMarketplaceOPSellerData() @@ -769,7 +787,7 @@ class DashboardController extends Controller ->join('marketplace_aif_sellers', 'marketplace_buyer_forms.associated_id', 'marketplace_aif_sellers.id') ->alernativeInvestmentFund() ->sold() - ->where('listing_status', '!=', 'Hide') + // ->where('listing_status', '!=', 'Hide') // ->where('marketplace_aif_sellers.listing_status', 'Hide') ->select('name_of_the_aif_fund', 'fund_category', 'fund_strategy', 'type_of_fund', 'total_capital_commitment', 'uncalled_capital_commitment') ->get(); @@ -783,7 +801,7 @@ class DashboardController extends Controller ->join('marketplace_fre_sellers', 'marketplace_buyer_forms.associated_id', 'marketplace_fre_sellers.id') ->fractionalRealEstate() ->sold() - ->where('listing_status', '!=', 'Hide') + // ->where('listing_status', '!=', 'Hide') // ->where('marketplace_fre_sellers.listing_status', 'Hide') ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price') ->get(); diff --git a/app/Http/Controllers/Frontend/MarketPlaceController.php b/app/Http/Controllers/Frontend/MarketPlaceController.php index 8c45272..378150a 100644 --- a/app/Http/Controllers/Frontend/MarketPlaceController.php +++ b/app/Http/Controllers/Frontend/MarketPlaceController.php @@ -111,7 +111,34 @@ class MarketPlaceController extends Controller // dd($request->all()); $offering = $this->viewOfferingData($slug); // dd($offering['data']->id); - $status = MarketplaceBuyerForm::where(['associated_id'=>$offering['data']->id,'status'=>'Sold'])->exists() ? 'SOLD':'OPEN'; + // $status = MarketplaceBuyerForm::where(['associated_id'=>$offering['data']->id,'status'=>'Sold'])->exists() ? 'SOLD':'OPEN'; + $status = ''; + $checkBIDExist = MarketplaceBuyerForm::where('associated_id', $offering['data']->id)->where('status', 'Sold')->exists(); + if($checkBIDExist) + { + $buyerData = MarketplaceBuyerForm::where('associated_id', $offering['data']->id)->where('status', 'Sold')->get(); + // dd($buyerData->toArray()); + if(MarketplaceAlternativeInvestmentFundSeller::where('id',$buyerData[0]->associated_id)->exists()) + { + $totalSellUnits = 0; + $buyerData->each(function($data) use($totalSellUnits){ + return $totalSellUnits += (int)$data->no_of_units_you_wish_to_buy; + }); + $getAIFData = MarketplaceAlternativeInvestmentFundSeller::where('id',$buyerData[0]->associated_id)->first(); + $aifData = (int)$getAIFData->no_of_units_you_wish_to_sell; + $remainUnits = $aifData - $totalSellUnits; + if($remainUnits <= 0) + { + $status .= 'SOLD'; + } + $status .= 'OPEN'; + } + elseif(MarketplaceFractionalRealEstateSeller::where('id',$buyerData[0]->associated_id)->exists()){ + $status .= 'SOLD'; + } + }else{ + $status .= 'OPEN'; + } // dd($status); $invested = $offering['invested']; diff --git a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php index cc811d8..84682fa 100644 --- a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php +++ b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php @@ -84,7 +84,30 @@ class MarketplaceAlternativeInvestmentFundSeller extends Model public function getSoldStatusAttribute($id) { - return MarketplaceBuyerForm::where('associated_id', $id)->where('status', 'Sold')->exists() ? 'SOLD' : 'OPEN'; + // return MarketplaceBuyerForm::where('associated_id', $id)->where('status', 'Sold')->exists() ? 'SOLD' : 'OPEN'; + $checkBIDExist = MarketplaceBuyerForm::where('associated_id', $id)->where('status', 'Sold')->exists(); + if($checkBIDExist) + { + $buyerData = MarketplaceBuyerForm::where('associated_id', $id)->where('status', 'Sold')->get(); + // dd($buyerData->toArray()); + $totalSellUnits = 0; + $buyerData->each(function($data) use($totalSellUnits){ + return $totalSellUnits += (int)$data->no_of_units_you_wish_to_buy; + }); + if(MarketplaceAlternativeInvestmentFundSeller::where('id',$buyerData[0]->associated_id)->exists()) + { + $getAIFData = MarketplaceAlternativeInvestmentFundSeller::where('id',$buyerData[0]->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'; + } } public function getDiscountAttribute($id) diff --git a/app/Models/MarketplaceFractionalRealEstateSeller.php b/app/Models/MarketplaceFractionalRealEstateSeller.php index 75a8c75..91e12bd 100644 --- a/app/Models/MarketplaceFractionalRealEstateSeller.php +++ b/app/Models/MarketplaceFractionalRealEstateSeller.php @@ -62,5 +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'; + // } } } \ No newline at end of file diff --git a/app/Models/MarketplaceSellerForm.php b/app/Models/MarketplaceSellerForm.php index 7c70f6e..c6c818c 100644 --- a/app/Models/MarketplaceSellerForm.php +++ b/app/Models/MarketplaceSellerForm.php @@ -16,7 +16,8 @@ class MarketplaceSellerForm extends Model } public function aif(){ - return $this->hasMany(MarketplaceAlternativeInvestmentFundSeller::class,'seller_forms_id')->where('listing_status', '!=','Hide'); + // return $this->hasMany(MarketplaceAlternativeInvestmentFundSeller::class,'seller_forms_id')->where('listing_status', '!=','Hide'); + return $this->hasMany(MarketplaceAlternativeInvestmentFundSeller::class,'seller_forms_id'); } public function fre(){ diff --git a/resources/views/Admin/Pages/pre_owned_investment/interested-buyers.blade.php b/resources/views/Admin/Pages/pre_owned_investment/interested-buyers.blade.php index 88a41a1..436d586 100644 --- a/resources/views/Admin/Pages/pre_owned_investment/interested-buyers.blade.php +++ b/resources/views/Admin/Pages/pre_owned_investment/interested-buyers.blade.php @@ -352,6 +352,9 @@ } if (result.status == 400) { toastr.warning(result.message); + setTimeout(() => { + location.reload(); + }, 3000); // $("#change-status").val("Interested"); } }, diff --git a/resources/views/Admin/Pages/pre_owned_investment/partial/interested-buyers-row.blade.php b/resources/views/Admin/Pages/pre_owned_investment/partial/interested-buyers-row.blade.php index d0711dc..1861f45 100644 --- a/resources/views/Admin/Pages/pre_owned_investment/partial/interested-buyers-row.blade.php +++ b/resources/views/Admin/Pages/pre_owned_investment/partial/interested-buyers-row.blade.php @@ -9,6 +9,7 @@ {{$data->no_of_units_you_wish_to_buy}} {{$data->offer_price_per_unit}} {{$data->total_purchase_value}} + @if($data->status != 'Sold') + @else + + + {{-- --}} + + @endif diff --git a/resources/views/Admin/general-dashboard.blade.php b/resources/views/Admin/general-dashboard.blade.php index 5a14b77..b8f2914 100644 --- a/resources/views/Admin/general-dashboard.blade.php +++ b/resources/views/Admin/general-dashboard.blade.php @@ -150,13 +150,13 @@
₹ 0.0 - Gross Earn + Net Received
₹ 0.0 - Net Received + Gross Earn
diff --git a/resources/views/Frontend/Pages/profile/dashboard.blade.php b/resources/views/Frontend/Pages/profile/dashboard.blade.php index 5e21b3e..c4cef60 100644 --- a/resources/views/Frontend/Pages/profile/dashboard.blade.php +++ b/resources/views/Frontend/Pages/profile/dashboard.blade.php @@ -471,17 +471,17 @@ @foreach ($marketPlaceAIFSellerData as $item) - {{ $item->marketplace_aif_sellers_data->name_of_the_aif_fund }} + {{ $item['name_of_the_aif_fund'] }} - {{ $item->marketplace_aif_sellers_data->fund_category }} + {{ $item['fund_category'] }} - {{ $item->marketplace_aif_sellers_data->type_of_fund }} + {{ $item['type_of_fund'] }} - {{ $item->marketplace_aif_sellers_data->fund_strategy }} + {{ $item['fund_strategy'] }} - {{ $item->marketplace_aif_sellers_data->total_capital_commitment }} + {{ $item['total_capital_commitment'] }} - {{ $item->marketplace_aif_sellers_data->uncalled_capital_commitment }} + {{ $item['uncalled_capital_commitment'] }} {{-- @empty @@ -508,17 +508,17 @@ @foreach ($marketPlaceFRESellerData as $item) - {{ $item->marketplace_fre_sellers_data->property_name }} + {{ $item['property_name'] }} - {{ $item->marketplace_fre_sellers_data->property_address }} + {{ $item['property_address'] }} - {{ $item->marketplace_fre_sellers_data->property_grade }} + {{ $item['property_grade'] }} - {{ $item->marketplace_fre_sellers_data->asset_type }} + {{ $item['asset_type'] }} - {{ $item->marketplace_fre_sellers_data->fractional_real_estate_platform }} + {{ $item['fractional_real_estate_platform'] }} - {{ $item->marketplace_fre_sellers_data->expected_selling_price }} + {{ $item['expected_selling_price'] }} {{-- @empty