diff --git a/app/Http/Controllers/Admin/OverviewController.php b/app/Http/Controllers/Admin/OverviewController.php index 1d5d6cd..3ce3722 100644 --- a/app/Http/Controllers/Admin/OverviewController.php +++ b/app/Http/Controllers/Admin/OverviewController.php @@ -367,22 +367,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() @@ -437,7 +453,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, diff --git a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php index 7a7166a..59af686 100644 --- a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php +++ b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php @@ -156,7 +156,8 @@ class AlternativeInvestmentFundController extends Controller public function ventureCapitalFundProduct($slug) { - $ventureCapitalFund = $this->ventureCapitalData($slug)->getData(); + $ventureCapitalFund = $this->ventureCapitalData($slug)->getData()->data; + // dd($ventureCapitalFund); $otherVCP = AlternativeInvestmentFund::query() ->join('products', 'alternative_investment_funds.products_id', 'products.id') ->where(['status' => true, 'categories_id' => 28]) diff --git a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php index a9b8e1c..7cd6a0d 100644 --- a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php +++ b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php @@ -21,6 +21,11 @@ class MarketplaceAlternativeInvestmentFundSeller extends Model return $this->belongsTo(MarketplaceSellerForm::class, 'seller_forms_id'); } + public function buyer() + { + return $this->belongsTo(MarketplaceBuyerForm::class, 'seller_forms_id'); + } + public function Sluggable(): array { return [ diff --git a/app/Models/MarketplaceBuyerForm.php b/app/Models/MarketplaceBuyerForm.php index a9430c4..fb3eced 100644 --- a/app/Models/MarketplaceBuyerForm.php +++ b/app/Models/MarketplaceBuyerForm.php @@ -89,4 +89,11 @@ class MarketplaceBuyerForm extends Model public function company(){ return $this->belongsTo(Company::class,'platform'); } + + public function freSellerData(){ + return $this->hasOne(MarketplaceFractionalRealEstateSeller::class,'id','associated_id'); + } + public function aifSellerData(){ + return $this->hasOne(MarketplaceAlternativeInvestmentFundSeller::class,'id','associated_id'); + } } diff --git a/app/Models/MarketplaceFractionalRealEstateSeller.php b/app/Models/MarketplaceFractionalRealEstateSeller.php index 029ba39..4415b3f 100644 --- a/app/Models/MarketplaceFractionalRealEstateSeller.php +++ b/app/Models/MarketplaceFractionalRealEstateSeller.php @@ -19,6 +19,10 @@ class MarketplaceFractionalRealEstateSeller extends Model public function seller(){ return $this->belongsTo(MarketplaceSellerForm::class,'seller_forms_id'); } + + public function buyer(){ + return $this->belongsTo(MarketplaceBuyerForm::class,'seller_forms_id'); + } public function company(){ return $this->belongsTo(Company::class,'fractional_real_estate_platform'); diff --git a/resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php b/resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php index 7abcb69..d504391 100644 --- a/resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php +++ b/resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php @@ -1,28 +1,26 @@
- {{$iteration}} + {{$loop->iteration}}
{{$data->name}} - {{$data->seller->name}} - {{$data->name_of_the_aif_fund ?? $data->property_name ?? $data->security_name}} - @php($offerPricePerUnit = IND_money_format($data->offer_price_per_unit)) - @php($totalPurchaseValue = IND_money_format($data->total_purchase_value)) - {{--{{$offerPricePerUnit}} - {{$totalPurchaseValue}} - {{$data->created_at->format('d/m/y')}}--}} - {{$data->complete_units_sold}} + {{$data->data->seller->name}} + {{$data->data->name_of_the_aif_fund ?? $data->data->property_name}} + @php($offerPricePerUnit = IND_money_format($data->getAttributes()['offer_price_per_unit'])) + @php($totalPurchaseValue = IND_money_format($data->getAttributes()['total_purchase_value'])) + {{$data->table == 'marketplace_fre_sellers' ? 'Fractional Real Estate' : 'Alternative Investment Fund'}} + {{$data->no_of_units_you_wish_to_buy}} {{$data->complete_sale_value}} {{$data->commission_earned}} {{$data->date_of_sale}} {{companyName($data->platform)}} {{$data->final_purchase_value}} - + - + diff --git a/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php b/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php index a29c33a..df292a5 100644 --- a/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php +++ b/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php @@ -77,6 +77,7 @@ {{--Offer Price Per Unit Total Purchase Value Created At--}} + Category Final Units Sold Final Sale Value Commission Earned @@ -331,8 +332,8 @@ $('#transactions_view').modal('show'); }) - $('.edit-transaction-detail').click(function(e) { - alert($(this).data('date_of_sale')); + $('.edit-transaction-detail').on('click',function(e) { + // alert($(this).data('id')); $('#edit-id').val($(this).data("id")); $('#edit-name').val($(this).data("name")); $('#edit-final_units_sold').val($(this).data("complete_units_sold"));