diff --git a/spaces/app.vue b/spaces/app.vue
index ccc5db0..b113cd7 100644
--- a/spaces/app.vue
+++ b/spaces/app.vue
@@ -28,7 +28,7 @@ useHead({
})
useSeoMeta({
- ogSiteName: 'spaces.software',
+ ogSiteName: 'FEDEO',
twitterCard: 'summary_large_image'
})
diff --git a/spaces/components/DocumentDisplay.vue b/spaces/components/DocumentDisplay.vue
index 6fff9f2..7d8daa1 100644
--- a/spaces/components/DocumentDisplay.vue
+++ b/spaces/components/DocumentDisplay.vue
@@ -187,7 +187,7 @@ const updateDocumentAssignment = async () => {
v-if="!documentData.tags.includes('Bild')"
/>
{
let fileData = fileUploadFormData.value
fileData[type] = elementId
- await dataStore.uploadFiles(fileData, document.getElementById("fileUploadInput").files,true)
+ await dataStore.uploadF632iles(fileData, document.getElementById("fileUploadInput").files,true)
uploadModalOpen.value = false;
uploadInProgress.value = false;
diff --git a/spaces/components/HistoryDisplay.vue b/spaces/components/HistoryDisplay.vue
index 5c7577d..1e46cc4 100644
--- a/spaces/components/HistoryDisplay.vue
+++ b/spaces/components/HistoryDisplay.vue
@@ -156,7 +156,7 @@ const renderText = (text) => {
[
label: '',
disabled: true
}], [{
- label: 'Einstellungen',
- icon: 'i-heroicons-cog-8-tooth',
- to: '/settings'
- }, {
label: 'Suche',
icon: 'i-heroicons-command-line',
shortcuts: [metaSymbol.value, 'K'],
@@ -31,7 +27,7 @@ const items = computed(() => [
}], [{
label: 'Webseite',
icon: 'i-heroicons-book-open',
- to: 'https://spaces.software',
+ to: 'https://fedeo.de',
target: '_blank'
},/* {
label: 'GitHub repository',
diff --git a/spaces/composables/useDashboard.ts b/spaces/composables/useDashboard.ts
index 49242e7..b2b2460 100644
--- a/spaces/composables/useDashboard.ts
+++ b/spaces/composables/useDashboard.ts
@@ -8,10 +8,8 @@ const _useDashboard = () => {
defineShortcuts({
'g-h': () => router.push('/'),
- 'g-i': () => router.push('/inbox'),
- 'g-u': () => router.push('/profiles'),
- 'g-s': () => router.push('/settings'),
- '?': () => isHelpSlideoverOpen.value = true,
+ 'g-a': () => router.push('/tasks'),
+ '?': () => isHelpSlideoverOpen.value = !isHelpSlideoverOpen.value,
n: () => isNotificationsSlideoverOpen.value = !isNotificationsSlideoverOpen.value
})
diff --git a/spaces/layouts/default.vue b/spaces/layouts/default.vue
index d4639ca..03cb04c 100644
--- a/spaces/layouts/default.vue
+++ b/spaces/layouts/default.vue
@@ -174,7 +174,7 @@ const navLinks = [
},
]
-
+//const activeFeatures = dataStore.tenants.find(dataStore.currentTenant).features
let links = [
{
@@ -305,7 +305,8 @@ let links = [
label: "Belege",
to: "/receipts",
icon: "i-heroicons-document-text"
- },{
+ },
+ {
label: "Bank",
to: "/banking",
icon: "i-heroicons-document-text"
@@ -482,14 +483,15 @@ const footerLinks = [/*{
-
![Logo]()
-
+
+
diff --git a/spaces/nuxt.config.ts b/spaces/nuxt.config.ts
index d5b158e..02502a3 100644
--- a/spaces/nuxt.config.ts
+++ b/spaces/nuxt.config.ts
@@ -46,13 +46,13 @@ export default defineNuxtConfig({
icons: ['heroicons','mdi']
},
colorMode: {
- preference: 'dark'
+ preference: 'system'
},
pwa: {
manifest: {
- name: "spaces.software",
- short_name: "spaces",
- description: "spaces.software",
+ name: "FEDEO",
+ short_name: "FEDEO",
+ description: "FEDEO",
icons: [
{
src: "/icon.png",
diff --git a/spaces/pages/banking/index.vue b/spaces/pages/banking/index.vue
index e44dc26..dfed729 100644
--- a/spaces/pages/banking/index.vue
+++ b/spaces/pages/banking/index.vue
@@ -91,6 +91,15 @@
Konto: {{selectedStatement.account}}
Beschreibung:
{{selectedStatement.text}}
+
+
+
+
+
+
+
diff --git a/spaces/pages/login.vue b/spaces/pages/login.vue
index 9e5c10e..0fc862b 100644
--- a/spaces/pages/login.vue
+++ b/spaces/pages/login.vue
@@ -86,8 +86,8 @@ const onSubmit = async (data) => {
diff --git a/spaces/pages/receipts/index.vue b/spaces/pages/receipts/index.vue
index 03b93a1..861a427 100644
--- a/spaces/pages/receipts/index.vue
+++ b/spaces/pages/receipts/index.vue
@@ -93,6 +93,7 @@
{{row.date ? dayjs(row.date).format("DD.MM.YY") : ''}}
+ {{row.documentDate ? dayjs(row.documentDate).format("DD.MM.YY") : ''}}
{{row.dueDate ? dayjs(row.dueDate).format("DD.MM.YY") : ''}}
@@ -108,6 +109,9 @@
>
{{getRowAmount(row) === 0 ? '' : `${String(getRowAmount(row).toFixed(2)).replace('.',',')} €`}}
+
+ {{calculateDocSum(row.rows)}} €
+
@@ -141,6 +145,11 @@ const templateColumns = [
label: "Status.",
sortable: true
},
+ {
+ key: "amount",
+ label: "Betrag",
+ sortable: true
+ },
{
key: 'partner',
label: "Kunde / Lieferant",
@@ -166,11 +175,6 @@ const templateColumns = [
label: "Fällig:",
sortable: true
},
- {
- key: "amount",
- label: "Betrag",
- sortable: true
- },
]
const selectedColumns = ref(templateColumns)
const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
@@ -233,6 +237,18 @@ const filteredRows = computed(() => {
})
})
})
+
+const calculateDocSum = (rows) => {
+ let sum = 0
+
+ rows.forEach(row => {
+ if(row.mode !== "pagebreak") {
+ sum += row.price * row.quantity * ( row.taxPercent + 100)/100
+ }
+ })
+
+ return sum.toFixed(2)
+}