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

Fix for expenseCategories

Browse Source
This commit is contained in:
Hillel Coren 2016-07-04 20:19:22 +03:00
parent 0dc9b3fceb
commit 251438dc41
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Account.php
View File

@ -283,7 +283,7 @@ class Account extends Eloquent
/** /**
* @return mixed * @return mixed
*/ */
public function expenseCategories() public function expense_categories()
{ {
return $this->hasMany('App\Models\ExpenseCategory','account_id','id')->withTrashed(); return $this->hasMany('App\Models\ExpenseCategory','account_id','id')->withTrashed();
} }
@ -1024,7 +1024,7 @@ class Account extends Eloquent
'tax_rates' => [], 'tax_rates' => [],
'expenses' => ['client', 'invoice', 'vendor'], 'expenses' => ['client', 'invoice', 'vendor'],
'payments' => ['invoice'], 'payments' => ['invoice'],
'expenseCategories' => [], 'expense_categories' => [],
]; ];
foreach ($map as $key => $values) { foreach ($map as $key => $values) {

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

@ -33,7 +33,7 @@ class AccountTransformer extends EntityTransformer
public function includeExpenseCategories(Account $account) public function includeExpenseCategories(Account $account)
{ {
$transformer = new ExpenseCategoryTransformer($account, $this->serializer); $transformer = new ExpenseCategoryTransformer($account, $this->serializer);
return $this->includeCollection($account->expenseCategories, $transformer, ENTITY_EXPENSE_CATEGORIES); return $this->includeCollection($account->expense_categories, $transformer, ENTITY_EXPENSE_CATEGORIES);
} }
/** /**
@ -143,4 +143,4 @@ class AccountTransformer extends EntityTransformer
'logo' => $account->logo, 'logo' => $account->logo,
]; ];
} }
} }