diff --git a/CHANGELOG.md b/CHANGELOG.md index d6e995fb9..2f9eac824 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,9 @@ This file documents all notable changes made to ITFlow. ### Upgrading to 26.11 -Update from Maintenance > Update — Queue Update hands the job to cron, which updates the files and applies this release's database changes (2.7.9 to 3.0.2) in the same pass. Nothing else is required. +Update from Maintenance > Update — Queue Update hands the job to cron, which updates the files and applies this release's database changes (2.7.9 to 3.0.3) in the same pass. Nothing else is required. -This is a big release, with twenty-three database steps in one go, so take a backup before you update. +This is a big release, with twenty-four database steps in one go, so take a backup before you update. The update also clears out data that deletes in older versions left behind, all of it pointing at something that no longer exists: @@ -25,6 +25,8 @@ Expenses already entered take who entered them from the audit log, where it has Recurring expenses keep their next date and from then on run on that day of the month - monthly ones stay monthly and yearly ones yearly. Look over their next dates once after the update (see Breaking Changes, Expenses). The expenses they recorded before are linked to them, matched on the vendor, category, client and description. No expense or recurring expense becomes billable to a client by itself - they stay your cost until you mark them (see New Features, Expenses). +Trips already logged keep the miles they were entered with (see Breaking Changes, Trips). Each takes who logged it from the audit log, or its driver where the log has no record. A trip for a client whose destination is one of that client's locations, by name or by address, is linked to that location. + If you are coming from 26.08 or earlier, the database update still has to be run from the command line one time, exactly as described under Upgrading to 26.09 below. ### Breaking Changes and Notes @@ -88,6 +90,10 @@ If you are coming from 26.08 or earlier, the database update still has to be run - Deleting a recurring expense needs full Financial access, the same as deleting an expense. It used to need write access. - Unbilled Time also lists expenses to bill for agents with Financial access, and its count in the menu adds them. For those agents it shows in the menu even with ticketing turned off. - Transactions has a Reimbursement type for money paid back to an agent. A Transactions export filtered to Expense leaves those out. +- Trips: + - Every agent can open Trips when accounting is on, and log their own driving. An agent without Financial access sees only the trips they drove or logged, and can change or delete only those. Logging a trip for someone else, or changing theirs, needs write access to Financial, and deleting theirs needs full access. Before, any agent who opened the page saw every trip of their clients and could change any of them. + - A trip's miles are the whole trip. The form asks for the miles one way and doubles them for a round trip. The old form saved the number as typed, whether Round Trip was ticked or not, so an older round trip entered as the miles one way still counts once. Edit those to correct them. + - The database column `trips.trip_end_odmeter` is now `trip_end_odometer`. Anything of your own that reads it, such as a custom report, needs the new name. - Notifications now follow access too. An agent only sees notifications for clients and areas they can open, so someone without sales access no longer sees invoice and quote notifications. - Drop-downs: Tom Select is gone, replaced by ITFlow's own picker. It works the way you are used to: type to search, tick several in a multi-select, and type a new value in fields that allow it, such as ticket watchers. See Developer Updates if you have custom pages that used Tom Select. - Several small windows are gone because the change is now made where the value is shown: @@ -529,7 +535,29 @@ If you are coming from 26.08 or earlier, the database update still has to be run - The MFA QR code is drawn on the page itself. - You can see your remembered browsers and forget one or all of them. - You can set how many rows a list shows per page. -- **Trips**: the driver shows as an agent pill, like ticket assignees. +- **Trips** (rebuilt) + - Along the top of the list: the miles this month against the same days of last month, the year so far, your own this month, and how much of the year's driving was for clients. + - Pills cut the list to your own trips, trips for a client, trips for a ticket and our own errands, each with a count. Filter by driver, client and date. Search finds what it was for, where from and to, the client, site, driver and ticket number. The total of everything the filters leave sits under the list. + - Each row shows the route with the ticket and what it was for, the client and their site, the driver as an agent pill, and the miles with a mark for a round trip. + - Clicking a trip opens its quick look: + - the route, with Directions in Google Maps from where it started, and the miles each way for a round trip + - the driver, the client, their site and the ticket, each linked + - the odometer readings, and who logged it and when + - how many trips have gone to that site, opening them + - From the quick look or a row's menu: Edit, Copy (dated today), Return Trip and Delete. Return Trip is the way back, from there to where it started, one way and on the same day. + - New Trip, Edit, Copy and Return Trip are one form with an icon on every field: + - Pick the client to choose from their sites and their tickets (open ones, and those done in the last 60 days). A site fills in its address as where to. A ticket fills in what the trip was for, and its site. + - From starts where your last trip started, and offers the places you start from most. + - Enter the miles one way and switch Round trip on or off. The form shows what the whole trip comes to. + - A route you have driven before fills in its miles. + - Odometer readings are optional. With both, the trip is what the odometer says. + - Tickets: Log a trip in the ticket's menu starts with its client, site and subject. An onsite ticket, or one with trips, has a Trips card listing them with the miles driven for it. + - Locations: the location page has a Trips tab with the trips out to it and Log Trip. + - The Mileage report shows each trip's ticket and site under its purpose, a trip's date opens it, and the CSV has Site and Ticket columns. + - Bulk actions set the driver or the client of the ticked trips, or delete them. Changing the client takes off the old client's site and ticket. + - Export takes the same filters as the list, with Driver, Round Trip, One Way, Site, Ticket and the odometer readings as columns. + - Trips follow their ticket. Merging a ticket with its replies moves its trips to the ticket it goes into, and moving it to another client takes its trips along. Deleting a ticket or a location keeps the trips, without the link. + - The demo data logs a trip to the site for each onsite ticket fixed in the last six months. ### Bug Fixes @@ -597,7 +625,7 @@ If you are coming from 26.08 or earlier, the database update still has to be run ### Developer Updates -- Database 2.8.0 to 2.9.8, one file per step under `admin/database_updates/`, with `db.sql` matching 2.9.8: +- Database 2.8.0 to 3.0.3, one file per step under `admin/database_updates/`, with `db.sql` matching 3.0.3: - 2.8.0: `racks.rack_units_descending`, `rack_power_capacity` and `rack_photo_rear`. On `rack_units`: `unit_face`, `unit_full_depth`, `unit_type`, `unit_power_watts`, `unit_notes` and a `unit_asset_id` key. Unlinked items move from asset id 0 to NULL. - 2.8.1: `location_documents` and `location_files`. - 2.8.2: `vendor_tags` (tag type 6), and `vendor_contact_phone_country_code`, `vendor_contact_phone` and `vendor_contact_email`. @@ -633,6 +661,7 @@ If you are coming from 26.08 or earlier, the database update still has to be run - 3.0.0 (after 2.9.9, the way 2.0.0 followed 1.9.9): `recurring_expenses.recurring_expense_frequency` becomes `varchar(10)` (`month`, `quarter` or `year`, from 1 and 2), with `recurring_expense_anchor_day` (backfilled from the next date) and `recurring_expense_end_date`. `recurring_expense_day` and `recurring_expense_month` are dropped. `expenses.expense_recurring_expense_id`, backfilled by vendor, category, client and description from the day each recurring expense was set up. - 3.0.1: `expenses.expense_billable` (0), `expense_markup` (`decimal(7,2)`, 0.00), `expense_invoice_id` (keyed) and `expense_invoice_item_id`. `recurring_expenses.recurring_expense_billable` (0), `recurring_expense_markup` and `recurring_expense_recurring_invoice_id`. `settings.config_expense_markup` (0.00). - 3.0.2: `expenses.expense_import_key` (keyed), `expense_paid_by` (0) and `expense_reimbursement_id` (keyed). `expense_import_rules` (`import_rule_match` unique, `import_rule_vendor_id`, `import_rule_category_id`, `import_rule_client_id`, `import_rule_billable`, `import_rule_used_count`). `reimbursements` (`reimbursement_user_id`, `reimbursement_date`, `reimbursement_amount`, `reimbursement_currency_code`, `reimbursement_account_id`, `reimbursement_payment_method`, `reimbursement_reference`, `reimbursement_expense_id`, `reimbursement_created_by`). `accounts.account_import_map`. + - 3.0.3: `trips.trip_end_odmeter` renamed `trip_end_odometer`, and `trip_miles` from `float(15,1)` to `decimal(10,1)` (0.0). New `trip_location_id`, `trip_ticket_id` and `trip_created_by` (0), keyed with `trip_user_id` (`trip_user_id`, `trip_date`). `trip_created_by` is backfilled from the audit log's Trip Create entries, else the driver, and `trip_location_id` where the destination matches one of the client's locations by name or by `formatAddress()` of its address, case and spacing aside. - New shared function files, loaded by `functions.php`: `functions/asset.php`, `asset_interface.php`, `certificate.php`, `client_overview.php`, `contact.php`, `credential.php`, `dashboard.php`, `links.php`, `location.php`, `notifications.php`, `project.php`, `rack.php`, `search.php`, `service.php`, `software.php`, `tags.php`, `ticket.php`, `ticket_fields.php`, `user.php` and `vendor.php`. They hold the queries and rules, so the pages, the API and cron share one definition. - Removed post models: `agent/post/{asset_interface,certificate,credential,domain,event,location,network_ip,network,recurring_ticket,vendor}_model.php`, `admin/post/user_model.php` and `api/v1/certificates/certificate_model.php`. Their handlers call the shared functions above. Interface handlers moved to `agent/post/asset_interface.php`. - New scripts: `js/itflow_select.js`, `quick_pick.js`, `tag_picker.js`, `global_search.js`, `notifications.js`, `dashboard.js`, `client_overview.js`, `client_switcher.js`, `credentials.js` and `autosubmit.js`, and `agent/js/calendar.js`, `calendar_event_modal.js`, `files.js`, `interface_form.js`, `network_form.js`, `project_modal.js` and `ticket_schedule_modal.js`. @@ -813,6 +842,19 @@ If you are coming from 26.08 or earlier, the database update still has to be run - `expenseRow()` adds `paid_by_name`, `reimbursement_date`, `reimbursed_account_name`, `reimbursement_out_id` and `reimbursed_to_name` (its joins on `accounts` and `users` are aliased now). `expenseShows()` adds `to_reimburse`, and `expenseFiltersSql()` takes `paid_by`. - Handlers: POST `expense_reimburse` (`user_id`, `expense_ids[]`, `account`, `date`, `payment_method`, `reference`) and GET `expense_reimbursement_delete` (Financial at 3). `bulk_edit_expenses` with `field=account` clears `expense_paid_by` and skips paid back ones. The export adds `expense_paid_by_display`. - New windows `agent/modals/expense/expense_reimburse.php` (`?user_id=` or `?expense_ids[]=`) and `expense_reimbursement.php?id=`. `agent/transactions.php`, its export and `agent/post/transaction.php` give the payment the type Reimbursement, with the agent as the other side. `dashboardAttention()` adds Expenses to reimburse. +- Trips, in the new `functions/trips.php` (loaded by `functions.php`): + - Access: `tripCanSeeAll()` (Financial at 1), `tripCanManage()` (Financial at 2), `tripIsMine($row)` (drove or logged it), `tripCanEdit($row)`, `tripCanDelete($row)` (theirs, or Financial at 3) and `tripScopeSql()` - `clientScopeSql('trips.trip_client_id')`, plus their own trips only without Financial access. Every read below goes through it. + - `tripRow($id, $scoped = true)` reads a trip with its client, driver (`driver_name`, `driver_avatar`), `created_by_name`, location and ticket, through `tripJoinsSql()` (`users` aliased `driver`). `tripsFor($column, $id, $limit)` and `tripTotalsFor($column, $id)` read the trips of a ticket, location or client, and `tripTableHtml($rows)` draws them for a location's Trips tab. + - `tripSave($in, $id, &$error)` is the one path that writes a trip from a form - New, Edit, Copy and Return. It takes `date`, `driver`, `client_id`, `ticket_id`, `location_id`, `source`, `destination`, `miles` (one way), `round_trip`, `odometer_start`, `odometer_end` and `purpose`. `trip_miles` is the whole trip: both odometer readings make it, otherwise the miles one way, doubled for a round trip. A ticket brings its client (and needs Support access), a location and ticket must be the client's, and without `tripCanManage()` the driver is the agent. It sets `trip_created_by` on insert. `tripDelete($id, &$error)` checks `tripCanDelete()`. + - The list and export share `tripFiltersSql($src, &$summary)` (q, driver, client, location_id, ticket_id, show, dtf and dtt) and `tripShows()`, the pills (`mine`, `client`, `ticket` and `own`). Also `tripStats()`, `tripDrivers()`, `tripClientSites()`, `tripClientTickets()`, `tripKnownRoutes()` (one way miles by lowercased `from|to`, both directions, the latest first), `tripStartPlaces()`, `tripLastStart()`, `tripOfficeAddress()`, `tripLocationAddress()`, `tripOneWay()`, `tripLabel()`, `tripMapUrl()`, `tripUnit()` and `tripMilesText()`. + - New windows: the quick look `agent/modals/trip/trip.php?id=`, `trip_form.php` (the fields of `trip_add.php`, `trip_edit.php` and `trip_copy.php`), `trip_bulk_edit.php?field=` (driver or client) and `trip_bulk_delete.php`, with the menu in `agent/includes/trip_bulk_menu.php`. `trip_add.php` takes `?client_id=`, `?location_id=` and `?ticket_id=`, and `trip_copy.php` takes `?return=1`. + - Handlers in `agent/post/trip.php`: `add_trip` and `edit_trip` (with `trip_id`) post the fields above through `tripSave()`. GET `delete_trip`. New are `bulk_edit_trips` (`field`, `value`, `trip_ids[]`; Financial at 2) and `bulk_delete_trips` (Financial at 3). `export_trips` takes the list's filters and adds the `user_name`, `round_trip_display`, `trip_one_way`, `location_name`, `ticket_display`, `trip_start_odometer` and `trip_end_odometer` columns. The old fields `roundtrip` and `user` are gone. + - `agent/trips.php` takes `?driver=`, `?client=`, `?location_id=`, `?ticket_id=`, `?show=` and `?open=`, and is open to every agent. `side_nav.php` lists Trips under Finance for everyone, `globalSearchPages()` offers it with accounting on, and `inc_all_client.php` counts `$num_trips` through `tripTotalsFor()`. + - `agent/ticket.php` has the Trips card and Log a trip. `agent/location.php` has the Trips tab. `agent/reports/mileage.php` joins the location and ticket and links each date to `trips.php?open=`. + - Kept in step: `ticketDeleteForGood()` and `locationClearReferences()` clear `trip_ticket_id` and `trip_location_id`. `ticketMergeInto()` with `$move_replies` moves the trips. `change_client_ticket` moves the ticket's trips to the new client, without a location. + - Seeds: `demoBuildClient()` gives the quarterly visits the primary location's address and id, and adds a trip for each onsite ticket resolved in the last six months. Every seeded trip has `trip_created_by`. + - CSS: `.itflow-trip-route`. + - Removed: `agent/post/trip_model.php`. - The billing helpers (`billingTimeInvoice()`, `quoteConvert()`, `recurringInvoiceGenerate()` and the rest) take the agent's name as plain text. Their handlers now pass `stripslashes($session_name)`, so a name with an apostrophe no longer shows a backslash in history and the audit log. - Sidebar brand: `agent/css/sidebar_brand_fix.css` and `agent/js/sidebar_brand_fix.js` from 26.10 are replaced by CSS in `css/itflow_custom.css`. `includes/load_company_settings.php` now sets `$session_company_logo`. - `alertMessageHtml()` no longer double-encodes, and save messages built from `escapeSql()` values use `stripslashes()` at the flash. diff --git a/admin/database_updates/3.0.3.php b/admin/database_updates/3.0.3.php new file mode 100644 index 000000000..cc4bf0213 --- /dev/null +++ b/admin/database_updates/3.0.3.php @@ -0,0 +1,38 @@ + 0"); + mysqli_query($mysqli, "UPDATE trips SET trip_created_by = trip_user_id WHERE trip_created_by = 0"); + + // New Trip put a client site's address in as the destination - link those + // trips to the site, by its address or its name + mysqli_query($mysqli, "UPDATE trips JOIN locations ON location_client_id = trip_client_id + SET trip_location_id = location_id + WHERE trip_location_id = 0 AND trip_client_id > 0 AND ( + LOWER(TRIM(trip_destination)) = LOWER(TRIM(location_name)) + OR LOWER(TRIM(trip_destination)) = LOWER(TRIM(CONCAT_WS(' ', + NULLIF(TRIM(location_address), ''), + NULLIF(IF(TRIM(COALESCE(location_city, '')) <> '' AND TRIM(CONCAT_WS(' ', NULLIF(TRIM(location_state), ''), NULLIF(TRIM(location_zip), ''))) <> '', + CONCAT(TRIM(location_city), ', ', TRIM(CONCAT_WS(' ', NULLIF(TRIM(location_state), ''), NULLIF(TRIM(location_zip), '')))), + TRIM(CONCAT_WS(' ', NULLIF(TRIM(location_city), ''), NULLIF(TRIM(location_state), ''), NULLIF(TRIM(location_zip), '')))), '')))))"); diff --git a/admin/post/demo_data_model.php b/admin/post/demo_data_model.php index d1101abbd..1ed251044 100644 --- a/admin/post/demo_data_model.php +++ b/admin/post/demo_data_model.php @@ -1676,6 +1676,11 @@ function demoBuildClient($mysqli, $profile, $index, $context, &$counts) { } } + // The driving out to them (functions/trips.php): the quarterly visit to + // their main site, and a trip for each onsite ticket fixed in the last six + // months - to the ticket's site, on the day it was fixed, by who fixed it + $trip_miles = 8.5 + ($index * 2.5); + $main_site = $profile['sites'][0]; for ($trip_month = min(6, $months); $trip_month >= 0; $trip_month = $trip_month - 3) { if (demoIsFuture(demoMonthDate($trip_month, 17))) { continue; @@ -1684,14 +1689,38 @@ function demoBuildClient($mysqli, $profile, $index, $context, &$counts) { 'trip_date' => demoMonthDate($trip_month, 17), 'trip_purpose' => 'Onsite - ' . $profile['onsite_visit'], 'trip_source' => 'Office', - 'trip_destination' => $profile['sites'][0]['city'] . ', ' . $profile['sites'][0]['state'], - 'trip_miles' => 8.5 + ($index * 2.5), + 'trip_destination' => formatAddress($main_site['address'], $main_site['city'], $main_site['state'], $main_site['zip'], '', ' '), + 'trip_miles' => $trip_miles, 'round_trip' => 1, 'trip_user_id' => $user_id, + 'trip_created_by' => $user_id, 'trip_client_id' => $client_id, + 'trip_location_id' => $primary_location_id, 'trip_created_at' => demoMonthDateTime($trip_month, 17, 17, 30), ]); } + $sql = mysqli_query($mysqli, "SELECT ticket_id, ticket_subject, ticket_assigned_to, ticket_resolved_at, location_id, location_name, location_address, location_city, location_state, location_zip + FROM tickets LEFT JOIN locations ON location_id = ticket_location_id + WHERE ticket_client_id = " . intval($client_id) . " AND ticket_onsite = 1 AND ticket_resolved_at IS NOT NULL + AND ticket_resolved_at >= NOW() - INTERVAL 6 MONTH AND ticket_resolved_at <= NOW() + ORDER BY ticket_resolved_at ASC"); + while ($ticket = mysqli_fetch_assoc($sql)) { + $driver_id = intval($ticket['ticket_assigned_to']) ?: $user_id; + starterInsert($mysqli, 'trips', [ + 'trip_date' => substr($ticket['ticket_resolved_at'], 0, 10), + 'trip_purpose' => mb_substr('Onsite - ' . $ticket['ticket_subject'], 0, 200), + 'trip_source' => 'Office', + 'trip_destination' => $ticket['location_id'] !== null ? tripLocationAddress($ticket) : formatAddress($main_site['address'], $main_site['city'], $main_site['state'], $main_site['zip'], '', ' '), + 'trip_miles' => $trip_miles, + 'round_trip' => 1, + 'trip_user_id' => $driver_id, + 'trip_created_by' => $driver_id, + 'trip_client_id' => $client_id, + 'trip_location_id' => intval($ticket['location_id']), + 'trip_ticket_id' => intval($ticket['ticket_id']), + 'trip_created_at' => $ticket['ticket_resolved_at'], + ]); + } } @@ -3655,6 +3684,7 @@ function demoBuildInternalDiary($mysqli, $context, &$counts) { 'trip_miles' => $errand[2], 'round_trip' => 1, 'trip_user_id' => $user_id, + 'trip_created_by' => $user_id, 'trip_client_id' => 0, 'trip_created_at' => demoDateTime($days_ago, 17, 45), ]); diff --git a/agent/includes/inc_all_client.php b/agent/includes/inc_all_client.php index e08f2f578..e50de81b0 100644 --- a/agent/includes/inc_all_client.php +++ b/agent/includes/inc_all_client.php @@ -271,8 +271,8 @@ if (isset($_GET['client_id'])) { AND (COALESCE(event_end, event_start) >= CURDATE() OR (event_repeat <> '' AND (event_repeat_until IS NULL OR event_repeat_until >= CURDATE())))")); $num_calendar_events = intval($row['num']); - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(trip_id) AS num FROM trips WHERE trip_archived_at IS NULL AND trip_client_id = $client_id")); - $num_trips = intval($row['num']); + // The trips this agent may see - all of them with Financial access, else their own + [$num_trips] = tripTotalsFor('trip_client_id', $client_id); } } diff --git a/agent/includes/side_nav.php b/agent/includes/side_nav.php index d9c1c2215..afd300a6a 100644 --- a/agent/includes/side_nav.php +++ b/agent/includes/side_nav.php @@ -213,12 +213,15 @@

