diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js index a81009c09..ef96e3652 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js +++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js @@ -73,8 +73,8 @@ describe('ContributionMessagesFormular', () => { ) }) - it('emitted "update-state" with data', async () => { - expect(wrapper.emitted('update-state')).toEqual( + it('emitted "update-status" with data', async () => { + expect(wrapper.emitted('update-status')).toEqual( expect.arrayContaining([expect.arrayContaining([42])]), ) }) diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue index 3a5d6e0b8..56761df12 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -54,7 +54,7 @@ export default { }) .then((result) => { this.$emit('get-list-contribution-messages', this.contributionId) - this.$emit('update-state', this.contributionId) + this.$emit('update-status', this.contributionId) this.form.text = '' this.toastSuccess(this.$t('message.request')) this.loading = false diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js index f0b6ea821..c0d9ed9ae 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js @@ -10,7 +10,7 @@ describe('ContributionMessagesList', () => { const propsData = { contributionId: 42, - contributionState: 'PENDING', + contributionStatus: 'PENDING', } const mocks = { diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue index fab6b5e4a..173061012 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue @@ -6,11 +6,11 @@ -
+
@@ -31,7 +31,7 @@ export default { type: Number, required: true, }, - contributionState: { + contributionStatus: { type: String, required: true, }, @@ -58,8 +58,8 @@ export default { this.toastError(error.message) }) }, - updateState(id) { - this.$emit('update-state', id) + updateStatus(id) { + this.$emit('update-status', id) }, }, created() { diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js index d02b5053a..93e2cdcd8 100644 --- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js +++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js @@ -18,7 +18,7 @@ describe('ContributionMessagesListItem', () => { describe('if message author has moderator role', () => { const propsData = { contributionId: 42, - state: 'PENDING', + status: 'PENDING', message: { id: 111, message: 'Lorem ipsum?', @@ -79,7 +79,7 @@ describe('ContributionMessagesListItem', () => { describe('if message author does not have moderator role', () => { const propsData = { contributionId: 42, - state: 'PENDING', + status: 'PENDING', message: { id: 113, message: 'Asda sdad ad asdasd, das Ass das Das. ', diff --git a/admin/src/components/CreationTransactionList.spec.js b/admin/src/components/CreationTransactionList.spec.js index e88d7cc22..bff1bb32c 100644 --- a/admin/src/components/CreationTransactionList.spec.js +++ b/admin/src/components/CreationTransactionList.spec.js @@ -28,7 +28,7 @@ const defaultData = () => { memo: 'Danke für alles', date: new Date(), moderator: 1, - state: 'PENDING', + status: 'PENDING', creation: [500, 500, 500], messagesCount: 0, deniedBy: null, @@ -50,7 +50,7 @@ const defaultData = () => { memo: 'Gut Ergattert', date: new Date(), moderator: 1, - state: 'PENDING', + status: 'PENDING', creation: [500, 500, 500], messagesCount: 0, deniedBy: null, diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue index a4849c87e..5ce3f0644 100644 --- a/admin/src/components/CreationTransactionList.vue +++ b/admin/src/components/CreationTransactionList.vue @@ -34,8 +34,8 @@ {{ $t('help.transactionlist.confirmed') }}
- {{ $t('transactionlist.state') }} {{ $t('math.equals') }} - {{ $t('help.transactionlist.state') }} + {{ $t('transactionlist.status') }} {{ $t('math.equals') }} + {{ $t('help.transactionlist.status') }}
@@ -78,8 +78,8 @@ export default { }, }, { - key: 'state', - label: this.$t('transactionlist.state'), + key: 'status', + label: this.$t('transactionlist.status'), }, { key: 'amount', diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js index 8f91aca03..11c5fd240 100644 --- a/admin/src/components/Tables/OpenCreationsTable.spec.js +++ b/admin/src/components/Tables/OpenCreationsTable.spec.js @@ -131,13 +131,13 @@ describe('OpenCreationsTable', () => { }) }) - describe('call updateState', () => { + describe('call updateStatus', () => { beforeEach(() => { - wrapper.vm.updateState(4) + wrapper.vm.updateStatus(4) }) - it('emits update-state', () => { - expect(wrapper.vm.$root.$emit('update-state', 4)).toBeTruthy() + it('emits update-status', () => { + expect(wrapper.vm.$root.$emit('update-status', 4)).toBeTruthy() }) }) }) diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue index 9d93eba60..216a91c32 100644 --- a/admin/src/components/Tables/OpenCreationsTable.vue +++ b/admin/src/components/Tables/OpenCreationsTable.vue @@ -9,8 +9,8 @@ stacked="md" :tbody-tr-class="rowClass" > -