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

Merge fix for expense categories in API

Browse Source
This commit is contained in:
Hillel Coren 2016-11-29 19:54:40 +02:00
parent b3b18e1510
commit 243f345e85
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ class ExpenseApiController extends BaseAPIController
{ {
$expenses = Expense::scope() $expenses = Expense::scope()
->withTrashed() ->withTrashed()
->with('client', 'invoice', 'vendor') ->with('client', 'invoice', 'vendor', 'expense_category')
->orderBy('created_at','desc'); ->orderBy('created_at','desc');
return $this->listResponse($expenses); return $this->listResponse($expenses);

6
app/Ninja/Transformers/ExpenseTransformer.php
View File

@ -7,7 +7,7 @@ class ExpenseTransformer extends EntityTransformer
public function __construct($account = null, $serializer = null, $client = null) public function __construct($account = null, $serializer = null, $client = null)
{ {
parent::__construct($account, $serializer); parent::__construct($account, $serializer);
$this->client = $client; $this->client = $client;
} }
@ -23,7 +23,7 @@ class ExpenseTransformer extends EntityTransformer
'transaction_id' => $expense->transaction_id, 'transaction_id' => $expense->transaction_id,
'bank_id' => $expense->bank_id, 'bank_id' => $expense->bank_id,
'expense_currency_id' => (int) $expense->expense_currency_id, 'expense_currency_id' => (int) $expense->expense_currency_id,
'expense_category_id' => (int) $expense->expense_category_id, 'expense_category_id' => $expense->expense_category ? (int) $expense->expense_category->public_id : null,
'amount' => (float) $expense->amount, 'amount' => (float) $expense->amount,
'expense_date' => $expense->expense_date, 'expense_date' => $expense->expense_date,
'exchange_rate' => (float) $expense->exchange_rate, 'exchange_rate' => (float) $expense->exchange_rate,
@ -38,4 +38,4 @@ class ExpenseTransformer extends EntityTransformer
'vendor_id' => isset($expense->vendor->public_id) ? (int) $expense->vendor->public_id : null, 'vendor_id' => isset($expense->vendor->public_id) ? (int) $expense->vendor->public_id : null,
]); ]);
} }
} }