From c389c6888318fc7c98765bdc18bd8e4df1014551 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 27 May 2024 13:46:17 -0400 Subject: [PATCH] Default Tickets to not billable and add Billable option to Create Ticket --- ajax_calendar_events.php | 139 --------------------------------------- ticket_add_modal.php | 15 +++++ 2 files changed, 15 insertions(+), 139 deletions(-) delete mode 100644 ajax_calendar_events.php diff --git a/ajax_calendar_events.php b/ajax_calendar_events.php deleted file mode 100644 index c332f7e7..00000000 --- a/ajax_calendar_events.php +++ /dev/null @@ -1,139 +0,0 @@ - - -

-

- intval($row['event_id']), - 'title' => $row['event_title'], - 'start' => $row['event_start'], - 'end' => $row['event_end'], - 'color' => $row['calendar_color'] - ]; -} - -// Fetch invoices created -$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN invoices ON client_id = invoice_client_id WHERE invoice_date BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $events[] = [ - 'id' => intval($row['invoice_id']), - 'title' => $row['invoice_prefix'] . $row['invoice_number'] . " created -scope: " . $row['invoice_scope'], - 'start' => $row['invoice_date'], - 'display' => 'list-item', - 'color' => 'blue', - 'url' => 'invoice.php?invoice_id=' . $row['invoice_id'] - ]; -} - -// Fetch quotes created -$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN quotes ON client_id = quote_client_id WHERE quote_date BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $events[] = [ - 'id' => intval($row['quote_id']), - 'title' => $row['quote_prefix'] . $row['quote_number'] . " " . $row['quote_scope'], - 'start' => $row['quote_date'], - 'display' => 'list-item', - 'color' => 'purple', - 'url' => 'quote.php?quote_id=' . $row['quote_id'] - ]; -} - -// Fetch tickets created -$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_created_at BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $username = $row['user_name']; - $username = empty($username) ? "" : "[". substr($row['user_name'], 0, 9) . "...]"; - $events[] = [ - 'id' => intval($row['ticket_id']), - 'title' => $row['ticket_prefix'] . $row['ticket_number'] . " created - " . $row['ticket_subject'] . " " . $username . "{" . $row['ticket_status_name'] . "}", - 'start' => $row['ticket_created_at'], - 'color' => getTicketColor($row['ticket_status']), - 'url' => 'ticket.php?ticket_id=' . $row['ticket_id'] - ]; -} - -// Fetch recurring tickets -$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN scheduled_tickets ON client_id = scheduled_ticket_client_id LEFT JOIN users ON scheduled_ticket_assigned_to = user_id WHERE scheduled_ticket_next_run BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $username = $row['user_name']; - $username = empty($username) ? "" : "[". substr($row['user_name'], 0, 9) . "...]"; - $events[] = [ - 'id' => intval($row['scheduled_ticket_id']), - 'title' => "R Ticket (" . $row['scheduled_ticket_frequency'] . ") - " . $row['scheduled_ticket_subject'] . " " . $username, - 'start' => $row['scheduled_ticket_next_run'], - 'color' => $row['calendar_color'], - 'url' => 'client_recurring_tickets.php?client_id=' . $row['client_id'] - ]; -} - -// Fetch scheduled tickets -$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_schedule BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $username = $row['user_name']; - $username = empty($username) ? "" : substr($row['user_name'], 0, 9) . "..."; - $events[] = [ - 'id' => intval($row['ticket_id']), - 'title' => $row['ticket_prefix'] . $row['ticket_number'] . " scheduled - " . $row['ticket_subject'] . " [" . $username . "]{" . $row['ticket_status_name'] . "}", - 'start' => $row['ticket_schedule'], - 'color' => strtotime($row['ticket_schedule']) < time() ? (!empty($row['ticket_schedule']) ? "red" : "green") : "grey", - 'url' => 'ticket.php?ticket_id=' . $row['ticket_id'] - ]; -} - -// Fetch vendors created -$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN vendors ON client_id = vendor_client_id WHERE vendor_template = 0 AND vendor_created_at BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $events[] = [ - 'id' => intval($row['vendor_id']), - 'title' => "Vendor : '" . $row['vendor_name'] . "' created", - 'start' => $row['vendor_created_at'], - 'color' => 'brown', - 'url' => 'client_vendors.php?client_id=' . $row['client_id'] - ]; -} - -// Fetch clients added -$sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_created_at BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $events[] = [ - 'id' => intval($row['client_id']), - 'title' => "Client: '" . $row['client_name'] . "' created", - 'start' => $row['client_created_at'], - 'color' => 'brown', - 'url' => 'client_overview.php?client_id=' . $row['client_id'] - ]; -} - -echo json_encode($events); - -function getTicketColor($status) { - switch ($status) { - case 1: - return 'red'; - case 2: - return 'blue'; - case 3: - return 'grey'; - default: - return 'black'; - } -} -?> \ No newline at end of file diff --git a/ticket_add_modal.php b/ticket_add_modal.php index 0ee8c3b0..7b2922f1 100644 --- a/ticket_add_modal.php +++ b/ticket_add_modal.php @@ -139,6 +139,21 @@ + +
+ +
+
+ +
+ +
+
+ +