diff --git a/admin/package.json b/admin/package.json
index b1983fd39..413bc7154 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -88,7 +88,8 @@
"stylelint-config-recommended-vue": "1.5.0",
"stylelint-config-standard-scss": "13.1.0",
"unplugin-icons": "^0.19.0",
- "unplugin-vue-components": "^0.27.3"
+ "unplugin-vue-components": "^0.27.3",
+ "vite-plugin-environment": "^1.1.3"
},
"browserslist": [
"> 1%",
diff --git a/admin/src/components/ContributionLink/ContributionLinkForm.vue b/admin/src/components/ContributionLink/ContributionLinkForm.vue
index ebcfcf5e3..af3c68327 100644
--- a/admin/src/components/ContributionLink/ContributionLinkForm.vue
+++ b/admin/src/components/ContributionLink/ContributionLinkForm.vue
@@ -112,6 +112,7 @@
{{ $t('close') }}
+ {{ console.log(editContributionLink) }}
@@ -146,7 +147,6 @@ const form = ref({
validFrom: null,
validTo: null,
cycle: 'ONCE',
- maxPerCycle: 1,
maxAmountPerMonth: '0',
})
@@ -160,9 +160,9 @@ const cycle = ref([
const maxPerCycle = ref([{ value: '1', text: '1 x' }])
-const { mutate: contributionLinkMutation } = useMutation(
- props.editContributionLink ? updateContributionLink : createContributionLink,
-)
+const { mutate: contributionLinkMutation } = useMutation(createContributionLink)
+
+const { mutate: contributionLinkMutationUpdate } = useMutation(updateContributionLink)
watch(
() => props.contributionLinkData,
@@ -180,12 +180,15 @@ const onSubmit = async () => {
const variables = {
...form.value,
- maxAmountPerMonth: 1, // TODO this is added only for test puropuse during migration since max amount input is commented out but without it being a number bigger then 0 it doesn't work
+ // maxAmountPerMonth: 1, // TODO this is added only for test puropuse during migration since max amount input is commented out but without it being a number bigger then 0 it doesn't work
id: props.contributionLinkData.id ? props.contributionLinkData.id : null,
}
try {
- const result = await contributionLinkMutation({ ...variables })
+ const mutationType = props.editContributionLink
+ ? contributionLinkMutationUpdate
+ : contributionLinkMutation
+ const result = await mutationType({ ...variables })
const link = props.editContributionLink
? result.data.updateContributionLink.link
: result.data.createContributionLink.link
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index eb6bfc25f..b0ada94f6 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -75,177 +75,349 @@
--->
+
+
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index ad396ed15..14b640066 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -14,7 +14,7 @@
:contribution-memo="contributionMemo"
:hide-resubmission="hideResubmission"
:input-resubmission-date="resubmissionAt"
- @get-list-contribution-messages="$apollo.queries.Messages.refetch()"
+ @get-list-contribution-messages="refetch"
@update-status="updateStatus"
@reload-contribution="reloadContribution"
@update-contributions="updateContributions"
@@ -22,79 +22,74 @@
-