Fix current month setting for members-fees calculation.

This commit is contained in:
Dominik Pantůček 2024-01-02 12:59:33 +01:00
parent 778f89717f
commit 0e82221c16

View file

@ -122,19 +122,21 @@
;; Converts the entry into the fee ;; Converts the entry into the fee
(define (member-calendar-entry->fee e) (define (member-calendar-entry->fee e)
(if e (with-current-month
(if (member 'existing (cadr e)) (car e)
(if (member 'suspended (cadr e)) (if e
0 ; Suspended (if (member 'existing (cadr e))
(if (member 'destroyed (cadr e)) (if (member 'suspended (cadr e))
0 ; Destroyed 0 ; Suspended
(if (member 'student (cadr e)) (if (member 'destroyed (cadr e))
(lookup-member-fee 'student) ; Student 0 ; Destroyed
(if (caddr e) (if (member 'student (cadr e))
(caddr e) (lookup-member-fee 'student) ; Student
(lookup-member-fee 'regular))))) ; Normal (if (caddr e)
0) ; Nonexistent - should not happen (caddr e)
0)) ; Nonexistent (lookup-member-fee 'regular))))) ; Normal
0) ; Nonexistent - should not happen
0))) ; Nonexistent
;; Converts the calendar into a table where rows represent years and ;; Converts the calendar into a table where rows represent years and
;; contain the year in the first cell and 12 cells for months after ;; contain the year in the first cell and 12 cells for months after