diff --git a/admin_settings_invoice.php b/admin_settings_invoice.php index 9633c3eb2..a379ca82c 100644 --- a/admin_settings_invoice.php +++ b/admin_settings_invoice.php @@ -67,8 +67,6 @@ -
-

Recurring Invoice

@@ -91,7 +89,51 @@
+

Invoice Localization

+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ + +
+
+ +
+ +
+
+ +
+ + +
+
+ +
+ +
+
+ +
+ + +
+
diff --git a/admin_settings_quote.php b/admin_settings_quote.php index 6c8910a33..1466bbbef 100644 --- a/admin_settings_quote.php +++ b/admin_settings_quote.php @@ -10,6 +10,8 @@
+

Quote

+
@@ -45,6 +47,19 @@
+

Quote Localization

+ +
+ +
+
+ +
+ + +
+
+
diff --git a/admin_settings_ticket.php b/admin_settings_ticket.php index 2d6d4efd5..d125b28fe 100644 --- a/admin_settings_ticket.php +++ b/admin_settings_ticket.php @@ -20,6 +20,16 @@ +
+ +
+
+ +
+ +
+
+
diff --git a/client/post.php b/client/post.php index ea329e895..d4442cce2 100644 --- a/client/post.php +++ b/client/post.php @@ -12,7 +12,12 @@ if (isset($_POST['add_ticket'])) { - $subject = sanitizeInput($_POST['subject']); + $subject = sanitizeInput($_POST['subject']); + + if($config_ticket_client_prefix_subject){ + $subject = $config_ticket_client_prefix_subject . $subject; + } + $details = mysqli_real_escape_string($mysqli, ($_POST['details'])); $category = intval($_POST['category']); @@ -684,4 +689,4 @@ $_SESSION['alert_message'] = "Payment method removed"; header('Location: autopay.php'); -} \ No newline at end of file +} diff --git a/database_updates.php b/database_updates.php index 3a7a593e4..5057b2f58 100644 --- a/database_updates.php +++ b/database_updates.php @@ -3457,10 +3457,17 @@ function processFile($file_path, $file_name, $mysqli) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.3'"); } - // if (CURRENT_DATABASE_VERSION == '2.1.3') { - // // Insert queries here required to update to DB version 2.1.4 + if (CURRENT_DATABASE_VERSION == '2.1.3') { + + mysqli_query($mysqli, "ALTER TABLE `settings` ADD COLUMN `config_invoice_localization_title` VARCHAR(200) NULL DEFAULT 'Invoice' AFTER `config_invoice_footer`, ADD COLUMN `config_invoice_localization_tax` VARCHAR(200) NULL DEFAULT 'Tax' AFTER `config_invoice_localization_title`, ADD COLUMN `config_invoice_localization_total` VARCHAR(200) NULL DEFAULT 'Total' AFTER `config_invoice_localization_tax`, ADD COLUMN `config_invoice_localization_subtotal` VARCHAR(200) NULL DEFAULT 'Subtotal' AFTER `config_invoice_localization_total`, ADD COLUMN `config_quote_localization_title` VARCHAR(200) NULL DEFAULT 'Quote' AFTER `config_quote_footer`, ADD COLUMN `config_ticket_client_prefix_subject` VARCHAR(200) NULL DEFAULT NULL AFTER `config_ticket_moving_columns`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.4'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.1.4') { + // // Insert queries here required to update to DB version 2.1.5 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.4'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.5'"); // } } else { diff --git a/includes/get_settings.php b/includes/get_settings.php index d142b7098..be9354e87 100644 --- a/includes/get_settings.php +++ b/includes/get_settings.php @@ -42,6 +42,10 @@ $config_invoice_prefix = $row['config_invoice_prefix']; $config_invoice_next_number = intval($row['config_invoice_next_number']); $config_invoice_footer = $row['config_invoice_footer']; +$config_invoice_localization_title = $row['config_invoice_localization_title']; +$config_invoice_localization_tax = $row['config_invoice_localization_tax']; +$config_invoice_localization_total = $row['config_invoice_localization_total']; +$config_invoice_localization_subtotal = $row['config_invoice_localization_subtotal']; $config_invoice_from_name = $row['config_invoice_from_name']; $config_invoice_from_email = $row['config_invoice_from_email']; $config_invoice_late_fee_enable = intval($row['config_invoice_late_fee_enable']); @@ -59,6 +63,7 @@ $config_quote_from_name = $row['config_quote_from_name']; $config_quote_from_email = $row['config_quote_from_email']; $config_quote_notification_email = $row['config_quote_notification_email']; +$config_quote_localization_title = $row['config_quote_localization_title']; // Projects $config_project_prefix = $row['config_project_prefix']; @@ -66,6 +71,7 @@ // Tickets $config_ticket_prefix = $row['config_ticket_prefix']; +$config_ticket_client_prefix_subject = $row['config_ticket_client_prefix_subject']; $config_ticket_next_number = intval($row['config_ticket_next_number']); $config_ticket_from_name = $row['config_ticket_from_name']; $config_ticket_from_email = $row['config_ticket_from_email']; diff --git a/invoice.php b/invoice.php index 63c60dd8b..4b5f87be6 100644 --- a/invoice.php +++ b/invoice.php @@ -260,7 +260,7 @@ Print - ');"> + ');"> Download PDF @@ -298,7 +298,7 @@
-

