From 93898e0efe403d1d3a97dd1060a587857025b981 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 15 Jan 2017 21:48:31 +0200
Subject: [PATCH] Improvements to CSV import

---
 app/Ninja/Import/BaseTransformer.php             | 11 ++++++++---
 app/Ninja/Import/CSV/InvoiceTransformer.php      |  3 ++-
 app/Ninja/Import/Harvest/InvoiceTransformer.php  |  4 ++--
 app/Ninja/Import/Harvest/PaymentTransformer.php  |  4 ++--
 app/Ninja/Import/Hiveage/InvoiceTransformer.php  |  6 +++---
 app/Ninja/Import/Hiveage/PaymentTransformer.php  |  2 +-
 app/Ninja/Import/Nutcache/InvoiceTransformer.php |  6 +++---
 app/Ninja/Import/Nutcache/PaymentTransformer.php |  2 +-
 app/Ninja/Import/Wave/InvoiceTransformer.php     |  6 +++---
 app/Ninja/Import/Wave/PaymentTransformer.php     |  2 +-
 10 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/app/Ninja/Import/BaseTransformer.php b/app/Ninja/Import/BaseTransformer.php
index f5a957c9ed92..df9058a855e0 100644
--- a/app/Ninja/Import/BaseTransformer.php
+++ b/app/Ninja/Import/BaseTransformer.php
@@ -1,5 +1,6 @@
 <?php namespace App\Ninja\Import;
 
+use Carbon;
 use Utils;
 use DateTime;
 use League\Fractal\TransformerAbstract;
@@ -128,10 +129,14 @@ class BaseTransformer extends TransformerAbstract
      * @param string $format
      * @return null
      */
-    public function getDate($date, $format = 'Y-m-d')
+    public function getDate($data, $field)
     {
-        if ( ! $date instanceof DateTime) {
-            $date = DateTime::createFromFormat($format, $date);
+        if ($date = data_get($data, $field)) {
+            try {
+                $date = new Carbon($date);
+            } catch (Exception $e) {
+                // if we fail to parse return blank
+            }
         }
 
         return $date ? $date->format('Y-m-d') : null;
diff --git a/app/Ninja/Import/CSV/InvoiceTransformer.php b/app/Ninja/Import/CSV/InvoiceTransformer.php
index 2ee8b018a4e2..2d151a45605e 100644
--- a/app/Ninja/Import/CSV/InvoiceTransformer.php
+++ b/app/Ninja/Import/CSV/InvoiceTransformer.php
@@ -30,7 +30,8 @@ class InvoiceTransformer extends BaseTransformer
                 'po_number' => $this->getString($data, 'po_number'),
                 'terms' => $this->getString($data, 'terms'),
                 'public_notes' => $this->getString($data, 'public_notes'),
-                'invoice_date_sql' => isset($data->invoice_date) ? $data->invoice_date : null,
+                'invoice_date_sql' => $this->getDate($data, 'invoice_date'),
+                'due_date_sql' => $this->getDate($data, 'due_date'),
                 'invoice_items' => [
                     [
                         'product_key' => '',
diff --git a/app/Ninja/Import/Harvest/InvoiceTransformer.php b/app/Ninja/Import/Harvest/InvoiceTransformer.php
index ae47e7a7eb83..d6b2f619b0b9 100644
--- a/app/Ninja/Import/Harvest/InvoiceTransformer.php
+++ b/app/Ninja/Import/Harvest/InvoiceTransformer.php
@@ -28,7 +28,7 @@ class InvoiceTransformer extends BaseTransformer
                 'invoice_number' => $this->getInvoiceNumber($data->id),
                 'paid' => (float) $data->paid_amount,
                 'po_number' => $this->getString($data, 'po_number'),
-                'invoice_date_sql' => $this->getDate($data->issue_date, 'm/d/Y'),
+                'invoice_date_sql' => $this->getDate($data, 'issue_date'),
                 'invoice_items' => [
                     [
                         'product_key' => '',
@@ -40,4 +40,4 @@ class InvoiceTransformer extends BaseTransformer
             ];
         });
     }
-}
\ No newline at end of file
+}
diff --git a/app/Ninja/Import/Harvest/PaymentTransformer.php b/app/Ninja/Import/Harvest/PaymentTransformer.php
index b8b98e0dc837..3391b9ace16e 100644
--- a/app/Ninja/Import/Harvest/PaymentTransformer.php
+++ b/app/Ninja/Import/Harvest/PaymentTransformer.php
@@ -17,10 +17,10 @@ class PaymentTransformer extends BaseTransformer
         return new Item($data, function ($data) {
             return [
                 'amount' => $data->paid_amount,
-                'payment_date_sql' => $this->getDate($data->last_payment_date, 'm/d/Y'),
+                'payment_date_sql' => $this->getDate($data, 'last_payment_date'),
                 'client_id' => $data->client_id,
                 'invoice_id' => $data->invoice_id,
             ];
         });
     }
-}
\ No newline at end of file
+}
diff --git a/app/Ninja/Import/Hiveage/InvoiceTransformer.php b/app/Ninja/Import/Hiveage/InvoiceTransformer.php
index eab836eed2ac..a35e0a6d65aa 100644
--- a/app/Ninja/Import/Hiveage/InvoiceTransformer.php
+++ b/app/Ninja/Import/Hiveage/InvoiceTransformer.php
@@ -27,8 +27,8 @@ class InvoiceTransformer extends BaseTransformer
                 'client_id' => $this->getClientId($data->client),
                 'invoice_number' => $this->getInvoiceNumber($data->statement_no),
                 'paid' => (float) $data->paid_total,
