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

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

Browse Source 
# Conflicts:
#	app/Http/Resources/TransactionResource.php
#	resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
#	routes/web.php
This commit is contained in:
omair saleh
2021-12-21 19:42:28 +08:00
parent 72b5810dbc f485689b47
commit 5eee532ff7
15 changed files with 308 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/TransactionResource.php
+1 -1
View File
@@ -3,7 +3,6 @@
namespace App\Http\Resources;
use App\Classes\ValueObjects\Constants\TransactionType;
use App\Models\Transaction;
use Carbon\Carbon;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -25,6 +24,7 @@ class TransactionResource extends JsonResource
'payment_reference' => $this->payment_reference,
'payment_method' => (float) $this->payment_method,
'recipient_bank_account' => new BankResource($this->when((int) $this->type === TransactionType::BILL, $this->booking->bank)),
'issuer_name' => $this->issuerCompany->name,
'amount' => (double) $this->amount,
'original_amount' => (double) $this->original_amount,
'currency' => new CurrencyResource($this->currency),