Merge branch 'devCorrected' into 'beta'

Fixed Createddocuments in Projects

See merge request fedeo/software!6

components/EntityShowSubCreatedDocuments.vue

@@ -181,7 +181,7 @@ const selectItem = (item) => {
       <UButton
           @click="showFinalInvoiceConfig = true"
           v-if="props.topLevelType === 'projects'"
-          :disabled="!props.item.createddocuments.filter(i => !i.archived && i.type === 'advanceInvoices').length > 0"
+          :disabled="!props.item.createddocuments?.filter(i => !i.archived && i.type === 'advanceInvoices').length > 0"
       >
         + Schlussrechnung
       </UButton>

pages/createDocument/edit/[[id]].vue

@@ -202,7 +202,8 @@ const setupPage = async () => {
         }
 
       } else if (route.query.loadMode === "finalInvoice") {
-        let linkedDocuments = (await supabase.from("createddocuments").select().in("id", JSON.parse(route.query.linkedDocuments))).data
+        let linkedDocuments = (await useEntities("createddocuments").select()).filter(i => JSON.parse(route.query.linkedDocuments).includes(i.id))
+        //let linkedDocuments = (await supabase.from("createddocuments").select().in("id", JSON.parse(route.query.linkedDocuments))).data
 
         //TODO: Implement Checking for Same Customer, Contact and Project
 

pages/support/create.vue

@@ -33,7 +33,7 @@ const createTicket = async () => {
       console.log(messageError)
     } else {
       console.log(ticketData)
-      useFunctions().useSendTelegramNotification(`Ticket von ${profileStore.activeProfile.fullName} erstellt : ${itemInfo.value.content}`)
+      //useFunctions().useSendTelegramNotification(`Ticket von ${profileStore.activeProfile.fullName} erstellt : ${itemInfo.value.content}`)
       router.push(`/support/${ticketData.id}`)
     }
   }