From 3ac8b63164c574760c6fc1141662724d81e01958 Mon Sep 17 00:00:00 2001 From: florianfederspiel Date: Sat, 8 Nov 2025 18:53:48 +0100 Subject: [PATCH] Redone Banksettings --- components/MainNav.vue | 3 +-- pages/banking/statements/[mode]/[[id]].vue | 6 +++--- pages/settings/banking/index.vue | 12 ++++++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/components/MainNav.vue b/components/MainNav.vue index 16e7476..d8e0579 100644 --- a/components/MainNav.vue +++ b/components/MainNav.vue @@ -305,8 +305,7 @@ const links = computed(() => { },{ label: "Bankkonten", to: "/settings/banking", - icon: "i-heroicons-currency-euro", - disabled: true + icon: "i-heroicons-currency-euro" },{ label: "Textvorlagen", to: "/settings/texttemplates", diff --git a/pages/banking/statements/[mode]/[[id]].vue b/pages/banking/statements/[mode]/[[id]].vue index b23655f..37f5db9 100644 --- a/pages/banking/statements/[mode]/[[id]].vue +++ b/pages/banking/statements/[mode]/[[id]].vue @@ -69,7 +69,7 @@ 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 useEntities("incominginvoices").select("*, statementallocations(*), vendor(*)")).filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== getInvoiceSum(i,false)) + openIncomingInvoices.value = (await useEntities("incominginvoices").select("*, statementallocations(*), vendor(*)")).filter(i => !i.archived && 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) @@ -181,14 +181,14 @@ const searchString = ref("") const filteredDocuments = computed(() => { - return useSearch(searchString.value, openDocuments.value) + return useSearch(searchString.value, openDocuments.value.filter(i => i.state === "Gebucht")) }) const filteredIncomingInvoices = computed(() => { - return useSearch(searchString.value, openIncomingInvoices.value) + return useSearch(searchString.value, openIncomingInvoices.value.filter(i => i.state === "Gebucht")) }) diff --git a/pages/settings/banking/index.vue b/pages/settings/banking/index.vue index 1d18001..94eba51 100644 --- a/pages/settings/banking/index.vue +++ b/pages/settings/banking/index.vue @@ -20,7 +20,7 @@ const setupPage = async () => { reqData.value = await useFunctions().useBankingListRequisitions(route.query.ref) } - bankaccounts.value = await useSupabaseSelect("bankaccounts") + bankaccounts.value = await useEntities("bankaccounts").select() } const checkBIC = async () => { @@ -61,11 +61,15 @@ const addAccount = async (account) => { } const updateAccount = async (account) => { - const {data,error} = await supabase.from("bankaccounts").update({accountId: account.id, expired: false}).eq("iban",account.iban).select() - if(error) { + + let bankaccountId = bankaccounts.value.find(i => i.iban === account.iban).id + + const res = await useEntities("bankaccounts").update(bankaccountId, {accountId: account.id, expired: false}) + + if(!res) { console.log(error) toast.add({title: "Es gab einen Fehler bei aktualisieren des Accounts", color:"rose"}) - } else if(data) { + } else { toast.add({title: "Account erfolgreich aktualisiert"}) setupPage() }