Add salutation field to contacts #13

app/Http/Controllers/ContactController.php

@@ -12,6 +12,7 @@ public function index()
             return [
                 'id' => $contact->id,
                 'customerId' => $contact->customer_id,
+                'salutation' => $contact->salutation,
                 'firstName' => $contact->first_name,
                 'lastName' => $contact->last_name,
                 'email' => $contact->email,
@@ -36,6 +37,7 @@ public function show($id)
         return [
             'id' => $contact->id,
             'customerId' => $contact->customer_id,
+            'salutation' => $contact->salutation,
             'firstName' => $contact->first_name,
             'lastName' => $contact->last_name,
             'email' => $contact->email,
@@ -51,4 +53,4 @@ public function show($id)
             ] : null,
         ];
     }
-}
+}

app/Http/Controllers/InvoiceController.php

@@ -344,6 +344,7 @@ public function store(Request $request)
             'billingData.billingAddress.city' => 'nullable|string',
             'billingData.billingAddress.postalCode' => 'nullable|string',
             'billingData.billingAddress.countryCode' => 'nullable|string',
+            'billingData.contactSalutation' => 'nullable|string',
             'billingData.contactFirstName' => 'nullable|string',
             'billingData.contactLastName' => 'nullable|string',
             'billingData.paymentTerms' => 'nullable|array',
@@ -428,6 +429,7 @@ public function update(Request $request, $id)
             'billingData.billingAddress.city' => 'nullable|string',
             'billingData.billingAddress.postalCode' => 'nullable|string',
             'billingData.billingAddress.countryCode' => 'nullable|string',
+            'billingData.contactSalutation' => 'nullable|string',
             'billingData.contactFirstName' => 'nullable|string',
             'billingData.contactLastName' => 'nullable|string',
             'billingData.paymentTerms' => 'nullable|array',

app/Models/Contact.php

@@ -11,6 +11,7 @@ class Contact extends Model
 
     protected $fillable = [
         'customer_id',
+        'salutation',
         'first_name',
         'last_name',
         'email',

database/factories/ContactFactory.php

@@ -20,9 +20,12 @@ public function definition()
             $avatar = "https://i.pravatar.cc/128?img={$randomImageId}";
         }
 
+        $gender = rand(0, 9) >= 5 ? 'female' : 'male';
+        
         return [
-            'first_name' => $this->faker->firstName(),
+            'salutation' => $this->faker->title($gender),
-            'last_name' => $this->faker->lastName(),
+            'first_name' => $this->faker->firstName($gender),
+            'last_name' => $this->faker->lastName($gender),
             'email' => $this->faker->unique()->safeEmail(),
             'phone' => $this->faker->phoneNumber(),
             'position' => $this->faker->jobTitle(),

database/migrations/2025_10_06_122048_create_contacts_table.php

@@ -11,6 +11,7 @@ public function up()
         Schema::create('contacts', function (Blueprint $table) {
             $table->id();
             $table->foreignId('customer_id')->constrained()->onDelete('cascade');
+            $table->string('salutation', 20);
             $table->string('first_name', 50);
             $table->string('last_name', 50);
             $table->string('email', 100)->nullable();

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 {{

routes/api.php

@@ -28,11 +28,11 @@
 
 Route::get('/invoices/{id}/remind', function ($id) {
     $invoice = InvoiceController::single($id);
-    Mail::to('daniel@vollstock.de')->send(new Reminder($invoice));
+    // Mail::to('daniel@vollstock.de')->send(new Reminder($invoice));
-    // return new Reminder($invoice);
+    return new Reminder($invoice);
 });
 
-Route::get('/offers/{id}/confirmation', function ($id) {
+Route::get('/offers/{id}/confirm', function ($id) {
     // $offer = offerController::single($id);
     $offer = [
         'nr' => 0,
@@ -52,23 +52,23 @@
         ],
         'contact' => [
             'salutation' => 'Frau',
-            'firstName' => '',
+            'firstName' => 'Claudia',
-            'lastName' => '',
+            'lastName' => 'Mustermann',
             'email' => '',
             'phone' => '',
             'position' => null,
             'isPrimary' => false,
             'avatar' => null,
         ],
-        'totalAmount' => '13575.88',
+        'totalAmount' => '84.033',
-        'title' => "",
+        'title' => "Angebots-Titel",
         'text' => '',
         'items' => [],
         'paymentTerms' => [
             'name' => 'onReceipt',
             'description' => 'Bei Rechnungserhalt',
             'isFixed' => true,
-            'days' => null,
+            'days' => 14,
         ]
     ];