v2 first commit
This commit is contained in:
@ -2,7 +2,7 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Abstracts\Http\Controller;
|
||||
|
||||
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
|
||||
use Illuminate\Http\Request;
|
||||
|
@ -2,8 +2,10 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Abstracts\Http\Controller;
|
||||
use App\Http\Requests\Auth\Login as Request;
|
||||
use Illuminate\Foundation\Auth\AuthenticatesUsers;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class Login extends Controller
|
||||
{
|
||||
@ -46,47 +48,81 @@ class Login extends Controller
|
||||
return view('auth.login.create');
|
||||
}
|
||||
|
||||
public function store()
|
||||
public function store(Request $request)
|
||||
{
|
||||
// Attempt to login
|
||||
if (!auth()->attempt(request(['email', 'password']), request('remember', false))) {
|
||||
flash(trans('auth.failed'))->error();
|
||||
if (!auth()->attempt($request->only('email', 'password'), $request->get('remember', false))) {
|
||||
$response = [
|
||||
'status' => null,
|
||||
'success' => false,
|
||||
'error' => true,
|
||||
'message' => trans('auth.failed'),
|
||||
'data' => null,
|
||||
'redirect' => null,
|
||||
];
|
||||
|
||||
return back();
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
// Get user object
|
||||
$user = auth()->user();
|
||||
$user = user();
|
||||
|
||||
// Check if user is enabled
|
||||
if (!$user->enabled) {
|
||||
$this->logout();
|
||||
|
||||
flash(trans('auth.disabled'))->error();
|
||||
$response = [
|
||||
'status' => null,
|
||||
'success' => false,
|
||||
'error' => true,
|
||||
'message' => trans('auth.disabled'),
|
||||
'data' => null,
|
||||
'redirect' => null,
|
||||
];
|
||||
|
||||
return redirect('auth/login');
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
// Check if is customer
|
||||
if ($user->customer) {
|
||||
$path = session('url.intended', 'customers');
|
||||
if ($user->contact) {
|
||||
$path = session('url.intended', 'portal');
|
||||
|
||||
// Path must start with 'customers' prefix
|
||||
if (!str_contains($path, 'customers')) {
|
||||
$path = 'customers';
|
||||
// Path must start with 'portal' prefix
|
||||
if (!Str::startsWith($path, 'portal')) {
|
||||
$path = 'portal';
|
||||
}
|
||||
|
||||
return redirect($path);
|
||||
$response = [
|
||||
'status' => null,
|
||||
'success' => true,
|
||||
'error' => false,
|
||||
'message' => null,
|
||||
'data' => null,
|
||||
'redirect' => url($path),
|
||||
];
|
||||
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
return redirect()->intended('wizard');
|
||||
session(['dashboard_id' => $user->dashboards()->pluck('id')->first()]);
|
||||
|
||||
$response = [
|
||||
'status' => null,
|
||||
'success' => true,
|
||||
'error' => false,
|
||||
'message' => null,
|
||||
'data' => null,
|
||||
'redirect' => redirect()->intended('wizard')->getTargetUrl(),
|
||||
];
|
||||
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
public function destroy()
|
||||
{
|
||||
$this->logout();
|
||||
|
||||
return redirect('auth/login');
|
||||
return redirect()->route('login');
|
||||
}
|
||||
|
||||
public function logout()
|
||||
|
@ -2,13 +2,15 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Abstracts\Http\Controller;
|
||||
use App\Http\Requests\Auth\Permission as Request;
|
||||
use App\Jobs\Auth\CreatePermission;
|
||||
use App\Jobs\Auth\DeletePermission;
|
||||
use App\Jobs\Auth\UpdatePermission;
|
||||
use App\Models\Auth\Permission;
|
||||
|
||||
class Permissions extends Controller
|
||||
{
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
@ -40,14 +42,23 @@ class Permissions extends Controller
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
// Create permission
|
||||
$permission = Permission::create($request->all());
|
||||
$response = $this->ajaxDispatch(new CreatePermission($request));
|
||||
|
||||
$message = trans('messages.success.added', ['type' => trans_choice('general.permissions', 1)]);
|
||||
if ($response['success']) {
|
||||
$response['redirect'] = route('permissions.index');
|
||||
|
||||
flash($message)->success();
|
||||
$message = trans('messages.success.added', ['type' => trans_choice('general.permissions', 1)]);
|
||||
|
||||
return redirect('auth/permissions');
|
||||
flash($message)->success();
|
||||
} else {
|
||||
$response['redirect'] = route('permissions.create');
|
||||
|
||||
$message = $response['message'];
|
||||
|
||||
flash($message)->error();
|
||||
}
|
||||
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -65,38 +76,55 @@ class Permissions extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param Permission $permission
|
||||
* @param Request $request
|
||||
* @param Permission $permission
|
||||
* @param Request $request
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function update(Permission $permission, Request $request)
|
||||
{
|
||||
// Update permission
|
||||
$permission->update($request->all());
|
||||
$response = $this->ajaxDispatch(new UpdatePermission($permission, $request));
|
||||
|
||||
$message = trans('messages.success.updated', ['type' => trans_choice('general.permissions', 1)]);
|
||||
if ($response['success']) {
|
||||
$response['redirect'] = route('permissions.index');
|
||||
|
||||
flash($message)->success();
|
||||
$message = trans('messages.success.updated', ['type' => $permission->display_name]);
|
||||
|
||||
return redirect('auth/permissions');
|
||||
flash($message)->success();
|
||||
} else {
|
||||
$response['redirect'] = route('permissions.edit', $permission->id);
|
||||
|
||||
$message = $response['message'];
|
||||
|
||||
flash($message)->error();
|
||||
}
|
||||
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param Permission $permission
|
||||
* @param Permission $permission
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function destroy(Permission $permission)
|
||||
{
|
||||
$permission->delete();
|
||||
$response = $this->ajaxDispatch(new DeletePermission($permission));
|
||||
|
||||
$message = trans('messages.success.deleted', ['type' => trans_choice('general.permissions', 1)]);
|
||||
$response['redirect'] = route('permissions.index');
|
||||
|
||||
flash($message)->success();
|
||||
if ($response['success']) {
|
||||
$message = trans('messages.success.deleted', ['type' => $permission->display_name]);
|
||||
|
||||
return redirect('auth/permissions');
|
||||
flash($message)->success();
|
||||
} else {
|
||||
$message = $response['message'];
|
||||
|
||||
flash($message)->error();
|
||||
}
|
||||
|
||||
return response()->json($response);
|
||||
}
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Abstracts\Http\Controller;
|
||||
use Illuminate\Foundation\Auth\ResetsPasswords;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Password;
|
||||
|
@ -2,14 +2,16 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Abstracts\Http\Controller;
|
||||
use App\Http\Requests\Auth\Role as Request;
|
||||
use App\Jobs\Auth\CreateRole;
|
||||
use App\Jobs\Auth\DeleteRole;
|
||||
use App\Jobs\Auth\UpdateRole;
|
||||
use App\Models\Auth\Permission;
|
||||
use App\Models\Auth\Role;
|
||||
|
||||
class Roles extends Controller
|
||||
{
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
@ -55,17 +57,23 @@ class Roles extends Controller
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
// Create role
|
||||
$role = Role::create($request->all());
|
||||
$response = $this->ajaxDispatch(new CreateRole($request));
|
||||
|
||||
// Attach permissions
|
||||
$role->permissions()->attach($request['permissions']);
|
||||
if ($response['success']) {
|
||||
$response['redirect'] = route('roles.index');
|
||||
|
||||
$message = trans('messages.success.added', ['type' => trans_choice('general.roles', 1)]);
|
||||
$message = trans('messages.success.added', ['type' => trans_choice('general.roles', 1)]);
|
||||
|
||||
flash($message)->success();
|
||||
flash($message)->success();
|
||||
} else {
|
||||
$response['redirect'] = route('roles.create');
|
||||
|
||||
return redirect('auth/roles');
|
||||
$message = $response['message'];
|
||||
|
||||
flash($message)->error();
|
||||
}
|
||||
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -100,41 +108,55 @@ class Roles extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param Role $role
|
||||
* @param Role $role
|
||||
* @param Request $request
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function update(Role $role, Request $request)
|
||||
{
|
||||
// Update role
|
||||
$role->update($request->all());
|
||||
$response = $this->ajaxDispatch(new UpdateRole($role, $request));
|
||||
|
||||
// Sync permissions
|
||||
$role->permissions()->sync($request['permissions']);
|
||||
if ($response['success']) {
|
||||
$response['redirect'] = route('roles.index');
|
||||
|
||||
$message = trans('messages.success.updated', ['type' => trans_choice('general.roles', 1)]);
|
||||
$message = trans('messages.success.updated', ['type' => $role->display_name]);
|
||||
|
||||
flash($message)->success();
|
||||
flash($message)->success();
|
||||
} else {
|
||||
$response['redirect'] = route('roles.edit', $role->id);
|
||||
|
||||
return redirect('auth/roles');
|
||||
$message = $response['message'];
|
||||
|
||||
flash($message)->error();
|
||||
}
|
||||
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param Role $role
|
||||
* @param Role $role
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function destroy(Role $role)
|
||||
{
|
||||
$role->delete();
|
||||
$response = $this->ajaxDispatch(new DeleteRole($role));
|
||||
|
||||
$message = trans('messages.success.deleted', ['type' => trans_choice('general.roles', 1)]);
|
||||
$response['redirect'] = route('roles.index');
|
||||
|
||||
flash($message)->success();
|
||||
if ($response['success']) {
|
||||
$message = trans('messages.success.deleted', ['type' => $role->display_name]);
|
||||
|
||||
return redirect('auth/roles');
|
||||
flash($message)->success();
|
||||
} else {
|
||||
$message = $response['message'];
|
||||
|
||||
flash($message)->error();
|
||||
}
|
||||
|
||||
return response()->json($response);
|
||||
}
|
||||
}
|
||||
|
@ -2,14 +2,15 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Abstracts\Http\Controller;
|
||||
use App\Http\Requests\Auth\User as Request;
|
||||
use Illuminate\Http\Request as ARequest;
|
||||
use App\Jobs\Auth\CreateUser;
|
||||
use App\Jobs\Auth\DeleteUser;
|
||||
use App\Jobs\Auth\UpdateUser;
|
||||
use App\Models\Auth\User;
|
||||
use App\Models\Auth\Role;
|
||||
use App\Traits\Uploads;
|
||||
|
||||
use Auth;
|
||||
use Illuminate\Http\Request as BaseRequest;
|
||||
|
||||
class Users extends Controller
|
||||
{
|
||||
@ -24,10 +25,7 @@ class Users extends Controller
|
||||
{
|
||||
$users = User::with('roles')->collect();
|
||||
|
||||
$roles = collect(Role::all()->pluck('display_name', 'id'))
|
||||
->prepend(trans('general.all_type', ['type' => trans_choice('general.roles', 2)]), '');
|
||||
|
||||
return view('auth.users.index', compact('users', 'roles'));
|
||||
return view('auth.users.index', compact('users'));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -38,14 +36,10 @@ class Users extends Controller
|
||||
public function create()
|
||||
{
|
||||
$roles = Role::all()->reject(function ($r) {
|
||||
return $r->hasPermission('read-customer-panel');
|
||||
return $r->hasPermission('read-client-portal');
|
||||
});
|
||||
|
||||
$companies = Auth::user()->companies()->get()->sortBy('name');
|
||||
|
||||
foreach ($companies as $company) {
|
||||
$company->setSettings();
|
||||
}
|
||||
$companies = user()->companies()->get()->sortBy('name');
|
||||
|
||||
return view('auth.users.create', compact('roles', 'companies'));
|
||||
}
|
||||
@ -59,27 +53,23 @@ class Users extends Controller
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
// Create user
|
||||
$user = User::create($request->input());
|
||||
$response = $this->ajaxDispatch(new CreateUser($request));
|
||||
|
||||
// Upload picture
|
||||
if ($request->file('picture')) {
|
||||
$media = $this->getMedia($request->file('picture'), 'users');
|
||||
if ($response['success']) {
|
||||
$response['redirect'] = route('users.index');
|
||||
|
||||
$user->attachMedia($media, 'picture');
|
||||
$message = trans('messages.success.added', ['type' => trans_choice('general.users', 1)]);
|
||||
|
||||
flash($message)->success();
|
||||
} else {
|
||||
$response['redirect'] = route('users.create');
|
||||
|
||||
$message = $response['message'];
|
||||
|
||||
flash($message)->error();
|
||||
}
|
||||
|
||||
// Attach roles
|
||||
$user->roles()->attach($request['roles']);
|
||||
|
||||
// Attach companies
|
||||
$user->companies()->attach($request['companies']);
|
||||
|
||||
$message = trans('messages.success.added', ['type' => trans_choice('general.users', 1)]);
|
||||
|
||||
flash($message)->success();
|
||||
|
||||
return redirect('auth/users');
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -91,23 +81,19 @@ class Users extends Controller
|
||||
*/
|
||||
public function edit(User $user)
|
||||
{
|
||||
if ($user->customer) {
|
||||
if ($user->contact) {
|
||||
// Show only roles with customer permission
|
||||
$roles = Role::all()->reject(function ($r) {
|
||||
return !$r->hasPermission('read-customer-panel');
|
||||
return !$r->hasPermission('read-client-portal');
|
||||
});
|
||||
} else {
|
||||
// Don't show roles with customer permission
|
||||
$roles = Role::all()->reject(function ($r) {
|
||||
return $r->hasPermission('read-customer-panel');
|
||||
return $r->hasPermission('read-client-portal');
|
||||
});
|
||||
}
|
||||
|
||||
$companies = Auth::user()->companies()->get()->sortBy('name');
|
||||
|
||||
foreach ($companies as $company) {
|
||||
$company->setSettings();
|
||||
}
|
||||
$companies = user()->companies()->get()->sortBy('name');
|
||||
|
||||
return view('auth.users.edit', compact('user', 'companies', 'roles'));
|
||||
}
|
||||
@ -115,111 +101,98 @@ class Users extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param User $user
|
||||
* @param Request $request
|
||||
* @param User $user
|
||||
* @param Request $request
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function update(User $user, Request $request)
|
||||
{
|
||||
// Do not reset password if not entered/changed
|
||||
if (empty($request['password'])) {
|
||||
unset($request['password']);
|
||||
unset($request['password_confirmation']);
|
||||
$response = $this->ajaxDispatch(new UpdateUser($user, $request));
|
||||
|
||||
if ($response['success']) {
|
||||
$response['redirect'] = route('users.index');
|
||||
|
||||
$message = trans('messages.success.updated', ['type' => $user->name]);
|
||||
|
||||
flash($message)->success();
|
||||
} else {
|
||||
$response['redirect'] = route('users.edit', $user->id);
|
||||
|
||||
$message = $response['message'];
|
||||
|
||||
flash($message)->error();
|
||||
}
|
||||
|
||||
// Update user
|
||||
$user->update($request->input());
|
||||
|
||||
// Upload picture
|
||||
if ($request->file('picture')) {
|
||||
$media = $this->getMedia($request->file('picture'), 'users');
|
||||
|
||||
$user->attachMedia($media, 'picture');
|
||||
}
|
||||
|
||||
// Sync roles
|
||||
$user->roles()->sync($request['roles']);
|
||||
|
||||
// Sync companies
|
||||
$user->companies()->sync($request['companies']);
|
||||
|
||||
$message = trans('messages.success.updated', ['type' => trans_choice('general.users', 1)]);
|
||||
|
||||
flash($message)->success();
|
||||
|
||||
return redirect('auth/users');
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Enable the specified resource.
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function enable(User $user)
|
||||
{
|
||||
$user->enabled = 1;
|
||||
$user->save();
|
||||
$response = $this->ajaxDispatch(new UpdateUser($user, request()->merge(['enabled' => 1])));
|
||||
|
||||
$message = trans('messages.success.enabled', ['type' => trans_choice('general.users', 1)]);
|
||||
if ($response['success']) {
|
||||
$response['message'] = trans('messages.success.enabled', ['type' => $user->name]);
|
||||
}
|
||||
|
||||
flash($message)->success();
|
||||
|
||||
return redirect()->route('users.index');
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Disable the specified resource.
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function disable(User $user)
|
||||
{
|
||||
$user->enabled = 0;
|
||||
$user->save();
|
||||
$response = $this->ajaxDispatch(new UpdateUser($user, request()->merge(['enabled' => 0])));
|
||||
|
||||
$message = trans('messages.success.disabled', ['type' => trans_choice('general.users', 1)]);
|
||||
if ($response['success']) {
|
||||
$response['message'] = trans('messages.success.disabled', ['type' => $user->name]);
|
||||
}
|
||||
|
||||
flash($message)->success();
|
||||
|
||||
return redirect()->route('users.index');
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function destroy(User $user)
|
||||
{
|
||||
// Can't delete yourself
|
||||
if ($user->id == \Auth::user()->id) {
|
||||
$message = trans('auth.error.self_delete');
|
||||
$response = $this->ajaxDispatch(new DeleteUser($user));
|
||||
|
||||
$response['redirect'] = route('users.index');
|
||||
|
||||
if ($response['success']) {
|
||||
$message = trans('messages.success.deleted', ['type' => $user->name]);
|
||||
|
||||
flash($message)->success();
|
||||
} else {
|
||||
$message = $response['message'];
|
||||
|
||||
flash($message)->error();
|
||||
|
||||
return redirect('auth/users');
|
||||
}
|
||||
|
||||
$user->delete();
|
||||
|
||||
$message = trans('messages.success.deleted', ['type' => trans_choice('general.users', 1)]);
|
||||
|
||||
flash($message)->success();
|
||||
|
||||
return redirect('auth/users');
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Mark upcoming bills notifications are read and redirect to bills page.
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
@ -235,14 +208,13 @@ class Users extends Controller
|
||||
$notification->markAsRead();
|
||||
}
|
||||
|
||||
// Redirect to bills
|
||||
return redirect('expenses/bills');
|
||||
return redirect()->route('bills.index');
|
||||
}
|
||||
|
||||
/**
|
||||
* Mark overdue invoices notifications are read and redirect to invoices page.
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
@ -258,34 +230,10 @@ class Users extends Controller
|
||||
$notification->markAsRead();
|
||||
}
|
||||
|
||||
// Redirect to invoices
|
||||
return redirect('incomes/invoices');
|
||||
return redirect()->route('invoices.index');
|
||||
}
|
||||
|
||||
/**
|
||||
* Mark items out of stock notifications are read and redirect to items page.
|
||||
*
|
||||
* @param User $user
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function readItemsOutOfStock(User $user)
|
||||
{
|
||||
// Mark item notifications as read
|
||||
foreach ($user->unreadNotifications as $notification) {
|
||||
// Not an item notification
|
||||
if ($notification->getAttribute('type') != 'App\Notifications\Common\Item') {
|
||||
continue;
|
||||
}
|
||||
|
||||
$notification->markAsRead();
|
||||
}
|
||||
|
||||
// Redirect to items
|
||||
return redirect('common/items');
|
||||
}
|
||||
|
||||
public function autocomplete(ARequest $request)
|
||||
public function autocomplete(BaseRequest $request)
|
||||
{
|
||||
$user = false;
|
||||
$data = false;
|
||||
|
Reference in New Issue
Block a user