TIMOR-TELECOM/gps-frontend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
meusinfirmary
2025-05-29 15:56:21 +07:00
parent 77bc5f10a6
commit 4c09fc45a7
2 changed files with 568 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Models/Tracks.php
View File

@ -128,19 +128,19 @@ class Tracks extends Model
}
if (isset($filter["get_order_data"])) {
// the old way => only 1 order 1 vehicle
// $query .= " LEFT JOIN t_orders as ord ON v.ord_id = ord.id";
// $query .= " LEFT JOIN t_orders_pickups as ord_pck ON v.ord_id = ord_pck.ord_id";
// $query .= " LEFT JOIN t_orders_drops as ord_drop ON v.ord_id = ord_drop.ord_id";
// $query .= " LEFT JOIN t_orders_drivers as ord_drv ON v.ord_id = ord_drv.ord_id";
// $query .= " LEFT JOIN t_orders_clients as ord_c ON v.ord_id = ord_c.ord_id";
$query .= " LEFT JOIN t_orders as ord ON v.ord_id = ord.id";
$query .= " LEFT JOIN t_orders_pickups as ord_pck ON v.ord_id = ord_pck.ord_id";
$query .= " LEFT JOIN t_orders_drops as ord_drop ON v.ord_id = ord_drop.ord_id";
$query .= " LEFT JOIN t_orders_drivers as ord_drv ON v.ord_id = ord_drv.ord_id";
$query .= " LEFT JOIN t_orders_clients as ord_c ON v.ord_id = ord_c.ord_id";
// the new way => can handle 2 order in 1 vehicle
$query .= " LEFT JOIN t_orders_vehicles as ord_vhc ON v.id = ord_vhc.vhc_id";
$query .= " LEFT JOIN t_orders as ord ON ord_vhc.ord_id = ord.id";
$query .= " LEFT JOIN t_orders_pickups as ord_pck ON ord_vhc.ord_id = ord_pck.ord_id";
$query .= " LEFT JOIN t_orders_drops as ord_drop ON ord_vhc.ord_id = ord_drop.ord_id";
$query .= " LEFT JOIN t_orders_drivers as ord_drv ON ord_vhc.ord_id = ord_drv.ord_id";
$query .= " LEFT JOIN t_orders_clients as ord_c ON ord_vhc.ord_id = ord_c.ord_id";
// $query .= " LEFT JOIN t_orders_vehicles as ord_vhc ON v.id = ord_vhc.vhc_id";
// $query .= " LEFT JOIN t_orders as ord ON ord_vhc.ord_id = ord.id";
// $query .= " LEFT JOIN t_orders_pickups as ord_pck ON ord_vhc.ord_id = ord_pck.ord_id";
// $query .= " LEFT JOIN t_orders_drops as ord_drop ON ord_vhc.ord_id = ord_drop.ord_id";
// $query .= " LEFT JOIN t_orders_drivers as ord_drv ON ord_vhc.ord_id = ord_drv.ord_id";
// $query .= " LEFT JOIN t_orders_clients as ord_c ON ord_vhc.ord_id = ord_c.ord_id";
}
$query .= " WHERE v.dlt is null";
// $query .= " AND tr.action IN ('location','alarm')"; // kalo gamau ngambil data heartbeat(idling)
@ -211,6 +211,7 @@ class Tracks extends Model
$query .= " AND ord_c.c_id = ?";
$params[] = $filter["client_id"];
}
// $query .= " AND ord.status IN (22,4)";
}
if (isset($filter["company"])) {
$query .= " AND client.id = ?";