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

Include default currency.

Browse Source
This commit is contained in:
James Cole 2017-08-12 16:42:29 +02:00
parent 83b721a322
commit f684a2900b
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 424 additions and 434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,28 +11,16 @@ declare(strict_types=1);
namespace FireflyIII\Import\Storage; namespace FireflyIII\Import\Storage;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Import\Object\ImportAccount; use FireflyIII\Import\Object\ImportAccount;
use FireflyIII\Import\Object\ImportJournal; use FireflyIII\Import\Object\ImportJournal;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Category;
use FireflyIII\Models\ImportJob; use FireflyIII\Models\ImportJob;
use FireflyIII\Models\Rule;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Rules\Processor;
use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Steam;
/** /**
* Is capable of storing individual ImportJournal objects. * Is capable of storing individual ImportJournal objects.
@ -50,8 +38,8 @@ class ImportStorage
private $currencyRepository; private $currencyRepository;
/** @var string */ /** @var string */
private $dateFormat = 'Ymd'; private $dateFormat = 'Ymd';
/** @var TransactionCurrency */ /** @var int */
private $defaultCurrency; private $defaultCurrencyId = 0;
/** @var ImportJob */ /** @var ImportJob */
private $job; private $job;
/** @var Collection */ /** @var Collection */
@ -85,6 +73,8 @@ class ImportStorage
public function setJob(ImportJob $job) public function setJob(ImportJob $job)
{ {
$this->job = $job; $this->job = $job;
$currency = app('amount')->getDefaultCurrencyByUser($this->job->user);
$this->defaultCurrencyId = $currency->id;
// $repository = app(CurrencyRepositoryInterface::class); // $repository = app(CurrencyRepositoryInterface::class);
// $repository->setUser($job->user); // $repository->setUser($job->user);
// $this->currencyRepository = $repository; // $this->currencyRepository = $repository;
@ -93,7 +83,7 @@ class ImportStorage
// $repository->setUser($job->user); // $repository->setUser($job->user);
// $this->tagRepository = $repository; // $this->tagRepository = $repository;
// $this->rules = $this->getUserRules(); // $this->rules = $this->getUserRules();
// $this->defaultCurrency = Amount::getDefaultCurrencyByUser($this->job->user); //
} }
/** /**