fix: newsletter send error
This commit is contained in:
parent
a5bd9ec114
commit
08a893aa0e
3 changed files with 12 additions and 6 deletions
|
@ -141,9 +141,9 @@ export abstract class NewsletterHelper {
|
|||
}
|
||||
}
|
||||
|
||||
let members = await MemberService.getAll({ noLimit: true });
|
||||
|
||||
return members[0].filter((m) => queryMemberIds.includes(m.id));
|
||||
let members = await MemberService.getAll({ noLimit: true, ids: queryMemberIds });
|
||||
console.log(members);
|
||||
return members[0];
|
||||
}
|
||||
|
||||
public static getICSFilePath(newsletter: newsletter) {
|
||||
|
@ -253,7 +253,13 @@ export abstract class NewsletterHelper {
|
|||
|
||||
for (const [index, rec] of [
|
||||
...pdfRecipients,
|
||||
{ id: "0", firstname: "Alle Mitglieder", lastname: CLUB_NAME } as member,
|
||||
{
|
||||
id: "0",
|
||||
firstname: "Alle Mitglieder",
|
||||
lastname: CLUB_NAME,
|
||||
nameaffix: "",
|
||||
salutation: { salutation: "" },
|
||||
} as member,
|
||||
].entries()) {
|
||||
let data = this.buildData(newsletter, dates, rec, printWithAdress.includes(rec.sendNewsletter?.type?.id));
|
||||
|
||||
|
|
|
@ -135,7 +135,7 @@ export default abstract class MemberService {
|
|||
"member.sendNewsletter",
|
||||
"member.communications",
|
||||
"sendNewsletter",
|
||||
"sendNewsletter.isSendNewsletter = 1"
|
||||
"sendNewsletter.isSendNewsletter = true"
|
||||
)
|
||||
.where("member.id = :id", { id: id })
|
||||
.getOneOrFail()
|
||||
|
|
|
@ -18,7 +18,7 @@ export default abstract class NewsletterRecipientsService {
|
|||
"member.sendNewsletter",
|
||||
"member.communications",
|
||||
"sendNewsletter",
|
||||
"sendNewsletter.isSendNewsletter = 1"
|
||||
"sendNewsletter.isSendNewsletter = true"
|
||||
)
|
||||
.leftJoinAndSelect("member.salutation", "salutation")
|
||||
.leftJoinAndSelect("sendNewsletter.type", "communicationtype")
|
||||
|
|
Loading…
Add table
Reference in a new issue