diff --git a/components/HelpSlideover.vue b/components/HelpSlideover.vue index 63a2f38..1693232 100644 --- a/components/HelpSlideover.vue +++ b/components/HelpSlideover.vue @@ -201,6 +201,7 @@ const resetContactRequest = () => { Senden @@ -208,6 +209,7 @@ const resetContactRequest = () => { type="reset" color="rose" variant="outline" + :disabled="!contactRequestData.title && !contactRequestData.message" > Zurücksetzen diff --git a/components/columnRenderings/phase.vue b/components/columnRenderings/phase.vue new file mode 100644 index 0000000..20d14bd --- /dev/null +++ b/components/columnRenderings/phase.vue @@ -0,0 +1,14 @@ + + + diff --git a/components/displayOpenBalances.vue b/components/displayOpenBalances.vue index 0e3f3ac..0ba1943 100644 --- a/components/displayOpenBalances.vue +++ b/components/displayOpenBalances.vue @@ -6,18 +6,16 @@ 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").filter(i => !i.archived) + let documents = (await useSupabaseSelect("createddocuments","*, statementallocations(*), customer(id,name)")).filter(i => i.type === "invoices" ||i.type === "advanceInvoices"||i.type === "cancellationInvoices").filter(i => !i.archived) let draftDocuments = documents.filter(i => i.state === "Entwurf") let finalizedDocuments = documents.filter(i => i.state === "Gebucht") - console.log(finalizedDocuments) finalizedDocuments = finalizedDocuments.filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== getDocumentSum(i).toFixed(2)) finalizedDocuments.forEach(i => { - console.log(getDocumentSum(i)) unpaidInvoicesSum.value += getDocumentSum(i) - i.statementallocations.reduce((n,{amount}) => n + amount, 0) }) unpaidInvoicesCount.value = finalizedDocuments.length diff --git a/components/displayProjectsInPhases.vue b/components/displayProjectsInPhases.vue new file mode 100644 index 0000000..18491f7 --- /dev/null +++ b/components/displayProjectsInPhases.vue @@ -0,0 +1,43 @@ + + + + + \ No newline at end of file diff --git a/pages/createDocument/show/[id].vue b/pages/createDocument/show/[id].vue index 4b21b4f..b351e42 100644 --- a/pages/createDocument/show/[id].vue +++ b/pages/createDocument/show/[id].vue @@ -68,11 +68,50 @@ const openEmail = () => { :to="dataStore.documents.find(i => i.createdDocument === itemInfo.id) ? dataStore.documents.find(i => i.createdDocument === itemInfo.id).url : ''" target="_blank" >In neuen Tab anzeigen--> - - Übernehmen - + + Angebot + + + + + Auftragsbestätigung + + + + + Lieferschein + + + + + Rechnung + + { @click="router.push(`/createDocument/edit/?linkedDocument=${itemInfo.id}&loadMode=storno`)" variant="outline" color="rose" + v-if="itemInfo.type === 'invoices' || itemInfo.type === 'advanceInvoices'" > Stornieren Projekt + + Kunde + diff --git a/pages/index.vue b/pages/index.vue index cd4d044..7e0346c 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -13,27 +13,33 @@ - + - - + --> + + + diff --git a/stores/data.js b/stores/data.js index fd697b7..1f1190f 100644 --- a/stores/data.js +++ b/stores/data.js @@ -31,6 +31,7 @@ import sellingPriceComposedTotal from "~/components/columnRenderings/sellingPric import startDate from "~/components/columnRenderings/startDate.vue" import endDate from "~/components/columnRenderings/endDate.vue" import serviceCategories from "~/components/columnRenderings/serviceCategories.vue" +import phase from "~/components/columnRenderings/phase.vue" import quantity from "~/components/helpRenderings/quantity.vue" import {useZipCheck} from "~/composables/useZipCheck.js"; @@ -736,7 +737,11 @@ export const useDataStore = defineStore('data', () => { default: true, "filterFunction": function (row) { if(row.phases && row.phases.length > 0) { - return row.phases.find(i => i.active).label !== "Abgeschlossen"; + return row.phases.find(i => i.active).label !== "Abgeschlossen" + + //return phase.label !== "Abgeschlossen"; + + } else { return true } @@ -772,7 +777,8 @@ export const useDataStore = defineStore('data', () => { } },{ key: "phase", - label: "Phase" + label: "Phase", + component: phase },{ key: "name", label: "Name",