From 671981000f2a42dcb773bcbb37638b6361a676f7 Mon Sep 17 00:00:00 2001
From: chris <christiansteinle@arcor.de>
Date: Tue, 14 Jan 2025 11:05:05 +0100
Subject: [PATCH] Small adjustments to invoices.

---
 resources/views/invoice/create.blade.php | 8 +++++++-
 resources/views/invoice/mail.blade.php   | 2 +-
 resources/views/pdfs/address.blade.php   | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/resources/views/invoice/create.blade.php b/resources/views/invoice/create.blade.php
index 6a435a0..e00a9d1 100644
--- a/resources/views/invoice/create.blade.php
+++ b/resources/views/invoice/create.blade.php
@@ -405,17 +405,23 @@
                     tax: tax
                 })
                     .then(function (response) {
+                        let error = false;
+                        let invoice_id = response.data.id;
                         for (let i = 0; i < self.items.length; i++) {
                             let pos = sort_flipped[i];
                             let item = self.items[pos];
-                            axios.post('invoice/' + response.data.id + '/item', item)
+                            axios.post('invoice/' + invoice_id + '/item', item)
                                 .then(function (response) {
                                     console.log(response);
                                 })
                                 .catch(function (error) {
+                                    error = true;
                                     console.log(error);
                                 })
                         }
+                        if (!error) {
+                            window.location.href = '/invoice/' + invoice_id;
+                        }
                         console.log(response);
                     })
                     .catch(function (error) {
diff --git a/resources/views/invoice/mail.blade.php b/resources/views/invoice/mail.blade.php
index b68b380..24d160f 100644
--- a/resources/views/invoice/mail.blade.php
+++ b/resources/views/invoice/mail.blade.php
@@ -101,7 +101,7 @@
             data: {
                 id: {{ $invoice->id }},
                 To: '{{ $invoice->customer->email }}',
-                Cc: '{{ $invoice->address->email }}',
+                Cc: '{{ ($invoice->address->email === $invoice->customer->email) ? "" : $invoice->address->email }}',
                 Bcc: '',
                 Subject: '{{ __('invoice.Invoice') . ' ' . $invoice->number }}',
                 Body: '{{ __('invoice.Invoice body', ['invoice_number' => $invoice->number]) }}',
diff --git a/resources/views/pdfs/address.blade.php b/resources/views/pdfs/address.blade.php
index 8e4a463..a458d1c 100644
--- a/resources/views/pdfs/address.blade.php
+++ b/resources/views/pdfs/address.blade.php
@@ -2,7 +2,9 @@
     <div style="font-size: 10px;">{{ $options->company_name }}, {{ $options->address }}
         , {{ $options->zip }} {{ $options->city }}</div>
     <div style="margin-top: 5mm;">
-        <div>{{ $invoice->customer->name }}</div>
+        @if ( $invoice->customer->name != $invoice->address->name)
+            <div>{{ $invoice->customer->name }}</div>
+        @endif
         <div>{{ $invoice->address->name }}</div>
         <div>{{ $invoice->address->address }}</div>
         <div>&nbsp;</div>