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 branch 'develop' of github.com:invoiceninja/invoiceninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2017-08-18 09:37:34 +03:00
commit a3522081da
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ class ExpenseTransformer extends EntityTransformer
* @SWG\Property(property="updated_at", type="integer", example=1451160233, readOnly=true) * @SWG\Property(property="updated_at", type="integer", example=1451160233, readOnly=true)
* @SWG\Property(property="archived_at", type="integer", example=1451160233, readOnly=true) * @SWG\Property(property="archived_at", type="integer", example=1451160233, readOnly=true)
* @SWG\Property(property="transaction_id", type="integer", example=1) * @SWG\Property(property="transaction_id", type="integer", example=1)
* @SWG\Property(property="transaction_reference", type="string", example="")
* @SWG\Property(property="bank_id", type="integer", example=1) * @SWG\Property(property="bank_id", type="integer", example=1)
* @SWG\Property(property="expense_currency_id", type="integer", example=1) * @SWG\Property(property="expense_currency_id", type="integer", example=1)
* @SWG\Property(property="expense_category_id", type="integer", example=1) * @SWG\Property(property="expense_category_id", type="integer", example=1)
@ -67,6 +68,7 @@ class ExpenseTransformer extends EntityTransformer
'updated_at' => $this->getTimestamp($expense->updated_at), 'updated_at' => $this->getTimestamp($expense->updated_at),
'archived_at' => $this->getTimestamp($expense->deleted_at), 'archived_at' => $this->getTimestamp($expense->deleted_at),
'transaction_id' => $expense->transaction_id, 'transaction_id' => $expense->transaction_id,
'transaction_reference' => $expense->transaction_reference,
'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' => $expense->expense_category ? (int) $expense->expense_category->public_id : null, 'expense_category_id' => $expense->expense_category ? (int) $expense->expense_category->public_id : null,