diff --git a/cron.php b/cron.php index 9df90de5..016364d6 100644 --- a/cron.php +++ b/cron.php @@ -297,6 +297,7 @@ if (mysqli_num_rows($sql_scheduled_tickets) > 0) { $ticket_subject = $row['ticket_subject']; $ticket_details = $row['ticket_details']; // Output on settings_mail_queue.php is sanitized through HTML Purifier + $data = []; // Notify client by email their ticket has been raised, if general notifications are turned on & there is a valid contact email if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1 && filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { @@ -304,7 +305,15 @@ if (mysqli_num_rows($sql_scheduled_tickets) > 0) { $email_subject = mysqli_real_escape_string($mysqli, "Ticket created - [$ticket_prefix$ticket_number] - $ticket_subject (scheduled)"); $email_body = mysqli_real_escape_string($mysqli, "##- Please type your reply above this line -##

Hello, $contact_name

A ticket regarding \"$ticket_subject\" has been automatically created for you.

--------------------------------
$details--------------------------------

Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: Open
Portal: https://$config_base_url/portal/ticket.php?id=$id

~
$company_name
Support Department
$config_ticket_from_email
$company_phone"); - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$contact_email_escaped', email_recipient_name = '$contact_name_escaped', email_from = '$config_ticket_from_email_escaped', email_from_name = '$config_ticket_from_name_escaped', email_subject = '$email_subject', email_content = '$email_body'"); + $email = [ + 'recipient' => $contact_email_escaped, + 'recipient_name' => $contact_name_escaped, + 'subject' => $email_subject, + 'body' => $email_body + ]; + + $data[] = $email; + } @@ -314,9 +323,19 @@ if (mysqli_num_rows($sql_scheduled_tickets) > 0) { $email_subject = mysqli_real_escape_string($mysqli, "ITFlow - New Scheduled Ticket - $client_name: $ticket_subject"); $email_body = mysqli_real_escape_string($mysqli, "Hello,

This is a notification that a new scheduled ticket has been raised in ITFlow.
Ticket: $ticket_prefix$ticket_number
Client: $client_name
Priority: $priority
Link: https://$config_base_url/ticket.php?ticket_id=$id

--------------------------------

$ticket_subject
$ticket_details"); - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$config_ticket_new_ticket_notification_email', email_recipient_name = 'ITFlow Agents', email_from = '$config_ticket_from_email', email_from_name = '$config_ticket_from_name', email_subject = '$email_subject', email_content = '$email_body'"); + $email = [ + 'recipient' => $config_ticket_new_ticket_notification_email, + 'recipient_name' => $config_ticket_from_name_escaped, + 'subject' => $email_subject, + 'body' => $email_body + ]; + + $data[] = $email; } + // Add to the mail queue + addToMailQueue($mysqli, $data); + // Set the next run date if ($frequency == "weekly") { diff --git a/cron_ticket_email_parser.php b/cron_ticket_email_parser.php index cc7d78ab..a821d939 100644 --- a/cron_ticket_email_parser.php +++ b/cron_ticket_email_parser.php @@ -157,21 +157,23 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date } - + $data = []; // E-mail client notification that ticket has been created if ($config_ticket_client_general_notifications == 1) { // Insert email into queue (first, escape vars) $contact_email_escaped = sanitizeInput($contact_email); $contact_name_escaped = sanitizeInput($contact_name); - $config_ticket_from_email_escaped = sanitizeInput($config_ticket_from_email); - $config_ticket_from_name_escaped = sanitizeInput($config_ticket_from_name); $subject_escaped = mysqli_escape_string($mysqli, "Ticket created - [$config_ticket_prefix$ticket_number] - $subject"); $body_escaped = mysqli_escape_string($mysqli, "##- Please type your reply above this line -##

Hello, $contact_name

Thank you for your email. A ticket regarding \"$subject\" has been automatically created for you.

Ticket: $config_ticket_prefix$ticket_number
Subject: $subject
Status: Open
https://$config_base_url/portal/ticket.php?id=$id

~
$company_name
Support Department
$config_ticket_from_email
$company_phone"); - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$contact_email_escaped', email_recipient_name = '$contact_name_escaped', email_from = '$config_ticket_from_email_escaped', email_from_name = '$config_ticket_from_name_escaped', email_subject = '$subject_escaped', email_content = '$body_escaped'"); - + $data[] = [ + 'recipient' => $contact_email_escaped, + 'recipient_name' => $contact_name_escaped, + 'subject' => $subject_escaped, + 'body' => $body_escaped + ]; } // Notify agent DL of the new ticket, if populated with a valid email @@ -188,9 +190,16 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date $email_subject = mysqli_escape_string($mysqli, "ITFlow - New Ticket - $client_name: $subject"); $email_body = "Hello,

