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

Merge branch 'feature/webhooks' into develop

Browse Source 
# Conflicts:
#	app/Events/UpdatedTransactionGroup.php
This commit is contained in:
James Cole
2021-06-11 20:00:40 +02:00
parent e9f2d6b5ea 4a2f751db3
commit 8a9a36b512
9 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Api/V1/Requests/Models/Transaction/StoreRequest.php
View File

@@ -57,6 +57,7 @@ class StoreRequest extends FormRequest
'group_title' => $this->string('group_title'),
'error_if_duplicate_hash' => $this->boolean('error_if_duplicate_hash'),
'apply_rules' => $this->boolean('apply_rules', true),
'fire_webhooks' => $this->boolean('fire_webhooks', true),
'transactions' => $this->getTransactionData(),
];
// TODO location

3
app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
View File

@@ -129,6 +129,9 @@ class UpdateRequest extends FormRequest
if ($this->has('apply_rules')) {
$data['apply_rules'] = $this->boolean('apply_rules', true);
}
if ($this->has('fire_webhooks')) {
$data['fire_webhooks'] = $this->boolean('fire_webhooks', true);
}
if ($this->has('group_title')) {
$data['group_title'] = $this->string('group_title');
}