Skip to content

Add management for some localization texts, add possibility to add pr… #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kkutylowski wants to merge 5 commits into from
Closed

Add management for some localization texts, add possibility to add pr… #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
30bfb36
Add management for some localization texts, add possibility to add pr…
krystian-kutylowski Mar 21, 2025
b1481d7
Merge branch 'develop' into manage-invoice-ticket-quote-localization
krystian-kutylowski Mar 26, 2025
595152e
Resolve conflicts
krystian-kutylowski Mar 26, 2025
10a3ee7
Merge branch 'develop' into manage-invoice-ticket-quote-localization
kkutylowski Apr 6, 2025
0a4860f
Update post.php
kkutylowski Apr 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 44 additions & 2 deletions admin_settings_invoice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@
</div>
</div>

<hr>

<h4>Recurring Invoice</h4>

<div class="form-group">
Expand All @@ -91,7 +89,51 @@
</div>
</div>

<h4>Invoice Localization</h4>

<div class="form-group">
<label>Invoice Title</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
</div>

<input type="text" class="form-control" name="config_invoice_localization_title" placeholder="Invoice" value="<?php echo nullable_htmlentities($config_invoice_localization_title); ?>" required>
</div>
</div>

<div class="form-group">
<label>Invoice Tax</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
</div>

<input type="text" class="form-control" name="config_invoice_localization_tax" placeholder="Tax" value="<?php echo nullable_htmlentities($config_invoice_localization_tax); ?>" required>
</div>
</div>

<div class="form-group">
<label>Invoice Total</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
</div>

<input type="text" class="form-control" name="config_invoice_localization_total" placeholder="Total" value="<?php echo nullable_htmlentities($config_invoice_localization_total); ?>" required>
</div>
</div>

<div class="form-group">
<label>Invoice Subtotal</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
</div>

<input type="text" class="form-control" name="config_invoice_localization_subtotal" placeholder="Subtotal" value="<?php echo nullable_htmlentities($config_invoice_localization_subtotal); ?>" required>
</div>
</div>

<hr>

Expand Down
15 changes: 15 additions & 0 deletions admin_settings_quote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">

<h4>Quote</h4>

<div class="form-group">
<label>Quote Prefix</label>
<div class="input-group">
Expand Down Expand Up @@ -45,6 +47,19 @@
</div>
</div>

<h4>Quote Localization</h4>

<div class="form-group">
<label>Quote Title</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
</div>

<input type="text" class="form-control" name="config_quote_localization_title" placeholder="Quote" value="<?php echo nullable_htmlentities($config_quote_localization_title); ?>" required>
</div>
</div>

<hr>

<button type="submit" name="edit_quote_settings" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
Expand Down
10 changes: 10 additions & 0 deletions admin_settings_ticket.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@
</div>
</div>

<div class="form-group">
<label>Ticket Client Prefix Subject</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-life-ring"></i></span>
</div>
<input type="text" class="form-control" name="config_ticket_client_prefix_subject" placeholder="Add prefix to ticket subject from client" value="<?php echo nullable_htmlentities($config_ticket_client_prefix_subject); ?>" pattern="^[A-Za-z-]+$" title="Only letters and hyphens are allowed">
</div>
</div>

<div class="form-group">
<label>Next Number</label>
<div class="input-group">
Expand Down
9 changes: 7 additions & 2 deletions client/post.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);

Expand Down Expand Up @@ -684,4 +689,4 @@

$_SESSION['alert_message'] = "Payment method removed";
header('Location: autopay.php');
}
}
13 changes: 10 additions & 3 deletions database_updates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 6 additions & 0 deletions includes/get_settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
Expand All @@ -59,13 +63,15 @@
$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'];
$config_project_next_number = intval($row['config_project_next_number']);

// 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'];
Expand Down
28 changes: 14 additions & 14 deletions invoice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
<a class="dropdown-item" href="#" onclick="window.print();">
<i class="fa fa-fw fa-print text-secondary mr-2"></i>Print
</a>
<a class="dropdown-item" href="#" onclick="pdfMake.createPdf(docDefinition).download('<?php echo strtoAZaz09(html_entity_decode("$invoice_date-$company_name-$client_name-Invoice-$invoice_prefix$invoice_number")); ?>');">
<a class="dropdown-item" href="#" onclick="pdfMake.createPdf(docDefinition).download('<?php echo strtoAZaz09(html_entity_decode("$invoice_date-$company_name-$client_name-$config_invoice_localization_title-$invoice_prefix$invoice_number")); ?>');">
<i class="fa fa-fw fa-download text-secondary mr-2"></i>Download PDF
</a>
<?php if (!empty($config_smtp_host) && !empty($contact_email)) { ?>
Expand Down Expand Up @@ -298,7 +298,7 @@
<?php echo "$invoice_status"; ?>
</div>
</div>
<h3 class="text-right mt-5"><strong>Invoice</strong><br><small class="text-secondary"><?php echo "$invoice_prefix$invoice_number"; ?></small></h3>
<h3 class="text-right mt-5"><strong><?php echo $config_invoice_localization_title; ?></strong><br><small class="text-secondary"><?php echo "$invoice_prefix$invoice_number"; ?></small></h3>
</div>

</div>
Expand Down Expand Up @@ -355,8 +355,8 @@
<th>Description</th>
<th class="text-center">Quantity</th>
<th class="text-right">Price</th>
<th class="text-right">Tax</th>
<th class="text-right">Total</th>
<th class="text-right"><?php echo $config_invoice_localization_tax; ?></th>
<th class="text-right"><?php echo $config_invoice_localization_total; ?></th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -477,7 +477,7 @@
<tbody>

<tr class="border-bottom">
<td>Subtotal</td>
<td><?php echo $config_invoice_localization_subtotal; ?></td>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $sub_total, $invoice_currency_code); ?></td>
</tr>
<?php
Expand All @@ -492,12 +492,12 @@
?>
<?php if ($total_tax > 0) { ?>
<tr class="border-bottom">
<td>Tax</td>
<td><?php echo $config_invoice_localization_tax; ?></td>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_tax, $invoice_currency_code); ?></td>
</tr>
<?php } ?>
<tr class="border-bottom">
<td>Total</td>
<td><?php echo $config_invoice_localization_total; ?></td>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
</tr>
<?php
Expand Down Expand Up @@ -717,7 +717,7 @@

