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

Merge branch 'main' of https://github.com/Ritikeshyadav/my-freeu into megha

Browse Source
This commit is contained in:
meghamalore
2024-05-09 12:58:27 +05:30
parent d85bf5b842 44dc072914
commit d1e095a05c
16 changed files with 134 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/Http/Controllers/Admin/OverviewController.php
View File

@@ -267,7 +267,7 @@ class OverviewController extends Controller
public function listingTransfer()
{
$check = checkSidebarAccess('investment-listing-transfer');
$check = checkSidebarAccess('investment-`listing-transfer`');
if (!$check) {
abort(404);
}
@@ -368,22 +368,38 @@ class OverviewController extends Controller
if (!$check) {
abort(404);
}
$aifBuyerForm = MarketplaceAlternativeInvestmentFundSeller::with('seller', 'company')->join('marketplace_buyer_forms', 'marketplace_aif_sellers.id', 'marketplace_buyer_forms.associated_id')
->latest('marketplace_aif_sellers.created_at')->get();
$freBuyerForm = MarketplaceFractionalRealEstateSeller::with('seller', 'company')->join('marketplace_buyer_forms', 'marketplace_fre_sellers.id', 'marketplace_buyer_forms.associated_id')->latest('marketplace_fre_sellers.created_at')->get();
$opBuyerForm = MarketplaceOtherProductsSeller::with('seller', 'company')->join('marketplace_buyer_forms', 'marketplace_op_sellers.id', 'marketplace_buyer_forms.associated_id')->latest('marketplace_op_sellers.created_at')->get();
$completedData = collect();
$aifBuyerForm->each(function($value) use($completedData){
$completedData[] = $value;
});
$freBuyerForm->each(function($value) use($completedData){
$completedData[] = $value;
});
// $latestArray = array_merge($aifBuyerForm->toArray(),$freBuyerForm->toArray());
$newData = $completedData->sortBy('created_at');
// $aifBuyerForm = MarketplaceAlternativeInvestmentFundSeller::with('seller', 'company', 'buyer')->join('marketplace_buyer_forms', 'marketplace_aif_sellers.id', 'marketplace_buyer_forms.associated_id')
// ->latest('marketplace_aif_sellers.created_at')->get();
// $freBuyerForm = MarketplaceFractionalRealEstateSeller::with('seller', 'company', 'buyer')->join('marketplace_buyer_forms', 'marketplace_fre_sellers.id', 'marketplace_buyer_forms.associated_id')->latest('marketplace_fre_sellers.created_at')->get();
// $opBuyerForm = MarketplaceOtherProductsSeller::with('seller', 'company')->join('marketplace_buyer_forms', 'marketplace_op_sellers.id', 'marketplace_buyer_forms.associated_id')->latest('marketplace_op_sellers.created_at')->get();
$marketPlaceBuyerFrom = MarketplaceBuyerForm::where('status','Sold')->get();
$newData = collect();
foreach($marketPlaceBuyerFrom as $item){
if($item->table == 'marketplace_fre_sellers'){
$item['data'] = MarketplaceFractionalRealEstateSeller::with('seller', 'company',)->where('id',$item->associated_id)->first();
$newData->push($item);
}
else if($item->table == 'marketplace_aif_sellers')
{
$item['data'] = MarketplaceAlternativeInvestmentFundSeller::with('seller', 'company',)->where('id',$item->associated_id)->first();
$newData->push($item);
}
}
// dd($newData);
// $completedData = collect();
// $aifBuyerForm->each(function($value) use($completedData){
// $completedData[] = $value;
// });
// $freBuyerForm->each(function($value) use($completedData){
// $completedData[] = $value;
// });
// $newData = $completedData->sortBy('buyer.updated_at');
$companies = Company::active()->pluck('company_name', 'id');
return view('Admin.Pages.pre_owned_investment.transactions', compact('aifBuyerForm', 'freBuyerForm', 'opBuyerForm', 'companies','newData'));
// return view('Admin.Pages.pre_owned_investment.transactions', compact('aifBuyerForm', 'freBuyerForm', 'opBuyerForm', 'companies','newData'));
return view('Admin.Pages.pre_owned_investment.transactions', compact('companies','newData'));
}
// public function manage_seller_profile()
@@ -438,7 +454,7 @@ class OverviewController extends Controller
public function updateCompleteTransaction(Request $request)
{
// dd($request->all());
$completedTransactionUpdated = MarketplaceBuyerForm::where('id', $request->buyer_id)->update([
'complete_units_sold' => $request->final_units_sold,
'complete_sale_value' => $request->final_sale_value,