From 6236bf0deec6a485617c3348b36e197baee91c5b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 5 Jan 2024 11:45:51 +1100
Subject: [PATCH] Fixes for clone quotes

---
 app/Factory/CloneQuoteToInvoiceFactory.php | 5 +++--
 app/Models/Invoice.php                     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Factory/CloneQuoteToInvoiceFactory.php b/app/Factory/CloneQuoteToInvoiceFactory.php
index 30400edccae6..10c1c7f86cae 100644
--- a/app/Factory/CloneQuoteToInvoiceFactory.php
+++ b/app/Factory/CloneQuoteToInvoiceFactory.php
@@ -28,7 +28,8 @@ class CloneQuoteToInvoiceFactory
         unset($quote_array['invoice_id']);
         unset($quote_array['id']);
         unset($quote_array['invitations']);
-
+        unset($quote_array['user']);
+        
         //preserve terms if they exist on Quotes
         //if(array_key_exists('terms', $quote_array) && strlen($quote_array['terms']) < 2)
         if (! $quote->company->use_quote_terms_on_conversion) {
@@ -38,7 +39,6 @@ class CloneQuoteToInvoiceFactory
         // unset($quote_array['public_notes']);
         unset($quote_array['footer']);
         unset($quote_array['design_id']);
-        unset($quote_array['user']);
 
         foreach ($quote_array as $key => $value) {
             $invoice->{$key} = $value;
@@ -59,6 +59,7 @@ class CloneQuoteToInvoiceFactory
         $invoice->last_sent_date = null;
         $invoice->last_viewed = null;
 
+
         return $invoice;
     }
 }
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 2d9a5babc397..a9ff626e819c 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -240,12 +240,12 @@ class Invoice extends BaseModel
 
     public function getDueDateAttribute($value)
     {
-        return $this->dateMutator($value);
+        return $value ? $this->dateMutator($value) : null;
     }
 
     public function getPartialDueDateAttribute($value)
     {
-        return $this->dateMutator($value);
+        return $value ? $this->dateMutator($value) : null;
     }
 
     public function company(): \Illuminate\Database\Eloquent\Relations\BelongsTo