diff --git a/ajax.php b/ajax.php
index 3a420b06..f1c6dcb2 100644
--- a/ajax.php
+++ b/ajax.php
@@ -306,10 +306,10 @@ if (isset($_GET['share_generate_link'])) {
// Return URL
if ($item_type == "Login") {
- $url = "https://$config_base_url/guest_view_item.php?id=$share_id&key=$item_key&ek=$login_encryption_key";
+ $url = "https://$config_base_url/guest/guest_view_item.php?id=$share_id&key=$item_key&ek=$login_encryption_key";
}
else {
- $url = "https://$config_base_url/guest_view_item.php?id=$share_id&key=$item_key";
+ $url = "https://$config_base_url/guest/guest_view_item.php?id=$share_id&key=$item_key";
}
$sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1");
diff --git a/cron.php b/cron.php
index 04e48d13..9504a6b6 100644
--- a/cron.php
+++ b/cron.php
@@ -485,7 +485,7 @@ if ($config_send_invoice_reminders == 1) {
$subject = "Overdue Invoice $invoice_prefix$invoice_number";
$body = "Hello $contact_name,
Our records indicate that we have not yet received payment for the invoice $invoice_prefix$invoice_number. We kindly request that you submit your payment as soon as possible. If you have any questions or concerns, please do not hesitate to contact us at $company_email or $company_phone.
- Kindly review the invoice details mentioned below.
Invoice: $invoice_prefix$invoice_number
Issue Date: $invoice_date
Total: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "
Due Date: $invoice_due
Over Due By: $day Days
To view your invoice, please click here.
--
$company_name - Billing
$config_invoice_from_email
$company_phone";
+ Kindly review the invoice details mentioned below.
Invoice: $invoice_prefix$invoice_number
Issue Date: $invoice_date
Total: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "
Due Date: $invoice_due
Over Due By: $day Days
To view your invoice, please click here.
--
$company_name - Billing
$config_invoice_from_email
$company_phone";
$mail = addToMailQueue($mysqli, [
[
@@ -617,7 +617,7 @@ while ($row = mysqli_fetch_array($sql_recurring)) {
$contact_email = sanitizeInput($row['contact_email']);
$subject = "Invoice $invoice_prefix$invoice_number";
- $body = "Hello $contact_name,
An invoice regarding \"$invoice_scope\" has been generated. Please view the details below.
Invoice: $invoice_prefix$invoice_number
Issue Date: $invoice_date
Total: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_currency_code) . "
Due Date: $invoice_due
To view your invoice, please click here.
--
$company_name - Billing
$config_invoice_from_email
$company_phone";
+ $body = "Hello $contact_name,
An invoice regarding \"$invoice_scope\" has been generated. Please view the details below.
Invoice: $invoice_prefix$invoice_number
Issue Date: $invoice_date
Total: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_currency_code) . "
Due Date: $invoice_due
To view your invoice, please click here.
--
$company_name - Billing
$config_invoice_from_email
$company_phone";
$mail = addToMailQueue($mysqli, [
[
diff --git a/invoice.php b/invoice.php
index deef2fbb..3736f6fd 100644
--- a/invoice.php
+++ b/invoice.php
@@ -231,7 +231,7 @@ if (isset($_GET['invoice_id'])) {
Send Email
- ">
+ ">
Guest URL
diff --git a/post/user/invoice.php b/post/user/invoice.php
index a02c0e63..847a096b 100644
--- a/post/user/invoice.php
+++ b/post/user/invoice.php
@@ -801,7 +801,7 @@ if (isset($_POST['add_payment'])) {
if ($email_receipt == 1) {
$subject = "Payment Received - Invoice $invoice_prefix$invoice_number";
- $body = "Hello $contact_name,
We have received your payment in full for 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 Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
Payment Method: $payment_method
Payment Reference: $reference
Thank you for your business!
--
$company_name - Billing Department
$config_invoice_from_email
$company_phone";
+ $body = "Hello $contact_name,
We have received your payment in full for 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 Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
Payment Method: $payment_method
Payment Reference: $reference
Thank you for your business!
--
$company_name - Billing Department
$config_invoice_from_email
$company_phone";
// Queue Mail
$email = [
@@ -833,7 +833,7 @@ if (isset($_POST['add_payment'])) {
if ($email_receipt == 1) {
$subject = "Partial Payment Received - Invoice $invoice_prefix$invoice_number";
- $body = "Hello $contact_name,
We have received 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 Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
Payment Method: $payment_method
Payment Reference: $reference
Invoice Balance: " . numfmt_format_currency($currency_format, $invoice_balance, $invoice_currency_code) . "
Thank you for your business!
~
$company_name - Billing
$config_invoice_from_email
$company_phone";
+ $body = "Hello $contact_name,
We have received 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 Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
Payment Method: $payment_method
Payment Reference: $reference
Invoice Balance: " . numfmt_format_currency($currency_format, $invoice_balance, $invoice_currency_code) . "
Thank you for your business!
~
$company_name - Billing
$config_invoice_from_email
$company_phone";
// Queue Mail
$email = [
@@ -960,7 +960,7 @@ if (isset($_POST['add_bulk_payment'])) {
mysqli_query($mysqli, $add_history_query);
// Add to Email Body Invoice Portion
- $email_body_invoices .= "
Invoice $invoice_prefix$invoice_number - Outstanding Amount: " . numfmt_format_currency($currency_format, $invoice_balance, $currency_code) . " - Payment Applied: " . numfmt_format_currency($currency_format, $payment_amount, $currency_code) . " - New Balance: " . numfmt_format_currency($currency_format, $remaining_invoice_balance, $currency_code);
+ $email_body_invoices .= "
Invoice $invoice_prefix$invoice_number - Outstanding Amount: " . numfmt_format_currency($currency_format, $invoice_balance, $currency_code) . " - Payment Applied: " . numfmt_format_currency($currency_format, $payment_amount, $currency_code) . " - New Balance: " . numfmt_format_currency($currency_format, $remaining_invoice_balance, $currency_code);
customAction('invoice_pay', $invoice_id);
@@ -1122,10 +1122,10 @@ if (isset($_GET['email_invoice'])) {
if ($invoice_status == 'Paid') {
$subject = "Invoice $invoice_prefix$invoice_number Receipt";
- $body = "Hello $contact_name,
Please click on the link below to see your invoice regarding \"$invoice_scope\" marked paid.
Invoice Link
--
$company_name - Billing
$config_invoice_from_email
$company_phone";
+ $body = "Hello $contact_name,
Please click on the link below to see your invoice regarding \"$invoice_scope\" marked paid.
Invoice Link
--
$company_name - Billing
$config_invoice_from_email
$company_phone";
} else {
$subject = "Invoice $invoice_prefix$invoice_number";
- $body = "Hello $contact_name,
Please view the details of your invoice regarding \"$invoice_scope\" below.
Invoice: $invoice_prefix$invoice_number
Issue Date: $invoice_date
Total: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "
Balance Due: " . numfmt_format_currency($currency_format, $balance, $invoice_currency_code) . "
Due Date: $invoice_due
To view your invoice, please click here.
--
$company_name - Billing
$config_invoice_from_email
$company_phone";
+ $body = "Hello $contact_name,
Please view the details of your invoice regarding \"$invoice_scope\" below.
Invoice: $invoice_prefix$invoice_number
Issue Date: $invoice_date
Total: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "
Balance Due: " . numfmt_format_currency($currency_format, $balance, $invoice_currency_code) . "
Due Date: $invoice_due
To view your invoice, please click here.
--
$company_name - Billing
$config_invoice_from_email
$company_phone";
}
// Queue Mail
@@ -1364,7 +1364,7 @@ if (isset($_GET['force_recurring'])) {
// Email to client
$subject = "Invoice $invoice_prefix$invoice_number";
- $body = "Hello $contact_name,
An invoice regarding \"$invoice_scope\" has been generated. Please view the details below.
Invoice: $invoice_prefix$invoice_number
Issue Date: $invoice_date
Total: $$invoice_amount
Due Date: $invoice_due
To view your invoice, please click here.
--
$company_name - Billing
$company_phone";
+ $body = "Hello $contact_name,
An invoice regarding \"$invoice_scope\" has been generated. Please view the details below.
Invoice: $invoice_prefix$invoice_number
Issue Date: $invoice_date
Total: $$invoice_amount
Due Date: $invoice_due
To view your invoice, please click here.
--
$company_name - Billing
$company_phone";
$data = [
diff --git a/post/user/quote.php b/post/user/quote.php
index 6251d44d..ac9b05ac 100644
--- a/post/user/quote.php
+++ b/post/user/quote.php
@@ -489,7 +489,7 @@ if (isset($_GET['email_quote'])) {
$config_base_url = sanitizeInput($config_base_url);
$subject = "Quote [$quote_scope]";
- $body = "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";
+ $body = "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
$data = [
diff --git a/post/user/ticket.php b/post/user/ticket.php
index 8fa974e2..c53668d5 100644
--- a/post/user/ticket.php
+++ b/post/user/ticket.php
@@ -115,7 +115,7 @@ if (isset($_POST['add_ticket'])) {
// EMAILING
$subject = "Ticket created [$ticket_prefix$ticket_number] - $ticket_subject";
- $body = "##- Please type your reply above this line -##
Hello $contact_name,
A ticket regarding \"$ticket_subject\" has been created for you.
--------------------------------
$ticket_details--------------------------------
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: Open
Portal: View ticket
--
$company_name - Support
$config_ticket_from_email
$company_phone";
+ $body = "##- Please type your reply above this line -##
Hello $contact_name,
A ticket regarding \"$ticket_subject\" has been created for you.
--------------------------------
$ticket_details--------------------------------
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: Open
Portal: View ticket
--
$company_name - Support
$config_ticket_from_email
$company_phone";
// Verify contact email is valid
if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
@@ -221,7 +221,7 @@ if (isset($_POST['edit_ticket'])) {
$data = []; // Queue array
$subject = "Ticket Created - [$ticket_prefix$ticket_number] - $ticket_subject";
- $body = "##- Please type your reply above this line -##
Hello $contact_name,
A ticket regarding \"$ticket_subject\" has been created for you.
--------------------------------
$ticket_details--------------------------------
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status
Portal: View ticket
--
$company_name - Support
$config_ticket_from_email
$company_phone";
+ $body = "##- Please type your reply above this line -##
Hello $contact_name,
A ticket regarding \"$ticket_subject\" has been created for you.
--------------------------------
$ticket_details--------------------------------
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status
Portal: View ticket
--
$company_name - Support
$config_ticket_from_email
$company_phone";
// Only add contact to email queue if email is valid
@@ -343,7 +343,7 @@ if (isset($_POST['edit_ticket_contact'])) {
$data = []; // Queue array
$subject = "Ticket Created - [$ticket_prefix$ticket_number] - $ticket_subject";
- $body = "##- Please type your reply above this line -##
Hello $contact_name,
A ticket regarding \"$ticket_subject\" has been created for you.
--------------------------------
$ticket_details--------------------------------
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status
Portal: View ticket
--
$company_name - Support
$config_ticket_from_email
$company_phone";
+ $body = "##- Please type your reply above this line -##
Hello $contact_name,
A ticket regarding \"$ticket_subject\" has been created for you.
--------------------------------
$ticket_details--------------------------------
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status
Portal: View ticket
--
$company_name - Support
$config_ticket_from_email
$company_phone";
$data[] = [
'from' => $config_ticket_from_email,
@@ -417,7 +417,7 @@ if (isset($_POST['add_ticket_watcher'])) {
$data = []; // Queue array
$subject = "Ticket Notification - [$ticket_prefix$ticket_number] - $ticket_subject";
- $body = "##- Please type your reply above this line -##
Hello,
You have been added as a collaborator on this ticket regarding \"$ticket_subject\".
--------------------------------
$ticket_details--------------------------------
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status
Guest link: https://$config_base_url/guest_view_ticket.php?ticket_id=$ticket_id&url_key=$url_key
--
$company_name - Support
$config_ticket_from_email
$company_phone";
+ $body = "##- Please type your reply above this line -##
Hello,
You have been added as a collaborator on this ticket regarding \"$ticket_subject\".
--------------------------------
$ticket_details--------------------------------
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status
Guest link: https://$config_base_url/guest/guest_view_ticket.php?ticket_id=$ticket_id&url_key=$url_key
--
$company_name - Support
$config_ticket_from_email
$company_phone";
// Only add watcher to email queue if email is valid
if (filter_var($watcher_email, FILTER_VALIDATE_EMAIL)) {
@@ -961,7 +961,7 @@ if (isset($_POST['bulk_resolve_tickets'])) {
// EMAIL
$subject = "Ticket resolved - [$ticket_prefix$ticket_number] - $ticket_subject | (pending closure)";
- $body = "##- Please type your reply above this line -##
Hello $contact_name,
Your ticket regarding \"$ticket_subject\" has been marked as solved and is pending closure.
$details
If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Portal: https://$base_url/portal/ticket.php?id=$ticket_id
--
$company_name - Support
$config_ticket_from_email
$company_phone";
+ $body = "##- Please type your reply above this line -##
Hello $contact_name,
Your ticket regarding \"$ticket_subject\" has been marked as solved and is pending closure.
$details
If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Portal: https://$base_url/portal/ticket.php?id=$ticket_id
--
$company_name - Support
$config_ticket_from_email
$company_phone";
// Check email valid
if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
@@ -1101,7 +1101,7 @@ if (isset($_POST['bulk_ticket_reply'])) {
if ($private_note == 0 && !empty($config_smtp_host)) {
$subject = "Ticket update - [$ticket_prefix$ticket_number] - $ticket_subject";
- $body = "##- Please type your reply above this line -##
Hello $contact_name,
Your ticket regarding $ticket_subject has been updated.
--------------------------------
$ticket_reply
--------------------------------
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status_name
Portal: View ticket
--
$company_name - Support
$from_email
$company_phone";
+ $body = "##- Please type your reply above this line -##
Hello $contact_name,
Your ticket regarding $ticket_subject has been updated.
--------------------------------
$ticket_reply
--------------------------------
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status_name
Portal: View ticket
--
$company_name - Support
$from_email
$company_phone";
if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
@@ -1413,11 +1413,11 @@ if (isset($_POST['add_ticket_reply'])) {
if ($ticket_status == 4) {
// Resolved
$subject = "Ticket resolved - [$ticket_prefix$ticket_number] - $ticket_subject | (pending closure)";
- $body = "##- Please type your reply above this line -##
Hello $contact_name,
Your ticket regarding $ticket_subject has been marked as solved and is pending closure.
--------------------------------
$ticket_reply
--------------------------------
If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status_name
Portal: View ticket
--
$company_name - Support
$config_ticket_from_email
$company_phone";
+ $body = "##- Please type your reply above this line -##
Hello $contact_name,
Your ticket regarding $ticket_subject has been marked as solved and is pending closure.
--------------------------------
$ticket_reply
--------------------------------
If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status_name
Portal: View ticket
--
$company_name - Support
$config_ticket_from_email
$company_phone";
} else {
// Anything else
$subject = "Ticket update - [$ticket_prefix$ticket_number] - $ticket_subject";
- $body = "##- Please type your reply above this line -##
Hello $contact_name,
Your ticket regarding $ticket_subject has been updated.
--------------------------------
$ticket_reply
--------------------------------
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status_name
Portal: View ticket
--
$company_name - Support
$config_ticket_from_email
$company_phone";
+ $body = "##- Please type your reply above this line -##
Hello $contact_name,
Your ticket regarding $ticket_subject has been updated.
--------------------------------
$ticket_reply
--------------------------------
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status_name
Portal: View ticket
--
$company_name - Support
$config_ticket_from_email
$company_phone";
}
if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
@@ -1664,7 +1664,7 @@ if (isset($_GET['resolve_ticket'])) {
// EMAIL
$subject = "Ticket resolved - [$ticket_prefix$ticket_number] - $ticket_subject | (pending closure)";
- $body = "##- Please type your reply above this line -##
Hello $contact_name,
Your ticket regarding $ticket_subject has been marked as solved and is pending closure.
If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status
Portal: View ticket
--
$company_name - Support
$config_ticket_from_email
$company_phone";
+ $body = "##- Please type your reply above this line -##
Hello $contact_name,
Your ticket regarding $ticket_subject has been marked as solved and is pending closure.
If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status
Portal: View ticket
--
$company_name - Support
$config_ticket_from_email
$company_phone";
// Check email valid
if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
@@ -1758,7 +1758,7 @@ if (isset($_GET['close_ticket'])) {
// EMAIL
$subject = "Ticket closed - [$ticket_prefix$ticket_number] - $ticket_subject | (do not reply)";
//$body = "Hello $contact_name,
Your ticket regarding \"$ticket_subject\" has been closed.
We hope the request/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
--
$company_name - Support
$config_ticket_from_email
$company_phone";
- $body = "Hello $contact_name,
Your ticket regarding \"$ticket_subject\" has been closed.
We hope the request/issue was resolved to your satisfaction, please provide your feedback here.
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
--
$company_name - Support
$config_ticket_from_email
$company_phone";
+ $body = "Hello $contact_name,
Your ticket regarding \"$ticket_subject\" has been closed.
We hope the request/issue was resolved to your satisfaction, please provide your feedback here.
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
--
$company_name - Support
$config_ticket_from_email
$company_phone";
// Check email valid
if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
diff --git a/quote.php b/quote.php
index fd3b22b8..edb096c6 100644
--- a/quote.php
+++ b/quote.php
@@ -191,7 +191,7 @@ if (isset($_GET['quote_id'])) {
Send Email
- ">
+ ">
Guest URL
= 3) { ?>