Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 22:14:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2016-07-16 23:51:30 +03:00
commit 0d58e6da94
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,8 @@ class InvoiceItemTransformer extends EntityTransformer
'qty' => (float) $item->qty, 'qty' => (float) $item->qty,
'tax_name1' => $item->tax_name1 ? $item->tax_name1 : '', 'tax_name1' => $item->tax_name1 ? $item->tax_name1 : '',
'tax_rate1' => (float) $item->tax_rate1, 'tax_rate1' => (float) $item->tax_rate1,
'tax_name2' => $item->tax_name2 ? $item->tax_name1 : '', 'tax_name2' => $item->tax_name2 ? $item->tax_name2 : '',
'tax_rate2' => (float) $item->tax_rate2, 'tax_rate2' => (float) $item->tax_rate2,
]); ]);
} }
} }

1
app/Ninja/Transformers/UserAccountTransformer.php
View File

@ -32,6 +32,7 @@ class UserAccountTransformer extends EntityTransformer
'token' => $user->account->getToken($user->id, $this->tokenName), 'token' => $user->account->getToken($user->id, $this->tokenName),
'default_url' => SITE_URL, 'default_url' => SITE_URL,
'logo' => $user->account->logo, 'logo' => $user->account->logo,
'logo_url' => $user->account->getLogoURL(),
]; ];
} }
} }