Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 14 Pull requests Projects Releases 24 Packages Wiki Activity Actions

Merge pull request 'patches v1.3.10' (#82) from develop into main

Browse source 
Reviewed-on: #82
This commit is contained in:
Julian Krauser 2025-04-07 14:28:07 +00:00
commit fc5a6634ef
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/helpers/newsletterHelper.ts
View file

@ -63,8 +63,8 @@ export abstract class NewsletterHelper {
newsletterText: newsletter.newsletterText, newsletterText: newsletter.newsletterText,
newsletterSignatur: newsletter.newsletterSignatur, newsletterSignatur: newsletter.newsletterSignatur,
dates: dates.map((d) => ({ dates: dates.map((d) => ({
title: d.diffTitle ?? d.calendar.title, title: d.diffTitle || d.calendar.title,
content: d.diffDescription ?? d.calendar.content, content: d.diffDescription || d.calendar.content,
starttime: d.calendar.starttime, starttime: d.calendar.starttime,
formattedStarttime: new Date(d.calendar.starttime).toLocaleDateString("de-DE", { formattedStarttime: new Date(d.calendar.starttime).toLocaleDateString("de-DE", {
weekday: "long", weekday: "long",
@ -104,9 +104,9 @@ export abstract class NewsletterHelper {
nameaffix: recipient.nameaffix, nameaffix: recipient.nameaffix,
...(showAdress ...(showAdress
? { ? {
street: recipient.sendNewsletter.street ?? "", street: recipient.sendNewsletter.street || "",
streetNumber: recipient.sendNewsletter.streetNumber ?? "", streetNumber: recipient.sendNewsletter.streetNumber || "",
streetNumberAdd: recipient.sendNewsletter.streetNumberAddition ?? "", streetNumberAdd: recipient.sendNewsletter.streetNumberAddition || "",
} }
: {}), : {}),
}, },