Invoice

+


@@ -355,8 +355,8 @@ Description Quantity Price - Tax - Total + + @@ -477,7 +477,7 @@ - Subtotal + 0) { ?> - Tax + - Total + , + title: , author: }, @@ -736,7 +736,7 @@ [ { - text: 'Invoice', + text: '', style: 'invoiceTitle', width: '*' }, @@ -851,11 +851,11 @@ style: [ 'itemsHeader', 'right'] }, { - text: 'Tax', + text: '', style: [ 'itemsHeader', 'right'] }, { - text: 'Total', + text: '', style: [ 'itemsHeader', 'right'] } ], @@ -942,7 +942,7 @@ style: 'notesText' }, { - text: 'Subtotal', + text: '', style: 'itemsFooterSubTitle' }, { @@ -967,7 +967,7 @@ [ {}, { - text: 'Tax', + text: '', style: 'itemsFooterSubTitle' }, { @@ -979,7 +979,7 @@ [ {}, { - text: 'Total', + text: '', style: 'itemsFooterSubTitle' }, { diff --git a/post/admin/admin_settings_invoice.php b/post/admin/admin_settings_invoice.php index 62cb30884..8600233bb 100644 --- a/post/admin/admin_settings_invoice.php +++ b/post/admin/admin_settings_invoice.php @@ -17,8 +17,12 @@ if (filter_var($_POST['config_invoice_paid_notification_email'], FILTER_VALIDATE_EMAIL)) { $config_invoice_paid_notification_email = sanitizeInput($_POST['config_invoice_paid_notification_email']); } + $config_invoice_localization_title = sanitizeInput($_POST['config_invoice_localization_title']); + $config_invoice_localization_tax = sanitizeInput($_POST['config_invoice_localization_tax']); + $config_invoice_localization_total = sanitizeInput($_POST['config_invoice_localization_total']); + $config_invoice_localization_subtotal = sanitizeInput($_POST['config_invoice_localization_subtotal']); - 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_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"); + 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_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, config_invoice_localization_title = '$config_invoice_localization_title', config_invoice_localization_tax = '$config_invoice_localization_tax', config_invoice_localization_total = '$config_invoice_localization_total', config_invoice_localization_subtotal = '$config_invoice_localization_subtotal' WHERE company_id = 1"); // Logging logAction("Settings", "Edit", "$session_name edited invoice settings"); diff --git a/post/admin/admin_settings_quote.php b/post/admin/admin_settings_quote.php index afef08a3a..335f809d5 100644 --- a/post/admin/admin_settings_quote.php +++ b/post/admin/admin_settings_quote.php @@ -13,8 +13,10 @@ if (filter_var($_POST['config_quote_notification_email'], FILTER_VALIDATE_EMAIL)) { $config_quote_notification_email = sanitizeInput($_POST['config_quote_notification_email']); } + $config_quote_localization_title = sanitizeInput($_POST['config_quote_localization_title']); - mysqli_query($mysqli,"UPDATE settings SET config_quote_prefix = '$config_quote_prefix', config_quote_next_number = $config_quote_next_number, config_quote_footer = '$config_quote_footer', config_quote_notification_email = '$config_quote_notification_email' WHERE company_id = 1"); + + mysqli_query($mysqli,"UPDATE settings SET config_quote_prefix = '$config_quote_prefix', config_quote_next_number = $config_quote_next_number, config_quote_footer = '$config_quote_footer', config_quote_notification_email = '$config_quote_notification_email', config_quote_localization_title = '$config_quote_localization_title' WHERE company_id = 1"); // Logging logAction("Settings", "Edit", "$session_name edited Quote settings"); diff --git a/quote.php b/quote.php index 13e741151..4d151dbd0 100644 --- a/quote.php +++ b/quote.php @@ -205,7 +205,7 @@ Print - ');"> + ');"> Download PDF @@ -240,7 +240,7 @@ -

Quote

+


@@ -603,7 +603,7 @@