This is a notification that a new ticket has been raised in ITFlow.
Client: $client_name
Priority: Low (email parsed)
Link: https://$config_base_url/ticket.php?ticket_id=$id

--------------------------------

$subject
$details"; - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$config_ticket_new_ticket_notification_email', email_recipient_name = 'ITFlow Agents', email_from = '$config_ticket_from_email', email_from_name = '$config_ticket_from_name', email_subject = '$email_subject', email_content = '$email_body'"); + $data[] = [ + 'recipient' => $config_ticket_new_ticket_notification_email, + 'recipient_name' => $config_ticket_from_name, + 'subject' => $email_subject, + 'body' => $email_body + ]; } + addToMailQueue($mysqli, $data); + return true; } @@ -310,6 +319,9 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac } + // E-mail techs assigned to the ticket to notify them of the reply + $ticket_assigned_to = mysqli_query($mysqli, "SELECT ticket_assigned_to FROM tickets WHERE ticket_id = $ticket_id LIMIT 1"); + // Update Ticket Last Response Field & set ticket to open as client has replied mysqli_query($mysqli, "UPDATE tickets SET ticket_status = 'Client-Replied' WHERE ticket_id = $ticket_id AND ticket_client_id = $client_id LIMIT 1"); diff --git a/functions.php b/functions.php index b471d80b..c2e8d372 100644 --- a/functions.php +++ b/functions.php @@ -871,4 +871,20 @@ function calculateAccountBalance($mysqli, $account_id) { } return $balance; +} + +function addToMailQueue($mysqli, $data) { + $config_invoice_from_email = strval(getSettingValue($mysqli, 'config_invoice_from_email')); + $config_invoice_from_name = strval(getSettingValue($mysqli, 'config_invoice_from_name')); + + foreach ($data as $email) { + $recipient = $email['email']; + $recipient_name = $email['name']; + $subject = $email['subject']; + $body = $email['body']; + + mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$recipient', email_recipient_name = '$recipient_name', email_from = '$config_invoice_from_email', email_from_name = '$config_invoice_from_name', email_subject = '$subject', email_content = '$body'"); + } + + return true; } \ No newline at end of file diff --git a/portal/portal_post.php b/portal/portal_post.php index 40dac547..b09bdfc0 100644 --- a/portal/portal_post.php +++ b/portal/portal_post.php @@ -50,8 +50,17 @@ if (isset($_POST['add_ticket'])) { $email_subject = "ITFlow - New Ticket - $client_name: $subject"; $email_body = "Hello,

This is a notification that a new ticket has been raised in ITFlow.
Client: $client_name
Priority: $priority
Link: https://$config_base_url/ticket.php?ticket_id=$id

$subject
$details"; - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$config_ticket_new_ticket_notification_email', email_recipient_name = 'ITFlow Agents', email_from = '$config_ticket_from_email', email_from_name = '$config_ticket_from_name', email_subject = '$email_subject', email_content = '$email_body'"); - } + // Queue Mail + $data = [ + [ + 'recipient' => $config_ticket_new_ticket_notification_email, + 'recipient_name' => $config_ticket_from_name, + 'subject' => $email_subject, + 'body' => $email_body, + ] + ]; + addToMailQueue($mysqli, $data); + } // Logging mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = 'Client contact $session_contact_name created ticket $subject', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id"); diff --git a/post/contact.php b/post/contact.php index f750e916..a01fa4d7 100644 --- a/post/contact.php +++ b/post/contact.php @@ -119,8 +119,15 @@ if (isset($_POST['edit_contact'])) { $body = mysqli_real_escape_string($mysqli, "Hello, $contact_name

$session_company_name has created a support portal account for you.

Username: $email
Password: $password_info

Login URL: https://$config_base_url/portal/

