From 0b27385a24e9b0c557a5063f6a7f5f65532cd287 Mon Sep 17 00:00:00 2001 From: Markus Zimmerberger Date: Tue, 27 May 2025 19:21:14 +0200 Subject: [PATCH] #8 Remove hint for mail-delivery if mail is already active --- sustApp/create_payment_slip.py | 9 +++++++-- sustApp/mail_payment_slips.py | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sustApp/create_payment_slip.py b/sustApp/create_payment_slip.py index 86232f7..2e38c5a 100644 --- a/sustApp/create_payment_slip.py +++ b/sustApp/create_payment_slip.py @@ -20,7 +20,9 @@ def print_multiple_lines(lines: int, text): text.textLines("") cnt += 1 -def create_payment_slip(member: models.Members = None): +def create_payment_slip(member: models.Members = None, + forMail: bool = False): + locale.setlocale(locale.LC_ALL, '') salutation = "Deine" @@ -94,7 +96,10 @@ def create_payment_slip(member: models.Members = None): print_multiple_lines(2, text) text.textLines("* Skigymnastik\n* Radfahren\n* Stockschiessen\n* Pilates\n* Tagesskifahrt\n* uvam") print_multiple_lines(5, text) - text.textLines(f"Wir möchten das Zustellen des Mitgliedsbeitrags-Zahlscheines zuküntig auf Mail umstellen, daher bitten wir {salutation3},\nuns eine Mail mit dem Betreff \"Zahlschein\" an unsere Mail-Adresse sv.stthomas@gmx.at zu senden!") + if not forMail: + text.textLines(f"Wir möchten das Zustellen des Mitgliedsbeitrags-Zahlscheines zuküntig auf Mail umstellen, daher bitten wir {salutation3},\nuns eine Mail mit dem Betreff \"Zahlschein\" an unsere Mail-Adresse sv.stthomas@gmx.at zu senden!") + else: + print_multiple_lines(2, text) print_multiple_lines(3, text) text.textLines(f"{salutation2.capitalize()} Sportverein-Team!") c.drawText(text) diff --git a/sustApp/mail_payment_slips.py b/sustApp/mail_payment_slips.py index f65a43b..dd9983b 100644 --- a/sustApp/mail_payment_slips.py +++ b/sustApp/mail_payment_slips.py @@ -58,7 +58,8 @@ def send_mail(member: models.Members): path_to_file = os.path.join(os.path.expanduser("~"),"sust","payment_slips","mail",f"{member.member_zip}_payment_slip_member{member.id}.pdf") if not exists(path_to_file): - create_payment_slip(member=member) + create_payment_slip(member=member, + forMail=True) with open(path_to_file, 'rb') as f: attachment = MIMEApplication(f.read(), _subtype='pdf')