update
This commit is contained in:
@ -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',
|
||||
|
||||
@ -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"> </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>
|
||||
|
||||
@ -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> --}}
|
||||
|
||||
@ -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>
|
||||
@ -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');
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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',
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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>
|
||||
|
||||
Reference in New Issue
Block a user