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

Fix for upgrading directly after signing up

Browse Source
This commit is contained in:
Hillel Coren 2016-07-04 13:03:09 +03:00
parent 4a6673b25e
commit 6217419a2f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/UserController.php
View File

@ -258,14 +258,17 @@ class UserController extends BaseController
return Redirect::to("/password/reset/{$token}"); return Redirect::to("/password/reset/{$token}");
} else { } else {
if (Session::has(REQUESTED_PRO_PLAN)) { if (Auth::check()) {
Session::forget(REQUESTED_PRO_PLAN); if (Session::has(REQUESTED_PRO_PLAN)) {
$invitation = $this->accountRepo->enableProPlan(); Session::forget(REQUESTED_PRO_PLAN);
$url = '/settings/account_management?upgrade=true';
return Redirect::to($invitation->getLink()); } else {
$url = '/dashboard';
}
} else { } else {
return Redirect::to(Auth::check() ? '/dashboard' : '/login')->with('message', $notice_msg); $url = '/login';
} }
return Redirect::to($url)->with('message', $notice_msg);
} }
} else { } else {
$error_msg = trans('texts.security.wrong_confirmation'); $error_msg = trans('texts.security.wrong_confirmation');