From 8302b00a9c1df72a528e29e9d18afefbb8dd0bcf Mon Sep 17 00:00:00 2001 From: florianfederspiel Date: Sun, 7 Sep 2025 19:39:14 +0200 Subject: [PATCH] Corrected displayIncomeAndExpenditure.vue displayOpenBalances.vue --- components/displayIncomeAndExpenditure.vue | 4 ++-- components/displayOpenBalances.vue | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/components/displayIncomeAndExpenditure.vue b/components/displayIncomeAndExpenditure.vue index 97f2b96..cfd55c2 100644 --- a/components/displayIncomeAndExpenditure.vue +++ b/components/displayIncomeAndExpenditure.vue @@ -10,7 +10,7 @@ let expenseData = ref({}) const setup = async () => { //let incomeRawData = (await supabase.from("createddocuments").select().eq("tenant",profileStore.currentTenant).eq("state","Gebucht").in('type',['invoices','advanceInvoices','cancellationInvoices'])).data let incomeRawData = (await useEntities("createddocuments").select()).filter(i => i.state === "Gebucht" && ['invoices','advanceInvoices','cancellationInvoices'].includes(i.type)) - console.log(incomeRawData) + let incomeRawFilteredData = incomeRawData.filter(x => x.state === 'Gebucht' && incomeRawData.find(i => i.linkedDocument && i.linkedDocument.id === x.id && i.type === 'cancellationInvoices') && ['invoices','advanceInvoices'].includes(row.type)) @@ -86,7 +86,7 @@ const setup = async () => { } Object.keys(expenseMonths).forEach(month => { let dates = Object.keys(expenseData.value).filter(i => i.split("-")[1] === month && i.split("-")[2] === dayjs().format("YY")) - console.log(dates) + dates.forEach(date => { diff --git a/components/displayOpenBalances.vue b/components/displayOpenBalances.vue index 8fca1d8..e0e6a11 100644 --- a/components/displayOpenBalances.vue +++ b/components/displayOpenBalances.vue @@ -24,11 +24,9 @@ const setupPage = async () => { 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(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 @@ -44,7 +42,7 @@ const setupPage = async () => { }) draftInvoicesCount.value = draftDocuments.length - countPreparedOpenIncomingInvoices.value = (await supabase.from("incominginvoices").select("id").eq("tenant",profileStore.currentTenant).eq("state", "Vorbereitet")).data.length + countPreparedOpenIncomingInvoices.value = (await useEntities("incominginvoices").select("id, state")).filter(i => i.state === "Vorbereitet").length }