From f721cdbe64f518350f66e229a0019986f0afdaa5 Mon Sep 17 00:00:00 2001 From: = Date: Sun, 16 May 2021 20:04:01 +1000 Subject: [PATCH] Fixes for migration resources --- app/Traits/GenerateMigrationResources.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index f9239df278..543e0793f5 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -547,8 +547,12 @@ info("get company"); 'tax_name2' => $invoice->tax_name2, 'tax_rate1' => $invoice->tax_rate1, 'tax_rate2' => $invoice->tax_rate2, - 'custom_value1' => $invoice->custom_value1 ?: '', - 'custom_value2' => $invoice->custom_value2 ?: '', + 'custom_surcharge1' => $invoice->custom_value1 ?: '', + 'custom_surcharge2' => $invoice->custom_value2 ?: '', + 'custom_value1' => $invoice->custom_text_value1 ?: '', + 'custom_value2' => $invoice->custom_text_value2 ?: '', + 'custom_surcharge_tax1' => $invoice->custom_taxes1 ?: '', + 'custom_surcharge_tax2' => $invoice->custom_taxes2 ?: '', 'next_send_date' => null, 'amount' => $invoice->amount ?: 0, 'balance' => $invoice->balance ?: 0, @@ -1052,8 +1056,12 @@ info("get company"); 'tax_name2' => $quote->tax_name2, 'tax_rate1' => $quote->tax_rate1, 'tax_rate2' => $quote->tax_rate2, - 'custom_value1' => $quote->custom_value1 ?: '', - 'custom_value2' => $quote->custom_value2 ?: '', + 'custom_surcharge1' => $quote->custom_value1 ?: '', + 'custom_surcharge2' => $quote->custom_value2 ?: '', + 'custom_value1' => $quote->custom_text_value1 ?: '', + 'custom_value2' => $quote->custom_text_value2 ?: '', + 'custom_surcharge_tax1' => $quote->custom_taxes1 ?: '', + 'custom_surcharge_tax2' => $quote->custom_taxes2 ?: '', 'next_send_date' => null, 'amount' => $quote->amount ?: 0, 'balance' => $quote->balance ?: 0,