diff --git a/pages/sales_purchases_print_script.php b/pages/sales_purchases_print_script.php
index 69d6e6a..6cac1ce 100644
--- a/pages/sales_purchases_print_script.php
+++ b/pages/sales_purchases_print_script.php
@@ -44,7 +44,7 @@
if (value) {
valueElement.textContent = value;
- container.style.display = 'block';
+ container.style.display = '';
} else {
valueElement.textContent = '';
container.style.display = 'none';
@@ -176,22 +176,28 @@
const tr = document.createElement('tr');
const englishName = escapeHtml(item.name_en || item.name || 'Item');
const arabicName = escapeHtml(item.name_ar || '');
- const itemNameHtml = arabicName
- ? `
${englishName}
${arabicName}
`
- : `${englishName}
`;
+ const vatRateText = `${(Number.isFinite(parseFloat(item.vat_rate)) ? parseFloat(item.vat_rate) : 0).toFixed(2)}%`;
+ const itemDetails = [];
+ if (arabicName) {
+ itemDetails.push(arabicName);
+ }
+ itemDetails.push(`VAT ${vatRateText}`);
+ const itemNameHtml = `
+ ${englishName}
+ ${itemDetails.join(' • ')}
+ `;
tr.innerHTML = `
${index + 1} |
${itemNameHtml} |
${formatQty(item.quantity)} |
${formatInvoiceCurrency(item.unit_price, 3)} |
- ${(Number.isFinite(parseFloat(item.vat_rate)) ? parseFloat(item.vat_rate) : 0).toFixed(2)}% |
${formatInvoiceCurrency(item.total_price, 3)} |
`;
body.appendChild(tr);
});
} else {
- body.innerHTML = '| No invoice items / لا توجد أصناف |
';
+ body.innerHTML = '| No invoice items / لا توجد أصناف |
';
}
}
@@ -254,7 +260,7 @@
if (Array.isArray(payments) && payments.length > 0) {
if (paymentsBody) {
- payments.forEach((payment) => {
+ payments.slice(0, 3).forEach((payment) => {
const paymentChip = document.createElement('div');
paymentChip.className = 'invoice-payment-pill';
paymentChip.innerHTML = `
@@ -266,6 +272,13 @@
`;
paymentsBody.appendChild(paymentChip);
});
+
+ if (payments.length > 3) {
+ const moreChip = document.createElement('div');
+ moreChip.className = 'invoice-payment-pill invoice-payment-pill--more';
+ moreChip.textContent = `+${payments.length - 3} more payments`;
+ paymentsBody.appendChild(moreChip);
+ }
}
if (paymentsSection) paymentsSection.style.display = 'block';
} else if (paymentsSection) {
diff --git a/pages/sales_purchases_print_view.php b/pages/sales_purchases_print_view.php
index 24971ba..8fb3fa7 100644
--- a/pages/sales_purchases_print_view.php
+++ b/pages/sales_purchases_print_view.php
@@ -1,3 +1,4 @@
+