~
$session_company_name
Support Department
$config_ticket_from_email"); // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$email', email_recipient_name = '$name', email_from = '$config_ticket_from_email_escaped', email_from_name = '$config_ticket_from_name_escaped', email_subject = '$subject', email_content = '$body'"); - + $data = [ + [ + 'recipient' => $email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body, + ] + ]; + addToMailQueue($mysqli, $data); // Get Email ID for reference $email_id = mysqli_insert_id($mysqli); diff --git a/post/invoice.php b/post/invoice.php index 46983c13..2b2c8a57 100644 --- a/post/invoice.php +++ b/post/invoice.php @@ -663,6 +663,8 @@ if (isset($_POST['add_payment'])) { //Calculate the Invoice balance $invoice_balance = $invoice_amount - $total_payments_amount; + $email_data = []; + //Determine if invoice has been paid then set the status accordingly if ($invoice_balance == 0) { @@ -674,7 +676,14 @@ if (isset($_POST['add_payment'])) { $body = mysqli_real_escape_string($mysqli, "Hello $contact_name,

We have received your payment in the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

Amount: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
Balance: " . numfmt_format_currency($currency_format, $invoice_balance, $invoice_currency_code) . "

Thank you for your business!


~
$company_name
Billing Department
$config_invoice_from_email
$company_phone"); // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$contact_email_escaped', email_recipient_name = '$contact_name_escaped', email_from = '$config_invoice_from_email_escaped', email_from_name = '$config_invoice_from_name_escaped', email_subject = '$subject', email_content = '$body'"); + $email = [ + 'recipient' => $contact_email_escaped, + 'recipient_name' => $contact_name_escaped, + 'subject' => $subject, + 'body' => $body + ]; + + $email_data = $email; // Get Email ID for reference $email_id = mysqli_insert_id($mysqli); @@ -698,7 +707,14 @@ if (isset($_POST['add_payment'])) { $body = mysqli_real_escape_string($mysqli, "Hello $contact_name,

We have recieved partial payment in the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " and it has been applied to invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

Amount: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
Balance: " . numfmt_format_currency($currency_format, $invoice_balance, $invoice_currency_code) . "

Thank you for your business!


~
$company_name
Billing Department
$config_invoice_from_email
$company_phone"); // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$contact_email_escaped', email_recipient_name = '$contact_name_escaped', email_from = '$config_invoice_from_email_escaped', email_from_name = '$config_invoice_from_name_escaped', email_subject = '$subject', email_content = '$body'"); + $email = [ + 'recipient' => $contact_email_escaped, + 'recipient_name' => $contact_name_escaped, + 'subject' => $subject, + 'body' => $body + ]; + + $email_data = $email; // Get Email ID for reference $email_id = mysqli_insert_id($mysqli); @@ -713,6 +729,11 @@ if (isset($_POST['add_payment'])) { } + // Add emails to queue + if (!empty($email)) { + addToMailQueue($mysqli, $email); + } + //Update Invoice Status mysqli_query($mysqli,"UPDATE invoices SET invoice_status = '$invoice_status' WHERE invoice_id = $invoice_id"); @@ -840,7 +861,16 @@ if (isset($_GET['email_invoice'])) { } // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$contact_email_escaped', email_recipient_name = '$contact_name_escaped', email_from = '$config_invoice_from_email_escaped', email_from_name = '$config_invoice_from_name_escaped', email_subject = '$subject', email_content = '$body'"); + $data = [ + [ + 'email' => $contact_email_escaped, + 'name' => $contact_name_escaped, + 'subject' => $subject, + 'body' => $body + ] + ]; + + addToMailQueue($mysqli, $data); // Get Email ID for reference $email_id = mysqli_insert_id($mysqli); @@ -865,21 +895,28 @@ if (isset($_GET['email_invoice'])) { AND contact_email != '' AND contact_client_id = $client_id" ); + + $data = []; + while ($billing_contact = mysqli_fetch_array($sql_billing_contacts)) { $billing_contact_name = sanitizeInput($billing_contact['contact_name']); $billing_contact_email = sanitizeInput($billing_contact['contact_email']); - // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$billing_contact_email', email_recipient_name = '$billing_contact_name', email_from = '$config_invoice_from_email', email_from_name = '$config_invoice_from_name', email_subject = '$subject', email_content = '$body'"); - - // Get Email ID for reference - $email_id = mysqli_insert_id($mysqli); + $data = [ + [ + 'email' => $billing_contact_email, + 'name' => $billing_contact_name, + 'subject' => $subject, + 'body' => $body + ] + ]; // Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Invoice', log_action = 'Email', log_description = 'Invoice $invoice_prefix_escaped$invoice_number queued to $billing_contact_email Email ID: $email_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $invoice_id"); - } + addToMailQueue($mysqli, $data); + header("Location: " . $_SERVER["HTTP_REFERER"]); } diff --git a/post/quote.php b/post/quote.php index 93060051..2b9761d3 100644 --- a/post/quote.php +++ b/post/quote.php @@ -395,10 +395,15 @@ if (isset($_GET['email_quote'])) { $body = mysqli_escape_string($mysqli, "Hello $contact_name,

