This commit is contained in:
meusinfirmary
2025-07-15 04:28:55 +07:00
parent 86e9c43cfd
commit 452f23fed8
26 changed files with 2642 additions and 1421 deletions

View File

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

View File

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

View File

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

View File

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

View 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

View File

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

View File

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

View File

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

View File

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

View File

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