Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improvements to CSV import

Browse Source
This commit is contained in:
Hillel Coren 2017-01-15 21:48:31 +02:00
parent dda0ca8a8c
commit 93898e0efe
10 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Ninja/Import/BaseTransformer.php
View File

@ -1,5 +1,6 @@
<?php namespace App\Ninja\Import; <?php namespace App\Ninja\Import;
use Carbon;
use Utils; use Utils;
use DateTime; use DateTime;
use League\Fractal\TransformerAbstract; use League\Fractal\TransformerAbstract;
@ -128,10 +129,14 @@ class BaseTransformer extends TransformerAbstract
* @param string $format * @param string $format
* @return null * @return null
*/ */
public function getDate($date, $format = 'Y-m-d') public function getDate($data, $field)
{ {
if ( ! $date instanceof DateTime) { if ($date = data_get($data, $field)) {
$date = DateTime::createFromFormat($format, $date); try {
$date = new Carbon($date);
} catch (Exception $e) {
// if we fail to parse return blank
}
} }
return $date ? $date->format('Y-m-d') : null; return $date ? $date->format('Y-m-d') : null;

3
app/Ninja/Import/CSV/InvoiceTransformer.php
View File

@ -30,7 +30,8 @@ class InvoiceTransformer extends BaseTransformer
'po_number' => $this->getString($data, 'po_number'), 'po_number' => $this->getString($data, 'po_number'),
'terms' => $this->getString($data, 'terms'), 'terms' => $this->getString($data, 'terms'),
'public_notes' => $this->getString($data, 'public_notes'), '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' => [ 'invoice_items' => [
[ [
'product_key' => '', 'product_key' => '',

2
app/Ninja/Import/Harvest/InvoiceTransformer.php
View File

@ -28,7 +28,7 @@ class InvoiceTransformer extends BaseTransformer
'invoice_number' => $this->getInvoiceNumber($data->id), 'invoice_number' => $this->getInvoiceNumber($data->id),
'paid' => (float) $data->paid_amount, 'paid' => (float) $data->paid_amount,
'po_number' => $this->getString($data, 'po_number'), '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' => [ 'invoice_items' => [
[ [
'product_key' => '', 'product_key' => '',

2
app/Ninja/Import/Harvest/PaymentTransformer.php
View File

@ -17,7 +17,7 @@ class PaymentTransformer extends BaseTransformer
return new Item($data, function ($data) { return new Item($data, function ($data) {
return [ return [
'amount' => $data->paid_amount, '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, 'client_id' => $data->client_id,
'invoice_id' => $data->invoice_id, 'invoice_id' => $data->invoice_id,
]; ];

4
app/Ninja/Import/Hiveage/InvoiceTransformer.php
View File

@ -27,8 +27,8 @@ class InvoiceTransformer extends BaseTransformer
'client_id' => $this->getClientId($data->client), 'client_id' => $this->getClientId($data->client),
'invoice_number' => $this->getInvoiceNumber($data->statement_no), 'invoice_number' => $this->getInvoiceNumber($data->statement_no),
'paid' => (float) $data->paid_total, 'paid' => (float) $data->paid_total,
'invoice_date_sql' => $this->getDate($data->date), 'invoice_date_sql' => $this->getDate($data, 'date'),
'due_date_sql' => $this->getDate($data->due_date), 'due_date_sql' => $this->getDate($data, 'due_date'),
'invoice_items' => [ 'invoice_items' => [
[ [
'product_key' => '', 'product_key' => '',

2
app/Ninja/Import/Hiveage/PaymentTransformer.php
View File

@ -17,7 +17,7 @@ class PaymentTransformer extends BaseTransformer
return new Item($data, function ($data) { return new Item($data, function ($data) {
return [ return [
'amount' => $data->paid_total, '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, 'client_id' => $data->client_id,
'invoice_id' => $data->invoice_id, 'invoice_id' => $data->invoice_id,
]; ];

4
app/Ninja/Import/Nutcache/InvoiceTransformer.php
View File

@ -30,8 +30,8 @@ class InvoiceTransformer extends BaseTransformer
'po_number' => $this->getString($data, 'purchase_order'), 'po_number' => $this->getString($data, 'purchase_order'),
'terms' => $this->getString($data, 'terms'), 'terms' => $this->getString($data, 'terms'),
'public_notes' => $this->getString($data, 'notes'), 'public_notes' => $this->getString($data, 'notes'),
'invoice_date_sql' => $this->getDate($data->date), 'invoice_date_sql' => $this->getDate($data, 'date'),
'due_date_sql' => $this->getDate($data->due_date), 'due_date_sql' => $this->getDate($data, 'due_date'),
'invoice_items' => [ 'invoice_items' => [
[ [
'product_key' => '', 'product_key' => '',

2
app/Ninja/Import/Nutcache/PaymentTransformer.php
View File

@ -17,7 +17,7 @@ class PaymentTransformer extends BaseTransformer
return new Item($data, function ($data) { return new Item($data, function ($data) {
return [ return [
'amount' => (float) $data->paid_to_date, '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, 'client_id' => $data->client_id,
'invoice_id' => $data->invoice_id, 'invoice_id' => $data->invoice_id,
]; ];

4
app/Ninja/Import/Wave/InvoiceTransformer.php
View File

@ -27,8 +27,8 @@ class InvoiceTransformer extends BaseTransformer
'client_id' => $this->getClientId($data->customer), 'client_id' => $this->getClientId($data->customer),
'invoice_number' => $this->getInvoiceNumber($data->invoice_num), 'invoice_number' => $this->getInvoiceNumber($data->invoice_num),
'po_number' => $this->getString($data, 'po_so'), 'po_number' => $this->getString($data, 'po_so'),
'invoice_date_sql' => $this->getDate($data->invoice_date), 'invoice_date_sql' => $this->getDate($data, 'invoice_date'),
'due_date_sql' => $this->getDate($data->due_date), 'due_date_sql' => $this->getDate($data, 'due_date'),
'paid' => 0, 'paid' => 0,
'invoice_items' => [ 'invoice_items' => [
[ [

2
app/Ninja/Import/Wave/PaymentTransformer.php
View File

@ -21,7 +21,7 @@ class PaymentTransformer extends BaseTransformer
return new Item($data, function ($data) { return new Item($data, function ($data) {
return [ return [
'amount' => (float) $data->amount, '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), 'client_id' => $this->getInvoiceClientId($data->invoice_num),
'invoice_id' => $this->getInvoiceId($data->invoice_num), 'invoice_id' => $this->getInvoiceId($data->invoice_num),
]; ];