diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 62137b2..540a846 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -25,10 +25,12 @@ class ReportsController extends Controller
$q = "SELECT id, nopol1 from t_vehicles WHERE dlt is null order by nopol1";
$vehicletype = DB::table('t_vehicles_cats')->where('is_active', 1)->get();
$listNopol = DB::select($q);
+ $listpool = DB::table('t_conf_pools')->where('is_active')->get();
$data = [
'listNopol' => $listNopol,
- 'vehicletype' => $vehicletype
+ 'vehicletype' => $vehicletype,
+ 'listpool' => $listpool
];
$log = [
@@ -63,6 +65,7 @@ class ReportsController extends Controller
$to_date = $req->input('to_date') - Helper::TIMEFIX;
$vid = $req->input('vid');
$vt = $req->input('vt');
+ $poolcode = $req->input('poolcode');
// $from_date = 1756054800;
// $to_date = 1756745940;
@@ -161,7 +164,8 @@ class ReportsController extends Controller
t.start BETWEEN ? AND ?
and if(? , t.id = ? , 1=1)
and if(? , vt.id = ? , 1=1)
- ", [$from_date, $to_date, $from_date, $to_date, $vid, $vid, $vt, $vt]);
+ and if(? , t.pool_code = ? , 1=1)
+ ", [$from_date, $to_date, $from_date, $to_date, $vid, $vid, $vt, $vt, $poolcode, $poolcode]);
// // RETURN 1 - LIST
// if($req->type != 'report'){
diff --git a/resources/views/menu_v1/reports/vehicle_trips.blade.php b/resources/views/menu_v1/reports/vehicle_trips.blade.php
index f952a00..dfecfc6 100644
--- a/resources/views/menu_v1/reports/vehicle_trips.blade.php
+++ b/resources/views/menu_v1/reports/vehicle_trips.blade.php
@@ -25,8 +25,8 @@
@if ($user_role == \App\Models\Users::ROLE_VENDOR || $user_role == \App\Models\Users::ROLE_ADMIN)
@can('vehicle.create')
+
+ -->
@endcan
{{--
@@ -79,6 +79,18 @@
+
+
+
+
+
+
@@ -190,17 +202,17 @@
+
-->
@endsection
@@ -314,6 +326,7 @@
&to_date=${moment($('#tgl1').val(), "DD-MM-YYYY HH:mm").unix()}
&vid=${$('#filterNopol').val() || ''}
&vt=${$('#vehicleType').val() || ''}
+ &poolcode=${$('#poolcode').val() || ''}
`,
type: 'GET',
success: function(json) {