From 6553683eda52d5e85d63e7a0826f9e3fe862f3e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Wed, 5 Apr 2023 11:27:15 +0200 Subject: [PATCH] Remove full JendaSAP compat layer. --- src/bbstool.scm | 2 -- src/configuration.scm | 4 ---- src/members-payments.scm | 10 +++------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/bbstool.scm b/src/bbstool.scm index e9a06aa..719ea0c 100644 --- a/src/bbstool.scm +++ b/src/bbstool.scm @@ -87,8 +87,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. (-apikeys-file- fname)) (-bankdir (dir) "Where are bank CSV files" (-bank-dir- dir)) - (-jenda () "JendaSAP compatibility mode" - (*jendasap-compat* #t)) (-jenda-checked (file) "JendaSAP checked.ntlm file" (*jendasap-checked* file)) "" diff --git a/src/configuration.scm b/src/configuration.scm index 5a8f4a0..8a6d5b8 100644 --- a/src/configuration.scm +++ b/src/configuration.scm @@ -31,7 +31,6 @@ *current-month* *member-suspend-max-months* *members-directory* - *jendasap-compat* *jendasap-checked* ) @@ -54,9 +53,6 @@ ;; Needed by multiple modules actually (define *members-directory* (make-parameter "members")) - ;; JendaSAP compatibility mode - (define *jendasap-compat* (make-parameter #f)) - ;; JendaSAP compatibility file with last checked Fio transaction (define *jendasap-checked* (make-parameter "checked.ntlm")) diff --git a/src/members-payments.scm b/src/members-payments.scm index dafdc83..85c077e 100644 --- a/src/members-payments.scm +++ b/src/members-payments.scm @@ -67,10 +67,8 @@ (if (equal? (bank-transaction-type transaction) "Poplatek") #f (let* ((varsym-id0 - (if (*jendasap-compat*) ;; JendaSAP - whole string - (bank-transaction-varsym transaction) - (string->number - (bank-transaction-varsym transaction)))) + (string->number + (bank-transaction-varsym transaction))) (varsym-id (or varsym-id0 (let* ((msg (bank-transaction-message transaction)) @@ -83,9 +81,7 @@ ;; Special comparator with JendaSAP hack (define (compare-member-id member-id bank-varsym) - (if (*jendasap-compat*) - (equal? bank-varsym (number->string member-id)) - (eq? member-id bank-varsym))) + (eq? member-id bank-varsym)) ;; Merges bank account statement into members payment keys. The ;; payment key will be a list of transactions.