cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-09-01 10:54:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into 'master'

Browse Source 
Development

See merge request CIEFWorldwideSdnBhd/exchange-2.0!80
This commit is contained in:
omair saleh
2022-02-21 17:09:15 +00:00
parent dda2dc088f 1c13b2e40b
commit d1b179cafc
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/BookingResource.php
+1 -1
View File
@@ -57,7 +57,7 @@ class BookingResource extends JsonResource
'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '<', Carbon::now())->get()),
'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){
$query->where(function($query){
$query->payments();
$query->payments()->where('status', '!=', ApprovalStatus::PENDING_SUBMISSION);
})->orWhere(function($query){
$query->where(function($query){
$query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]);
app/Http/Resources/TransactionResource.php
+4 -3
View File
@@ -16,14 +16,16 @@ class TransactionResource extends JsonResource
*/
public function toArray($request)
{
$booking = (int) $this->type === TransactionType::BILL ? $this->owner->owner : $this->booking;
return [
'id' => $this->id,
'booking' => new BookingResource($this->booking),
'booking' => new BookingResource($booking),
'type' => (int) $this->type,
'bill_no' => $this->bill_no,
'payment_reference' => $this->payment_reference,
'payment_method' => (float) $this->payment_method,
'recipient_bank_account' => new BankResource($this->when((int) $this->type === TransactionType::BILL, $this->booking->bank)),
'recipient_bank_account' => new BankResource($booking->bank),
'issuer_name' => $this->issuerCompany->name,
'amount' => (double) $this->amount,
'original_amount' => (double) $this->original_amount,
@@ -35,7 +37,6 @@ class TransactionResource extends JsonResource
'status' => (int) $this->status,
'details' => TransactionDetailResource::collection($this->transactionDetails),
'documents' => new DocumentResource($this->documents()->first()),
// 'transaction_payment' => new TransactionResource($this->when((int) $this->type === TransactionType::BILL, $this->owner)),
'transaction_bill' => new TransactionResource($this->when((int) $this->type === TransactionType::PAYMENT, $this->transactions()->first())),
'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'),
resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
+1 -1
View File
@@ -41,7 +41,7 @@
</div>
</div>
<bank-in-component :data="item"></bank-in-component>
<div class="row" v-if="item.status === 1 || item.status === 2">
<div class="row hide" v-if="item.status === 1 || item.status === 2">
<div class="col">
<span class="text-complete fs-10 pointer requestModal" data-type="topUpModal">Cancel this order?</span>
</div>