Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 02:57:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #616 from turbo124/master

Browse Source 
Working on API
This commit is contained in:
David Bomba 2016-01-12 20:30:32 +11:00
commit dab86580ba
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -223,6 +223,9 @@ class InvoiceRepository extends BaseRepository
if (isset($data['invoice_number']) && !$invoice->is_recurring) { if (isset($data['invoice_number']) && !$invoice->is_recurring) {
$invoice->invoice_number = trim($data['invoice_number']); $invoice->invoice_number = trim($data['invoice_number']);
} }
elseif (!isset($data['invoice_number']) && !$invoice->is_recurring) {
$invoice->invoice_number = $account->getNextInvoiceNumber($invoice);
}
if (isset($data['discount'])) { if (isset($data['discount'])) {
$invoice->discount = round(Utils::parseFloat($data['discount']), 2); $invoice->discount = round(Utils::parseFloat($data['discount']), 2);

2
app/Ninja/Transformers/AccountTransformer.php
View File

@ -13,7 +13,7 @@ class AccountTransformer extends EntityTransformer
protected $defaultIncludes = [ protected $defaultIncludes = [
'users', 'users',
// 'clients', // 'clients',
'invoices', // 'invoices',
'products', 'products',
'taxRates' 'taxRates'
]; ];