From e540e98c80a309e839cb241ce45d6d9cabba5b2d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 21 Jun 2016 19:50:26 +1000 Subject: [PATCH 1/2] Add company logo_url to UserAccount Transformer --- app/Ninja/Transformers/UserAccountTransformer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Ninja/Transformers/UserAccountTransformer.php b/app/Ninja/Transformers/UserAccountTransformer.php index 0d64579e2c19..b0d408479f19 100644 --- a/app/Ninja/Transformers/UserAccountTransformer.php +++ b/app/Ninja/Transformers/UserAccountTransformer.php @@ -35,6 +35,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(), ]; } } \ No newline at end of file From cfb32f244a6bfa5cd7704ae28de07aa6b291d512 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 16 Jul 2016 07:52:00 +1000 Subject: [PATCH 2/2] Fix typo --- app/Ninja/Transformers/InvoiceItemTransformer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Ninja/Transformers/InvoiceItemTransformer.php b/app/Ninja/Transformers/InvoiceItemTransformer.php index 080234f35e1b..8b2bc4571f35 100644 --- a/app/Ninja/Transformers/InvoiceItemTransformer.php +++ b/app/Ninja/Transformers/InvoiceItemTransformer.php @@ -19,8 +19,8 @@ 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, ]); } -} \ No newline at end of file +}