diff --git a/CHANGELOG.md b/CHANGELOG.md index 652defac7..fb093d694 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 2.9.1) 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 2.9.2) in the same pass. Nothing else is required. -This is a big release, with twelve database steps in one go, so take a backup before you update. +This is a big release, with thirteen 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: @@ -59,7 +59,12 @@ If you are coming from 26.08 or earlier, the database update still has to be run Click the value and pick a new one, or use the + at the end of a record's tags. Each change saves straight away. - Tickets: a closed ticket can no longer be changed, either from the ticket's windows or through the API. Merging is only offered between tickets of the same client. -- Invoicing a ticket: the invoice line now reads `Ticket TCK-123 - Subject - 10/14/2026`. It used to be a block of text with the agent, dates, contact, asset and time spent. You can still edit it before adding the line. +- Invoicing a ticket: + - The invoice line now reads `Ticket TCK-123 - Subject - 10/14/2026`. It used to be a block of text with the agent, dates, contact, asset and time spent. You can still edit it before adding the line. + - Billing a ticket goes in the ticket's history ("Billed on invoice INV-45"). It used to add an internal note to the conversation. + - An invoice made from a ticket is due on the client's terms, the same as New Invoice. A client set to On Receipt is due on receipt, where it used to get the default terms. + - Add Tickets on an invoice now adds a line for each ticket's time. To only put the tickets on the invoice, as before, switch off Bill their time. + - A ticket's time is counted the same way everywhere: Unbilled Time, the Invoice window, Add Tickets and the Unbilled Work report. A ticket counts once it is resolved or closed, and archived tickets and archived replies are left out. - Calendars: only admins can add, edit or delete calendars now. Agents can still add and edit events. - Licenses: archiving a license keeps its seats (the devices and users on it), so restoring it brings everything back. In 26.10, archiving took the seats off. - Vendors: deleting a vendor that has expenses, recurring expenses or payment provider fees archives it instead, so your books keep it. Deleting any vendor now also clears it from the assets, licenses, tickets and domains that named it. @@ -139,7 +144,7 @@ If you are coming from 26.08 or earlier, the database update still has to be run - Receivables Aging: what each client owes, split into not due yet, 1 to 30, 31 to 60, 61 to 90 and over 90 days late, and the overdue invoices, longest overdue first. - Recurring Revenue: monthly and yearly recurring revenue by client and category, and every recurring invoice with its next date. With Financial access, what is left after recurring expenses. - Tax Collected: tax and the sales it was charged on, per tax, by quarter or by month. - - Unbilled Work: billable tickets that are done but not invoiced, with the hours to bill (to the nearest 15 minutes, as the Invoice window does) and what they are worth at the client's rate. + - Unbilled Work: billable tickets that are done but not invoiced, with the hours to bill (rounded the way Billing Time in Admin > Settings > Invoice says, as Unbilled Time does) and what they are worth at the client's rate. - Time Detail by Client: per client, each ticket and the time on every reply, with the hours to bill. - Ticket Overview: tickets opened against resolved, the typical first reply and time to resolve, sources, priorities, categories, top clients and contacts, and a weekday by hour chart of when tickets come in. - Tickets by Client: volume and its change, urgent tickets, time logged, reply and resolution times, SLA and satisfaction for each client. @@ -207,6 +212,15 @@ If you are coming from 26.08 or earlier, the database update still has to be run - Quarterly recurring invoices, alongside monthly and yearly. They count as a third in monthly recurring revenue on the dashboard, the client pages, the client portal and the reports. - Period words: `{month}`, `{quarter}`, `{year}` and `{period}` in a recurring invoice's scope, notes or lines are filled in with the period each invoice covers, such as "Managed services November 2026", "Q4 2026" or "Nov 1 - Nov 30, 2026". - Invoice Now names the run it bills, whether it will be emailed and when the next one is, before you confirm. Pressing it twice, or in two tabs, bills that run only once. + - **Unbilled Time**, under Billing and in each client's menu, with a count of what is waiting: + - Every client with billable tickets that are done and not invoiced, with their tickets, the time logged, the hours to bill, their rate, what it comes to and how long the oldest has waited. Tick clients and make all their invoices at once - a new draft each, or onto each one's newest draft. + - One client's tickets, each with its hours to bill filled in and ready to change before it goes on. Tick the ones to bill and make an invoice or add them to one of the client's drafts, with a line for each ticket or one for all of them. The total follows as you change the hours, rate or tax. + - Not billable writes off ticked tickets so they leave the list. Each one's history says so. + - Two agents billing the same tickets at once can't both bill them. + - Billing Time in Admin > Settings > Invoice: round a ticket's time to 6, 12, 15 or 30 minutes or the hour, to the nearest step or always up, with a minimum a ticket bills, and the name of the invoice line. It starts as before: the nearest 15 minutes, no minimum. + - The ticket's Invoice window is redone. It shows the time logged by each agent and the hours that bills, with the client's rate (or the default rate) filled in, and it can add to one of the client's drafts. An open ticket can still be billed from here, with a warning that later time won't be. + - Add Tickets on an invoice bills their time: tick the tickets, change their hours, and they go on as lines at the rate. + - The client overview's Not yet invoiced shows what the unbilled time comes to and opens Unbilled Time. The dashboard and the Unbilled Work report link to it too. - **Tickets** - The ticket list has views for Open, Mine, Unassigned, Needs reply, Waiting, Overdue, Scheduled, Closed and All. - Each row shows whose move it is (yours or the client's) along with SLA and due badges, and status, priority and agent change right in the row. @@ -381,6 +395,8 @@ If you are coming from 26.08 or earlier, the database update still has to be run - Billing: the client's view of a quote offered Accept on a viewed quote that had run out, and the invoice and quote views put the browser's HTML into the history. - Billing: copying an invoice logged its old number with the prefix twice. - Recurring invoices: if cron missed a night, that recurring invoice stopped billing until someone moved its date. The missed run is now billed the next night, up to 7 days late. +- Invoicing a ticket: on an invoice that already had lines, its line went in near the top instead of at the end. A ticket already on an invoice could be billed again from a second window, and a ticket with 100 hours or more logged had no hours filled in. +- Invoicing a ticket for a client with no hourly rate filled in nothing. It now takes the default hourly rate, as the Unbilled Work report already did. - Recurring invoices: the email went to contacts that had been archived, and could reach the same address twice. - Client Portal: the recurring card on the home page didn't show for a client with only yearly recurring invoices, and counted archived ones. - Copy buttons in many places, such as pages that already had a window open, showed Copied! but copied nothing. Copy guest URL on invoices and quotes jumped the page to the top, and copying an empty field wiped your clipboard. @@ -413,7 +429,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.1, one file per step under `admin/database_updates/`, with `db.sql` matching 2.9.1: +- Database 2.8.0 to 2.9.2, one file per step under `admin/database_updates/`, with `db.sql` matching 2.9.2: - 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`. @@ -438,6 +454,7 @@ If you are coming from 26.08 or earlier, the database update still has to be run - `item_note` widened to 1000, `item_view_limit` made `NOT NULL DEFAULT 0` (NULL was unlimited), existing `item_key` values replaced by their SHA-256, and `item_name` filled from the shared record - `settings.config_share_max_hours` (720) and `config_share_require_protection` (0) - 2.9.1: `recurring_invoice_items.item_seat_source`, `item_seat_filter` (JSON) and `item_seat_minimum`, and `recurring_invoices.recurring_invoice_anchor_day`, backfilled from the day of each next date. + - 2.9.2: `settings.config_time_increment` (15), `config_time_rounding` ('nearest'), `config_time_minimum` (0) and `config_time_item_name` ('Support [Hourly]'). - 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`. @@ -536,6 +553,9 @@ If you are coming from 26.08 or earlier, the database update still has to be run - Schedules: `recurringInvoiceFrequencies()` (month, quarter, year), `recurringInvoiceMonths()`, `recurringInvoicePeriodWord()`, `recurringInvoiceMonthly()` and `recurringInvoiceMonthlySql()` (use it in SQL sums), `recurringInvoiceAfter()`, `recurringInvoicePeriod()` and `recurringInvoiceTokens()`. `validateRecurringFrequency()` accepts `quarter`. The edit handler keeps `recurring_invoice_anchor_day` unless the next date changes, and the add and edit handlers run their dates through `validateDate()`. - Seats: `recurringSeatSources()`, `recurringSeatFilter()`, `recurringSeatCount()` (null when a license is gone or isn't the client's), `recurringSeatDescribe()`, `recurringSeatOptions()`, `recurringSeatLines()` and `recurringInvoiceRefresh()`, which syncs the seat quantities and takes each line's tax at its current rate. `billing_item_save` takes `seat_source` (empty for typed), `seat_tag`, `seat_types[]`, `seat_software_id`, `seat_count` (`used` or `total`) and `seat_minimum` on recurring lines. A form without `seat_source` leaves the seat settings alone. - New handlers: `recurring_invoice_sync` (GET, `agent/post/billing.php`) and `recurring_seat_count` in `agent/ajax.php`, which returns `{count, quantity, label}` or `{error}` and needs Sales and access to the client. `itflowBillingSeatForm()` in `js/billing_items.js` drives the Edit Line seat fields. + - Billing time (`functions/billing.php`): `billingTimeRules()` reads the settings once a request (falling back to the old rules before 2.9.2 is applied, so they are not in `load_global_settings.php`), `billingTimeIncrements()`, `billingTimeRulesText()`, `billingTimeHours()`, `billingTimeRate()`, `billingTimeDescription()`. `billingUnbilledSql()` is the one definition of unbilled (billable, status Resolved or Closed, not archived, `ticket_invoice_id = 0`); `billingUnbilledTickets()`, `billingUnbilledByClient()` and `billingUnbilledCount()` read it, scoped to the agent's clients. The dashboard, client overview, sidebars and the Unbilled Work report use them. + - `billingTimeInvoice($client_id, $hours, $opts, &$error)` is the one path that bills time - Unbilled Time, `add_invoice_from_ticket`, `add_ticket_to_invoice`. It validates first, makes the draft with `billingInvoiceCreate()` when needed, claims the tickets with a conditional `UPDATE` (deleting a new draft that ends up with none), adds the lines through `billingItemSave()`, and logs ticket history, invoice history and the audit log. `billingTimeWriteOff()` sets `ticket_billable = 0`. `invoiceUnbilledTickets()` is replaced by `billingUnbilledTickets()`, and `roundToNearest15Min()` is no longer used. + - New page `agent/unbilled_time.php` with `js/unbilled_time.js`, and handlers `unbilled_invoice`, `unbilled_invoice_clients` and `unbilled_write_off` in `agent/post/billing.php`. `add_ticket_to_invoice` takes `ticket_ids[]`, `hours[id]`, `bill_time`, `item_name`, `price`, `tax_id` and `lines` (`each` or `one`). `add_invoice_from_ticket` keeps its field names. `remove_ticket_from_invoice` writes to the ticket's history. - Removed: `add_invoice_item`, `edit_invoice_item`, `delete_invoice_item`, `add_quote_item`, `edit_quote_item`, `delete_quote_item`, `add_recurring_invoice_item`, `edit_recurring_invoice_item`, `delete_recurring_invoice_item` and `link_invoice_to_ticket` (it wrote a column that does not exist), `update_invoice_items_order`, `update_quote_items_order` and `update_recurring_invoice_items_order` in `agent/ajax.php`, `agent/modals/invoice/invoice_item_edit.php`, `agent/modals/quote/quote_item_edit.php`, `agent/modals/recurring_invoice/recurring_invoice_item_edit.php`, `guest/guest_quote_upload_file_modal.php` and `js/product_autocomplete.js`. - 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/2.9.2.php b/admin/database_updates/2.9.2.php new file mode 100644 index 000000000..a6b361436 --- /dev/null +++ b/admin/database_updates/2.9.2.php @@ -0,0 +1,18 @@ + Settings > Invoice, billingTimeRules()): + // the step it rounds to in minutes, to the nearest step or always up, the + // least a ticket with time on it bills, and the invoice line's name. The + // defaults are how it has always been - the nearest 15 minutes, no minimum. + mysqli_query($mysqli, "ALTER TABLE `settings` + ADD COLUMN `config_time_increment` int(11) NOT NULL DEFAULT 15 AFTER `config_default_hourly_rate`, + ADD COLUMN `config_time_rounding` varchar(10) NOT NULL DEFAULT 'nearest' AFTER `config_time_increment`, + ADD COLUMN `config_time_minimum` int(11) NOT NULL DEFAULT 0 AFTER `config_time_rounding`, + ADD COLUMN `config_time_item_name` varchar(200) NOT NULL DEFAULT 'Support [Hourly]' AFTER `config_time_minimum`"); diff --git a/admin/post/settings_invoice.php b/admin/post/settings_invoice.php index 02346ad8a..7c51ab012 100644 --- a/admin/post/settings_invoice.php +++ b/admin/post/settings_invoice.php @@ -19,6 +19,16 @@ if (isset($_POST['edit_invoice_settings'])) { $config_invoice_paid_notification_email = escapeSql($_POST['config_invoice_paid_notification_email']); } + // Billing time - see billingTimeRules() + $config_time_increment = intval($_POST['config_time_increment'] ?? 15); + $config_time_increment = isset(billingTimeIncrements()[$config_time_increment]) ? $config_time_increment : 15; + $config_time_rounding = ($_POST['config_time_rounding'] ?? '') === 'up' ? 'up' : 'nearest'; + $config_time_minimum = max(0, min(1440, intval($_POST['config_time_minimum'] ?? 0))); + $config_time_item_name = trim((string) ($_POST['config_time_item_name'] ?? '')); + $config_time_item_name = escapeSql(mb_substr($config_time_item_name !== '' ? $config_time_item_name : 'Support [Hourly]', 0, 200)); + + mysqli_query($mysqli,"UPDATE settings SET config_time_increment = $config_time_increment, config_time_rounding = '$config_time_rounding', config_time_minimum = $config_time_minimum, config_time_item_name = '$config_time_item_name' WHERE company_id = 1"); + mysqli_query($mysqli,"UPDATE settings SET config_invoice_prefix = '$config_invoice_prefix', config_invoice_next_number = $config_invoice_next_number, config_invoice_footer = '$config_invoice_footer', config_invoice_show_tax_id = $config_invoice_show_tax_id, config_invoice_late_fee_enable = $config_invoice_late_fee_enable, config_invoice_late_fee_percent = $config_invoice_late_fee_percent, config_invoice_paid_notification_email = '$config_invoice_paid_notification_email', config_recurring_invoice_prefix = '$config_recurring_invoice_prefix', config_recurring_invoice_next_number = $config_recurring_invoice_next_number WHERE company_id = 1"); logAudit("Settings", "Edit", "$session_name edited invoice settings"); diff --git a/admin/settings_invoice.php b/admin/settings_invoice.php index 83f26ac6a..19c30a811 100644 --- a/admin/settings_invoice.php +++ b/admin/settings_invoice.php @@ -88,7 +88,55 @@ require_once "includes/inc_all_admin.php"; +
+ +

