From dba0bab91ea31948e34a00213a7e13c561f904c2 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 14 Feb 2024 16:23:37 +1100 Subject: [PATCH] Set default payment notifications for new companies --- app/DataMapper/CompanySettings.php | 2 +- .../Bank/Nordigen/Transformer/TransactionTransformer.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php index 2ab9923962cb..3079a50988c3 100644 --- a/app/DataMapper/CompanySettings.php +++ b/app/DataMapper/CompanySettings.php @@ -878,7 +878,7 @@ class CompanySettings extends BaseSettings { $notification = new stdClass(); $notification->email = []; - $notification->email = ['invoice_sent_all']; + $notification->email = ['invoice_sent_all','payment_success_all','payment_manual_all']; return $notification; } diff --git a/app/Helpers/Bank/Nordigen/Transformer/TransactionTransformer.php b/app/Helpers/Bank/Nordigen/Transformer/TransactionTransformer.php index 184e79546509..63c58c5a2b77 100644 --- a/app/Helpers/Bank/Nordigen/Transformer/TransactionTransformer.php +++ b/app/Helpers/Bank/Nordigen/Transformer/TransactionTransformer.php @@ -112,8 +112,8 @@ class TransactionTransformer implements BankRevenueInterface // enrich description with currencyExchange informations if (array_key_exists('currencyExchange', $transaction)) { foreach ($transaction["currencyExchange"] as $exchangeRate) { - $targetAmount = round($amount * (float) $exchangeRate["exchangeRate"], 2); - $description .= '\nexchangeRate: ' . $amount . " " . $exchangeRate["sourceCurrency"] . " = " . $targetAmount . " " . $exchangeRate["targetCurrency"] . " (" . $exchangeRate["quotationDate"] . ")"; + $targetAmount = round($amount * (float) ($exchangeRate["exchangeRate"] ?? 1) , 2); + $description .= '\nexchangeRate: ' . $amount . " " . ($exchangeRate["sourceCurrency"] ?? '?') . " = " . $targetAmount . " " . ($exchangeRate["targetCurrency"] ?? '?') . " (" . ($exchangeRate["quotationDate"] ?? '?') . ")"; } }