-                'invoice_date_sql' => $this->getDate($data->date),
-                'due_date_sql' => $this->getDate($data->due_date),
+                'invoice_date_sql' => $this->getDate($data, 'date'),
+                'due_date_sql' => $this->getDate($data, 'due_date'),
                 'invoice_items' => [
                     [
                         'product_key' => '',
@@ -40,4 +40,4 @@ class InvoiceTransformer extends BaseTransformer
             ];
         });
     }
-}
\ No newline at end of file
+}
diff --git a/app/Ninja/Import/Hiveage/PaymentTransformer.php b/app/Ninja/Import/Hiveage/PaymentTransformer.php
index fe091a5eff56..2057c32a94fc 100644
--- a/app/Ninja/Import/Hiveage/PaymentTransformer.php
+++ b/app/Ninja/Import/Hiveage/PaymentTransformer.php
@@ -17,7 +17,7 @@ class PaymentTransformer extends BaseTransformer
         return new Item($data, function ($data) {
             return [
                 'amount' => $data->paid_total,
-                'payment_date_sql' => $this->getDate($data->last_paid_on),
+                'payment_date_sql' => $this->getDate($data, 'last_paid_on'),
                 'client_id' => $data->client_id,
                 'invoice_id' => $data->invoice_id,
             ];
diff --git a/app/Ninja/Import/Nutcache/InvoiceTransformer.php b/app/Ninja/Import/Nutcache/InvoiceTransformer.php
index 227a4f587837..463585e89cc6 100644
--- a/app/Ninja/Import/Nutcache/InvoiceTransformer.php
+++ b/app/Ninja/Import/Nutcache/InvoiceTransformer.php
@@ -30,8 +30,8 @@ class InvoiceTransformer extends BaseTransformer
                 'po_number' => $this->getString($data, 'purchase_order'),
                 'terms' => $this->getString($data, 'terms'),
                 'public_notes' => $this->getString($data, 'notes'),
-                'invoice_date_sql' => $this->getDate($data->date),
-                'due_date_sql' => $this->getDate($data->due_date),
+                'invoice_date_sql' => $this->getDate($data, 'date'),
+                'due_date_sql' => $this->getDate($data, 'due_date'),
                 'invoice_items' => [
                     [
                         'product_key' => '',
@@ -43,4 +43,4 @@ class InvoiceTransformer extends BaseTransformer
             ];
         });
     }
-}
\ No newline at end of file
+}
diff --git a/app/Ninja/Import/Nutcache/PaymentTransformer.php b/app/Ninja/Import/Nutcache/PaymentTransformer.php
index fcdf139e6d13..cd7737d44073 100644
--- a/app/Ninja/Import/Nutcache/PaymentTransformer.php
+++ b/app/Ninja/Import/Nutcache/PaymentTransformer.php
@@ -17,7 +17,7 @@ class PaymentTransformer extends BaseTransformer
         return new Item($data, function ($data) {
             return [
                 'amount' => (float) $data->paid_to_date,
-                'payment_date_sql' => $this->getDate($data->date),
+                'payment_date_sql' => $this->getDate($data, 'date'),
                 'client_id' => $data->client_id,
                 'invoice_id' => $data->invoice_id,
             ];
diff --git a/app/Ninja/Import/Wave/InvoiceTransformer.php b/app/Ninja/Import/Wave/InvoiceTransformer.php
index 0ae418ebaa1a..9dff9c39db6f 100644
--- a/app/Ninja/Import/Wave/InvoiceTransformer.php
+++ b/app/Ninja/Import/Wave/InvoiceTransformer.php
@@ -27,8 +27,8 @@ class InvoiceTransformer extends BaseTransformer
                 'client_id' => $this->getClientId($data->customer),
                 'invoice_number' => $this->getInvoiceNumber($data->invoice_num),
                 'po_number' => $this->getString($data, 'po_so'),
-                'invoice_date_sql' => $this->getDate($data->invoice_date),
-                'due_date_sql' => $this->getDate($data->due_date),
+                'invoice_date_sql' => $this->getDate($data, 'invoice_date'),
+                'due_date_sql' => $this->getDate($data, 'due_date'),
                 'paid' => 0,
                 'invoice_items' => [
                     [
@@ -41,4 +41,4 @@ class InvoiceTransformer extends BaseTransformer
             ];
         });
     }
-}
\ No newline at end of file
+}
diff --git a/app/Ninja/Import/Wave/PaymentTransformer.php b/app/Ninja/Import/Wave/PaymentTransformer.php
index dbfbf6741e60..d08225b8e3c4 100644
--- a/app/Ninja/Import/Wave/PaymentTransformer.php
+++ b/app/Ninja/Import/Wave/PaymentTransformer.php
@@ -21,7 +21,7 @@ class PaymentTransformer extends BaseTransformer
         return new Item($data, function ($data) {
             return [
                 'amount' => (float) $data->amount,
-                'payment_date_sql' => $this->getDate($data->payment_date),
+                'payment_date_sql' => $this->getDate($data, 'payment_date'),
                 'client_id' => $this->getInvoiceClientId($data->invoice_num),
                 'invoice_id' => $this->getInvoiceId($data->invoice_num),
             ];