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

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/accounting-bank-mapping

Browse Source 
# Conflicts:
#	app/Models/Transaction.php
This commit is contained in:
edmondlang
2023-06-21 17:48:37 +08:00
parent 7bec962e26 019bc9ce53
commit d4901ff7b7
15 changed files with 346 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Transaction.php
+8
View File
@@ -116,6 +116,14 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
return $this->HasOne(GroupTransaction::class, 'transaction_id');
}
/**
* @return HasOne
*/
public function voucherRedemption(): HasOne
{
return $this->HasOne(VoucherRedemption::class, 'transaction_id', 'id');
}
public function convert_original_amount()
{
if($this->booking()->first()->fix_currency_id !== 1) {