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 pull request #985 from turbo124/develop

Browse Source 
Fix typo
This commit is contained in:
David Bomba 2016-07-16 07:52:58 +10:00 committed by GitHub
commit 20c9d661ac
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ class InvoiceItemTransformer extends EntityTransformer
'qty' => (float) $item->qty,
'tax_name1' => $item->tax_name1 ? $item->tax_name1 : '',
'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,
]);
}

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

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