Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

This commit is contained in:
Hillel Coren 2016-10-26 06:23:35 +03:00
commit 3b94b38216

View File

@ -27,13 +27,13 @@ class UserAccountTransformer extends EntityTransformer
public function transform(User $user) public function transform(User $user)
{ {
return [ return [
'account_key' => $this->account->account_key, 'account_key' => $user->account->account_key,
'name' => $this->account->present()->name, 'name' => $user->account->present()->name,
'token' => $this->account->getToken($user->id, $this->tokenName), 'token' => $user->account->getToken($user->id, $this->tokenName),
'default_url' => SITE_URL, 'default_url' => SITE_URL,
'plan' => $this->account->company->plan, 'plan' => $user->account->company->plan,
'logo' => $this->account->logo, 'logo' => $user->account->logo,
'logo_url' => $this->account->getLogoURL(), 'logo_url' => $user->account->getLogoURL(),
]; ];
} }
} }