kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-08 15:05:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1198

Browse Source
This commit is contained in:
James Cole
2018-03-09 04:47:43 +01:00
parent f537945351
commit 19f7027718
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Internal/Support/TransactionServiceTrait.php
View File

@@ -258,6 +258,8 @@ trait TransactionServiceTrait
protected function setForeignCurrency(Transaction $transaction, ?TransactionCurrency $currency): void
{
if (is_null($currency)) {
$transaction->foreign_currency_id = null;
$transaction->save();
return;
}
$transaction->foreign_currency_id = $currency->id;

4
app/Services/Internal/Update/TransactionUpdateService.php
View File

@@ -107,11 +107,11 @@ class TransactionUpdateService
// set foreign currency
$foreign = $this->findCurrency($data['foreign_currency_id'], $data['foreign_currency_code']);
// set foreign amount:
if (!is_null($data['foreign_amount'])) {
if (!is_null($data['foreign_amount']) && !is_null($foreign)) {
$this->setForeignCurrency($transaction, $foreign);
$this->setForeignAmount($transaction, $foreignAmount);
}
if (is_null($data['foreign_amount'])) {
if (is_null($data['foreign_amount']) || is_null($foreign)) {
$this->setForeignCurrency($transaction, null);
$this->setForeignAmount($transaction, null);
}