diff --git a/app/Http/Controllers/VehiclesController.php b/app/Http/Controllers/VehiclesController.php index 3d84c9d..b6509a5 100755 --- a/app/Http/Controllers/VehiclesController.php +++ b/app/Http/Controllers/VehiclesController.php @@ -73,7 +73,8 @@ 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, dvc.crt + fvhc_img, vyear, t.`desc` type_name, c_name company_name, crt_d, + dvc.crt, dvc.simcard FROM t_vehicles as v INNER JOIN t_vehicles_detail AS vd ON v.id = vd.vid LEFT JOIN t_vehicles_types AS t ON v.type_id = t.id diff --git a/resources/views/menu_v1/vehicles.blade.php b/resources/views/menu_v1/vehicles.blade.php index 35d9257..53365e2 100755 --- a/resources/views/menu_v1/vehicles.blade.php +++ b/resources/views/menu_v1/vehicles.blade.php @@ -50,6 +50,7 @@ Service Start @if ($user_role != \App\Models\Users::ROLE_VENDOR) Device ID + SIM Card Last Update @endif Type @@ -809,6 +810,17 @@ return Helper.splitEvery4Char(data); // return `${data}` + Helper.splitEvery4Char(`${data}`); }, + }, + { + data: 'simcard', + className: 'text-end text-nowrap', + visible: true, + orderable: true, + searchable: true, + render: function(data, type, row, meta) { + return Helper.splitEvery4Char(data); + // return `${data}` + Helper.splitEvery4Char(`${data}`); + }, }, { data: 'crt_d', @@ -817,7 +829,7 @@ orderable: true, searchable: true, render: function(data, type, row, meta) { - return moment.unix(data).format('DD MMM YYYY'); + return data ? moment.unix(data).format('DD MMM YYYY HH:mm') : '-'; }, }, @endif @@ -1028,6 +1040,7 @@ // return data || 'All Group'; // } // }, + { data: 'device_id', visible: false}, ], buttons: [ {