Corrected Color in Error Alert in Whitemode

Added Firstname and Lastname to Customer disabled when company
This commit is contained in:
2025-01-29 18:10:59 +01:00
parent 7ea5da8d0f
commit 61de673741
2 changed files with 38 additions and 5 deletions

View File

@@ -649,8 +649,8 @@ const getDocumentData = () => {
const generateContext = (itemInfo, contactData) => { const generateContext = (itemInfo, contactData) => {
return { return {
vorname:contactData && contactData.firstName, vorname:(contactData && contactData.firstName) || (customerData && customerData.firstname),
nachname: contactData && contactData.lastName, nachname: (contactData && contactData.lastName) || (customerData && customerData.lastname),
kundenname: customerData && customerData.name, kundenname: customerData && customerData.name,
zahlungsziel_in_tagen:itemInfo.paymentDays, zahlungsziel_in_tagen:itemInfo.paymentDays,
diesel_gesamtverbrauch: (itemInfo.agriculture && itemInfo.agriculture.dieselUsageTotal) && itemInfo.agriculture.dieselUsageTotal diesel_gesamtverbrauch: (itemInfo.agriculture && itemInfo.agriculture.dieselUsageTotal) && itemInfo.agriculture.dieselUsageTotal
@@ -1003,7 +1003,7 @@ const setRowData = (row) => {
> >
<template #description> <template #description>
<ul class="list-disc ml-5"> <ul class="list-disc ml-5">
<li v-for="error in findDocumentErrors" :class="[...error.type === 'breaking' ? ['text-rose-600'] : ['text-white']]"> <li v-for="error in findDocumentErrors" :class="[...error.type === 'breaking' ? ['text-rose-600'] : ['dark:text-white','text-black']]">
{{error.message}} {{error.message}}
</li> </li>
</ul> </ul>

View File

@@ -156,9 +156,42 @@ export const useDataStore = defineStore('data', () => {
inputType: "text" inputType: "text"
}, { }, {
key: "name", key: "name",
label: "Name", label: "Firmenname",
title: true, title: true,
inputType: "text" inputType: "text",
disabledFunction: function (item) {
return !item.isCompany
},
},{
key: "firstname",
label: "Vorname",//TODO: Add Conditional Rendering to Datatypes
title: true,
inputType: "text",
inputChangeFunction: function (row) {
if(row.firstname && row.lastname) {
row.name = `${row.firstname} ${row.lastname}`
} else {
row.name = row.firstname
}
},
disabledFunction: function (item) {
return item.isCompany
},
},{
key: "lastname",
label: "Nachname",
title: true,
inputType: "text",
inputChangeFunction: function (row) {
if(row.firstname && row.lastname) {
row.name = `${row.firstname} ${row.lastname}`
} else {
row.name = row.lastname
}
},
disabledFunction: function (item) {
return item.isCompany
},
}, { }, {
key: "isCompany", key: "isCompany",
label: "Firmenkunde", label: "Firmenkunde",