Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 17:44:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify new company process

Browse Source
This commit is contained in:
Hillel Coren 2016-12-29 22:24:11 +02:00
parent e313a32c6a
commit 152b8770f5
6 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Auth/AuthController.php
View File

@ -141,6 +141,7 @@ class AuthController extends Controller
if (Auth::check()) { if (Auth::check()) {
Event::fire(new UserLoggedIn()); Event::fire(new UserLoggedIn());
/*
$users = false; $users = false;
// we're linking a new account // we're linking a new account
if ($request->link_accounts && $userId && Auth::user()->id != $userId) { if ($request->link_accounts && $userId && Auth::user()->id != $userId) {
@ -150,6 +151,9 @@ class AuthController extends Controller
} else { } else {
$users = $this->accountRepo->loadAccounts(Auth::user()->id); $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);
} elseif ($user) { } elseif ($user) {

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

@ -356,7 +356,7 @@ class UserController extends BaseController
Session::put(SESSION_USER_ACCOUNTS, $users); Session::put(SESSION_USER_ACCOUNTS, $users);
Session::flash('message', trans('texts.unlinked_account')); Session::flash('message', trans('texts.unlinked_account'));
return Redirect::to('/dashboard'); return Redirect::to('/manage_companies');
} }
public function manageCompanies() public function manageCompanies()

4
app/Ninja/Repositories/AccountRepository.php
View File

@ -594,6 +594,9 @@ class AccountRepository
$record->save(); $record->save();
return $this->getUserAccounts($record);
/*
$users = $this->getUserAccounts($record); $users = $this->getUserAccounts($record);
// Pick the primary user // Pick the primary user
@ -649,6 +652,7 @@ class AccountRepository
} }
return $users; return $users;
*/
} }
public function unlinkAccount($account) { public function unlinkAccount($account) {

1
resources/lang/en/texts.php
View File

@ -2290,6 +2290,7 @@ $LANG = array(
'renew_license' => 'Renew License', 'renew_license' => 'Renew License',
'iphone_app_message' => 'Consider downloading our :link', 'iphone_app_message' => 'Consider downloading our :link',
'iphone_app' => 'iPhone app', 'iphone_app' => 'iPhone app',
'logged_in' => 'Logged In',
); );

2
resources/views/header.blade.php
View File

@ -432,7 +432,7 @@
@if (count(session(SESSION_USER_ACCOUNTS)) > 1) @if (count(session(SESSION_USER_ACCOUNTS)) > 1)
<li>{!! link_to('/manage_companies', trans('texts.manage_companies')) !!}</li> <li>{!! link_to('/manage_companies', trans('texts.manage_companies')) !!}</li>
@elseif (!session(SESSION_USER_ACCOUNTS) || count(session(SESSION_USER_ACCOUNTS)) < 5) @elseif (!session(SESSION_USER_ACCOUNTS) || count(session(SESSION_USER_ACCOUNTS)) < 5)
<li>{!! link_to('/login?new_company=true', trans('texts.add_company')) !!}</li> <li>{!! link_to('/invoice_now?new_company=true&sign_up=true', trans('texts.add_company')) !!}</li>
@endif @endif
@endif @endif
<li>{!! link_to('#', trans('texts.logout'), array('onclick'=>'logout()')) !!}</li> <li>{!! link_to('#', trans('texts.logout'), array('onclick'=>'logout()')) !!}</li>

13
resources/views/users/account_management.blade.php
View File

@ -5,7 +5,7 @@
<center> <center>
@if (!session(SESSION_USER_ACCOUNTS) || count(session(SESSION_USER_ACCOUNTS)) < 5) @if (!session(SESSION_USER_ACCOUNTS) || count(session(SESSION_USER_ACCOUNTS)) < 5)
{!! Button::success(trans('texts.add_company'))->asLinkTo(url('/login?new_company=true')) !!} {!! Button::success(trans('texts.add_company'))->asLinkTo(url('/invoice_now?new_company=true&sign_up=true')) !!}
@endif @endif
</center> </center>
@ -31,12 +31,15 @@
<td> <td>
<h3>{{ $account->account_name }}<br/> <h3>{{ $account->account_name }}<br/>
<small>{{ $account->user_name }} <small>{{ $account->user_name }}
@if ($account->user_id == Auth::user()->id)
| {{ trans('texts.current_user')}}
@endif
</small></h3> </small></h3>
</td> </td>
<td>{!! Button::primary(trans('texts.unlink'))->withAttributes(['onclick'=>"return showUnlink({$account->id}, {$account->user_id})"]) !!}</td> <td>
@if ($account->user_id == Auth::user()->id)
<b>{{ trans('texts.logged_in')}}</b>
@else
{!! Button::primary(trans('texts.unlink'))->withAttributes(['onclick'=>"return showUnlink({$account->id}, {$account->user_id})"]) !!}
@endif
</td>
</tr> </tr>
@endforeach @endforeach
</table> </table>