diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index 40d5bcb8c..e2b6fa483 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -157,7 +157,7 @@ export default { data() { return { radioSelected: '', - text: !this.creationUserData.note ? '' : this.creationUserData.note, + text: !this.creationUserData.memo ? '' : this.creationUserData.memo, value: !this.creationUserData.amount ? 0 : this.creationUserData.amount / 10000, rangeMin: 0, rangeMax: 1000, diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue index fbc3d83c3..aa60cced7 100644 --- a/admin/src/components/EditCreationFormular.vue +++ b/admin/src/components/EditCreationFormular.vue @@ -184,7 +184,7 @@ export default { data() { return { radioSelected: '', - text: !this.creationUserData.note ? '' : this.creationUserData.note, + text: !this.creationUserData.memo ? '' : this.creationUserData.memo, value: !this.creationUserData.amount ? 0 : this.creationUserData.amount / 10000, rangeMin: 0, rangeMax: 1000, diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js index add9efc29..86b1965c8 100644 --- a/admin/src/graphql/getPendingCreations.js +++ b/admin/src/graphql/getPendingCreations.js @@ -8,7 +8,7 @@ export const getPendingCreations = gql` lastName email amount - note + memo date moderator creation diff --git a/admin/src/graphql/updatePendingCreation.js b/admin/src/graphql/updatePendingCreation.js index e9e372440..5c63b4674 100644 --- a/admin/src/graphql/updatePendingCreation.js +++ b/admin/src/graphql/updatePendingCreation.js @@ -1,11 +1,11 @@ import gql from 'graphql-tag' export const updatePendingCreation = gql` - query ($email: String!, $amount: Int!, $note: String!, $creationDate: String!, $moderator: Int!) { + query ($email: String!, $amount: Int!, $memo: String!, $creationDate: String!, $moderator: Int!) { updatePendingCreation( email: $email amount: $amount - note: $note + memo: $memo creationDate: $creationDate moderator: $moderator ) diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js index 365ccd809..6598738f1 100644 --- a/admin/src/pages/CreationConfirm.spec.js +++ b/admin/src/pages/CreationConfirm.spec.js @@ -13,7 +13,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ lastName: 'Bloxberg', email: 'bibi@bloxberg.de', amount: 500, - note: 'Danke für alles', + memo: 'Danke für alles', date: new Date(), moderator: 0, }, @@ -22,7 +22,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ lastName: 'Hotzenplotz', email: 'raeuber@hotzenplotz.de', amount: 1000000, - note: 'Gut Ergatert', + memo: 'Gut Ergatert', date: new Date(), moderator: 0, }, diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index ec0e6e7af..cf15fb64f 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -33,7 +33,7 @@ export default { return value + ' GDD' }, }, - { key: 'note', label: 'Text' }, + { key: 'memo', label: 'Text' }, { key: 'date', label: 'Datum',