diff --git a/app/Domains/CostUnit/Controllers/ExportController.php b/app/Domains/CostUnit/Controllers/ExportController.php index 5d14f4c..d258088 100644 --- a/app/Domains/CostUnit/Controllers/ExportController.php +++ b/app/Domains/CostUnit/Controllers/ExportController.php @@ -93,7 +93,7 @@ class ExportController extends CommonController { 'amount' => $invoice->amount, 'recipient_name' => $invoice->contact_bank_owner, 'recipient_iban' => $invoice->contact_bank_iban, - 'payment_purpose' => $invoice->payment_purpose ?? 'Auslagenerstattung Rechnungsnummer ' . $invoice->invoice_number, + 'payment_purpose' => $invoice->paymentPurposeText(), ]); } } diff --git a/app/Domains/CostUnit/Views/Partials/ListInvoices.vue b/app/Domains/CostUnit/Views/Partials/ListInvoices.vue index 2673fad..2933661 100644 --- a/app/Domains/CostUnit/Views/Partials/ListInvoices.vue +++ b/app/Domains/CostUnit/Views/Partials/ListInvoices.vue @@ -89,12 +89,13 @@
+
+

+ Der Betrag wird nicht ausgezahlt, sondern als Spende gebucht. Die Erstattung wird sofort + eingereicht; der Teili erhält den Beleg per E-Mail. +

+ diff --git a/app/Domains/Invoice/Views/Partials/invoiceDetails/EditInvoice.vue b/app/Domains/Invoice/Views/Partials/invoiceDetails/EditInvoice.vue index 693ff09..de49093 100644 --- a/app/Domains/Invoice/Views/Partials/invoiceDetails/EditInvoice.vue +++ b/app/Domains/Invoice/Views/Partials/invoiceDetails/EditInvoice.vue @@ -16,11 +16,18 @@ const props = defineProps({ const emit = defineEmits(['submit', 'cancel']) +/** + * Die Anmerkung heißt in der Resource `comment` und ist dort `'--'`, wenn keine gesetzt ist -- beides + * muss hier stimmen, sonst startet das Feld leer und das Speichern löscht die vorhandene Anmerkung. + */ +const existingComment = props.newInvoice.comment + const formData = reactive({ type_internal: props.newInvoice.internalType || '', cost_unit: props.newInvoice.costUnitId || '', amount: props.newInvoice.amountPlain || '', - notices: props.newInvoice.comments || '', + purpose: props.newInvoice.purpose || '', + notices: !existingComment || existingComment === '--' ? '' : existingComment, }) const submitForm = () => { @@ -70,6 +77,13 @@ onMounted(async () => { + + Zahlungsgrund: + + + + + Anmerkungen: diff --git a/app/Domains/Invoice/Views/Partials/invoiceDetails/Header.vue b/app/Domains/Invoice/Views/Partials/invoiceDetails/Header.vue index c8d268f..721397e 100644 --- a/app/Domains/Invoice/Views/Partials/invoiceDetails/Header.vue +++ b/app/Domains/Invoice/Views/Partials/invoiceDetails/Header.vue @@ -100,6 +100,10 @@ const emit = defineEmits(["accept", "deny", "fix", "reopen"]) Rechnungszahlung Klassische Auszahlung + + Zahlungsgrund: + {{props.data.purpose}} + Status: {{props.data.readableStatus}} diff --git a/app/Domains/Invoice/Views/Partials/myInvoiceDetails/DistanceAllowance.vue b/app/Domains/Invoice/Views/Partials/myInvoiceDetails/DistanceAllowance.vue index 34fd61f..6bcb6d6 100644 --- a/app/Domains/Invoice/Views/Partials/myInvoiceDetails/DistanceAllowance.vue +++ b/app/Domains/Invoice/Views/Partials/myInvoiceDetails/DistanceAllowance.vue @@ -32,15 +32,6 @@ const props = defineProps({ {{props.invoice.amount}} - - Marterialtransport - {{props.invoice.transportation}} - - - - Hat Personen mitgenommen - {{props.invoice.passengers}} - diff --git a/app/Domains/Invoice/Views/Partials/myInvoiceDetails/ListInvoices.vue b/app/Domains/Invoice/Views/Partials/myInvoiceDetails/ListInvoices.vue index 43c3481..8deae6e 100644 --- a/app/Domains/Invoice/Views/Partials/myInvoiceDetails/ListInvoices.vue +++ b/app/Domains/Invoice/Views/Partials/myInvoiceDetails/ListInvoices.vue @@ -45,12 +45,13 @@