This commit is contained in:
meusinfirmary
2025-05-29 13:21:59 +07:00
parent 3b9d94620a
commit 77bc5f10a6
29 changed files with 2206 additions and 2247 deletions

View File

@ -391,7 +391,7 @@
if (!AllowRouteSegment1.includes(AppState.route_segment1)) {
const AllowRouteSegment2 = ['pocket'];
if (!AllowRouteSegment2.includes(AppState.route_segment2)) {
$('#subNav').addClass('d-none');
// $('#subNav').addClass('d-none');
return false;
}
}

View File

@ -12,7 +12,7 @@
<div class="card-header">
<div class="row d-flex align-items-center">
<div class="col">
<p class="card-title text-bold mb-0">Detail Pesanan</p>
<p class="card-title text-bold mb-0">Detail Job</p>
</div>
<div class="col text-end">
<button class="btn btn-secondary btn-sm" onclick="location.href='{{ route('view_transactions') }}'">Kembali</button>
@ -24,11 +24,11 @@
<div class="row d-flex">
<div class="col-5 mb-3">
<div class="row">
<div class="col-sm-12 mb-3">
{{-- <div class="col-sm-12 mb-3">
<p class="text-danger text-bold mb-0">Penjemputan dan Pengantaran</p>
</div>
</div> --}}
<div class="col-sm-12 mb-3">
<label for="" class="form-label">Tanggal Penjemputan</label>
<label for="" class="form-label">Date</label>
<div class="card bg-light border mb-0">
<div class="card-body">
<p class="mb-0"><span id="view-pickup_date_at"></span></p>
@ -36,7 +36,7 @@
</div>
</div>
<div class="col-sm-12 mb-3">
<label for="" class="form-label">Waktu Penjemputan</label>
<label for="" class="form-label">Time</label>
<div class="card bg-light border mb-0">
<div class="card-body">
<p class="mb-0"><span id="view-pickup_time_at"></span></p>
@ -48,10 +48,10 @@
<div class="col-sm-2"></div>
<div class="col-sm-5 mb-3">
<div class="row">
<div class="col-sm-12 col-12 mb-3">
{{-- <div class="col-sm-12 col-12 mb-3">
<p class="text-danger text-bold mb-0">Layanan Yang Dipilih</p>
</div>
<div class="col-sm-12 col-6 mb-3">
</div> --}}
{{-- <div class="col-sm-12 col-6 mb-3">
<label for="" class="form-label">Durasi Pengantaran</label>
<div class="card bg-light border mb-0 w-100">
<div class="card-body d-flex justify-content-between">
@ -61,9 +61,9 @@
</p>
</div>
</div>
</div>
</div> --}}
<div class="col-sm-12 col-6 mb-3">
<label for="" class="form-label">Tipe Kendaraan</label>
<label for="" class="form-label">Vehicle</label>
<div class="card bg-light border mb-0 w-100">
<div class="card-body d-flex justify-content-between">
<p class="mb-0">{{ $order->prefer_truck_type_name }}</p>
@ -75,7 +75,7 @@
</div>
<div class="row mb-3 d-flex align-items-center">
<div class="col-5 mb-3">
<label for="" class="form-label">Lokasi Penjemputan</label>
<label for="" class="form-label">Origin</label>
<div class="card bg-light border mb-0">
<div class="card-body">
{{-- <p class="text-bold mb-2">Gudang Pluit SiCepat (Jakarta)</p> --}}
@ -91,7 +91,7 @@
<span class="ion-arrow-right-c text-danger" style="font-size: 15px"></span>
</div>
<div class="col-5 mb-3">
<label for="" class="form-label">Lokasi Pengantaran</label>
<label for="" class="form-label">Destination</label>
<div class="card bg-light border mb-0">
<div class="card-body">
{{-- <p class="text-bold mb-2">Kantor Pusat SiCepat (yogyakarta)</p> --}}
@ -105,36 +105,7 @@
</div>
</div>
</div>
<div class="col-sm-6">
@if ($order->confirm_at === 0)
<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">Order History</p>
</div>
</div>
</div> --}}
<div class="card-body">
<div class="col-12 mb-3">
<p class="text-danger text-bold mb-0">Pencarian Vendor Otomatis</p>
</div>
<div id="mapsOrder" class="mb-3"></div>
<div class="col-12">
<div class="text-end">
{{-- <button class="btn btn-danger btn-sm"
onclick="location.href='{{ route('view_transactions') }}'">Submit</button> --}}
<button id="btnSearchDriver" class="btn btn-danger btn-sm">Cari Otomatis</button>
<div id="group_btnSearchDrvSpinner" class="d-none">
<div class="spinner-border" role="status">
<span class="visually-hidden">Loading...</span>
</div>
</div>
</div>
</div>
</div>
</div>
@endif
{{-- <div class="col-sm-6">
<div class="card">
<div class="card-body">
<div class="col-12 mb-3">
@ -150,8 +121,6 @@
</select>
</div>
<div class="text-end">
{{-- <button class="btn btn-danger btn-sm"
onclick="location.href='{{ route('view_transactions') }}'">Pilih</button> --}}
<button id="btnChooseVendor" class="btn btn-danger btn-sm">Pilih</button>
<div id="group_btnChooseVdrSpinner" class="d-none">
<div class="spinner-border" role="status">
@ -161,7 +130,7 @@
</div>
</div>
</div>
</div>
</div> --}}
</div>
</div>
</div>
@ -178,8 +147,8 @@
}
/* .leaflet-control-container .leaflet-left {
display: none;
} */
display: none;
} */
.leaflet-left .leaflet-draw-edit-remove {
display: none;
@ -268,10 +237,7 @@
rectangle: "{{ App\Models\Zone::ZONE_BOUNDARY_RECTANGLE }}",
},
boundary_type_choose: "{{ App\Models\Zone::ZONE_BOUNDARY_CIRCLE }}",
boundary_latlngs: [{
lat: "{{ $order->pck_center_lat }}",
lng: "{{ $order->pck_center_lng }}",
}], // [{lat,lng}].
boundary_radius: 2000, // in meters. only circle
boundary_bounds: null, // {northEast:{lat,lng},southWest:{lat,lng}}. only polygon,rectangle
default_boundary_hex: '#f26e6f',

View File

@ -76,16 +76,13 @@
</div>
<div class="col-2 text-center d-flex align-items-center justify-content-center">
<label for="" class="form-label mb-0 mt-0">&nbsp;</label>
{{-- <p class="mb-0">to</p> --}}
<span class="ion-arrow-right-c text-danger" style="font-size: 15px"></span>
</div>
<div class="col-5">
<label for="" class="form-label">Lokasi Pengantaran</label>
<div class="card bg-light border mb-0">
<div class="card-body">
{{-- <p class="text-bold mb-2">Kantor Pusat SiCepat (yogyakarta)</p> --}}
<p class="text-bold mb-2">{{ $_order['drop_name'] }}</p>
{{-- <p class="mb-0">Jl. Prof. Herman Yohanes No.989, Terban, Gondokusuman, Kota Yogyakarta, Daerah Istimewa Yogyakarta 55223, Indonesia</p> --}}
<p class="mb-0">{{ $_order['drop_addr'] }}</p>
</div>
</div>

View File

@ -11,8 +11,8 @@
}
/* .select2-container {
z-index: 99999;
} */
z-index: 99999;
} */
</style>
@endsection
@ -29,7 +29,7 @@
</div>
<div class="col text-end">
{{-- <a href="#" class="btn btn-sm btn-danger" data-bs-toggle="modal" data-bs-target="#addNewClientModal">Add New Client</a> --}}
<a href="#" class="btn btn-sm btn-danger" id="btnAddNewClientModal">Tambah Client</a>
{{-- <a href="#" class="btn btn-sm btn-danger" id="btnAddNewClientModal">Tambah Client</a> --}}
</div>
<div class="col-auto text-end ps-0">
{{-- <button class="btn btn-sm btn-danger">Upload</button> --}}

View File

