From 29d4c7986f7f36089b3ad431bacfb132ef0acdfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Wed, 12 Apr 2023 20:27:02 +0200 Subject: [PATCH] More ignored transactions. --- src/members-payments.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/members-payments.scm b/src/members-payments.scm index a3c03f3..96129c7 100644 --- a/src/members-payments.scm +++ b/src/members-payments.scm @@ -60,13 +60,17 @@ (make-period-lookup-table '(((2010 1) 25)))) + ;; Transaction types to ignore + (define ignored-transaction-types + '("Poplatek" "Připsaný úrok")) + ;; Lookup CZK/EUR (define (lookup-eur-rate) (car (lookup-by-period exchange-rates-lookup-table))) ;; Extract probable member-id from transaction (define (transaction-extract-member-id transaction) - (if (equal? (bank-transaction-type transaction) "Poplatek") + (if (member (bank-transaction-type transaction) ignored-transaction-types) #f (let* ((varsym-id0 (string->number @@ -94,8 +98,8 @@ mb (let* ((transaction (car transactions)) (varsym-id (transaction-extract-member-id transaction)) - (member (find-member-by-id mb varsym-id))) - (loop (if member + (bmember (find-member-by-id mb varsym-id))) + (loop (if bmember (members-base-update mb (lambda (mr) @@ -108,7 +112,8 @@ (> (bank-transaction-amount transaction) 0) (not (bank-accounts-member? all-accounts (bank-transaction-account transaction) - (bank-transaction-bank transaction)))) + (bank-transaction-bank transaction))) + (not (member (bank-transaction-type transaction) ignored-transaction-types))) (members-base-add-unpaired mb transaction) mb)) (cdr transactions))))))