codinux
/
Bankmeister
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Showing also transaction (direct debit) details

This commit is contained in:
dankito 2024-09-18 00:19:22 +02:00
parent 372a259f8b
commit d98a77bc1d
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composeApp/src/commonMain/kotlin/net/codinux/banking/ui/forms/SectionHeader.kt
View File

@ -22,7 +22,7 @@ fun SectionHeader(title: String, topPadding: Boolean = true) {
} }
}, },
color = Colors.CodinuxSecondaryColor, color = Colors.CodinuxSecondaryColor,
fontSize = 15.sp fontSize = 16.sp
) )
} }

48
composeApp/src/commonMain/kotlin/net/codinux/banking/ui/screens/AccountTransactionDetailsScreen.kt
View File

@ -26,6 +26,14 @@ fun AccountTransactionDetailsScreen(transaction: AccountTransactionEntity, onClo
val showColoredAmounts = DI.uiSettings.showColoredAmounts.collectAsState() val showColoredAmounts = DI.uiSettings.showColoredAmounts.collectAsState()
val hasDetailedValues = transaction.customerReference != null ||
transaction.endToEndReference != null || transaction.mandateReference != null
|| transaction.creditorIdentifier != null || transaction.originatorsIdentificationCode != null
|| transaction.compensationAmount != null || transaction.originalAmount != null
|| transaction.deviantOriginator != null || transaction.deviantRecipient != null
|| transaction.referenceWithNoSpecialType != null
|| transaction.journalNumber != null || transaction.textKeyAddition != null
FullscreenViewBase("Umsatzdetails", onClosed = onClosed) { FullscreenViewBase("Umsatzdetails", onClosed = onClosed) {
SelectionContainer { SelectionContainer {
@ -41,16 +49,16 @@ fun AccountTransactionDetailsScreen(transaction: AccountTransactionEntity, onClo
LabelledValue("IBAN", transaction.otherPartyAccountId ?: "") LabelledValue("IBAN", transaction.otherPartyAccountId ?: "")
} }
Column(Modifier.fillMaxWidth().padding(top = 8.dp)) { Column(Modifier.fillMaxWidth()) {
SectionHeader("Betrag, Datum und Verwendungszweck")
LabelledValue("Betrag", formatUtil.formatAmount(transaction.amount, transaction.currency), LabelledValue("Betrag", formatUtil.formatAmount(transaction.amount, transaction.currency),
formatUtil.getColorForAmount(transaction.amount, showColoredAmounts.value)) formatUtil.getColorForAmount(transaction.amount, showColoredAmounts.value))
LabelledValue("Verwendungszweck", transaction.reference ?: "")
}
Column(Modifier.fillMaxWidth().padding(top = 24.dp)) {
LabelledValue("Buchungstext", transaction.postingText ?: "") LabelledValue("Buchungstext", transaction.postingText ?: "")
LabelledValue("Verwendungszweck", transaction.reference ?: "")
LabelledValue("Buchungsdatum", formatUtil.formatDate(transaction.bookingDate)) LabelledValue("Buchungsdatum", formatUtil.formatDate(transaction.bookingDate))
LabelledValue("Wertstellungsdatum", formatUtil.formatDate(transaction.valueDate)) LabelledValue("Wertstellungsdatum", formatUtil.formatDate(transaction.valueDate))
@ -63,6 +71,36 @@ fun AccountTransactionDetailsScreen(transaction: AccountTransactionEntity, onClo
LabelledValue("Tagesendsaldo", formatUtil.formatAmount(it, accountCurrency)) LabelledValue("Tagesendsaldo", formatUtil.formatAmount(it, accountCurrency))
} }
} }
if (hasDetailedValues) {
Column(Modifier.fillMaxWidth()) {
SectionHeader("(Lastschrift-)Details")
LabelledValue("Kundenreferenz", transaction.customerReference)
LabelledValue("Bankreferenz", transaction.bankReference)
LabelledValue("Währungsart und Umsatzbetrag in Ursprungswährung", transaction.furtherInformation)
LabelledValue("Ende-zu-Ende Referenz", transaction.endToEndReference)
LabelledValue("Mandatsreferenz", transaction.mandateReference)
LabelledValue("Gläubiger-Identifikationsnummer", transaction.creditorIdentifier)
LabelledValue("Kennung des Auftraggebers", transaction.originatorsIdentificationCode)
LabelledValue("Betrag der ursprünglichen Lastschrift", transaction.originalAmount)
LabelledValue("Rücklastschrift Auslagenersatz und Bearbeitungsprovision", transaction.compensationAmount)
LabelledValue("Abweichender Überweisender oder Zahlungsempfänger", transaction.deviantOriginator)
LabelledValue("Abweichender Zahlungsempfänger oder Zahlungspflichtiger", transaction.deviantRecipient)
LabelledValue("Verwendungszweck ohne spezielle Bedeutung", transaction.referenceWithNoSpecialType)
LabelledValue("Auszugsnummer", transaction.statementNumber?.toString())
LabelledValue("Blattnummer", transaction.sheetNumber?.toString())
LabelledValue("Primanoten-Nr.", transaction.journalNumber)
// LabelledValue("Kundenreferenz", transaction.textKeyAddition)
LabelledValue("Referenznummer", transaction.orderReferenceNumber)
LabelledValue("Bezugsreferenz", transaction.referenceNumber)
}
}
} }
} }
} }