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

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development

Browse Source
This commit is contained in:
edmondlang
2022-03-01 22:08:11 +08:00
parent e75cccb3a5 1aeacf731b
commit e816a3c8d0
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/TransactionResource.php
+3 -2
View File
@@ -17,6 +17,7 @@ class TransactionResource extends JsonResource
public function toArray($request)
{
$booking = (int)$this->type === TransactionType::BILL ? $this->owner->owner : $this->booking;
$days = Carbon::parse($this->created_at)->addDays($booking->service_id === 1 ? 1 : 2);
return [
'id' => $this->id,
@@ -41,8 +42,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' => (Carbon::parse($this->created_at)->addDays(3)->gt(Carbon::now()) ) ? '+' : '-' ,
'duration' => Carbon::parse($this->created_at)->addDays(3)->diff(Carbon::now())->format('%d'),
'value' => $days->gt(Carbon::now()) ? '+' : '-',
'duration' => $days->diff(Carbon::now())->format('%d'),
]
];
}
resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
+6
View File
@@ -28,6 +28,12 @@
{{item.booking.company.reference}}
</div>
</div>
<div class="col-auto" v-if="$store.getters.isAdmin">
<div class="font-heading fs-10 muted all-caps">Supplier</div>
<div class="font-heading fs-10">
{{item.issuer_name}}
</div>
</div>
<div class="col" v-if="item.status === 3">
<div v-for="file in item.documents.files" v-bind:key="file.id" class="col-auto no-padding m-l-5">
<document-file-viewer-component :file="file">
resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
+1 -1
View File
@@ -19,7 +19,7 @@
{{item.payment_method === 5 || item.payment_method === 4 ? item.updated_at : item.documents.created_at}}
</div>
</div>
<div class="col text-right hide">
<div class="col text-right">
<div class="font-heading fs-10 muted all-caps">timer</div>
<div class="font-heading fs-12 bold" :class="[{'text-success': item.interval.value === '+'}, {'text-danger': item.interval.value === '-'}]">
{{item.interval.value}}