Filter brmember-credit properly.
This commit is contained in:
parent
d5ac70b95a
commit
f7166475d7
3 changed files with 16 additions and 10 deletions
|
@ -70,6 +70,8 @@
|
|||
brmember-add-payment
|
||||
brmember-payments
|
||||
|
||||
brmember-credit
|
||||
|
||||
brmember-mailman
|
||||
brmember-add-mailman
|
||||
|
||||
|
@ -357,6 +359,18 @@
|
|||
(cal-month<=? month (*current-month*))))
|
||||
(ldict-ref mr 'payments '())))
|
||||
|
||||
;; Returns credit records - respects *current-month*
|
||||
(define (brmember-credit mr)
|
||||
(filter (lambda (cr)
|
||||
(let* ((cmon (cadr cr))
|
||||
(mon (if cmon
|
||||
(cal-ensure-month cmon)
|
||||
#f)))
|
||||
(if mon
|
||||
(cal-month<=? mon (*current-month*))
|
||||
#t)))
|
||||
(brmember-info mr 'credit '())))
|
||||
|
||||
;; Returns a list of MLs this member is subscribed to
|
||||
(define (brmember-mailman mr)
|
||||
(ldict-ref mr 'mailman '()))
|
||||
|
|
|
@ -163,15 +163,7 @@
|
|||
|
||||
;; Total credit manually recorded in member record
|
||||
(define (member-credit-total mr)
|
||||
(let* ((credit (filter (lambda (cr)
|
||||
(let* ((cmon (cadr cr))
|
||||
(mon (if cmon
|
||||
(cal-ensure-month cmon)
|
||||
#f)))
|
||||
(if mon
|
||||
(cal-month<=? mon (*current-month*))
|
||||
#t)))
|
||||
(brmember-info mr 'credit '())))
|
||||
(let* ((credit (brmember-credit mr))
|
||||
(amounts (map car credit)))
|
||||
(foldl + 0 amounts)))
|
||||
|
||||
|
|
|
@ -103,7 +103,7 @@
|
|||
(list (car c)
|
||||
(cal-format (cadr c))
|
||||
(caddr c)))
|
||||
v)
|
||||
(brmember-credit mr))
|
||||
#:col-border #t)))
|
||||
((suspend student member)
|
||||
(list k
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue