Skip to content

Commit dc4bbbb

Browse files
krystian-kutylowskikrystian-kutylowski
committed
Add some management for texts in quote and invoice
1 parent 244e129 commit dc4bbbb

9 files changed

+102
-23
lines changed

‎admin_settings_invoice.php

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@
6767
</div>
6868
</div>
6969

70-
<hr>
71-
7270
<h4>Recurring Invoice</h4>
7371

7472
<div class="form-group">
@@ -91,7 +89,51 @@
9189
</div>
9290
</div>
9391

92+
<h4>Invoice Localization</h4>
93+
94+
<div class="form-group">
95+
<label>Invoice Title</label>
96+
<div class="input-group">
97+
<div class="input-group-prepend">
98+
<span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
99+
</div>
94100

101+
<input type="text" class="form-control" name="config_invoice_localization_title" placeholder="Invoice" value="<?php echo nullable_htmlentities($config_invoice_localization_title); ?>" required>
102+
</div>
103+
</div>
104+
105+
<div class="form-group">
106+
<label>Invoice Tax</label>
107+
<div class="input-group">
108+
<div class="input-group-prepend">
109+
<span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
110+
</div>
111+
112+
<input type="text" class="form-control" name="config_invoice_localization_tax" placeholder="Tax" value="<?php echo nullable_htmlentities($config_invoice_localization_tax); ?>" required>
113+
</div>
114+
</div>
115+
116+
<div class="form-group">
117+
<label>Invoice Total</label>
118+
<div class="input-group">
119+
<div class="input-group-prepend">
120+
<span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
121+
</div>
122+
123+
<input type="text" class="form-control" name="config_invoice_localization_total" placeholder="Total" value="<?php echo nullable_htmlentities($config_invoice_localization_total); ?>" required>
124+
</div>
125+
</div>
126+
127+
<div class="form-group">
128+
<label>Invoice Subtotal</label>
129+
<div class="input-group">
130+
<div class="input-group-prepend">
131+
<span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
132+
</div>
133+
134+
<input type="text" class="form-control" name="config_invoice_localization_subtotal" placeholder="Subtotal" value="<?php echo nullable_htmlentities($config_invoice_localization_subtotal); ?>" required>
135+
</div>
136+
</div>
95137

96138
<hr>
97139

‎admin_settings_quote.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<form action="post.php" method="post" autocomplete="off">
1111
<input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
1212

13+
<h4>Quote</h4>
14+
1315
<div class="form-group">
1416
<label>Quote Prefix</label>
1517
<div class="input-group">
@@ -45,6 +47,19 @@
4547
</div>
4648
</div>
4749

50+
<h4>Quote Localization</h4>
51+
52+
<div class="form-group">
53+
<label>Quote Title</label>
54+
<div class="input-group">
55+
<div class="input-group-prepend">
56+
<span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
57+
</div>
58+
59+
<input type="text" class="form-control" name="config_quote_localization_title" placeholder="Quote" value="<?php echo nullable_htmlentities($config_quote_localization_title); ?>" required>
60+
</div>
61+
</div>
62+
4863
<hr>
4964

5065
<button type="submit" name="edit_quote_settings" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>

‎database_updates.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3380,6 +3380,17 @@ function processFile($file_path, $file_name, $mysqli) {
33803380
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.7'");
33813381
}
33823382

