diff --git a/app/Http/Controllers/VehiclesController.php b/app/Http/Controllers/VehiclesController.php
index b6509a5..0afc82f 100755
--- a/app/Http/Controllers/VehiclesController.php
+++ b/app/Http/Controllers/VehiclesController.php
@@ -73,7 +73,7 @@ class VehiclesController extends Controller
}
$list = DB::select("SELECT
v.id, v.name, v.device_id, nopol1, nopol2, nopol3, v.sum_milleage,
- fvhc_img, vyear, t.`desc` type_name, c_name company_name, crt_d,
+ fvhc_img, vyear, t.`desc` type_name, c_name company_name, rltm.crt_d, rltm.crt,
dvc.crt, dvc.simcard
FROM t_vehicles as v
INNER JOIN t_vehicles_detail AS vd ON v.id = vd.vid
diff --git a/resources/views/menu_v1/vehicles.blade.php b/resources/views/menu_v1/vehicles.blade.php
index 53365e2..67193b0 100755
--- a/resources/views/menu_v1/vehicles.blade.php
+++ b/resources/views/menu_v1/vehicles.blade.php
@@ -715,14 +715,14 @@
searchable: true,
},
{
- data: 'action',
+ data: 'id',
className: 'text-center',
visible: true,
orderable: true,
searchable: true,
render: function(data, type, row, meta) {
let action = `
-
+
`;
@@ -823,7 +823,7 @@
},
},
{
- data: 'crt_d',
+ data: 'crt',
className: 'text-end text-nowrap',
visible: true,
orderable: true,
@@ -1228,7 +1228,8 @@
event: function() {
// modal
$('#tVehicles').on('click', '.btnEdtVhc', async function(e) {
- let vid = $(e.target).closest('tr').find('td[data-vid]').data('vid');
+ // let vid = $(e.target).closest('tr').find('td[data-vid]').data('vid');
+ const vid = $(this).data('vid');
VEdt.removeOptionDevice(State.dvc_type.portable);
let resp = await VEdt.reqData({
vid