Fix computing expected income based on actual fees and discounts.

This commit is contained in:
Dominik Pantůček 2024-02-09 14:28:17 +01:00
parent dc3044026c
commit 15888b7e3e
2 changed files with 40 additions and 29 deletions

View file

@ -30,6 +30,7 @@
(
lookup-member-fee
member-calendar
make-member-calendar-entry
member-calendar-first-month
member-calendar-last-month
member-calendar-query
@ -82,15 +83,17 @@
(if (cal-month>? cm last-month)
(reverse cal)
(loop (cal-month-add cm)
(cons (list cm
(with-current-month
cm
(brmember-flags mr))
(with-current-month
cm
(brmember-spec-fee mr)))
(cons (with-current-month
cm
(make-member-calendar-entry mr))
cal))))))
;; Assumes current-month is specified correctly
(define (make-member-calendar-entry mr)
(list (*current-month*)
(brmember-flags mr)
(brmember-spec-fee mr)))
;; Returns the first month of the calendar
(define (member-calendar-first-month mc)
(caar mc))