diff --git a/components/displayOpenBalances.vue b/components/displayOpenBalances.vue index cb8c977..a21f401 100644 --- a/components/displayOpenBalances.vue +++ b/components/displayOpenBalances.vue @@ -15,23 +15,26 @@ let draftInvoicesCount = ref(0) let countUnfinishedOpenIncomingInvoices = ref(0) const setupPage = async () => { - let documents = (await useSupabaseSelect("createddocuments","*, statementallocations(*), customer(id,name)")).filter(i => i.type === "invoices" ||i.type === "advanceInvoices"||i.type === "cancellationInvoices").filter(i => !i.archived) + let items = (await useSupabaseSelect("createddocuments","*, statementallocations(*), customer(id,name), linkedDocument(*)")).filter(i => !i.archived) + let documents = items.filter(i => i.type === "invoices" ||i.type === "advanceInvoices") let draftDocuments = documents.filter(i => i.state === "Entwurf") let finalizedDocuments = documents.filter(i => i.state === "Gebucht") finalizedDocuments = finalizedDocuments.filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== useSum().getCreatedDocumentSum(i, documents).toFixed(2)) - if(process.dev) console.log(finalizedDocuments) + finalizedDocuments = finalizedDocuments.filter(x => (x.type === 'invoices' || x.type === 'advanceInvoices') && x.state === 'Gebucht' && !items.find(i => i.linkedDocument && i.linkedDocument.id === x.id)) + + console.log(finalizedDocuments) finalizedDocuments.forEach(i => { - if(process.dev) console.log(i) - if(process.dev) console.log(useSum().getCreatedDocumentSum(i, documents) - i.statementallocations.reduce((n,{amount}) => n + amount, 0)) + //if(process.dev) console.log(i) + //if(process.dev) console.log(useSum().getCreatedDocumentSum(i, documents) - i.statementallocations.reduce((n,{amount}) => n + amount, 0)) if(dayjs().subtract(i.paymentDays,"days").isAfter(i.documentDate)) { unpaidOverdueInvoicesSum.value += useSum().getCreatedDocumentSum(i, documents) - i.statementallocations.reduce((n,{amount}) => n + amount, 0) unpaidOverdueInvoicesCount.value += 1 } else { - unpaidInvoicesSum.value += useSum().getCreatedDocumentSum(i, documents) - i.statementallocations.reduce((n,{amount}) => n + amount, 0) + unpaidInvoicesSum.value += useSum().getCreatedDocumentSum(i, items) - i.statementallocations.reduce((n,{amount}) => n + amount, 0) unpaidInvoicesCount.value += 1 } })