diff --git a/app/Http/Controllers/ExpenseApiController.php b/app/Http/Controllers/ExpenseApiController.php index 465edcc852de..2f38a53362de 100644 --- a/app/Http/Controllers/ExpenseApiController.php +++ b/app/Http/Controllers/ExpenseApiController.php @@ -44,7 +44,7 @@ class ExpenseApiController extends BaseAPIController { $expenses = Expense::scope() ->withTrashed() - ->with('client', 'invoice', 'vendor') + ->with('client', 'invoice', 'vendor', 'expense_category') ->orderBy('created_at','desc'); return $this->listResponse($expenses); diff --git a/app/Ninja/Transformers/ExpenseTransformer.php b/app/Ninja/Transformers/ExpenseTransformer.php index 31248deaa154..953eac338aee 100644 --- a/app/Ninja/Transformers/ExpenseTransformer.php +++ b/app/Ninja/Transformers/ExpenseTransformer.php @@ -7,7 +7,7 @@ class ExpenseTransformer extends EntityTransformer public function __construct($account = null, $serializer = null, $client = null) { parent::__construct($account, $serializer); - + $this->client = $client; } @@ -23,7 +23,7 @@ class ExpenseTransformer extends EntityTransformer 'transaction_id' => $expense->transaction_id, 'bank_id' => $expense->bank_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, 'expense_date' => $expense->expense_date, '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, ]); } -} \ No newline at end of file +}