From 0e82221c165e7aeafa6f41f35866b4c5b790d47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Tue, 2 Jan 2024 12:59:33 +0100 Subject: [PATCH] Fix current month setting for members-fees calculation. --- src/members-fees.scm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/members-fees.scm b/src/members-fees.scm index a77affd..7fe3dc8 100644 --- a/src/members-fees.scm +++ b/src/members-fees.scm @@ -122,19 +122,21 @@ ;; Converts the entry into the fee (define (member-calendar-entry->fee e) - (if e - (if (member 'existing (cadr e)) - (if (member 'suspended (cadr e)) - 0 ; Suspended - (if (member 'destroyed (cadr e)) - 0 ; Destroyed - (if (member 'student (cadr e)) - (lookup-member-fee 'student) ; Student - (if (caddr e) - (caddr e) - (lookup-member-fee 'regular))))) ; Normal - 0) ; Nonexistent - should not happen - 0)) ; Nonexistent + (with-current-month + (car e) + (if e + (if (member 'existing (cadr e)) + (if (member 'suspended (cadr e)) + 0 ; Suspended + (if (member 'destroyed (cadr e)) + 0 ; Destroyed + (if (member 'student (cadr e)) + (lookup-member-fee 'student) ; Student + (if (caddr e) + (caddr e) + (lookup-member-fee 'regular))))) ; Normal + 0) ; Nonexistent - should not happen + 0))) ; Nonexistent ;; Converts the calendar into a table where rows represent years and ;; contain the year in the first cell and 12 cells for months after