diff --git a/components/displayIncomeAndExpenditure.vue b/components/displayIncomeAndExpenditure.vue index ac30d7f..d71d9c5 100644 --- a/components/displayIncomeAndExpenditure.vue +++ b/components/displayIncomeAndExpenditure.vue @@ -12,7 +12,11 @@ let incomeData = ref({}) let expenseData = ref({}) const setup = async () => { - let incomeRawData = (await supabase.from("createddocuments").select().eq("tenant",profileStore.currentTenant).in('type',['invoices','cancellationInvoices'])).data + let incomeRawData = (await supabase.from("createddocuments").select().eq("tenant",profileStore.currentTenant).eq("state","Gebucht").in('type',['invoices','advanceInvoices','cancellationInvoices'])).data + 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)) + + let expenseRawData =(await supabase.from("incominginvoices").select().eq("tenant",profileStore.currentTenant)).data let withoutInvoiceRawData = (await supabase.from("statementallocations").select().eq("tenant",profileStore.currentTenant).not("account","is",null)).data