kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 16:57:09 +00:00
Code Issues 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
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()) { if (0 === $this->ruleRepos->count()) {
$data = [ $data = [
'rule_group_id' => $this->ruleRepos->getFirstRuleGroup()->id, 'rule_group_id' => $this->ruleRepos->getFirstRuleGroup()->id,
'stop_processing' => 0, 'stop-processing' => 0,
'title' => trans('firefly.default_rule_name'), 'title' => trans('firefly.default_rule_name'),
'description' => trans('firefly.default_rule_description'), 'description' => trans('firefly.default_rule_description'),
'trigger' => 'store-journal', 'trigger' => 'store-journal',
'strict' => true, 'strict' => true,
'rule-trigger-values' => [ 'rule-triggers' => [
trans('firefly.default_rule_trigger_description'), [
trans('firefly.default_rule_trigger_from_account'), 'name' => 'description_is',
], 'value' => trans('firefly.default_rule_trigger_description'),
'rule-action-values' => [ 'stop-processing' => false,
trans('firefly.default_rule_action_prepend'),
trans('firefly.default_rule_action_set_category'),
],
'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); $this->ruleRepos->store($data);

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

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