AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-08-05 07:07:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/itflow-org/itflow into develop

Browse Source
This commit is contained in:
wrongecho
2026-08-03 18:58:58 +01:00
parent f87d43881e ea3d6a2fc6
commit a313278623
3 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
agent/invoice.php
View File

@@ -163,7 +163,7 @@ if (isset($_GET['invoice_id'])) {
//Product autocomplete
$products_sql = mysqli_query($mysqli, "
SELECT
CONCAT(product_code, ' - ', product_name) AS label,
IF(product_code IS NULL OR product_code = '', product_name, CONCAT(product_code, ' - ', product_name)) AS label,
product_name,
product_code,
product_type AS type,
@@ -178,6 +178,7 @@ if (isset($_GET['invoice_id'])) {
LEFT JOIN taxes ON product_tax_id = tax_id
WHERE product_archived_at IS NULL
GROUP BY product_id
ORDER BY product_name ASC
");
if (mysqli_num_rows($products_sql) > 0) {
@@ -449,7 +450,7 @@ if (isset($_GET['invoice_id'])) {
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
<input type="hidden" name="invoice_id" value="<?= $invoice_id ?>">
<input type="hidden" id="product_id" name="product_id" value="<?= $item_product_id ?? 0 ?>">
<input type="hidden" id="product_id" name="product_id" value="0">
<input type="hidden" name="item_order" value="<?= mysqli_num_rows($sql_invoice_items) + 1 ?>">
<td></td>
<td>
@@ -752,21 +753,32 @@ $(function() {
var term = $.ui.autocomplete.escapeRegex(request.term.toLowerCase());
var matcher = new RegExp(term, "i");
var matches = $.grep(availableProducts, function(item) {
return matcher.test(item.label) || matcher.test(item.product_name) || matcher.test(item.product_code);
return matcher.test(item.label || "") || matcher.test(item.product_name || "") || matcher.test(item.product_code || "");
});
response(matches);
},
select: function (event, ui) {
$("#name").val(ui.item.label);
$("#name").val(ui.item.product_name);
$("#desc").val(ui.item.description);
$("#qty").val(1);
$("#price").val(ui.item.price);
$("#tax").val(ui.item.tax);
$("#tax").val(ui.item.tax).trigger('change');
$("#product_id").val(ui.item.prod_id);
return false;
}
});
// Typing over the name by hand breaks the link to the product
$("#name").on("input", function() {
$("#product_id").val(0);
});
// Product names and descriptions are user supplied - escape before
// building markup, the default renderer uses .text() for this reason
function esc(value) {
return $("<div>").text(value == null ? "" : value).html();
}
// Keep it simple: default jQuery UI look, just richer content
$("#name").autocomplete("instance")._renderItem = function(ul, item) {
var typeText = item.type ? item.type.charAt(0).toUpperCase() + item.type.slice(1).toLowerCase() : "";
@@ -774,21 +786,22 @@ $(function() {
var taxText = (item.tax_percent != null) ? (parseFloat(item.tax_percent) + "%") : "No tax";
var priceText = (item.price != null && item.price !== "") ? String(item.price) : "";
var stockText = (item.available_stock ?? 0);
var infoLeft =
"<div class='d-flex justify-content-between align-items-start'>" +
"<div class='flex-fill pr-2'>" +
"<div class='font-weight-bold'>" + (item.label || "") +
(typeText ? " <small class='text-muted'>(" + typeText + ")</small>" : "") +
"<div class='font-weight-bold'>" + esc(item.label) +
(typeText ? " <small class='text-muted'>(" + esc(typeText) + ")</small>" : "") +
"</div>" +
"<div class='small text-muted'>" + (item.description || "") + "</div>" +
"<div class='small text-muted'>" + esc(item.description) + "</div>" +
"<div class='mt-1'>" +
"<span class='badge badge-secondary mr-1'>Tax: " + taxText + "</span>" +
(showStock ? "<span class='badge " + ((item.available_stock ?? 0) > 0 ? "badge-success" : "badge-danger") + "'>Stock: " + (item.available_stock ?? 0) + "</span>" : "") +
"<span class='badge badge-secondary mr-1'>Tax: " + esc(taxText) + "</span>" +
(showStock ? "<span class='badge " + (stockText > 0 ? "badge-success" : "badge-danger") + "'>Stock: " + esc(stockText) + "</span>" : "") +
"</div>" +
"</div>" +
"<div class='text-right'>" +
"<div class='font-weight-bold'>" + priceText + "</div>" +
"<div class='font-weight-bold'>" + esc(priceText) + "</div>" +
"</div>" +
"</div>";

4
agent/quote.php
View File

@@ -584,7 +584,7 @@ require_once "../includes/footer.php";
<script src="../libs/jquery-ui/jquery-ui.min.js"></script>
<script>
$(function() {
var availableProducts = <?= $json_products ?? '""' ?>;
var availableProducts = <?= $json_products ?? '[]' ?>;
$("#name").autocomplete({
source: availableProducts,
@@ -593,7 +593,7 @@ require_once "../includes/footer.php";
$("#desc").val(ui.item.description); // Product description field
$("#qty").val(1); // Product quantity field automatically make it a 1
$("#price").val(ui.item.price); // Product price field
$("#tax").val(ui.item.tax); // Tax field
$("#tax").val(ui.item.tax).trigger('change'); // Tax field - trigger repaints select2
return false;
}
});

4
agent/recurring_invoice.php
View File

@@ -488,7 +488,7 @@ require_once "../includes/footer.php";
<script src="../libs/jquery-ui/jquery-ui.min.js"></script>
<script>
$(function() {
var availableProducts = <?= $json_products ?>;
var availableProducts = <?= $json_products ?? '[]' ?>;
$("#name").autocomplete({
source: availableProducts,
@@ -497,7 +497,7 @@ require_once "../includes/footer.php";
$("#desc").val(ui.item.description); // Product description field
$("#qty").val(1); // Product quantity field automatically make it a 1
$("#price").val(ui.item.price); // Product price field
$("#tax").val(ui.item.tax); // Product tax field
$("#tax").val(ui.item.tax).trigger('change'); // Product tax field - trigger repaints select2
return false;
}
});