diff --git a/components/displayBankaccounts.vue b/components/displayBankaccounts.vue new file mode 100644 index 0000000..9f18a9f --- /dev/null +++ b/components/displayBankaccounts.vue @@ -0,0 +1,54 @@ + + + + + + + Nicht zugewiesene Bankbuchungen: + + {{unallocatedStatements}} + 0 + + + + {{ account.name }}: + + {{dayjs(account.synced_at).format("DD.MM.YY HH:mm")}} + + + {{useCurrency(account.balance)}} + {{useCurrency(account.balance)}} + + + + + + + \ No newline at end of file diff --git a/components/displayOpenBalances.vue b/components/displayOpenBalances.vue index 2f0fa12..4ab51e7 100644 --- a/components/displayOpenBalances.vue +++ b/components/displayOpenBalances.vue @@ -4,7 +4,6 @@ let unpaidInvoicesSum = ref(0) let unpaidInvoicesCount = ref(0) let draftInvoicesSum = ref(0) let draftInvoicesCount = ref(0) -let unallocatedStatements = 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) @@ -25,33 +24,10 @@ const setupPage = async () => { }) draftInvoicesCount.value = draftDocuments.length - let bankstatements = (await useSupabaseSelect("bankstatements","*, statementallocations(*)","date",true)).filter(i => !i.archived) - unallocatedStatements.value = bankstatements.filter(i => Number(calculateOpenSum(i)) !== 0).length } setupPage() -const calculateOpenSum = (statement) => { - /*let startingAmount = statement.amount || 0 - - statement.statementallocations.forEach(item => { - if(item.cd_id) { - startingAmount = startingAmount - item.amount - } else if(item.ii_id) { - startingAmount = Number(startingAmount) + item.amount - } - }) - - return startingAmount.toFixed(2)*/ - - let startingAmount = 0 - - statement.statementallocations.forEach(item => { - startingAmount += item.amount - }) - - return (statement.amount - startingAmount).toFixed(2) -} @@ -72,13 +48,6 @@ const calculateOpenSum = (statement) => { >{{draftInvoicesCount}} Stk / {{useCurrency(draftInvoicesSum)}} 0 Stk / 0,00€ - - Nicht zugewiesene Bankbuchungen: - - {{unallocatedStatements}} - 0 - - diff --git a/pages/index.vue b/pages/index.vue index 3763bb7..c25855d 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -27,6 +27,12 @@ > + + +