IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Catch various errors.

Browse Source
This commit is contained in:
James Cole
2018-07-26 06:27:52 +02:00
parent 6bcfea1de4
commit 89be30c4b9
19 changed files with 76 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Services/Internal/Update/AccountUpdateService.php
View File

@@ -41,17 +41,18 @@ class AccountUpdateService
* @param array $data
*
* @return Account
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function update(Account $account, array $data): Account
{
// update the account itself:
$account->name = $data['name'];
$account->active = $data['active'];
$account->virtual_balance = trim($data['virtualBalance']) === '' ? '0' : $data['virtualBalance'];
$account->virtual_balance = '' === trim($data['virtualBalance']) ? '0' : $data['virtualBalance'];
$account->iban = $data['iban'];
$account->save();
if (isset($data['currency_id']) && $data['currency_id'] === 0) {
if (isset($data['currency_id']) && 0 === $data['currency_id']) {
unset($data['currency_id']);
}

1
app/Services/Internal/Update/JournalUpdateService.php
View File

@@ -44,6 +44,7 @@ class JournalUpdateService
* @param array $data
*
* @return TransactionJournal
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function update(TransactionJournal $journal, array $data): TransactionJournal
{

2
app/Services/Internal/Update/RecurrenceUpdateService.php
View File

@@ -25,7 +25,7 @@ namespace FireflyIII\Services\Internal\Update;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Recurrence;
use FireflyIII\Models\RecurrenceMeta;
use FireflyIII\Services\Internal\Support\RecurringTransactionTrait;
use FireflyIII\Services\Internal\Support\TransactionServiceTrait;
use FireflyIII\Services\Internal\Support\TransactionTypeTrait;

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

@@ -69,6 +69,7 @@ class TransactionUpdateService
* @param array $data
*
* @return Transaction
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function update(Transaction $transaction, array $data): Transaction
{
@@ -100,7 +101,7 @@ class TransactionUpdateService
$transaction->description = $description;
$transaction->amount = $amount;
$transaction->foreign_amount = null;
$transaction->transaction_currency_id = $currency->id;
$transaction->transaction_currency_id = null === $currency ? $transaction->transaction_currency_id : $currency->id;
$transaction->account_id = $account->id;
$transaction->reconciled = $data['reconciled'];
$transaction->save();
@@ -108,11 +109,11 @@ class TransactionUpdateService
// set foreign currency
$foreign = $this->findCurrency($data['foreign_currency_id'], $data['foreign_currency_code']);
// set foreign amount:
if (null !== $data['foreign_amount'] && null !== $foreign) {
if (null !== $foreign && null !== $data['foreign_amount']) {
$this->setForeignCurrency($transaction, $foreign);
$this->setForeignAmount($transaction, $foreignAmount);
}
if (null === $data['foreign_amount'] || null === $foreign) {
if (null === $foreign && null === $data['foreign_amount']) {
$this->setForeignCurrency($transaction, null);
$this->setForeignAmount($transaction, null);
}