diff --git a/client_tickets.php b/client_tickets.php index bd922600..f76c5522 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -41,7 +41,7 @@ $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM tickets WHERE client_id = $client_id - AND (ticket_number LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status LIKE '%$q%' OR ticket_priority LIKE '%$q%') + AND (CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status LIKE '%$q%' OR ticket_priority LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); @@ -71,7 +71,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); "> - + @@ -84,6 +84,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); while($row = mysqli_fetch_array($sql)){ $ticket_id = $row['ticket_id']; + $ticket_prefix = $row['ticket_prefix']; $ticket_number = $row['ticket_number']; $ticket_subject = $row['ticket_subject']; $ticket_details = $row['ticket_details']; @@ -114,7 +115,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); ?> - + diff --git a/edit_ticket_modal.php b/edit_ticket_modal.php index 3ca4f09d..c49bf76e 100644 --- a/edit_ticket_modal.php +++ b/edit_ticket_modal.php @@ -2,7 +2,7 @@
-
Ticket # for
+
Ticket for
diff --git a/post.php b/post.php index e65340f5..92685f45 100644 --- a/post.php +++ b/post.php @@ -863,7 +863,7 @@ if(isset($_POST['add_ticket'])){ $new_config_ticket_next_number = $config_ticket_next_number + 1; mysqli_query($mysqli,"UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = $session_company_id"); - mysqli_query($mysqli,"INSERT INTO tickets SET ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 'Open', ticket_created_at = NOW(), ticket_created_by = $session_user_id, client_id = $client_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 'Open', ticket_created_at = NOW(), ticket_created_by = $session_user_id, client_id = $client_id, company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = '$subject', log_created_at = NOW(), client_id = $client_id, company_id = $session_company_id, user_id = $session_user_id"); @@ -2710,6 +2710,7 @@ if(isset($_POST['add_payment'])){ $row = mysqli_fetch_array($sql); $invoice_amount = $row['invoice_amount']; + $invoice_prefix = $row['invoice_prefix']; $invoice_number = $row['invoice_number']; $invoice_url_key = $row['invoice_url_key']; $client_name = $row['client_name']; @@ -2760,8 +2761,8 @@ if(isset($_POST['add_payment'])){ // Content $mail->isHTML(true); // Set email format to HTML - $mail->Subject = "Payment Recieved - Invoice $invoice_number"; - $mail->Body = "Hello $client_name,

We have recieved your payment in the amount of $$formatted_amount for invoice $invoice_number. Please keep this email as a receipt for your records.

Amount: $$formatted_amount
Balance: $$formatted_invoice_balance

Thank you for your business!


~
$company_name
$company_phone"; + $mail->Subject = "Payment Recieved - Invoice $invoice_prefix$invoice_number"; + $mail->Body = "Hello $client_name,

We have recieved your payment in the amount of $$formatted_amount for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

Amount: $$formatted_amount
Balance: $$formatted_invoice_balance

Thank you for your business!


~
$company_name
$company_phone"; $mail->send(); echo 'Message has been sent'; @@ -2796,8 +2797,8 @@ if(isset($_POST['add_payment'])){ // Content $mail->isHTML(true); // Set email format to HTML - $mail->Subject = "Partial Payment Recieved - Invoice $invoice_number"; - $mail->Body = "Hello $client_name,

We have recieved partial payment in the amount of $$formatted_amount and it has been applied to invoice $invoice_number. Please keep this email as a receipt for your records.

Amount: $$formatted_amount
Balance: $$formatted_invoice_balance

Thank you for your business!


~
$company_name
$company_phone"; + $mail->Subject = "Partial Payment Recieved - Invoice $invoice_prefix$invoice_number"; + $mail->Body = "Hello $client_name,

We have recieved partial payment in the amount of $$formatted_amount and it has been applied to invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

Amount: $$formatted_amount
Balance: $$formatted_invoice_balance

Thank you for your business!


~
$company_name
$company_phone"; $mail->send(); echo 'Message has been sent'; diff --git a/recurring.php b/recurring.php index c0bddd2b..20e32adc 100644 --- a/recurring.php +++ b/recurring.php @@ -20,7 +20,7 @@ if(isset($_GET['q'])){ if(!empty($_GET['sb'])){ $sb = mysqli_real_escape_string($mysqli,$_GET['sb']); }else{ - $sb = "recurring_number"; + $sb = "recurring_next_date"; } if(isset($_GET['o'])){ diff --git a/ticket.php b/ticket.php index 5c4633e4..daa19a3e 100644 --- a/ticket.php +++ b/ticket.php @@ -79,7 +79,7 @@ if(isset($_GET['ticket_id'])){
-

Ticket

+

Ticket

diff --git a/tickets.php b/tickets.php index 694c56c7..34f9885a 100644 --- a/tickets.php +++ b/tickets.php @@ -60,7 +60,7 @@ AND tickets.company_id = $session_company_id AND ticket_status LIKE '%$status%' AND DATE(ticket_created_at) BETWEEN '$dtf' AND '$dtt' - AND (ticket_number LIKE '%$q%' OR client_name LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_priority LIKE '%$q%') + AND (CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR client_name LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_priority LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); @@ -120,7 +120,7 @@
NumberNumber Subject Date Opened Status
"> - + @@ -135,6 +135,8 @@ while($row = mysqli_fetch_array($sql)){ $ticket_id = $row['ticket_id']; + $ticket_prefix = $row['ticket_prefix']; + $ticket_number = $row['ticket_number']; $ticket_subject = $row['ticket_subject']; $ticket_details = $row['ticket_details']; $ticket_priority = $row['ticket_priority']; @@ -166,7 +168,7 @@ ?> - +
NumberNumber Status Created Client