From cdc720a511ca54a775c7494ed83148bdb8880451 Mon Sep 17 00:00:00 2001 From: dankl Date: Mon, 13 Jan 2020 00:06:57 +0100 Subject: [PATCH] Adjusted property order and added balance --- .../net/dankito/banking/ui/model/AccountTransaction.kt | 7 ++++--- .../net/dankito/banking/mapper/fints4javaModelMapper.kt | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/AccountTransaction.kt b/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/AccountTransaction.kt index 25806690..ec082513 100644 --- a/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/AccountTransaction.kt +++ b/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/AccountTransaction.kt @@ -7,18 +7,19 @@ import java.util.* open class AccountTransaction( val amount: BigDecimal, - val currency: String, - val usage: String, val bookingDate: Date, + val usage: String, val otherPartyName: String?, val otherPartyBankCode: String?, val otherPartyAccountId: String?, val bookingText: String?, + val balance: BigDecimal?, + val currency: String, val bankAccount: BankAccount ) { // for object deserializers - internal constructor() : this(0.toBigDecimal(),"", "", Date(), null, null, null, null, BankAccount()) + internal constructor() : this(BigDecimal.ZERO, Date(),"", null, null, null, null, BigDecimal.ZERO, "", BankAccount()) val showOtherPartyName: Boolean diff --git a/fints4javaBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt b/fints4javaBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt index d49b748f..3f64a02d 100644 --- a/fints4javaBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt +++ b/fints4javaBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt @@ -104,13 +104,14 @@ open class fints4javaModelMapper { open fun mapTransaction(bankAccount: BankAccount, transaction: net.dankito.fints.model.AccountTransaction): AccountTransaction { return AccountTransaction( transaction.amount, - transaction.currency, - transaction.usage, transaction.bookingDate, + transaction.usage, transaction.otherPartyName, transaction.otherPartyBankCode, transaction.otherPartyAccountId, transaction.bookingText, + transaction.closingBalance, + transaction.currency, bankAccount ) }