From c955dfc910141f63c66cd19a82c20631c8634cad Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 17 Oct 2023 21:38:35 +1100
Subject: [PATCH] Fixes for recurring invoice export

---
 app/Export/CSV/BaseExport.php    | 1 +
 app/Export/CSV/InvoiceExport.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php
index e0344792895c..dc371aa28013 100644
--- a/app/Export/CSV/BaseExport.php
+++ b/app/Export/CSV/BaseExport.php
@@ -168,6 +168,7 @@ class BaseExport
         'tax_rate1' => 'invoice.tax_rate1',
         'tax_rate2' => 'invoice.tax_rate2',
         'tax_rate3' => 'invoice.tax_rate3',
+        'recurring_invoice' => 'invoice.recurring_id',
     ];
 
     protected array $recurring_invoice_report_keys = [    
diff --git a/app/Export/CSV/InvoiceExport.php b/app/Export/CSV/InvoiceExport.php
index 0a8f3188f2c3..741f5e22a029 100644
--- a/app/Export/CSV/InvoiceExport.php
+++ b/app/Export/CSV/InvoiceExport.php
@@ -142,6 +142,11 @@ class InvoiceExport extends BaseExport
         if (in_array('invoice.status', $this->input['report_keys'])) {
             $entity['invoice.status'] = $invoice->stringStatus($invoice->status_id);
         }
+
+        if (in_array('invoice.recurring_id', $this->input['report_keys'])) {
+            $entity['invoice.recurring_id'] = $invoice->recurring_invoice->number ?? '';
+        }
+
         
         return $entity;
     }