From f2389c963d4bfdb2b8ffeb33625231592ac33539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?=
 <dominik.pantucek@trustica.cz>
Date: Tue, 11 Apr 2023 09:03:40 +0200
Subject: [PATCH] Nicely formatted email body.

---
 src/Makefile        |  4 ++--
 src/reminders.scm   | 39 +++++++++++++++++++++++++--------------
 src/util-format.scm |  3 ++-
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 65917bf..71d0f72 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -37,7 +37,7 @@ HACKERBASE-DEPS=hackerbase.scm month.import.scm				\
 	cards.import.scm members-print.import.scm			\
 	members-payments.import.scm web-static.import.scm		\
 	environment.import.scm mailman.import.scm texts.import.scm	\
-	tests.import.scm
+	tests.import.scm reminders.import.scm
 
 HACKERBASE-OBJS=hackerbase.o testing.o listing.o month.o period.o	\
 	 ansi.o util-dict-list.o command-line.o members-base.o		\
@@ -317,7 +317,7 @@ util-mail.import.scm: $(UTIL-MAIL-SOURCES)
 
 REMINDERS-SOURCES=reminders.scm member-record.import.scm	\
 	util-mail.import.scm util-dict-list.import.scm		\
-	members-payments.import.scm util-format.scm
+	members-payments.import.scm util-format.import.scm
 
 reminders.o: reminders.import.scm
 reminders.import.scm: $(REMINDERS-SOURCES)
diff --git a/src/reminders.scm b/src/reminders.scm
index c88e30f..620be14 100644
--- a/src/reminders.scm
+++ b/src/reminders.scm
@@ -42,20 +42,31 @@
 
  ;; Creates reminder email body
  (define (reminder-email-body mr)
-   (list
-    (member-format "Ahoj ~N," mr)
-    "podle evidence členů a bankovního účtu to vypadá, že máš nedoplatek"
-    (format "ve výši ~A Kč." (format-amount (member-total-balance mr)))
-    "Zkontroluj, prosím, zda tvé platby členských příspěvků"
-    (member-format "s variabilním symbolem ~I byly zaslány na" mr)
-    "správný účet 1234/2010"
-    ""
-    ""
-    (member-format "Hi ~N," mr)
-    ""
-    "--"
-    "Brmlab Hackerspace Members Database"
-    ))
+   (let ((C identity)
+	 (M (lambda (s)
+	      (member-format s mr)))
+	 (F format)
+	 (absdebt (format-amount (- (member-total-balance mr))))
+	 (macc "2500079551/2010"))
+     (list
+      (M "Ahoj ~N,")
+      (C "podle evidence členů a bankovního účtu to vypadá, že máš nedoplatek")
+      (F "ve výši ~A Kč." absdebt)
+      (C "Zkontroluj, prosím, zda tvé platby členských příspěvků")
+      (M "s variabilním symbolem ~I byly zaslány na")
+      (F "správný účet ~A." macc)
+      ""
+      ""
+      (M "Dear ~N,")
+      (C "according to the members database and bank account statements, it appears")
+      (F "your payment of ~A CZK is missing." absdebt)
+      (C "Please, check whether your membership fees were transfered")
+      (M "correctly with the variable symbol (identification) ~I to")
+      (F "the correct bank account ~A." macc)
+      ""
+      "--"
+      "Brmlab Hackerspace Members Database"
+      )))
 
  ;; Creates reminder email dictionary
  (define (make-reminder-email mr)
diff --git a/src/util-format.scm b/src/util-format.scm
index ff652b1..b9cc832 100644
--- a/src/util-format.scm
+++ b/src/util-format.scm
@@ -41,7 +41,8 @@
        (let* ((str (number->string amt))
 	      (flds (string-split str "."))
 	      (integer? (null? (cdr flds))))
-	 (if integer?
+	 (if (or integer?
+		 (string=? (cadr flds) "0"))
 	     (format "~A.--" (car flds))
 	     (format "~A.~A"
 		     (car flds)