Thank you for your inquiry, we are pleased to provide you with the following estimate.


$quote_scope
Total Cost: " . numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code) . "


View and accept your estimate online here


~
$company_name
Sales
$config_quote_from_email
$company_phone"); // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$contact_email_escaped', email_recipient_name = '$contact_name_escaped', email_from = '$config_quote_from_email_escaped', email_from_name = '$config_quote_from_name_escaped', email_subject = '$subject', email_content = '$body'"); - - // Get Email ID for reference - $email_id = mysqli_insert_id($mysqli); + $data = [ + [ + 'recipient' => $contact_email_escaped, + 'recipient_name' => $contact_name_escaped, + 'subject' => $subject, + 'body' => $body, + ] + ]; + addToMailQueue($mysqli, $data); // Logging mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Emailed Quote!', history_quote_id = $quote_id"); diff --git a/post/ticket.php b/post/ticket.php index 37f26109..0840e1e0 100644 --- a/post/ticket.php +++ b/post/ticket.php @@ -112,10 +112,13 @@ if (isset($_POST['add_ticket'])) { // Email Ticket Contact // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$contact_email_escaped', email_recipient_name = '$contact_name_escaped', email_from = '$config_ticket_from_email_escaped', email_from_name = '$config_ticket_from_name_escaped', email_subject = '$subject_escaped', email_content = '$body_escaped'"); - - // Get Email ID for reference - $email_id = mysqli_insert_id($mysqli); + $data = []; + $data[] = [ + 'recipient' => $contact_email_escaped, + 'recipient_name' => $contact_name_escaped, + 'subject' => $subject_escaped, + 'body' => $body_escaped, + ]; // Also Email all the watchers $sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id"); @@ -124,8 +127,14 @@ if (isset($_POST['add_ticket'])) { $watcher_email_escaped = sanitizeInput($row['watcher_email']); // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$watcher_email_escaped', email_recipient_name = '$contact_name_escaped', email_from = '$config_ticket_from_email_escaped', email_from_name = '$config_ticket_from_name_escaped', email_subject = '$subject_escaped', email_content = '$body_escaped'"); + $data[] = [ + 'recipient' => $watcher_email_escaped, + 'recipient_name' => $watcher_email_escaped, + 'subject' => $subject_escaped, + 'body' => $body_escaped, + ]; } + addToMailQueue($mysqli, $data); } } @@ -401,10 +410,15 @@ if (isset($_POST['assign_ticket'])) { // Email Ticket Agent // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$agent_email_escaped', email_recipient_name = '$agent_name_escaped', email_from = '$config_ticket_from_email_escaped', email_from_name = '$config_ticket_from_name_escaped', email_subject = '$subject_escaped', email_content = '$body_escaped'"); - - // Get Email ID for reference - $email_id = mysqli_insert_id($mysqli); + $data = [ + [ + 'recipient' => $agent_email_escaped, + 'recipient_name' => $agent_name_escaped, + 'subject' => $subject_escaped, + 'body' => $body_escaped, + ] + ]; + addToMailQueue($mysqli, $data); } } @@ -545,12 +559,16 @@ if (isset($_POST['add_ticket_reply'])) { } + $data = []; + // Email Ticket Contact // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$contact_email_escaped', email_recipient_name = '$contact_name_escaped', email_from = '$config_ticket_from_email_escaped', email_from_name = '$config_ticket_from_name_escaped', email_subject = '$subject_escaped', email_content = '$body_escaped'"); - - // Get Email ID for reference - $email_id = mysqli_insert_id($mysqli); + $data[] = [ + 'recipient' => $contact_email_escaped, + 'recipient_name' => $contact_name_escaped, + 'subject' => $subject_escaped, + 'body' => $body_escaped, + ]; // Also Email all the watchers $sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id"); @@ -559,9 +577,14 @@ if (isset($_POST['add_ticket_reply'])) { $watcher_email_escaped = sanitizeInput($row['watcher_email']); // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$watcher_email_escaped', email_recipient_name = '$contact_name_escaped', email_from = '$config_ticket_from_email_escaped', email_from_name = '$config_ticket_from_name_escaped', email_subject = '$subject_escaped', email_content = '$body_escaped'"); + $data[] = [ + 'recipient' => $watcher_email_escaped, + 'recipient_name' => $watcher_email_escaped, + 'subject' => $subject_escaped, + 'body' => $body_escaped, + ]; } - + addToMailQueue($mysqli, $data); } } //End Mail IF @@ -754,15 +777,20 @@ if (isset($_GET['close_ticket'])) { // Check email valid if (filter_var($contact_email_escaped, FILTER_VALIDATE_EMAIL)) { + $data = []; + $subject_escaped = mysqli_escape_string($mysqli, "Ticket closed - [$ticket_prefix$ticket_number] - $ticket_subject | (do not reply)"); $body_escaped = mysqli_escape_string($mysqli, "Hello, $contact_name