@ -22,8 +22,8 @@
}
/* .cLogoGroup {
display: inherit;
} */
display: inherit;
} */
#openLeftSideBar1Mobile {
display: none;
}
@ -35,11 +35,11 @@
@media (max-width: 425px) {
/* .cLogoGroup {
display: none;
}
.cNameGroup {
margin-bottom: 0!important;
} */
display: none;
}
.cNameGroup {
margin-bottom: 0!important;
} */
#openLeftSideBar1 {
display: none !important;
}
@ -234,10 +234,10 @@
</div>
<div class="form-group mb-3 w-100">
<select name="" class="form-control select2" style="width: 100%;" id="selectFiter">
<option value="3">Pekerjaan</option>
<option value="1">Kendaraan</option>
<option value="2">Pengemudi</option>
<option value="4">Riwayat Perjalanan</option>
<option value="1">Vehicle</option>
<option value="2">Driver</option>
<option value="3">Job</option>
<option value="4">Travel History</option>
</select>
</div>
<ul class="list-group" id="infoVehicles">
@ -249,7 +249,7 @@
<p id="infoVehicles-crt" class="text-muted mb-0">20-Jan-2022 23:16:18</p>
</li>
<li class="list-group-item p-1 px-2">
<p class="text-bold mb-0">Lokasi saat ini</p>
<p class="text-bold mb-0">Current Location</p>
<p id="infoVehicles-addr" class="text-muted mb-0">Kebon Baru - Tebet</p>
</li>
<li class="list-group-item p-1 px-2">
@ -257,7 +257,7 @@
<p id="infoVehicles-lat_lng" class="text-muted mb-0">-6.27013, 106.731371</p>
</li>
<li class="list-group-item p-1 px-2">
<p class="text-bold mb-0">Jarak tempuh kendaraan (km)</p>
<p class="text-bold mb-0">Vehicle Mileage (km)</p>
<p id="infoVehicles-mileage" class="text-muted mb-0">45080.83</p>
</li>
{{-- <li class="list-group-item p-1 px-2">
@ -273,7 +273,7 @@
<p id="infoVehicles-ignition" class="text-muted mb-0">ON</p>
</li> --}}
<li class="list-group-item p-1 px-2">
<p class="text-bold mb-0">Status Mesin</p>
<p class="text-bold mb-0">Engine Status</p>
<p id="infoVehicles-engineStatus" class="text-muted mb-0">Idling</p>
</li>
{{-- <li class="list-group-item p-1 px-2">
@ -305,15 +305,15 @@
</ul>
<ul class="list-group" id="infoDriver">
<li class="list-group-item p-1 px-2">
<p class="text-bold mb-0">Informasi Pengemudi</p>
<p class="text-bold mb-0">Driver Information</p>
<p id="infoDrv-updt" class="text-muted mb-0">20-Jan-2022 23:16:18</p>
</li>
<li class="list-group-item p-1 px-2">
<p class="text-bold mb-0">Nama Pengemudi</p>
<p id="infoDrv-name" class="text-muted mb-0">Rafif</p>
<p class="text-bold mb-0">Driver Name</p>
<p id="infoDrv-name" class="text-muted mb-0">Emrsyf</p>
</li>
<li class="list-group-item p-1 px-2">
<p class="text-bold mb-0">Phone 1</p>
<p class="text-bold mb-0">Phone</p>
<p class="mb-0">
<a href="tel:0" id="infoDrv-phone1-tel">
<i class="text-dark ion-ios-telephone"></i>&nbsp;
@ -326,7 +326,7 @@
</a>
</p>
</li>
<li class="list-group-item p-1 px-2">
{{-- <li class="list-group-item p-1 px-2">
<p class="text-bold mb-0">Phone 2</p>
<p class="mb-0">
<a href="tel:0" id="infoDrv-phone2-tel">
@ -339,7 +339,7 @@
<span class="infoDrv-phone2-text"></span>
</a>
</p>
</li>
</li> --}}
</ul>
<div id="infoJob">
{{-- @for ($i = 0; $i < 20; $i++)
@ -356,9 +356,8 @@
</div>
</li>
@endfor --}}
<ul class="list-group mb-3">
{{-- <ul class="list-group mb-3">
<li class="list-group-item p-1 px-2">
{{-- <p class="text-bold mb-0">#902192102910</p> --}}
<div class="row d-flex align-items-center justify-content-between">
<div class="col-12">
<small class="text-muted">Client</small>
@ -366,13 +365,13 @@
</div>
</div>
</li>
</ul>
</ul> --}}
<ul class="list-group mb-3">
<li class="list-group-item p-1 px-2">
{{-- <p class="text-bold mb-0">#902192102910</p> --}}
<div class="row d-flex align-items-center justify-content-between">
<div class="col-12">
<small class="text-muted">Dari</small>
<small class="text-muted">Origin</small>
<p id="infoJob-pck_city" class="">Jakarta</p>
<p id="infoJob-pck_name" class="mb-0">JKT-01</p>
<p id="infoJob-pck_addr" class="mb-0">Jl. Pancoran Timur Raya No.9, RT.8/RW.9, Pancoran, Kec. Pancoran, Kota Jakarta Selatan, Daerah Khusus Ibukota Jakarta 12780</p>
@ -383,7 +382,7 @@
{{-- <p class="text-bold mb-0">#902192102910</p> --}}
<div class="row d-flex align-items-center justify-content-between">
<div class="col-12">
<small class="text-muted">Tujuan</small>
<small class="text-muted">Destination</small>
<p id="infoJob-drop_city" class="">Indramayu</p>
<p id="infoJob-drop_name" class="mb-0">IND-01</p>
<p id="infoJob-drop_addr" class="mb-0">Jl. Jend. Sudirman, Karanganyar, Kec. Indramayu, Kabupaten Indramayu, Jawa Barat</p>
@ -404,17 +403,17 @@
</ul>
</div>
<ul class="list-group" id="infoMovement">
<li class="list-group-item p-1 px-2">
<p class="text-bold mb-0">Riwayat Perjalanan</p>
<p id="infoVehicles-infoMove" class="text-muted mb-0">Terbaru</p>
<li class="list-group-item p-1 px-2 mb-2" style="border-radius: 0.25rem;">
<p class="text-bold mb-0">Trip History</p>
<p id="infoVehicles-infoMove" class="text-muted mb-0">Most Recent</p>
</li>
<div>
<div>
<label class="text-muted">Dari</label>
<div class="mb-2">
<label class="text-muted">From</label>
<input class="form-control" type="date" id="historyStartDate">
</div>
<div>
<label class="text-muted">Sampai</label>
<div class="mb-3">
<label class="text-muted">To</label>
<input class="form-control" type="date" id="historyEndDate">
</div>
</div>
@ -1225,7 +1224,7 @@
Menu.showViewDetailVehicle($(this).val());
});
Menu.showViewDetailVehicle(State.stts_filterDetail.assignJob);
Menu.showViewDetailVehicle(State.stts_filterDetail.vehicles);
Menu.eventListVehicle();
Menu.eventListMovement();
@ -1280,8 +1279,8 @@
}, State.delay_hideTruckNotSelected);
});
Leaflet.clearLayer('eventRemoveDetailPlotMovement');
$('#selectFiter').val(State.stts_filterDetail.assignJob).trigger('change');
$('#selectFiter').val(State.stts_filterDetail.assignJob).trigger('select2:select');
$('#selectFiter').val(State.stts_filterDetail.vehicles).trigger('change');
$('#selectFiter').val(State.stts_filterDetail.vehicles).trigger('select2:select');
$('#rightSideBar2').removeClass('d-none');
if (Trucks.lists[i]?.lst_lat == null || Trucks.lists[i]?.lst_lng == null) {
Helper.toast('Warning', 'just now',
@ -2424,7 +2423,7 @@
// driver
$('#infoDrv-updt').text((truck?.ord_crt) ? moment.unix(truck?.ord_crt).format('DD MMM YYYY HH:mm') : '-');
$('#infoDrv-name').text(truck?.ord_drv_name ?? 'Tidak dalam order');
$('#infoDrv-name').text(truck?.ord_drv_name ?? 'Off Duty');
$('.infoDrv-phone1-text').text((truck?.ord_drv_phone_val) ? Helper.splitEvery4Char('0' + truck?.ord_drv_phone_val) : '-');
$('#infoDrv-phone1-tel').attr('tel:0' + (truck?.ord_drv_phone_val ?? ''));
$('#infoDrv-phone1-wa').attr('https://api.whatsapp.com/send/?phone=62' + (truck?.ord_drv_phone_val ?? '') + '&text=Halo&app_absent=0');

View File

@ -11,8 +11,8 @@
@section('customcss')
<style>
/* .select2-container {
z-index: 99999;
} */
z-index: 99999;
} */
</style>
@endsection
@ -25,7 +25,8 @@
<div class="col-3">
<p class="card-title text-bold mb-0">List Driver</p>
</div>
@if ($user_role === \App\Models\Users::ROLE_VENDOR)
{{-- @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>

View File

@ -19,18 +19,18 @@
<div class="card-header">
<div class="row d-flex align-items-center">
<div class="col">
<p class="card-title text-bold mb-0">Transaksi</p>
<p class="card-subtitle text-muted">Daftar Transaksi</p>
<p class="card-title text-bold mb-0">Transaction</p>
<p class="card-subtitle text-muted">Transaction List</p>
</div>
{{-- <div class="col-auto text-end ps-0">
<a href="#" id="btnMdlMrgTrx" class="btn btn-sm btn-danger">Merge Transaksi</a>
</div>
<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">Tambah Transaksi</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>
</div>
</div>
<div class="card-body">
@ -39,20 +39,20 @@
<thead>
<tr class="">
<th class="">#</th>
<th class="text-nowrap text-center">Tindakan</th>
<th class="text-nowrap">Kode Order</th>
<th class="text-nowrap">Nama Client</th>
<th class="text-nowrap">Waktu Pemesanan</th>
<th class="text-nowrap">Vendor</th>
<th class="text-nowrap">Kendaraan</th>
<th class="text-nowrap">Pengemudi</th>
<th class="text-nowrap">Lokasi Penjemputan</th>
<th class="text-nowrap">Lokasi Pengantaran</th>
<th class="text-nowrap text-center">Action</th>
<th class="text-nowrap">Order Code</th>
<th class="text-nowrap">Company</th>
<th class="text-nowrap">Order Time</th>
{{-- <th class="text-nowrap">Vendor</th> --}}
<th class="text-nowrap">Vehicle</th>
<th class="text-nowrap">Driver</th>
<th class="text-nowrap">Origin</th>
<th class="text-nowrap">Destination</th>
<th class="text-nowrap text-center">Status</th>
</tr>
</thead>
<tbody>
<tr class="">
{{-- <tr class="">
<td class="text-nowrap">1</td>
<td class="text-nowrap">SiCepat</td>
<td class="text-nowrap">Feb 20, 2022 17:29:50</td>
@ -75,7 +75,7 @@
<span class="icon ion-eye text-danger fz-16"></span>
</a>
</td>
</tr>
</tr> --}}
</tbody>
</table>
</div>
@ -434,29 +434,71 @@
orderable: true,
searchable: true,
render: function(data, type, row, meta) {
console.log("rows: ", row)
let action = ``;
// if (row.confirm_at === 0) {
if (!row.vdr_name) {
action += `<a href="${State.url_conf_order}?code=${row.ord_code}"
class="text-decoration-none me-1" data-bs-toggle="tooltip"
data-bs-placement="bottom" title="Tindak Lanjuti">
<span class="icon ion-forward text-danger fz-16"></span>
</a>`;
} else {
let ord_codes = row.ord_code;
if (typeof row.childs != 'undefined' && row.childs.length > 0) {
for (const child of row.childs) {
ord_codes += ',' + child.ord_code;
}
// if (!row.vdr_name) {
// action += `<a href="${State.url_conf_order}?code=${row.ord_code}"
// class="text-decoration-none me-1" data-bs-toggle="tooltip"
// data-bs-placement="bottom" title="Tindak Lanjuti">
// <span class="icon ion-forward text-danger fz-16"></span>
// </a>`;
// } else {
// let ord_codes = row.ord_code;
// if (typeof row.childs != 'undefined' && row.childs.length > 0) {
// for (const child of row.childs) {
// ord_codes += ',' + child.ord_code;
// }
// }
// action += `
// <a href="${State.url_view_order}?code=${ord_codes}"
// class="text-decoration-none me-1" data-bs-toggle="tooltip"
// data-bs-placement="bottom" title="Lihat">
// <span class="icon ion-eye text-danger fz-16"></span>
// </a>
// `;
// action += `
// <a href="#"
// class="text-decoration-none me-1 btnTrackOrder" data-bs-toggle="tooltip"
// data-bs-placement="bottom" title="Tracking #${row.ord_code}"
// data-id="${row.ord_id}" data-code="${row.ord_code}">
// <span class="icon ion-map text-danger fz-16"></span>
// </a>
// `;
// // data-bs-toggle="modal" data-bs-target="#mdlPantau"
// for (const child of row.childs) {
// action += `
// <a href="#"
// class="text-decoration-none me-1 btnTrackOrder" data-bs-toggle="tooltip"
// data-bs-placement="bottom" title="Tracking #${child.ord_code}"
// data-id="${child.ord_id}" data-code="${child.ord_code}">
// <span class="icon ion-map text-danger fz-16"></span>
// </a>
// `;
// }
// }
// action += `
// <a href="#"
// class="text-decoration-none me-1 btnDelOrder" data-bs-toggle="tooltip"
// data-bs-placement="bottom" title="Delete Order"
// data-id="${row.ord_id}" data-code="${row.ord_code}">
// <span class="icon ion-ios-trash text-danger fz-16"></span>
// </a>
// `;
let ord_codes = row.ord_code;
if (typeof row.childs != 'undefined' && row.childs.length > 0) {
for (const child of row.childs) {
ord_codes += ',' + child.ord_code;
}
action += `
}
action += `
<a href="${State.url_view_order}?code=${ord_codes}"
class="text-decoration-none me-1" data-bs-toggle="tooltip"
data-bs-placement="bottom" title="Lihat">
<span class="icon ion-eye text-danger fz-16"></span>
</a>
`;
action += `
action += `
<a href="#"
class="text-decoration-none me-1 btnTrackOrder" data-bs-toggle="tooltip"
data-bs-placement="bottom" title="Tracking #${row.ord_code}"
@ -464,9 +506,9 @@
<span class="icon ion-map text-danger fz-16"></span>
</a>
`;
// data-bs-toggle="modal" data-bs-target="#mdlPantau"
for (const child of row.childs) {
action += `
// data-bs-toggle="modal" data-bs-target="#mdlPantau"
for (const child of row.childs) {
action += `
<a href="#"
class="text-decoration-none me-1 btnTrackOrder" data-bs-toggle="tooltip"
data-bs-placement="bottom" title="Tracking #${child.ord_code}"
@ -474,7 +516,6 @@
<span class="icon ion-map text-danger fz-16"></span>
</a>
`;
}
}
action += `
<a href="#"
@ -506,7 +547,7 @@
},
},
{
data: 'c_name',
data: 'c_pt_name',
className: 'text-start',
visible: true,
orderable: true,
@ -520,8 +561,9 @@
// },
render: function(data, type, row, meta) {
let txt = data;
console.log("row:", row);
for (const child of row.childs) {
txt += '<br>' + child.c_name;
txt += '<br>' + child.c_pt_name;
}
return txt;
},
@ -540,29 +582,29 @@
return txt;
},
},
{
data: 'vdr_name',
className: 'text-start',
visible: true,
orderable: true,
searchable: true,
render: function(data, type, row, meta) {
let txt = '';
if (data) {
txt += data;
} else {
txt += `<span class="text-danger">belum ditugaskan</span>`;
}
for (const child of row.childs) {
if (child.vdr_name) {
txt += '<br>' + child.vdr_name;
} else {
txt += `<br><span class="text-danger">belum ditugaskan</span>`;
}
}
return txt;
},
},
// {
// data: 'vdr_name',
// className: 'text-start',
// visible: true,
// orderable: true,
// searchable: true,
// render: function(data, type, row, meta) {
// let txt = '';
// if (data) {
// txt += data;
// } else {
// txt += `<span class="text-danger">belum ditugaskan</span>`;
// }
// for (const child of row.childs) {
// if (child.vdr_name) {
// txt += '<br>' + child.vdr_name;
// } else {
// txt += `<br><span class="text-danger">belum ditugaskan</span>`;
// }
// }
// return txt;
// },
// },
{
data: 'vhc_nopol1',
className: 'text-start',

View File

@ -7,8 +7,8 @@
@section('customcss')
<style>
/* .select2-container {
z-index: 99999;
} */
z-index: 99999;
} */
</style>
@endsection
@ -52,7 +52,7 @@
<tbody>
<tr class="">
<td class="">1</td>
<td class="">Rafif</td>
<td class="">Emrsyf</td>
<td class="">Jl. Letjen Mt. Haryono No.Kav. 20, RW.1, Cawang, Kec.
Kramat jati, Kota Jakarta Timur, Daerah Khusus Ibukota Jakarta 13630</td>
<td class="text-nowrap">021 83782235</td>

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
@ -321,7 +321,7 @@
</div>
</div>
{{-- Other Data --}}
@if ($user_role != \App\Models\Users::ROLE_VENDOR)
{{-- @if ($user_role != \App\Models\Users::ROLE_VENDOR)
<div class="mb-3">
<div class="border-bottom">
<h6>Other Data</h6>
@ -340,7 +340,7 @@
</div>
</div>
</div>
@endif
@endif --}}
</form>
</div>
<div class="modal-footer">
@ -578,7 +578,7 @@
</div>
</div>
{{-- Other Data --}}
@if ($user_role != \App\Models\Users::ROLE_VENDOR)
{{-- @if ($user_role != \App\Models\Users::ROLE_VENDOR)
<div class="mb-3">
<div class="border-bottom">
<h6>Other Data</h6>
@ -597,7 +597,7 @@
</div>
</div>
</div>
@endif
@endif --}}
</form>
</div>
<div class="modal-footer">

View File

@ -29,8 +29,8 @@
<div class="col">
<p class="card-title text-bold mb-0">Zona (<span id="count_zones"></span>)</p>
</div>
{{-- @if ($user_role === \App\Models\Users::ROLE_ADMIN || \App\Models\Users::ROLE_VENDOR) --}}
@if ($user_role === \App\Models\Users::ROLE_VENDOR)
@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">Tambah Zona</a>

View File

@ -1,9 +1,9 @@
@php
if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
$route_list_trx = route('view_transactions');
} else {
$route_list_trx = route('view_user_client_transaction');
}
if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
$route_list_trx = route('view_transactions');
} else {
$route_list_trx = route('view_user_client_transaction');
}
@endphp
@extends('app.app')
@ -20,28 +20,23 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
{{-- Form Order --}}
<div class="col-sm-6">
<div class="card">
<div class="card-header">
{{-- <div class="card-header">
<div class="row d-flex align-items-center">
<div class="col">
<p class="card-title text-bold mb-0">Tambah Pengiriman Baru</p>
<p class="card-title text-bold mb-0">Add new job</p>
</div>
</div>
</div>
<div class="card-body">
</div> --}}
<div class="card-body pb-0">
@if (Auth::user()->role == \App\Models\Users::ROLE_ADMIN)
<div class="row mb-3 d-flex align-items-center">
<div class="col-12 mb-3">
<p class="text-danger text-bold mb-0">Pengiriman Untuk Client</p>
{{-- <small>Masukkan tanggal, jam, lokasi penjemputan, dan lokasi pengantaran yang ada pada daftar zona yang telah didaftarkan</small> --}}
</div>
<div class="row mb-3 d-flex align-items-center d-none">
<div class="col-sm-5 col-5 mb-3">
<label for="add-client" class="form-label text-nowrap">Pilih Client</label>
<label for="add-client" class="form-label text-nowrap">Company</label>
<select name="add-client" id="add-client" class="select2 form-control">
<option value="" selected disabled>Belum ada Client yang dipilih</option>
@foreach ($uclients as $uclient)
<option value="{{ $uclient->id }}" data-uid="{{ $uclient->id }}"
data-cptid="{{ $uclient->client_group_id }}">
{{ $uclient->first_name." ($uclient->client_group_name)" }}</option>
<option value="{{ $uclient->id }}" data-uid="{{ $uclient->id }}" data-cptid="{{ $uclient->client_group_id }}">
{{ $uclient->client_group_name }}</option>
@endforeach
</select>
</div>
@ -49,34 +44,33 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
@endif
<div class="row mb-3 d-flex align-items-center">
<div class="col-12 mb-3">
<p class="text-danger text-bold mb-0">Penjemputan dan Pengantaran</p>
<p class="text-danger text-bold mb-0">Orign & Destination</p>
{{-- <small>select time, pickup and drop zone from your zone list. Can't find your zone? <a href="{{ route('view_zone') }}">Add new zone</a></small> --}}
<small>Masukkan tanggal, jam, lokasi penjemputan, dan lokasi pengantaran yang ada pada
daftar zona yang telah didaftarkan</small>
<small>Enter the date, time, origin location, and destination location from<br>the list of registered zones.</small>
</div>
<div class="col-sm-5 col-5 mb-3">
<label for="add-pickup_date" class="form-label text-nowrap">Tanggal Penjemputan</label>
<label for="add-pickup_date" class="form-label text-nowrap">Date</label>
<input type="date" name="add-pickup_date" id="add-pickup_date" class="form-control">
</div>
<div class="col-2"></div>
<div class="col-sm-5 col-5 mb-3">
<label for="add-pickup_time" class="form-label text-nowrap">Waktu Penjemputan</label>
<label for="add-pickup_time" class="form-label text-nowrap">Time</label>
{{-- <input type="time" name="add-pickup_time" id="add-pickup_time" class="form-control"
min="23:30"> --}}
<div class="row">
<div class="col-md-4 col-lg-3" style="padding:0 0 0 0.75rem;">
<select name="add-pickup_time_hour" id="add-pickup_time_hour" class="form-control">
<option value="" selected disabled hidden>--</option>
@for ($i=0; $i<24; $i++)
<option value="{{ str_pad($i, 2, '0', STR_PAD_LEFT) }}">{{ str_pad($i, 2, '0', STR_PAD_LEFT) }}</option>
@for ($i = 0; $i < 24; $i++)
<option value="{{ str_pad($i, 2, '0', STR_PAD_LEFT) }}">{{ str_pad($i, 2, '0', STR_PAD_LEFT) }}</option>
@endfor
</select>
</div>
<div class="col-md-4 col-lg-3" style="padding:0 0 0 0.75rem;">
<select name="add-pickup_time_minute" id="add-pickup_time_minute" class="form-control">
<option value="" selected disabled hidden>--</option>
@for ($i=0; $i<60; $i++)
<option value="{{ str_pad($i, 2, '0', STR_PAD_LEFT) }}">{{ str_pad($i, 2, '0', STR_PAD_LEFT) }}</option>
@for ($i = 0; $i < 60; $i++)
<option value="{{ str_pad($i, 2, '0', STR_PAD_LEFT) }}">{{ str_pad($i, 2, '0', STR_PAD_LEFT) }}</option>
@endfor
</select>
</div>
@ -85,13 +79,12 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
</div>
<div class="row mb-3 d-flex align-items-center">
<div class="col-5 mb-3">
<label for="add-pickup_zone" class="form-label">Lokasi Penjemputan</label>
<label for="add-pickup_zone" class="form-label">Origin</label>
<select name="add-pickup_zone" id="add-pickup_zone" class="select2 form-control">
<option value="" selected disabled>Belum ada lokasi yang dipilih</option>
<option value="" selected disabled>No origin location selected</option>
@if (Auth::user()->role === \App\Models\Users::ROLE_CLIENT_ADMIN)
@foreach ($pickups as $pickup)
<option value="{{ $pickup->id }}" data-id="{{ $pickup->id }}"
data-title="{{ $pickup->name }}" data-addr="{{ $pickup->fulladdress }}">
<option value="{{ $pickup->id }}" data-id="{{ $pickup->id }}" data-title="{{ $pickup->name }}" data-addr="{{ $pickup->fulladdress }}">
{{ $pickup->name }}</option>
@endforeach
@endif
@ -103,20 +96,19 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
<span class="ion-arrow-right-c text-danger" style="font-size: 15px"></span>
</div>
<div class="col-5 mb-3">
<label for="add-drop_zone" class="form-label">Lokasi Pengantaran</label>
<label for="add-drop_zone" class="form-label">Destination</label>
<select name="add-drop_zone" id="add-drop_zone" class="select2 form-control">
<option value="" selected disabled>Belum ada lokasi yang dipilih</option>
<option value="" selected disabled>No destination location selected</option>
@if (Auth::user()->role === \App\Models\Users::ROLE_CLIENT_ADMIN)
@foreach ($drops as $drop)
<option value="{{ $drop->id }}" data-id="{{ $drop->id }}"
data-title="{{ $drop->name }}" data-addr="{{ $drop->fulladdress }}">
<option value="{{ $drop->id }}" data-id="{{ $drop->id }}" data-title="{{ $drop->name }}" data-addr="{{ $drop->fulladdress }}">
{{ $drop->name }}</option>
@endforeach
@endif
</select>
</div>
</div>
<div class="row d-flex align-items-center mb-3">
<div class="row d-flex align-items-center justify-content-between">
<div class="col-12 mb-3">
<p class="text-danger text-bold mb-0">Informasi Kendaraan</p>
{{-- <small>You must fill in at least 1 of the package information.</small> --}}
@ -138,21 +130,37 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
<div class="col-5 mb-3 d-flex align-items-center">
<input type="number" name="add-koli" id="add-koli" class="form-control w-75 me-2">pcs
</div> --}}
<div class="col-5 mb-3">
{{-- <div class="col-5 mb-3">
<label for="add-truck_type" class="form-label">Jenis Kendaraan</label>
<select name="add-truck_type" id="add-truck_type" class="select2 form-control">
{{-- <option value="" data-name="Let system choose automatically" selected>Let system
choose automatically
</option> --}}
<option value="" selected disabled>Pilih kendaraan</option>
@foreach ($truck_types as $tt)
<option value="{{ $tt->type_id }}" data-id="{{ $tt->id }}" data-type_id="{{ $tt->type_id }}"
data-name="{{ $tt->type_name }}" data-weight="{{ $tt->max_kg }}"
data-cbm="{{ $tt->max_cbm }}" data-koli="{{ $tt->max_koli }}">
<option value="{{ $tt->type_id }}" data-id="{{ $tt->id }}" data-type_id="{{ $tt->type_id }}" data-name="{{ $tt->type_name }}" data-weight="{{ $tt->max_kg }}" data-cbm="{{ $tt->max_cbm }}" data-koli="{{ $tt->max_koli }}">
{{ $tt->type_name }}</option>
@endforeach
</select>
</div> --}}
<div class="col-5 mb-3">
<label for="add-truck_type" class="form-label">Select Vehicle</label>
<select name="add-truck_type" id="add-truck_type" class="select2 form-control">
<option value="" selected disabled>Select Vehicle</option>
@foreach ($vehicle as $_vehicle)
<option value="{{ $_vehicle->vid }}" data-id="{{ $_vehicle->vid }}" data-type_id="{{ $_vehicle->vid }}" data-name="{{ $_vehicle->name }}">
{{ $_vehicle->name }}</option>
@endforeach
</select>
</div>
<div class="col-5 mb-3">
<label for="add-driver" class="form-label">Driver</label>
<select name="add-driver" id="add-driver" class="select2 form-control">
<option value="" selected disabled>Select Driver</option>
@foreach ($driver as $_driver)
<option value="{{ $_driver->id }}" data-id="{{ $_driver->id }}" data-driver_id="{{ $_driver->id }}" data-name="{{ $_driver->fullname }}">
{{ $_driver->fullname }}</option>
@endforeach
</select>
</div>
</div>
{{-- <div class="row d-flex align-items-center">
<div class="col-12 mb-3">
@ -172,7 +180,7 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
</div>
</div>
</div> --}}
<div class="row d-flex align-items-center mb-3">
<div class="row d-flex align-items-center mb-3 d-none">
<div class="col-12 mb-3">
<p class="text-danger text-bold mb-0">Asuransi</p>
<small>Apakah Anda ingin menambahkan Asuransi untuk pengiriman ini?</small>
@ -198,12 +206,11 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
<div class="row d-flex align-items-center">
<div class="col-8">
<p class="mb-0">
Sudahkah Anda mengisi semua kolom yang ada?
Have you filled in all the required fields?
</p>
</div>
<div class="col-4 text-end">
<button class="btn btn-warning btn-block btn-sm" id="btnCalculate">Kalkulasi
Sekarang</button>
<button class="btn btn-warning btn-block btn-sm" id="btnCalculate">&nbsp;&nbsp;&nbsp;&nbsp;Next&nbsp;&nbsp;&nbsp;&nbsp;</button>
</div>
</div>
</div>
@ -211,6 +218,7 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
</div>
{{-- Checkout --}}
<div class="col-sm-6 d-none" id="checkOutView">
{{-- <div class="col-sm-6"> --}}
<div class="card">
<div class="card-header">
<div class="row d-flex align-items-center">
@ -231,10 +239,10 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
<div class="card-body pb-0 checkoutBody">
<div class="row d-flex align-items-center">
<div class="col-12 mb-3">
<p class="text-danger text-bold mb-0">Penjemputan dan Pengantaran</p>
<p class="text-danger text-bold mb-0">Orign & Destination</p>
</div>
<div class="col-sm-5 mb-3">
<label for="" class="form-label">Tanggal Penjemputan</label>
<label for="" class="form-label">Date</label>
<div class="card bg-light border mb-0">
<div class="card-body">
<p id="checkout-pickup_at" class="mb-0">Feb 22, 2022 23:59:00</p>
@ -243,17 +251,18 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
</div>
<div class="col-sm-2"></div>
<div class="col-sm-5 mb-3">
<label for="" class="form-label">Jenis Kendaraan</label>
<label for="" class="form-label">Vehicle</label>
<div class="card bg-light border mb-0">
<div class="card-body">
<p id="checkout-truck_type" class="mb-0">CDD Long</p>
<p id="checkout-driver" class="mb-0">CDD Long</p>
</div>
</div>
</div>
</div>
<div class="row d-flex align-items-center">
<div class="col-5 mb-3">
<label for="" class="form-label">Lokasi Penjemputan</label>
<label for="" class="form-label">Origin</label>
<div class="card bg-light border mb-0">
<div class="card-body">
<p id="checkout-pickup_zone_title" class="text-bold mb-2">Gudang Pluit SiCepat
@ -270,7 +279,7 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
<span class="ion-arrow-right-c text-danger" style="font-size: 15px"></span>
</div>
<div class="col-5 mb-3">
<label for="" class="form-label">Lokasi Pengantaran</label>
<label for="" class="form-label">Destination</label>
<div class="card bg-light border mb-0">
<div class="card-body">
<p id="checkout-drop_zone_title" class="text-bold mb-2">Kantor Pusat SiCepat
@ -318,12 +327,12 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
</div>
</div>
</div> --}}
<div class="row">
<div class="row d-none">
<div class="col-12">
<hr>
</div>
</div>
<div class="row d-flex align-items-center">
<div class="row d-flex align-items-center d-none">
<div class="col-12 mb-3 mt-3">
<p class="text-danger text-bold mb-0">Pilih Layanan</p>
<small>Berikut layanan yang tersedia untuk pesanan Anda</small>
@ -378,11 +387,7 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
<div class="row mb-3 d-flex align-items-center">
<div class="col-6">
<div class="form-check">
<input class="form-check-input" type="radio" name="chooseFleet"
data-lead_time_id="${opt.lead_time_id}"
data-lead_time="${opt.lead_time}" data-price="${opt.price}"
data-real_price="${opt.real_price}"
data-disc_price="${opt.disc_price}">
<input class="form-check-input" type="radio" name="chooseFleet" data-lead_time_id="${opt.lead_time_id}" data-lead_time="${opt.lead_time}" data-price="${opt.price}" data-real_price="${opt.real_price}" data-disc_price="${opt.disc_price}">
<label class="form-check-label text-success">
1 Hari <span class="badge bg-success ms-2">Best services</span>
</label>
@ -397,11 +402,7 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
<div class="row mb-3 d-flex align-items-center">
<div class="col-6">
<div class="form-check">
<input class="form-check-input" type="radio" name="chooseFleet"
data-lead_time_id="${opt.lead_time_id}"
data-lead_time="${opt.lead_time}" data-price="${opt.price}"
data-real_price="${opt.real_price}"
data-disc_price="${opt.disc_price}">
<input class="form-check-input" type="radio" name="chooseFleet" data-lead_time_id="${opt.lead_time_id}" data-lead_time="${opt.lead_time}" data-price="${opt.price}" data-real_price="${opt.real_price}" data-disc_price="${opt.disc_price}">
<label class="form-check-label text-dark">
2 Hari
</label>
@ -427,15 +428,13 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
<div class="card-footer checkoutBody">
<div class="row d-flex align-items-center">
<div class="col-8">
<p class="text-danger mb-0">Harga layanan yang tercantum adalah harga perkiraan, bukan
harga Final.</p>
<p class="mb-0">
Sudahkah Anda memeriksa ulang informasi pesanan?
Have you reviewed the job information?
</p>
</div>
<div class="col-4 text-end">
<button class="btn btn-danger btn-block btn-sm" id="btnOrder" {{-- onclick="location.href='{{ route('view_user_client_transaction') }}'" --}}
disabled>Pesan Sekarang</button>
{{-- <button class="btn btn-danger btn-block btn-sm" id="btnOrder" disabled>Pesan Sekarang</button> --}}
<button class="btn btn-danger btn-block btn-sm" id="btnOrder">Submit</button>
<div id="btnOrderSpinner" class="d-none">
<div class="spinner-border" role="status">
<span class="visually-hidden">Loading...</span>
@ -452,9 +451,7 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
@endsection
@section('customjs')
<script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.2/xlsx.full.min.js"
integrity="sha512-oCjkwxjURabnte5K4Zeoc+hZ/G5pQE7GI4DYl+0wl6WaJIkBjb9FvUIaMU3lOPoBMSRZZ7QrczpGQoBFAKKB1Q=="
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.2/xlsx.full.min.js" integrity="sha512-oCjkwxjURabnte5K4Zeoc+hZ/G5pQE7GI4DYl+0wl6WaJIkBjb9FvUIaMU3lOPoBMSRZZ7QrczpGQoBFAKKB1Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script>
$("#insuranceCheck").change(function() {
$("#insurancePrice").toggleClass("d-none")
@ -464,6 +461,12 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
$("#insuranceInput").prop('required', true);
}
})
$(document).ready(function() {
setTimeout(function() {
$('select[name=add-client]').val('1').change();
}, 100);
});
</script>
<script>
'use strict';
@ -495,14 +498,13 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
TrxNew.activate();
},
event: function() {
$('#checkout-group_pricing').on('click', 'input[name=chooseFleet]', function() {
$('#btnOrder').prop("disabled", false);
});
// $('#checkout-group_pricing').on('click', 'input[name=chooseFleet]', function() {
// $('#btnOrder').prop("disabled", false);
// });
// min date is today
let TimeISOString = moment().toISOString().split('T');
let time = TimeISOString[1].split('.')[0].split(':');
$('#add-pickup_date').attr('min', TimeISOString[0]);
// $('#add-pickup_time').attr('min', time[0] + ':' + time[1]);
},
};
@ -745,8 +747,8 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
TrxNew.hideCheckout();
let selected = $('#add-client :selected');
$('#add-pickup_zone').html('<option value="" selected disabled>Belum ada lokasi yang dipilih</option>');
$('#add-drop_zone').html('<option value="" selected disabled>Belum ada lokasi yang dipilih</option>');
$('#add-pickup_zone').html('<option value="" selected disabled>No location has been selected.</option>');
$('#add-drop_zone').html('<option value="" selected disabled>No location has been selected.</option>');
const listPickupZones = await Req.list_client_zone({
cptid: selected.data('cptid'),
@ -844,8 +846,12 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
// data.koli = Number($('#add-koli').val() || 'n');
let truck_type = $('#add-truck_type :selected');
data.truck_type_id = truck_type.data('type_id');
data.truck_type_name = truck_type.data('name')?.trim();
data.vehicle_id = truck_type.data('type_id');
data.vehicle_name = truck_type.data('name')?.trim();
let driver = $('#add-driver :selected');
data.driver_id = driver.data('driver_id');
data.driver_name = driver.data('name')?.trim();
// data.truck_type_weight = truck_type.data('weight');
// data.truck_type_cbm = truck_type.data('cbm');
// data.truck_type_koli = truck_type.data('koli');
@ -872,25 +878,26 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
},
checkData: function(data, isAlert = false) {
if (data.pickup_at < 1 || isNaN(data.pickup_at)) {
if (isAlert) Helper.toast('Warning', 'just now', 'Pickup date / time not valid');
if (isAlert) Helper.toast('Warning', 'just now', 'Date / time not valid');
return false;
}
if (data.pickup_at < moment().unix()) {
if (isAlert) Helper.toast('Warning', 'just now',
'Pickup date / time is less than the current date / time');
'Date / time is less than the current date / time');
return false;
}
if (data.pickup_at < moment().add(3, 'hours').unix()) {
// if (data.pickup_at < moment().add(3, 'hours').unix()) {
if (data.pickup_at < moment().add(5, 'minutes').unix()) {
if (isAlert) Helper.toast('Warning', 'just now',
'Pickup time minimum 3 hours from now');
'The selected time is too soon. Minimum is 5 minutes from now.');
return false;
}
if (typeof data.pickup_zone_id == 'undefined') {
if (isAlert) Helper.toast('Warning', 'just now', 'Pickup zone not valid');
if (isAlert) Helper.toast('Warning', 'just now', 'Origin zone not valid');
return false;
}
if (typeof data.drop_zone_id == 'undefined') {
if (isAlert) Helper.toast('Warning', 'just now', 'Drop zone not valid');
if (isAlert) Helper.toast('Warning', 'just now', 'Destination zone not valid');
return false;
}
@ -900,23 +907,23 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
// 'weight / volume / koli must be provided at least 1 of them');
// return false;
// }
// if (typeof data.truck_type_id != 'undefined') {
// if (typeof data.vehicle_id != 'undefined') {
// if (!isNaN(data.weight) && data.truck_type_weight != 0 && data.weight > data
// .truck_type_weight) {
// if (isAlert) Helper.toast('Warning', 'just now',
// `maximum weight for type truck ${data.truck_type_name} is ${data.truck_type_weight} Kg`
// `maximum weight for type truck ${data.vehicle_name} is ${data.truck_type_weight} Kg`
// );
// return false;
// }
// if (!isNaN(data.cbm) && data.truck_type_cbm != 0 && data.cbm > data.truck_type_cbm) {
// if (isAlert) Helper.toast('Warning', 'just now',
// `maximum volume for type truck ${data.truck_type_name} is ${data.truck_type_cbm} m³`
// `maximum volume for type truck ${data.vehicle_name} is ${data.truck_type_cbm} m³`
// );
// return false;
// }
// if (!isNaN(data.koli) && data.truck_type_koli != 0 && data.koli > data.truck_type_koli) {
// if (isAlert) Helper.toast('Warning', 'just now',
// `maximum koli for type truck ${data.truck_type_name} is ${data.truck_type_koli} Pcs`
// `maximum koli for type truck ${data.vehicle_name} is ${data.truck_type_koli} Pcs`
// );
// return false;
// }
@ -959,39 +966,39 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
// $('#checkout-unit').html('');
// if (!isNaN(data.weight)) {
// $('#checkout-unit').append(`
// <div class="col-sm-4 mb-0 d-flex align-items-center">
// <label for="" class="form-label">Berat</label>
// <div class="card bg-light border mb-0 w-100">
// <div class="card-body">
// <p class="mb-0">${data.weight} Kg</p>
// </div>
// </div>
// </div>
// `);
// <div class="col-sm-4 mb-0 d-flex align-items-center">
// <label for="" class="form-label">Berat</label>
// <div class="card bg-light border mb-0 w-100">
// <div class="card-body">
// <p class="mb-0">${data.weight} Kg</p>
// </div>
// </div>
// </div>
// `);
// }
// if (!isNaN(data.cbm)) {
// $('#checkout-unit').append(`
// <div class="col-sm-4 mb-0 d-flex align-items-center">
// <label for="" class="form-label">Volume</label>
// <div class="card bg-light border mb-0 w-100">
// <div class="card-body">
// <p class="mb-0">${data.cbm} m&sup3;</p>
// </div>
// </div>
// </div>
// `);
// <div class="col-sm-4 mb-0 d-flex align-items-center">
// <label for="" class="form-label">Volume</label>
// <div class="card bg-light border mb-0 w-100">
// <div class="card-body">
// <p class="mb-0">${data.cbm} m&sup3;</p>
// </div>
// </div>
// </div>
// `);
// }
// if (!isNaN(data.koli)) {
// $('#checkout-unit').append(`
// <div class="col-sm-4 mb-0 d-flex align-items-center">
// <label for="" class="form-label">Koli</label>
// <div class="card bg-light border mb-0 w-100">
// <div class="card-body">
// <p class="mb-0">${data.koli} Pcs</p>
// </div>
// </div>
// </div>
// `);
// <div class="col-sm-4 mb-0 d-flex align-items-center">
// <label for="" class="form-label">Koli</label>
// <div class="card bg-light border mb-0 w-100">
// <div class="card-body">
// <p class="mb-0">${data.koli} Pcs</p>
// </div>
// </div>
// </div>
// `);
// }
// // end packing list data
@ -1048,7 +1055,9 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
`);
}
$('#checkout-truck_type').text(data.truck_type_name);
$('#checkout-truck_type').text(data.vehicle_name);
console.log("driver:", data.driver_name);
$('#checkout-driver').text(data.driver_name);
$('#checkOutView').removeClass('d-none');
$('#checkOutView').addClass('d-block');
@ -1056,7 +1065,7 @@ if (Auth::user()->role === \App\Models\Users::ROLE_ADMIN) {
hideCheckout: function() {
$('#checkOutView').addClass('d-none');
$('#checkOutView').removeClass('d-block');
$('#btnOrder').attr('disabled', true);
$('#btnOrder').attr('disabled', false);
},
downloadTemplatePackingList: function() {
const fileName = 'template_packing_list.xlsx';

View File

@ -7,14 +7,14 @@
<div class="container-fluid">
<div class="content">
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-header">
<p class="card-title text-bold mb-0">Riwayat Transfer Uang Saku</p>
<p class="card-subtitle text-muted">Daftar Transfer</p>
</div>
<div class="card-body">
<div class="table-responsive">
<div class="col-12">
<div class="card">
<div class="card-header">
<p class="card-title text-bold mb-0">Riwayat Transfer Uang Saku</p>
<p class="card-subtitle text-muted">Daftar Transfer</p>
</div>
<div class="card-body">
<div class="table-responsive">
<table id="tTable" class="table table-hover dataTable w-100">
<thead>
<tr class="">
@ -46,7 +46,7 @@
<p class="mb-0">BCA (014)</p>
<p class="mb-0">Bank Central Asia</p>
</td>
<td class="text-start">Rafif</td>
<td class="text-start">Emrsyf</td>
<td class="text-center">0101010100101</td>
<td class="text-center">2.500.000</td>
<td class="text-center"><span class="text-danger">Fail</span></td>
@ -55,16 +55,15 @@
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{{-- modal resend pocket money tf --}}
<div class="modal fade" id="mdlResendPocket" data-bs-backdrop="static" data-bs-keyboard="false"
aria-labelledby="mdlResendPocketLabel" aria-hidden="true">
<div class="modal fade" id="mdlResendPocket" data-bs-backdrop="static" data-bs-keyboard="false" aria-labelledby="mdlResendPocketLabel" aria-hidden="true">
<div class="modal-dialog modal-md modal-dialog-centered modal-dialog-scrollable">
<div class="modal-content">
<div class="modal-header">
@ -103,299 +102,299 @@
@endsection
@section('customjs')
<script>
'use strict'
<script>
'use strict'
const State = {
stts: {
unpaid: "{{ \App\Models\OrdersLogsTf::STTS_UNPAID }}",
paid: "{{ \App\Models\OrdersLogsTf::STTS_PAID }}",
fail: "{{ \App\Models\OrdersLogsTf::STTS_FAIL }}",
pending: "{{ \App\Models\OrdersLogsTf::STTS_PENDING }}",
},
checkpoint_paid: {
unpaid: "{{ \App\Models\OrdersCheckpoints::IS_UNPAID }}",
paid: "{{ \App\Models\OrdersCheckpoints::IS_PAID }}",
fail: "{{ \App\Models\OrdersCheckpoints::IS_TF_FAIL }}",
},
delay_type_number: 1000,
storage_lara: "{{ asset('storage') }}/",
file_jimp_worker: "{{ asset('assets/js/worker/jimp.js') }}",
};
const State = {
stts: {
unpaid: "{{ \App\Models\OrdersLogsTf::STTS_UNPAID }}",
paid: "{{ \App\Models\OrdersLogsTf::STTS_PAID }}",
fail: "{{ \App\Models\OrdersLogsTf::STTS_FAIL }}",
pending: "{{ \App\Models\OrdersLogsTf::STTS_PENDING }}",
},
checkpoint_paid: {
unpaid: "{{ \App\Models\OrdersCheckpoints::IS_UNPAID }}",
paid: "{{ \App\Models\OrdersCheckpoints::IS_PAID }}",
fail: "{{ \App\Models\OrdersCheckpoints::IS_TF_FAIL }}",
},
delay_type_number: 1000,
storage_lara: "{{ asset('storage') }}/",
file_jimp_worker: "{{ asset('assets/js/worker/jimp.js') }}",
};
const Wrapper = {
activate: function() {
DTable.activate();
ResendPocket.activate();
},
};
const Wrapper = {
activate: function() {
DTable.activate();
ResendPocket.activate();
},
};
const DTable = {
activate: function() {
DTable.reload();
},
reload: function() {
// $('#tTable').DataTable();
// if (Driver.Table.firstInitDataTable == 1) { loadTableSkeletonLoading() } else { Driver.Table.firstInitDataTable = 1; }
$('#tTable').DataTable({
processing: true,
serverSide: false,
bLengthChange: true,
deferRender: true,
destroy: true,
// fixedColumns: {
// left: 3,
// },
ajax: {
url: "{{ route('api_finance_list_pocket_tf_history') }}",
type: 'GET',
complete: function() {
// removeTableSkeletonLoading()
const DTable = {
activate: function() {
DTable.reload();
},
reload: function() {
// $('#tTable').DataTable();
// if (Driver.Table.firstInitDataTable == 1) { loadTableSkeletonLoading() } else { Driver.Table.firstInitDataTable = 1; }
$('#tTable').DataTable({
processing: true,
serverSide: false,
bLengthChange: true,
deferRender: true,
destroy: true,
// fixedColumns: {
// left: 3,
// },
ajax: {
url: "{{ route('api_finance_list_pocket_tf_history') }}",
type: 'GET',
complete: function() {
// 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 = '';
if (row.pocket_is_paid == State.checkpoint_paid.fail) {
action += `
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 = '';
if (row.pocket_is_paid == State.checkpoint_paid.fail) {
action += `
<a href="#" class="btnResendPocket text-decoration-none me-1" data-bs-toggle="tooltip" data-bs-placement="top" title="Kirim Ulang">
<span class="icon ion-refresh text-danger fz-16"></span>
</a>
`;
}
// <a href="#" class="text-decoration-none text-danger btnDelDrv">
// <span class="icon ion-trash-b fz-16"></span>
// </a>
return action;
}
// <a href="#" class="text-decoration-none text-danger btnDelDrv">
// <span class="icon ion-trash-b fz-16"></span>
// </a>
return action;
}
},
{
data: 'ord_code',
className: 'text-nowrap',
visible: true,
orderable: true,
searchable: true,
createdCell: function(td, cellData, rowData, row, col) {
// $(td).attr('data-id', rowData.id);
$(td).attr('data-ord_id', rowData.ord_id);
$(td).attr('data-ord_code', rowData.ord_code);
$(td).attr('data-checkpoint_id', rowData.ord_checkpoint_id);
},
render: function(data, type, row, meta) {
return '#'+data;
{
data: 'ord_code',
className: 'text-nowrap',
visible: true,
orderable: true,
searchable: true,
createdCell: function(td, cellData, rowData, row, col) {
// $(td).attr('data-id', rowData.id);
$(td).attr('data-ord_id', rowData.ord_id);
$(td).attr('data-ord_code', rowData.ord_code);
$(td).attr('data-checkpoint_id', rowData.ord_checkpoint_id);
},
render: function(data, type, row, meta) {
return '#' + data;
},
},
},
// {
// data: 'ref_code',
// className: 'text-nowrap',
// visible: true,
// orderable: true,
// searchable: true,
// render: function(data, type, row, meta) {
// return '#'+data;
// },
// },
{
data: 'pck_name',
className: 'text-start',
visible: true,
orderable: true,
searchable: true,
},
{
data: 'bank_id',
className: 'text-start text-nowrap',
visible: true,
orderable: true,
searchable: true,
render: function(data, type, row, meta) {
return `
// {
// data: 'ref_code',
// className: 'text-nowrap',
// visible: true,
// orderable: true,
// searchable: true,
// render: function(data, type, row, meta) {
// return '#'+data;
// },
// },
{
data: 'pck_name',
className: 'text-start',
visible: true,
orderable: true,
searchable: true,
},
{
data: 'bank_id',
className: 'text-start text-nowrap',
visible: true,
orderable: true,
searchable: true,
render: function(data, type, row, meta) {
return `
<p class="mb-0">${row.bank_short_name} (${row.bank_code})</p>
<p class="mb-0">${row.bank_name}</p>
`;
},
},
{
data: 'bank_acc_name',
className: 'text-nowrap',
visible: true,
orderable: true,
searchable: true,
},
{
data: 'bank_acc_number',
className: 'text-center',
visible: true,
orderable: true,
searchable: true,
},
},
{
data: 'bank_acc_name',
className: 'text-nowrap',
visible: true,
orderable: true,
searchable: true,
},
{
data: 'bank_acc_number',
className: 'text-center',
visible: true,
orderable: true,
searchable: true,
},
{
data: 'pocket_total',
className: 'text-nowrap',
visible: true,
orderable: true,
searchable: true,
render: function(data, type, row, meta) {
return (new Intl.NumberFormat('id-ID')).format(data);
{
data: 'pocket_total',
className: 'text-nowrap',
visible: true,
orderable: true,
searchable: true,
render: function(data, type, row, meta) {
return (new Intl.NumberFormat('id-ID')).format(data);
},
},
},
// {
// data: 'stts', // log.stts
// className: 'text-center',
// visible: true,
// orderable: true,
// searchable: true,
// render: function(data, type, row, meta) {
// if (data == State.stts.unpaid) {
// return '<span class="text-dark">Unpaid</span>';
// } else if (data == State.stts.paid) {
// return '<span class="text-success">Success</span>';
// } else if (data == State.stts.fail) {
// return '<span class="text-danger">Fail</span>';
// } else if (data == State.stts.pending) {
// return '<span class="text-warning">Pending</span>';
// }
// return '<span class="text-danger">Fail</span>';
// },
// },
{
data: 'pocket_is_paid', // checkpoint.is_paid
className: 'text-center',
visible: true,
orderable: true,
searchable: true,
render: function(data, type, row, meta) {
if (data == State.checkpoint_paid.unpaid) {
return '<span class="text-dark">Unpaid</span>';
} else if (data == State.checkpoint_paid.paid) {
return '<span class="text-success">Success</span>';
} else if (data == State.checkpoint_paid.fail) {
// {
// data: 'stts', // log.stts
// className: 'text-center',
// visible: true,
// orderable: true,
// searchable: true,
// render: function(data, type, row, meta) {
// if (data == State.stts.unpaid) {
// return '<span class="text-dark">Unpaid</span>';
// } else if (data == State.stts.paid) {
// return '<span class="text-success">Success</span>';
// } else if (data == State.stts.fail) {
// return '<span class="text-danger">Fail</span>';
// } else if (data == State.stts.pending) {
// return '<span class="text-warning">Pending</span>';
// }
// return '<span class="text-danger">Fail</span>';
// },
// },
{
data: 'pocket_is_paid', // checkpoint.is_paid
className: 'text-center',
visible: true,
orderable: true,
searchable: true,
render: function(data, type, row, meta) {
if (data == State.checkpoint_paid.unpaid) {
return '<span class="text-dark">Unpaid</span>';
} else if (data == State.checkpoint_paid.paid) {
return '<span class="text-success">Success</span>';
} else if (data == State.checkpoint_paid.fail) {
return '<span class="text-danger">Fail</span>';
} else if (data == State.checkpoint_paid.pending) {
return '<span class="text-warning">Pending</span>';
}
return '<span class="text-danger">Fail</span>';
} else if (data == State.checkpoint_paid.pending) {
return '<span class="text-warning">Pending</span>';
}
return '<span class="text-danger">Fail</span>';
},
},
},
{
data: 'tf_note',
className: 'text-start',
visible: true,
orderable: true,
searchable: true,
},
],
});
},
};
{
data: 'tf_note',
className: 'text-start',
visible: true,
orderable: true,
searchable: true,
},
],
});
},
};
const ResendPocket = {
activate: function () {
$('#tTable').on('click', '.btnResendPocket', async function(e) {
let checkpoint_id = $(e.target).closest('tr').find('td[data-checkpoint_id]').data('checkpoint_id');
console.log(checkpoint_id);
// let resp = await ResendPocket.reqData({
// checkpoint_id
// });
// if (resp.type != 'success') {
// Helper.toast('Riwayat tidak ditemukan', 'just now', 'please try again');
// return false;
// }
// ResendPocket.passDataToView(resp.data);
$('#mdlResendPocket').data('checkoint_id', checkpoint_id);
$('#mdlResendPocket').modal('show');
});
const ResendPocket = {
activate: function() {
$('#tTable').on('click', '.btnResendPocket', async function(e) {
let checkpoint_id = $(e.target).closest('tr').find('td[data-checkpoint_id]').data('checkpoint_id');
console.log(checkpoint_id);
// let resp = await ResendPocket.reqData({
// checkpoint_id
// });
// if (resp.type != 'success') {
// Helper.toast('Riwayat tidak ditemukan', 'just now', 'please try again');
// return false;
// }
// ResendPocket.passDataToView(resp.data);
$('#mdlResendPocket').data('checkoint_id', checkpoint_id);
$('#mdlResendPocket').modal('show');
});
$('#btnSubmitResendPocket').on('click', async function() {
let data = ResendPocket.getData();
let isValid = ResendPocket.checkData(data, true);
if (!isValid) return false;
let submitItems = await ResendPocket.submitResendPocket(data);
});
},
getData: function() {
let data = {};
$('#btnSubmitResendPocket').on('click', async function() {
let data = ResendPocket.getData();
let isValid = ResendPocket.checkData(data, true);
if (!isValid) return false;
let submitItems = await ResendPocket.submitResendPocket(data);
});
},
getData: function() {
let data = {};
data.ord_checkpoint_id = $('#mdlResendPocket').data('checkoint_id');
data.ord_checkpoint_id = $('#mdlResendPocket').data('checkoint_id');
return data;
},
checkData: function(data, isAlert = false) {
if (!data.ord_checkpoint_id) {
if (isAlert) Helper.toast('Warning', 'just now', 'Riwayat transfer tidak valid');
return false;
}
return true;
},
submitResendPocket: async function(data) {
return new Promise((resolve, reject) => {
if (typeof $('#btnSubmitResendPocket').attr('disabed') != 'undefined') {
resolve({
type: 'fail'
});
return data;
},
checkData: function(data, isAlert = false) {
if (!data.ord_checkpoint_id) {
if (isAlert) Helper.toast('Warning', 'just now', 'Riwayat transfer tidak valid');
return false;
}
$('#btnSubmitResendPocket').attr('disabed', true);
$('#btnSubmitResendPocketSpinner').removeClass('d-none');
$.ajax({
url: "{{ route('api_finance_resend_pocket') }}",
method: 'POST',
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) => {
$('#btnSubmitResendPocket').removeAttr('disabed');
$('#btnSubmitResendPocketSpinner').addClass('d-none');
if (data.meta.type != 'success') {
resolve({
type: 'fail'
});
Helper.toast('Warning', 'just now', data.meta.message);
return false;
}
Helper.toast('Success', 'just now', 'success transfer ulang');
$('#mdlResendPocket').modal('hide');
DTable.reload();
return true;
},
submitResendPocket: async function(data) {
return new Promise((resolve, reject) => {
if (typeof $('#btnSubmitResendPocket').attr('disabed') != 'undefined') {
resolve({
type: 'success'
});
},
error: (jqXHR, textStatus, error) => {
$('#btnSubmitResendPocket').removeAttr('disabed');
$('#btnSubmitResendPocketSpinner').addClass('d-none');
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'
type: 'fail'
});
return false;
}
})
});
},
}
$('#btnSubmitResendPocket').attr('disabed', true);
$('#btnSubmitResendPocketSpinner').removeClass('d-none');
$.ajax({
url: "{{ route('api_finance_resend_pocket') }}",
method: 'POST',
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) => {
$('#btnSubmitResendPocket').removeAttr('disabed');
$('#btnSubmitResendPocketSpinner').addClass('d-none');
if (data.meta.type != 'success') {
resolve({
type: 'fail'
});
Helper.toast('Warning', 'just now', data.meta.message);
return false;
}
Helper.toast('Success', 'just now', 'success transfer ulang');
$('#mdlResendPocket').modal('hide');
DTable.reload();
resolve({
type: 'success'
});
},
error: (jqXHR, textStatus, error) => {
$('#btnSubmitResendPocket').removeAttr('disabed');
$('#btnSubmitResendPocketSpinner').addClass('d-none');
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'
});
}
})
});
},
}
Wrapper.activate();
</script>
@endsection
Wrapper.activate();
</script>
@endsection

View File

@ -18,26 +18,26 @@
@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)
<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') }}">
Beranda
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') }}">
Transaksi
Transaction
</a>
</li> --}}
<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') }}">
Transaksi
Transaction
</a>
</li>
@endif
@if ($user_role === \App\Models\Users::ROLE_VENDOR)
<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') }}">
Zona
Zone
</a>
</li>
@endif
@ -52,27 +52,22 @@
@if ($user_role === \App\Models\Users::ROLE_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') }}">
Transaksi
Job
</a>
</li>
<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') }}">
Perusahaan
Company
</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') }}">
Zona
</a>
</li>
<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') }}">
Pengguna
Zone
</a>
</li>
<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">
Konfigurasi
Configuration
</a>
<ul class="dropdown-menu" style="right: 0; left: auto;" aria-labelledby="dropdownConfig">
{{-- <li>
@ -114,15 +109,20 @@
{{-- @if ($user_role === \App\Models\Users::ROLE_ADMIN) --}}
<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') }}">
Pengemudi
Driver
</a>
</li>
<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') }}">
Kendaraan
Vehicle
</a>
</li>
@endif
<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>
{{-- only admin and client --}}
{{-- @if ($user_role === \App\Models\Users::ROLE_ADMIN || $user_role === \App\Models\Users::ROLE_CLIENT_ADMIN)
@ -137,7 +137,7 @@
@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') }}">
Transaksi
Transaction
</a>
</li>
{{-- <li class="nav-item {{ Request::segment(1) == 'zone' ? 'active' : '' }}">
@ -167,7 +167,7 @@
@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="#">
Beranda
Dashboard
</a>
</li>
<li class="nav-item {{ Request::segment(3) == 'ledgerBalanceList' ? 'active' : '' }}">
@ -237,22 +237,10 @@
<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">Perusahaan</span>
{{-- <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 Perusahaan</option>
</select>
</div>
{{-- <div class="col-2 d-flex align-items-center">
<span class="me-2">Divisi</span>
<select name="" class="select2 form-control" id="">
<option value="">Semua Divisi</option>
</select>
</div>
<div class="col-2 d-flex align-items-center">
<span class="me-2">Grup</span>
<select name="" class="select2 form-control" id="">
<option value="">Semua Grup</option>
<option value="all">Semua Company</option>
</select>
</div> --}}
</div>