Split out member id extraction.
This commit is contained in:
parent
3c56578d65
commit
9435659140
1 changed files with 16 additions and 11 deletions
|
@ -45,6 +45,21 @@
|
||||||
dictionary
|
dictionary
|
||||||
member-fees)
|
member-fees)
|
||||||
|
|
||||||
|
;; Extract probable member-id from transaction
|
||||||
|
(define (transaction-extract-member-id transaction)
|
||||||
|
(let* ((varsym-id0
|
||||||
|
(string->number
|
||||||
|
(bank-transaction-varsym transaction)))
|
||||||
|
(varsym-id
|
||||||
|
(or varsym-id0
|
||||||
|
(let* ((msg (bank-transaction-message transaction))
|
||||||
|
(ci (substring-index "," msg))
|
||||||
|
(vs (if ci
|
||||||
|
(substring msg ci)
|
||||||
|
msg)))
|
||||||
|
(string->number vs)))))
|
||||||
|
varsym-id))
|
||||||
|
|
||||||
;; Merges bank account statement into members payment keys. The
|
;; Merges bank account statement into members payment keys. The
|
||||||
;; payment key will be a list of transactions.
|
;; payment key will be a list of transactions.
|
||||||
(define (members-payments-process-bank mb ba)
|
(define (members-payments-process-bank mb ba)
|
||||||
|
@ -53,17 +68,7 @@
|
||||||
(if (null? transactions)
|
(if (null? transactions)
|
||||||
mb
|
mb
|
||||||
(let* ((transaction (car transactions))
|
(let* ((transaction (car transactions))
|
||||||
(varsym-id0
|
(varsym-id (transaction-extract-member-id transaction)))
|
||||||
(string->number
|
|
||||||
(bank-transaction-varsym transaction)))
|
|
||||||
(varsym-id
|
|
||||||
(or varsym-id0
|
|
||||||
(let* ((msg (bank-transaction-message transaction))
|
|
||||||
(ci (substring-index "," msg))
|
|
||||||
(vs (if ci
|
|
||||||
(substring msg ci)
|
|
||||||
msg)))
|
|
||||||
(string->number vs)))))
|
|
||||||
(loop (members-base-update mb
|
(loop (members-base-update mb
|
||||||
(lambda (mr)
|
(lambda (mr)
|
||||||
(eq? (member-id mr)
|
(eq? (member-id mr)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue