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

# Conflicts:
#	app/Http/Resources/TransactionResource.php
#	routes/web.php
This commit is contained in:
edmondlang
2021-12-16 20:22:15 +08:00
16 changed files with 317 additions and 9 deletions
@@ -24,6 +24,7 @@ class TransactionResource extends JsonResource
'bill_no' => $this->bill_no,
'payment_reference' => $this->payment_reference,
'payment_method' => $this->payment_method,
'issuer_name' => $this->issuerCompany->name,
'recipient_bank_account' => new BankResource($this->when((int) $this->type === TransactionType::BILL,$this->booking->bank)),
'amount' => (double) $this->amount,
'original_amount' => (double) $this->original_amount,