3383+
if (CURRENT_DATABASE_VERSION == '2.0.7') {
3384+
mysqli_query($mysqli, "ALTER TABLE `settings`
3385+
ADD COLUMN `config_invoice_localization_title` VARCHAR(200) NULL DEFAULT 'Invoice' AFTER `config_invoice_footer`,
3386+
ADD COLUMN `config_invoice_localization_tax` VARCHAR(200) NULL DEFAULT 'Tax' AFTER `config_invoice_localization_title`,
3387+
ADD COLUMN `config_invoice_localization_total` VARCHAR(200) NULL DEFAULT 'Total' AFTER `config_invoice_localization_tax`,
3388+
ADD COLUMN `config_invoice_localization_subtotal` VARCHAR(200) NULL DEFAULT 'Subtotal' AFTER `config_invoice_localization_total`,
3389+
ADD COLUMN `config_quote_localization_title` VARCHAR(200) NULL DEFAULT 'Quote' AFTER `config_quote_footer`;");
3390+
3391+
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.8'");
3392+
}
3393+
33833394
// if (CURRENT_DATABASE_VERSION == '2.0.7') {
33843395
// // Insert queries here required to update to DB version 2.0.8
33853396
// // Then, update the database to the next sequential version

‎includes/database_version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
* It is used in conjunction with database_updates.php
66
*/
77

8-
DEFINE("LATEST_DATABASE_VERSION", "2.0.7");
8+
DEFINE("LATEST_DATABASE_VERSION", "2.0.8");

‎includes/get_settings.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
$config_invoice_prefix = $row['config_invoice_prefix'];
4343
$config_invoice_next_number = intval($row['config_invoice_next_number']);
4444
$config_invoice_footer = $row['config_invoice_footer'];
45+
$config_invoice_localization_title = $row['config_invoice_localization_title'];
46+
$config_invoice_localization_tax = $row['config_invoice_localization_tax'];
47+
$config_invoice_localization_total = $row['config_invoice_localization_total'];
48+
$config_invoice_localization_subtotal = $row['config_invoice_localization_subtotal'];
4549
$config_invoice_from_name = $row['config_invoice_from_name'];
4650
$config_invoice_from_email = $row['config_invoice_from_email'];
4751
$config_invoice_late_fee_enable = intval($row['config_invoice_late_fee_enable']);
@@ -59,6 +63,7 @@
5963
$config_quote_from_name = $row['config_quote_from_name'];
6064
$config_quote_from_email = $row['config_quote_from_email'];
6165
$config_quote_notification_email = $row['config_quote_notification_email'];
66+
$config_quote_localization_title = $row['config_quote_localization_title'];
6267

6368
// Projects
6469
$config_project_prefix = $row['config_project_prefix'];

‎invoice.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
<a class="dropdown-item" href="#" onclick="window.print();">
258258
<i class="fa fa-fw fa-print text-secondary mr-2"></i>Print
259259
</a>
260-
<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")); ?>');">
260+
<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")); ?>');">
261261
<i class="fa fa-fw fa-download text-secondary mr-2"></i>Download PDF
262262
</a>
263263
<?php if (!empty($config_smtp_host) && !empty($contact_email)) { ?>
@@ -295,7 +295,7 @@
295295
<?php echo "$invoice_status"; ?>
296296
</div>
297297
</div>
298-
<h3 class="text-right mt-5"><strong>Invoice</strong><br><small class="text-secondary"><?php echo "$invoice_prefix$invoice_number"; ?></small></h3>
298+
<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>
299299
</div>
300300

301301
</div>
@@ -352,8 +352,8 @@
352352
<th>Description</th>
353353
<th class="text-center">Quantity</th>
354354
<th class="text-right">Price</th>
355-
<th class="text-right">Tax</th>
356-
<th class="text-right">Total</th>
355+
<th class="text-right"><?php echo $config_invoice_localization_tax; ?></th>
356+
<th class="text-right"><?php echo $config_invoice_localization_total; ?></th>
357357
</tr>
358358
</thead>
359359
<tbody>
@@ -474,7 +474,7 @@
474474
<tbody>
475475

476476
<tr class="border-bottom">
477-
<td>Subtotal</td>
477+
<td><?php echo $config_invoice_localization_subtotal; ?></td>
478478
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $sub_total, $invoice_currency_code); ?></td>
479479
</tr>
480480
<?php
@@ -489,12 +489,12 @@
489489
?>
490490
<?php if ($total_tax > 0) { ?>
491491
<tr class="border-bottom">
492-
<td>Tax</td>
492+
<td><?php echo $config_invoice_localization_tax; ?></td>
493493
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_tax, $invoice_currency_code); ?></td>
494494
</tr>
495495
<?php } ?>
496496
<tr class="border-bottom">
497-
<td>Total</td>
497+
<td><?php echo $config_invoice_localization_total; ?></td>
498498
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
499499
</tr>
500500
<?php
@@ -714,7 +714,7 @@
714714

