From e204eedaa22e2651d72fbd289c474749aba5a990 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 1 May 2020 22:43:08 +1000
Subject: [PATCH] Fix for invoice design not changing dynamically (#3666)

---
 app/Jobs/Credit/CreateCreditPdf.php   | 4 +++-
 app/Jobs/Invoice/CreateInvoicePdf.php | 6 ++++--
 app/Jobs/Quote/CreateQuotePdf.php     | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/Jobs/Credit/CreateCreditPdf.php b/app/Jobs/Credit/CreateCreditPdf.php
index 940169da87e5..a6f9eeb7a6af 100644
--- a/app/Jobs/Credit/CreateCreditPdf.php
+++ b/app/Jobs/Credit/CreateCreditPdf.php
@@ -75,7 +75,9 @@ class CreateCreditPdf implements ShouldQueue
 
         $file_path = $path . $this->credit->number . '.pdf';
 
-        $design = Design::find($this->decodePrimaryKey($this->credit->client->getSetting('credit_design_id')));
+        $credit_design_id = $this->credit->design_id ? $this->credit->design_id : $this->decodePrimaryKey($this->credit->client->getSetting('credit_design_id'));
+
+        $design = Design::find($credit_design_id);
         
         $designer = new Designer($this->credit, $design, $this->credit->client->getSetting('pdf_variables'), 'credit');
 
diff --git a/app/Jobs/Invoice/CreateInvoicePdf.php b/app/Jobs/Invoice/CreateInvoicePdf.php
index 488e0dbd14ab..0b6e878a092f 100644
--- a/app/Jobs/Invoice/CreateInvoicePdf.php
+++ b/app/Jobs/Invoice/CreateInvoicePdf.php
@@ -72,8 +72,10 @@ class CreateInvoicePdf implements ShouldQueue
         $path      = $this->invoice->client->invoice_filepath();
 
         $file_path = $path . $this->invoice->number . '.pdf';
-        
-        $design    = Design::find($this->decodePrimaryKey($this->invoice->client->getSetting('invoice_design_id')));
+
+        $invoice_design_id = $this->invoice->design_id ? $this->invoice->design_id : $this->decodePrimaryKey($this->invoice->client->getSetting('invoice_design_id'));
+
+        $design    = Design::find($invoice_design_id);
 
         $designer  = new Designer($this->invoice, $design, $this->invoice->client->getSetting('pdf_variables'), 'invoice');
 
diff --git a/app/Jobs/Quote/CreateQuotePdf.php b/app/Jobs/Quote/CreateQuotePdf.php
index 99f423c053ab..23580fb6bed0 100644
--- a/app/Jobs/Quote/CreateQuotePdf.php
+++ b/app/Jobs/Quote/CreateQuotePdf.php
@@ -73,7 +73,9 @@ class CreateQuotePdf implements ShouldQueue
 
         $path       = $this->quote->client->quote_filepath();
 
-        $design     = Design::find($this->decodePrimaryKey($this->quote->client->getSetting('quote_design_id')));
+        $quote_design_id = $this->quote->design_id ? $this->quote->design_id : $this->decodePrimaryKey($this->quote->client->getSetting('quote_design_id'));
+
+        $design     = Design::find($quote_design_id);
 
         $designer   = new Designer($this->quote, $design, $this->quote->client->getSetting('pdf_variables'), 'quote');