diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php index ee66cebb58..15f17eba73 100644 --- a/app/Console/Commands/UpgradeDatabase.php +++ b/app/Console/Commands/UpgradeDatabase.php @@ -220,7 +220,7 @@ class UpgradeDatabase extends Command // when mismatch in transaction: if (!(intval($transaction->transaction_currency_id) === intval($currency->id))) { - $transaction->foreign_currency_id = $transaction->transaction_currency_id; + $transaction->foreign_currency_id = intval($transaction->transaction_currency_id); $transaction->foreign_amount = $transaction->amount; $transaction->transaction_currency_id = $currency->id; $transaction->save(); diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index b271a9f4ad..ba24a58696 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -272,7 +272,7 @@ class TransactionController extends Controller $return = []; /** @var Transaction $transaction */ foreach ($collection as $transaction) { - $currencyId = $transaction->transaction_currency_id; + $currencyId = intval($transaction->transaction_currency_id); // save currency information: if (!isset($return[$currencyId])) { diff --git a/app/Import/Storage/ImportSupport.php b/app/Import/Storage/ImportSupport.php index 3acf03b550..177831e4ba 100644 --- a/app/Import/Storage/ImportSupport.php +++ b/app/Import/Storage/ImportSupport.php @@ -121,10 +121,10 @@ trait ImportSupport { $transaction = new Transaction; $transaction->account_id = $parameters['account']; - $transaction->transaction_journal_id = $parameters['id']; - $transaction->transaction_currency_id = $parameters['currency']; + $transaction->transaction_journal_id = intval($parameters['id']); + $transaction->transaction_currency_id = intval($parameters['currency']); $transaction->amount = $parameters['amount']; - $transaction->foreign_currency_id = $parameters['foreign_currency']; + $transaction->foreign_currency_id = intval($parameters['foreign_currency']); $transaction->foreign_amount = $parameters['foreign_amount']; $transaction->save(); if (null === $transaction->id) { diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 989801716a..c0f5f291f0 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -184,11 +184,11 @@ class Steam $modified = null === $entry->modified ? '0' : strval($entry->modified); $foreignModified = null === $entry->modified_foreign ? '0' : strval($entry->modified_foreign); $amount = '0'; - if ($currencyId === $entry->transaction_currency_id || 0 === $currencyId) { + if ($currencyId === intval($entry->transaction_currency_id) || 0 === $currencyId) { // use normal amount: $amount = $modified; } - if ($currencyId === $entry->foreign_currency_id) { + if ($currencyId === intval($entry->foreign_currency_id)) { // use foreign amount: $amount = $foreignModified; }