From e72e301c00bac652f51476fa3818e72457806d44 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 2 Sep 2021 18:12:35 +1000
Subject: [PATCH] v5.3.6

---
 VERSION.txt                                      |  2 +-
 .../Transformers/Csv/ClientTransformer.php       | 16 ++++++++--------
 .../Transformers/Csv/ExpenseTransformer.php      |  4 ++++
 .../Transformers/Csv/VendorTransformer.php       |  4 ++++
 config/ninja.php                                 |  4 ++--
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 229793ae14..0722778658 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.3.5
\ No newline at end of file
+5.3.6
\ No newline at end of file
diff --git a/app/Import/Transformers/Csv/ClientTransformer.php b/app/Import/Transformers/Csv/ClientTransformer.php
index eabcf10b2b..0ea9401a9e 100644
--- a/app/Import/Transformers/Csv/ClientTransformer.php
+++ b/app/Import/Transformers/Csv/ClientTransformer.php
@@ -52,10 +52,10 @@ class ClientTransformer extends BaseTransformer
 			'website'              => $this->getString( $data, 'client.website' ),
 			'vat_number'           => $this->getString( $data, 'client.vat_number' ),
 			'id_number'            => $this->getString( $data, 'client.id_number' ),
-			'custom_value1'        => $this->getString( $data, 'client.custom1' ),
-			'custom_value2'        => $this->getString( $data, 'client.custom2' ),
-			'custom_value3'        => $this->getString( $data, 'client.custom3' ),
-			'custom_value4'        => $this->getString( $data, 'client.custom4' ),
+			'custom_value1'        => $this->getString( $data, 'client.custom_value1' ),
+			'custom_value2'        => $this->getString( $data, 'client.custom_value2' ),
+			'custom_value3'        => $this->getString( $data, 'client.custom_value3' ),
+			'custom_value4'        => $this->getString( $data, 'client.custom_value4' ),
 			'balance'              => preg_replace( '/[^0-9,.]+/', '', $this->getFloat( $data, 'client.balance' ) ),
 			'paid_to_date'         => preg_replace( '/[^0-9,.]+/', '', $this->getFloat( $data, 'client.paid_to_date' ) ),
 			'credit_balance'       => 0,
@@ -67,10 +67,10 @@ class ClientTransformer extends BaseTransformer
 					'last_name'     => $this->getString( $data, 'contact.last_name' ),
 					'email'         => $this->getString( $data, 'contact.email' ),
 					'phone'         => $this->getString( $data, 'contact.phone' ),
-					'custom_value1' => $this->getString( $data, 'contact.custom1' ),
-					'custom_value2' => $this->getString( $data, 'contact.custom2' ),
-					'custom_value3' => $this->getString( $data, 'contact.custom3' ),
-					'custom_value4' => $this->getString( $data, 'contact.custom4' ),
+					'custom_value1' => $this->getString( $data, 'contact.custom_value1' ),
+					'custom_value2' => $this->getString( $data, 'contact.custom_value2' ),
+					'custom_value3' => $this->getString( $data, 'contact.custom_value3' ),
+					'custom_value4' => $this->getString( $data, 'contact.custom_value4' ),
 				],
 			],
 			'country_id'           => isset( $data['client.country'] ) ? $this->getCountryId( $data['client.country']) : null,
diff --git a/app/Import/Transformers/Csv/ExpenseTransformer.php b/app/Import/Transformers/Csv/ExpenseTransformer.php
index baf5321058..519210686a 100644
--- a/app/Import/Transformers/Csv/ExpenseTransformer.php
+++ b/app/Import/Transformers/Csv/ExpenseTransformer.php
@@ -29,6 +29,10 @@ class ExpenseTransformer extends BaseTransformer {
 			'project_id'            => isset( $data['expense.project'] ) ? $this->getProjectId( $data['expense.project'] ) : null,
 			'payment_type_id'       => isset( $data['expense.payment_type'] ) ? $this->getPaymentTypeId( $data['expense.payment_type'] ) : null,
 			'payment_date'          => isset( $data['expense.payment_date'] ) ? date( 'Y-m-d', strtotime( $data['expense.payment_date'] ) ) : null,
+			'custom_value1'        => $this->getString( $data, 'expense.custom_value1' ),
+			'custom_value2'        => $this->getString( $data, 'expense.custom_value2' ),
+			'custom_value3'        => $this->getString( $data, 'expense.custom_value3' ),
+			'custom_value4'        => $this->getString( $data, 'expense.custom_value4' ),
 			'transaction_reference' => $this->getString( $data, 'expense.transaction_reference' ),
 			'should_be_invoiced'    => $clientId ? true : false,
 		];
diff --git a/app/Import/Transformers/Csv/VendorTransformer.php b/app/Import/Transformers/Csv/VendorTransformer.php
index 639fd4936e..73624a43fa 100644
--- a/app/Import/Transformers/Csv/VendorTransformer.php
+++ b/app/Import/Transformers/Csv/VendorTransformer.php
@@ -33,6 +33,10 @@ class VendorTransformer extends BaseTransformer {
 			'city'            => $this->getString( $data, 'vendor.city' ),
 			'state'           => $this->getString( $data, 'vendor.state' ),
 			'postal_code'     => $this->getString( $data, 'vendor.postal_code' ),
+			'custom_value1'        => $this->getString( $data, 'vendor.custom_value1' ),
+			'custom_value2'        => $this->getString( $data, 'vendor.custom_value2' ),
+			'custom_value3'        => $this->getString( $data, 'vendor.custom_value3' ),
+			'custom_value4'        => $this->getString( $data, 'vendor.custom_value4' ),
 			'vendor_contacts' => [
 				[
 					'first_name' => $this->getString( $data, 'vendor.first_name' ),
diff --git a/config/ninja.php b/config/ninja.php
index b19ae24343..8db819f73e 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.3.5',
-    'app_tag' => '5.3.5',
+    'app_version' => '5.3.6',
+    'app_tag' => '5.3.6',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),