v2 first commit

This commit is contained in:
denisdulici
2019-11-16 10:21:14 +03:00
parent 5b23e9c2c4
commit 6d50fa8442
3075 changed files with 3451681 additions and 65594 deletions

View File

@ -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;