github-starred/actual-actualbudget
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-03-11 17:47:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix condition mapping for payee rule creation from payee modal (#414)

Browse Source
This commit is contained in:
winklevos
2023-01-15 04:42:16 +11:00
committed by GitHub
parent 3424e0eea6
commit a86ffbcca8
2 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/desktop-client/src/components/ManageRules.js
View File

@@ -588,20 +588,29 @@ export default function ManageRules({
}, []);
function onCreateRule() {
let rule = {
stage: null,
conditions: [
{
field: 'payee',
op: 'is',
value: payeeId || null,
type: 'id'
}
],
actions: [
{
op: 'set',
field: 'category',
value: null,
type: 'id'
}
]
};
dispatch(
pushModal('edit-rule', {
rule: {
stage: null,
conditions: [{ op: 'is', field: 'payee', value: null, type: 'id' }],
actions: [
{
op: 'set',
field: 'category',
value: null,
type: 'id'
}
]
},
rule,
onSave: async newRule => {
let newRules = await loadRules();

15
packages/desktop-client/src/components/payees/ManagePayeesWithData.js
View File

@@ -90,19 +90,24 @@ function ManagePayeesWithData({
}
function onCreateRule(id) {
let payee = payees.find(p => p.id === id);
let rule = {
id: null,
stage: null,
conditions: [
{
field: 'description',
field: 'payee',
op: 'is',
value: payee.id,
value: id,
type: 'id'
}
],
actions: []
actions: [
{
op: 'set',
field: 'category',
value: null,
type: 'id'
}
]
};
pushModal('edit-rule', { rule });
}