From 59e55ba3dc274251ae46910eb628675196f1cbf0 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 23 Apr 2023 16:43:54 +1000
Subject: [PATCH] fixes for einvoice

---
 app/Services/Invoice/InvoiceService.php | 22 +++++++++++++---------
 app/Transformers/CompanyTransformer.php |  1 +
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index 82693c3a634c..6977b4925910 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -449,22 +449,26 @@ class InvoiceService
             if ($force) {
                 $this->invoice->invitations->each(function ($invitation) {
                     (new CreateEntityPdf($invitation))->handle();
-                    if ($invitation instanceof InvoiceInvitation)
+
+                    if ($invitation->company->enable_e_invoice && $invitation instanceof InvoiceInvitation)
                     {
-                    (new CreateEInvoice($invitation->invoice, true))->handle();
+                        (new CreateEInvoice($invitation->invoice, true))->handle();
                     }
+
                 });
 
                 return $this;
             }
 
-            $this->invoice->invitations->each(function ($invitation) {
-                CreateEntityPdf::dispatch($invitation);
-                if ($invitation instanceof InvoiceInvitation)
-                {
-                    CreateEInvoice::dispatch($invitation->invoice, true);
-                }
-            });
+            if($this->invoice->company->enable_e_invoice) {
+                $this->invoice->invitations->each(function ($invitation) {
+                    CreateEntityPdf::dispatch($invitation);
+                    if ($invitation instanceof InvoiceInvitation) {
+                        CreateEInvoice::dispatch($invitation->invoice, true);
+                    }
+                });
+            }
+
         } catch (\Exception $e) {
             nlog('failed creating invoices in Touch PDF');
         }
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index 37c1e8011a48..e52ad26b5cfe 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -196,6 +196,7 @@ class CompanyTransformer extends EntityTransformer
             'invoice_task_hours' => (bool) $company->invoice_task_hours,
             'calculate_taxes' => (bool) $company->calculate_taxes,
             'tax_data' => $company->tax_data ?: new \stdClass,
+            'enable_e_invoice' => (bool) $company->enable_e_invoice,
         ];
     }