From 1c77c5043011658a4a781ad70415e79b57866a73 Mon Sep 17 00:00:00 2001 From: Kolibri1990 <66674482+Kolibri1990@users.noreply.github.com> Date: Wed, 31 Aug 2022 23:28:38 +0200 Subject: [PATCH 1/4] [DEV-596] add charge amount 0 and currency --- src/payment/models/bank-tx/frick.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/payment/models/bank-tx/frick.service.ts b/src/payment/models/bank-tx/frick.service.ts index f5e923e1d4..6fe960d741 100644 --- a/src/payment/models/bank-tx/frick.service.ts +++ b/src/payment/models/bank-tx/frick.service.ts @@ -198,11 +198,11 @@ export class FrickService { amount: Math.abs(tx.totalAmount), instructedAmount: tx.fxTransactionAmount ? Math.abs(tx.fxTransactionAmount) : Math.abs(tx.amount), txAmount: Math.abs(tx.amount), - chargeAmount: Math.abs(tx.fees), + chargeAmount: tx.fees ? Math.abs(tx.fees) : 0, currency: tx.currency, instructedCurrency: tx.fxTransactionCurrency ?? tx.currency, txCurrency: tx.currency, - chargeCurrency: tx.fees ? tx.currency : undefined, + chargeCurrency: tx.currency, ...this.getCustomerInformation(tx), remittanceInfo: tx.reference, type: tx.type === TransactionType.INTERNAL ? BankTxType.INTERNAL : null, From 757ac8813b5a34ae3400ba491aeb0623ace23671 Mon Sep 17 00:00:00 2001 From: Kolibri1990 <66674482+Kolibri1990@users.noreply.github.com> Date: Thu, 1 Sep 2022 09:28:17 +0200 Subject: [PATCH 2/4] [DEV-596] Add comments --- src/payment/models/bank-tx/bank-tx.entity.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/payment/models/bank-tx/bank-tx.entity.ts b/src/payment/models/bank-tx/bank-tx.entity.ts index 126404c8f8..a463a8c77a 100644 --- a/src/payment/models/bank-tx/bank-tx.entity.ts +++ b/src/payment/models/bank-tx/bank-tx.entity.ts @@ -112,6 +112,7 @@ export class BankTx extends IEntity { @Column({ length: 256, nullable: true }) clearingSystemId?: string; + // bank account number like IBAN @Column({ length: 256, nullable: true }) memberId?: string; @@ -133,6 +134,7 @@ export class BankTx extends IEntity { @Column({ length: 'MAX', nullable: true }) txRaw?: string; + // routing id for american banks @Column({ length: 256, nullable: true }) aba?: string; From bbcc1df76e25e59805843f18bb75c35922a6b8e5 Mon Sep 17 00:00:00 2001 From: Kolibri1990 <66674482+Kolibri1990@users.noreply.github.com> Date: Thu, 1 Sep 2022 10:49:07 +0200 Subject: [PATCH 3/4] Refactoring mail style default font-family:Open Sans,Helvetica,Arial,sans-serif; --- src/shared/assets/mails/default.hbs | 2 +- src/shared/i18n/de/mail.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/assets/mails/default.hbs b/src/shared/assets/mails/default.hbs index 86a6e6d005..5895080255 100644 --- a/src/shared/assets/mails/default.hbs +++ b/src/shared/assets/mails/default.hbs @@ -2,7 +2,7 @@ html, body, table { background-color: #072440; color: #ffffff; - font-family: Open Sans; + font-family: Open Sans,Helvetica,Arial,sans-serif; } .logo { diff --git a/src/shared/i18n/de/mail.json b/src/shared/i18n/de/mail.json index 7269b53c1a..4bb878d600 100644 --- a/src/shared/i18n/de/mail.json +++ b/src/shared/i18n/de/mail.json @@ -29,12 +29,12 @@ "stakingRef": { "referrer": { "salutation": "Du bist ein DFX Ambassador - Erfolgreich geworben", - "body": "
Herzlichen Glückwunsch
Ein von dir geworbener Kunde ist soeben dem $DFI Staking von DFX beigetreten.
Dein Werbebonus von {outputAmount} {outputAsset} wurde an deine Wallet ausgezahlt.
Hier findest du die Transaktion: {txId}
Your DFX Team
Bitcoiners by heart ♥️
", + "body": "
Herzlichen Glückwunsch
Ein von dir geworbener Kunde ist soeben dem $DFI Staking von DFX beigetreten.
Dein Werbebonus von {outputAmount} {outputAsset} wurde an deine Wallet ausgezahlt.
Hier findest du die Transaktion: {txId}
Your DFX Team
Bitcoiners by heart ♥️
", "title": "Erfolgreich geworben" }, "referred": { "salutation": "Herzlich willkommen in der DFX Familie - Referral Bonus ausgezahlt", - "body": "
Du bist erfolgreich dem $DFI Staking von DFX beigetreten.
Dafür haben wir soeben deinen Bonus von {outputAmount} {outputAsset} an deine Staking Route ausgezahlt.
Hier findest du die Transaktion: {txId}
Happy Staking!
Your DFX Team
Bitcoiners by heart ♥️
", + "body": "
Du bist erfolgreich dem $DFI Staking von DFX beigetreten.
Dafür haben wir soeben deinen Bonus von {outputAmount} {outputAsset} an deine Staking Route ausgezahlt.
Hier findest du die Transaktion: {txId}
Happy Staking!
Your DFX Team
Bitcoiners by heart ♥️
", "title": "Referral Bonus ausgezahlt" } }, From 141e6a520abc10b177af7b3ad807638d8bc5a0aa Mon Sep 17 00:00:00 2001 From: Kolibri1990 <66674482+Kolibri1990@users.noreply.github.com> Date: Thu, 1 Sep 2022 17:56:50 +0200 Subject: [PATCH 4/4] [DEV-596] Add fallback languages to other mail translations --- src/shared/i18n/en/mail.json | 4 ++-- src/shared/i18n/es/mail.json | 4 ++-- src/shared/i18n/fr/mail.json | 4 ++-- src/shared/i18n/it/mail.json | 4 ++-- src/shared/i18n/pt/mail.json | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/shared/i18n/en/mail.json b/src/shared/i18n/en/mail.json index 7119c473eb..c655745fa4 100644 --- a/src/shared/i18n/en/mail.json +++ b/src/shared/i18n/en/mail.json @@ -29,12 +29,12 @@ "stakingRef": { "referrer": { "salutation": "You are a DFX Ambassador - successful referral", - "body": "
Congratulations
A customer you referred has started staking $DFI at DFX.
Your referral reward of {outputAmount} {outputAsset} has just been paid to your wallet.
Here you can find the transaction: {txId}
Your DFX Team
Bitcoiners by heart ♥️
", + "body": "
Congratulations
A customer you referred has started staking $DFI at DFX.
Your referral reward of {outputAmount} {outputAsset} has just been paid to your wallet.
Here you can find the transaction: {txId}
Your DFX Team
Bitcoiners by heart ♥️
", "title": "Successful referral" }, "referred": { "salutation": "Welcome to the DFX Family - Referral Bonus paid out", - "body": "
You have successfully joined $DFI Staking at DFX and we have just paid your {outputAmount} {outputAsset} referral bonus.
Here you can find the transaction: {txId}
Happy Staking!
Your DFX Team
Bitcoiners by heart ♥️
", + "body": "
You have successfully joined $DFI Staking at DFX and we have just paid your {outputAmount} {outputAsset} referral bonus.
Here you can find the transaction: {txId}
Happy Staking!
Your DFX Team
Bitcoiners by heart ♥️
", "title": "Referral Bonus paid out" } }, diff --git a/src/shared/i18n/es/mail.json b/src/shared/i18n/es/mail.json index b73d183065..e95600cf42 100644 --- a/src/shared/i18n/es/mail.json +++ b/src/shared/i18n/es/mail.json @@ -29,12 +29,12 @@ "stakingRef": { "referrer": { "salutation": "Has tenido éxito en compartir tu enlace de referidos", - "body": "
Enhorabuena
Te has convertido en un Embajador de DFX cuando un cliente que referiste empezó el servicio de staking $DFI en DFX.
Tu recompensa de {outputAmount} {outputAsset} por esta acción se acaba de pagar en tu billetera.
Aquí puede encontrar la transacción: {txId}
Your DFX Team
Bitcoiners by heart ♥️
", + "body": "
Enhorabuena
Te has convertido en un Embajador de DFX cuando un cliente que referiste empezó el servicio de staking $DFI en DFX.
Tu recompensa de {outputAmount} {outputAsset} por esta acción se acaba de pagar en tu billetera.
Aquí puede encontrar la transacción: {txId}
Your DFX Team
Bitcoiners by heart ♥️
", "title": "Has tenido éxito en compartir tu enlace de referidos" }, "referred": { "salutation": "Bienvenidos a la familia DFX - La recompensa por referidos se ha pagado", - "body": "
Has accedido con éxito al servicio de staking $DFI de DFX y te hemos pagado tu recompensa de {outputAmount} {outputAsset}.
Aquí puede encontrar la transacción: {txId}
Happy Staking!
Your DFX Team
Bitcoiners by heart ♥️
", + "body": "
Has accedido con éxito al servicio de staking $DFI de DFX y te hemos pagado tu recompensa de {outputAmount} {outputAsset}.
Aquí puede encontrar la transacción: {txId}
Happy Staking!
Your DFX Team
Bitcoiners by heart ♥️
", "title": "La recompensa por referidos se ha pagado" } }, diff --git a/src/shared/i18n/fr/mail.json b/src/shared/i18n/fr/mail.json index 7ea41b50a8..047ac7f45f 100644 --- a/src/shared/i18n/fr/mail.json +++ b/src/shared/i18n/fr/mail.json @@ -29,12 +29,12 @@ "stakingRef": { "referrer": { "salutation": "Vous êtes un Ambassadeur DFX - parrainage réalisé", - "body": "
Félicitations
Un cliente da te segnalato ha iniziato lo staking di $DFI su DFX.
Votre récompense de parrainage de {outputAmount} {outputAsset} vient d'être versée sur votre portefeuille
Voici la transaction: {txId}
Your DFX Team
Bitcoiners by heart ♥️
", + "body": "
Félicitations
Un cliente da te segnalato ha iniziato lo staking di $DFI su DFX.
Votre récompense de parrainage de {outputAmount} {outputAsset} vient d'être versée sur votre portefeuille
Voici la transaction: {txId}
Your DFX Team
Bitcoiners by heart ♥️
", "title": "Parrainage réalisé" }, "referred": { "salutation": "Bienvenue dans la famille DFX - versement du bonus de parrainage", - "body": "
Vous avez rejoint le staking de $DFI avec DFX, et nous venons de verser votre bonus de {outputAmount} {outputAsset} de parrainage.
Voici la transaction: {txId}
Happy Staking!
Your DFX Team
Bitcoiners by heart ♥️
", + "body": "
Vous avez rejoint le staking de $DFI avec DFX, et nous venons de verser votre bonus de {outputAmount} {outputAsset} de parrainage.
Voici la transaction: {txId}
Happy Staking!
Your DFX Team
Bitcoiners by heart ♥️
", "title": "Versement du bonus de parrainage" } }, diff --git a/src/shared/i18n/it/mail.json b/src/shared/i18n/it/mail.json index 6cc4ddf2a3..d1f4269f43 100644 --- a/src/shared/i18n/it/mail.json +++ b/src/shared/i18n/it/mail.json @@ -29,12 +29,12 @@ "stakingRef": { "referrer": { "salutation": "Sei un Ambasciatore DFX - referral di successo", - "body": "
Congratulazioni
Un cliente da te segnalato ha iniziato lo staking di $DFI su DFX.
La tua ricompensa di {outputAmount} {outputAsset} è stata appena versata nel tuo Wallet.
Ecco la transazione: {txId}
Your DFX Team
Bitcoiners by heart ♥️
", + "body": "
Congratulazioni
Un cliente da te segnalato ha iniziato lo staking di $DFI su DFX.
La tua ricompensa di {outputAmount} {outputAsset} è stata appena versata nel tuo Wallet.
Ecco la transazione: {txId}
Your DFX Team
Bitcoiners by heart ♥️
", "title": "Referral di successo" }, "referred": { "salutation": "Benvenuto nella famiglia DFX - Versato il Referral Bonus", - "body": "
Ti sei unito con successo allo Staking di $DFI su DFX e abbiamo appena pagato il tuo bonus di referral di {outputAmount} {outputAsset}.
Ecco la transazione: {txId}
Happy Staking!
Your DFX Team
Bitcoiners by heart ♥️
", + "body": "
Ti sei unito con successo allo Staking di $DFI su DFX e abbiamo appena pagato il tuo bonus di referral di {outputAmount} {outputAsset}.
Ecco la transazione: {txId}
Happy Staking!
Your DFX Team
Bitcoiners by heart ♥️
", "title": "Versato il Referral Bonus" } }, diff --git a/src/shared/i18n/pt/mail.json b/src/shared/i18n/pt/mail.json index 7119c473eb..c655745fa4 100644 --- a/src/shared/i18n/pt/mail.json +++ b/src/shared/i18n/pt/mail.json @@ -29,12 +29,12 @@ "stakingRef": { "referrer": { "salutation": "You are a DFX Ambassador - successful referral", - "body": "
Congratulations
A customer you referred has started staking $DFI at DFX.
Your referral reward of {outputAmount} {outputAsset} has just been paid to your wallet.
Here you can find the transaction: {txId}
Your DFX Team
Bitcoiners by heart ♥️
", + "body": "
Congratulations
A customer you referred has started staking $DFI at DFX.
Your referral reward of {outputAmount} {outputAsset} has just been paid to your wallet.
Here you can find the transaction: {txId}
Your DFX Team
Bitcoiners by heart ♥️
", "title": "Successful referral" }, "referred": { "salutation": "Welcome to the DFX Family - Referral Bonus paid out", - "body": "
You have successfully joined $DFI Staking at DFX and we have just paid your {outputAmount} {outputAsset} referral bonus.
Here you can find the transaction: {txId}
Happy Staking!
Your DFX Team
Bitcoiners by heart ♥️
", + "body": "
You have successfully joined $DFI Staking at DFX and we have just paid your {outputAmount} {outputAsset} referral bonus.
Here you can find the transaction: {txId}
Happy Staking!
Your DFX Team
Bitcoiners by heart ♥️
", "title": "Referral Bonus paid out" } },