From 207c9388b53d9a752087b1866578288ac542ac3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 10 Sep 2020 13:01:10 +0200
Subject: [PATCH 1/2] Fix migration issues

---
 app/Jobs/Invoice/CreateInvoicePdf.php | 4 ++++
 app/Jobs/Util/Import.php              | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/app/Jobs/Invoice/CreateInvoicePdf.php b/app/Jobs/Invoice/CreateInvoicePdf.php
index acc644594a98..d86085f05d97 100644
--- a/app/Jobs/Invoice/CreateInvoicePdf.php
+++ b/app/Jobs/Invoice/CreateInvoicePdf.php
@@ -85,6 +85,10 @@ class CreateInvoicePdf implements ShouldQueue
 
         $design = Design::find($invoice_design_id);
 
+        if (!$design) {
+            $design = Design::first();
+        }
+
         $html = new HtmlEngine(null, $this->invitation, 'invoice');
 
         $template = new PdfMakerDesign(strtolower($design->name));
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 5b805ae05ba2..414a268a5ad1 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -207,6 +207,13 @@ class Import implements ShouldQueue
     private function processCompany(array $data): void
     {
         Company::unguard();
+        
+        if (
+            $data['settings']['invoice_design_id'] > 9 ||
+            $data['settings']['invoice_design_id'] > "9"
+        ) {
+            $data['settings']['invoice_design_id'] = 1;
+        }
 
         $data = $this->transformCompanyData($data);
 

From 1b36dc58681d44102dc45f80614fac2294b54032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 10 Sep 2020 13:01:34 +0200
Subject: [PATCH 2/2] cleanup

---
 app/Jobs/Invoice/CreateInvoicePdf.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/Jobs/Invoice/CreateInvoicePdf.php b/app/Jobs/Invoice/CreateInvoicePdf.php
index d86085f05d97..e6d85ae56de8 100644
--- a/app/Jobs/Invoice/CreateInvoicePdf.php
+++ b/app/Jobs/Invoice/CreateInvoicePdf.php
@@ -84,11 +84,6 @@ class CreateInvoicePdf implements ShouldQueue
         $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);
-
-        if (!$design) {
-            $design = Design::first();
-        }
-
         $html = new HtmlEngine(null, $this->invitation, 'invoice');
 
         $template = new PdfMakerDesign(strtolower($design->name));