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

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

Browse Source
This commit is contained in:
edmondlang
2022-03-11 19:52:52 +08:00
parent 09e3dc03ba 4e5680fd13
commit fcd57def34
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/TransactionResource.php
+1
View File
@@ -16,6 +16,7 @@ class TransactionResource extends JsonResource
*/
public function toArray($request)
{
$booking = (int)$this->type === TransactionType::BILL ? $this->owner->owner : $this->booking;
$days = $this->updated_at->endOfDay()->addWeekdays($booking->service_id === 1 ? 1 : 3);
resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
+18 -2
View File
@@ -40,6 +40,18 @@
</div>
</div>
</div>
<div class="col">
<div class="row">
<div class="col">
<div class="font-heading fs-10 muted all-caps">Description</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="font-heading all-caps fs-11" v-html="data.description"></div>
</div>
</div>
</div>
<div class="col">
<div class="row">
<div class="col">
@@ -52,7 +64,7 @@
</div>
</div>
</div>
<div class="col">
<div class="col" v-if="data.type === 5">
<div class="row">
<div class="col">
<div class="font-heading fs-10 muted all-caps">Payment Reference</div>
@@ -60,7 +72,11 @@
</div>
<div class="row">
<div class="col">
<div class="font-heading fs-11">{{data.payment_reference == null ? '&nbsp;' : data.payment_reference }}</div>
<a :href="route('billplz.bill', data.reference)" target="_blank" v-if="data.reference">
<div class="icon-thumbnail fs-11 text-white icon-25 bg-complete btn-rounded float-left m-r-5">
Bz
</div>
</a>
</div>
</div>
</div>