From a28b63ce0fadcfb0a5147e9444dcffbdc4d8d590 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 30 Apr 2017 12:44:48 +0300 Subject: [PATCH] Return public ids for default tax rates in the API --- app/Http/Controllers/AccountApiController.php | 2 +- app/Ninja/Transformers/AccountTransformer.php | 2 +- app/Ninja/Transformers/ProductTransformer.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php index cc20a725c211..f73a7d2b7cff 100644 --- a/app/Http/Controllers/AccountApiController.php +++ b/app/Http/Controllers/AccountApiController.php @@ -78,7 +78,7 @@ class AccountApiController extends BaseAPIController $updatedAt = $request->updated_at ? date('Y-m-d H:i:s', $request->updated_at) : false; $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'); return $this->response($account); diff --git a/app/Ninja/Transformers/AccountTransformer.php b/app/Ninja/Transformers/AccountTransformer.php index 071d0670965e..2effb3b97d40 100644 --- a/app/Ninja/Transformers/AccountTransformer.php +++ b/app/Ninja/Transformers/AccountTransformer.php @@ -213,7 +213,7 @@ class AccountTransformer extends EntityTransformer 'num_days_reminder3' => $account->num_days_reminder3, 'custom_invoice_text_label1' => $account->custom_invoice_text_label1, '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, 'invoice_number_pattern' => $account->invoice_number_pattern, 'quote_number_pattern' => $account->quote_number_pattern, diff --git a/app/Ninja/Transformers/ProductTransformer.php b/app/Ninja/Transformers/ProductTransformer.php index 241e3e992f0d..ceba995c6223 100644 --- a/app/Ninja/Transformers/ProductTransformer.php +++ b/app/Ninja/Transformers/ProductTransformer.php @@ -27,7 +27,7 @@ class ProductTransformer extends EntityTransformer 'notes' => $product->notes, 'cost' => $product->cost, '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), 'archived_at' => $this->getTimestamp($product->deleted_at), ]);