715715
var docDefinition = {
716716
info: {
717-
title: <?php echo json_encode(html_entity_decode($company_name) . "- Invoice") ?>,
717+
title: <?php echo json_encode(html_entity_decode($company_name) . "- " . $config_invoice_localization_title) ?>,
718718
author: <?php echo json_encode(html_entity_decode($company_name)) ?>
719719
},
720720

@@ -733,7 +733,7 @@
733733

734734
[
735735
{
736-
text: 'Invoice',
736+
text: '<?php echo $config_invoice_localization_title; ?>',
737737
style: 'invoiceTitle',
738738
width: '*'
739739
},
@@ -848,11 +848,11 @@
848848
style: [ 'itemsHeader', 'right']
849849
},
850850
{
851-
text: 'Tax',
851+
text: '<?php echo $config_invoice_localization_tax; ?>',
852852
style: [ 'itemsHeader', 'right']
853853
},
854854
{
855-
text: 'Total',
855+
text: '<?php echo $config_invoice_localization_total; ?>',
856856
style: [ 'itemsHeader', 'right']
857857
}
858858
],
@@ -939,7 +939,7 @@
939939
style: 'notesText'
940940
},
941941
{
942-
text: 'Subtotal',
942+
text: '<?php echo $config_invoice_localization_subtotal; ?>',
943943
style: 'itemsFooterSubTitle'
944944
},
945945
{
@@ -964,7 +964,7 @@
964964
[
965965
{},
966966
{
967-
text: 'Tax',
967+
text: '<?php echo $config_invoice_localization_tax; ?>',
968968
style: 'itemsFooterSubTitle'
969969
},
970970
{
@@ -976,7 +976,7 @@
976976
[
977977
{},
978978
{
979-
text: 'Total',
979+
text: '<?php echo $config_invoice_localization_total; ?>',
980980
style: 'itemsFooterSubTitle'
981981
},
982982
{

‎post/admin/admin_settings_invoice.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
if (filter_var($_POST['config_invoice_paid_notification_email'], FILTER_VALIDATE_EMAIL)) {
1818
$config_invoice_paid_notification_email = sanitizeInput($_POST['config_invoice_paid_notification_email']);
1919
}
20+
$config_invoice_localization_title = sanitizeInput($_POST['config_invoice_localization_title']);
21+
$config_invoice_localization_tax = sanitizeInput($_POST['config_invoice_localization_tax']);
22+
$config_invoice_localization_total = sanitizeInput($_POST['config_invoice_localization_total']);
23+
$config_invoice_localization_subtotal = sanitizeInput($_POST['config_invoice_localization_subtotal']);
2024

21-
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");
25+
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");
2226

2327
// Logging
2428
logAction("Settings", "Edit", "$session_name edited invoice settings");

‎post/admin/admin_settings_quote.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
if (filter_var($_POST['config_quote_notification_email'], FILTER_VALIDATE_EMAIL)) {
1414
$config_quote_notification_email = sanitizeInput($_POST['config_quote_notification_email']);
1515
}
16+
$config_quote_localization_title = sanitizeInput($_POST['config_quote_localization_title']);
1617

17-
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");
18+
19+
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");
1820

1921
// Logging
2022
logAction("Settings", "Edit", "$session_name edited Quote settings");

‎quote.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
<a class="dropdown-item" href="#" onclick="window.print();">
203203
<i class="fa fa-fw fa-print text-secondary mr-2"></i>Print
204204
</a>
205-
<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")); ?>');">
205+
<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")); ?>');">
206206
<i class="fa fa-fw fa-download text-secondary mr-2"></i>Download PDF
207207
</a>
208208
<?php if (!empty($config_smtp_host) && !empty($contact_email)) { ?>
@@ -237,7 +237,7 @@
237237
<?php echo $quote_status; ?>
238238
</div>
239239
</div>
240-
<h3 class="text-right mt-5"><strong>Quote</strong><br><small class="text-secondary"><?php echo "$quote_prefix$quote_number"; ?></small></h3>
240+
<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>
241241
</div>
242242
</div>
243243
<div class="row mb-4">
@@ -600,7 +600,7 @@
600600
<script>
601601
var docDefinition = {
602602
info: {
603-
title: <?php echo json_encode(html_entity_decode($company_name) . "- Quote") ?>,
603+
title: <?php echo json_encode(html_entity_decode($company_name) . "- " . $config_quote_localization_title) ?>,
604604
author: <?php echo json_encode(html_entity_decode($company_name)) ?>
605605
},
606606

@@ -617,7 +617,7 @@
617617
<?php } ?>
618618

619619
[{
620-
text: 'Quote',
620+
text: '<?php echo $config_quote_localization_title; ?>',
621621
style: 'invoiceTitle',
622622
width: '*'
623623
}, {

0 commit comments

Comments
 (0)