diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index e69330f..62137b2 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -23,7 +23,7 @@ class ReportsController extends Controller public function view_report_vehicle_trips(Request $req) { $q = "SELECT id, nopol1 from t_vehicles WHERE dlt is null order by nopol1"; - $vehicletype = DB::table('t_vehicles_types')->where('is_active', 1)->get(); + $vehicletype = DB::table('t_vehicles_cats')->where('is_active', 1)->get(); $listNopol = DB::select($q); $data = [ @@ -156,7 +156,7 @@ class ReportsController extends Controller FROM trips t JOIN TotalMileage tm ON t.id = tm.id LEFT JOIN t_vehicles tvt ON tvt.id = t.vhc_id - LEFT JOIN t_vehicles_types vt ON vt.id = tvt.type_id + LEFT JOIN t_vehicles_cats vt ON vt.id = tvt.cat_id WHERE t.start BETWEEN ? AND ? and if(? , t.id = ? , 1=1) diff --git a/resources/views/menu_v1/reports/vehicle_trips.blade.php b/resources/views/menu_v1/reports/vehicle_trips.blade.php index e565311..0e0124b 100644 --- a/resources/views/menu_v1/reports/vehicle_trips.blade.php +++ b/resources/views/menu_v1/reports/vehicle_trips.blade.php @@ -107,7 +107,7 @@ Finish (km) Distance (km) Fuel (L) - Vehicle Type + Vehicle Category Detail