Your ticket regarding \"$ticket_subject\" has been closed.

We hope the issue was resolved to your satisfaction. If you need further assistance, please raise a new ticket using the below details. Please do not reply to this email.

Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Portal: https://$config_base_url/portal/ticket.php?id=$ticket_id

~
$session_company_name
Support Department
$config_ticket_from_email
$company_phone"); // Email Ticket Contact // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$contact_email_escaped', email_recipient_name = '$contact_name_escaped', email_from = '$config_ticket_from_email_escaped', email_from_name = '$config_ticket_from_name_escaped', email_subject = '$subject_escaped', email_content = '$body_escaped'"); - // Get Email ID for reference - $email_queue_id = mysqli_insert_id($mysqli); + $data[] = [ + 'recipient' => $contact_email_escaped, + 'recipient_name' => $contact_name_escaped, + 'subject' => $subject_escaped, + 'body' => $body_escaped, + ]; // Also Email all the watchers $sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id"); @@ -771,9 +799,16 @@ if (isset($_GET['close_ticket'])) { $watcher_email_escaped = sanitizeInput($row['watcher_email']); // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$watcher_email_escaped', email_recipient_name = '$contact_name_escaped', email_from = '$config_ticket_from_email_escaped', email_from_name = '$config_ticket_from_name_escaped', email_subject = '$subject_escaped', email_content = '$body_escaped'"); + $data[] = [ + 'recipient' => $watcher_email_escaped, + 'recipient_name' => $watcher_email_escaped, + 'subject' => $subject_escaped, + 'body' => $body_escaped, + ]; } + addToMailQueue($mysqli, $data); + } } diff --git a/temp.php b/temp.php index 04785c17..70c895ed 100644 --- a/temp.php +++ b/temp.php @@ -62,13 +62,19 @@ if(isset($_GET['email_invoice'])){ } // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$contact_email_escaped', email_recipient_name = '$contact_name_escaped', email_from = '$config_invoice_from_email_escaped', email_from_name = '$config_invoice_from_name_escaped', email_subject = '$subject', email_content = '$body'"); + $data = [ + [ + 'recipient' => $contact_email_escaped, + 'recipient_name' => $contact_name_escaped, + 'subject' => $subject, + 'body' => $body, + ] + ]; + addToMailQueue($mysqli, $data); - // Get Email ID for reference - $email_id = mysqli_insert_id($mysqli); $_SESSION['alert_message'] = "Invoice has been sent"; - mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Invoice sent to the mail queue ID: $email_id', history_invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Invoice sent to the mail queue.', history_invoice_id = $invoice_id"); // Don't change the status to sent if the status is anything but draft if($invoice_status == 'Draft'){ @@ -92,8 +98,16 @@ if(isset($_GET['email_invoice'])){ $billing_contact_email = sanitizeInput($billing_contact['contact_email']); // Queue Mail - mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$billing_contact_email', email_recipient_name = '$billing_contact_name', email_from = '$config_invoice_from_email', email_from_name = '$config_invoice_from_name', email_subject = '$subject', email_content = '$body'"); - + $data = [ + [ + 'recipient' => $billing_contact_email, + 'recipient_name' => $billing_contact_name, + 'subject' => $subject, + 'body' => $body, + ] + ]; + addToMailQueue($mysqli, $data); + // Get Email ID for reference $email_id = mysqli_insert_id($mysqli);