Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 18:54:34 -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

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

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