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

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-ui-tab

Browse Source
This commit is contained in:
edmondlang
2022-03-03 21:18:37 +08:00
parent 0c317a1139 9ff3f3ab5b
commit 20e64f6fd3
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/TransactionResource.php
+1 -1
View File
@@ -17,7 +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);
$days = Carbon::parse($this->created_at->format('d-m-Y'))->addDays($booking->service_id === 1 ? 2 : 3);
return [
'id' => $this->id,
resources/assets/vue/components/bookings/elements/BookingComponent.vue
+1 -1
View File
@@ -42,7 +42,7 @@
<div class="font-heading fs-10 muted all-caps">Payable Amount</div>
<div class="font-heading text-success bold">{{this.item.amount}} {{this.item.fixed_currency.short_code}}</div>
</div>
<div class="col-auto" v-if="$store.getters.isCustomer">
<div class="col-auto hide" v-if="$store.getters.isCustomer">
<div class="font-heading fs-10 muted all-caps">status</div>
<div class="font-heading all-caps text-master btn-rounded p-l-10 p-r-10 lh-15 mt-1" :class="[{'bg-warning': item.status !== 3}, {'bg-success': item.status === 3} ]">
{{item.status === 3 ? 'Complete' : 'In Progress'}}
resources/assets/vue/components/wallets/elements/WalletComponent.vue
+1 -1
View File
@@ -10,7 +10,7 @@
<div class="col text-center">
<div class="row m-b-50">
<div class="col bg-white padding-15">
<h5 class="text-center text-success bold">Congratulation! You've earned and achievement</h5>
<h5 class="text-center text-success bold">Congratulation! You've earned an achievement</h5>
</div>
</div>
<div class="row justify-content-center">
resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
+1 -1
View File
@@ -119,7 +119,7 @@
parameters: {
amount: {
required,
minValue: minValue(this.minValue),
minValue: 0,
},
reference: {
required: requiredIf(function () { return this.parameters.transaction_type !== 0 })