Working on data import

app/Http/Controllers/ImportController.php

@@ -47,6 +47,7 @@ class ImportController extends BaseController
                 }
             }
         } catch (Exception $exception) {
+            Utils::logError($exception);
             Session::flash('error', $exception->getMessage());
         }
 
@@ -72,6 +73,7 @@ class ImportController extends BaseController
                 Session::flash('message', trans('texts.imported_file'));
             }
         } catch (Exception $exception) {
+            Utils::logError($exception);
             Session::flash('error', $exception->getMessage());
         }
 

app/Libraries/Utils.php

@@ -7,6 +7,7 @@ use App;
 use Schema;
 use Session;
 use Request;
+use Exception;
 use View;
 use DateTimeZone;
 use Input;
@@ -35,7 +36,7 @@ class Utils
             if (Schema::hasTable('accounts')) {
                 return true;
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
     }
@@ -198,6 +199,10 @@ class Utils
 
     public static function logError($error, $context = 'PHP')
     {
+        if ($error instanceof Exception) {
+            $error = self::getErrorString($error);
+        }
+
         $count = Session::get('error_count', 0);
         Session::put('error_count', ++$count);
         if ($count > 100) {

app/Ninja/Import/BaseTransformer.php

@@ -0,0 +1,58 @@
+<?php namespace App\Ninja\Import;
+
+use Utils;
+use DateTime;
+use League\Fractal\TransformerAbstract;
+
+class BaseTransformer extends TransformerAbstract
+{
+    protected $maps;
+
+    public function __construct($maps)
+    {
+        $this->maps = $maps;
+    }
+
+    protected function hasClient($name)
+    {
+        $name = strtolower($name);
+        return isset($this->maps[ENTITY_CLIENT][$name]);
+    }
+
+    protected function getClientId($name)
+    {
+        $name = strtolower($name);
+        return isset($this->maps[ENTITY_CLIENT][$name]) ? $this->maps[ENTITY_CLIENT][$name] : null;
+    }
+
+    protected function getCountryId($name)
+    {
+        $name = strtolower($name);
+        return isset($this->maps['countries'][$name]) ? $this->maps['countries'][$name] : null;
+    }
+
+    protected function getFirstName($name)
+    {
+        $name = Utils::splitName($name);
+        return $name[0];
+    }
+
+    protected function getDate($date, $format = 'Y-m-d')
+    {
+        $date = DateTime::createFromFormat($format, $date);
+        return $date ? $date->format('Y-m-d') : null;
+    }
+
+    protected function getLastName($name)
+    {
+        $name = Utils::splitName($name);
+        return $name[1];
+    }
+
+    protected function hasInvoice($invoiceNumber)
+    {
+        $invoiceNumber = strtolower($invoiceNumber);
+        return isset($this->maps[ENTITY_INVOICE][$invoiceNumber]);
+    }
+
+}

app/Ninja/Import/CSV/ClientTransformer.php

@@ -1,22 +1,17 @@
 <?php namespace App\Ninja\Import\CSV;
 
-use League\Fractal\TransformerAbstract;
+use App\Ninja\Import\BaseTransformer;
-use App\Models\Country;
 use League\Fractal\Resource\Item;
 
-class ClientTransformer extends TransformerAbstract
+class ClientTransformer extends BaseTransformer
 {
-    public function transform($data, $maps)
+    public function transform($data)
     {
-        if (isset($maps[ENTITY_CLIENT][$data->name])) {
+        if (isset($data->name) && $this->hasClient($data->name)) {
             return false;
         }
 
-        if (isset($maps['countries'][$data->country])) {
+        return new Item($data, function ($data) {
-            $data->country_id = $maps['countries'][$data->country];
-        }
-
-        return new Item($data, function ($data) use ($maps) {
             return [
                 'name' => isset($data->name) ? $data->name : null,
                 'work_phone' => isset($data->work_phone) ? $data->work_phone : null,
@@ -33,7 +28,7 @@ class ClientTransformer extends TransformerAbstract
                         'phone' => isset($data->phone) ? $data->phone : null,
                     ],
                 ],
-                'country_id' => isset($data->country_id) ? $data->country_id : null,
+                'country_id' => isset($data->country) ? $this->getCountryId($data->country) : null,
             ];
         });
     }

app/Ninja/Import/CSV/InvoiceTransformer.php

@@ -1,28 +1,25 @@
 <?php namespace App\Ninja\Import\CSV;
 
-use League\Fractal\TransformerAbstract;
+use App\Ninja\Import\BaseTransformer;
 use League\Fractal\Resource\Item;
-use App\Models\Client;
 
-class InvoiceTransformer extends TransformerAbstract
+class InvoiceTransformer extends BaseTransformer
 {
-    public function transform($data, $maps)
+    public function transform($data)
     {
-        if (isset($maps[ENTITY_INVOICE][$data->invoice_number])) {
+        if ( ! $this->getClientId($data->name)) {
             return false;
         }
 
-        if (isset($maps[ENTITY_CLIENT][$data->name])) {
+        if (isset($data->invoice_number) && $this->hasInvoice($data->invoice_number)) {
-            $data->client_id = $maps[ENTITY_CLIENT][$data->name];
-        } else {
             return false;
         }
 
-        return new Item($data, function ($data) use ($maps) {
+        return new Item($data, function ($data) {
             return [
                 'invoice_number' => isset($data->invoice_number) ? $data->invoice_number : null,
                 'paid' => isset($data->paid) ? (float) $data->paid : null,
-                'client_id' => (int) $data->client_id,
+                'client_id' => $this->getClientId($data->name),
                 'po_number' => isset($data->po_number) ? $data->po_number : null,
                 'terms' => isset($data->terms) ? $data->terms : null,
                 'public_notes' => isset($data->notes) ? $data->notes : null,

app/Ninja/Import/CSV/PaymentTransformer.php

@@ -1,13 +1,13 @@
 <?php namespace App\Ninja\Import\CSV;
 
-use League\Fractal\TransformerAbstract;
+use App\Ninja\Import\BaseTransformer;
 use League\Fractal\Resource\Item;
 
-class PaymentTransformer extends TransformerAbstract
+class PaymentTransformer extends BaseTransformer
 {
-    public function transform($data, $maps)
+    public function transform($data)
     {
-        return new Item($data, function ($data) use ($maps) {
+        return new Item($data, function ($data) {
             return [
                 'amount' => $data->paid,
                 'payment_date_sql' => isset($data->invoice_date) ? $data->invoice_date : null,

app/Ninja/Import/FreshBooks/ClientTransformer.php

@@ -1,22 +1,17 @@
 <?php namespace App\Ninja\Import\FreshBooks;
 
-use League\Fractal\TransformerAbstract;
+use App\Ninja\Import\BaseTransformer;
-use App\Models\Country;
 use League\Fractal\Resource\Item;
 
-class ClientTransformer extends TransformerAbstract
+class ClientTransformer extends BaseTransformer
 {
-    public function transform($data, $maps)
+    public function transform($data)
     {
-        if (isset($maps[ENTITY_CLIENT][$data->organization])) {
+        if ($this->hasClient($data->organization)) {
             return false;
         }
 
-        if (isset($maps['countries'][$data->country])) {
+        return new Item($data, function ($data) {
-            $data->country_id = $maps['countries'][$data->country];
-        }
-
-        return new Item($data, function ($data) use ($maps) {
             return [
                 'name' => $data->organization,
                 'work_phone' => $data->busphone,
@@ -34,7 +29,7 @@ class ClientTransformer extends TransformerAbstract
                         'phone' => $data->mobphone ?: $data->homephone,
                     ],
                 ],
-                'country_id' => $data->country_id,
+                'country_id' => $this->getCountryId($data->country),
             ];
         });
     }

app/Ninja/Import/FreshBooks/InvoiceTransformer.php

@@ -1,28 +1,25 @@
 <?php namespace App\Ninja\Import\FreshBooks;
 
-use League\Fractal\TransformerAbstract;
+use App\Ninja\Import\BaseTransformer;
 use League\Fractal\Resource\Item;
-use App\Models\Client;
 
-class InvoiceTransformer extends TransformerAbstract
+class InvoiceTransformer extends BaseTransformer
 {
-    public function transform($data, $maps)
+    public function transform($data)
     {
-        if (isset($maps[ENTITY_INVOICE][$data->invoice_number])) {
+        if ( ! $this->getClientId($data->organization)) {
             return false;
         }
 
-        if (isset($maps[ENTITY_CLIENT][$data->organization])) {
+        if ($this->hasInvoice($data->invoice_number)) {
-            $data->client_id = $maps[ENTITY_CLIENT][$data->organization];
-        } else {
             return false;
         }
 
-        return new Item($data, function ($data) use ($maps) {
+        return new Item($data, function ($data) {
             return [
                 'invoice_number' => $data->invoice_number,
                 'paid' => (float) $data->paid,
-                'client_id' => (int) $data->client_id,
+                'client_id' => $this->getClientId($data->organization),
                 'po_number' => $data->po_number,
                 'terms' => $data->terms,
                 'public_notes' => $data->notes,

app/Ninja/Import/FreshBooks/PaymentTransformer.php

@@ -1,9 +1,9 @@
 <?php namespace App\Ninja\Import\FreshBooks;
 
-use League\Fractal\TransformerAbstract;
+use App\Ninja\Import\BaseTransformer;
 use League\Fractal\Resource\Item;
 
-class PaymentTransformer extends TransformerAbstract
+class PaymentTransformer extends BaseTransformer
 {
     public function transform($data, $maps)
     {

app/Ninja/Import/FreshBooks/TaskTransformer.php

@@ -1,10 +1,10 @@
 <?php namespace App\Ninja\Import\FreshBooks;
 
-use League\Fractal\TransformerAbstract;
+use App\Ninja\Import\BaseTransformer;
-use Illuminate\Support\Facades\Auth;
+use League\Fractal\Resource\Item;
 
 /*
-class TaskTransformer extends TransformerAbstract
+class TaskTransformer extends BaseTransformer
 {
 
     public function transform($data)

app/Ninja/Import/Harvest/ClientTransformer.php

@@ -1,18 +1,17 @@
 <?php namespace App\Ninja\Import\Harvest;
 
-use League\Fractal\TransformerAbstract;
+use App\Ninja\Import\BaseTransformer;
-use App\Models\Country;
 use League\Fractal\Resource\Item;
 
-class ClientTransformer extends TransformerAbstract
+class ClientTransformer extends BaseTransformer
 {
-    public function transform($data, $maps)
+    public function transform($data)
     {
-        if (isset($maps[ENTITY_CLIENT][$data->client_name])) {
+        if ($this->hasClient($data->client_name)) {
             return false;
         }
 
-        return new Item($data, function ($data) use ($maps) {
+        return new Item($data, function ($data) {
             return [
                 'name' => $data->client_name,
             ];

app/Ninja/Import/Harvest/ContactTransformer.php

@@ -1,22 +1,19 @@
 <?php namespace App\Ninja\Import\Harvest;
 
-use League\Fractal\TransformerAbstract;
+use App\Ninja\Import\BaseTransformer;
-use App\Models\Country;
 use League\Fractal\Resource\Item;
 
-class ContactTransformer extends TransformerAbstract
+class ContactTransformer extends BaseTransformer
 {
-    public function transform($data, $maps)
+    public function transform($data)
     {
-        if (isset($maps[ENTITY_CLIENT][$data->client])) {
+        if ( ! $this->hasClient($data->client)) {
-            $data->client_id = $maps[ENTITY_CLIENT][$data->client];
-        } else {
             return false;
         }
 
-        return new Item($data, function ($data) use ($maps) {
+        return new Item($data, function ($data) {
             return [
-                'client_id' => $data->client_id,
+                'client_id' => $this->getClientId($data->client),
                 'first_name' => $data->first_name,
                 'last_name' => $data->last_name,
                 'email' => $data->email,

app/Ninja/Import/Harvest/InvoiceTransformer.php

@@ -1,36 +1,27 @@
 <?php namespace App\Ninja\Import\Harvest;
 
-use League\Fractal\TransformerAbstract;
+use App\Ninja\Import\BaseTransformer;
 use League\Fractal\Resource\Item;
-use App\Models\Client;
-use DateTime;
 
-class InvoiceTransformer extends TransformerAbstract
+class InvoiceTransformer extends BaseTransformer
 {
-    public function transform($data, $maps)
+    public function transform($data)
     {
-        if (isset($maps[ENTITY_INVOICE][$data->id])) {
+        if ( ! $this->getClientId($data->client)) {
             return false;
         }
 
-        if (isset($maps[ENTITY_CLIENT][$data->client])) {
+        if ($this->hasInvoice($data->id)) {
-            $data->client_id = $maps[ENTITY_CLIENT][$data->client];
-        } else {
             return false;
         }
 
-        return new Item($data, function ($data) use ($maps) {
+        return new Item($data, function ($data) {
-
-            $invoiceDate = DateTime::createFromFormat('m/d/Y', $data->issue_date);
-
             return [
                 'invoice_number' => $data->id,
                 'paid' => (float) $data->paid_amount,
-                'client_id' => (int) $data->client_id,
+                'client_id' => $this->getClientId($data->client),
                 'po_number' => $data->po_number,
-                'invoice_date_sql' => $invoiceDate->format('Y-m-d'),
+                'invoice_date_sql' => $this->getDate($data->issue_date, 'm/d/Y'),
-                'tax_rate' => $data->tax ?: null,
-                'tax_name' => $data->tax ? trans('texts.tax') : null,
                 'invoice_items' => [
                     [
                         'notes' => $data->subject,

app/Ninja/Import/Harvest/PaymentTransformer.php

@@ -1,20 +1,16 @@
 <?php namespace App\Ninja\Import\Harvest;
 
-use League\Fractal\TransformerAbstract;
+use App\Ninja\Import\BaseTransformer;
 use League\Fractal\Resource\Item;
-use DateTime;
 
-class PaymentTransformer extends TransformerAbstract
+class PaymentTransformer extends BaseTransformer
 {
-    public function transform($data, $maps)
+    public function transform($data)
     {
-        return new Item($data, function ($data) use ($maps) {
+        return new Item($data, function ($data) {
-
-            $paymentDate = DateTime::createFromFormat('m/d/Y', $data->last_payment_date);
-
             return [
                 'amount' => $data->paid_amount,
-                'payment_date_sql' => $paymentDate ? $paymentDate->format('Y-m-d') : null,
+                'payment_date_sql' => $this->getDate($data->last_payment_date, 'm/d/Y'),
                 'client_id' => $data->client_id,
                 'invoice_id' => $data->invoice_id,
             ];

app/Ninja/Import/Hiveage/ClientTransformer.php

@@ -0,0 +1,35 @@
+<?php namespace App\Ninja\Import\Hiveage;
+
+use App\Ninja\Import\BaseTransformer;
+use League\Fractal\Resource\Item;
+
+class ClientTransformer extends BaseTransformer
+{
+    public function transform($data)
+    {
+        if ($this->hasClient($data->name)) {
+            return false;
+        }
+
+        return new Item($data, function ($data) {
+            return [
+                'name' => $data->name,
+                'contacts' => [
+                    [
+                        'first_name' => $this->getFirstName($data->primary_contact),
+                        'last_name' => $this->getLastName($data->primary_contactk),
+                        'email' => $data->business_email,
+                    ],
+                ],
+                'address1' => $data->address_1,
+                'address2' => $data->address_2,
+                'city' => $data->city,
+                'state' => $data->state_name,
+                'postal_code' => $data->zip_code,
+                'work_phone' => $data->phone,
+                'website' => $data->website,
+                'country_id' => $this->getCountryId($data->country),
+            ];
+        });
+    }
+}

app/Ninja/Import/Hiveage/InvoiceTransformer.php

@@ -0,0 +1,35 @@
+<?php namespace App\Ninja\Import\Hiveage;
+
+use App\Ninja\Import\BaseTransformer;
+use League\Fractal\Resource\Item;
+
+class InvoiceTransformer extends BaseTransformer
+{
+    public function transform($data)
+    {
+        if ( ! $this->getClientId($data->client)) {
+            return false;
+        }
+
+        if ($this->hasInvoice($data->statement_no)) {
+            return false;
+        }
+
+        return new Item($data, function ($data) {
+            return [
+                'invoice_number' => $data->statement_no,
+                'paid' => (float) $data->paid_total,
+                'client_id' => $this->getClientId($data->client),
+                'invoice_date_sql' => $this->getDate($data->date),
+                'due_date_sql' => $this->getDate($data->due_date),
+                'invoice_items' => [
+                    [
+                        'notes' => $data->summary,
+                        'cost' => (float) $data->billed_total,
+                        'qty' => 1,
+                    ]
+                ],
+            ];
+        });
+    }
+}

app/Ninja/Import/Hiveage/PaymentTransformer.php

@@ -0,0 +1,19 @@
+<?php namespace App\Ninja\Import\Hiveage;
+
+use App\Ninja\Import\BaseTransformer;
+use League\Fractal\Resource\Item;
+
+class PaymentTransformer extends BaseTransformer
+{
+    public function transform($data, $maps)
+    {
+        return new Item($data, function ($data) use ($maps) {
+            return [
+                'amount' => $data->paid_total,
+                'payment_date_sql' => $this->getDate($data->last_paid_on),
+                'client_id' => $data->client_id,
+                'invoice_id' => $data->invoice_id,
+            ];
+        });
+    }
+}

app/Ninja/Repositories/InvoiceRepository.php

@@ -262,7 +262,10 @@ class InvoiceRepository extends BaseRepository
         $invoice->invoice_footer = Utils::processVariables($invoice->invoice_footer);
         $invoice->public_notes = Utils::processVariables($invoice->public_notes);
 
+        if (isset($data['po_number'])) {
             $invoice->po_number = trim($data['po_number']);
+        }
+        
         $invoice->invoice_design_id = isset($data['invoice_design_id']) ? $data['invoice_design_id'] : $account->invoice_design_id;
 
         if (isset($data['tax_name']) && isset($data['tax_rate']) && $data['tax_name']) {

app/Services/ImportService.php

@@ -35,7 +35,7 @@ class ImportService
         IMPORT_CSV,
         IMPORT_FRESHBOOKS,
         IMPORT_HARVEST,
-        //IMPORT_HIVEAGE,
+        IMPORT_HIVEAGE,
         //IMPORT_INVOICEABLE,
         //IMPORT_NUTCACHE,
         //IMPORT_RONIN,
@@ -85,7 +85,7 @@ class ImportService
 
     private function saveData($source, $entityType, $row, $maps)
     {
-        $transformer = $this->getTransformer($source, $entityType);
+        $transformer = $this->getTransformer($source, $entityType, $maps);
         $resource = $transformer->transform($row, $maps);
 
         if (!$resource) {
@@ -135,16 +135,16 @@ class ImportService
         return 'App\\Ninja\\Import\\'.$source.'\\'.ucwords($entityType).'Transformer';
     }
 
-    public static function getTransformer($source, $entityType)
+    public static function getTransformer($source, $entityType, $maps)
     {
         $className = self::getTransformerClassName($source, $entityType);
 
-        return new $className();
+        return new $className($maps);
     }
 
     private function createPayment($source, $data, $maps, $clientId, $invoiceId)
     {
-        $paymentTransformer = $this->getTransformer($source, ENTITY_PAYMENT);
+        $paymentTransformer = $this->getTransformer($source, ENTITY_PAYMENT, $maps);
 
         $data->client_id = $clientId;
         $data->invoice_id = $invoiceId;
@@ -190,25 +190,32 @@ class ImportService
         $clientMap = [];
         $clients = $this->clientRepo->all();
         foreach ($clients as $client) {
-            $clientMap[$client->name] = $client->id;
+            $clientMap[strtolower($client->name)] = $client->id;
         }
 
         $invoiceMap = [];
         $invoices = $this->invoiceRepo->all();
         foreach ($invoices as $invoice) {
-            $invoiceMap[$invoice->invoice_number] = $invoice->id;
+            $invoiceMap[strtolower($invoice->invoice_number)] = $invoice->id;
         }
 
         $countryMap = [];
         $countries = Cache::get('countries');
         foreach ($countries as $country) {
-            $countryMap[$country->name] = $country->id;
+            $countryMap[strtolower($country->name)] = $country->id;
+        }
+
+        $currencyMap = [];
+        $currencies = Cache::get('currencies');
+        foreach ($currencies as $currency) {
+            $currencyMap[strtolower($currency->code)] = $currency->id;
         }
 
         return [
             ENTITY_CLIENT => $clientMap,
             ENTITY_INVOICE => $invoiceMap,
             'countries' => $countryMap,
+            'currencies' => $currencyMap,
         ];
     }
 

readme.md

@@ -23,7 +23,7 @@ There are two options:
 
 ### Requirements
 * PHP >= 5.4.0
-* MCrypt Extension
+* MCrypt PHP Extension
 * MySQL
 
 ### Features