diff --git a/components/HelpSlideover.vue b/components/HelpSlideover.vue index 3b8d40c..63a2f38 100644 --- a/components/HelpSlideover.vue +++ b/components/HelpSlideover.vue @@ -105,14 +105,12 @@ const contactRequestData = ref({ title: "", }) +const loadingContactRequest = ref(false) + const addContactRequest = async () => { console.log("ADD") - const retVal = await useFunctions().useCreateTicket({ - subject: contactRequestData.value.title, - message: contactRequestData.value.message, - url: router.currentRoute.value.fullPath, - source: "helpSlideover", - }) + loadingContactRequest.value = true + const retVal = await useFunctions().useCreateTicket(contactRequestData.value.title,contactRequestData.value.message,router.currentRoute.value.fullPath,"helpSlideover",) if(retVal) { toast.add({title: "Anfrage erfolgreich erstellt"}) @@ -120,6 +118,7 @@ const addContactRequest = async () => { } else { toast.add({title: "Anfrage konnte nicht erstellt werden",color:"rose"}) } + loadingContactRequest.value = false } const resetContactRequest = () => { @@ -169,7 +168,7 @@ const resetContactRequest = () => {
-
+

Kontaktanfrage:

{
+ \ No newline at end of file diff --git a/composables/useFunctions.js b/composables/useFunctions.js index a4ae94b..07f956b 100644 --- a/composables/useFunctions.js +++ b/composables/useFunctions.js @@ -1,7 +1,7 @@ import axios from "axios"; import dayjs from "dayjs"; -const baseURL = "https://functions.fedeo.io" +const baseURL = "http://localhost:3333" /*"https://functions.fedeo.io"*/ export const useFunctions = () => { const supabase = useSupabaseClient() @@ -59,5 +59,55 @@ export const useFunctions = () => { } - return {getWorkingTimesEvaluationData, useNextNumber, useCreateTicket} + const useBankingGenerateLink = async (institutionId) => { + const {data:{session:{access_token}}} = await supabase.auth.getSession() + + const {data} = await axios({ + method: "POST", + url: `${baseURL}/functions/bankstatements/generatelink`, + data: { + institutionId + }, + headers: { + Authorization: `Bearer ${access_token}` + } + }) + + console.log(data) + + return data.link + + } + + const useBankingCheckInstitutions = async (bic) => { + const {data:{session:{access_token}}} = await supabase.auth.getSession() + + const {data} = await axios({ + method: "GET", + url: `${baseURL}/functions/bankstatements/checkinstitutions/${bic}`, + headers: { + Authorization: `Bearer ${access_token}` + } + }) + + return data + + } + + const useBankingListRequisitions = async (reqId) => { + const {data:{session:{access_token}}} = await supabase.auth.getSession() + + const {data} = await axios({ + method: "GET", + url: `${baseURL}/functions/bankstatements/listrequisitions/${reqId}`, + headers: { + Authorization: `Bearer ${access_token}` + } + }) + + return data + + } + + return {getWorkingTimesEvaluationData, useNextNumber, useCreateTicket, useBankingGenerateLink, useBankingCheckInstitutions, useBankingListRequisitions} } \ No newline at end of file diff --git a/pages/banking/statements/[mode]/[[id]].vue b/pages/banking/statements/[mode]/[[id]].vue index cea4294..378abf9 100644 --- a/pages/banking/statements/[mode]/[[id]].vue +++ b/pages/banking/statements/[mode]/[[id]].vue @@ -27,6 +27,8 @@ const openDocuments = ref([]) const allocatedDocuments = ref([]) const openIncomingInvoices = ref([]) +const accounts = ref([]) + const setup = async () => { if(route.params.id) { itemInfo.value = (await supabase.from("bankstatements").select("*, statementallocations(*)").eq("id",route.params.id).single()).data //dataStore.bankstatements.find(i => i.id === Number(route.params.id)) @@ -35,6 +37,8 @@ const setup = async () => { const documents = (await useSupabaseSelect("createddocuments","*, statementallocations(*), customer(id,name)")).filter(i => i.type === "invoices" ||i.type === "advanceInvoices") + accounts.value = (await supabase.from("accounts").select()).data + openDocuments.value = documents.filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== getDocumentSum(i).toFixed(2)) openDocuments.value = openDocuments.value.map(i => { @@ -99,6 +103,8 @@ const calculateOpenSum = computed(() => { startingAmount = startingAmount - item.amount } else if(item.ii_id) { startingAmount = Number(startingAmount) + item.amount + }else if(item.account) { + startingAmount = Number(startingAmount) - item.amount } }) @@ -298,7 +304,7 @@ setup() - Verknüpfte Dokumente: + Buchungen: {{dataStore.getVendorById(dataStore.getIncomingInvoiceById(item.ii_id).vendor).name}} - {{dataStore.getIncomingInvoiceById(item.ii_id).reference}} + + Buchungskonto: {{accounts.find(i => i.id === item.account).number}} {{accounts.find(i => i.id === item.account).label}} + + + + Als DP markieren + +