-
  • - "> - -

    Trips

    -     -
    • + + +
  • + "> + +

    Trips

    +     +
    • + = 1) { ?>
  • "> diff --git a/agent/includes/trip_bulk_menu.php b/agent/includes/trip_bulk_menu.php new file mode 100644 index 000000000..7604d6200 --- /dev/null +++ b/agent/includes/trip_bulk_menu.php @@ -0,0 +1,20 @@ + + diff --git a/agent/location.php b/agent/location.php index 81ef7ec0f..e71a14e98 100644 --- a/agent/location.php +++ b/agent/location.php @@ -104,6 +104,11 @@ if (!$location || ($client_url && intval($location['location_client_id']) !== in $tickets = ticketRows("tickets.ticket_location_id = $location_id", max(25, $ticket_open_count)); } + // The driving out to it - functions/trips.php, so an agent without Financial access sees their own + $show_trips = !empty($config_module_enable_accounting); + $trips = $show_trips ? tripsFor('trip_location_id', $location_id, 25) : []; + [$trip_count, $trip_miles] = $show_trips ? tripTotalsFor('trip_location_id', $location_id) : [0, 0.0]; + $documents = $can_support ? linkedRecords('location', $location_id, 'document') : []; $files = $can_support ? linkedRecords('location', $location_id, 'file') : []; $history = locationHistory($location_id, 100); @@ -114,10 +119,14 @@ if (!$location || ($client_url && intval($location['location_client_id']) !== in 'networks' => ['label' => 'Networks', 'icon' => 'fa-network-wired', 'count' => count($networks)], 'racks' => ['label' => 'Racks', 'icon' => 'fa-server', 'count' => count($racks)], 'tickets' => ['label' => 'Tickets', 'icon' => 'fa-life-ring', 'count' => $ticket_count, 'badge' => $ticket_open_count], + 'trips' => ['label' => 'Trips', 'icon' => 'fa-route', 'count' => $trip_count], 'documents' => ['label' => 'Documents', 'icon' => 'fa-file-alt', 'count' => count($documents)], 'files' => ['label' => 'Files', 'icon' => 'fa-paperclip', 'count' => count($files)], 'history' => ['label' => 'History', 'icon' => 'fa-history', 'count' => count($history)], ]; + if (!$show_trips) { + unset($location_tabs['trips']); + } if (!$can_support) { unset($location_tabs['assets'], $location_tabs['networks'], $location_tabs['racks'], $location_tabs['tickets'], $location_tabs['documents'], $location_tabs['files']); } @@ -211,7 +220,7 @@ if (!$location || ($client_url && intval($location['location_client_id']) !== in
    - + Trip here @@ -607,6 +616,26 @@ if (!$location || ($client_url && intval($location['location_client_id']) !== in + + +
    +
    + + + + +
    + + + count($trips)) { ?> +
    The most recent of - all of them in Trips.
    + + +
    No trips to this site.
    + +
    + +
    diff --git a/agent/modals/trip/trip.php b/agent/modals/trip/trip.php new file mode 100644 index 000000000..9a13ca427 --- /dev/null +++ b/agent/modals/trip/trip.php @@ -0,0 +1,144 @@ + 'That trip no longer exists, or is not one you can see.']); + exit; +} + +$trip_id = intval($row['trip_id']); +$client_id = intval($row['trip_client_id']); +$miles = floatval($row['trip_miles']); +$round = intval($row['round_trip']) === 1; +$can_edit = tripCanEdit($row); +$can_delete = tripCanDelete($row); + +ob_start(); + +?> + +
    +
    + +
    +
    +
    · from
    +
    +
    +
    +
    +
    +
    + +
    + +
    + + +
    + +
    +
    +
    From
    +
    +
    +
    +
    To
    +
    + +
    and back - each way
    + +
    +
    +
    + Directions +
    +
    + + +
    +
    +
    + + +
    +
    + + + + + Our own - not for a client + +
    + +
    + + +
    + + +
    + + $row['trip_ticket_id'], 'ticket_client_id' => $row['ticket_client_id'], 'ticket_prefix' => $row['ticket_prefix'], 'ticket_number' => $row['ticket_number'], 'ticket_subject' => $row['ticket_subject'], 'ticket_resolved_at' => $row['ticket_resolved_at'], 'ticket_closed_at' => $row['ticket_closed_at']]) : 'A ticket since deleted' ?> +
    + +
    +
    + +
    + + → +
    + +
    + + by +
    + +
    + + trip to +
    + +
    +
    + +
    +
    What for
    +
    +
    + +
    + +
    + + + +
    + + +
    + + Delete + + +
    + +
    -
    New Trip
    +
    ' . escapeHtml(ticketReference($ticket)) . '' : 'New Trip' ?>
    -
    - - - - - -
    - -
    - - -
    -
    - - - -
    -
    - -
    - - " required> -
    -
    - -
    - -
    - - -
    - -
    -
    -
    -
    - -
    - -
    - - -
    -
    - -
    -
    - - -
    -
    - -
    - - -
    - -
    - -
    - - -
    -
    - +
    -
    - - + +
    diff --git a/agent/modals/trip/trip_bulk_delete.php b/agent/modals/trip/trip_bulk_delete.php new file mode 100644 index 000000000..b73c5c960 --- /dev/null +++ b/agent/modals/trip/trip_bulk_delete.php @@ -0,0 +1,45 @@ + 'Tick the trips to delete first.']); + exit; +} + +ob_start(); + +?> +
    +
    Delete Trip
    + +
    + +
    + + + + +
    +
    + +
    +
    for good.
    +
    Their miles come out of the Mileage report and off their tickets and sites. This can't be undone.
    +
    +
    +
    +
    + + +
    +
    + + ['label' => 'Driver', 'icon' => 'fa-user'], + 'client' => ['label' => 'Client', 'icon' => 'fa-building'], +]; +if (!isset($fields[$field])) { + echo json_encode(['error' => 'Pick what to set from the Bulk Action menu.']); + exit; +} +if (!$count) { + echo json_encode(['error' => 'Tick the trips to change first.']); + exit; +} + +ob_start(); + +?> +
    +
    Set trip
    + +
    + +
    + + + + + +
    + +
    + + + + + + +
    + +
    A trip that was another client's loses its site and ticket - they were that client's.
    + +
    +
    + + +
    +
    + + 'That trip no longer exists, or is not one you can see.'])); } +$form_mode = !empty($_GET['return']) ? 'return' : 'copy'; ob_start(); ?> -
    -
    Copying Trip
    +
    -
    - -
    - -
    - -
    - - " required> -
    -
    - -
    - -
    - - -
    - > -
    -
    -
    - -
    - -
    - -
    - - -
    -
    - -
    -
    - - -
    -
    - -
    - - -
    - -
    - -
    - - -
    -
    - - - - - -
    - -
    - - -
    -
    - - - +
    - - + +
    'That trip no longer exists, or is not one you can see.'])); } +if (!tripCanEdit($form_row)) { + exit(json_encode(['error' => "That is someone else's trip - changing it needs write access to Financial."])); +} +$form_mode = 'edit'; ob_start(); ?> -
    -
    Editing Trip
    +
    Edit Trip
    + +
    - - - -
    - -
    - -
    - - -
    -
    - -
    - -
    - - -
    - > -
    -
    -
    - -
    - -
    - -
    - - -
    -
    - -
    -
    - - -
    -
    - -
    - - -
    - -
    - -
    - - -
    -
    - - - - - -
    - -
    - - -
    -
    - - - +
    -
    - - + +
    @@ -37,27 +48,85 @@ ob_start(); + +
    The trips you drove or logged
    + + + +
    Only the trips to
    + + + +
    Only the trips for
    + +
    - +
    - - + +
    -
    - -
    - - +
    + +
    + +
    + + +
    +
    + + +
    + +
    + + +
    +
    + +
    + +
    + + +
    -
    - -
    - -
    +
    + +
    - + +
    +
    +
    + +
    + + +
    diff --git a/agent/modals/trip/trip_form.php b/agent/modals/trip/trip_form.php new file mode 100644 index 000000000..bca2b3e76 --- /dev/null +++ b/agent/modals/trip/trip_form.php @@ -0,0 +1,344 @@ + +
    + + +
    +
    The way back from - a trip of its own, one way.
    +
    + + +
    + +
    + + +
    +
    + +
    + +
    + + +
    + +
    You log your own trips.
    + +
    + +
    + +
    + + +
    +
    + + + +
    + +
    + + + + + + + +
    +
    + + + +
    + +
    + + +
    +
    + +
    + +
    + + > + +
    + +
    +
    +
    + data-trip-round> + +
    +
    +
    +
    The trip is
    +
    + +
    + Odometer readings +
    +
    +
    + +
    + + +
    +
    +
    + +
    + + +
    +
    +
    With both, the trip is what the odometer says.
    +
    +
    +
    + +
    + +
    + + +
    +
    + +
    + + diff --git a/agent/post/ticket.php b/agent/post/ticket.php index de6cdbe58..3612a546c 100644 --- a/agent/post/ticket.php +++ b/agent/post/ticket.php @@ -61,6 +61,8 @@ function ticketMergeInto($child, $parent, $comment, $move_replies = false) { if ($move_replies) { mysqli_query($mysqli, "UPDATE ticket_replies SET ticket_reply_ticket_id = $parent_id WHERE ticket_reply_ticket_id = $ticket_id"); + // The work goes over, and the driving for it with it + mysqli_query($mysqli, "UPDATE trips SET trip_ticket_id = $parent_id WHERE trip_ticket_id = $ticket_id"); } if (empty($child['ticket_first_response_at'])) { setTicketFirstResponse($ticket_id); @@ -1294,6 +1296,8 @@ if (isset($_POST['change_client_ticket'])) { mysqli_query($mysqli, "UPDATE tickets SET ticket_client_id = $client_id, ticket_contact_id = $contact_id, ticket_asset_id = 0, ticket_location_id = 0, ticket_vendor_id = $vendor_id, ticket_project_id = $project_id WHERE ticket_id = $ticket_id LIMIT 1"); mysqli_query($mysqli, "DELETE FROM ticket_assets WHERE ticket_id = $ticket_id"); + // The driving for it goes with it - not to the old client's site + mysqli_query($mysqli, "UPDATE trips SET trip_client_id = $client_id, trip_location_id = 0 WHERE trip_ticket_id = $ticket_id"); applyTicketSla($ticket_id); $old_client_name = $old_client_id ? (string) getFieldById('clients', $old_client_id, 'client_name') : 'no client'; diff --git a/agent/post/trip.php b/agent/post/trip.php index 35a669b2f..5060b39d7 100644 --- a/agent/post/trip.php +++ b/agent/post/trip.php @@ -1,32 +1,30 @@ $source to $destination logged"); + flashAlert("Trip to " . escapeHtml($row['trip_destination']) . " logged - " . escapeHtml(tripMilesText($row['trip_miles']))); redirect(); @@ -36,27 +34,16 @@ if (isset($_POST['edit_trip'])) { validateCSRFToken(); - require_once 'trip_model.php'; - - $trip_id = intval($_POST['trip_id']); - - // Check the client the trip belongs to now, not just the one submitted - $existing_client_id = intval(getFieldById('trips', $trip_id, 'trip_client_id')); - if ($existing_client_id) { - enforceClientAccess($existing_client_id); + $trip_id = intval($_POST['trip_id'] ?? 0); + if (!tripSave($_POST, $trip_id, $error)) { + flashAlert(escapeHtml($error), 'error'); + redirect(); } - $client_id = intval($_POST['client_id']); + $row = tripRow($trip_id, false); + logAudit("Trip", "Edit", "$session_name edited the trip " . escapeSql(tripLabel($row)), intval($row['trip_client_id']), $trip_id); - if ($client_id) { - enforceClientAccess(); - } - - mysqli_query($mysqli,"UPDATE trips SET trip_date = '$date', trip_source = '$source', trip_destination = '$destination', trip_miles = $miles, trip_purpose = '$purpose', round_trip = $roundtrip, trip_user_id = $user_id, trip_client_id = $client_id WHERE trip_id = $trip_id"); - - logAudit("Trip", "Edit", "$session_name edited trip", $client_id , $trip_id); - - flashAlert("Trip edited"); + flashAlert("Trip to " . escapeHtml($row['trip_destination']) . " saved"); redirect(); @@ -66,25 +53,89 @@ if (isset($_GET['delete_trip'])) { validateCSRFToken(); - enforceUserPermission('module_financial', 3); - - $trip_id = intval($_GET['delete_trip']); - - // Get Trip Info and Client ID for logging - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT trip_client_id, trip_destination, trip_source FROM trips WHERE trip_id = $trip_id")); - $client_id = intval($row['trip_client_id']); - $trip_source = escapeSql($row['trip_source']); - $trip_destination = escapeSql($row['trip_destination']); - - if ($client_id) { - enforceClientAccess(); + $row = tripDelete(intval($_GET['delete_trip']), $error); + if (!$row) { + flashAlert(escapeHtml($error), 'error'); + redirect(); } - mysqli_query($mysqli,"DELETE FROM trips WHERE trip_id = $trip_id"); + logAudit("Trip", "Delete", "$session_name deleted the trip " . escapeSql(tripLabel($row)), intval($row['trip_client_id'])); - logAudit("Trip", "Delete", "$session_name deleted trip ($trip_source - $trip_destination)", $client_id); + flashAlert("Trip to " . escapeHtml($row['trip_destination']) . " deleted", 'error'); - flashAlert("Trip ($trip_source - $trip_destination) deleted", 'error'); + redirect(); + +} + +/* Set the driver (an agent) or client (0 for none - the site and ticket go with the old one) of the ticked trips. */ +if (isset($_POST['bulk_edit_trips'])) { + + validateCSRFToken(); + + enforceUserPermission('module_financial', 2); + + $field = (string) ($_POST['field'] ?? ''); + $value = intval($_POST['value'] ?? 0); + $set = ''; + $label = ''; + if ($field === 'driver') { + $drivers = tripDrivers(); + if (isset($drivers[$value])) { + $set = "trip_user_id = $value"; + $label = 'the driver to ' . $drivers[$value]['user_name']; + } + } elseif ($field === 'client') { + if (!$value) { + $set = 'trip_client_id = 0, trip_location_id = 0, trip_ticket_id = 0'; + $label = 'no client'; + } elseif (mysqli_num_rows(mysqli_query($mysqli, "SELECT client_id FROM clients WHERE client_id = $value " . clientScopeSql('client_id')))) { + // The site and ticket first - the client after, as MySQL sets them in order + $set = "trip_location_id = IF(trip_client_id = $value, trip_location_id, 0), trip_ticket_id = IF(trip_client_id = $value, trip_ticket_id, 0), trip_client_id = $value"; + $label = 'the client to ' . getFieldById('clients', $value, 'client_name'); + } + } + $trip_ids = array_unique(array_filter(array_map('intval', (array) ($_POST['trip_ids'] ?? [])))); + if ($set === '' || !$trip_ids) { + flashAlert($trip_ids ? 'Pick what to set them to' : 'Tick the trips to change first', 'error'); + redirect(); + } + + $count = 0; + foreach ($trip_ids as $trip_id) { + $row = tripRow($trip_id); + if (!$row) { + continue; + } + mysqli_query($mysqli, "UPDATE trips SET $set WHERE trip_id = $trip_id"); + logAudit("Trip", "Edit", "$session_name set " . escapeSql($label) . " on the trip " . escapeSql(tripLabel($row)), intval($row['trip_client_id']), $trip_id); + $count++; + } + logAudit("Trip", "Bulk Edit", "$session_name set " . escapeSql($label) . " on $count trip" . ($count === 1 ? '' : 's')); + + flashAlert("Set " . escapeHtml($label) . " on $count trip" . ($count === 1 ? '' : 's')); + + redirect(); + +} + +if (isset($_POST['bulk_delete_trips'])) { + + validateCSRFToken(); + + enforceUserPermission('module_financial', 3); + + $count = 0; + foreach (array_unique(array_filter(array_map('intval', (array) ($_POST['trip_ids'] ?? [])))) as $trip_id) { + $row = tripDelete($trip_id); + if (!$row) { + continue; + } + logAudit("Trip", "Delete", "$session_name deleted the trip " . escapeSql(tripLabel($row)), intval($row['trip_client_id'])); + $count++; + } + logAudit("Trip", "Bulk Delete", "$session_name deleted $count trip" . ($count === 1 ? '' : 's')); + + flashAlert("$count trip" . ($count === 1 ? '' : 's') . " deleted", 'error'); redirect(); @@ -94,54 +145,23 @@ if (isExportRequest('export_trips')) { validateCSRFToken(); - // Exports are reads - see CONTRIBUTING.md - enforceUserPermission('module_financial'); - $format = resolveExportFormat($_POST['export_trips']); - // Filters inherited from the trips page - mirrors agent/trips.php - $filter_summary = []; - + // The same filters as the trips list, over the trips this agent may see + $src = $_POST; if (!empty($_POST['client_id'])) { - $client_id = intval($_POST['client_id']); - $client_query = "AND trip_client_id = $client_id"; - $client_name = getFieldById('clients', $client_id, 'client_name'); - $file_name_prepend = "$client_name-"; - $filter_summary['Client'] = $client_name; - + $src['client'] = intval($_POST['client_id']); + } + $where = tripFiltersSql($src, $filter_summary); + $client_id = intval($src['client'] ?? 0); + if ($client_id) { enforceClientAccess(); - } else { - $client_query = ''; - $client_id = 0; // for Logging - $file_name_prepend = "$session_company_name-"; } - // Date Filter - $dtf = escapeSql(!empty($_POST['dtf']) ? $_POST['dtf'] : '1970-01-01'); - $dtt = escapeSql(!empty($_POST['dtt']) ? $_POST['dtt'] : '2099-12-31'); - $date_range = formatExportDateRange($dtf, $dtt); - if ($date_range) { - $filter_summary['Dated'] = $date_range; - } - - // Search Filter - $q = escapeSql($_POST['q'] ?? ''); - if (!empty($q)) { - $filter_summary['Search'] = $_POST['q']; - } - - $sql = mysqli_query( - $mysqli, - "SELECT * FROM trips - LEFT JOIN clients ON trip_client_id = client_id - LEFT JOIN users ON trip_user_id = user_id - WHERE (trip_purpose LIKE '%$q%' OR trip_source LIKE '%$q%' OR trip_destination LIKE '%$q%' OR trip_miles LIKE '%$q%' OR client_name LIKE '%$q%' OR user_name LIKE '%$q%') - AND DATE(trip_date) BETWEEN '$dtf' AND '$dtt' - AND trip_archived_at IS NULL - $client_query - " . clientScopeSql('trip_client_id') . " - ORDER BY trip_date ASC" - ); + $sql = mysqli_query($mysqli, "SELECT trips.*, client_name, driver.user_name AS driver_name, location_name, ticket_prefix, ticket_number, ticket_subject + FROM trips " . tripJoinsSql() . " + WHERE $where + ORDER BY trips.trip_date ASC, trips.trip_id ASC"); $num_rows = mysqli_num_rows($sql); @@ -149,9 +169,13 @@ if (isExportRequest('export_trips')) { guardExportPdfRowCount($format, $num_rows); - $export = beginExport('trips', $format, $file_name_prepend . 'Trips', 'Trips', summarizeExportFilters($filter_summary)); + $export = beginExport('trips', $format, ($client_id ? getFieldById('clients', $client_id, 'client_name') : $session_company_name) . '-Trips', 'Trips', summarizeExportFilters($filter_summary)); while ($row = mysqli_fetch_assoc($sql)) { + $row['user_name'] = $row['driver_name']; + $row['round_trip_display'] = intval($row['round_trip']) ? 'Yes' : 'No'; + $row['trip_one_way'] = number_format(tripOneWay($row), 1, '.', ''); + $row['ticket_display'] = $row['ticket_number'] !== null ? ticketReference($row) . ' - ' . $row['ticket_subject'] : ''; addExportRow($export, $row); } diff --git a/agent/post/trip_model.php b/agent/post/trip_model.php deleted file mode 100644 index 70b62486f..000000000 --- a/agent/post/trip_model.php +++ /dev/null @@ -1,10 +0,0 @@ - $a['miles']; }); $value_column = ['label' => 'At ' . ($rate ? reportMoney($rate) . ' a mile' : 'your rate'), 'type' => 'money', 'csv_label' => 'Amount']; $trip_columns = [ - 'trip_date' => ['label' => 'Date', 'type' => 'date', 'class' => 'text-nowrap'], + 'trip_date' => ['label' => 'Date', 'type' => 'date', 'class' => 'text-nowrap', 'html' => function ($row) { + // Opens the trip's quick look on the Trips list + return '' . escapeHtml(date('M j, Y', strtotime($row['trip_date']))) . ''; + }], 'user_name' => ['label' => 'Agent', 'html' => function ($row) { return reportAgentCell($row['trip_user_id'], $row['user_name'] ?? '', $row['user_avatar'] ?? '', 'No one'); }], 'client_name' => ['label' => 'Client', 'html' => function ($row) { return reportClientCell($row['trip_client_id'], $row['client_name'] ?? '', $row['client_abbreviation'] ?? ''); }], - 'trip_purpose' => ['label' => 'Purpose', 'class' => 'itflow-report-text'], + 'trip_purpose' => ['label' => 'Purpose', 'class' => 'itflow-report-text', 'html' => function ($row) { + $for = []; + if ($row['ticket_number'] !== null && intval($row['trip_ticket_id'])) { + $for[] = '' . escapeHtml(ticketReference($row)) . ''; + } + if ($row['location_name'] !== null && intval($row['trip_location_id'])) { + $for[] = '' . escapeHtml($row['location_name']); + } + return escapeHtml($row['trip_purpose']) . ($for ? '
    ' . implode(' · ', $for) . '
    ' : ''); + }], + 'route' => ['label' => 'From → to', 'class' => 'small text-body-secondary', 'csv' => function ($row) { return $row['trip_source'] . ' → ' . $row['trip_destination']; }, 'html' => function ($row) { @@ -87,6 +105,15 @@ $trip_columns = [ if ($rate) { $trip_columns['value'] = $value_column; } +// The CSV has the site and ticket in columns of their own +$trip_csv_columns = array_slice($trip_columns, 0, 4, true) + [ + 'location_name' => ['label' => 'Site', 'csv' => function ($row) { + return intval($row['trip_location_id']) ? (string) $row['location_name'] : ''; + }], + 'ticket' => ['label' => 'Ticket', 'csv' => function ($row) { + return $row['ticket_number'] !== null && intval($row['trip_ticket_id']) ? ticketReference($row) : ''; + }], +] + array_slice($trip_columns, 4, null, true); $agent_columns = [ 'agent' => ['label' => 'Agent', 'html' => function ($row) { @@ -116,7 +143,7 @@ if (reportExporting('clients')) { reportCsv("$name by client", $client_columns, $by_client, ['client' => 'Total'] + $totals); } if (reportExporting()) { - reportCsv($name, $trip_columns, $trips, ['trip_date' => 'Total', 'miles' => $miles, 'value' => $totals['value']]); + reportCsv($name, $trip_csv_columns, $trips, ['trip_date' => 'Total', 'miles' => $miles, 'value' => $totals['value']]); } $buckets = reportBuckets($period); diff --git a/agent/ticket.php b/agent/ticket.php index 66ac2320b..dbb26a186 100644 --- a/agent/ticket.php +++ b/agent/ticket.php @@ -458,6 +458,11 @@ if (isset($_GET['ticket_id'])) { $show_quote_button = $can_edit_ticket && $config_module_enable_accounting && $ticket_billable == 1 && empty($quote_id) && empty($invoice_id) && lookupUserPermission("module_sales") >= 2; $show_invoice_button = $can_edit_ticket && $config_module_enable_accounting && $ticket_billable == 1 && empty($invoice_id) && lookupUserPermission("module_sales") >= 2; + // Trips - the driving done for it: anyone working it can log theirs (functions/trips.php) + $show_trips = $config_module_enable_accounting && $client_id > 0; + $ticket_trips = $show_trips ? tripsFor('trip_ticket_id', $ticket_id, 5) : []; + [$ticket_trip_count, $ticket_trip_miles] = $show_trips ? tripTotalsFor('trip_ticket_id', $ticket_id) : [0, 0.0]; + // Values in the Details panel are links only when they can actually be changed $can_change_fields = $can_edit_ticket && !$ticket_is_closed; @@ -519,7 +524,7 @@ if (isset($_GET['ticket_id'])) { the rarer actions live in the menu; Invoice comes out of it once the work is done, which is when it is actually wanted. --> - +
    @@ -572,6 +577,14 @@ if (isset($_GET['ticket_id'])) { Summarize with AI + + + Log a trip + + +
    + + Merge into another ticket @@ -1229,6 +1242,43 @@ if (isset($_GET['ticket_id'])) {
    + + +
    +
    +
    Trips
    +
    + +
    +
    + +
    + + +
    + · + +
    +
    →
    +     + +
    +
    + driven + count($ticket_trips)) { ?> + All + + Open in Trips + +
    + +
    + An onsite ticket - drove out for it? Log the trip to keep the miles with the ticket. +
    + +
    + +
    diff --git a/agent/trips.php b/agent/trips.php index 6a9c4bee8..0adcac57a 100644 --- a/agent/trips.php +++ b/agent/trips.php @@ -1,5 +1,23 @@ 'trips.trip_date', 'user_name' => 'driver.user_name', 'trip_destination' => 'trips.trip_destination', 'client_name' => 'client_name', 'trip_miles' => 'trips.trip_miles']; +if (!isset($sortable_columns[$sort])) { + $sort = 'trip_date'; +} + +// Everything but the pill, then the pill - the pill counts are over what the rest leave +$filter_src = array_merge($_GET, ['dtf' => $dtf, 'dtt' => $dtt, 'show' => '', 'client' => $client_filter]); +$where = tripFiltersSql($filter_src); +$show_query = $shows[$show]['where'] ? "AND {$shows[$show]['where']}" : ''; +$joins = tripJoinsSql(); + +$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS trips.*, client_name, driver.user_name AS driver_name, driver.user_avatar AS driver_avatar, + location_name, ticket_prefix, ticket_number, ticket_subject, ticket_resolved_at, ticket_closed_at + FROM trips $joins + WHERE $where $show_query + ORDER BY {$sortable_columns[$sort]} $order, trips.trip_id DESC LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +$trips = []; +while ($row = mysqli_fetch_assoc($sql)) { + $trips[] = $row; +} + +// The pills, and the miles of what is listed +$count_sql = []; +foreach ($shows as $key => $s) { + $count_sql[] = $key === '' ? 'COUNT(*)' : "COALESCE(SUM({$s['where']}), 0)"; +} +$row = mysqli_fetch_row(mysqli_query($mysqli, "SELECT " . implode(', ', $count_sql) . ", COALESCE(SUM(CASE WHEN 1 $show_query THEN trips.trip_miles END), 0) + FROM trips $joins WHERE $where")); +$counts = []; +foreach (array_keys($shows) as $i => $key) { + $counts[$key] = intval($row[$i]); +} +$listed_miles = floatval($row[count($shows)]); + +$stats = tripStats(); +$filter_url = function ($changes) use ($client_page, $client_id) { + $params = array_merge($_GET, $changes); + unset($params['page']); + if ($client_page) { + $params['client_id'] = $client_id; + } + return '?' . http_build_query(array_filter($params, function ($v) { return $v !== '' && $v !== null; })); +}; +$date_url = function ($from, $to, $changes = []) use ($filter_url) { + return $filter_url(array_merge(['canned_date' => 'custom', 'dtf' => $from, 'dtt' => $to], $changes)); +}; +$any_filter = $q || $driver_filter || ($client_filter && !$client_page) || $location_filter || $ticket_filter || $show !== '' || $dtf !== '1970-01-01'; +$add_url = 'modals/trip/trip_add.php' . ($client_page ? "?client_id=$client_id" : ''); ?> -
    -
    -

    Trips

    -
    -
    - - 0) { ?> - -
    - - Export - -
    + +
    +
    + +
    This month
    +
    +
    + trip + + · % on the same days of + +
    +     +
    +
    + +
    so far
    +
    +
    trip
    +     +
    +
    + +
    Yours this month
    +
    +
    trip you drove
    +     +
    +
    + +
    For clients this year
    +
    +
    0 ? round($stats['year_client_miles'] / $stats['year_miles'] * 100) . '% of the driving' : 'No driving yet this year' ?>
    +     +
    +
    + +
    +
    +

    Tripsyours' ?>

    +
    +
    + + +
    + + Export + + = 1 && lookupUserPermission('module_financial') >= 1) { ?> + Mileage Report
    - -
    -
    - - - -
    -
    -
    - - - -
    -
    -
    -
    -
    -
    -
    -
    " id="advancedFilter"> -
    -
    -
    - - - - - -
    -
    -
    -
    -
    -
    -
    - - "> - - - - - - - - - - - - - - - $client_name"; - } - if ($round_trip == 1) { - $round_trip_display = ""; - } else { - $round_trip_display = ""; - } - $user_name_display = formatAssignee($trip_user_id, $row['user_name'], $row['user_avatar'], false, 'No driver'); - - ?> - - - - - - - - - - - - - - - - -
    - - Date - - - - Driver - - - - Purpose - - - - Source - - - - Destination - - - - Miles - - - - Client - - Action
    - - - - $trip_miles $round_trip_display" ?> -
    - -
    - - Map it - -
    - - Edit - - - Copy - -
    - - Delete - -
    -
    -
    -
    -
    - +
    + + + + + $location_filter, 'ticket_id' => $ticket_filter] as $key => $value) { + if ($value) { ?> + + +
    +
    +
    + + +
    +
    +
    + + + + +
    +
    +
    +
    + +
    + + + +
    +
    + +
    +
    +
    + +
    + + + +
    +
    + +
    +
    + + + +
    + + Clear +
    + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    +     		Date Trip Client SiteDriver
    +
    + +
    +     		> +
    + + +
    +
    + + · + + +
    +     		+ +
    +
    + + Our own + +     		intval($row['trip_location_id'])])) . '">' . escapeHtml($row['location_name']) . '' : '-' ?> + + + +
    + +
    + >Open + Directions +
    + + Edit + + Copy + Return Trip + +
    + + Delete + + +
    +
    +
    + trip count($trips) ? ' - the total is for all of them, not just this page' : '' ?> +
    +
    + +
    + +
    + +
    Log the drive out to a client from their ticket - Log a trip, in its menu - or with New Trip here.
    + +
    + + +
    + + + + + + + + [ 'trip_date' => ['label' => 'Date'], + 'user_name' => ['label' => 'Driver', 'weight' => 2], 'trip_purpose' => ['label' => 'Purpose', 'weight' => 3], - 'trip_source' => ['label' => 'Source', 'weight' => 2], - 'trip_destination' => ['label' => 'Destination', 'weight' => 2], + 'trip_source' => ['label' => 'From', 'weight' => 2], + 'trip_destination' => ['label' => 'To', 'weight' => 2], 'trip_miles' => ['label' => 'Miles', 'format' => 'number'], + 'round_trip_display' => ['label' => 'Round Trip', 'default' => false], + 'trip_one_way' => ['label' => 'One Way', 'format' => 'number', 'default' => false], 'client_name' => ['label' => 'Client', 'weight' => 2, 'default' => false], + 'location_name' => ['label' => 'Site', 'weight' => 2, 'default' => false], + 'ticket_display' => ['label' => 'Ticket', 'weight' => 2, 'default' => false], + 'trip_start_odometer' => ['label' => 'Odometer Start', 'default' => false], + 'trip_end_odometer' => ['label' => 'Odometer End', 'default' => false], ], // user_status_display is the status word, built by the handler diff --git a/functions/location.php b/functions/location.php index c1fa9c50d..f68c199ce 100644 --- a/functions/location.php +++ b/functions/location.php @@ -216,6 +216,7 @@ function locationClearReferences($location_id) { } mysqli_query($mysqli, "UPDATE tickets SET ticket_location_id = 0 WHERE ticket_location_id = $location_id"); mysqli_query($mysqli, "UPDATE calendar_events SET event_location_id = 0 WHERE event_location_id = $location_id"); + mysqli_query($mysqli, "UPDATE trips SET trip_location_id = 0 WHERE trip_location_id = $location_id"); } /** diff --git a/functions/search.php b/functions/search.php index cc6acb7cc..efbe4185f 100644 --- a/functions/search.php +++ b/functions/search.php @@ -792,7 +792,7 @@ function globalSearchPages($raw_query) { ['Income', '/agent/income.php', $financial && $accounting], ['Expenses', '/agent/expenses.php', $financial && $accounting], ['Recurring Expenses', '/agent/recurring_expenses.php', $financial && $accounting], - ['Trips', '/agent/trips.php', $financial && $accounting], + ['Trips', '/agent/trips.php', $accounting], ['Accounts', '/agent/accounts.php', $financial && $accounting], ['Transactions', '/agent/transactions.php', $financial && $accounting], ['Transfers', '/agent/transfers.php', $financial && $accounting], diff --git a/functions/ticket.php b/functions/ticket.php index fc3872a56..1b9f73146 100644 --- a/functions/ticket.php +++ b/functions/ticket.php @@ -283,6 +283,8 @@ function ticketDeleteForGood($ticket_id) { mysqli_query($mysqli, "DELETE FROM ticket_history WHERE ticket_history_ticket_id = $ticket_id"); mysqli_query($mysqli, "DELETE FROM sla_history WHERE sla_history_ticket_id = $ticket_id"); mysqli_query($mysqli, "DELETE FROM tickets WHERE ticket_id = $ticket_id"); + // The driving for it still happened - the trips stay, without the ticket + mysqli_query($mysqli, "UPDATE trips SET trip_ticket_id = 0 WHERE trip_ticket_id = $ticket_id"); removeDirectory(__DIR__ . "/../uploads/tickets/$ticket_id"); } diff --git a/functions/trips.php b/functions/trips.php new file mode 100644 index 000000000..8dd7c57cd --- /dev/null +++ b/functions/trips.php @@ -0,0 +1,491 @@ += 1; +} + +/** May this agent log trips for others and change theirs? */ +function tripCanManage() { + return lookupUserPermission('module_financial') >= 2; +} + +/** Is it this agent's own trip - they drove it or logged it? */ +function tripIsMine(array $row) { + global $session_user_id; + return intval($row['trip_user_id']) === intval($session_user_id) || intval($row['trip_created_by'] ?? 0) === intval($session_user_id); +} + +/** May this agent change this trip? */ +function tripCanEdit(array $row) { + return tripIsMine($row) || tripCanManage(); +} + +/** May this agent delete this trip? */ +function tripCanDelete(array $row) { + return tripIsMine($row) || lookupUserPermission('module_financial') >= 3; +} + +/** The trips this agent may see, as SQL - their client scope, and their own unless they see all. */ +function tripScopeSql() { + global $session_user_id; + $sql = clientScopeSql('trips.trip_client_id'); + if (!tripCanSeeAll()) { + $me = intval($session_user_id); + $sql .= " AND (trips.trip_user_id = $me OR trips.trip_created_by = $me)"; + } + return $sql; +} + +/** The joins the list, export and quick look read through. */ +function tripJoinsSql() { + return "LEFT JOIN clients ON client_id = trips.trip_client_id + LEFT JOIN users AS driver ON driver.user_id = trips.trip_user_id + LEFT JOIN locations ON location_id = trips.trip_location_id + LEFT JOIN tickets ON ticket_id = trips.trip_ticket_id"; +} + +/** One trip with its client, driver, site, ticket and who logged it - raw, or null. Scoped to what this agent may see. */ +function tripRow($trip_id, $scoped = true) { + global $mysqli; + $trip_id = intval($trip_id); + if (!$trip_id) { + return null; + } + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT trips.*, client_name, client_abbreviation, driver.user_name AS driver_name, driver.user_avatar AS driver_avatar, + creator.user_name AS created_by_name, location_name, location_address, location_city, location_state, location_zip, location_archived_at, + ticket_prefix, ticket_number, ticket_subject, ticket_client_id, ticket_resolved_at, ticket_closed_at, ticket_onsite + FROM trips " . tripJoinsSql() . " + LEFT JOIN users AS creator ON creator.user_id = trips.trip_created_by + WHERE trips.trip_id = $trip_id AND trips.trip_archived_at IS NULL " . ($scoped ? tripScopeSql() : '') . " + LIMIT 1")); + return $row ?: null; +} + +/** The miles one way - the whole trip halved for a round trip. */ +function tripOneWay(array $row) { + $miles = floatval($row['trip_miles']); + return intval($row['round_trip']) ? round($miles / 2, 1) : $miles; +} + +/** A trip in a sentence - "Office to Ravenwood Dental on 2026-10-14 (24.6 mi)". Raw. */ +function tripLabel(array $row) { + return $row['trip_source'] . ' to ' . $row['trip_destination'] . ' on ' . $row['trip_date'] . ' (' . tripMilesText($row['trip_miles']) . ')'; +} + +/** A directions link for the trip - to the address, from where it started. */ +function tripMapUrl(array $row) { + return 'https://www.google.com/maps/dir/?api=1&origin=' . rawurlencode((string) $row['trip_source']) . '&destination=' . rawurlencode((string) $row['trip_destination']); +} + +/** Where we start from - the company's address, as one line, or ''. */ +function tripOfficeAddress() { + global $mysqli; + static $address = null; + if ($address === null) { + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT company_address, company_city, company_state, company_zip FROM companies WHERE company_id = 1")) ?: []; + $address = formatAddress($row['company_address'] ?? '', $row['company_city'] ?? '', $row['company_state'] ?? '', $row['company_zip'] ?? '', '', ' '); + } + return $address; +} + +/** A client site's address as one line - its name when it has no address. */ +function tripLocationAddress(array $row) { + $address = formatAddress($row['location_address'] ?? '', $row['location_city'] ?? '', $row['location_state'] ?? '', $row['location_zip'] ?? '', '', ' '); + return $address !== '' ? $address : (string) ($row['location_name'] ?? ''); +} + +/** The ways the list can be cut - ?show= */ +function tripShows() { + global $session_user_id; + $me = intval($session_user_id); + return [ + '' => ['label' => 'All', 'where' => ''], + 'mine' => ['label' => 'Mine', 'icon' => 'fa-user', 'where' => "trips.trip_user_id = $me", 'title' => 'Trips you drove'], + 'client' => ['label' => 'For a client', 'icon' => 'fa-building', 'where' => 'trips.trip_client_id > 0', 'title' => 'Driving for a client'], + 'ticket' => ['label' => 'For a ticket', 'icon' => 'fa-life-ring', 'where' => 'trips.trip_ticket_id > 0', 'title' => 'Onsite work on a ticket'], + 'own' => ['label' => 'Our own', 'icon' => 'fa-store', 'where' => 'trips.trip_client_id = 0', 'title' => "Errands for the business - the bank, the post office, a supplier"], + ]; +} + +/** + * The WHERE for a set of filters, as the list and the export take them: q, + * driver, client, location_id, ticket_id, show, dtf and dtt. Starts with what + * this agent may see. $summary gets what each is, by name, for the export. + */ +function tripFiltersSql(array $src, &$summary = []) { + $summary = []; + $sql = "trips.trip_archived_at IS NULL " . tripScopeSql(); + $q = trim((string) ($src['q'] ?? '')); + if ($q !== '') { + $like = escapeSql($q); + $sql .= " AND (trips.trip_purpose LIKE '%$like%' OR trips.trip_source LIKE '%$like%' OR trips.trip_destination LIKE '%$like%' OR client_name LIKE '%$like%' + OR driver.user_name LIKE '%$like%' OR location_name LIKE '%$like%' OR CONCAT(ticket_prefix, ticket_number) LIKE '%$like%')"; + $summary['Search'] = $q; + } + foreach (['driver' => ['trips.trip_user_id', 'users', 'user_name', 'Driver'], 'client' => ['trips.trip_client_id', 'clients', 'client_name', 'Client'], + 'location_id' => ['trips.trip_location_id', 'locations', 'location_name', 'Site'], 'ticket_id' => ['trips.trip_ticket_id', 'tickets', 'ticket_subject', 'Ticket']] as $key => $f) { + $id = intval($src[$key] ?? 0); + if ($id) { + $sql .= " AND {$f[0]} = $id"; + $summary[$f[3]] = (string) getFieldById($f[1], $id, $f[2]); + } + } + $shows = tripShows(); + $show = (string) ($src['show'] ?? ''); + if (isset($shows[$show]) && $shows[$show]['where']) { + $sql .= " AND {$shows[$show]['where']}"; + $summary['Showing'] = $shows[$show]['label']; + } + $dtf = (string) ($src['dtf'] ?? ''); + $dtt = (string) ($src['dtt'] ?? ''); + $dtf = preg_match('/^\d{4}-\d{2}-\d{2}$/', $dtf) ? $dtf : '1970-01-01'; + $dtt = preg_match('/^\d{4}-\d{2}-\d{2}$/', $dtt) ? $dtt : '2099-12-31'; + if ($dtf !== '1970-01-01' || $dtt !== '2099-12-31') { + $sql .= " AND trips.trip_date BETWEEN '$dtf' AND '$dtt'"; + $range = formatExportDateRange($dtf, $dtt); + if ($range) { + $summary['Dated'] = $range; + } + } + return $sql; +} + +/** + * The driving along the top of the list, in what this agent may see: miles + * this month against the same days of last month, the year so far, and the + * agent's own this month. + */ +function tripStats() { + global $mysqli, $session_user_id; + $scope = "trips.trip_archived_at IS NULL " . tripScopeSql(); + $month_start = date('Y-m-01'); + $today = date('Y-m-d'); + $last_start = date('Y-m-01', strtotime('first day of last month')); + $last_to_date = date('Y-m-d', min(strtotime(date('Y-m-t', strtotime($last_start))), strtotime($last_start . ' +' . (intval(date('j')) - 1) . ' days'))); + $year_start = date('Y-01-01'); + $me = intval($session_user_id); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT + COALESCE(SUM(CASE WHEN trip_date BETWEEN '$month_start' AND '$today' THEN trip_miles END), 0) AS month_miles, + COALESCE(SUM(trip_date BETWEEN '$month_start' AND '$today'), 0) AS month_trips, + COALESCE(SUM(CASE WHEN trip_date BETWEEN '$last_start' AND '$last_to_date' THEN trip_miles END), 0) AS last_to_date, + COALESCE(SUM(CASE WHEN trip_date BETWEEN '$year_start' AND '$today' THEN trip_miles END), 0) AS year_miles, + COALESCE(SUM(trip_date BETWEEN '$year_start' AND '$today'), 0) AS year_trips, + COALESCE(SUM(CASE WHEN trip_date BETWEEN '$year_start' AND '$today' AND trip_client_id > 0 THEN trip_miles END), 0) AS year_client_miles, + COALESCE(SUM(CASE WHEN trip_date BETWEEN '$month_start' AND '$today' AND trip_user_id = $me THEN trip_miles END), 0) AS my_month_miles, + COALESCE(SUM(trip_date BETWEEN '$month_start' AND '$today' AND trip_user_id = $me), 0) AS my_month_trips + FROM trips LEFT JOIN clients ON client_id = trip_client_id WHERE $scope")); + $row = array_map('floatval', $row ?: []); + $row['month_start'] = $month_start; + $row['last_start'] = $last_start; + $row['year_start'] = $year_start; + $row['change'] = $row['last_to_date'] > 0 ? round(($row['month_miles'] - $row['last_to_date']) / $row['last_to_date'] * 100) : null; + return $row; +} + +/** Who can drive - active agents, and $keep_id - id => [name, avatar]. */ +function tripDrivers($keep_id = 0) { + global $mysqli; + $keep_id = intval($keep_id); + $drivers = []; + $sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE (user_type = 1 AND user_archived_at IS NULL) OR user_id = $keep_id ORDER BY user_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $drivers[intval($row['user_id'])] = $row; + } + return $drivers; +} + +/** The sites of the clients this agent may reach - client_id => [[id, name, address], ...], archived ones left out but $keep_id. */ +function tripClientSites($client_id = 0, $keep_id = 0) { + global $mysqli; + $client_id = intval($client_id); + $keep_id = intval($keep_id); + $sites = []; + $sql = mysqli_query($mysqli, "SELECT location_id, location_client_id, location_name, location_address, location_city, location_state, location_zip, location_primary + FROM locations JOIN clients ON client_id = location_client_id + WHERE (location_archived_at IS NULL OR location_id = $keep_id) AND client_archived_at IS NULL " . ($client_id ? "AND location_client_id = $client_id " : '') . clientScopeSql('location_client_id') . " + ORDER BY location_primary DESC, location_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $sites[intval($row['location_client_id'])][] = [intval($row['location_id']), $row['location_name'], tripLocationAddress($row)]; + } + return $sites; +} + +/** + * The tickets a trip can be for - each client's open ones and those done in + * the last 60 days, newest first, up to 25 a client, plus $keep_id - client_id + * => [[id, "TCK-12 - Subject", location_id, open], ...]. Only for agents who + * can see tickets. + */ +function tripClientTickets($client_id = 0, $keep_id = 0) { + global $mysqli; + if (lookupUserPermission('module_support') < 1) { + return []; + } + $client_id = intval($client_id); + $keep_id = intval($keep_id); + $tickets = []; + $sql = mysqli_query($mysqli, "SELECT ticket_id, ticket_prefix, ticket_number, ticket_subject, ticket_client_id, ticket_location_id, ticket_resolved_at, ticket_closed_at + FROM tickets + WHERE ticket_client_id > 0 AND ticket_archived_at IS NULL " . ($client_id ? "AND ticket_client_id = $client_id " : '') . " + AND (" . TICKET_OPEN_SQL . " OR COALESCE(ticket_resolved_at, ticket_closed_at) >= CURDATE() - INTERVAL 60 DAY OR ticket_id = $keep_id) " . clientScopeSql('ticket_client_id') . " + ORDER BY ticket_client_id, (ticket_resolved_at IS NULL AND ticket_closed_at IS NULL) DESC, ticket_id DESC"); + while ($row = mysqli_fetch_assoc($sql)) { + $cid = intval($row['ticket_client_id']); + if (count($tickets[$cid] ?? []) >= 25 && intval($row['ticket_id']) !== $keep_id) { + continue; + } + $tickets[$cid][] = [intval($row['ticket_id']), ticketReference($row) . ' - ' . mb_substr((string) $row['ticket_subject'], 0, 80), intval($row['ticket_location_id']), ticketIsOpen($row) ? 1 : 0]; + } + return $tickets; +} + +/** + * Routes driven before - "from|to" (lowercase) => miles one way, the last + * time each was driven, from the trips this agent may see. Both directions, + * so the way back is known too. For the form to fill in. + */ +function tripKnownRoutes($limit = 400) { + global $mysqli; + $routes = []; + $sql = mysqli_query($mysqli, "SELECT trip_source, trip_destination, trip_miles, round_trip FROM trips LEFT JOIN clients ON client_id = trip_client_id + WHERE trips.trip_archived_at IS NULL AND trip_miles > 0 " . tripScopeSql() . " + ORDER BY trip_date DESC, trip_id DESC LIMIT " . intval($limit * 3)); + while ($row = mysqli_fetch_assoc($sql)) { + $from = mb_strtolower(trim((string) $row['trip_source'])); + $to = mb_strtolower(trim((string) $row['trip_destination'])); + if ($from === '' || $to === '') { + continue; + } + $one_way = tripOneWay($row); + $routes += ["$from|$to" => $one_way, "$to|$from" => $one_way]; + if (count($routes) >= $limit * 2) { + break; + } + } + return $routes; +} + +/** Where this agent has started from lately, most used first - for the From box to offer, with the office first. */ +function tripStartPlaces($limit = 6) { + global $mysqli, $session_user_id; + $places = []; + $office = tripOfficeAddress(); + if ($office !== '') { + $places[] = $office; + } + $sql = mysqli_query($mysqli, "SELECT trip_source, COUNT(*) AS n FROM trips WHERE trip_user_id = " . intval($session_user_id) . " AND trip_archived_at IS NULL + GROUP BY trip_source ORDER BY n DESC LIMIT " . intval($limit)); + while ($row = mysqli_fetch_row($sql)) { + if (!in_array($row[0], $places, true) && trim((string) $row[0]) !== '') { + $places[] = $row[0]; + } + } + return $places; +} + +/** Where this agent's last trip started - for a new one to start from. */ +function tripLastStart() { + global $mysqli, $session_user_id; + $row = mysqli_fetch_row(mysqli_query($mysqli, "SELECT trip_source FROM trips WHERE trip_user_id = " . intval($session_user_id) . " AND trip_archived_at IS NULL ORDER BY trip_date DESC, trip_id DESC LIMIT 1")); + return $row ? (string) $row[0] : ''; +} + +/** + * The one path that writes a trip from a form - New, Edit, Copy and Return. + * $in: date, source, destination, miles (one way), round_trip, odometer_start, + * odometer_end, purpose, driver, client_id, location_id, ticket_id. A ticket + * brings its client when none is picked; a site and ticket must be the + * client's. Returns the trip id, or 0 with $error. + */ +function tripSave(array $in, $trip_id = 0, &$error = '') { + global $mysqli, $session_user_id; + $error = ''; + $trip_id = intval($trip_id); + $existing = $trip_id ? tripRow($trip_id) : null; + if ($trip_id && !$existing) { + $error = 'That trip no longer exists, or is not one you can see'; + return 0; + } + if ($existing && !tripCanEdit($existing)) { + $error = "That is someone else's trip - changing it needs write access to Financial"; + return 0; + } + + $date = trim((string) ($in['date'] ?? '')); + if (!preg_match('/^\d{4}-\d{2}-\d{2}$/', $date) || !checkdate(intval(substr($date, 5, 2)), intval(substr($date, 8, 2)), intval(substr($date, 0, 4)))) { + $error = 'Enter the date of the trip'; + return 0; + } + $source = mb_substr(trim(preg_replace('/\s+/u', ' ', (string) ($in['source'] ?? ''))), 0, 200); + $destination = mb_substr(trim(preg_replace('/\s+/u', ' ', (string) ($in['destination'] ?? ''))), 0, 200); + if ($source === '' || $destination === '') { + $error = 'Enter where the trip started and where it went'; + return 0; + } + $purpose = mb_substr(trim((string) ($in['purpose'] ?? '')), 0, 200); + if ($purpose === '') { + $error = 'Enter what the trip was for'; + return 0; + } + + // The miles: from the odometer when both readings are there, else one way, doubled for a round trip + $round = !empty($in['round_trip']) ? 1 : 0; + $odo_start_text = trim(str_replace(',', '', (string) ($in['odometer_start'] ?? ''))); + $odo_end_text = trim(str_replace(',', '', (string) ($in['odometer_end'] ?? ''))); + if (($odo_start_text !== '' && !ctype_digit($odo_start_text)) || ($odo_end_text !== '' && !ctype_digit($odo_end_text))) { + $error = 'The odometer readings are whole numbers'; + return 0; + } + $odo_start = $odo_start_text === '' ? null : intval($odo_start_text); + $odo_end = $odo_end_text === '' ? null : intval($odo_end_text); + if ($odo_start !== null && $odo_end !== null) { + if ($odo_end < $odo_start) { + $error = 'The odometer at the end is lower than at the start'; + return 0; + } + $miles = round($odo_end - $odo_start, 1); + } else { + $miles_text = trim(str_replace([',', ' '], '', (string) ($in['miles'] ?? ''))); + if (!is_numeric($miles_text) || floatval($miles_text) < 0 || floatval($miles_text) >= 100000) { + $error = 'Enter the ' . tripUnit() . ' one way'; + return 0; + } + $miles = round(round(floatval($miles_text), 1) * ($round ? 2 : 1), 1); + } + + // The client, the ticket it was for and the site it went to + $client_id = intval($in['client_id'] ?? 0); + $ticket_id = intval($in['ticket_id'] ?? 0); + if ($ticket_id) { + $ticket = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT ticket_id, ticket_client_id FROM tickets WHERE ticket_id = $ticket_id AND ticket_client_id > 0 " . clientScopeSql('ticket_client_id'))); + if (!$ticket || ($client_id && intval($ticket['ticket_client_id']) !== $client_id) || (lookupUserPermission('module_support') < 1 && (!$existing || intval($existing['trip_ticket_id']) !== $ticket_id))) { + $error = "That ticket isn't one of the client's"; + return 0; + } + $client_id = intval($ticket['ticket_client_id']); + } + if ($client_id && !mysqli_num_rows(mysqli_query($mysqli, "SELECT client_id FROM clients WHERE client_id = $client_id " . clientScopeSql('client_id')))) { + $error = "That client isn't one you can log trips for"; + return 0; + } + $location_id = $client_id ? intval($in['location_id'] ?? 0) : 0; + if ($location_id && !mysqli_num_rows(mysqli_query($mysqli, "SELECT location_id FROM locations WHERE location_id = $location_id AND location_client_id = $client_id"))) { + $error = "That site isn't one of the client's"; + return 0; + } + + // Who drove - only themselves, unless they may log trips for others + $driver = intval($in['driver'] ?? 0); + $drivers = tripDrivers($existing ? $existing['trip_user_id'] : 0); + if (!isset($drivers[$driver])) { + $error = 'Pick who drove'; + return 0; + } + if (!tripCanManage() && $driver !== intval($session_user_id) && !($existing && $driver === intval($existing['trip_user_id']))) { + $error = 'You can log your own trips - logging one for someone else needs write access to Financial'; + return 0; + } + + $set = "trip_date = '$date', trip_source = '" . escapeSql($source) . "', trip_destination = '" . escapeSql($destination) . "', trip_miles = $miles, round_trip = $round, + trip_start_odometer = " . ($odo_start === null ? 'NULL' : $odo_start) . ", trip_end_odometer = " . ($odo_end === null ? 'NULL' : $odo_end) . ", + trip_purpose = '" . escapeSql($purpose) . "', trip_user_id = $driver, trip_client_id = $client_id, trip_location_id = $location_id, trip_ticket_id = $ticket_id"; + if ($existing) { + mysqli_query($mysqli, "UPDATE trips SET $set WHERE trip_id = $trip_id"); + return $trip_id; + } + mysqli_query($mysqli, "INSERT INTO trips SET $set, trip_created_by = " . intval($session_user_id)); + return mysqli_insert_id($mysqli); +} + +/** Delete a trip this agent may delete - the row it deleted, or null with $error. */ +function tripDelete($trip_id, &$error = '') { + global $mysqli; + $error = ''; + $row = tripRow($trip_id); + if (!$row) { + $error = 'That trip no longer exists, or is not one you can see'; + return null; + } + if (!tripCanDelete($row)) { + $error = "That is someone else's trip - deleting it needs full access to Financial"; + return null; + } + mysqli_query($mysqli, "DELETE FROM trips WHERE trip_id = " . intval($row['trip_id'])); + return $row; +} + +/** The trips of a ticket, a site or a client - newest first, scoped. For the cards that list them. */ +function tripsFor($column, $id, $limit = 10) { + global $mysqli; + if (!in_array($column, ['trip_ticket_id', 'trip_location_id', 'trip_client_id'], true)) { + return []; + } + $id = intval($id); + $rows = []; + $sql = mysqli_query($mysqli, "SELECT trips.*, driver.user_name AS driver_name, driver.user_avatar AS driver_avatar, client_name, location_name, ticket_prefix, ticket_number, ticket_subject + FROM trips " . tripJoinsSql() . " + WHERE trips.$column = $id AND trips.trip_archived_at IS NULL " . tripScopeSql() . " + ORDER BY trip_date DESC, trip_id DESC LIMIT " . intval($limit)); + while ($row = mysqli_fetch_assoc($sql)) { + $rows[] = $row; + } + return $rows; +} + +/** How many trips and miles a ticket, site or client has - [count, miles], scoped. */ +function tripTotalsFor($column, $id) { + global $mysqli; + if (!in_array($column, ['trip_ticket_id', 'trip_location_id', 'trip_client_id'], true)) { + return [0, 0.0]; + } + $row = mysqli_fetch_row(mysqli_query($mysqli, "SELECT COUNT(*), COALESCE(SUM(trip_miles), 0) FROM trips LEFT JOIN clients ON client_id = trip_client_id + WHERE trips.$column = " . intval($id) . " AND trips.trip_archived_at IS NULL " . tripScopeSql())); + return [intval($row[0]), floatval($row[1])]; +} + +/** A small table of trips - from tripsFor() - each opening its quick look. For a site's Trips tab. */ +function tripTableHtml(array $rows) { + $html = '
    ' + . ''; + foreach ($rows as $row) { + $open = 'href="#" class="ajax-modal" data-modal-size="lg" data-modal-url="modals/trip/trip.php?id=' . intval($row['trip_id']) . '"'; + $ticket = $row['ticket_number'] !== null && intval($row['trip_ticket_id']) ? '' . escapeHtml(ticketReference($row)) . '' : ''; + $html .= '' + . '' + . '' + . '' + . '' + . ''; + } + return $html . '
    DateTripDriver' . ucfirst(tripUnit()) . '
    ' . escapeHtml(date('M j, Y', strtotime($row['trip_date']))) . '
    ' . escapeHtml($row['trip_source']) . ' → ' . escapeHtml($row['trip_destination']) . '
    ' + . '
    ' . $ticket . escapeHtml($row['trip_purpose']) . '
    		' . formatAssignee($row['trip_user_id'], $row['driver_name'] ?? '', $row['driver_avatar'] ?? '', false, 'No driver') . '' . escapeHtml(tripMilesText($row['trip_miles'])) + . (intval($row['round_trip']) ? '' : '') . '
    '; +}