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

Last minute fixes.

Browse Source
This commit is contained in:
James Cole 2018-07-03 19:34:13 +02:00
parent 8eb4259be0
commit 9f69e112d0
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/Http/Controllers/RuleController.php
View File

@ -549,23 +549,39 @@ class RuleController extends Controller
{
if (0 === $this->ruleRepos->count()) {
$data = [
'rule_group_id' => $this->ruleRepos->getFirstRuleGroup()->id,
'stop_processing' => 0,
'title' => trans('firefly.default_rule_name'),
'description' => trans('firefly.default_rule_description'),
'trigger' => 'store-journal',
'strict' => true,
'rule-trigger-values' => [
trans('firefly.default_rule_trigger_description'),
trans('firefly.default_rule_trigger_from_account'),
],
'rule-action-values' => [
trans('firefly.default_rule_action_prepend'),
trans('firefly.default_rule_action_set_category'),
],
'rule_group_id' => $this->ruleRepos->getFirstRuleGroup()->id,
'stop-processing' => 0,
'title' => trans('firefly.default_rule_name'),
'description' => trans('firefly.default_rule_description'),
'trigger' => 'store-journal',
'strict' => true,
'rule-triggers' => [
[
'name' => 'description_is',
'value' => trans('firefly.default_rule_trigger_description'),
'stop-processing' => false,
'rule-triggers' => ['description_is', 'from_account_is'],
'rule-actions' => ['prepend_description', 'set_category'],
],
[
'name' => 'from_account_is',
'value' => trans('firefly.default_rule_trigger_from_account'),
'stop-processing' => false,
],
],
'rule-actions' => [
[
'name' => 'prepend_description',
'value' => trans('firefly.default_rule_action_prepend'),
'stop-processing' => false,
],
[
'name' => 'set_category',
'value' => trans('firefly.default_rule_action_set_category'),
'stop-processing' => false,
],
],
];
$this->ruleRepos->store($data);

1
app/Import/Prerequisites/BunqPrerequisites.php
View File

@ -116,6 +116,7 @@ class BunqPrerequisites implements PrerequisitesInterface
$environment = $this->getBunqEnvironment();
$deviceDescription = 'Firefly III v' . config('firefly.version');
$permittedIps = [$externalIP];
Log::debug(sprintf('Environment for bunq is %s', $environment->getChoiceString()));
try {
/** @var ApiContext $object */