kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Clean up code for import routine.

Browse Source
This commit is contained in:
James Cole
2018-03-24 10:35:42 +01:00
parent 310ed9f504
commit 55602d632d
23 changed files with 363 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Import/Storage/ImportSupport.php
View File

@@ -127,7 +127,7 @@ trait ImportSupport
$transaction->transaction_journal_id = intval($parameters['id']);
$transaction->transaction_currency_id = intval($parameters['currency']);
$transaction->amount = $parameters['amount'];
$transaction->foreign_currency_id = intval($parameters['foreign_currency']) === 0 ? null : intval($parameters['foreign_currency']);
$transaction->foreign_currency_id = 0 === intval($parameters['foreign_currency']) ? null : intval($parameters['foreign_currency']);
$transaction->foreign_amount = null === $transaction->foreign_currency_id ? null : $parameters['foreign_amount'];
$transaction->save();
if (null === $transaction->id) {
@@ -158,6 +158,7 @@ trait ImportSupport
* @param ImportJournal $importJournal
*
* @return int
*
* @throws FireflyException
*/
private function getCurrencyId(ImportJournal $importJournal): int
@@ -171,7 +172,7 @@ trait ImportSupport
// use given currency
$currency = $importJournal->currency->getTransactionCurrency();
if (null !== $currency->id) {
if (null !== $currency) {
return $currency->id;
}
@@ -196,7 +197,7 @@ trait ImportSupport
{
// use given currency by import journal.
$currency = $importJournal->currency->getTransactionCurrency();
if (null !== $currency->id && intval($currency->id) !== intval($currencyId)) {
if (null !== $currency && intval($currency->id) !== intval($currencyId)) {
return $currency->id;
}
@@ -220,6 +221,7 @@ trait ImportSupport
* @see ImportSupport::getTransactionType
*
* @return Account
*
* @throws FireflyException
*/
private function getOpposingAccount(ImportAccount $account, int $forbiddenAccount, string $amount): Account