flfeders/FEDEO
2
1
Fork 0
Code Issues 62 Pull Requests Actions Packages Projects 21 Releases Wiki Activity

Revert "Start for Dev Branch"

Browse Source 
This reverts commit acf5d1c2ea
This commit is contained in:
Florian Federspiel
2024-12-20 17:49:24 +00:00
parent acf5d1c2ea
commit 8abfce0fa1
16 changed files with 170 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
pages/createDocument/edit/[[id]].vue
View File

@@ -57,8 +57,7 @@ const itemInfo = ref({
dateDirection: "Rückwirkend",
},
letterhead: null,
agriculture: {},
usedAdvanceInvoices: []
agriculture: {}
})
@@ -72,10 +71,7 @@ const selectedProductcategorie = ref(null)
const services = ref([])
const servicecategories = ref([])
const selectedServicecategorie = ref(null)
const customers = ref([])
const contacts = ref([])
const loaded = ref(false)
const setupPage = async () => {
letterheads.value = (await useSupabaseSelect("letterheads","*")).filter(i => i.documentTypes.length === 0 || i.documentTypes.includes(itemInfo.value.type))
@@ -85,8 +81,6 @@ const setupPage = async () => {
servicecategories.value = (await useSupabaseSelect("servicecategories","*"))
products.value = (await useSupabaseSelect("products","*"))
productcategories.value = (await useSupabaseSelect("productcategories","*"))
customers.value = (await useSupabaseSelect("customers","*","customerNumber"))
contacts.value = (await useSupabaseSelect("contacts","*"))
if(productcategories.value.length > 0) selectedProductcategorie.value = productcategories.value[0].id
if(servicecategories.value.length > 0) selectedServicecategorie.value = servicecategories.value[0].id
@@ -171,33 +165,13 @@ const setupPage = async () => {
}
if(route.query.project) {
itemInfo.value.project = Number(route.query.project)
checkForOpenAdvanceInvoices()
}
if(route.query.project) itemInfo.value.project = Number(route.query.project)
if(route.query.contact) itemInfo.value.contact = Number(route.query.contact)
if(route.query.customer) {
itemInfo.value.customer = Number(route.query.customer)
setCustomerData()
}
}
loaded.value = true
}
const openAdvanceInvoices = ref([])
const checkForOpenAdvanceInvoices = async () => {
const {data,error} = await supabase.from("createddocuments").select().eq("project", itemInfo.value.project).eq("advanceInvoiceResolved", false).eq("type","advanceInvoices")
console.log(data)
openAdvanceInvoices.value = data
}
const addAdvanceInvoiceToInvoice = (advanceInvoice) => {
itemInfo.value.usedAdvanceInvoices.push(advanceInvoice)
}
const setDocumentTypeConfig = (withTexts = false) => {
@@ -227,6 +201,7 @@ const setDocumentTypeConfig = (withTexts = false) => {
const setCustomerData = () => {
let customer = dataStore.getCustomerById(itemInfo.value.customer)
itemInfo.value.contact = null
if(customer) {
@@ -235,8 +210,6 @@ const setCustomerData = () => {
itemInfo.value.address.city = customer.infoData.city
itemInfo.value.address.special = customer.infoData.special
}
}
const setContactPersonData = async () => {
@@ -283,6 +256,8 @@ const importPositions = () => {
}
}
const getRowAmount = (row) => {
return String(Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) /100) ).toFixed(2)).replace('.',',')
}
@@ -357,6 +332,13 @@ const addPosition = (mode) => {
}
const showEditRowDescription = ref(false)
const rowToEdit = ref("")
const removePosition = (id) => {
let rows = itemInfo.value.rows.filter(row => row.id !== id)
/*rows = rows.sort((a,b) => a.pos - b.pos)
@@ -371,15 +353,6 @@ const removePosition = (id) => {
}
const getRowMargin = (row) => {
if(row.mode === "normal" && row.product) {
let purchasePrice = dataStore.getProductById(row.product).purchasePrice || 0
return row.price - purchasePrice
} else {
return 0
}
}
const findDocumentErrors = computed(() => {
let errors = []
@@ -432,7 +405,6 @@ const tabItems = computed(() => {
const renderCurrency = (value, currency = "€") => {
return Number(value).toFixed(2).replace(".",",") + " €"
}
const documentTotal = computed(() => {
let totalNet = 0
let total19 = 0
@@ -440,7 +412,7 @@ const documentTotal = computed(() => {
itemInfo.value.rows.forEach(row => {
if(!['pagebreak','title','text'].includes(row.mode)){
let rowPrice = Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) /100) ).toFixed(3)
let rowPrice = Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) /100) ).toFixed(2)
totalNet = totalNet + Number(rowPrice)
if(row.taxPercent === 19) {
@@ -449,33 +421,11 @@ const documentTotal = computed(() => {
}
})
totalGross = totalNet + total19
let totalGrossAlreadyPaid = 0
itemInfo.value.usedAdvanceInvoices.forEach(advanceInvoiceId => {
let advanceInvoice = openAdvanceInvoices.value.find(i => i.id === advanceInvoiceId)
let priceNet = advanceInvoice.rows.find(i => i.advanceInvoiceData).price
let partSum = priceNet * ((100 + advanceInvoice.rows.find(i => i.advanceInvoiceData).taxPercent) / 100)
totalGrossAlreadyPaid += partSum
})
console.log(totalGrossAlreadyPaid)
let sumToPay = totalGross - totalGrossAlreadyPaid
return {
totalNet: `${String(totalNet.toFixed(2)).replace(".",",")} €`,
total19: `${String(total19.toFixed(2)).replace(".",",")} €`,
totalGross: renderCurrency(totalGross),
totalGrossAlreadyPaid: renderCurrency(totalGrossAlreadyPaid),
totalSumToPay: renderCurrency(sumToPay)
totalGross: `${String(Number(totalNet + total19).toFixed(2)).replace(".",",")} €`
}
@@ -526,6 +476,7 @@ const processDieselPosition = () => {
itemInfo.value.agriculture = {...itemInfo.value.agriculture, ...agricultureData}
}
const getDocumentData = () => {
let customerData = dataStore.getCustomerById(itemInfo.value.customer)
@@ -581,7 +532,6 @@ const getDocumentData = () => {
return {
vorname:contactData && contactData.firstName,
nachname: contactData && contactData.lastName,
kundenname: customerData && customerData.name,
zahlungsziel_in_tagen:itemInfo.paymentDays,
diesel_gesamtverbrauch: (itemInfo.agriculture && itemInfo.agriculture.dieselUsageTotal) && itemInfo.agriculture.dieselUsageTotal
}
@@ -616,10 +566,7 @@ const getDocumentData = () => {
startText: templateStartText(generateContext(itemInfo.value, contactData)),
rows: rows,
total: documentTotal.value,
agriculture: itemInfo.value.agriculture,
usedAdvanceInvoices: itemInfo.value.usedAdvanceInvoices.map(i => {
return openAdvanceInvoices.value.find(x => x.id === i)
})
agriculture: itemInfo.value.agriculture
}
//console.log(returnData)
@@ -627,6 +574,7 @@ const getDocumentData = () => {
return returnData
}
const showDocument = ref(false)
const uri = ref("")
const generateDocument = async () => {
@@ -764,8 +712,7 @@ const saveDocument = async (state) => {
contactPerson: itemInfo.value.contactPerson,
linkedDocument: itemInfo.value.linkedDocument,
agriculture: itemInfo.value.agriculture,
letterhead: itemInfo.value.letterhead,
usedAdvanceInvoices: itemInfo.value.usedAdvanceInvoices
letterhead: itemInfo.value.letterhead
}
if(route.params.id) {
@@ -849,7 +796,7 @@ setupPage()
</UDashboardNavbar>
<UDashboardPanelContent>
<UTabs class="p-5" :items="tabItems" @change="onChangeTab" v-if="loaded">
<UTabs class="p-5" :items="tabItems" @change="onChangeTab">
<template #item="{item}">
@@ -993,9 +940,11 @@ setupPage()
<UFormGroup
label="Kunde:"
>
<div class="flex flex-row">
<InputGroup
class="w-full"
>
<USelectMenu
:options="customers"
:options="dataStore.customers"
option-attribute="name"
value-attribute="id"
:search-attributes="['name']"
@@ -1003,15 +952,14 @@ setupPage()
searchable-placeholder="Suche..."
v-model="itemInfo.customer"
@change="setCustomerData"
class="flex-auto mr-2"
class="flex-auto"
>
<UButton
:color="itemInfo.customer ? 'primary' : 'rose'"
variant="outline"
class="w-full"
>
<!-- <span class="truncate text-left">{{dataStore.getCustomerById(itemInfo.customer) ? dataStore.getCustomerById(itemInfo.customer).name : "Kein Kunde ausgewählt"}}</span>-->
{{dataStore.getCustomerById(itemInfo.customer) ? dataStore.getCustomerById(itemInfo.customer).name : "Kein Kunde ausgewählt"}}
class="w-full">
<span class="truncate">{{dataStore.getCustomerById(itemInfo.customer) ? dataStore.getCustomerById(itemInfo.customer).name : "Kein Kunde ausgewählt"}}</span>
<UIcon name="i-heroicons-chevron-right-20-solid" class="w-5 h-5 transition-transform text-gray-400 dark:text-gray-500" :class="['transform rotate-90']" />
</UButton>
@@ -1021,14 +969,11 @@ setupPage()
</USelectMenu>
<UButton
variant="outline"
class="w-25"
v-if="itemInfo.customer"
icon="i-heroicons-arrow-right-end-on-rectangle"
@click="router.push(`/customers/show/${itemInfo.customer}`)"
>Kunde</UButton>
</div>
</InputGroup>
<UAlert
v-if="itemInfo.customer"
@@ -1052,7 +997,7 @@ setupPage()
>
<InputGroup>
<USelectMenu
:options="contacts.filter(i => i.customer === itemInfo.customer)"
:options="dataStore.getContactsByCustomerId(itemInfo.customer)"
option-attribute="fullName"
value-attribute="id"
:search-attributes="['name']"
@@ -1176,13 +1121,9 @@ setupPage()
</UFormGroup>
<UFormGroup
class="w-full"
label="Zahlungziel in Tagen:"
class="flex-auto"
>
<template #label>
<span class="truncate">
Zahlungsziel in Tagen:
</span>
</template>
<UInput
type="number"
v-model="itemInfo.paymentDays"
@@ -1228,7 +1169,6 @@ setupPage()
:search-attributes="['name']"
class="w-full"
:disabled="!itemInfo.customer"
@change="checkForOpenAdvanceInvoices"
>
<template #label>
{{dataStore.getProjectById(itemInfo.project) ? dataStore.getProjectById(itemInfo.project).name : "Kein Projekt ausgewählt"}}
@@ -1330,6 +1270,9 @@ setupPage()
</div>
<UDivider
class="my-3"
/>
@@ -1446,7 +1389,6 @@ setupPage()
<UInput
v-model="row.text"
placeholder="Name"
class="min-w-40"
/>
</td>
<td
@@ -1616,8 +1558,7 @@ setupPage()
<UInput
v-model="row.price"
type="number"
step="0.001"
:color="getRowMargin(row) > 0 ? 'primary' : 'rose'"
step="0.01"
>
<template #trailing>
<span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
@@ -1774,21 +1715,18 @@ setupPage()
<UButton
@click="addPosition('service')"
class="mt-3"
:disabled="itemInfo.type === 'advanceInvoices'"
>
+ Leistung
</UButton>
<UButton
@click="addPosition('normal')"
class="mt-3"
:disabled="itemInfo.type === 'advanceInvoices'"
>
+ Artikel
</UButton>
<UButton
@click="addPosition('free')"
class="mt-3"
:disabled="itemInfo.type === 'advanceInvoices'"
>
+ Freie Position
</UButton>
@@ -1812,44 +1750,6 @@ setupPage()
</UButton>
</InputGroup>
<UDivider
class="mt-5 mb-3"
v-if="openAdvanceInvoices.length > 0"
>
Noch nicht abgerechnete Abschlagsrechnungen
</UDivider>
<!-- Abzurechnende Abschlagsrechnungen -->
<div
v-for="advanceInvoice in openAdvanceInvoices"
:key="advanceInvoice.id"
class="flex flex-row justify-between my-2"
>
<span>{{advanceInvoice.documentNumber}}</span>
<span>Summe: {{renderCurrency(advanceInvoice.rows[0].price * (1 + advanceInvoice.rows[0].taxPercent/100))}}</span>
<InputGroup>
<UButton
@click="addAdvanceInvoiceToInvoice(advanceInvoice.id)"
:disabled="itemInfo.usedAdvanceInvoices.includes(advanceInvoice.id)"
class="mr-2"
>
Verwenden
</UButton>
<UButton
@click="itemInfo.usedAdvanceInvoices = itemInfo.usedAdvanceInvoices.filter(i => i !== advanceInvoice.id)"
:disabled="!itemInfo.usedAdvanceInvoices.includes(advanceInvoice.id)"
color="rose"
variant="outline"
>
X
</UButton>
</InputGroup>
</div>
<UDivider class="my-3" v-if="itemInfo.rows.length > 0"/>
<div class="w-full flex justify-end" v-if="itemInfo.type !== 'deliveryNotes'">
<table class="w-1/3" v-if="itemInfo.rows.length > 0">
<tr>
@@ -1864,19 +1764,6 @@ setupPage()
<td class="font-bold">Brutto:</td>
<td class="text-right">{{documentTotal.totalGross}}</td>
</tr>
<tr v-if="documentTotal.totalGrossAlreadyPaid !== '0,00 €'">
<td class="font-bold">Bereits bezahlt:</td>
<td class="text-right">{{documentTotal.totalGrossAlreadyPaid}}</td>
</tr>
<tr v-if="documentTotal.totalGrossAlreadyPaid !== '0,00 €'">
<td class="font-bold">Offene Summe:</td>
<td class="text-right">{{documentTotal.totalSumToPay}}</td>
</tr>
</table>
</div>
@@ -1928,7 +1815,6 @@ setupPage()
</div>
</template>
</UTabs>
<UProgress animation="carousel" v-else/>
</UDashboardPanelContent>