From 6c3049f5cbb69fe1beba08ed037f436bc6329cb7 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 16 Jul 2023 20:39:41 +1000 Subject: [PATCH] checks for importing exchange rates --- app/Import/Transformer/BaseTransformer.php | 15 +++++++++++++++ app/Import/Transformer/Csv/InvoiceTransformer.php | 2 +- app/Import/Transformer/Csv/QuoteTransformer.php | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/Import/Transformer/BaseTransformer.php b/app/Import/Transformer/BaseTransformer.php index 0bdf3051decc..ddc190b029ed 100644 --- a/app/Import/Transformer/BaseTransformer.php +++ b/app/Import/Transformer/BaseTransformer.php @@ -319,6 +319,21 @@ class BaseTransformer // return Number::parseFloat($number); } + /** + * @param $data + * @param $field + * + * @return float + */ + public function getFloatOrOne($data, $field) + { + if (array_key_exists($field, $data)) + return Number::parseStringFloat($data[$field]) > 0 ? Number::parseStringFloat($data[$field]) : 1; + + return 1; + + } + /** * @param $name * diff --git a/app/Import/Transformer/Csv/InvoiceTransformer.php b/app/Import/Transformer/Csv/InvoiceTransformer.php index 1f9a18b289cc..1399990a2a9e 100644 --- a/app/Import/Transformer/Csv/InvoiceTransformer.php +++ b/app/Import/Transformer/Csv/InvoiceTransformer.php @@ -114,7 +114,7 @@ class InvoiceTransformer extends BaseTransformer $invoice_data, 'invoice.custom_surcharge4' ), - 'exchange_rate' => $this->getFloat( + 'exchange_rate' => $this->getFloatOrOne( $invoice_data, 'invoice.exchange_rate' ), diff --git a/app/Import/Transformer/Csv/QuoteTransformer.php b/app/Import/Transformer/Csv/QuoteTransformer.php index e1ab4d4a9344..93e24120d0bf 100644 --- a/app/Import/Transformer/Csv/QuoteTransformer.php +++ b/app/Import/Transformer/Csv/QuoteTransformer.php @@ -114,7 +114,7 @@ class QuoteTransformer extends BaseTransformer $quote_data, 'quote.custom_surcharge4' ), - 'exchange_rate' => $this->getFloat( + 'exchange_rate' => $this->getFloatOrOne( $quote_data, 'quote.exchange_rate' ),