cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

temporary remove booking from transactions resource

Browse Source
This commit is contained in:
omair saleh
2022-09-15 14:58:24 +08:00
parent 2f5915e810
commit c054d9d3a2
3 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/CompanyResource.php
+11 -15
View File
@@ -27,8 +27,8 @@ class CompanyResource extends JsonResource
*/
public function toArray($request)
{
// $lastPayment = $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->orderBy('id', 'DESC')->first();
// $totalPayments = $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
$lastPayment = $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->orderBy('id', 'DESC')->first();
$totalPayments = $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
$segment = SegmentConstant::where('reference', SegmentConstants::SUPPLIER_CURRENCIES)->where('detail->id', $this->id)->first();
$serviceCharge = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $this->id)->first();
@@ -45,19 +45,15 @@ class CompanyResource extends JsonResource
'employee' => new UserResource(Auth::user()->type === RoleTypes::USER ? $this->employees()->where('email', '=', Auth::user()->email)->first() : $this->employees()->orderBy('id', 'DESC')->first()),
'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
'bookings' => $this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), []),
'confirmed_bookings' => 0,
'total_payments' => 0,
'average_spending_per_day' => 0,
'average_spending_per_booking' => 0,
// 'confirmed_bookings' => $this->bookings()->whereHas('transactions', function ($query){
// $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
// })->count(),
// 'total_payments' => (float) $totalPayments,
// 'average_spending_per_day' => (float) $totalPayments / ($this->created_at->diff(Carbon::now())->days === 0 ? 1 : $this->created_at->diff(Carbon::now())->days),
// 'average_spending_per_booking' => (float) $totalPayments > 0 ? $totalPayments / $this->bookings()->whereHas('transactions', function ($query){
// $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
// })->count() : $totalPayments,
// 'last_payment' => $lastPayment ? $lastPayment->created_at->diffForHumans() : 'No Payments',
'confirmed_bookings' => $this->bookings()->whereHas('transactions', function ($query){
$query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
})->count(),
'total_payments' => (float) $totalPayments,
'average_spending_per_day' => (float) $totalPayments / ($this->created_at->diff(Carbon::now())->days === 0 ? 1 : $this->created_at->diff(Carbon::now())->days),
'average_spending_per_booking' => (float) $totalPayments > 0 ? $totalPayments / $this->bookings()->whereHas('transactions', function ($query){
$query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
})->count() : $totalPayments,
'last_payment' => $lastPayment ? $lastPayment->created_at->diffForHumans() : 'No Payments',
'personal_banks' => BankResource::collection($this->banks->where('type', BankAccountType::PERSONAL)),
'recipient_banks' => [
'accounts' => BankResource::collection($this->banks->where('type', BankAccountType::EXTERNAL)),
app/Http/Resources/TransactionResource.php
+1 -1
View File
@@ -23,7 +23,7 @@ class TransactionResource extends JsonResource
return [
'id' => $this->id,
'booking' => new BookingResource($booking),
// 'booking' => new BookingResource($booking),
'type' => (int) $this->type,
'bill_no' => $this->bill_no,
'payment_reference' => $this->payment_reference,
resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
+8 -8
View File
@@ -30,24 +30,24 @@
</div>
</div>
</div>
<div class="row" v-if="item.booking.bank.bank_name.includes('浙江网商银行')">
<div class="col">
<span class="rounded badge-danger" style="padding: 5px">1688</span>
</div>
</div>
<!--<div class="row" v-if="item.booking.bank.bank_name.includes('浙江网商银行')">-->
<!--<div class="col">-->
<!--<span class="rounded badge-danger" style="padding: 5px">1688</span>-->
<!--</div>-->
<!--</div>-->
</div>
</div>
<div class="row m-b-10">
<div class="col-auto">
<div class="font-heading fs-10 muted all-caps">reference</div>
<div class="font-heading fs-10">
<a :href="route('booking.details', item.booking.marking)">{{item.booking.marking}}</a>
<!--<a :href="route('booking.details', item.booking.marking)">{{item.booking.marking}}</a>-->
</div>
</div>
<div class="col-auto">
<div class="font-heading fs-10 muted all-caps">Marking</div>
<div class="font-heading fs-10">
<a :href="route('customer.profile', item.booking.company.reference)">{{item.booking.company.reference}}</a>
<!--<a :href="route('customer.profile', item.booking.company.reference)">{{item.booking.company.reference}}</a>-->
</div>
</div>
<div class="col-auto">
@@ -89,7 +89,7 @@
<div class="col-auto">
<div class="font-heading fs-10 muted all-caps">Service</div>
<div class="font-heading fs-10">
{{item.booking.service.name}}
<!--{{item.booking.service.name}}-->
</div>
</div>
<div class="col text-right">