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

fixing description issue

Browse Source
This commit is contained in:
Ritikesh yadav
2024-05-08 17:46:59 +05:30
parent ada8c666a2
commit 07b5efbf8a
7 changed files with 61 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

3
app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php
View File

@@ -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])

5
app/Models/MarketplaceAlternativeInvestmentFundSeller.php
View File

@@ -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 [

7
app/Models/MarketplaceBuyerForm.php
View File

@@ -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');
}
}

4
app/Models/MarketplaceFractionalRealEstateSeller.php
View File

@@ -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');

20
resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php
View File

@@ -1,28 +1,26 @@
<tr>
<td>
<div class="form-check form-check-sm form-check-custom form-check-solid">
{{$iteration}}
{{$loop->iteration}}
</div>
</td>
<td>{{$data->name}}</td>
<td>{{$data->seller->name}}</td>
<td>{{$data->name_of_the_aif_fund ?? $data->property_name ?? $data->security_name}}</td>
@php($offerPricePerUnit = IND_money_format($data->offer_price_per_unit))
@php($totalPurchaseValue = IND_money_format($data->total_purchase_value))
{{--<td>{{$offerPricePerUnit}}</td>
<td>{{$totalPurchaseValue}}</td>
<td>{{$data->created_at->format('d/m/y')}}</td>--}}
<td>{{$data->complete_units_sold}}</td>
<td>{{$data->data->seller->name}}</td>
<td>{{$data->data->name_of_the_aif_fund ?? $data->data->property_name}}</td>
@php($offerPricePerUnit = IND_money_format($data->getAttributes()['offer_price_per_unit']))
@php($totalPurchaseValue = IND_money_format($data->getAttributes()['total_purchase_value']))
<td>{{$data->table == 'marketplace_fre_sellers' ? 'Fractional Real Estate' : 'Alternative Investment Fund'}}</td>
<td>{{$data->no_of_units_you_wish_to_buy}}</td>
<td>{{$data->complete_sale_value}}</td>
<td>{{$data->commission_earned}}</td>
<td>{{$data->date_of_sale}}</td>
<td>{{companyName($data->platform)}}</td>
<td>{{$data->final_purchase_value}}</td>
<td>
<a class="get-transaction-detail" title="View detail" data-name="{{$data->name}}" data-city="{{$data->city}}" data-country="{{$data->country}}" data-email="{{$data->email_id}}" data-contact="{{$data->contact_number}}" data-seller="{{$data->seller->name}}" data-productname="{{$data->name_of_the_aif_fund ?? $data->property_name ?? $data->security_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}">
<a class="get-transaction-detail" title="View detail" data-name="{{$data->name}}" data-city="{{$data->city}}" data-country="{{$data->country}}" data-email="{{$data->email_id}}" data-contact="{{$data->contact_number}}" data-seller="{{$data->data->seller->name}}" data-productname="{{$data->data->name_of_the_aif_fund ?? $data->data->property_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}">
<i class="fa-regular fa-eye"></i>
</a>
<a class="edit-transaction-detail mx-5" title="Edit detail" data-id="{{$data->id}}" data-name="{{$data->name}}" data-city="{{$data->city}}" data-country="{{$data->country}}" data-email="{{$data->email_id}}" data-contact="{{$data->contact_number}}" data-seller="{{$data->seller->name}}" data-productname="{{$data->name_of_the_aif_fund ?? $data->property_name ?? $data->security_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}" data-commission_earned="{{$data->commission_earned}}" data-complete_units_sold="{{$data->complete_units_sold}}" data-complete_sale_value="{{$data->complete_sale_value}}" data-date_of_sale="{{$data->date_of_sale}}" data-platform="{{$data->platform}}" data-final_purchase_value="{{$data->final_purchase_value}}">
<a class="edit-transaction-detail mx-5" title="Edit detail" data-id="{{$data->id}}" data-name="{{$data->name}}" data-seller="{{$data->data->seller->name}}" data-productname="{{$data->data->name_of_the_aif_fund ?? $data->data->property_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}" data-commission_earned="{{$data->commission_earned}}" data-complete_units_sold="{{$data->complete_units_sold}}" data-complete_sale_value="{{$data->complete_sale_value}}" data-date_of_sale="{{$data->date_of_sale}}" data-platform="{{$data->platform}}" data-final_purchase_value="{{$data->final_purchase_value}}">
<svg class="svg-inline--fa fa-pen-to-square" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="pen-to-square" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg="">
<path fill="currentColor" d="M471.6 21.7c-21.9-21.9-57.3-21.9-79.2 0L362.3 51.7l97.9 97.9 30.1-30.1c21.9-21.9 21.9-57.3 0-79.2L471.6 21.7zm-299.2 220c-6.1 6.1-10.8 13.6-13.5 21.9l-29.6 88.8c-2.9 8.6-.6 18.1 5.8 24.6s15.9 8.7 24.6 5.8l88.8-29.6c8.2-2.8 15.7-7.4 21.9-13.5L437.7 172.3 339.7 74.3 172.4 241.7zM96 64C43 64 0 107 0 160V416c0 53 43 96 96 96H352c53 0 96-43 96-96V320c0-17.7-14.3-32-32-32s-32 14.3-32 32v96c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32V160c0-17.7 14.3-32 32-32h96c17.7 0 32-14.3 32-32s-14.3-32-32-32H96z"></path>
</svg>

5
resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php
View File

@@ -77,6 +77,7 @@
{{--<th class="min-w-100px w-100px align-top">Offer Price Per Unit</th>
<th class="min-w-125px w-125px align-top">Total Purchase Value</th>
<th class="min-w-125px w-125px align-top">Created At</th>--}}
<th class="min-w-125px w-200px align-top">Category</th>
<th class="min-w-125px w-200px align-top">Final Units Sold</th>
<th class="min-w-125px w-200px align-top">Final Sale Value</th>
<th class="min-w-125px w-125px align-top">Commission Earned</th>
@@ -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"));