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

Merge branch 'develop' of github.com:JC5/firefly-iii into develop

Browse Source
This commit is contained in:
James Cole 2017-09-21 06:51:31 +02:00
commit 9f1ea0807b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Import/Converter/Amount.php
View File

@ -36,6 +36,10 @@ class Amount implements ConverterInterface
*/ */
public function convert($value): string public function convert($value): string
{ {
if(is_null($value)) {
return '0';
}
$value = strval($value);
Log::debug(sprintf('Start with amount "%s"', $value)); Log::debug(sprintf('Start with amount "%s"', $value));
$len = strlen($value); $len = strlen($value);
$decimalPosition = $len - 3; $decimalPosition = $len - 3;

2
app/Import/Storage/ImportStorage.php
View File

@ -39,7 +39,7 @@ class ImportStorage
/** @var string */ /** @var string */
private $dateFormat = 'Ymd'; // yes, hard coded private $dateFormat = 'Ymd'; // yes, hard coded
/** @var ImportJob */ /** @var ImportJob */
private $job; protected $job;
/** @var Collection */ /** @var Collection */
private $objects; private $objects;
/** @var Collection */ /** @var Collection */

4
app/Repositories/Journal/JournalRepository.php
View File

@ -196,7 +196,7 @@ class JournalRepository implements JournalRepositoryInterface
$journal->save(); $journal->save();
// store stuff: // store stuff:
$this->storeCategoryWithJournal($journal, $data['category']); $this->storeCategoryWithJournal($journal, strval($data['category']));
$this->storeBudgetWithJournal($journal, $data['budget_id']); $this->storeBudgetWithJournal($journal, $data['budget_id']);
// store two transactions: // store two transactions:
@ -271,7 +271,7 @@ class JournalRepository implements JournalRepositoryInterface
$journal->categories()->detach(); $journal->categories()->detach();
$journal->budgets()->detach(); $journal->budgets()->detach();
$this->storeCategoryWithJournal($journal, $data['category']); $this->storeCategoryWithJournal($journal, strval($data['category']));
$this->storeBudgetWithJournal($journal, $data['budget_id']); $this->storeBudgetWithJournal($journal, $data['budget_id']);
// negative because source loses money. // negative because source loses money.