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

Return public ids for default tax rates in the API

Browse Source
This commit is contained in:
Hillel Coren 2017-04-30 12:44:48 +03:00
parent af8d4ad370
commit a28b63ce0f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AccountApiController.php
View File

@ -78,7 +78,7 @@ class AccountApiController extends BaseAPIController
$updatedAt = $request->updated_at ? date('Y-m-d H:i:s', $request->updated_at) : false; $updatedAt = $request->updated_at ? date('Y-m-d H:i:s', $request->updated_at) : false;
$transformer = new AccountTransformer(null, $request->serializer); $transformer = new AccountTransformer(null, $request->serializer);
$account->load(array_merge($transformer->getDefaultIncludes(), ['projects.client'])); $account->load(array_merge($transformer->getDefaultIncludes(), ['projects.client', 'products.default_tax_rate']));
$account = $this->createItem($account, $transformer, 'account'); $account = $this->createItem($account, $transformer, 'account');
return $this->response($account); return $this->response($account);

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

@ -213,7 +213,7 @@ class AccountTransformer extends EntityTransformer
'num_days_reminder3' => $account->num_days_reminder3, 'num_days_reminder3' => $account->num_days_reminder3,
'custom_invoice_text_label1' => $account->custom_invoice_text_label1, 'custom_invoice_text_label1' => $account->custom_invoice_text_label1,
'custom_invoice_text_label2' => $account->custom_invoice_text_label2, 'custom_invoice_text_label2' => $account->custom_invoice_text_label2,
'default_tax_rate_id' => $account->default_tax_rate_id, 'default_tax_rate_id' => $account->default_tax_rate_id ? $account->default_tax_rate->public_id : 0,
'recurring_hour' => $account->recurring_hour, 'recurring_hour' => $account->recurring_hour,
'invoice_number_pattern' => $account->invoice_number_pattern, 'invoice_number_pattern' => $account->invoice_number_pattern,
'quote_number_pattern' => $account->quote_number_pattern, 'quote_number_pattern' => $account->quote_number_pattern,

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

@ -27,7 +27,7 @@ class ProductTransformer extends EntityTransformer
'notes' => $product->notes, 'notes' => $product->notes,
'cost' => $product->cost, 'cost' => $product->cost,
'qty' => $product->qty, 'qty' => $product->qty,
'default_tax_rate_id' => $product->default_tax_rate_id, 'default_tax_rate_id' => $product->default_tax_rate_id ? $product->default_tax_rate->public_id : 0,
'updated_at' => $this->getTimestamp($product->updated_at), 'updated_at' => $this->getTimestamp($product->updated_at),
'archived_at' => $this->getTimestamp($product->deleted_at), 'archived_at' => $this->getTimestamp($product->deleted_at),
]); ]);