From 841bb67d6074f30266576137aac437bbc9bc5d49 Mon Sep 17 00:00:00 2001 From: florianfederspiel Date: Thu, 31 Jul 2025 20:38:30 +0200 Subject: [PATCH] Added Title Transfer Sums --- pages/createDocument/edit/[[id]].vue | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue index fae2c18..1622a2c 100644 --- a/pages/createDocument/edit/[[id]].vue +++ b/pages/createDocument/edit/[[id]].vue @@ -734,17 +734,29 @@ const documentTotal = computed(() => { //Title Sum let titleSums = {} + let titleSumsTransfer = {} let lastTitle = "" + let transferCounter = 0 itemInfo.value.rows.forEach(row => { if(row.mode === 'title'){ - titleSums[`${row.pos} - ${row.text}`] = 0 - lastTitle = `${row.pos} - ${row.text}` + let title = `${row.pos} - ${row.text}` + titleSums[title] = 0 + lastTitle = title + + //Übertrag berechnen + titleSumsTransfer[Object.keys(titleSums)[row.pos-2]] = transferCounter + + } else if(!['pagebreak','text'].includes(row.mode) && lastTitle !== "" && !row.optional && !row.alternative){ titleSums[lastTitle] = Number(titleSums[lastTitle]) + Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) /100) ) + transferCounter += Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) /100) ) + console.log(transferCounter) } }) + console.log(titleSumsTransfer) + @@ -783,6 +795,7 @@ const documentTotal = computed(() => { return { titleSums: titleSums, + titleSumsTransfer: titleSumsTransfer, totalNet: totalNet, total19: total19, totalNet19: totalNet19, @@ -1019,7 +1032,15 @@ const getDocumentData = () => { }) } + let returnTitleSumsTransfer = {} + if(Object.keys(documentTotal.value.titleSumsTransfer).length > 0) { + Object.keys(documentTotal.value.titleSumsTransfer).forEach(key => { + returnTitleSumsTransfer[key] = renderCurrency(documentTotal.value.titleSumsTransfer[key]) + }) + } + console.log(returnTitleSums) + console.log(returnTitleSumsTransfer) const returnData = { @@ -1131,7 +1152,8 @@ const getDocumentData = () => { totalGross: renderCurrency(documentTotal.value.totalGross), totalGrossAlreadyPaid: renderCurrency(documentTotal.value.totalGrossAlreadyPaid), totalSumToPay: renderCurrency(documentTotal.value.totalSumToPay), - titleSums: returnTitleSums + titleSums: returnTitleSums, + titleSumsTransfer: returnTitleSumsTransfer }, agriculture: itemInfo.value.agriculture, usedAdvanceInvoices: itemInfo.value.usedAdvanceInvoices.map(i => {