Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Improved number parsing for CSV import

Browse Source
This commit is contained in:
Hillel Coren 2016-12-22 19:17:45 +02:00
parent b7465a8f17
commit 4658abfbd4
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,16 @@ class BaseTransformer extends TransformerAbstract
return (isset($data->$field) && $data->$field) ? $data->$field : 0;
}
/**
* @param $data
* @param $field
* @return float
*/
protected function getFloat($data, $field)
{
return (isset($data->$field) && $data->$field) ? Utils::parseFloat($data->$field) : 0;
}
/**
* @param $name
* @return null

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

@ -1,5 +1,6 @@
<?php namespace App\Ninja\Import\CSV;
use Utils;
use App\Ninja\Import\BaseTransformer;
use League\Fractal\Resource\Item;
@ -16,7 +17,7 @@ class ExpenseTransformer extends BaseTransformer
{
return new Item($data, function ($data) {
return [
'amount' => isset($data->amount) ? (float) $data->amount : null,
'amount' => $this->getFloat($data, 'amount'),
'vendor_id' => isset($data->vendor) ? $this->getVendorId($data->vendor) : null,
'client_id' => isset($data->client) ? $this->getClientId($data->client) : null,
'expense_date' => isset($data->expense_date) ? date('Y-m-d', strtotime($data->expense_date)) : null,

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

@ -26,7 +26,7 @@ class InvoiceTransformer extends BaseTransformer
return [
'client_id' => $this->getClientId($data->name),
'invoice_number' => isset($data->invoice_number) ? $this->getInvoiceNumber($data->invoice_number) : null,
'paid' => isset($data->paid) ? (float) $data->paid : null,
'paid' => $this->getFloat($data, 'paid'),
'po_number' => $this->getString($data, 'po_number'),
'terms' => $this->getString($data, 'terms'),
'public_notes' => $this->getString($data, 'public_notes'),
@ -35,11 +35,11 @@ class InvoiceTransformer extends BaseTransformer
[
'product_key' => '',
'notes' => $this->getString($data, 'notes'),
'cost' => isset($data->amount) ? (float) $data->amount : null,
'cost' => $this->getFloat($data, 'amount'),
'qty' => 1,
]
],
];
});
}
}
}

4
app/Ninja/Import/CSV/PaymentTransformer.php
View File

@ -16,11 +16,11 @@ class PaymentTransformer extends BaseTransformer
{
return new Item($data, function ($data) {
return [
'amount' => $data->paid,
'amount' => $this->getFloat($data, 'paid'),
'payment_date_sql' => isset($data->invoice_date) ? $data->invoice_date : null,
'client_id' => $data->client_id,
'invoice_id' => $data->invoice_id,
];
});
}
}
}

2
app/Ninja/Import/CSV/ProductTransformer.php
View File

@ -22,7 +22,7 @@ class ProductTransformer extends BaseTransformer
return [
'product_key' => $this->getString($data, 'product_key'),
'notes' => $this->getString($data, 'notes'),
'cost' => $this->getNumber($data, 'cost'),
'cost' => $this->getFloat($data, 'cost'),
];
});
}