Added Title Transfer Sums
This commit is contained in:
@@ -734,17 +734,29 @@ const documentTotal = computed(() => {
|
|||||||
//Title Sum
|
//Title Sum
|
||||||
|
|
||||||
let titleSums = {}
|
let titleSums = {}
|
||||||
|
let titleSumsTransfer = {}
|
||||||
let lastTitle = ""
|
let lastTitle = ""
|
||||||
|
let transferCounter = 0
|
||||||
|
|
||||||
itemInfo.value.rows.forEach(row => {
|
itemInfo.value.rows.forEach(row => {
|
||||||
if(row.mode === 'title'){
|
if(row.mode === 'title'){
|
||||||
titleSums[`${row.pos} - ${row.text}`] = 0
|
let title = `${row.pos} - ${row.text}`
|
||||||
lastTitle = `${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){
|
} 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) )
|
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 {
|
return {
|
||||||
titleSums: titleSums,
|
titleSums: titleSums,
|
||||||
|
titleSumsTransfer: titleSumsTransfer,
|
||||||
totalNet: totalNet,
|
totalNet: totalNet,
|
||||||
total19: total19,
|
total19: total19,
|
||||||
totalNet19: totalNet19,
|
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(returnTitleSums)
|
||||||
|
console.log(returnTitleSumsTransfer)
|
||||||
|
|
||||||
|
|
||||||
const returnData = {
|
const returnData = {
|
||||||
@@ -1131,7 +1152,8 @@ const getDocumentData = () => {
|
|||||||
totalGross: renderCurrency(documentTotal.value.totalGross),
|
totalGross: renderCurrency(documentTotal.value.totalGross),
|
||||||
totalGrossAlreadyPaid: renderCurrency(documentTotal.value.totalGrossAlreadyPaid),
|
totalGrossAlreadyPaid: renderCurrency(documentTotal.value.totalGrossAlreadyPaid),
|
||||||
totalSumToPay: renderCurrency(documentTotal.value.totalSumToPay),
|
totalSumToPay: renderCurrency(documentTotal.value.totalSumToPay),
|
||||||
titleSums: returnTitleSums
|
titleSums: returnTitleSums,
|
||||||
|
titleSumsTransfer: returnTitleSumsTransfer
|
||||||
},
|
},
|
||||||
agriculture: itemInfo.value.agriculture,
|
agriculture: itemInfo.value.agriculture,
|
||||||
usedAdvanceInvoices: itemInfo.value.usedAdvanceInvoices.map(i => {
|
usedAdvanceInvoices: itemInfo.value.usedAdvanceInvoices.map(i => {
|
||||||
|
|||||||
Reference in New Issue
Block a user