diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 4975eba..d93a123 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -36,6 +36,7 @@ const itemInfo = ref({
deliveryDateType: "Lieferdatum",
dateOfPerformance: null,
paymentDays: auth.activeTenantData.standardPaymentDays,
+ payment_type: "transfer",
customSurchargePercentage: 0,
createdBy: auth.user.id,
title: null,
@@ -295,6 +296,7 @@ const setupPage = async () => {
if (optionsToImport.deliveryDateEnd) itemInfo.value.deliveryDateEnd = linkedDocument.deliveryDateEnd
if (optionsToImport.documentDate) itemInfo.value.documentDate = linkedDocument.documentDate
if (optionsToImport.paymentDays) itemInfo.value.paymentDays = linkedDocument.paymentDays
+ if (optionsToImport.payment_type) itemInfo.value.payment_type = linkedDocument.payment_type
if (optionsToImport.customSurchargePercentage) itemInfo.value.customSurchargePercentage = linkedDocument.customSurchargePercentage
if (optionsToImport.contactPerson) itemInfo.value.contactPerson = linkedDocument.contactPerson
if (optionsToImport.plant) itemInfo.value.plant = linkedDocument.plant
@@ -320,6 +322,7 @@ const setupPage = async () => {
itemInfo.value.deliveryDateEnd = linkedDocument.deliveryDateEnd
itemInfo.value.documentDate = linkedDocument.documentDate
itemInfo.value.paymentDays = linkedDocument.paymentDays
+ itemInfo.value.payment_type = linkedDocument.payment_type
itemInfo.value.customSurchargePercentage = linkedDocument.customSurchargePercentage
itemInfo.value.contactPerson = linkedDocument.contactPerson
itemInfo.value.plant = linkedDocument.plant
@@ -460,6 +463,7 @@ const setCustomerData = async (customerId, loadOnlyAdress = false) => {
itemInfo.value.address.special = customer.infoData.special
if (!loadOnlyAdress && customer.customPaymentDays) itemInfo.value.paymentDays = customer.customPaymentDays
+ if (!loadOnlyAdress && customer.custom_payment_type) itemInfo.value.payment_type = customer.custom_payment_type
if (!loadOnlyAdress && customer.customSurchargePercentage) {
itemInfo.value.customSurchargePercentage = customer.customSurchargePercentage
@@ -1054,6 +1058,7 @@ const getDocumentData = async () => {
nachname: (contactData && contactData.lastName) || (customerData && customerData.lastname),
kundenname: customerData && customerData.name,
zahlungsziel_in_tagen: itemInfo.paymentDays,
+ zahlungsart: itemInfo.payment_type === "transfer" ? "Überweisung" : "Lastschrift",
diesel_gesamtverbrauch: (itemInfo.agriculture && itemInfo.agriculture.dieselUsageTotal) && itemInfo.agriculture.dieselUsageTotal
}
}
@@ -1257,6 +1262,7 @@ const saveSerialInvoice = async () => {
address: itemInfo.value.address,
project: itemInfo.value.project,
paymentDays: itemInfo.value.paymentDays,
+ payment_type: itemInfo.value.payment_type,
deliveryDateType: "Leistungszeitraum",
createdBy: itemInfo.value.createdBy,
title: itemInfo.value.title,
@@ -1344,6 +1350,7 @@ const saveDocument = async (state, resetup = false) => {
deliveryDate: itemInfo.value.deliveryDate,
deliveryDateEnd: itemInfo.value.deliveryDateEnd,
paymentDays: itemInfo.value.paymentDays,
+ payment_type: itemInfo.value.payment_type,
deliveryDateType: itemInfo.value.deliveryDateType,
info: {},
createdBy: itemInfo.value.createdBy,
@@ -1950,6 +1957,29 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
v-model="itemInfo.paymentDays"
/>
+
+
+
+ {{itemInfo.payment_type === 'transfer' ? "Überweisung" : "SEPA-Lastschrift"}}
+
+
+
{
inputType: "number",
inputColumn: "Allgemeines",
sortable: true
+ },{
+ key: "custom_payment_type",
+ label: "Zahlungsart",
+ inputType: "select",
+ selectValueAttribute:"key",
+ selectOptionAttribute: "label",
+ selectManualOptions: [
+ {label:'Überweisung', key: 'transfer'},
+ {label:'SEPA Lastschrift', key: 'direct-debit'},
+ ],
+ inputColumn: "Allgemeines",
+ sortable: true
}, {
key: "customSurchargePercentage",
label: "Individueller Aufschlag",