omair/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/uldvstar/exchange-2.0.git synced 2026-08-19 04:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

back

Browse Source
This commit is contained in:
glovetleong
2022-04-10 00:24:22 +08:00
parent 17f6333030
commit eee77325f7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/TransactionResource.php
+4 -4
View File
@@ -19,7 +19,7 @@ class TransactionResource extends JsonResource
{
$booking = in_array((int)$this->type, [TransactionType::BILL, TransactionType::REFUND])? $this->owner->owner : $this->owner;
// $days = $this->created_at->endOfDay()->addWeekdays($booking->service_id === 3 ? 3 : 1);
$days = $this->created_at->endOfDay()->addWeekdays($booking->service_id === 3 ? 3 : 1);
return [
'id' => $this->id,
@@ -28,7 +28,7 @@ class TransactionResource extends JsonResource
'bill_no' => $this->bill_no,
'payment_reference' => $this->payment_reference,
'payment_method' => (float) $this->payment_method,
// 'recipient_bank_account' => new BankResource($booking->bank),
'recipient_bank_account' => new BankResource($booking->bank),
'issuer_name' => $this->issuerCompany->name,
'amount' => (double) $this->amount,
'original_amount' => (double) $this->original_amount,
@@ -45,8 +45,8 @@ class TransactionResource extends JsonResource
'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'),
'interval' => [
// 'value' => $days->gt(Carbon::now()) ? '+' : '-',
// 'duration' => $days->diff(Carbon::now())->format('%d'),
'value' => $days->gt(Carbon::now()) ? '+' : '-',
'duration' => $days->diff(Carbon::now())->format('%d'),
]
];
}
resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+1 -1
View File
@@ -220,7 +220,7 @@
</div>
</div>
<div class="row m-t-10" v-show="[2, 3].includes(item.status) && totalRequestedRefund < data.booking.amount">
<div class="col">
<div class="col hide">
<button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border requestModal" data-type="transferSummary">Request Refund</button>
<modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="transferSummary" size="large">
<refund-confirmation-component :data="data" :section="section" :totalRefunds="totalRequestedRefund + totalRefunds"></refund-confirmation-component>