Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 20:52:56 +01:00
Code Issues Releases Activity

Merge branch 'master' of github.com:hillelcoren/invoice-ninja

Browse Source
This commit is contained in:
Hillel Coren 2015-12-07 15:35:02 +02:00
commit f600cbb6dd
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,15 @@ class AccountTransformer extends EntityTransformer
'language_id' => (int) $account->language_id,
'fill_products' => (bool) $account->fill_products,
'update_products' => (bool) $account->update_products,
'vat_number' => $account->vat_number
'vat_number' => $account->vat_number,
'custom_invoice_label1' => $account->custom_invoice_label1,
'custom_invoice_label2' => $account->custom_invoice_label2,
'custom_invoice_taxes1' => $account->custom_invoice_taxes1,
'custom_invoice_taxes2' => $account->custom_invoice_taxes1,
'custom_label1' => $account->custom_label1,
'custom_label2' => $account->custom_label2,
'custom_value1' => $account->custom_value1,
'custom_value2' => $account->custom_value2
];
}
}

4
app/Ninja/Transformers/InvoiceTransformer.php
View File

@ -64,7 +64,9 @@ class InvoiceTransformer extends EntityTransformer
'has_tasks' => (bool) $invoice->has_tasks,
'auto_bill' => (bool) $invoice->auto_bill,
'account_key' => $this->account->account_key,
'user_id' => (int) $invoice->user->public_id + 1
'user_id' => (int) $invoice->user->public_id + 1,
'custom_value1' => $invoice->custom_value1,
'custom_value2' => $invoice->custom_value2
];
}
}