diff --git a/pages/banking/statements/[mode]/[[id]].vue b/pages/banking/statements/[mode]/[[id]].vue index 7e2cbaa..bcd0856 100644 --- a/pages/banking/statements/[mode]/[[id]].vue +++ b/pages/banking/statements/[mode]/[[id]].vue @@ -71,7 +71,8 @@ const setup = async () => { allocatedIncomingInvoices.value = incominginvoices.filter(i => i.statementallocations.find(x => x.bs_id === itemInfo.value.id)) console.log(allocatedDocuments.value) console.log(allocatedIncomingInvoices.value) - openIncomingInvoices.value = (await useSupabaseSelect("incominginvoices","*, statementallocations(*), vendor(*)")).filter(i => i.statementallocations.length === 0 ) + //openIncomingInvoices.value = (await useSupabaseSelect("incominginvoices","*, statementallocations(*), vendor(*)")).filter(i => i.statementallocations.length === 0 ) + openIncomingInvoices.value = (await useSupabaseSelect("incominginvoices","*, statementallocations(*), vendor(*)")).filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== getInvoiceSum(i,false)) //console.log(openIncomingInvoices.value) // return incominginvoices.value.filter(i => bankstatements.value.filter(x => x.assignments.find(y => y.type === 'incomingInvoice' && y.id === i.id)).length === 0) @@ -92,7 +93,8 @@ const separateIBAN = (input = "") => { return separates.join(" ") } -const getInvoiceSum = (invoice) => { +const getInvoiceSum = (invoice, onlyOpenSum) => { + console.log(invoice) let sum = 0 invoice.accounts.forEach(account => { sum += account.amountTax @@ -100,6 +102,8 @@ const getInvoiceSum = (invoice) => { }) console.log(sum) + if(onlyOpenSum) sum = sum + Number(invoice.statementallocations.reduce((n,{amount}) => n + amount, 0)) + if(invoice.expense) { return (sum * -1).toFixed(2) } else { @@ -425,7 +429,7 @@ const archiveStatement = async () => { >