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

Implement rules in API.

Browse Source
This commit is contained in:
James Cole
2018-06-30 17:49:14 +02:00
parent 36a6981329
commit f13df7e605
6 changed files with 103 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Repositories/Rule/RuleRepository.php
View File

@@ -290,7 +290,7 @@ class RuleRepository implements RuleRepositoryInterface
$rule->order = ($order + 1);
$rule->active = 1;
$rule->strict = $data['strict'] ?? false;
$rule->stop_processing = 1 === (int)$data['stop_processing'];
$rule->stop_processing = 1 === (int)$data['stop-processing'];
$rule->title = $data['title'];
$rule->description = \strlen($data['description']) > 0 ? $data['description'] : null;
@@ -356,7 +356,7 @@ class RuleRepository implements RuleRepositoryInterface
// update rule:
$rule->rule_group_id = $data['rule_group_id'];
$rule->active = $data['active'];
$rule->stop_processing = $data['stop_processing'];
$rule->stop_processing = $data['stop-processing'];
$rule->title = $data['title'];
$rule->strict = $data['strict'] ?? false;
$rule->description = $data['description'];
@@ -387,11 +387,11 @@ class RuleRepository implements RuleRepositoryInterface
{
$order = 1;
foreach ($data['rule-actions'] as $index => $action) {
$value = $data['rule-action-values'][$index] ?? '';
$stopProcessing = isset($data['rule-action-stop'][$index]) ? true : false;
$value = $action['value'] ?? '';
$stopProcessing = $action['stop-processing'] ?? false;
$actionValues = [
'action' => $action,
'action' => $action['name'],
'value' => $value,
'stopProcessing' => $stopProcessing,
'order' => $order,
@@ -423,11 +423,11 @@ class RuleRepository implements RuleRepositoryInterface
$this->storeTrigger($rule, $triggerValues);
foreach ($data['rule-triggers'] as $index => $trigger) {
$value = $data['rule-trigger-values'][$index] ?? '';
$stopProcessing = isset($data['rule-trigger-stop'][$index]) ? true : false;
$value = $trigger['value'] ?? '';
$stopProcessing = $trigger['stop-processing'] ?? false;
$triggerValues = [
'action' => $trigger,
'action' => $trigger['name'],
'value' => $value,
'stopProcessing' => $stopProcessing,
'order' => $order,