brmlab/hackerbase
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix current month setting for members-fees calculation.

Browse source
This commit is contained in:
Dominik Pantůček 2024-01-02 12:59:33 +01:00
parent 778f89717f
commit 0e82221c16
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/members-fees.scm
View file

@ -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