From b00139bd893aaa9ec10340d6955628e71e232b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?=
 <dominik.pantucek@trustica.cz>
Date: Fri, 7 Apr 2023 23:21:06 +0200
Subject: [PATCH] Parse account and bank code for incoming payments.

---
 src/bank-account.scm  | 4 +++-
 src/bank-fio.scm      | 7 +++++--
 src/members-print.scm | 4 +++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/bank-account.scm b/src/bank-account.scm
index 9bbf95f..c5e8b39 100644
--- a/src/bank-account.scm
+++ b/src/bank-account.scm
@@ -42,6 +42,8 @@
   bank-transaction-id
   bank-transaction-message
   bank-transaction-type
+  bank-transaction-account
+  bank-transaction-bank
   )
 
  (import scheme
@@ -70,7 +72,7 @@
 	 (cdr account)))
 
  ;; Creates a new bank transaction.
- (define-record bank-transaction id date amount currency varsym message type)
+ (define-record bank-transaction id date amount currency varsym message type account bank)
 
  (set-record-printer! bank-transaction
 		      (lambda (tr out)
diff --git a/src/bank-fio.scm b/src/bank-fio.scm
index 3295f31..d4cc06a 100644
--- a/src/bank-fio.scm
+++ b/src/bank-fio.scm
@@ -56,8 +56,11 @@
 	 (currency (string->symbol (cadddr row)))
 	 (varsym (list-ref row 9))
 	 (message (list-ref row 12))
-	 (type (list-ref row 13)))
-     (make-bank-transaction id date amount currency varsym message type)))
+	 (type (list-ref row 13))
+	 (bank (list-ref row 6))
+	 (account (list-ref row 4)))
+     (make-bank-transaction id date amount currency varsym message type
+			    account bank)))
 
  ;; Loads Fio bank accound statement.
  (define (bank-fio-parse fn)
diff --git a/src/members-print.scm b/src/members-print.scm
index 9642116..f89efc1 100644
--- a/src/members-print.scm
+++ b/src/members-print.scm
@@ -440,7 +440,7 @@
    (print
     (table->string
      (cons
-      (list "Id" "Date" "Amount" "" "VS" "Type" "Message")
+      (list "Id" "Date" "Amount" "" "VS" "Type" "Message" "Account" "Bank")
       (map
        (lambda (tr)
 	 (list (bank-transaction-id tr)
@@ -450,6 +450,8 @@
 	       (sprintf "\t~A" (bank-transaction-varsym tr))
 	       (bank-transaction-type tr)
 	       (bank-transaction-message tr)
+	       (bank-transaction-account tr)
+	       (bank-transaction-bank tr)
 	       ))
        (members-base-unpaired mb)))
      #:row0-border #t