var docDefinition = {
info: {
title: <?php echo json_encode(html_entity_decode($company_name) . "- Invoice") ?>,
title: <?php echo json_encode(html_entity_decode($company_name) . "- " . $config_invoice_localization_title) ?>,
author: <?php echo json_encode(html_entity_decode($company_name)) ?>
},

Expand All @@ -736,7 +736,7 @@

[
{
text: 'Invoice',
text: '<?php echo $config_invoice_localization_title; ?>',
style: 'invoiceTitle',
width: '*'
},
Expand Down Expand Up @@ -851,11 +851,11 @@
style: [ 'itemsHeader', 'right']
},
{
text: 'Tax',
text: '<?php echo $config_invoice_localization_tax; ?>',
style: [ 'itemsHeader', 'right']
},
{
text: 'Total',
text: '<?php echo $config_invoice_localization_total; ?>',
style: [ 'itemsHeader', 'right']
}
],
Expand Down Expand Up @@ -942,7 +942,7 @@
style: 'notesText'
},
{
text: 'Subtotal',
text: '<?php echo $config_invoice_localization_subtotal; ?>',
style: 'itemsFooterSubTitle'
},
{
Expand All @@ -967,7 +967,7 @@
[
{},
{
text: 'Tax',
text: '<?php echo $config_invoice_localization_tax; ?>',
style: 'itemsFooterSubTitle'
},
{
Expand All @@ -979,7 +979,7 @@
[
{},
{
text: 'Total',
text: '<?php echo $config_invoice_localization_total; ?>',
style: 'itemsFooterSubTitle'
},
{
Expand Down
6 changes: 5 additions & 1 deletion post/admin/admin_settings_invoice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 3 additions & 1 deletion post/admin/admin_settings_quote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
8 changes: 4 additions & 4 deletions quote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
<a class="dropdown-item" href="#" onclick="window.print();">
<i class="fa fa-fw fa-print text-secondary mr-2"></i>Print
</a>
<a class="dropdown-item" href="#" onclick="pdfMake.createPdf(docDefinition).download('<?php echo strtoAZaz09(html_entity_decode("$quote_date-$company_name-$client_name-Quote-$quote_prefix$quote_number")); ?>');">
<a class="dropdown-item" href="#" onclick="pdfMake.createPdf(docDefinition).download('<?php echo strtoAZaz09(html_entity_decode("$quote_date-$company_name-$client_name-$config_quote_localization_title-$quote_prefix$quote_number")); ?>');">
<i class="fa fa-fw fa-download text-secondary mr-2"></i>Download PDF
</a>
<?php if (!empty($config_smtp_host) && !empty($contact_email)) { ?>
Expand Down Expand Up @@ -240,7 +240,7 @@
<?php echo $quote_status; ?>
</div>
</div>
<h3 class="text-right mt-5"><strong>Quote</strong><br><small class="text-secondary"><?php echo "$quote_prefix$quote_number"; ?></small></h3>
<h3 class="text-right mt-5"><strong><?php echo $config_quote_localization_title; ?></strong><br><small class="text-secondary"><?php echo "$quote_prefix$quote_number"; ?></small></h3>
</div>
</div>
<div class="row mb-4">
Expand Down Expand Up @@ -603,7 +603,7 @@
<script>
var docDefinition = {
info: {
title: <?php echo json_encode(html_entity_decode($company_name) . "- Quote") ?>,
title: <?php echo json_encode(html_entity_decode($company_name) . "- " . $config_quote_localization_title) ?>,
author: <?php echo json_encode(html_entity_decode($company_name)) ?>
},

Expand All @@ -620,7 +620,7 @@
<?php } ?>

[{
text: 'Quote',
text: '<?php echo $config_quote_localization_title; ?>',
style: 'invoiceTitle',
width: '*'
}, {
Expand Down