Add salutation field to contacts #13

resources/js/pages/Invoices.vue

@@ -120,6 +120,7 @@ const saveInvoice = async (updatedInvoice: Invoice) => {
                 companyName: updatedInvoice.billingData?.companyName,
                 vatId: updatedInvoice.billingData?.vatId,
                 billingAddress: updatedInvoice.billingData?.billingAddress,
+                contactSalutation: updatedInvoice.billingData?.contactSalutation,
                 contactFirstName: updatedInvoice.billingData?.contactFirstName,
                 contactLastName: updatedInvoice.billingData?.contactLastName,
                 paymentTerms: updatedInvoice.billingData?.paymentTerms

resources/js/types/index.d.ts

@@ -86,6 +86,7 @@ export type ContactType = Contact
 export function newContact(): Contact {
     return {
         id: 0,
+        salutation: '',
         firstName: '',
         lastName: '',
         email: '',
@@ -146,6 +147,7 @@ export interface Invoice {
         companyName: string | null;
         vatId: string | null;
         billingAddress: Address | null;
+        contactSalutation: string | null;
         contactFirstName: string | null;
         contactLastName: string | null;
         paymentTerms: PaymentTerms | null;
@@ -181,6 +183,7 @@ export function newBillingData() {
         companyName: "",
         vatId: "",
         billingAddress: newAddress(),
+        contactSalutation: "",
         contactFirstName: "",
         contactLastName: "",
         paymentTerms: newPaymentTerms()

resources/views/mail/invoices/reminder.blade.php

@@ -178,7 +178,7 @@
                                 <table width="636" cellpadding="0" cellspacing="0" border="0" class="container">
                                     <tr>
                                         <td align="left" valign="top">
-                                            <p>Hallo {{ $invoice['billingData']['contactSalutation'] ?? '' }} {{ $invoice['billingData']['contactLastName'] }},</p>
+                                            <p>Hallo {{ $invoice['billingData']['contactSalutation'] ?? 'Herr/Frau' }} {{ $invoice['billingData']['contactLastName'] }},</p>
                                             <p>uns ist aufgefallen, dass die hier aufgeführten Rechnungsbeträge noch nicht beglichen wurden.</p>
                                         </td>
                                     </tr>

resources/views/mail/offers/confirmation.blade.php

@@ -182,7 +182,7 @@
                                 <table width="636" cellpadding="0" cellspacing="0" border="0" class="container">
                                     <tr>
                                         <td align="left" valign="top">
-                                            <p>Hallo {{ $offer['contact']['salutation'] ?? '' }} {{
+                                            <p>Hallo {{ $offer['contact']['salutation'] ?? 'Herr/Frau' }} {{
                                                 $offer['contact']['lastName'] }},</p>
                                             <p>wir bedanken uns herzlich für Ihren Auftrag und bestätigen Ihnen hiermit
                                                 den Eingang und die Annahme Ihres Auftrags vom {{