patches v1.3.6 #78

Merged
jkeffects merged 4 commits from develop into main 2025-04-10 10:47:10 +00:00
3 changed files with 142 additions and 0 deletions
Showing only changes of commit fdbf9e7f0a - Show all commits

View file

@ -0,0 +1,67 @@
<template>
<div class="w-full md:max-w-md">
<div class="flex flex-col items-center">
<p class="text-xl font-medium">Newsletter Mail Empfänger</p>
</div>
<br />
<div class="flex flex-col gap-2 h-96 overflow-y-scroll">
<p
v-for="rec in receivers"
:key="rec.id"
class="bg-primary p-2 text-white flex flex-row justify-between items-center rounded-md"
>
{{ rec.lastname }}, {{ rec.firstname }}
</p>
<p v-if="receivers.length == 0">keine Empfänger gefunden</p>
</div>
<div class="flex flex-row gap-4 py-2 w-full">
<button primary @click="start">Versand starten</button>
<button primary-outline @click="closeModal">Versand abbrechen</button>
</div>
</div>
</template>
<script setup lang="ts">
import { defineAsyncComponent, defineComponent, markRaw } from "vue";
import { mapState, mapActions } from "pinia";
import { useModalStore } from "@/stores/modal";
import { useNewsletterPrintoutStore } from "@/stores/admin/club/newsletter/newsletterPrintout";
import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
</script>
<script lang="ts">
export default defineComponent({
data() {
return {
receivers: [] as Array<MemberViewModel>,
error: null as null | string,
};
},
mounted() {
this.fetchNewsletterMailReceivers()
.then((res) => {
this.receivers = res.data;
})
.catch((err) => {
this.error = "Fehler beim Laden der Empfänger";
});
},
methods: {
...mapActions(useNewsletterPrintoutStore, ["fetchNewsletterMailReceivers", "createNewsletterSend"]),
...mapActions(useModalStore, ["openModal", "closeModal"]),
start() {
this.createNewsletterSend();
this.openMailLogs();
},
openMailLogs() {
this.openModal(
markRaw(
defineAsyncComponent(() => import("@/components/admin/club/newsletter/NewsletterMailProgressModal.vue"))
)
);
},
},
});
</script>

View file

@ -0,0 +1,67 @@
<template>
<div class="w-full md:max-w-md">
<div class="flex flex-col items-center">
<p class="text-xl font-medium">Newsletter Druck Empfänger</p>
</div>
<br />
<div class="flex flex-col gap-2 h-96 overflow-y-scroll">
<p
v-for="rec in receivers"
:key="rec.id"
class="bg-primary p-2 text-white flex flex-row justify-between items-center rounded-md"
>
{{ rec.lastname }}, {{ rec.firstname }}
</p>
<p v-if="receivers.length == 0">keine Empfänger gefunden</p>
</div>
<div class="flex flex-row gap-4 py-2 w-full">
<button primary @click="start">Druck starten</button>
<button primary-outline @click="closeModal">Druck abbrechen</button>
</div>
</div>
</template>
<script setup lang="ts">
import { defineAsyncComponent, defineComponent, markRaw } from "vue";
import { mapState, mapActions } from "pinia";
import { useModalStore } from "@/stores/modal";
import { useNewsletterPrintoutStore } from "@/stores/admin/club/newsletter/newsletterPrintout";
import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
</script>
<script lang="ts">
export default defineComponent({
data() {
return {
receivers: [] as Array<MemberViewModel>,
error: null as null | string,
};
},
mounted() {
this.fetchNewsletterPrintReceivers()
.then((res) => {
this.receivers = res.data;
})
.catch((err) => {
this.error = "Fehler beim Laden der Empfänger";
});
},
methods: {
...mapActions(useNewsletterPrintoutStore, ["fetchNewsletterPrintReceivers", "createNewsletterPrintout"]),
...mapActions(useModalStore, ["openModal", "closeModal"]),
start() {
this.createNewsletterPrintout();
this.openPdfLogs();
},
openPdfLogs() {
this.openModal(
markRaw(
defineAsyncComponent(() => import("@/components/admin/club/newsletter/NewsletterPrintingProgressModal.vue"))
)
);
},
},
});
</script>

View file

@ -45,6 +45,14 @@ export const useNewsletterPrintoutStore = defineStore("newsletterPrintout", {
responseType: "blob",
});
},
fetchNewsletterPrintReceivers(): Promise<AxiosResponse<any, any>> {
const newsletterId = useNewsletterStore().activeNewsletter;
return http.get(`/admin/newsletter/${newsletterId}/printrecipients`);
},
fetchNewsletterMailReceivers(): Promise<AxiosResponse<any, any>> {
const newsletterId = useNewsletterStore().activeNewsletter;
return http.get(`/admin/newsletter/${newsletterId}/mailrecipients`);
},
createNewsletterMailPreview() {
this.sendingPreview = "loading";
const newsletterId = useNewsletterStore().activeNewsletter;