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 bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2019-02-19 13:07:29 +02:00
parent 4418451b71
commit 64b8c599a2
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Listeners/HandleUserSettingsChanged.php
View File

@ -44,7 +44,7 @@ class HandleUserSettingsChanged
$users = $this->accountRepo->loadAccounts(Auth::user()->id); $users = $this->accountRepo->loadAccounts(Auth::user()->id);
Session::put(SESSION_USER_ACCOUNTS, $users); Session::put(SESSION_USER_ACCOUNTS, $users);
if ($event->user && $event->user->confirmed && $event->user->isEmailBeingChanged()) { if ($event->user && $event->user->isEmailBeingChanged()) {
$this->userMailer->sendConfirmation($event->user); $this->userMailer->sendConfirmation($event->user);
$this->userMailer->sendEmailChanged($event->user); $this->userMailer->sendEmailChanged($event->user);

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

@ -217,13 +217,10 @@ class UserAccountTransformer extends EntityTransformer
'email_template_reminder1' => $account->getEmailTemplate('reminder1'), 'email_template_reminder1' => $account->getEmailTemplate('reminder1'),
'email_template_reminder2' => $account->getEmailTemplate('reminder2'), 'email_template_reminder2' => $account->getEmailTemplate('reminder2'),
'email_template_reminder3' => $account->getEmailTemplate('reminder3'), 'email_template_reminder3' => $account->getEmailTemplate('reminder3'),
<<<<<<< HEAD
=======
'has_custom_design1' => (bool) $account->custom_design1, 'has_custom_design1' => (bool) $account->custom_design1,
'has_custom_design2' => (bool) $account->custom_design2, 'has_custom_design2' => (bool) $account->custom_design2,
'has_custom_design3' => (bool) $account->custom_design3, 'has_custom_design3' => (bool) $account->custom_design3,
>>>>>>> cd8b764... Fixes for mobile app 'enable_portal_password' => (bool) $account->enable_portal_password,
]; ];
} }
} }