From 7167d6e59c71ab124b99523367ef05e0c94a276c Mon Sep 17 00:00:00 2001 From: dankito Date: Sun, 24 May 2020 16:32:43 +0200 Subject: [PATCH] Remove isReversal --- .../java/net/dankito/banking/ui/model/AccountTransaction.kt | 5 ++--- .../kotlin/net/dankito/banking/mapper/fints4kModelMapper.kt | 1 - .../net/dankito/banking/util/AccountTransactionMapper.kt | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/AccountTransaction.kt b/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/AccountTransaction.kt index 25eaaf26..d7bbdd3d 100644 --- a/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/AccountTransaction.kt +++ b/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/AccountTransaction.kt @@ -12,7 +12,6 @@ open class AccountTransaction( val bankAccount: BankAccount, val amount: BigDecimal, val currency: String, - val isReversal: Boolean, val unparsedUsage: String, val bookingDate: Date, val otherPartyName: String?, @@ -52,12 +51,12 @@ open class AccountTransaction( constructor(bankAccount: BankAccount, amount: BigDecimal, unparsedUsage: String, bookingDate: Date, otherPartyName: String?, otherPartyBankCode: String?, otherPartyAccountId: String?, bookingText: String?, valueDate: Date) - : this(bankAccount, amount, "EUR", false, unparsedUsage, bookingDate, + : this(bankAccount, amount, "EUR", unparsedUsage, bookingDate, otherPartyName, otherPartyBankCode, otherPartyAccountId, bookingText, valueDate, 0, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "", "", null, null, "", null) // for object deserializers - internal constructor() : this(BankAccount(), BigDecimal.ZERO, "", false,"", Date(), null, null, null, null, Date(), 0, null, BigDecimal.ZERO, BigDecimal.ZERO, + internal constructor() : this(BankAccount(), BigDecimal.ZERO, "","", Date(), null, null, null, null, Date(), 0, null, BigDecimal.ZERO, BigDecimal.ZERO, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "", "", null, null, "", null) diff --git a/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4kModelMapper.kt b/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4kModelMapper.kt index d8258d20..86097f6a 100644 --- a/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4kModelMapper.kt +++ b/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4kModelMapper.kt @@ -179,7 +179,6 @@ open class fints4kModelMapper { bankAccount, transaction.amount, transaction.currency, - transaction.isReversal, transaction.unparsedUsage, transaction.bookingDate, transaction.otherPartyName, diff --git a/ui/hbci4jBankingClient/src/main/kotlin/net/dankito/banking/util/AccountTransactionMapper.kt b/ui/hbci4jBankingClient/src/main/kotlin/net/dankito/banking/util/AccountTransactionMapper.kt index 79cb56c6..b98bdf4a 100644 --- a/ui/hbci4jBankingClient/src/main/kotlin/net/dankito/banking/util/AccountTransactionMapper.kt +++ b/ui/hbci4jBankingClient/src/main/kotlin/net/dankito/banking/util/AccountTransactionMapper.kt @@ -44,7 +44,7 @@ open class AccountTransactionMapper { val statementAndMaySequenceNumber = btag.counter.split('/') val result = AccountTransaction(bankAccount, - mapValue(transaction.value), transaction.value.curr, transaction.isStorno, unparsedUsage, transaction.bdate, + mapValue(transaction.value), transaction.value.curr, unparsedUsage, transaction.bdate, transaction.other.name + (transaction.other.name2 ?: ""), transaction.other.bic ?: transaction.other.blz, transaction.other.iban ?: transaction.other.number,