src/components/admin/club/newsletter/NewsletterMailProgressModal.vue

@@ -19,7 +19,7 @@
 
     <div class="flex flex-row justify-end">
       <div class="flex flex-row gap-4 py-2">
-        <button primary-outline @click="closeModal">schließen</button>
+        <button primary-outline @click="closeModal">abbrechen</button>
       </div>
     </div>
   </div>

src/components/admin/club/newsletter/NewsletterMailRecipientsModal.vue

@@ -1,68 +0,0 @@
-<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 />
-
-    <p v-if="receivers.length == 0">keine Empfänger gefunden</p>
-    <p v-else>{{ receivers.length }} Empfänger gefunden</p>
-    <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>
-    </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>

src/components/admin/club/newsletter/NewsletterPrintingProgressModal.vue

@@ -19,7 +19,7 @@
 
     <div class="flex flex-row justify-end">
       <div class="flex flex-row gap-4 py-2">
-        <button primary-outline @click="closeModal">schließen</button>
+        <button primary-outline @click="closeModal">abbrechen</button>
       </div>
     </div>
   </div>

src/components/admin/club/newsletter/NewsletterPrintingRecipientsModal.vue

@@ -1,68 +0,0 @@
-<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 />
-
-    <p v-if="receivers.length == 0">keine Empfänger gefunden</p>
-    <p v-else>{{ receivers.length }} Empfänger gefunden</p>
-    <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>
-    </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>

src/stores/admin/club/newsletter/newsletterPrintout.ts

@@ -45,14 +45,6 @@ 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;
@@ -124,7 +116,7 @@ export const useNewsletterPrintoutStore = defineStore("newsletterPrintout", {
         chunk.split("//").forEach((r) => {
           if (r.trim() != "") {
             let data = JSON.parse(r);
-            this.pdfSourceMessages.unshift(data);
+            this.pdfSourceMessages.push(data);
             let type: NotificationType = "info";
             let timeout = undefined;
             if (data.factor == "failed") {
@@ -146,7 +138,7 @@ export const useNewsletterPrintoutStore = defineStore("newsletterPrintout", {
         chunk.split("//").forEach((r) => {
           if (r.trim() != "") {
             let data = JSON.parse(r);
-            this.mailSourceMessages.unshift(data);
+            this.mailSourceMessages.push(data);
             let type: NotificationType = "info";
             let timeout = undefined;
             if (data.factor == "failed") {

src/views/admin/club/newsletter/NewsletterPrintout.vue

@@ -27,7 +27,7 @@
         primary
         class="!w-fit whitespace-nowrap flex flex-row gap-2"
         :disabled="printing != undefined"
-        @click="openPdfCommit"
+        @click="createNewsletterPrintout"
       >
         Newsletter drucken
         <Spinner v-if="printing == 'loading'" class="my-auto" />
@@ -39,7 +39,7 @@
         primary
         class="!w-fit whitespace-nowrap flex flex-row gap-2"
         :disabled="sending != undefined"
-        @click="openMailCommit"
+        @click="createNewsletterSend"
       >
         Mails versenden
         <Spinner v-if="sending == 'loading'" class="my-auto" />
@@ -108,8 +108,10 @@ export default defineComponent({
     ...mapActions(useModalStore, ["openModal"]),
     ...mapActions(useNewsletterPrintoutStore, [
       "fetchNewsletterPrintout",
+      "createNewsletterPrintout",
       "fetchNewsletterPrintoutById",
       "createNewsletterMailPreview",
+      "createNewsletterSend",
     ]),
     openPdfShow(filename?: string) {
       this.openModal(
@@ -130,20 +132,6 @@ export default defineComponent({
         })
         .catch(() => {});
     },
-    openPdfCommit() {
-      this.openModal(
-        markRaw(
-          defineAsyncComponent(() => import("@/components/admin/club/newsletter/NewsletterPrintingRecipientsModal.vue"))
-        )
-      );
-    },
-    openMailCommit() {
-      this.openModal(
-        markRaw(
-          defineAsyncComponent(() => import("@/components/admin/club/newsletter/NewsletterMailRecipientsModal.vue"))
-        )
-      );
-    },
     openPdfLogs() {
       this.openModal(
         markRaw(