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

First set of code for #956

Browse Source
This commit is contained in:
James Cole
2017-12-01 20:11:29 +01:00
parent 382c5e5760
commit 8a59380c6d
5 changed files with 125 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ use FireflyIII\Import\Object\ImportJournal;
use FireflyIII\Models\ImportJob;
use FireflyIII\Models\Note;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use Illuminate\Support\Collection;
use Log;
@@ -44,14 +45,22 @@ class ImportStorage
public $errors;
/** @var Collection */
public $journals;
/** @var int */
protected $defaultCurrencyId = 1; // yes, hard coded
/** @var BillRepositoryInterface */
protected $billRepository; // yes, hard coded
/** @var Collection */
protected $bills;
/** @var int */
protected $defaultCurrencyId = 1;
/** @var ImportJob */
protected $job;
/** @var Collection */
protected $rules;
/** @var bool */
private $applyRules = false;
/** @var string */
private $dateFormat = 'Ymd';
/** @var bool */
private $matchBills = false;
/** @var Collection */
private $objects;
/** @var array */
@@ -84,7 +93,21 @@ class ImportStorage
$currency = app('amount')->getDefaultCurrencyByUser($this->job->user);
$this->defaultCurrencyId = $currency->id;
$this->transfers = $this->getTransfers();
$this->rules = $this->getRules();
$config = $job->configuration;
$this->applyRules = $config['apply_rules'] ?? false;
$this->matchBills = $config['match_bills'] ?? false;
if ($this->applyRules === true) {
Log::debug('applyRules seems to be true, get the rules.');
$this->rules = $this->getRules();
}
if ($this->matchBills === true) {
Log::debug('matchBills seems to be true, get the bills');
$this->bills = $this->getBills();
$this->billRepository = app(BillRepositoryInterface::class);
$this->billRepository->setUser($job->user);
}
Log::debug(sprintf('Value of apply rules is %s', var_export($this->applyRules, true)));
Log::debug(sprintf('Value of match bills is %s', var_export($this->matchBills, true)));
}
/**
@@ -202,8 +225,26 @@ class ImportStorage
// Another step done!
$this->job->addStepsDone(1);
// run rules:
$this->applyRules($journal);
// run rules if config calls for it:
if ($this->applyRules === true) {
Log::info('Will apply rules to this journal.');
$this->applyRules($journal);
}
if (!($this->applyRules === true)) {
Log::info('Will NOT apply rules to this journal.');
}
// match bills if config calls for it.
if ($this->matchBills === true) {
//$this->/applyRules($journal);
Log::info('Cannot match bills (yet).');
$this->matchBills($journal);
}
if (!($this->matchBills === true)) {
Log::info('Cannot match bills (yet), but do not have to.');
}
// Another step done!
$this->job->addStepsDone(1);
$this->journals->push($journal);