update
This commit is contained in:
@ -30,8 +30,7 @@ class AuthController extends Controller
|
||||
$response = [
|
||||
"success" => false,
|
||||
"code" => 400,
|
||||
"msg" =>
|
||||
"Your account is inactive, please contact the Administrator.",
|
||||
"msg" => "Your account is inactive, please contact the Administrator.",
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
@ -51,56 +51,72 @@ class LoginController extends Controller
|
||||
return "email";
|
||||
}
|
||||
|
||||
// public function login(Request $req)
|
||||
// {
|
||||
// $this->validateLogin($req);
|
||||
|
||||
// if (method_exists($this, "hasTooManyLoginAttempts") && $this->hasTooManyLoginAttempts($req)) {
|
||||
// $this->fireLockoutEvent($req);
|
||||
|
||||
// return $this->sendLockoutResponse($req);
|
||||
// }
|
||||
|
||||
// if ($this->guard()->validate($this->credentials($req))) {
|
||||
// $user = $this->guard()->getLastAttempted();
|
||||
|
||||
// if ($user->dlt != null) {
|
||||
// $this->incrementLoginAttempts($req);
|
||||
// throw ValidationException::withMessages([
|
||||
// $this->username() => [trans("auth.failed")],
|
||||
// ]);
|
||||
// }
|
||||
// if ($user->status != Users::STATUS_ACTIVE) {
|
||||
// $this->incrementLoginAttempts($req);
|
||||
|
||||
// throw ValidationException::withMessages([
|
||||
// $this->username() => __("Your account not active, please contact admin."),
|
||||
// ]);
|
||||
// }
|
||||
|
||||
// if ($this->attemptLogin($req)) {
|
||||
// return $this->sendLoginResponse($req);
|
||||
// }
|
||||
// }
|
||||
|
||||
// $this->incrementLoginAttempts($req);
|
||||
|
||||
// return $this->sendFailedLoginResponse($req);
|
||||
// }
|
||||
public function login(Request $req)
|
||||
{
|
||||
$this->validateLogin($req);
|
||||
|
||||
// If the class is using the ThrottlesLogins trait, we can automatically throttle
|
||||
// the login attempts for this application. We'll key this by the username and
|
||||
// the IP address of the client making these requests into this application.
|
||||
if (
|
||||
method_exists($this, "hasTooManyLoginAttempts") &&
|
||||
$this->hasTooManyLoginAttempts($req)
|
||||
) {
|
||||
if (method_exists($this, "hasTooManyLoginAttempts") && $this->hasTooManyLoginAttempts($req)) {
|
||||
$this->fireLockoutEvent($req);
|
||||
|
||||
return $this->sendLockoutResponse($req);
|
||||
}
|
||||
|
||||
if ($this->guard()->validate($this->credentials($req))) {
|
||||
$user = $this->guard()->getLastAttempted();
|
||||
if ($user->dlt != null) {
|
||||
$this->incrementLoginAttempts($req);
|
||||
throw ValidationException::withMessages([
|
||||
$this->username() => [trans("auth.failed")],
|
||||
]);
|
||||
}
|
||||
if ($user->status != Users::STATUS_ACTIVE) {
|
||||
// Increment the failed login attempts and redirect back to the
|
||||
// login form with an error message.
|
||||
$this->incrementLoginAttempts($req);
|
||||
// return redirect()
|
||||
// ->back()
|
||||
// ->withInput($req->only($this->username(), 'remember'))
|
||||
// ->withErrors(['active' => 'You must be active to login.']);
|
||||
throw ValidationException::withMessages([
|
||||
$this->username() => __(
|
||||
"Your account not active, please contact admin."
|
||||
),
|
||||
]);
|
||||
}
|
||||
// Cari user yang belum dihapus (dlt == null)
|
||||
$user = Users::where("email", $req->email)
|
||||
->whereNull("dlt")
|
||||
->first();
|
||||
|
||||
if ($this->attemptLogin($req)) {
|
||||
return $this->sendLoginResponse($req);
|
||||
}
|
||||
if (!$user || !\Hash::check($req->password, $user->password)) {
|
||||
$this->incrementLoginAttempts($req);
|
||||
return $this->sendFailedLoginResponse($req);
|
||||
}
|
||||
|
||||
// If the login attempt was unsuccessful we will increment the number of attempts
|
||||
// to login and redirect the user back to the login form. Of course, when this
|
||||
// user surpasses their maximum number of attempts they will get locked out.
|
||||
$this->incrementLoginAttempts($req);
|
||||
if ($user->status != Users::STATUS_ACTIVE) {
|
||||
$this->incrementLoginAttempts($req);
|
||||
throw ValidationException::withMessages([
|
||||
$this->username() => __("Your account not active, please contact admin."),
|
||||
]);
|
||||
}
|
||||
|
||||
return $this->sendFailedLoginResponse($req);
|
||||
// Login manual
|
||||
$this->guard()->login($user);
|
||||
|
||||
return $this->sendLoginResponse($req);
|
||||
}
|
||||
|
||||
protected function validateLogin(Request $req)
|
||||
@ -139,9 +155,7 @@ class LoginController extends Controller
|
||||
} elseif ($user->role == Users::ROLE_CHECKER) {
|
||||
return redirect(route("view_user_checker"));
|
||||
} elseif ($user->role == Users::ROLE_CLIENT_ADMIN) {
|
||||
return redirect(
|
||||
route("view_user_client_transaction_add") . "?rdl=1"
|
||||
);
|
||||
return redirect(route("view_user_client_transaction_add") . "?rdl=1");
|
||||
} elseif ($user->role == Users::ROLE_SPECIAL_TRACKING) {
|
||||
return redirect(route("view_dashboard"));
|
||||
} elseif ($user->role == Users::ROLE_FINANCE) {
|
||||
@ -166,9 +180,7 @@ class LoginController extends Controller
|
||||
if ($response = $this->loggedOut($req)) {
|
||||
return $response;
|
||||
}
|
||||
return $req->wantsJson()
|
||||
? new JsonResponse([], 204)
|
||||
: redirect(route("login_admin"));
|
||||
return $req->wantsJson() ? new JsonResponse([], 204) : redirect(route("login_admin"));
|
||||
} elseif ($user->role == Users::ROLE_FINANCE) {
|
||||
$this->guard()->logout();
|
||||
$req->session()->invalidate();
|
||||
@ -176,9 +188,7 @@ class LoginController extends Controller
|
||||
if ($response = $this->loggedOut($req)) {
|
||||
return $response;
|
||||
}
|
||||
return $req->wantsJson()
|
||||
? new JsonResponse([], 204)
|
||||
: redirect(route("login_admin"));
|
||||
return $req->wantsJson() ? new JsonResponse([], 204) : redirect(route("login_admin"));
|
||||
} elseif ($user->role == Users::ROLE_VENDOR) {
|
||||
$this->guard()->logout();
|
||||
$req->session()->invalidate();
|
||||
@ -186,9 +196,7 @@ class LoginController extends Controller
|
||||
if ($response = $this->loggedOut($req)) {
|
||||
return $response;
|
||||
}
|
||||
return $req->wantsJson()
|
||||
? new JsonResponse([], 204)
|
||||
: redirect(route("login_vendor"));
|
||||
return $req->wantsJson() ? new JsonResponse([], 204) : redirect(route("login_vendor"));
|
||||
} elseif ($user->role == Users::ROLE_CHECKER) {
|
||||
$this->guard()->logout();
|
||||
$req->session()->invalidate();
|
||||
@ -196,9 +204,7 @@ class LoginController extends Controller
|
||||
if ($response = $this->loggedOut($req)) {
|
||||
return $response;
|
||||
}
|
||||
return $req->wantsJson()
|
||||
? new JsonResponse([], 204)
|
||||
: redirect(route("login_checker"));
|
||||
return $req->wantsJson() ? new JsonResponse([], 204) : redirect(route("login_checker"));
|
||||
} elseif ($user->role == Users::ROLE_CLIENT_ADMIN) {
|
||||
$this->guard()->logout();
|
||||
$req->session()->invalidate();
|
||||
@ -206,9 +212,7 @@ class LoginController extends Controller
|
||||
if ($response = $this->loggedOut($req)) {
|
||||
return $response;
|
||||
}
|
||||
return $req->wantsJson()
|
||||
? new JsonResponse([], 204)
|
||||
: redirect(route("login_client"));
|
||||
return $req->wantsJson() ? new JsonResponse([], 204) : redirect(route("login_client"));
|
||||
} elseif ($user->role == Users::ROLE_SPECIAL_TRACKING) {
|
||||
$this->guard()->logout();
|
||||
$req->session()->invalidate();
|
||||
@ -216,9 +220,7 @@ class LoginController extends Controller
|
||||
if ($response = $this->loggedOut($req)) {
|
||||
return $response;
|
||||
}
|
||||
return $req->wantsJson()
|
||||
? new JsonResponse([], 204)
|
||||
: redirect(route("login_admin"));
|
||||
return $req->wantsJson() ? new JsonResponse([], 204) : redirect(route("login_admin"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -13,69 +13,69 @@ use App\Models\Users;
|
||||
|
||||
class AuthController extends Controller
|
||||
{
|
||||
// public function view_login(Request $req)
|
||||
// {
|
||||
// return 'Do login';
|
||||
// }
|
||||
public function view_login_admin(Request $req)
|
||||
{
|
||||
return view('auth.loginAdmin');
|
||||
}
|
||||
public function view_login_client(Request $req)
|
||||
{
|
||||
return view('auth.loginClient');
|
||||
}
|
||||
public function view_login_vendor(Request $req)
|
||||
{
|
||||
return view('auth.loginVendor');
|
||||
}
|
||||
public function view_login_checker(Request $req)
|
||||
{
|
||||
return view('auth.loginChecker');
|
||||
}
|
||||
// public function view_login(Request $req)
|
||||
// {
|
||||
// return 'Do login';
|
||||
// }
|
||||
public function view_login_admin(Request $req)
|
||||
{
|
||||
return view("auth.loginAdmin");
|
||||
}
|
||||
public function view_login_client(Request $req)
|
||||
{
|
||||
return view("auth.loginClient");
|
||||
}
|
||||
public function view_login_vendor(Request $req)
|
||||
{
|
||||
return view("auth.loginVendor");
|
||||
}
|
||||
public function view_login_checker(Request $req)
|
||||
{
|
||||
return view("auth.loginChecker");
|
||||
}
|
||||
|
||||
public function api_login(Request $req)
|
||||
{
|
||||
try {
|
||||
$now = time();
|
||||
public function api_login(Request $req)
|
||||
{
|
||||
try {
|
||||
$now = time();
|
||||
|
||||
$input = [
|
||||
'password' => $req->password,
|
||||
];
|
||||
$rulesInput = [
|
||||
'password' => 'required|string',
|
||||
];
|
||||
$input = [
|
||||
"password" => $req->password,
|
||||
];
|
||||
$rulesInput = [
|
||||
"password" => "required|string",
|
||||
];
|
||||
|
||||
if ($req->email) {
|
||||
$input['email'] = $req->email;
|
||||
$rulesInput['email'] = 'required|email';
|
||||
}
|
||||
if ($req->phone) {
|
||||
$input['phone'] = $req->phone;
|
||||
$rulesInput['phone'] = 'required|integer';
|
||||
}
|
||||
if ($req->email) {
|
||||
$input["email"] = $req->email;
|
||||
$rulesInput["email"] = "required|email";
|
||||
}
|
||||
if ($req->phone) {
|
||||
$input["phone"] = $req->phone;
|
||||
$rulesInput["phone"] = "required|integer";
|
||||
}
|
||||
|
||||
// validasi input
|
||||
$isValidInput = Validator::make($input, $rulesInput);
|
||||
if (!$isValidInput->passes()) {
|
||||
$apiResp = Responses::bad_input($isValidInput->messages()->first());
|
||||
return new Response($apiResp, $apiResp['meta']['code']);
|
||||
}
|
||||
// validasi input
|
||||
$isValidInput = Validator::make($input, $rulesInput);
|
||||
if (!$isValidInput->passes()) {
|
||||
$apiResp = Responses::bad_input($isValidInput->messages()->first());
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
|
||||
$getUser = Users::getUserByEmail($req->email);
|
||||
if (count($getUser) < 1) {
|
||||
$getUser = Users::getUserByPhone($req->phone);
|
||||
if (count($getUser) < 1) {
|
||||
$apiResp = Responses::not_found('akun tidak ditemukan');
|
||||
return (new Response($apiResp, $apiResp['meta']['code']));
|
||||
}
|
||||
}
|
||||
$getUser = Users::getUserByEmail($req->email);
|
||||
if (count($getUser) < 1) {
|
||||
$getUser = Users::getUserByPhone($req->phone);
|
||||
if (count($getUser) < 1) {
|
||||
$apiResp = Responses::not_found("akun tidak ditemukan");
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
}
|
||||
|
||||
$apiResp = Responses::success('sukses login');
|
||||
return (new Response($apiResp, $apiResp['meta']['code']));
|
||||
} catch (\Exception $e) {
|
||||
$apiResp = Responses::error($e->getMessage());
|
||||
return (new Response($apiResp, $apiResp['meta']['code']));
|
||||
}
|
||||
}
|
||||
$apiResp = Responses::success("sukses login");
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
} catch (\Exception $e) {
|
||||
$apiResp = Responses::error($e->getMessage());
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
287
app/Http/Controllers/RolesController.php
Executable file
287
app/Http/Controllers/RolesController.php
Executable file
@ -0,0 +1,287 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Validator;
|
||||
use App\Responses;
|
||||
use App\Helper;
|
||||
use App\Models\Users;
|
||||
use App\Models\Clients;
|
||||
use App\Models\Vehicles;
|
||||
use App\Models\Banks;
|
||||
use App\Models\UsersMenuPermissions;
|
||||
|
||||
class RolesController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function view(Request $req)
|
||||
{
|
||||
$permissions = \Spatie\Permission\Models\Permission::all();
|
||||
|
||||
$data = [
|
||||
"roles" => Users::listRoles($req->auth->role),
|
||||
"pernus" => UsersMenuPermissions::listPermissionsMenus([
|
||||
"is_active" => UsersMenuPermissions::IS_ACTIVE,
|
||||
]),
|
||||
"vehicles" => Vehicles::getVehicles(),
|
||||
"banks" => Banks::listBanks(["is_active" => Banks::IS_ACTIVE]),
|
||||
"permission" => $permissions->groupBy(function ($perm) {
|
||||
return explode(".", $perm->name)[0]; // ambil modul: user, transaction, dst
|
||||
}),
|
||||
];
|
||||
|
||||
return view("menu_v1.roles", $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* API
|
||||
*/
|
||||
|
||||
public function api_list(Request $req)
|
||||
{
|
||||
try {
|
||||
$list = DB::table("roles")->get();
|
||||
foreach ($list as $key => $row) {
|
||||
$list[$key]->DT_RowIndex = $key + 1;
|
||||
$list[$key]->count_trx = 0;
|
||||
$list[$key]->action = "-";
|
||||
}
|
||||
|
||||
$apiResp = Responses::success("success list users");
|
||||
$apiResp["data"] = $list;
|
||||
$apiResp["count"] = count($list);
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
} catch (\Exception $e) {
|
||||
$apiResp = Responses::error($e->getMessage());
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
}
|
||||
|
||||
public function api_show(Request $req, $uid)
|
||||
{
|
||||
try {
|
||||
$now = time();
|
||||
|
||||
$input = [
|
||||
"uid" => $uid,
|
||||
];
|
||||
$rulesInput = [
|
||||
"uid" => "required|integer|not_in:0",
|
||||
];
|
||||
|
||||
// validasi input
|
||||
$isValidInput = Validator::make($input, $rulesInput);
|
||||
if (!$isValidInput->passes()) {
|
||||
$apiResp = Responses::bad_input($isValidInput->messages()->first());
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
|
||||
$role = DB::table("roles")
|
||||
->where("roles.id", $uid)
|
||||
->get();
|
||||
|
||||
if (count($role) < 1) {
|
||||
$apiResp = Responses::not_found("role not found");
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
|
||||
$permissions = DB::table("role_has_permissions")
|
||||
->where("role_id", $uid)
|
||||
->pluck("permission_id") // ambil array [1, 6, ...]
|
||||
->toArray();
|
||||
$role[0]->permissions = $permissions;
|
||||
|
||||
$apiResp = Responses::success("success get detail role");
|
||||
$apiResp["data"] = $role[0];
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
} catch (\Exception $e) {
|
||||
$apiResp = Responses::error($e->getMessage());
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
}
|
||||
|
||||
public function api_add(Request $req)
|
||||
{
|
||||
try {
|
||||
DB::beginTransaction();
|
||||
// Users::addUser($data);
|
||||
|
||||
$role_id = DB::table("roles")->insertGetId([
|
||||
"name" => $req->name,
|
||||
"guard_name" => "web",
|
||||
"created_at" => date("Y-m-d H:i:s"),
|
||||
"updated_at" => date("Y-m-d H:i:s"),
|
||||
]);
|
||||
|
||||
$role_has_permissions = [];
|
||||
foreach ($req->permissions as $_permission) {
|
||||
array_push($role_has_permissions, ["permission_id" => $_permission, "role_id" => $role_id]);
|
||||
}
|
||||
|
||||
DB::table("role_has_permissions")->insert($role_has_permissions);
|
||||
|
||||
$apiResp = Responses::created("success add new role");
|
||||
DB::commit();
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
} catch (\Exception $e) {
|
||||
DB::rollBack();
|
||||
$apiResp = Responses::error($e->getMessage());
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
}
|
||||
|
||||
public function api_edit(Request $req)
|
||||
{
|
||||
try {
|
||||
DB::beginTransaction();
|
||||
|
||||
DB::table("roles")
|
||||
->where("id", $req->uid)
|
||||
->update([
|
||||
"name" => $req->name, // ganti sesuai field yang mau diubah
|
||||
"updated_at" => now(),
|
||||
]);
|
||||
|
||||
DB::table("role_has_permissions")
|
||||
->where("role_id", $req->uid)
|
||||
->delete();
|
||||
|
||||
$role_has_permissions = [];
|
||||
foreach ($req->permissions as $pid) {
|
||||
$role_has_permissions[] = [
|
||||
"role_id" => $req->uid,
|
||||
"permission_id" => $pid,
|
||||
];
|
||||
}
|
||||
DB::table("role_has_permissions")->insert($role_has_permissions);
|
||||
|
||||
$apiResp = Responses::created("success update role");
|
||||
|
||||
DB::commit();
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
} catch (\Exception $e) {
|
||||
DB::rollBack();
|
||||
$apiResp = Responses::error($e->getMessage());
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
}
|
||||
|
||||
public function api_del(Request $req)
|
||||
{
|
||||
try {
|
||||
$now = time();
|
||||
|
||||
$input = [
|
||||
"uid" => $req->uid,
|
||||
];
|
||||
$rulesInput = [
|
||||
"uid" => "required|integer|not_in:0",
|
||||
];
|
||||
$data = [
|
||||
"id" => $req->uid,
|
||||
];
|
||||
|
||||
// validasi input
|
||||
$isValidInput = Validator::make($input, $rulesInput);
|
||||
if (!$isValidInput->passes()) {
|
||||
$apiResp = Responses::bad_input($isValidInput->messages()->first());
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
|
||||
$role = DB::table("roles")
|
||||
->where("id", $req->uid)
|
||||
->get();
|
||||
if (count($role) < 1) {
|
||||
$apiResp = Responses::not_found("user not found");
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
|
||||
DB::beginTransaction();
|
||||
|
||||
DB::table("role_has_permissions")
|
||||
->where("role_id", $req->uid)
|
||||
->delete();
|
||||
|
||||
DB::table("roles")
|
||||
->where("id", $req->uid)
|
||||
->delete();
|
||||
|
||||
$apiResp = Responses::created("success delete role");
|
||||
|
||||
DB::commit();
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
} catch (\Exception $e) {
|
||||
DB::rollBack();
|
||||
$apiResp = Responses::error($e->getMessage());
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
}
|
||||
|
||||
public function api_search(Request $req)
|
||||
{
|
||||
try {
|
||||
$now = time();
|
||||
$roles = Users::arrRoles();
|
||||
$statuses = Users::arrStatus();
|
||||
|
||||
$input = [
|
||||
"name" => $req->name,
|
||||
"roles" => $req->roles,
|
||||
];
|
||||
$rulesInput = [
|
||||
"name" => "required|string|max:125",
|
||||
"roles" => "nullable|integer|not_in:0",
|
||||
];
|
||||
|
||||
// validasi input
|
||||
$isValidInput = Validator::make($input, $rulesInput);
|
||||
if (!$isValidInput->passes()) {
|
||||
$apiResp = Responses::bad_input($isValidInput->messages()->first());
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
|
||||
if ($req->roles) {
|
||||
if (in_array($req->roles, $roles)) {
|
||||
} else {
|
||||
$apiResp = Responses::bad_request("role not valid");
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
$users = Users::likeName($req->name, $req->roles);
|
||||
} else {
|
||||
$users = Users::likeName($req->name);
|
||||
}
|
||||
|
||||
if (count($users) < 1) {
|
||||
$apiResp = Responses::not_found("user not found");
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
|
||||
foreach ($users as $k => $v) {
|
||||
// remove from array but no reindex array
|
||||
// unset($users[$k]);
|
||||
// remove from array and reindex array
|
||||
// array_splice($users, $k, 1);
|
||||
unset($users[$k]->password);
|
||||
}
|
||||
|
||||
$apiResp = Responses::success("success search user by name");
|
||||
$apiResp["data"] = $users;
|
||||
|
||||
DB::commit();
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
} catch (\Exception $e) {
|
||||
DB::rollBack();
|
||||
$apiResp = Responses::error($e->getMessage());
|
||||
return new Response($apiResp, $apiResp["meta"]["code"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -25,8 +25,16 @@ class UsersController extends Controller
|
||||
*/
|
||||
public function view_users(Request $req)
|
||||
{
|
||||
if (
|
||||
!auth()
|
||||
->user()
|
||||
->can("user.view")
|
||||
) {
|
||||
abort(403, "Unauthorized");
|
||||
}
|
||||
$data = [
|
||||
"roles" => Users::listRoles($req->auth->role),
|
||||
// "roles" => Users::listRoles($req->auth->role),
|
||||
"roles" => DB::table("roles")->get(),
|
||||
"pernus" => UsersMenuPermissions::listPermissionsMenus([
|
||||
"is_active" => UsersMenuPermissions::IS_ACTIVE,
|
||||
]),
|
||||
@ -48,7 +56,7 @@ class UsersController extends Controller
|
||||
public function view_profile(Request $req)
|
||||
{
|
||||
$data = [
|
||||
"roles" => Users::listRoles($req->auth->role),
|
||||
"roles" => DB::table("roles")->get(),
|
||||
"pernus" => UsersMenuPermissions::listPermissionsMenus([
|
||||
"is_active" => UsersMenuPermissions::IS_ACTIVE,
|
||||
]),
|
||||
@ -304,7 +312,15 @@ class UsersController extends Controller
|
||||
|
||||
DB::beginTransaction();
|
||||
|
||||
Users::addUser($data);
|
||||
$user_id = Users::addUser($data);
|
||||
|
||||
if ($req->roles) {
|
||||
DB::table("model_has_roles")->insert([
|
||||
"role_id" => $req->roles,
|
||||
"model_type" => "App\\User", // atau 'App\User' tergantung struktur kamu
|
||||
"model_id" => $user_id, // ID user-nya
|
||||
]);
|
||||
}
|
||||
|
||||
$apiResp = Responses::created("success add new user");
|
||||
|
||||
@ -529,10 +545,24 @@ class UsersController extends Controller
|
||||
$data["updt"] = $now;
|
||||
$data["updt_by"] = $req->auth->uid;
|
||||
|
||||
$data["role"] = 2;
|
||||
|
||||
DB::beginTransaction();
|
||||
|
||||
Users::updateUser($req->uid, $data);
|
||||
|
||||
DB::table("model_has_roles")
|
||||
->where("model_id", $req->uid)
|
||||
->delete();
|
||||
|
||||
if ($req->roles) {
|
||||
DB::table("model_has_roles")->insert([
|
||||
"role_id" => $req->roles,
|
||||
"model_type" => "App\\User", // atau 'App\User' tergantung struktur kamu
|
||||
"model_id" => $req->uid, // ID user-nya
|
||||
]);
|
||||
}
|
||||
|
||||
$apiResp = Responses::created("success update user");
|
||||
|
||||
DB::commit();
|
||||
|
||||
@ -29,7 +29,7 @@ class Kernel extends HttpKernel
|
||||
* @var array
|
||||
*/
|
||||
protected $middlewareGroups = [
|
||||
'web' => [
|
||||
"web" => [
|
||||
\App\Http\Middleware\EncryptCookies::class,
|
||||
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
|
||||
\Illuminate\Session\Middleware\StartSession::class,
|
||||
@ -39,10 +39,7 @@ class Kernel extends HttpKernel
|
||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||
],
|
||||
|
||||
'api' => [
|
||||
'throttle:60,1',
|
||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||
],
|
||||
"api" => ["throttle:60,1", \Illuminate\Routing\Middleware\SubstituteBindings::class],
|
||||
];
|
||||
|
||||
/**
|
||||
@ -53,16 +50,19 @@ class Kernel extends HttpKernel
|
||||
* @var array
|
||||
*/
|
||||
protected $routeMiddleware = [
|
||||
'auth' => \App\Http\Middleware\Authenticate::class,
|
||||
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
|
||||
'auth.user' => \App\Http\Middleware\AuthUser::class,
|
||||
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
|
||||
'can' => \Illuminate\Auth\Middleware\Authorize::class,
|
||||
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
|
||||
'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
|
||||
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
|
||||
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
|
||||
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
|
||||
"auth" => \App\Http\Middleware\Authenticate::class,
|
||||
"auth.basic" => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
|
||||
"auth.user" => \App\Http\Middleware\AuthUser::class,
|
||||
"bindings" => \Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||
"cache.headers" => \Illuminate\Http\Middleware\SetCacheHeaders::class,
|
||||
"can" => \Illuminate\Auth\Middleware\Authorize::class,
|
||||
"guest" => \App\Http\Middleware\RedirectIfAuthenticated::class,
|
||||
"password.confirm" => \Illuminate\Auth\Middleware\RequirePassword::class,
|
||||
"signed" => \Illuminate\Routing\Middleware\ValidateSignature::class,
|
||||
"throttle" => \Illuminate\Routing\Middleware\ThrottleRequests::class,
|
||||
"verified" => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
|
||||
"permission" => \Spatie\Permission\Middleware\PermissionMiddleware::class,
|
||||
"role" => \Spatie\Permission\Middleware\RoleMiddleware::class,
|
||||
"role_or_permission" => \Spatie\Permission\Middleware\RoleOrPermissionMiddleware::class,
|
||||
];
|
||||
}
|
||||
}
|
||||
@ -22,225 +22,225 @@ class AuthUser
|
||||
$request->auth = Auth::user();
|
||||
$request->auth->uid = $request->auth->id;
|
||||
|
||||
if ($request->auth->role == Users::ROLE_ADMIN) {
|
||||
// views
|
||||
if ($request->is("home/*")) {
|
||||
} elseif ($request->is("home")) {
|
||||
} elseif ($request->is("dashboard/*")) {
|
||||
} elseif ($request->is("dashboard")) {
|
||||
} elseif ($request->is("drivers/*")) {
|
||||
} elseif ($request->is("drivers")) {
|
||||
} elseif ($request->is("transactions/*")) {
|
||||
} elseif ($request->is("transactions")) {
|
||||
} elseif ($request->is("vehicles/*")) {
|
||||
} elseif ($request->is("vehicles")) {
|
||||
} elseif ($request->is("clients/*")) {
|
||||
} elseif ($request->is("clients")) {
|
||||
} elseif ($request->is("zone/*")) {
|
||||
} elseif ($request->is("zone")) {
|
||||
} elseif ($request->is("users/*")) {
|
||||
} elseif ($request->is("users")) {
|
||||
} elseif ($request->is("profile/*")) {
|
||||
} elseif ($request->is("profile")) {
|
||||
} elseif ($request->is("config/*")) {
|
||||
} elseif ($request->is("config")) {
|
||||
} elseif ($request->is("pocket/*")) {
|
||||
} elseif ($request->is("pocket")) {
|
||||
} elseif ($request->is("lgb_types/*")) {
|
||||
} elseif ($request->is("lgb_types")) {
|
||||
} elseif ($request->is("lgb_masters/*")) {
|
||||
} elseif ($request->is("lgb_masters")) {
|
||||
} elseif ($request->is("insurances/*")) {
|
||||
} elseif ($request->is("static_insurances/*")) {
|
||||
}
|
||||
// api
|
||||
elseif ($request->is("api/conf/*")) {
|
||||
} elseif ($request->is("api/conf")) {
|
||||
} elseif ($request->is("api/osm/*")) {
|
||||
} elseif ($request->is("api/osm")) {
|
||||
} elseif ($request->is("api/region/*")) {
|
||||
} elseif ($request->is("api/region")) {
|
||||
} elseif ($request->is("api/zones/*")) {
|
||||
} elseif ($request->is("api/zones")) {
|
||||
} elseif ($request->is("api/vehicles/*")) {
|
||||
} elseif ($request->is("api/vehicles")) {
|
||||
} elseif ($request->is("api/drivers/*")) {
|
||||
} elseif ($request->is("api/drivers")) {
|
||||
} elseif ($request->is("api/users/*")) {
|
||||
} elseif ($request->is("api/users")) {
|
||||
} elseif ($request->is("api/clients/*")) {
|
||||
} elseif ($request->is("api/clients")) {
|
||||
} elseif ($request->is("api/tracks/*")) {
|
||||
} elseif ($request->is("api/tracks")) {
|
||||
} elseif ($request->is("api/transactions/*")) {
|
||||
} elseif ($request->is("api/transactions")) {
|
||||
} elseif ($request->is("api/transactions_spc/*")) {
|
||||
} elseif ($request->is("api/transactions_spc")) {
|
||||
} elseif ($request->is("api/insurances/*")) {
|
||||
} elseif ($request->is("api/insurances")) {
|
||||
} elseif ($request->is("api/devices/*")) {
|
||||
} elseif ($request->is("api/devices")) {
|
||||
} elseif ($request->is("api/user/clients/*")) {
|
||||
} elseif ($request->is("api/user/clients")) {
|
||||
} elseif ($request->is("api/a_items/*")) {
|
||||
} elseif ($request->is("api/a_items")) {
|
||||
} elseif ($request->is("api/admin/*")) {
|
||||
} elseif ($request->is("api/admin")) {
|
||||
} elseif ($request->is("api/static_insurances/*")) {
|
||||
} elseif ($request->is("api/static_insurances")) {
|
||||
} elseif ($request->is("api/menu_permissions/*")) {
|
||||
} elseif ($request->is("api/menu_permissions")) {
|
||||
} elseif ($request->is("api/pocket/*")) {
|
||||
} elseif ($request->is("api/pocket")) {
|
||||
} elseif ($request->is("api/lgb_types/*")) {
|
||||
} elseif ($request->is("api/lgb_types")) {
|
||||
} elseif ($request->is("api/lgb_keys/*")) {
|
||||
} elseif ($request->is("api/lgb_keys")) {
|
||||
} elseif ($request->is("api/dtypes/*")) {
|
||||
} elseif ($request->is("api/dtypes")) {
|
||||
} elseif ($request->is("api/dana/*")) {
|
||||
} elseif ($request->is("api/dana")) {
|
||||
} elseif ($request->is("api/universal/*")) {
|
||||
} elseif ($request->is("api/universal")) {
|
||||
} else {
|
||||
return abort(403, "Unauthorized action.");
|
||||
}
|
||||
} elseif ($request->auth->role == Users::ROLE_VENDOR) {
|
||||
// views
|
||||
if ($request->is("home/*")) {
|
||||
} elseif ($request->is("home")) {
|
||||
} elseif ($request->is("dashboard/*")) {
|
||||
} elseif ($request->is("dashboard")) {
|
||||
} elseif ($request->is("checklist/*")) {
|
||||
} elseif ($request->is("checklist")) {
|
||||
} elseif ($request->is("zone/*")) {
|
||||
} elseif ($request->is("zone")) {
|
||||
} elseif ($request->is("drivers/*")) {
|
||||
} elseif ($request->is("drivers")) {
|
||||
} elseif ($request->is("vehicles/*")) {
|
||||
} elseif ($request->is("vehicles")) {
|
||||
} elseif ($request->is("profile/*")) {
|
||||
} elseif ($request->is("transactions/*")) {
|
||||
} elseif ($request->is("transactions")) {
|
||||
} elseif ($request->is("profile")) {
|
||||
} elseif ($request->is("user/vendor/*")) {
|
||||
} elseif ($request->is("user/vendor")) {
|
||||
}
|
||||
// api
|
||||
elseif ($request->is("api/conf")) {
|
||||
} elseif ($request->is("api/osm/*")) {
|
||||
} elseif ($request->is("api/osm")) {
|
||||
} elseif ($request->is("api/region/*")) {
|
||||
} elseif ($request->is("api/region")) {
|
||||
} elseif ($request->is("api/tracks/*")) {
|
||||
} elseif ($request->is("api/tracks")) {
|
||||
} elseif ($request->is("api/vehicles/*")) {
|
||||
} elseif ($request->is("api/vehicles")) {
|
||||
} elseif ($request->is("api/drivers/*")) {
|
||||
} elseif ($request->is("api/drivers")) {
|
||||
} elseif ($request->is("api/user/vendor/*")) {
|
||||
} elseif ($request->is("api/user/vendor")) {
|
||||
} elseif ($request->is("api/transactions_spc/*")) {
|
||||
} elseif ($request->is("api/transactions_spc")) {
|
||||
} elseif ($request->is("api/zones/*")) {
|
||||
} elseif ($request->is("api/zones")) {
|
||||
} elseif ($request->is("api/users/*")) {
|
||||
} elseif ($request->is("api/users")) {
|
||||
} elseif ($request->is("api/universal/*")) {
|
||||
} elseif ($request->is("api/universal")) {
|
||||
} else {
|
||||
return abort(403, "Unauthorized action.");
|
||||
}
|
||||
} elseif ($request->auth->role == Users::ROLE_CLIENT_ADMIN) {
|
||||
// views
|
||||
if ($request->is("home/*")) {
|
||||
} elseif ($request->is("home")) {
|
||||
} elseif ($request->is("dashboard/*")) {
|
||||
} elseif ($request->is("dashboard")) {
|
||||
} elseif ($request->is("zone/*")) {
|
||||
} elseif ($request->is("zone")) {
|
||||
} elseif ($request->is("profile/*")) {
|
||||
} elseif ($request->is("profile")) {
|
||||
} elseif ($request->is("user/clients/*")) {
|
||||
} elseif ($request->is("user/clients")) {
|
||||
}
|
||||
// api
|
||||
elseif ($request->is("api/conf")) {
|
||||
} elseif ($request->is("api/osm/*")) {
|
||||
} elseif ($request->is("api/osm")) {
|
||||
} elseif ($request->is("api/region/*")) {
|
||||
} elseif ($request->is("api/region")) {
|
||||
} elseif ($request->is("api/zones/*")) {
|
||||
} elseif ($request->is("api/zones")) {
|
||||
} elseif ($request->is("api/tracks/*")) {
|
||||
} elseif ($request->is("api/tracks")) {
|
||||
} elseif ($request->is("api/user/clients/*")) {
|
||||
} elseif ($request->is("api/user/clients")) {
|
||||
} elseif ($request->is("api/users/*")) {
|
||||
} elseif ($request->is("api/users")) {
|
||||
} elseif ($request->is("api/universal/*")) {
|
||||
} elseif ($request->is("api/universal")) {
|
||||
} else {
|
||||
return abort(403, "Unauthorized action.");
|
||||
}
|
||||
} elseif ($request->auth->role == Users::ROLE_CHECKER) {
|
||||
// views
|
||||
if ($request->is("user/checker/*")) {
|
||||
} elseif ($request->is("user/checker")) {
|
||||
} elseif ($request->is("profile/*")) {
|
||||
} elseif ($request->is("profile")) {
|
||||
}
|
||||
// api
|
||||
elseif ($request->is("api/user/checker/*")) {
|
||||
} elseif ($request->is("api/user/checker")) {
|
||||
} elseif ($request->is("api/users/*")) {
|
||||
} elseif ($request->is("api/users")) {
|
||||
} elseif ($request->is("api/universal/*")) {
|
||||
} elseif ($request->is("api/universal")) {
|
||||
} else {
|
||||
return abort(403, "Unauthorized action.");
|
||||
}
|
||||
} elseif ($request->auth->role == Users::ROLE_FINANCE) {
|
||||
// views
|
||||
if ($request->is("finance/*")) {
|
||||
} elseif ($request->is("profile/*")) {
|
||||
} elseif ($request->is("profile")) {
|
||||
}
|
||||
// api
|
||||
elseif ($request->is("api/finance/*")) {
|
||||
} elseif ($request->is("api/finance")) {
|
||||
} elseif ($request->is("api/a_items/*")) {
|
||||
} elseif ($request->is("api/a_items")) {
|
||||
} elseif ($request->is("api/users/*")) {
|
||||
} elseif ($request->is("api/users")) {
|
||||
} elseif ($request->is("api/dana/*")) {
|
||||
} elseif ($request->is("api/dana")) {
|
||||
} elseif ($request->is("api/universal/*")) {
|
||||
} elseif ($request->is("api/universal")) {
|
||||
} else {
|
||||
return abort(403, "Unauthorized action.");
|
||||
}
|
||||
} elseif ($request->auth->role == Users::ROLE_SPECIAL_TRACKING) {
|
||||
// views
|
||||
if ($request->is("dashboard/*")) {
|
||||
} elseif ($request->is("dashboard")) {
|
||||
}
|
||||
// api
|
||||
elseif ($request->is("api/tracks/*")) {
|
||||
} elseif ($request->is("api/tracks")) {
|
||||
} elseif ($request->is("api/users/*")) {
|
||||
} elseif ($request->is("api/users")) {
|
||||
} elseif ($request->is("profile/*")) {
|
||||
} elseif ($request->is("profile")) {
|
||||
} elseif ($request->is("api/universal/*")) {
|
||||
} elseif ($request->is("api/universal")) {
|
||||
} else {
|
||||
return abort(403, "Unauthorized action.");
|
||||
}
|
||||
} else {
|
||||
return abort(403, "Unauthorized action.");
|
||||
}
|
||||
// dd($request->auth);
|
||||
|
||||
// if ($request->auth->role == Users::ROLE_ADMIN) {
|
||||
// // views
|
||||
// if ($request->is("home/*")) {
|
||||
// } elseif ($request->is("home")) {
|
||||
// } elseif ($request->is("dashboard/*")) {
|
||||
// } elseif ($request->is("dashboard")) {
|
||||
// } elseif ($request->is("drivers/*")) {
|
||||
// } elseif ($request->is("drivers")) {
|
||||
// } elseif ($request->is("transactions/*")) {
|
||||
// } elseif ($request->is("transactions")) {
|
||||
// } elseif ($request->is("vehicles/*")) {
|
||||
// } elseif ($request->is("vehicles")) {
|
||||
// } elseif ($request->is("clients/*")) {
|
||||
// } elseif ($request->is("clients")) {
|
||||
// } elseif ($request->is("zone/*")) {
|
||||
// } elseif ($request->is("zone")) {
|
||||
// } elseif ($request->is("users/*")) {
|
||||
// } elseif ($request->is("users")) {
|
||||
// } elseif ($request->is("profile/*")) {
|
||||
// } elseif ($request->is("profile")) {
|
||||
// } elseif ($request->is("config/*")) {
|
||||
// } elseif ($request->is("config")) {
|
||||
// } elseif ($request->is("pocket/*")) {
|
||||
// } elseif ($request->is("pocket")) {
|
||||
// } elseif ($request->is("lgb_types/*")) {
|
||||
// } elseif ($request->is("lgb_types")) {
|
||||
// } elseif ($request->is("lgb_masters/*")) {
|
||||
// } elseif ($request->is("lgb_masters")) {
|
||||
// } elseif ($request->is("insurances/*")) {
|
||||
// } elseif ($request->is("static_insurances/*")) {
|
||||
// }
|
||||
// // api
|
||||
// elseif ($request->is("api/conf/*")) {
|
||||
// } elseif ($request->is("api/conf")) {
|
||||
// } elseif ($request->is("api/osm/*")) {
|
||||
// } elseif ($request->is("api/osm")) {
|
||||
// } elseif ($request->is("api/region/*")) {
|
||||
// } elseif ($request->is("api/region")) {
|
||||
// } elseif ($request->is("api/zones/*")) {
|
||||
// } elseif ($request->is("api/zones")) {
|
||||
// } elseif ($request->is("api/vehicles/*")) {
|
||||
// } elseif ($request->is("api/vehicles")) {
|
||||
// } elseif ($request->is("api/drivers/*")) {
|
||||
// } elseif ($request->is("api/drivers")) {
|
||||
// } elseif ($request->is("api/users/*")) {
|
||||
// } elseif ($request->is("api/users")) {
|
||||
// } elseif ($request->is("api/clients/*")) {
|
||||
// } elseif ($request->is("api/clients")) {
|
||||
// } elseif ($request->is("api/tracks/*")) {
|
||||
// } elseif ($request->is("api/tracks")) {
|
||||
// } elseif ($request->is("api/transactions/*")) {
|
||||
// } elseif ($request->is("api/transactions")) {
|
||||
// } elseif ($request->is("api/transactions_spc/*")) {
|
||||
// } elseif ($request->is("api/transactions_spc")) {
|
||||
// } elseif ($request->is("api/insurances/*")) {
|
||||
// } elseif ($request->is("api/insurances")) {
|
||||
// } elseif ($request->is("api/devices/*")) {
|
||||
// } elseif ($request->is("api/devices")) {
|
||||
// } elseif ($request->is("api/user/clients/*")) {
|
||||
// } elseif ($request->is("api/user/clients")) {
|
||||
// } elseif ($request->is("api/a_items/*")) {
|
||||
// } elseif ($request->is("api/a_items")) {
|
||||
// } elseif ($request->is("api/admin/*")) {
|
||||
// } elseif ($request->is("api/admin")) {
|
||||
// } elseif ($request->is("api/static_insurances/*")) {
|
||||
// } elseif ($request->is("api/static_insurances")) {
|
||||
// } elseif ($request->is("api/menu_permissions/*")) {
|
||||
// } elseif ($request->is("api/menu_permissions")) {
|
||||
// } elseif ($request->is("api/pocket/*")) {
|
||||
// } elseif ($request->is("api/pocket")) {
|
||||
// } elseif ($request->is("api/lgb_types/*")) {
|
||||
// } elseif ($request->is("api/lgb_types")) {
|
||||
// } elseif ($request->is("api/lgb_keys/*")) {
|
||||
// } elseif ($request->is("api/lgb_keys")) {
|
||||
// } elseif ($request->is("api/dtypes/*")) {
|
||||
// } elseif ($request->is("api/dtypes")) {
|
||||
// } elseif ($request->is("api/dana/*")) {
|
||||
// } elseif ($request->is("api/dana")) {
|
||||
// } elseif ($request->is("api/universal/*")) {
|
||||
// } elseif ($request->is("api/universal")) {
|
||||
// } else {
|
||||
// return abort(403, "Unauthorized action.");
|
||||
// }
|
||||
// } elseif ($request->auth->role == Users::ROLE_VENDOR) {
|
||||
// // views
|
||||
// if ($request->is("home/*")) {
|
||||
// } elseif ($request->is("home")) {
|
||||
// } elseif ($request->is("dashboard/*")) {
|
||||
// } elseif ($request->is("dashboard")) {
|
||||
// } elseif ($request->is("checklist/*")) {
|
||||
// } elseif ($request->is("checklist")) {
|
||||
// } elseif ($request->is("zone/*")) {
|
||||
// } elseif ($request->is("zone")) {
|
||||
// } elseif ($request->is("drivers/*")) {
|
||||
// } elseif ($request->is("drivers")) {
|
||||
// } elseif ($request->is("vehicles/*")) {
|
||||
// } elseif ($request->is("vehicles")) {
|
||||
// } elseif ($request->is("profile/*")) {
|
||||
// } elseif ($request->is("transactions/*")) {
|
||||
// } elseif ($request->is("transactions")) {
|
||||
// } elseif ($request->is("profile")) {
|
||||
// } elseif ($request->is("user/vendor/*")) {
|
||||
// } elseif ($request->is("user/vendor")) {
|
||||
// }
|
||||
// // api
|
||||
// elseif ($request->is("api/conf")) {
|
||||
// } elseif ($request->is("api/osm/*")) {
|
||||
// } elseif ($request->is("api/osm")) {
|
||||
// } elseif ($request->is("api/region/*")) {
|
||||
// } elseif ($request->is("api/region")) {
|
||||
// } elseif ($request->is("api/tracks/*")) {
|
||||
// } elseif ($request->is("api/tracks")) {
|
||||
// } elseif ($request->is("api/vehicles/*")) {
|
||||
// } elseif ($request->is("api/vehicles")) {
|
||||
// } elseif ($request->is("api/drivers/*")) {
|
||||
// } elseif ($request->is("api/drivers")) {
|
||||
// } elseif ($request->is("api/user/vendor/*")) {
|
||||
// } elseif ($request->is("api/user/vendor")) {
|
||||
// } elseif ($request->is("api/transactions_spc/*")) {
|
||||
// } elseif ($request->is("api/transactions_spc")) {
|
||||
// } elseif ($request->is("api/zones/*")) {
|
||||
// } elseif ($request->is("api/zones")) {
|
||||
// } elseif ($request->is("api/users/*")) {
|
||||
// } elseif ($request->is("api/users")) {
|
||||
// } elseif ($request->is("api/universal/*")) {
|
||||
// } elseif ($request->is("api/universal")) {
|
||||
// } else {
|
||||
// return abort(403, "Unauthorized action.");
|
||||
// }
|
||||
// } elseif ($request->auth->role == Users::ROLE_CLIENT_ADMIN) {
|
||||
// // views
|
||||
// if ($request->is("home/*")) {
|
||||
// } elseif ($request->is("home")) {
|
||||
// } elseif ($request->is("dashboard/*")) {
|
||||
// } elseif ($request->is("dashboard")) {
|
||||
// } elseif ($request->is("zone/*")) {
|
||||
// } elseif ($request->is("zone")) {
|
||||
// } elseif ($request->is("profile/*")) {
|
||||
// } elseif ($request->is("profile")) {
|
||||
// } elseif ($request->is("user/clients/*")) {
|
||||
// } elseif ($request->is("user/clients")) {
|
||||
// }
|
||||
// // api
|
||||
// elseif ($request->is("api/conf")) {
|
||||
// } elseif ($request->is("api/osm/*")) {
|
||||
// } elseif ($request->is("api/osm")) {
|
||||
// } elseif ($request->is("api/region/*")) {
|
||||
// } elseif ($request->is("api/region")) {
|
||||
// } elseif ($request->is("api/zones/*")) {
|
||||
// } elseif ($request->is("api/zones")) {
|
||||
// } elseif ($request->is("api/tracks/*")) {
|
||||
// } elseif ($request->is("api/tracks")) {
|
||||
// } elseif ($request->is("api/user/clients/*")) {
|
||||
// } elseif ($request->is("api/user/clients")) {
|
||||
// } elseif ($request->is("api/users/*")) {
|
||||
// } elseif ($request->is("api/users")) {
|
||||
// } elseif ($request->is("api/universal/*")) {
|
||||
// } elseif ($request->is("api/universal")) {
|
||||
// } else {
|
||||
// return abort(403, "Unauthorized action.");
|
||||
// }
|
||||
// } elseif ($request->auth->role == Users::ROLE_CHECKER) {
|
||||
// // views
|
||||
// if ($request->is("user/checker/*")) {
|
||||
// } elseif ($request->is("user/checker")) {
|
||||
// } elseif ($request->is("profile/*")) {
|
||||
// } elseif ($request->is("profile")) {
|
||||
// }
|
||||
// // api
|
||||
// elseif ($request->is("api/user/checker/*")) {
|
||||
// } elseif ($request->is("api/user/checker")) {
|
||||
// } elseif ($request->is("api/users/*")) {
|
||||
// } elseif ($request->is("api/users")) {
|
||||
// } elseif ($request->is("api/universal/*")) {
|
||||
// } elseif ($request->is("api/universal")) {
|
||||
// } else {
|
||||
// return abort(403, "Unauthorized action.");
|
||||
// }
|
||||
// } elseif ($request->auth->role == Users::ROLE_FINANCE) {
|
||||
// // views
|
||||
// if ($request->is("finance/*")) {
|
||||
// } elseif ($request->is("profile/*")) {
|
||||
// } elseif ($request->is("profile")) {
|
||||
// }
|
||||
// // api
|
||||
// elseif ($request->is("api/finance/*")) {
|
||||
// } elseif ($request->is("api/finance")) {
|
||||
// } elseif ($request->is("api/a_items/*")) {
|
||||
// } elseif ($request->is("api/a_items")) {
|
||||
// } elseif ($request->is("api/users/*")) {
|
||||
// } elseif ($request->is("api/users")) {
|
||||
// } elseif ($request->is("api/dana/*")) {
|
||||
// } elseif ($request->is("api/dana")) {
|
||||
// } elseif ($request->is("api/universal/*")) {
|
||||
// } elseif ($request->is("api/universal")) {
|
||||
// } else {
|
||||
// return abort(403, "Unauthorized action.");
|
||||
// }
|
||||
// } elseif ($request->auth->role == Users::ROLE_SPECIAL_TRACKING) {
|
||||
// // views
|
||||
// if ($request->is("dashboard/*")) {
|
||||
// } elseif ($request->is("dashboard")) {
|
||||
// }
|
||||
// // api
|
||||
// elseif ($request->is("api/tracks/*")) {
|
||||
// } elseif ($request->is("api/tracks")) {
|
||||
// } elseif ($request->is("api/users/*")) {
|
||||
// } elseif ($request->is("api/users")) {
|
||||
// } elseif ($request->is("api/universal/*")) {
|
||||
// } elseif ($request->is("api/universal")) {
|
||||
// } else {
|
||||
// return abort(403, "Unauthorized action.");
|
||||
// }
|
||||
// } else {
|
||||
// return abort(403, "Unauthorized action.");
|
||||
// }
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -4,9 +4,11 @@ namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
|
||||
class Users extends Model
|
||||
class Users extends Authenticatable
|
||||
{
|
||||
protected $table = "t_users";
|
||||
const ROLE_SU = 1; // unused
|
||||
const ROLE_SUPERADMIN = 7;
|
||||
const ROLE_ADMIN = 2;
|
||||
@ -40,9 +42,12 @@ class Users extends Model
|
||||
const DEFAULT_PHONE_CODE = 62;
|
||||
|
||||
const defaultSelected = "
|
||||
u.*
|
||||
,c.c_name AS client_group_name,c.id AS client_group_id
|
||||
,r.name AS role_name
|
||||
u.*
|
||||
,c.c_name AS client_group_name
|
||||
,c.id AS client_group_id
|
||||
-- ,r.name as role_name
|
||||
,rl.id AS role_id
|
||||
,rl.name AS role_name
|
||||
";
|
||||
|
||||
public static function listUsers($filter = [])
|
||||
@ -77,19 +82,20 @@ class Users extends Model
|
||||
}
|
||||
|
||||
return DB::select(
|
||||
"SELECT
|
||||
" .
|
||||
" SELECT " .
|
||||
Users::defaultSelected .
|
||||
"
|
||||
$select_select
|
||||
FROM t_users AS u
|
||||
LEFT JOIN t_clients AS c ON u.client_group_id = c.id
|
||||
LEFT JOIN t_users_roles AS r ON u.role = r.id
|
||||
$join_join
|
||||
WHERE u.dlt is null
|
||||
$where_where
|
||||
$other_other
|
||||
;",
|
||||
$select_select
|
||||
FROM t_users AS u
|
||||
LEFT JOIN t_clients AS c ON u.client_group_id = c.id
|
||||
-- LEFT JOIN t_users_roles AS r ON u.role = r.id
|
||||
LEFT JOIN model_has_roles AS mhr ON mhr.model_id = u.id
|
||||
LEFT JOIN roles as rl ON rl.id = mhr.role_id
|
||||
$join_join
|
||||
WHERE u.dlt is null
|
||||
$where_where
|
||||
$other_other
|
||||
;",
|
||||
$params
|
||||
);
|
||||
}
|
||||
@ -137,7 +143,9 @@ class Users extends Model
|
||||
"
|
||||
FROM t_users AS u
|
||||
LEFT JOIN t_clients AS c ON u.client_group_id = c.id
|
||||
LEFT JOIN t_users_roles AS r ON u.role = r.id
|
||||
-- LEFT JOIN t_users_roles AS r ON u.role = r.id
|
||||
LEFT JOIN model_has_roles AS mhr ON mhr.model_id = u.id
|
||||
LEFT JOIN roles as rl ON rl.id = mhr.role_id
|
||||
WHERE u.dlt is null
|
||||
AND u.id = ?
|
||||
LIMIT 1;",
|
||||
|
||||
16
app/User.php
16
app/User.php
@ -5,30 +5,28 @@ namespace App;
|
||||
use Illuminate\Contracts\Auth\MustVerifyEmail;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
use Spatie\Permission\Traits\HasRoles;
|
||||
|
||||
class User extends Authenticatable
|
||||
{
|
||||
use Notifiable;
|
||||
use HasRoles;
|
||||
|
||||
protected $table = 't_users';
|
||||
protected $table = "t_users";
|
||||
|
||||
/**
|
||||
* The attributes that are mass assignable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $fillable = [
|
||||
'first_name', 'last_name', 'email', 'phone', 'password',
|
||||
];
|
||||
protected $fillable = ["first_name", "last_name", "email", "phone", "password"];
|
||||
|
||||
/**
|
||||
* The attributes that should be hidden for arrays.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $hidden = [
|
||||
'password', 'remember_token',
|
||||
];
|
||||
protected $hidden = ["password", "remember_token"];
|
||||
|
||||
/**
|
||||
* The attributes that should be cast to native types.
|
||||
@ -36,6 +34,6 @@ class User extends Authenticatable
|
||||
* @var array
|
||||
*/
|
||||
protected $casts = [
|
||||
'email_verified_at' => 'datetime',
|
||||
"email_verified_at" => "datetime",
|
||||
];
|
||||
}
|
||||
}
|
||||
@ -17,6 +17,7 @@
|
||||
"laravel/framework": "^9.0.0",
|
||||
"laravel/tinker": "^2.5",
|
||||
"laravel/ui": "^4.0",
|
||||
"spatie/laravel-permission": "^6.20",
|
||||
"yajra/laravel-datatables": "^9.0"
|
||||
},
|
||||
"require-dev": {
|
||||
|
||||
1487
composer.lock
generated
1487
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,6 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Authentication Defaults
|
||||
@ -13,9 +12,9 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'defaults' => [
|
||||
'guard' => 'web',
|
||||
'passwords' => 'users',
|
||||
"defaults" => [
|
||||
"guard" => "web",
|
||||
"passwords" => "users",
|
||||
],
|
||||
|
||||
/*
|
||||
@ -35,16 +34,16 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'guards' => [
|
||||
'web' => [
|
||||
'driver' => 'session',
|
||||
'provider' => 'users',
|
||||
"guards" => [
|
||||
"web" => [
|
||||
"driver" => "session",
|
||||
"provider" => "users",
|
||||
],
|
||||
|
||||
'api' => [
|
||||
'driver' => 'token',
|
||||
'provider' => 'users',
|
||||
'hash' => false,
|
||||
"api" => [
|
||||
"driver" => "token",
|
||||
"provider" => "users",
|
||||
"hash" => false,
|
||||
],
|
||||
],
|
||||
|
||||
@ -65,10 +64,10 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'providers' => [
|
||||
'users' => [
|
||||
'driver' => 'eloquent',
|
||||
'model' => App\User::class,
|
||||
"providers" => [
|
||||
"users" => [
|
||||
"driver" => "eloquent",
|
||||
"model" => App\User::class,
|
||||
],
|
||||
|
||||
// 'users' => [
|
||||
@ -92,12 +91,12 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'passwords' => [
|
||||
'users' => [
|
||||
'provider' => 'users',
|
||||
'table' => 'password_resets',
|
||||
'expire' => 60,
|
||||
'throttle' => 60,
|
||||
"passwords" => [
|
||||
"users" => [
|
||||
"provider" => "users",
|
||||
"table" => "password_resets",
|
||||
"expire" => 60,
|
||||
"throttle" => 60,
|
||||
],
|
||||
],
|
||||
|
||||
@ -112,6 +111,5 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'password_timeout' => 10800,
|
||||
|
||||
];
|
||||
"password_timeout" => 10800,
|
||||
];
|
||||
202
config/permission.php
Normal file
202
config/permission.php
Normal file
@ -0,0 +1,202 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
|
||||
'models' => [
|
||||
|
||||
/*
|
||||
* When using the "HasPermissions" trait from this package, we need to know which
|
||||
* Eloquent model should be used to retrieve your permissions. Of course, it
|
||||
* is often just the "Permission" model but you may use whatever you like.
|
||||
*
|
||||
* The model you want to use as a Permission model needs to implement the
|
||||
* `Spatie\Permission\Contracts\Permission` contract.
|
||||
*/
|
||||
|
||||
'permission' => Spatie\Permission\Models\Permission::class,
|
||||
|
||||
/*
|
||||
* When using the "HasRoles" trait from this package, we need to know which
|
||||
* Eloquent model should be used to retrieve your roles. Of course, it
|
||||
* is often just the "Role" model but you may use whatever you like.
|
||||
*
|
||||
* The model you want to use as a Role model needs to implement the
|
||||
* `Spatie\Permission\Contracts\Role` contract.
|
||||
*/
|
||||
|
||||
'role' => Spatie\Permission\Models\Role::class,
|
||||
|
||||
],
|
||||
|
||||
'table_names' => [
|
||||
|
||||
/*
|
||||
* When using the "HasRoles" trait from this package, we need to know which
|
||||
* table should be used to retrieve your roles. We have chosen a basic
|
||||
* default value but you may easily change it to any table you like.
|
||||
*/
|
||||
|
||||
'roles' => 'roles',
|
||||
|
||||
/*
|
||||
* When using the "HasPermissions" trait from this package, we need to know which
|
||||
* table should be used to retrieve your permissions. We have chosen a basic
|
||||
* default value but you may easily change it to any table you like.
|
||||
*/
|
||||
|
||||
'permissions' => 'permissions',
|
||||
|
||||
/*
|
||||
* When using the "HasPermissions" trait from this package, we need to know which
|
||||
* table should be used to retrieve your models permissions. We have chosen a
|
||||
* basic default value but you may easily change it to any table you like.
|
||||
*/
|
||||
|
||||
'model_has_permissions' => 'model_has_permissions',
|
||||
|
||||
/*
|
||||
* When using the "HasRoles" trait from this package, we need to know which
|
||||
* table should be used to retrieve your models roles. We have chosen a
|
||||
* basic default value but you may easily change it to any table you like.
|
||||
*/
|
||||
|
||||
'model_has_roles' => 'model_has_roles',
|
||||
|
||||
/*
|
||||
* When using the "HasRoles" trait from this package, we need to know which
|
||||
* table should be used to retrieve your roles permissions. We have chosen a
|
||||
* basic default value but you may easily change it to any table you like.
|
||||
*/
|
||||
|
||||
'role_has_permissions' => 'role_has_permissions',
|
||||
],
|
||||
|
||||
'column_names' => [
|
||||
/*
|
||||
* Change this if you want to name the related pivots other than defaults
|
||||
*/
|
||||
'role_pivot_key' => null, // default 'role_id',
|
||||
'permission_pivot_key' => null, // default 'permission_id',
|
||||
|
||||
/*
|
||||
* Change this if you want to name the related model primary key other than
|
||||
* `model_id`.
|
||||
*
|
||||
* For example, this would be nice if your primary keys are all UUIDs. In
|
||||
* that case, name this `model_uuid`.
|
||||
*/
|
||||
|
||||
'model_morph_key' => 'model_id',
|
||||
|
||||
/*
|
||||
* Change this if you want to use the teams feature and your related model's
|
||||
* foreign key is other than `team_id`.
|
||||
*/
|
||||
|
||||
'team_foreign_key' => 'team_id',
|
||||
],
|
||||
|
||||
/*
|
||||
* When set to true, the method for checking permissions will be registered on the gate.
|
||||
* Set this to false if you want to implement custom logic for checking permissions.
|
||||
*/
|
||||
|
||||
'register_permission_check_method' => true,
|
||||
|
||||
/*
|
||||
* When set to true, Laravel\Octane\Events\OperationTerminated event listener will be registered
|
||||
* this will refresh permissions on every TickTerminated, TaskTerminated and RequestTerminated
|
||||
* NOTE: This should not be needed in most cases, but an Octane/Vapor combination benefited from it.
|
||||
*/
|
||||
'register_octane_reset_listener' => false,
|
||||
|
||||
/*
|
||||
* Events will fire when a role or permission is assigned/unassigned:
|
||||
* \Spatie\Permission\Events\RoleAttached
|
||||
* \Spatie\Permission\Events\RoleDetached
|
||||
* \Spatie\Permission\Events\PermissionAttached
|
||||
* \Spatie\Permission\Events\PermissionDetached
|
||||
*
|
||||
* To enable, set to true, and then create listeners to watch these events.
|
||||
*/
|
||||
'events_enabled' => false,
|
||||
|
||||
/*
|
||||
* Teams Feature.
|
||||
* When set to true the package implements teams using the 'team_foreign_key'.
|
||||
* If you want the migrations to register the 'team_foreign_key', you must
|
||||
* set this to true before doing the migration.
|
||||
* If you already did the migration then you must make a new migration to also
|
||||
* add 'team_foreign_key' to 'roles', 'model_has_roles', and 'model_has_permissions'
|
||||
* (view the latest version of this package's migration file)
|
||||
*/
|
||||
|
||||
'teams' => false,
|
||||
|
||||
/*
|
||||
* The class to use to resolve the permissions team id
|
||||
*/
|
||||
'team_resolver' => \Spatie\Permission\DefaultTeamResolver::class,
|
||||
|
||||
/*
|
||||
* Passport Client Credentials Grant
|
||||
* When set to true the package will use Passports Client to check permissions
|
||||
*/
|
||||
|
||||
'use_passport_client_credentials' => false,
|
||||
|
||||
/*
|
||||
* When set to true, the required permission names are added to exception messages.
|
||||
* This could be considered an information leak in some contexts, so the default
|
||||
* setting is false here for optimum safety.
|
||||
*/
|
||||
|
||||
'display_permission_in_exception' => false,
|
||||
|
||||
/*
|
||||
* When set to true, the required role names are added to exception messages.
|
||||
* This could be considered an information leak in some contexts, so the default
|
||||
* setting is false here for optimum safety.
|
||||
*/
|
||||
|
||||
'display_role_in_exception' => false,
|
||||
|
||||
/*
|
||||
* By default wildcard permission lookups are disabled.
|
||||
* See documentation to understand supported syntax.
|
||||
*/
|
||||
|
||||
'enable_wildcard_permission' => false,
|
||||
|
||||
/*
|
||||
* The class to use for interpreting wildcard permissions.
|
||||
* If you need to modify delimiters, override the class and specify its name here.
|
||||
*/
|
||||
// 'wildcard_permission' => Spatie\Permission\WildcardPermission::class,
|
||||
|
||||
/* Cache-specific settings */
|
||||
|
||||
'cache' => [
|
||||
|
||||
/*
|
||||
* By default all permissions are cached for 24 hours to speed up performance.
|
||||
* When permissions or roles are updated the cache is flushed automatically.
|
||||
*/
|
||||
|
||||
'expiration_time' => \DateInterval::createFromDateString('24 hours'),
|
||||
|
||||
/*
|
||||
* The cache key used to store all permissions.
|
||||
*/
|
||||
|
||||
'key' => 'spatie.permission.cache',
|
||||
|
||||
/*
|
||||
* You may optionally indicate a specific cache driver to use for permission and
|
||||
* role caching using any of the `store` drivers listed in the cache.php config
|
||||
* file. Using 'default' here means to use the `default` set in cache.php.
|
||||
*/
|
||||
|
||||
'store' => 'default',
|
||||
],
|
||||
];
|
||||
@ -0,0 +1,136 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
public function up(): void
|
||||
{
|
||||
$teams = config('permission.teams');
|
||||
$tableNames = config('permission.table_names');
|
||||
$columnNames = config('permission.column_names');
|
||||
$pivotRole = $columnNames['role_pivot_key'] ?? 'role_id';
|
||||
$pivotPermission = $columnNames['permission_pivot_key'] ?? 'permission_id';
|
||||
|
||||
throw_if(empty($tableNames), new Exception('Error: config/permission.php not loaded. Run [php artisan config:clear] and try again.'));
|
||||
throw_if($teams && empty($columnNames['team_foreign_key'] ?? null), new Exception('Error: team_foreign_key on config/permission.php not loaded. Run [php artisan config:clear] and try again.'));
|
||||
|
||||
Schema::create($tableNames['permissions'], static function (Blueprint $table) {
|
||||
// $table->engine('InnoDB');
|
||||
$table->bigIncrements('id'); // permission id
|
||||
$table->string('name'); // For MyISAM use string('name', 225); // (or 166 for InnoDB with Redundant/Compact row format)
|
||||
$table->string('guard_name'); // For MyISAM use string('guard_name', 25);
|
||||
$table->timestamps();
|
||||
|
||||
$table->unique(['name', 'guard_name']);
|
||||
});
|
||||
|
||||
Schema::create($tableNames['roles'], static function (Blueprint $table) use ($teams, $columnNames) {
|
||||
// $table->engine('InnoDB');
|
||||
$table->bigIncrements('id'); // role id
|
||||
if ($teams || config('permission.testing')) { // permission.testing is a fix for sqlite testing
|
||||
$table->unsignedBigInteger($columnNames['team_foreign_key'])->nullable();
|
||||
$table->index($columnNames['team_foreign_key'], 'roles_team_foreign_key_index');
|
||||
}
|
||||
$table->string('name'); // For MyISAM use string('name', 225); // (or 166 for InnoDB with Redundant/Compact row format)
|
||||
$table->string('guard_name'); // For MyISAM use string('guard_name', 25);
|
||||
$table->timestamps();
|
||||
if ($teams || config('permission.testing')) {
|
||||
$table->unique([$columnNames['team_foreign_key'], 'name', 'guard_name']);
|
||||
} else {
|
||||
$table->unique(['name', 'guard_name']);
|
||||
}
|
||||
});
|
||||
|
||||
Schema::create($tableNames['model_has_permissions'], static function (Blueprint $table) use ($tableNames, $columnNames, $pivotPermission, $teams) {
|
||||
$table->unsignedBigInteger($pivotPermission);
|
||||
|
||||
$table->string('model_type');
|
||||
$table->unsignedBigInteger($columnNames['model_morph_key']);
|
||||
$table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_permissions_model_id_model_type_index');
|
||||
|
||||
$table->foreign($pivotPermission)
|
||||
->references('id') // permission id
|
||||
->on($tableNames['permissions'])
|
||||
->onDelete('cascade');
|
||||
if ($teams) {
|
||||
$table->unsignedBigInteger($columnNames['team_foreign_key']);
|
||||
$table->index($columnNames['team_foreign_key'], 'model_has_permissions_team_foreign_key_index');
|
||||
|
||||
$table->primary([$columnNames['team_foreign_key'], $pivotPermission, $columnNames['model_morph_key'], 'model_type'],
|
||||
'model_has_permissions_permission_model_type_primary');
|
||||
} else {
|
||||
$table->primary([$pivotPermission, $columnNames['model_morph_key'], 'model_type'],
|
||||
'model_has_permissions_permission_model_type_primary');
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
Schema::create($tableNames['model_has_roles'], static function (Blueprint $table) use ($tableNames, $columnNames, $pivotRole, $teams) {
|
||||
$table->unsignedBigInteger($pivotRole);
|
||||
|
||||
$table->string('model_type');
|
||||
$table->unsignedBigInteger($columnNames['model_morph_key']);
|
||||
$table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_roles_model_id_model_type_index');
|
||||
|
||||
$table->foreign($pivotRole)
|
||||
->references('id') // role id
|
||||
->on($tableNames['roles'])
|
||||
->onDelete('cascade');
|
||||
if ($teams) {
|
||||
$table->unsignedBigInteger($columnNames['team_foreign_key']);
|
||||
$table->index($columnNames['team_foreign_key'], 'model_has_roles_team_foreign_key_index');
|
||||
|
||||
$table->primary([$columnNames['team_foreign_key'], $pivotRole, $columnNames['model_morph_key'], 'model_type'],
|
||||
'model_has_roles_role_model_type_primary');
|
||||
} else {
|
||||
$table->primary([$pivotRole, $columnNames['model_morph_key'], 'model_type'],
|
||||
'model_has_roles_role_model_type_primary');
|
||||
}
|
||||
});
|
||||
|
||||
Schema::create($tableNames['role_has_permissions'], static function (Blueprint $table) use ($tableNames, $pivotRole, $pivotPermission) {
|
||||
$table->unsignedBigInteger($pivotPermission);
|
||||
$table->unsignedBigInteger($pivotRole);
|
||||
|
||||
$table->foreign($pivotPermission)
|
||||
->references('id') // permission id
|
||||
->on($tableNames['permissions'])
|
||||
->onDelete('cascade');
|
||||
|
||||
$table->foreign($pivotRole)
|
||||
->references('id') // role id
|
||||
->on($tableNames['roles'])
|
||||
->onDelete('cascade');
|
||||
|
||||
$table->primary([$pivotPermission, $pivotRole], 'role_has_permissions_permission_id_role_id_primary');
|
||||
});
|
||||
|
||||
app('cache')
|
||||
->store(config('permission.cache.store') != 'default' ? config('permission.cache.store') : null)
|
||||
->forget(config('permission.cache.key'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*/
|
||||
public function down(): void
|
||||
{
|
||||
$tableNames = config('permission.table_names');
|
||||
|
||||
if (empty($tableNames)) {
|
||||
throw new \Exception('Error: config/permission.php not found and defaults could not be merged. Please publish the package configuration before proceeding, or drop the tables manually.');
|
||||
}
|
||||
|
||||
Schema::drop($tableNames['role_has_permissions']);
|
||||
Schema::drop($tableNames['model_has_roles']);
|
||||
Schema::drop($tableNames['model_has_permissions']);
|
||||
Schema::drop($tableNames['roles']);
|
||||
Schema::drop($tableNames['permissions']);
|
||||
}
|
||||
};
|
||||
@ -1,7 +1,6 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Authentication Language Lines
|
||||
@ -13,7 +12,6 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'failed' => 'These credentials do not match our records.',
|
||||
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
|
||||
|
||||
"failed" => "These credentials do not match our records.",
|
||||
"throttle" => "Too many login attempts. Please try again in :seconds seconds.",
|
||||
];
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
}
|
||||
|
||||
/* .select2-container {
|
||||
z-index: 99999;
|
||||
} */
|
||||
z-index: 99999;
|
||||
} */
|
||||
</style>
|
||||
@endsection
|
||||
|
||||
@ -261,7 +261,9 @@
|
||||
<div class="modal-footer">
|
||||
{{-- <button type="button" id="btnDelClient_updt" class="btn btn-sm btn-warning">Delete ?</button> --}}
|
||||
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
|
||||
<button type="button" id="btnSubmitUpdtClient" class="btn btn-sm btn-danger">Update data</button>
|
||||
@can('client.edit')
|
||||
<button type="button" id="btnSubmitUpdtClient" class="btn btn-sm btn-danger">Update data</button>
|
||||
@endcan
|
||||
<div id="edt-btnSubmitUpdtClient" class="d-none">
|
||||
<div class="spinner-border" role="status">
|
||||
<span class="visually-hidden">Loading...</span>
|
||||
@ -415,7 +417,7 @@
|
||||
let action = `
|
||||
<a href="#" class="text-decoration-none me-1 btnEdtClient" data-bs-toggle="tooltip"
|
||||
data-bs-placement="bottom" title="Edit">
|
||||
<span class="icon ion-edit fz-16"></span>
|
||||
<span class="icon ion-eye fz-16"></span>
|
||||
</a>
|
||||
`;
|
||||
// <a href="#" class="text-decoration-none text-danger btnDelClient"
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
@section('customcss')
|
||||
<style>
|
||||
/* .select2-container {
|
||||
z-index: 99999;
|
||||
} */
|
||||
z-index: 99999;
|
||||
} */
|
||||
</style>
|
||||
@endsection
|
||||
|
||||
@ -21,9 +21,12 @@
|
||||
<div class="col-3">
|
||||
<p class="card-title text-bold mb-0">Device (<span id="count_devices">0</span>)</p>
|
||||
</div>
|
||||
<div class="col text-end">
|
||||
<button id="btnMdlNewDevice" class="btn btn-sm btn-danger">Add New Device</button>
|
||||
</div>
|
||||
@can('config_master_device.create')
|
||||
<div class="col text-end">
|
||||
<button id="btnMdlNewDevice" class="btn btn-sm btn-danger">Add New Device</button>
|
||||
</div>
|
||||
@endcan
|
||||
|
||||
<div class="col-auto text-end ps-0">
|
||||
{{-- <button class="btn btn-sm btn-danger">Upload</button> --}}
|
||||
{{-- <button class="btn btn-sm btn-danger">Download</button> --}}
|
||||
@ -227,9 +230,13 @@
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" id="btnDelDevice_updt" class="btn btn-sm btn-warning">Delete ?</button>
|
||||
@can('config_master_device.delete')
|
||||
<button type="button" id="btnDelDevice_updt" class="btn btn-sm btn-warning">Delete ?</button>
|
||||
@endcan
|
||||
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
|
||||
<button id="btnSubmitUpdtDevices" type="button" class="btn btn-sm btn-danger">Update Data</button>
|
||||
@can('config_master_device.edit')
|
||||
<button id="btnSubmitUpdtDevices" type="button" class="btn btn-sm btn-danger">Ubah data</button>
|
||||
@endcan
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -329,13 +336,13 @@
|
||||
});
|
||||
$('#add-available').bind('change', function() {
|
||||
if ($(this).is(':checked'))
|
||||
$('#add-txtAvailable').html('Available')
|
||||
$('#add-txtAvailable').html('Tersedia')
|
||||
else
|
||||
$('#add-txtAvailable').html('Not Available')
|
||||
});
|
||||
$('#updt-available').bind('change', function() {
|
||||
if ($(this).is(':checked'))
|
||||
$('#updt-txtAvailable').html('Available')
|
||||
$('#updt-txtAvailable').html('Tersedia')
|
||||
else
|
||||
$('#updt-txtAvailable').html('Not Available')
|
||||
});
|
||||
@ -396,7 +403,7 @@
|
||||
render: function(data, type, row, meta) {
|
||||
let action = `
|
||||
<a href="#" class="text-decoration-none me-1 btnUpdtDevice">
|
||||
<span class="icon ion-edit fz-16"></span>
|
||||
<span class="icon ion-eye fz-16"></span>
|
||||
</a>
|
||||
`;
|
||||
// <a href="#" class="text-decoration-none text-danger btnDelDevice">
|
||||
|
||||
@ -20,9 +20,12 @@
|
||||
{{-- <p class="card-title text-bold mb-0">Vehicle Types (<span id="count_trucktypes">0</span>)</p> --}}
|
||||
<p class="card-title text-bold mb-0">Vehicle Types</p>
|
||||
</div>
|
||||
<div class="col text-end">
|
||||
<button id="btnMdlNewTruckType" class="btn btn-sm btn-danger">Add New Vehicle Type</button>
|
||||
</div>
|
||||
@can('config_truck_type.create')
|
||||
<div class="col text-end">
|
||||
<button id="btnMdlNewTruckType" class="btn btn-sm btn-danger">Add New Vehicle Type</button>
|
||||
</div>
|
||||
@endcan
|
||||
|
||||
<div class="col-auto text-end ps-0">
|
||||
{{-- <button class="btn btn-sm btn-danger">Upload</button> --}}
|
||||
{{-- <button class="btn btn-sm btn-danger">Download</button> --}}
|
||||
@ -190,9 +193,13 @@
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" id="btnDelTruckType_updt" class="btn btn-sm btn-warning">Delete ?</button>
|
||||
@can('config_truck_type.delete')
|
||||
<button type="button" id="btnDelTruckType_updt" class="btn btn-sm btn-warning">Delete ?</button>
|
||||
@endcan
|
||||
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
|
||||
<button id="btnSubmitEdtTruckType" type="button" class="btn btn-sm btn-danger">Update data</button>
|
||||
@can('config_truck_type.edit')
|
||||
<button id="btnSubmitEdtTruckType" type="button" class="btn btn-sm btn-danger">Update data</button>
|
||||
@endcan
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -318,7 +325,7 @@
|
||||
render: function(data, type, row, meta) {
|
||||
let action = `
|
||||
<a href="#" class="text-decoration-none me-1 btnUpdtTruckType">
|
||||
<span class="icon ion-edit fz-16"></span>
|
||||
<span class="icon ion-eye fz-16"></span>
|
||||
</a>
|
||||
`;
|
||||
// <a href="#" class="text-decoration-none text-danger btnDelTruckType">
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
@section('customcss')
|
||||
<style>
|
||||
/* .select2-container {
|
||||
z-index: 99999;
|
||||
} */
|
||||
z-index: 99999;
|
||||
} */
|
||||
</style>
|
||||
@endsection
|
||||
|
||||
@ -27,9 +27,11 @@
|
||||
</div>
|
||||
{{-- @if ($user_role === \App\Models\Users::ROLE_VENDOR) --}}
|
||||
@if ($user_role === \App\Models\Users::ROLE_ADMIN)
|
||||
<div class="col text-end">
|
||||
<button id="btnMdlNewDrv" class="btn btn-sm btn-danger">Add New Driver</button>
|
||||
</div>
|
||||
@can('driver.create')
|
||||
<div class="col text-end">
|
||||
<button id="btnMdlNewDrv" class="btn btn-sm btn-danger">Add New Driver</button>
|
||||
</div>
|
||||
@endcan
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@ -410,8 +412,12 @@
|
||||
<button type="button" id="btnResetLogin_updt" class="btn btn-sm btn-dark text-white">Reset Login ?</button>
|
||||
</div> --}}
|
||||
<div class="col p-0 text-end">
|
||||
<button type="button" id="btnDelDrv_updt" class="btn btn-sm btn-warning">Delete ?</button>
|
||||
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
|
||||
@can('driver.delete')
|
||||
<button type="button" id="btnDelDrv_updt" class="btn btn-sm btn-warning">Delete ?</button>
|
||||
@endcan
|
||||
@can('driver.edit')
|
||||
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
|
||||
@endcan
|
||||
<button id="btnSubmitEdtDrv" type="button" class="btn btn-sm btn-danger">Update data</button>
|
||||
</div>
|
||||
</div>
|
||||
@ -545,7 +551,7 @@
|
||||
render: function(data, type, row, meta) {
|
||||
let action = `
|
||||
<a href="#" class="text-decoration-none me-1 btnEdtDrv">
|
||||
<span class="icon ion-edit fz-16"></span>
|
||||
<span class="icon ion-eye fz-16"></span>
|
||||
</a>
|
||||
`;
|
||||
// <a href="#" class="text-decoration-none text-danger btnDelDrv">
|
||||
|
||||
615
resources/views/menu_v1/roles.blade.php
Executable file
615
resources/views/menu_v1/roles.blade.php
Executable file
@ -0,0 +1,615 @@
|
||||
@extends('app.app')
|
||||
|
||||
@section('title')
|
||||
Users
|
||||
@endsection
|
||||
|
||||
@section('customcss')
|
||||
<style>
|
||||
/* .select2-container {
|
||||
z-index: 99999;
|
||||
} */
|
||||
</style>
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="container-fluid">
|
||||
<div class="content">
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<div class="row d-flex align-items-center">
|
||||
<div class="col">
|
||||
<p class="card-title text-bold mb-0">Roles (<span id="count_users">0</span>)</p>
|
||||
</div>
|
||||
@can('role.create')
|
||||
<div class="col text-end">
|
||||
<a href="#" class="btn btn-sm btn-danger" id="btnAddNewUserModal">Add New Role</a>
|
||||
</div>
|
||||
@endcan
|
||||
<div class="col-auto text-end ps-0">
|
||||
{{-- <button class="btn btn-sm btn-danger">Upload</button> --}}
|
||||
{{-- <button class="btn btn-sm btn-danger">Download</button> --}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="table-responsive">
|
||||
<table id="tUsers" class="table table-hover dataTable w-100">
|
||||
<thead>
|
||||
<tr class="">
|
||||
<th class="">#</th>
|
||||
<th class="text-center">Action</th>
|
||||
<th class="text-nowrap col-8">Name</th>
|
||||
<th class="text-nowrap col-2">Created At</th>
|
||||
<th class="text-nowrap col-2">Updated At</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-8"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{-- MODAL --}}
|
||||
<div class="modal fade" id="addNewUserModal" data-bs-backdrop="static" data-bs-keyboard="false" aria-labelledby="addNewUserModal" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog modal-dialog-centered modal-dialog-scrollable modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="addNewUserModal">Add New Role</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body pb-0">
|
||||
<div class="row">
|
||||
<h6>Role Infomation</h6>
|
||||
<div class="mb-3">
|
||||
<label for="add-first_name" class="form-label">Name</label>
|
||||
<input type="text" class="form-control form-control-sm" name="add-name" id="add-name">
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<h6>Permissions</h6>
|
||||
@foreach ($permission as $module => $perms)
|
||||
<div class="mb-3 row">
|
||||
<label for="add-first_name" class="form-label text-capitalize col-3">
|
||||
{{ $module == 'transaction' ? 'job' : ($module == 'client' ? 'company' : ($module == 'config_truck_type' ? 'Config Vehicle Type' : ($module == 'config_master_device' ? 'Config Master Devices' : ($module == 'config_logs_gps' ? 'Config Logs GPS' : $module)))) }}
|
||||
</label>
|
||||
<div class="col-9">
|
||||
<div class="d-flex flex-wrap align-items-center gap-2">
|
||||
@foreach ($perms as $perm)
|
||||
@php
|
||||
$id = 'perm-' . str_replace('.', '-', $perm->name);
|
||||
@endphp
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" name="add-permissions[]" value="{{ $perm->id }}" id="{{ $id }}">
|
||||
<label class="form-check-label ms-1" for="{{ $id }}">{{ Str::after($perm->name, '.') }}</label>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
|
||||
<button type="button" id="btnSubmitNewUser" class="btn btn-sm btn-danger">Submit data</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="updtUserModal" data-bs-backdrop="static" data-bs-keyboard="false" aria-labelledby="updtUserModal" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog modal-dialog-centered modal-dialog-scrollable modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="updtUserModal">Update Role</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body pb-0">
|
||||
<div class="row">
|
||||
<h6>Role Infomation</h6>
|
||||
<div class="mb-3">
|
||||
<label for="add-first_name" class="form-label">Name</label>
|
||||
<input type="text" class="form-control form-control-sm" name="updt-name" id="updt-name">
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<h6>Permissions</h6>
|
||||
@foreach ($permission as $module => $perms)
|
||||
<div class="mb-3 row">
|
||||
<label for="add-first_name" class="form-label text-capitalize col-3">
|
||||
{{ $module == 'transaction' ? 'job' : ($module == 'client' ? 'company' : ($module == 'config_truck_type' ? 'Config Vehicle Type' : ($module == 'config_master_device' ? 'Config Master Devices' : ($module == 'config_logs_gps' ? 'Config Logs GPS' : $module)))) }}
|
||||
</label>
|
||||
<div class="col-9">
|
||||
<div class="d-flex flex-wrap align-items-center gap-2">
|
||||
@foreach ($perms as $perm)
|
||||
@php
|
||||
$id = 'perm-' . str_replace('.', '-', $perm->name);
|
||||
@endphp
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" name="updt-permissions[]" value="{{ $perm->id }}" id="{{ $id }}">
|
||||
<label class="form-check-label ms-1" for="{{ $id }}">{{ Str::after($perm->name, '.') }}</label>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
@can('role.delete')
|
||||
<button type="button" id="btnDelUser_updt" class="btn btn-sm btn-warning">Delete ?</button>
|
||||
@endcan
|
||||
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
|
||||
@can('role.edit')
|
||||
<button type="button" id="btnSubmitUpdtUser" class="btn btn-sm btn-danger">Update data</button>
|
||||
@endcan
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="delUserModal" tabindex="-1" data-bs-backdrop="static" data-bs-keyboard="false" aria-labelledby="delUserModal" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-centered modal-sm">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="delUserModal">Delete Role</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="d-flex justify-content-center">
|
||||
<p class="mb-0">
|
||||
Are you sure want to delete this role
|
||||
<a href="#" class="text-danger">
|
||||
<span id="del-name"></span>
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-sm btn-danger" data-bs-dismiss="modal">Close</button>
|
||||
<button id="btnSubmitDelUser" type="button" class="btn btn-sm btn-secondary">Yes, delete</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@section('customjs')
|
||||
<script>
|
||||
'use strict';
|
||||
|
||||
const Wrapper = {
|
||||
activate: function() {
|
||||
Wrapper.event();
|
||||
DTable.activate();
|
||||
UNew.activate();
|
||||
UUpdate.activate();
|
||||
UDel.activate();
|
||||
Filter.activate();
|
||||
},
|
||||
event: function() {},
|
||||
};
|
||||
|
||||
const DTable = {
|
||||
activate: function() {
|
||||
DTable.reload();
|
||||
},
|
||||
reload: function() {
|
||||
// $('#tUsers').DataTable();
|
||||
// if (User.Table.firstInitDataTable == 1) { loadTableSkeletonLoading() } else { User.Table.firstInitDataTable = 1; }
|
||||
$('#tUsers').DataTable({
|
||||
processing: true,
|
||||
serverSide: false,
|
||||
bLengthChange: true,
|
||||
deferRender: true,
|
||||
destroy: true,
|
||||
ajax: {
|
||||
url: "{{ route('api_list_roles') }}?cptid=" + AppState.current_company,
|
||||
type: 'GET',
|
||||
complete: function(jqXHR, textStatus, c) {
|
||||
let count = jqXHR.responseJSON.count;
|
||||
if (typeof count != 'undefined') {
|
||||
$('#count_users').text(count);
|
||||
}
|
||||
// removeTableSkeletonLoading()
|
||||
},
|
||||
},
|
||||
deferRender: true,
|
||||
columns: [{
|
||||
data: 'DT_RowIndex',
|
||||
className: 'text-end',
|
||||
visible: true,
|
||||
orderable: true,
|
||||
searchable: true,
|
||||
},
|
||||
{
|
||||
data: 'action',
|
||||
className: 'text-center',
|
||||
visible: true,
|
||||
orderable: true,
|
||||
searchable: true,
|
||||
render: function(data, type, row, meta) {
|
||||
let action = `
|
||||
<a href="#" class="text-decoration-none me-1 btnEdtUser" data-bs-toggle="tooltip"
|
||||
data-bs-placement="bottom" title="Edit">
|
||||
<span class="icon ion-eye fz-16"></span>
|
||||
</a>
|
||||
`;
|
||||
return action;
|
||||
}
|
||||
},
|
||||
{
|
||||
data: 'name',
|
||||
className: 'text-start',
|
||||
visible: true,
|
||||
orderable: true,
|
||||
searchable: true,
|
||||
createdCell: function(td, cellData, rowData, row, col) {
|
||||
$(td).attr('data-id', rowData.id);
|
||||
$(td).attr('data-name', rowData.name);
|
||||
},
|
||||
},
|
||||
{
|
||||
data: 'created_at',
|
||||
className: 'text-start text-nowrap',
|
||||
visible: true,
|
||||
orderable: true,
|
||||
searchable: true,
|
||||
render: function(data, type, row, meta) {
|
||||
return moment(data, 'YYYY-MM-DD HH:mm:ss').format('DD MMM YYYY HH:mm')
|
||||
},
|
||||
},
|
||||
{
|
||||
data: 'updated_at',
|
||||
className: 'text-start text-nowrap',
|
||||
visible: true,
|
||||
orderable: true,
|
||||
searchable: true,
|
||||
render: function(data, type, row, meta) {
|
||||
return moment(data, 'YYYY-MM-DD HH:mm:ss').format('DD MMM YYYY HH:mm')
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
},
|
||||
};
|
||||
|
||||
const UNew = {
|
||||
activate: function() {
|
||||
UNew.event();
|
||||
},
|
||||
event: function() {
|
||||
// modal
|
||||
$('#btnAddNewUserModal').on('click', function() {
|
||||
$('#addNewUserModal').modal('show');
|
||||
});
|
||||
$('#addNewUserModal').on('shown.bs.modal', function() {
|
||||
// initiate select2 if there
|
||||
});
|
||||
$('#btnSubmitNewUser').on('click', function() {
|
||||
let data = UNew.getData();
|
||||
UNew.submitData(data);
|
||||
});
|
||||
},
|
||||
getData: function() {
|
||||
let data = {};
|
||||
data.name = $('input[name=add-name]').val();
|
||||
data.permissions = $('input[name="add-permissions[]"]:checked')
|
||||
.map(function() {
|
||||
return $(this).val();
|
||||
})
|
||||
.get();
|
||||
return data;
|
||||
},
|
||||
submitData: async function(data) {
|
||||
return new Promise((resolve, reject) => {
|
||||
if (typeof $('#btnSubmitNewUser').attr('disabed') != 'undefined') {
|
||||
resolve({
|
||||
type: 'fail'
|
||||
});
|
||||
return false;
|
||||
}
|
||||
$('#btnSubmitNewUser').attr('disabed', true);
|
||||
$.ajax({
|
||||
url: "{{ route('api_add_role') }}",
|
||||
method: 'POST',
|
||||
crossDomain: true,
|
||||
processData: true,
|
||||
headers: {
|
||||
'x-api-key': Helper.getCookie('_trtk'),
|
||||
'x-csrf-token': $('meta[name="csrf-token"]').attr('content'),
|
||||
},
|
||||
data: data,
|
||||
success: (data, textStatus, jqXHR) => {
|
||||
$('#btnSubmitNewUser').removeAttr('disabed');
|
||||
if (data.meta.type != 'success') {
|
||||
resolve({
|
||||
type: 'fail'
|
||||
});
|
||||
Helper.toast('Warning', 'just now', data.meta.message);
|
||||
return false;
|
||||
}
|
||||
Helper.toast('Success', 'just now', 'success add new role');
|
||||
$('#addNewUserModal').modal('hide');
|
||||
DTable.reload();
|
||||
UNew.clearInput();
|
||||
resolve({
|
||||
type: 'success'
|
||||
});
|
||||
},
|
||||
error: (jqXHR, textStatus, error) => {
|
||||
$('#btnSubmitNewUser').removeAttr('disabed');
|
||||
if (jqXHR.status >= 500) {
|
||||
Helper.toast('Error', 'just now', 'please try again');
|
||||
} else {
|
||||
Helper.toast('Error', 'just now', jqXHR.responseJSON.meta
|
||||
.message);
|
||||
}
|
||||
resolve({
|
||||
type: 'error'
|
||||
});
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
clearInput: function() {
|
||||
$('#add-chk_type').val('').trigger('change');
|
||||
},
|
||||
}
|
||||
|
||||
const UUpdate = {
|
||||
activate: function() {
|
||||
UUpdate.event();
|
||||
},
|
||||
event: function() {
|
||||
// modal
|
||||
$('#tUsers').on('click', '.btnEdtUser', async function(e) {
|
||||
let uid = $(e.target).closest('tr').find('td[data-id]').data('id');
|
||||
UUpdate.clearInput();
|
||||
let resp = await UUpdate.reqData({
|
||||
uid
|
||||
});
|
||||
if (resp.type != 'success') {
|
||||
Helper.toast('Role Not Found', 'just now', 'please try again');
|
||||
return false;
|
||||
}
|
||||
UUpdate.passDataToView(resp.data);
|
||||
});
|
||||
$('#updtUserModal').on('shown.bs.modal', function() {
|
||||
// initiate select2 if there
|
||||
});
|
||||
$('#btnSubmitUpdtUser').on('click', function() {
|
||||
let data = UUpdate.getData();
|
||||
UUpdate.submitData(data);
|
||||
});
|
||||
},
|
||||
reqData: function(params) {
|
||||
return new Promise((resolve, reject) => {
|
||||
$.ajax({
|
||||
url: "{{ route('api_show_role', '') }}/" + params.uid,
|
||||
method: 'GET',
|
||||
crossDomain: true,
|
||||
processData: true,
|
||||
headers: {
|
||||
'x-api-key': Helper.getCookie('_trtk'),
|
||||
},
|
||||
data: params,
|
||||
success: (data, textStatus, jqXHR) => {
|
||||
if (data.meta.type != 'success') {
|
||||
resolve({
|
||||
type: 'fail'
|
||||
});
|
||||
Helper.toast('Warning', 'just now', data.meta.message);
|
||||
return false;
|
||||
}
|
||||
resolve({
|
||||
type: 'success',
|
||||
data: data.data
|
||||
});
|
||||
},
|
||||
error: (jqXHR, textStatus, error) => {
|
||||
if (jqXHR.status >= 500) {
|
||||
Helper.toast('Error', 'just now', 'please try again');
|
||||
} else {
|
||||
Helper.toast('Error', 'just now', jqXHR.responseJSON.meta
|
||||
.message);
|
||||
}
|
||||
resolve({
|
||||
type: 'error'
|
||||
});
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
passDataToView: function(data) {
|
||||
$('input[name=updt-name').val(data.name);
|
||||
$('input[name="updt-permissions[]"]').each(function() {
|
||||
$(this).prop('checked', false);
|
||||
let val = parseInt($(this).val());
|
||||
if (data.permissions.includes(val)) {
|
||||
$(this).prop('checked', true);
|
||||
}
|
||||
});
|
||||
|
||||
$('#updtUserModal').data('id', data.id);
|
||||
$('#updtUserModal').modal('show');
|
||||
},
|
||||
getData: function() {
|
||||
let data = {};
|
||||
data.uid = $('#updtUserModal').data('id')
|
||||
data.name = $('input[name=updt-name]').val();
|
||||
data.permissions = $('input[name="updt-permissions[]"]:checked')
|
||||
.map(function() {
|
||||
return $(this).val();
|
||||
})
|
||||
.get();
|
||||
return data;
|
||||
},
|
||||
submitData: async function(data) {
|
||||
return new Promise((resolve, reject) => {
|
||||
if (typeof $('#btnSubmitUpdtUser').attr('disabed') != 'undefined') {
|
||||
resolve({
|
||||
type: 'fail'
|
||||
});
|
||||
return false;
|
||||
}
|
||||
$('#btnSubmitUpdtUser').attr('disabed', true);
|
||||
$.ajax({
|
||||
url: "{{ route('api_edit_role', '') }}/" + data.uid,
|
||||
method: 'PUT',
|
||||
crossDomain: true,
|
||||
processData: true,
|
||||
headers: {
|
||||
'x-csrf-token': $('meta[name="csrf-token"]').attr('content'),
|
||||
'x-api-key': Helper.getCookie('_trtk'),
|
||||
},
|
||||
data: data,
|
||||
success: (data, textStatus, jqXHR) => {
|
||||
$('#btnSubmitUpdtUser').removeAttr('disabed');
|
||||
if (data.meta.type != 'success') {
|
||||
resolve({
|
||||
type: 'fail'
|
||||
});
|
||||
Helper.toast('Warning', 'just now', data.meta.message);
|
||||
return false;
|
||||
}
|
||||
Helper.toast('Success', 'just now', 'success update role');
|
||||
$('#updtUserModal').modal('hide');
|
||||
DTable.reload();
|
||||
resolve({
|
||||
type: 'success'
|
||||
});
|
||||
},
|
||||
error: (jqXHR, textStatus, error) => {
|
||||
$('#btnSubmitUpdtUser').removeAttr('disabed');
|
||||
if (jqXHR.status >= 500) {
|
||||
Helper.toast('Error', 'just now', 'please try again');
|
||||
} else {
|
||||
Helper.toast('Error', 'just now', jqXHR.responseJSON.meta
|
||||
.message);
|
||||
}
|
||||
resolve({
|
||||
type: 'error'
|
||||
});
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
clearInput: function() {
|
||||
$('#updt-chk_type').val('').trigger('change');
|
||||
},
|
||||
}
|
||||
|
||||
const UDel = {
|
||||
activate: function() {
|
||||
UDel.event();
|
||||
},
|
||||
event: function() {
|
||||
// on table
|
||||
$('#tUsers').on('click', '.btnDelUser', function(e) {
|
||||
let row = $(e.target).closest('tr');
|
||||
let uid = row.find('td[data-id]').data('id');
|
||||
let name = row.find('td[data-name]').data('name');
|
||||
UDel.passDataToView({
|
||||
uid,
|
||||
});
|
||||
$('#delUserModal').data('id', uid);
|
||||
$('#delUserModal').modal('show');
|
||||
});
|
||||
$('#btnSubmitDelUser').on('click', function() {
|
||||
let data = {
|
||||
uid: $('#delUserModal').data('id'),
|
||||
};
|
||||
UDel.submitData(data);
|
||||
});
|
||||
// on modal update
|
||||
$('#btnDelUser_updt').on('click', function(e) {
|
||||
let data = UUpdate.getData();
|
||||
UDel.passDataToView({
|
||||
uid: data.uid,
|
||||
name: data.name,
|
||||
});
|
||||
$('#delUserModal').data('id', data.uid);
|
||||
$('#delUserModal').modal('show');
|
||||
});
|
||||
},
|
||||
passDataToView: function(data) {
|
||||
data.phone = '' + data.phone
|
||||
$('#del-name').text(data.fisrt_name);
|
||||
},
|
||||
submitData: async function(data) {
|
||||
return new Promise((resolve, reject) => {
|
||||
if (typeof $('#btnSubmitDelUser').attr('disabed') != 'undefined') {
|
||||
resolve({
|
||||
type: 'fail'
|
||||
});
|
||||
return false;
|
||||
}
|
||||
$('#btnSubmitDelUser').attr('disabed', true);
|
||||
$.ajax({
|
||||
url: "{{ route('api_del_role', '') }}/" + data.uid,
|
||||
method: 'DELETE',
|
||||
crossDomain: true,
|
||||
processData: true,
|
||||
headers: {
|
||||
'x-csrf-token': $('meta[name="csrf-token"]').attr('content'),
|
||||
'x-api-key': Helper.getCookie('_trtk'),
|
||||
},
|
||||
data: data,
|
||||
success: (data, textStatus, jqXHR) => {
|
||||
$('#btnSubmitDelUser').removeAttr('disabed');
|
||||
if (data.meta.type != 'success') {
|
||||
resolve({
|
||||
type: 'fail'
|
||||
});
|
||||
Helper.toast('Warning', 'just now', data.meta.message);
|
||||
return false;
|
||||
}
|
||||
Helper.toast('Success', 'just now', 'success delete role');
|
||||
$('#delUserModal').modal('hide');
|
||||
$('#updtUserModal').modal('hide');
|
||||
DTable.reload();
|
||||
resolve({
|
||||
type: 'success'
|
||||
});
|
||||
},
|
||||
error: (jqXHR, textStatus, error) => {
|
||||
$('#btnSubmitDelUser').removeAttr('disabed');
|
||||
if (jqXHR.status >= 500) {
|
||||
Helper.toast('Error', 'just now', 'please try again');
|
||||
} else {
|
||||
Helper.toast('Error', 'just now', jqXHR.responseJSON.meta
|
||||
.message);
|
||||
}
|
||||
resolve({
|
||||
type: 'error'
|
||||
});
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
}
|
||||
|
||||
const Filter = {
|
||||
activate: function() {
|
||||
Filter.event();
|
||||
},
|
||||
event: function() {},
|
||||
triggerFilterCompany: function() {
|
||||
DTable.reload();
|
||||
},
|
||||
}
|
||||
|
||||
Wrapper.activate();
|
||||
</script>
|
||||
@endsection
|
||||
@ -28,9 +28,11 @@
|
||||
<div class="col-auto text-end ps-0">
|
||||
<a href="{{ route('view_transactions_spc_add') }}" class="btn btn-sm btn-warning">Transaksi Khusus</a>
|
||||
</div> --}}
|
||||
<div class="col-auto text-end ps-0">
|
||||
<a href="{{ route('view_transactions_add') }}" class="btn btn-sm btn-danger">Add New Job</a>
|
||||
</div>
|
||||
@can('transaction.create')
|
||||
<div class="col-auto text-end ps-0">
|
||||
<a href="{{ route('view_transactions_add') }}" class="btn btn-sm btn-danger">Add New Job</a>
|
||||
</div>
|
||||
@endcan
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
@ -185,7 +187,9 @@
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-sm btn-danger" data-bs-dismiss="modal">Close</button>
|
||||
<button id="btnSubmitDelOrder" type="button" class="btn btn-sm btn-secondary">Yes, delete</button>
|
||||
@can('transaction.delete')
|
||||
<button id="btnSubmitDelOrder" type="button" class="btn btn-sm btn-secondary">Yes, delete</button>
|
||||
@endcan
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
@section('customcss')
|
||||
<style>
|
||||
/* .select2-container {
|
||||
z-index: 99999;
|
||||
} */
|
||||
z-index: 99999;
|
||||
} */
|
||||
</style>
|
||||
@endsection
|
||||
|
||||
@ -23,9 +23,11 @@
|
||||
<div class="col">
|
||||
<p class="card-title text-bold mb-0">Users (<span id="count_users">0</span>)</p>
|
||||
</div>
|
||||
<div class="col text-end">
|
||||
<a href="#" class="btn btn-sm btn-danger" id="btnAddNewUserModal">Add New User</a>
|
||||
</div>
|
||||
@can('user.create')
|
||||
<div class="col text-end">
|
||||
<a href="#" class="btn btn-sm btn-danger" id="btnAddNewUserModal">Add New User</a>
|
||||
</div>
|
||||
@endcan
|
||||
<div class="col-auto text-end ps-0">
|
||||
{{-- <button class="btn btn-sm btn-danger">Upload</button> --}}
|
||||
{{-- <button class="btn btn-sm btn-danger">Download</button> --}}
|
||||
@ -400,9 +402,13 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" id="btnDelUser_updt" class="btn btn-sm btn-warning">Delete ?</button>
|
||||
@can('user.delete')
|
||||
<button type="button" id="btnDelUser_updt" class="btn btn-sm btn-warning">Delete ?</button>
|
||||
@endcan
|
||||
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
|
||||
<button type="button" id="btnSubmitUpdtUser" class="btn btn-sm btn-danger">Update data</button>
|
||||
@can('user.edit')
|
||||
<button type="button" id="btnSubmitUpdtUser" class="btn btn-sm btn-danger">Update data</button>
|
||||
@endcan
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -631,7 +637,7 @@
|
||||
let action = `
|
||||
<a href="#" class="text-decoration-none me-1 btnEdtUser" data-bs-toggle="tooltip"
|
||||
data-bs-placement="bottom" title="Edit">
|
||||
<span class="icon ion-edit fz-16"></span>
|
||||
<span class="icon ion-eye fz-16"></span>
|
||||
</a>
|
||||
`;
|
||||
// <a href="#" class="text-decoration-none text-danger btnDelUser"
|
||||
@ -707,7 +713,7 @@
|
||||
orderable: true,
|
||||
searchable: true,
|
||||
render: function(data, type, row, meta) {
|
||||
return `<small class="text-muted">${data}</small>`;
|
||||
return `<small class="text-muted">${data ?? '-'}</small>`;
|
||||
},
|
||||
},
|
||||
{
|
||||
@ -936,7 +942,8 @@
|
||||
$('#updt-email').val(data.email);
|
||||
|
||||
$('#updt-clients').val(data.client_group_id).trigger('change');
|
||||
$('#updt-roles').val(data.role).trigger('change');
|
||||
// $('#updt-roles').val(data.role).trigger('change');
|
||||
$('#updt-roles').val(data.role_id).trigger('change');
|
||||
$('#updt-pernu_id').val(data.pernu_id);
|
||||
$('#updt-is_change_pasw').val('no').trigger('change');
|
||||
|
||||
|
||||
@ -11,18 +11,18 @@
|
||||
@section('customcss')
|
||||
<style>
|
||||
/* .select2-container {
|
||||
z-index: 99999;
|
||||
} */
|
||||
z-index: 99999;
|
||||
} */
|
||||
|
||||
/* .landscape-photo {
|
||||
max-height: max(21vh, 210px);
|
||||
} */
|
||||
max-height: max(21vh, 210px);
|
||||
} */
|
||||
|
||||
/* .thumb-img-table {
|
||||
width: max(4vw, 75px);
|
||||
height: max(4vh, 55px);
|
||||
object-fit: cover;
|
||||
} */
|
||||
width: max(4vw, 75px);
|
||||
height: max(4vh, 55px);
|
||||
object-fit: cover;
|
||||
} */
|
||||
</style>
|
||||
@endsection
|
||||
|
||||
@ -36,9 +36,12 @@
|
||||
<p class="card-title text-bold mb-0">Fleet Manager</p>
|
||||
</div>
|
||||
@if ($user_role == \App\Models\Users::ROLE_VENDOR || $user_role == \App\Models\Users::ROLE_ADMIN)
|
||||
<div class="col text-end">
|
||||
<button id="btnMdlNewVhc" class="btn btn-sm btn-danger">Add New Vehicle</button>
|
||||
</div>
|
||||
@can('vehicle.create')
|
||||
<div class="col text-end">
|
||||
<button id="btnMdlNewVhc" class="btn btn-sm btn-danger">Add New Vehicle</button>
|
||||
</div>
|
||||
@endcan
|
||||
|
||||
{{-- <div class="col-auto text-end ps-0">
|
||||
<button class="btn btn-sm btn-danger">Upload</button>
|
||||
</div> --}}
|
||||
@ -146,22 +149,10 @@
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<div class="mb-0">
|
||||
<label for="add-speedlimit" class="col-form-label">Speed Limit (kph):</label>
|
||||
<input type="number" id="add-speedlimit" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="mb-0">
|
||||
<label for="add-sum_milleage" class="col-form-label">Current Mileage (km):</label>
|
||||
<input type="number" id="add-sum_milleage" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-0">
|
||||
<label for="add-speedlimit" class="col-form-label">Speed Limit (kph):</label>
|
||||
<input type="number" id="add-speedlimit" class="form-control">
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -363,19 +354,9 @@
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<div class="mb-0">
|
||||
<label for="edt-speedlimit" class="col-form-label">Speed Limit (kph):</label>
|
||||
<input type="number" id="edt-speedlimit" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="mb-0">
|
||||
<label for="edt-sum_milleage" class="col-form-label">Current Mileage (km):</label>
|
||||
<input type="number" id="edt-sum_milleage" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-0">
|
||||
<label for="edt-speedlimit" class="col-form-label">Speed Limit (kph):</label>
|
||||
<input type="number" id="edt-speedlimit" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -520,9 +501,13 @@
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" id="btnDelVhc_updt" class="btn btn-sm btn-warning">Delete ?</button>
|
||||
@can('vehicle.delete')
|
||||
<button type="button" id="btnDelVhc_updt" class="btn btn-sm btn-warning">Delete ?</button>
|
||||
@endcan
|
||||
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
|
||||
<button id="btnSubmitEdtVhc" type="button" class="btn btn-sm btn-danger">Update data</button>
|
||||
@can('vehicle.edit')
|
||||
<button id="btnSubmitEdtVhc" type="button" class="btn btn-sm btn-danger">Update data</button>
|
||||
@endcan
|
||||
<div id="edt-btnSubmitEdtVhc" class="d-none">
|
||||
<div class="spinner-border" role="status">
|
||||
<span class="visually-hidden">Loading...</span>
|
||||
@ -671,7 +656,7 @@
|
||||
render: function(data, type, row, meta) {
|
||||
let action = `
|
||||
<a href="#" class="text-decoration-none me-1 btnEdtVhc">
|
||||
<span class="icon ion-edit fz-16"></span>
|
||||
<span class="icon ion-eye fz-16"></span>
|
||||
</a>
|
||||
`;
|
||||
// <a href="#" class="text-decoration-none text-danger btnDelVhc">
|
||||
@ -1024,7 +1009,6 @@
|
||||
data.append('type_id', safeVal('#add-type'));
|
||||
data.append('model_id', safeVal('#add-model') ?? 0);
|
||||
data.append('speed_limit', safeVal('#add-speedlimit'));
|
||||
data.append('sum_milleage', safeVal('#add-sum_milleage'));
|
||||
data.append('fuel_capacity', safeVal('#add-fuelcapacity') ?? 0);
|
||||
data.append('fuel_drop_treshold', safeVal('#add-fueldroptreshold') ?? 0);
|
||||
data.append('max_pressure', safeVal('#add-maxpressure') ?? 0);
|
||||
@ -1240,7 +1224,6 @@
|
||||
$('#edt-model').val(data?.model_id).trigger('change');
|
||||
|
||||
$('#edt-speedlimit').val(data?.speed_limit);
|
||||
$('#edt-sum_milleage').val(data?.sum_milleage);
|
||||
$('#edt-fuelcapacity').val(data?.fuel_capacity);
|
||||
$('#edt-fueldroptreshold').val(data?.fuel_drop_treshold);
|
||||
$('#edt-maxpressure').val(data?.max_pressure);
|
||||
@ -1296,7 +1279,6 @@
|
||||
data.model_id = $('#edt-model').val();
|
||||
|
||||
data.speed_limit = $('#edt-speedlimit').val();
|
||||
data.sum_milleage = $('#edt-sum_milleage').val();
|
||||
data.fuel_capacity = $('#edt-fuelcapacity').val();
|
||||
data.fuel_drop_treshold = $('#edt-fueldroptreshold').val();
|
||||
data.max_pressure = $('#edt-maxpressure').val();
|
||||
|
||||
@ -32,10 +32,12 @@
|
||||
</div>
|
||||
@if ($user_role === \App\Models\Users::ROLE_ADMIN || \App\Models\Users::ROLE_VENDOR)
|
||||
{{-- @if ($user_role === \App\Models\Users::ROLE_VENDOR) --}}
|
||||
<div class="col text-end">
|
||||
{{-- <a href="#" class="btn btn-sm btn-danger" data-bs-toggle="modal" data-bs-target="#addNewZoneModal">Add New Zone</a> --}}
|
||||
<a href="{{ route('view_zone_add') }}" class="btn btn-sm btn-danger">Add New Zone</a>
|
||||
</div>
|
||||
@can('zone.create')
|
||||
<div class="col text-end">
|
||||
{{-- <a href="#" class="btn btn-sm btn-danger" data-bs-toggle="modal" data-bs-target="#addNewZoneModal">Add New Zone</a> --}}
|
||||
<a href="{{ route('view_zone_add') }}" class="btn btn-sm btn-danger">Add New Zone</a>
|
||||
</div>
|
||||
@endcan
|
||||
@endif
|
||||
<div class="col-auto text-end ps-0">
|
||||
{{-- <button class="btn btn-sm btn-danger">Upload</button> --}}
|
||||
|
||||
@ -2,13 +2,10 @@
|
||||
$user_role = Auth::user()->role;
|
||||
$uid = Auth::user()->id;
|
||||
@endphp
|
||||
@php
|
||||
// dd($user_role);
|
||||
@endphp
|
||||
|
||||
<nav class="navbar navbar-expand-lg">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand" href="{{ route('view_dashboard') }}">
|
||||
{{-- <img src="{{ asset('images/logogram-bonceng.png') }}" class="img-fluid" alt="" width="30" height="24"> --}}
|
||||
<img src="{{ asset('images/logogram-bonceng.png') }}" class="img-fluid" alt="" height="20" width="70">
|
||||
</a>
|
||||
<button class="navbar-toggler btn btn-outline-secondary btn-sm" type="button" data-bs-toggle="collapse" data-bs-target="#navbarScroll" aria-controls="navbarScroll" aria-expanded="false" aria-label="Toggle navigation" style="width: 30px; height: 30px;">
|
||||
@ -17,195 +14,101 @@
|
||||
<div class="collapse navbar-collapse" id="navbarScroll">
|
||||
<ul class="navbar-nav navbar-nav-scroll">
|
||||
{{-- all roles --}}
|
||||
@if ($user_role === \App\Models\Users::ROLE_ADMIN || $user_role === \App\Models\Users::ROLE_VENDOR || $user_role === \App\Models\Users::ROLE_CLIENT_ADMIN || $user_role === \App\Models\Users::ROLE_SPECIAL_TRACKING)
|
||||
@can('dashboard.view')
|
||||
<li class="nav-item {{ Request::segment(1) == 'dashboard' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_dashboard') }}">
|
||||
Dashboard
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
@if ($user_role === \App\Models\Users::ROLE_VENDOR)
|
||||
{{-- <li class="nav-item {{ Request::path() == 'user/vendor/transactions' || Request::path() == 'user/vendor/transactions/newOrder' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ url('user/vendor/transactions/newOrder') }}">
|
||||
Transaction
|
||||
</a>
|
||||
</li> --}}
|
||||
@endcan
|
||||
@can('transaction.view')
|
||||
<li class="nav-item {{ Request::path() == 'user/vendor/transactions' || Request::path() == 'transactions/add/special' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ url('user/vendor/transactions') }}">
|
||||
Transaction
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
@if ($user_role === \App\Models\Users::ROLE_VENDOR)
|
||||
@endcan
|
||||
@can('zone.view')
|
||||
<li class="nav-item {{ Request::segment(1) == 'zone' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_zone') }}">
|
||||
Zone
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
@if ($user_role === \App\Models\Users::ROLE_VENDOR)
|
||||
<li class="nav-item {{ Request::segment(1) == 'checklist' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ url('checklist') }}">
|
||||
Konfigurasi
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
{{-- only admin --}}
|
||||
@if ($user_role === \App\Models\Users::ROLE_ADMIN)
|
||||
@endcan
|
||||
@can('transaction.view')
|
||||
<li class="nav-item {{ Request::segment(1) == 'transactions' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_transactions') }}">
|
||||
Job
|
||||
</a>
|
||||
</li>
|
||||
@endcan
|
||||
@can('client.view')
|
||||
<li class="nav-item {{ Request::segment(1) == 'clients' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_clients') }}">
|
||||
Company
|
||||
</a>
|
||||
</li>
|
||||
@endcan
|
||||
@can('zone.view')
|
||||
<li class="nav-item {{ Request::segment(1) == 'zone' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_zone') }}">
|
||||
Zone
|
||||
</a>
|
||||
</li>
|
||||
@endcan
|
||||
@if (auth()->user()->can('config_truck_type.view') || auth()->user()->can('config_master_device.view') || auth()->user()->can('config_logs_gps.view'))
|
||||
<li class="nav-item dropdown {{ Request::segment(1) == 'config' ? 'active' : '' }}">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="dropdownConfig" role="button" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
Configuration
|
||||
</a>
|
||||
<ul class="dropdown-menu" style="right: 0; left: auto;" aria-labelledby="dropdownConfig">
|
||||
{{-- <li>
|
||||
<a class="dropdown-item {{ Request::segment(2) == 'rates' ? 'active' : '' }}" href="{{ route('view_config_rates') }}" title="">Harga</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item {{ Request::segment(2) == 'pockets' ? 'active' : '' }}" href="{{ route('view_config_pockets') }}" title="">Uang Saku</a>
|
||||
</li> --}}
|
||||
{{-- <li>
|
||||
<a class="dropdown-item {{ Request::segment(2) == 'static_insurances' ? 'active' : '' }}" href="{{ route('view_config_static_insurances') }}" title="">Asuransi</a>
|
||||
</li> --}}
|
||||
<li>
|
||||
<a class="dropdown-item {{ Request::segment(2) == 'truck_types' ? 'active' : '' }}" href="{{ route('view_config_truck_types') }}" title="">Vehicle Type</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item {{ Request::segment(2) == 'devices' ? 'active' : '' }}" href="{{ route('view_config_devices') }}" title="">Master Devices</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item {{ Request::segment(2) == 'logs_gps' ? 'active' : '' }}" href="{{ route('view_config_logs_gps') }}" title="">Logs Gps</a>
|
||||
</li>
|
||||
{{-- <li>
|
||||
<a class="dropdown-item {{ Request::segment(2) == 'a_items' ? 'active' : '' }}" href="{{ route('view_adm_a_items') }}" title="">additional item</a>
|
||||
</li> --}}
|
||||
{{-- <li>
|
||||
<a class="dropdown-item {{ Request::segment(2) == 'menu_permissions' ? 'active' : '' }}"
|
||||
href="{{ route('view_adm_menu_permissions') }}" title="">Menu Permissions</a>
|
||||
</li> --}}
|
||||
{{-- <li>
|
||||
<a class="dropdown-item {{ Request::segment(2) == 'logbook_types' ? 'active' : '' }}" href="{{ route('view_config_lgb_types') }}" title="">Tipe Logbook</a>
|
||||
</li> --}}
|
||||
{{-- <li>
|
||||
<a class="dropdown-item {{ Request::segment(2) == 'logbook_keys' ? 'active' : '' }}" href="{{ route('view_config_lgb_keys') }}" title="">Master Logbook</a>
|
||||
</li> --}}
|
||||
@can('config_truck_type.view')
|
||||
<li>
|
||||
<a class="dropdown-item {{ Request::segment(2) == 'truck_types' ? 'active' : '' }}" href="{{ route('view_config_truck_types') }}" title="">Vehicle Type</a>
|
||||
</li>
|
||||
@endcan
|
||||
@can('config_master_device.view')
|
||||
<li>
|
||||
<a class="dropdown-item {{ Request::segment(2) == 'devices' ? 'active' : '' }}" href="{{ route('view_config_devices') }}" title="">Master Devices</a>
|
||||
</li>
|
||||
@endcan
|
||||
@can('config_logs_gps.view')
|
||||
<li>
|
||||
<a class="dropdown-item {{ Request::segment(2) == 'logs_gps' ? 'active' : '' }}" href="{{ route('view_config_logs_gps') }}" title="">Logs Gps</a>
|
||||
</li>
|
||||
@endcan
|
||||
</ul>
|
||||
</li>
|
||||
@endif
|
||||
{{-- only admin and vendor --}}
|
||||
@if ($user_role === \App\Models\Users::ROLE_ADMIN || $user_role === \App\Models\Users::ROLE_VENDOR)
|
||||
{{-- @if ($user_role === \App\Models\Users::ROLE_ADMIN) --}}
|
||||
@can('driver.view')
|
||||
<li class="nav-item {{ Request::segment(1) == 'drivers' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_drivers') }}">
|
||||
Driver
|
||||
</a>
|
||||
</li>
|
||||
@endcan
|
||||
@can('vehicle.view')
|
||||
<li class="nav-item {{ Request::segment(1) == 'vehicles' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_vehicles') }}">
|
||||
Vehicle
|
||||
</a>
|
||||
</li>
|
||||
@endcan
|
||||
@can('user.view')
|
||||
<li class="nav-item {{ Request::segment(1) == 'users' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_users') }}">
|
||||
User
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
@endcan
|
||||
|
||||
{{-- only admin and client --}}
|
||||
{{-- @if ($user_role === \App\Models\Users::ROLE_ADMIN || $user_role === \App\Models\Users::ROLE_CLIENT_ADMIN)
|
||||
<li class="nav-item {{ Request::segment(1) == 'transactions' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page"
|
||||
href="{{ route('view_transactions') }}">
|
||||
Transactions
|
||||
@can('role.view')
|
||||
<li class="nav-item {{ Request::segment(1) == 'roles' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_roles') }}">
|
||||
Role
|
||||
</a>
|
||||
</li>
|
||||
@endif --}}
|
||||
{{-- only client --}}
|
||||
@if ($user_role === \App\Models\Users::ROLE_CLIENT_ADMIN)
|
||||
<li class="nav-item {{ Request::path() == 'user/clients/transactions' || Request::path() == 'user/clients/transactions/addNew' || Request::path() == 'user/clients/transactions/view' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_user_client_transaction') }}">
|
||||
Transaction
|
||||
</a>
|
||||
</li>
|
||||
{{-- <li class="nav-item {{ Request::segment(1) == 'zone' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page"
|
||||
href="{{ route('view_zone') }}">
|
||||
Zone
|
||||
</a>
|
||||
</li> --}}
|
||||
@endif
|
||||
{{-- only checker --}}
|
||||
@if ($user_role === \App\Models\Users::ROLE_CHECKER)
|
||||
<li class="nav-item {{ Request::path() == 'user/checker' || Request::path() == 'user/checker/view' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_user_checker') }}">
|
||||
Checker
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
{{-- all roles --}}
|
||||
@if ($user_role === \App\Models\Users::ROLE_ADMIN || $user_role === \App\Models\Users::ROLE_VENDOR || $user_role === \App\Models\Users::ROLE_CLIENT_ADMIN)
|
||||
{{-- <li class="nav-item">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page"
|
||||
href="javascrript:void(0);">
|
||||
Reports
|
||||
</a>
|
||||
</li> --}}
|
||||
@endif
|
||||
@if ($user_role === \App\Models\Users::ROLE_FINANCE)
|
||||
<li class="nav-item {{ Request::segment(1) == 'dashboard' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="#">
|
||||
Dashboard
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item {{ Request::segment(3) == 'ledgerBalanceList' ? 'active' : '' }}">
|
||||
<a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_ledger_balance') }}">
|
||||
Ledger Balance
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item dropdown {{ Request::segment(2) == 'payment' ? 'active' : '' }}">
|
||||
<a class="nav-link" href="{{ route('view_keuangan_payment') }}" id="" role="button" aria-expanded="false">
|
||||
Pembayaran
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item dropdown {{ Request::segment(2) == 'billing' ? 'active' : '' }}">
|
||||
<a class="nav-link" href="{{ route('view_keuangan_billing') }}" id="" role="button" aria-expanded="false">
|
||||
Penagihan
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item dropdown {{ Request::segment(2) == 'pocket_tf_history' ? 'active' : '' }}">
|
||||
<a class="nav-link" href="{{ route('view_fiinance_pocket_tf_history') }}" id="" role="button" aria-expanded="false">
|
||||
Riwayat Transfer Uang Saku
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item dropdown {{ Request::segment(2) == 'config' ? 'active' : '' }}">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="" role="button" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
Konfigurasi
|
||||
</a>
|
||||
<ul class="dropdown-menu" style="right: 0; left: auto;" aria-labelledby="">
|
||||
<li>
|
||||
<a class="dropdown-item {{ Request::segment(3) == 'a_items' ? 'active' : '' }}" href="{{ route('view_a_items') }}" title="">additional item</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item {{ Request::segment(3) == 'dana' ? 'active' : '' }}" href="{{ route('view_finance_dana') }}" title="">Dana</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
@endif
|
||||
@endcan
|
||||
</ul>
|
||||
<ul class="navbar-nav ms-auto my-2 my-lg-0 navbar-nav-scroll">
|
||||
<li class="nav-item dropdown">
|
||||
@ -229,23 +132,5 @@
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
{{-- <p class="mb-0" id="time"></p> --}}
|
||||
</div>
|
||||
</nav>
|
||||
{{-- @if ($user_role == \App\Models\Users::ROLE_ADMIN)
|
||||
<div class="sub-nav shadow" id="subNav">
|
||||
<div class="container-fluid">
|
||||
<div class="row d-flex align-items-center">
|
||||
<div class="col-auto">
|
||||
<p class="text-bold mb-0">FLEET MANAGER</p>
|
||||
</div>
|
||||
<div class="col-5 d-flex align-items-center">
|
||||
<span class="me-2">Company</span>
|
||||
<select name="filter-company" class="select2 form-control" id="filter-company" style="width:100%;">
|
||||
<option value="all">Semua Company</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif --}}
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
$proxy_url = getenv('PROXY_URL');
|
||||
$proxy_schema = getenv('PROXY_SCHEMA');
|
||||
$proxy_url = getenv("PROXY_URL");
|
||||
$proxy_schema = getenv("PROXY_SCHEMA");
|
||||
|
||||
if (!empty($proxy_url)) {
|
||||
URL::forceRootUrl($proxy_url);
|
||||
@ -43,12 +43,21 @@ Route::middleware(["auth", "auth.user"])->group(function () {
|
||||
Route::get("/", "HomeController@check_redirect")->name("view_dashboard_0");
|
||||
Route::get("/home", "HomeController@check_redirect")->name("view_dashboard_1");
|
||||
|
||||
Route::get("/transactions", "MenuController@view_transactions")->name("view_transactions");
|
||||
Route::get("/transactions", "MenuController@view_transactions")
|
||||
->name("view_transactions")
|
||||
->middleware("permission:transaction.view");
|
||||
|
||||
Route::get("/transactions/confirm", "MenuController@view_transactions_confirm")->name(
|
||||
"view_transactions_confirm"
|
||||
);
|
||||
Route::get("/transactions/view", "MenuController@view_transactions_view")->name("view_transactions_view");
|
||||
Route::get("/transactions/add", "MenuController@view_transactions_add")->name("view_transactions_add");
|
||||
Route::get("/transactions/view", "MenuController@view_transactions_view")
|
||||
->name("view_transactions_view")
|
||||
->middleware("permission:transaction.view");
|
||||
|
||||
Route::get("/transactions/add", "MenuController@view_transactions_add")
|
||||
->name("view_transactions_add")
|
||||
->middleware("permission:transaction.add");
|
||||
|
||||
Route::get("/transactions/download_do", "TransactionController@view_transactions_download_do")->name(
|
||||
"view_transactions_download_do"
|
||||
);
|
||||
@ -85,14 +94,37 @@ Route::middleware(["auth", "auth.user"])->group(function () {
|
||||
);
|
||||
// ./new
|
||||
|
||||
Route::get("/clients", "ClientController@view_clients")->name("view_clients");
|
||||
Route::get("/zone", "ZoneController@view_zone")->name("view_zone");
|
||||
Route::get("/zone/add", "ZoneController@view_zone_add")->name("view_zone_add");
|
||||
Route::get("/zone/edit/{zid}", "ZoneController@view_zone_edit")->name("view_zone_edit");
|
||||
Route::get("/dashboard", "MenuController@view_dashboard")->name("view_dashboard");
|
||||
Route::get("/drivers", "MenuController@view_drivers")->name("view_drivers");
|
||||
Route::get("/vehicles", "MenuController@view_vehicles")->name("view_vehicles");
|
||||
Route::get("/users", "UsersController@view_users")->name("view_users");
|
||||
Route::get("/clients", "ClientController@view_clients")
|
||||
->name("view_clients")
|
||||
->middleware("permission:client.view");
|
||||
Route::get("/zone", "ZoneController@view_zone")
|
||||
->name("view_zone")
|
||||
->middleware("permission:zone.view");
|
||||
Route::get("/zone/add", "ZoneController@view_zone_add")
|
||||
->name("view_zone_add")
|
||||
->middleware("permission:zone.add");
|
||||
Route::get("/zone/edit/{zid}", "ZoneController@view_zone_edit")
|
||||
->name("view_zone_edit")
|
||||
->middleware("permission:zone.edit");
|
||||
Route::get("/dashboard", "MenuController@view_dashboard")
|
||||
->name("view_dashboard")
|
||||
->middleware("permission:dashboard.view");
|
||||
Route::get("/drivers", "MenuController@view_drivers")
|
||||
->name("view_drivers")
|
||||
->middleware("permission:driver.view");
|
||||
|
||||
Route::get("/vehicles", "MenuController@view_vehicles")
|
||||
->name("view_vehicles")
|
||||
->middleware("permission:vehicle.view");
|
||||
|
||||
Route::get("/users", "UsersController@view_users")
|
||||
->name("view_users")
|
||||
->middleware("permission:user.view");
|
||||
|
||||
Route::get("/roles", "RolesController@view")
|
||||
->name("view_roles")
|
||||
->middleware("permission:role.view");
|
||||
|
||||
Route::get("/profile", "UsersController@view_profile")->name("view_profile");
|
||||
Route::get("/config/rates", "ConfRateController@view_rates")->name("view_config_rates");
|
||||
Route::get("/config/pocket", "PocketController@view_pockets")->name("view_config_pockets");
|
||||
@ -100,11 +132,18 @@ Route::middleware(["auth", "auth.user"])->group(function () {
|
||||
Route::get("/config/static_insurances", "StaticInsuranceController@view_static_insurances")->name(
|
||||
"view_config_static_insurances"
|
||||
);
|
||||
Route::get("/config/truck_types", "ConfTruckTypeController@view_truck_types")->name(
|
||||
"view_config_truck_types"
|
||||
);
|
||||
Route::get("/config/devices", "DevicesController@view_devices")->name("view_config_devices");
|
||||
Route::get("/config/logs_gps", "MenuController@view_logs_gps")->name("view_config_logs_gps");
|
||||
Route::get("/config/truck_types", "ConfTruckTypeController@view_truck_types")
|
||||
->name("view_config_truck_types")
|
||||
->middleware("permission:config_truck_type.view");
|
||||
|
||||
Route::get("/config/devices", "DevicesController@view_devices")
|
||||
->name("view_config_devices")
|
||||
->middleware("permission:config_master_device.view");
|
||||
|
||||
Route::get("/config/logs_gps", "MenuController@view_logs_gps")
|
||||
->name("view_config_logs_gps")
|
||||
->middleware("permission:config_logs_gps.view");
|
||||
|
||||
Route::get("/config/a_items", "AItemsController@view_a_items")->name("view_adm_a_items");
|
||||
Route::get("/config/menu_permissions", "UsersMenuPermissionsController@view_menu_permissions")->name(
|
||||
"view_adm_menu_permissions"
|
||||
@ -218,6 +257,13 @@ Route::middleware(["auth", "auth.user"])->group(function () {
|
||||
"api_search_user_name"
|
||||
);
|
||||
|
||||
Route::get("/api/roles", "RolesController@api_list")->name("api_list_roles");
|
||||
Route::get("/api/roles/{uid}", "RolesController@api_show")->name("api_show_role");
|
||||
Route::post("/api/roles", "RolesController@api_add")->name("api_add_role");
|
||||
Route::put("/api/roles/{uid}", "RolesController@api_edit")->name("api_edit_role");
|
||||
Route::delete("/api/roles/{uid}", "RolesController@api_del")->name("api_del_role");
|
||||
Route::post("/api/roles/search", "RolesController@api_search")->name("api_search_role");
|
||||
|
||||
Route::get("/api/drivers", "DriversController@api_list_drivers")->name("api_list_drivers");
|
||||
Route::get("/api/drivers/{did}", "DriversController@api_show_driver")->name("api_show_driver");
|
||||
Route::post("/api/drivers", "DriversController@api_add_driver")->name("api_add_driver");
|
||||
|
||||
Reference in New Issue
Block a user