Billing Time

+

How the time logged on a billable ticket becomes hours on an invoice - in Unbilled Time, a ticket's Invoice window and Add Tickets. Each ticket's time is rounded once, as a whole. It is billed at the client's hourly rate, or the default rate in Defaults when the client has none.

+ +
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+ Once it has any time logged. A ticket with none bills nothing unless the hours are typed. +
+
+ +
+ + +
+ The name of the line the time goes on. The ticket number, subject and date go in its description. +
+
diff --git a/agent/ajax.php b/agent/ajax.php index ce1ea283d..84a088f59 100644 --- a/agent/ajax.php +++ b/agent/ajax.php @@ -246,7 +246,7 @@ if (isset($_GET['quick_pick_options'])) { $options[] = ['value' => (string) $status_id, 'label' => $status['ticket_status_name'], 'color' => preg_match('/^(#[0-9a-f]{3,8}|[a-z]{3,24})$/i', (string) $status['ticket_status_color']) ? $status['ticket_status_color'] : '']; } } elseif ($field === 'billable') { - $options[] = ['value' => '1', 'label' => 'Billable', 'icon' => 'fas fa-dollar-sign', 'description' => 'Shows on the Unbilled Tickets report until invoiced']; + $options[] = ['value' => '1', 'label' => 'Billable', 'icon' => 'fas fa-dollar-sign', 'description' => 'Shows under Unbilled Time once done, until invoiced']; $options[] = ['value' => '0', 'label' => 'Not billable', 'icon' => 'fas fa-minus']; } elseif ($field === 'assignee' || $field === 'recurring_assignee') { $options = quickPickAgents(); diff --git a/agent/client_overview.php b/agent/client_overview.php index c726689a0..a39f40ad2 100644 --- a/agent/client_overview.php +++ b/agent/client_overview.php @@ -505,10 +505,10 @@ $money_format = function ($amount) use ($currency_format, $client_currency_code, recurring invoice - + Not yet invoiced - ticket - + + ticket
diff --git a/agent/includes/client_side_nav.php b/agent/includes/client_side_nav.php index a1f526a89..c5d3010a8 100644 --- a/agent/includes/client_side_nav.php +++ b/agent/includes/client_side_nav.php @@ -344,6 +344,20 @@ + +
  • + "> + +

    + Unbilled Time + + + +

    +     +
    • + +
  • "> diff --git a/agent/includes/get_side_nav_counts.php b/agent/includes/get_side_nav_counts.php index a959f05a0..c973c54f5 100644 --- a/agent/includes/get_side_nav_counts.php +++ b/agent/includes/get_side_nav_counts.php @@ -25,6 +25,9 @@ $num_open_invoices = $row['num']; $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_invoice_id') AS num FROM recurring_invoices WHERE recurring_invoice_archived_at IS NULL " . clientScopeSql('recurring_invoice_client_id') . "")); $num_recurring_invoices = $row['num']; +// Unbilled tickets - billable, done and on no invoice (Billing > Unbilled Time) +$num_unbilled_tickets = $config_module_enable_accounting == 1 && $config_module_enable_ticketing == 1 && lookupUserPermission('module_sales') >= 1 ? billingUnbilledCount() : 0; + // Open Quotes Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('quote_id') AS num FROM quotes WHERE (quote_status = 'Sent' OR quote_status = 'Viewed') AND quote_archived_at IS NULL " . clientScopeSql('quote_client_id') . "")); $num_open_quotes = $row['num']; diff --git a/agent/includes/inc_all_client.php b/agent/includes/inc_all_client.php index e181c31d4..e73d2a55b 100644 --- a/agent/includes/inc_all_client.php +++ b/agent/includes/inc_all_client.php @@ -165,6 +165,9 @@ if (isset($_GET['client_id'])) { $recurring_monthly = floatval($row['recurring_monthly']); $num_recurring_invoices = intval($row['num_recurring_invoices']); + // Billable tickets done and not invoiced yet, for Unbilled Time + $num_unbilled_tickets = intval(mysqli_fetch_row(mysqli_query($mysqli, "SELECT COUNT(*) FROM tickets WHERE " . billingUnbilledSql() . " AND ticket_client_id = $client_id"))[0]); + // Get Credit Balance $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COALESCE(SUM(credit_amount), 0) AS credit_balance FROM credits WHERE credit_client_id = $client_id")); diff --git a/agent/includes/side_nav.php b/agent/includes/side_nav.php index 43c6b76af..6a162b6f6 100644 --- a/agent/includes/side_nav.php +++ b/agent/includes/side_nav.php @@ -150,6 +150,19 @@

    • + +
  • + "> + +

    + Unbilled Time + + + +

    +     +
    • +
  • "> diff --git a/agent/invoice.php b/agent/invoice.php index f53633fe0..066ee70b3 100644 --- a/agent/invoice.php +++ b/agent/invoice.php @@ -57,7 +57,7 @@ $can_manage_payments = lookupUserPermission('module_sales') >= 3 && lookupUserPe $can_edit_lines = billingCanEditItems('invoice', $invoice); $mail_ready = !empty($config_smtp_provider) && billingEmailableContacts('invoice', $client_id) > 0; $saved_card = $can_take_payment && in_array($status, ['Sent', 'Viewed'], true) && invoiceHasSavedCard($client_id); -$unbilled_tickets = $can_edit ? count(invoiceUnbilledTickets($client_id)) : 0; +$unbilled_tickets = $can_edit && $can_edit_lines && $config_module_enable_ticketing ? count(billingUnbilledTickets($client_id)) : 0; $guest_url = billingGuestUrl('invoice', $invoice); $csrf = $_SESSION['csrf_token']; diff --git a/agent/modals/billing/billing_form.php b/agent/modals/billing/billing_form.php index fde4f71e9..285d7a2d9 100644 --- a/agent/modals/billing/billing_form.php +++ b/agent/modals/billing/billing_form.php @@ -30,10 +30,11 @@ $form_category_id = intval($form_value('category_id', '0')); $form_categories = billingCategories($form_edit ? $form_value('created_at') : null); $form_discount = floatval($form_value('discount_amount', '0')); -// Net terms - the client's, or the default - for a new invoice's due date +// Net terms for a new invoice's due date - the client's (0 is On Receipt), as +// the invoice is saved with; the default until a client is picked $form_terms = intval($config_default_net_terms); if ($form_client_id) { - $form_terms = intval(getFieldById('clients', $form_client_id, 'client_net_terms')) ?: $form_terms; + $form_terms = intval(getFieldById('clients', $form_client_id, 'client_net_terms')); } $form_clients = []; @@ -61,7 +62,7 @@ $form_scope_placeholder = [
    • @@ -119,7 +120,7 @@ $form_scope_placeholder = [ -
    days from the invoice date - terms.
    +
    - terms.
    @@ -235,7 +236,7 @@ $form_scope_placeholder = [ if (due && date) { due.value = plus(date.value, terms()); if (note) { - note.textContent = terms() + ' days from the invoice date - ' + (client && client.value ? "the client's" : 'the default') + ' terms.'; + note.textContent = (terms() ? terms() + ' days from the invoice date' : 'Due on receipt') + ' - ' + (client && client.value ? "the client's" : 'the default') + ' terms.'; } } } diff --git a/agent/modals/invoice/invoice_add_ticket.php b/agent/modals/invoice/invoice_add_ticket.php index b3985db4f..19323c455 100644 --- a/agent/modals/invoice/invoice_add_ticket.php +++ b/agent/modals/invoice/invoice_add_ticket.php @@ -1,9 +1,11 @@ Settings > Invoice says), ready to + * change, and goes on as a line at the rate - or, with Bill their time off, + * goes on without a line, for work already on the invoice. ?invoice_id= */ require_once '../../../includes/modal_header.php'; @@ -17,8 +19,16 @@ if (!$invoice) { } $client_id = intval($invoice['client_id']); enforceClientAccess(); +if (!billingCanEditItems('invoice', $invoice)) { + exit(json_encode(['error' => billingNumber('invoice', $invoice) . " can't take more lines - it is paid, cancelled or non-billable."])); +} -$tickets = invoiceUnbilledTickets($client_id); +$tickets = billingUnbilledTickets($client_id); +$rules = billingTimeRules(); +$first = $tickets ? reset($tickets) : null; +$rate = $first ? $first['rate'] : billingTimeRate(getFieldById('clients', $client_id, 'client_rate')); +$currency = (string) $invoice['invoice_currency_code']; +$taxes = billingTaxes(); ob_start(); @@ -27,28 +37,78 @@ ob_start();
    Add Tickets
    -
    +
    - 's billable tickets, resolved or closed, that aren't on an invoice. Adding one marks it billed - its time isn't added as a line. + 's billable tickets, resolved or closed, that aren't on an invoice. The hours are the time logged, rounded - change them before adding.
    -
    - -
    diff --git a/agent/modals/ticket/ticket_invoice_add.php b/agent/modals/ticket/ticket_invoice_add.php index 4437f0362..9ffb160d1 100644 --- a/agent/modals/ticket/ticket_invoice_add.php +++ b/agent/modals/ticket/ticket_invoice_add.php @@ -1,307 +1,249 @@ Settings > Invoice says) and the client's rate + * are filled in, ready to change. A ticket still open can be billed from + * here too - time logged after that isn't billed. ?ticket_id= + */ + require_once '../../../includes/modal_header.php'; enforceUserPermission('module_sales', 2); -// The ticket, after the module and client checks - or the modal's error $ticket = ticketForModal($_GET['ticket_id'] ?? 0, 2); $ticket_id = intval($ticket['ticket_id']); -if (!intval($ticket['ticket_client_id'])) { - echo json_encode(['error' => 'Move the ticket to a client before invoicing it.']); - exit; +$reference = ticketReference($ticket); +if (!$client_id) { + exit(json_encode(['error' => 'Move the ticket to a client before invoicing it.'])); +} +if (intval($ticket['ticket_invoice_id'])) { + $on = billingRow('invoice', intval($ticket['ticket_invoice_id'])); + exit(json_encode(['error' => "$reference is already billed" . ($on ? ' on ' . billingNumber('invoice', $on) : '') . '.'])); +} +if (!intval($ticket['ticket_billable'])) { + exit(json_encode(['error' => "$reference isn't billable - mark it billable first."])); } -$ticket_sql = mysqli_query( - $mysqli, - "SELECT asset_id, asset_name, asset_type, category_name, client_id, client_rate, contact_id, - contact_name, location_address, location_city, location_id, location_name, location_phone, - location_state, location_zip, ticket_assigned_to, ticket_billable, ticket_category, - ticket_created_at, ticket_created_by, ticket_first_response_at, ticket_number, - ticket_onsite, ticket_prefix, ticket_priority, ticket_quote_id, ticket_resolved_at, - ticket_subject, user_name FROM tickets - LEFT JOIN clients ON ticket_client_id = client_id - LEFT JOIN contacts ON ticket_contact_id = contact_id - LEFT JOIN users ON ticket_assigned_to = user_id - LEFT JOIN locations ON ticket_location_id = location_id - LEFT JOIN assets ON ticket_asset_id = asset_id - LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id - LEFT JOIN categories ON ticket_category = category_id - WHERE ticket_id = $ticket_id - " . clientScopeSql('ticket_client_id') . " - LIMIT 1" -); - -$row = mysqli_fetch_assoc($ticket_sql); -$client_id = intval($row['client_id']); -$client_rate = floatval($row['client_rate']); -$ticket_prefix = escapeHtml($row['ticket_prefix']); -$ticket_number = intval($row['ticket_number']); -$ticket_category = intval($row['ticket_category']); -$ticket_category_display = escapeHtml($row['category_name']); -$ticket_subject = escapeHtml($row['ticket_subject']); -$ticket_priority = escapeHtml($row['ticket_priority']); -$ticket_billable = intval($row['ticket_billable']); -$ticket_onsite = intval($row['ticket_onsite']); - -$ticket_created_at = escapeHtml($row['ticket_created_at']); -$ticket_created_by = intval($row['ticket_created_by']); -$ticket_date = date('Y-m-d g:i A', strtotime($ticket_created_at)); -$ticket_date_description = date('m/d/Y', strtotime($ticket_created_at)); -$ticket_first_response_at = escapeHtml($row['ticket_first_response_at']); -if ($ticket_first_response_at) { - $ticket_first_response_date_time = date('Y-m-d g:i A', strtotime($ticket_first_response_at)); -} else { - $ticket_first_response_date_time = ''; +$unbilled = billingUnbilledTickets($client_id, [$ticket_id], true); +$row = $unbilled[$ticket_id] ?? null; +if (!$row) { + exit(json_encode(['error' => "$reference can't be billed - it is archived."])); } -$ticket_resolved_at = escapeHtml($row['ticket_resolved_at']); -if ($ticket_resolved_at) { - $ticket_resolved_date = date('Y-m-d g:i A', strtotime($ticket_resolved_at)); -} else { - $ticket_resolved_date = ''; +$rules = billingTimeRules(); +$open = !in_array(intval($row['ticket_status']), [TICKET_STATUS_RESOLVED, TICKET_STATUS_CLOSED], true); +$currency = (string) $session_company_currency; + +// The time on it, by who logged it +$agents = []; +$sql = mysqli_query($mysqli, "SELECT user_name, COUNT(*) AS entries, SUM(TIME_TO_SEC(ticket_reply_time_worked)) AS seconds FROM ticket_replies + LEFT JOIN users ON user_id = ticket_reply_by + WHERE ticket_reply_ticket_id = $ticket_id AND ticket_reply_archived_at IS NULL AND ticket_reply_time_worked > '00:00:00' + GROUP BY ticket_reply_by ORDER BY seconds DESC"); +while ($agent = mysqli_fetch_assoc($sql)) { + $agents[] = $agent; } -$ticket_assigned_to = intval($row['ticket_assigned_to']); -if ($ticket_assigned_to) { - $ticket_assigned_agent = escapeHtml($row['user_name']); -} else { - $ticket_assigned_agent = ''; +$drafts = []; +$sql = mysqli_query($mysqli, "SELECT invoice_id, invoice_prefix, invoice_number, invoice_scope, invoice_amount FROM invoices + WHERE invoice_client_id = $client_id AND invoice_status = 'Draft' AND invoice_archived_at IS NULL ORDER BY invoice_date DESC, invoice_id DESC"); +while ($draft = mysqli_fetch_assoc($sql)) { + $drafts[intval($draft['invoice_id'])] = $draft; } - -$ticket_quote_id = intval($row['ticket_quote_id']); - -$contact_id = intval($row['contact_id']); -$contact_name = escapeHtml($row['contact_name']); - -$asset_id = intval($row['asset_id']); -$asset_name = escapeHtml($row['asset_name']); -$asset_type = escapeHtml($row['asset_type']); - -$location_id = intval($row['location_id']); -$location_name = escapeHtml($row['location_name']); -$location_address = escapeHtml($row['location_address']); -$location_city = escapeHtml($row['location_city']); -$location_state = escapeHtml($row['location_state']); -$location_zip = escapeHtml($row['location_zip']); -$location_phone = formatPhoneNumber($row['location_phone']); - -if ($client_id) { - enforceClientAccess(); -} - -//Get Total Ticket Time -$ticket_total_reply_time = mysqli_query($mysqli, "SELECT SEC_TO_TIME(SUM(TIME_TO_SEC(ticket_reply_time_worked))) AS ticket_total_reply_time FROM ticket_replies WHERE ticket_reply_archived_at IS NULL AND ticket_reply_ticket_id = $ticket_id"); -$row = mysqli_fetch_assoc($ticket_total_reply_time); -$ticket_total_reply_time = escapeHtml($row['ticket_total_reply_time']); -$ticket_total_reply_time_display = formatDuration($ticket_total_reply_time); - -$sql_invoices = mysqli_query($mysqli, "SELECT invoice_amount, invoice_date, invoice_due, invoice_id, invoice_number, invoice_prefix, - invoice_scope, invoice_status FROM invoices WHERE invoice_status LIKE 'Draft' AND invoice_client_id = $client_id ORDER BY invoice_number ASC"); +$categories = billingCategories(); +$taxes = billingTaxes(); +$scopes = ["Ticket $reference - " . $row['ticket_subject'], 'Support - ' . date('F Y')]; ob_start(); ?> -
    -
    Invoice this ticket
    +
    Invoice
    -
    + +
    - 0) { ?> -