From f5363cd01270c650eb118124ce1d04c9e55cff08 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 17 Jan 2018 13:36:35 +0200
Subject: [PATCH] Merge export fix w/custom fields

---
 resources/views/export/invoices.blade.php           | 4 ++--
 resources/views/export/recurring_invoices.blade.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/export/invoices.blade.php b/resources/views/export/invoices.blade.php
index 2bc301791e35..16e34cd0a281 100644
--- a/resources/views/export/invoices.blade.php
+++ b/resources/views/export/invoices.blade.php
@@ -77,10 +77,10 @@
                 @if ($account->custom_invoice_label2)
                     <td>{{ $invoice->custom_value2 }}</td>
                 @endif
-                @if ($account->custom_invoice_label1)
+                @if ($account->custom_invoice_text_label1)
                     <td>{{ $invoice->custom_text_value1 }}</td>
                 @endif
-                @if ($account->custom_invoice_label2)
+                @if ($account->custom_invoice_text_label2)
                     <td>{{ $invoice->custom_text_value2 }}</td>
                 @endif
                 <td>{{ $item->product_key }}</td>
diff --git a/resources/views/export/recurring_invoices.blade.php b/resources/views/export/recurring_invoices.blade.php
index 7e3fe07efb6a..85edc42c067d 100644
--- a/resources/views/export/recurring_invoices.blade.php
+++ b/resources/views/export/recurring_invoices.blade.php
@@ -61,10 +61,10 @@
                 @if ($account->custom_invoice_label2)
                     <td>{{ $invoice->custom_value2 }}</td>
                 @endif
-                @if ($account->custom_invoice_label1)
+                @if ($account->custom_invoice_text_label1)
                     <td>{{ $invoice->custom_text_value1 }}</td>
                 @endif
-                @if ($account->custom_invoice_label2)
+                @if ($account->custom_invoice_text_label2)
                     <td>{{ $invoice->custom_text_value2 }}</td>
                 @endif
                 <td>{{ $item->product_key }}</td>