updated printing solutions
This commit is contained in:
@@ -125,8 +125,27 @@ table.view-orders-table.scan-table tbody tr.selected td {
|
||||
background-color: #6c757d;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
/* Force barcode SVG elements to be black */
|
||||
#barcode-display rect,
|
||||
#vertical-barcode-display rect {
|
||||
fill: #000000 !important;
|
||||
stroke: #000000 !important;
|
||||
}
|
||||
|
||||
#barcode-display path,
|
||||
#vertical-barcode-display path {
|
||||
fill: #000000 !important;
|
||||
stroke: #000000 !important;
|
||||
}
|
||||
|
||||
/* Ensure barcode frames have proper contrast */
|
||||
#barcode-frame,
|
||||
#vertical-barcode-frame {
|
||||
background: #ffffff !important;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
</style>
|
||||
<script src="https://cdn.jsdelivr.net/npm/jsbarcode@3.11.5/dist/JsBarcode.all.min.js"></script>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
@@ -194,7 +213,69 @@ table.view-orders-table.scan-table tbody tr.selected td {
|
||||
<div id="vertical-barcode-text" style="position: absolute; bottom: -15px; font-size: 7px; font-family: 'Courier New', monospace; text-align: center; font-weight: bold; width: 100%;"></div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Print Options removed as requested -->
|
||||
<!-- Print Options (copied from print_module.html) -->
|
||||
<div style="width: 100%; margin-top: 20px;">
|
||||
<!-- Print Method Selection -->
|
||||
<div style="margin-bottom: 15px;" role="group" aria-labelledby="print-method-label">
|
||||
<div id="print-method-label" style="font-size: 12px; font-weight: 600; color: #495057; margin-bottom: 8px;">
|
||||
📄 Print Method:
|
||||
</div>
|
||||
<div class="form-check" style="margin-bottom: 6px;">
|
||||
<input class="form-check-input" type="radio" name="printMethod" id="qzTrayPrint" value="qztray" checked>
|
||||
<label class="form-check-label" for="qzTrayPrint" style="font-size: 11px; line-height: 1.2;">
|
||||
<strong>🖨️ Direct Print</strong> <span id="qztray-status" class="badge badge-success" style="font-size: 9px; padding: 2px 6px;">Ready</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-check" id="pdf-option-container" style="display: none; margin-bottom: 6px;">
|
||||
<input class="form-check-input" type="radio" name="printMethod" id="pdfGenerate" value="pdf">
|
||||
<label class="form-check-label" for="pdfGenerate" style="font-size: 11px; line-height: 1.2;">
|
||||
<strong>📄 PDF Export</strong> <span class="text-muted" style="font-size: 10px;">(fallback)</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Printer Selection for QZ Tray (Compact) -->
|
||||
<div id="qztray-printer-selection" style="margin-bottom: 10px;">
|
||||
<label for="qztray-printer-select" style="font-size: 11px; font-weight: 600; color: #495057; margin-bottom: 3px; display: block;">
|
||||
Printer:
|
||||
</label>
|
||||
<select id="qztray-printer-select" class="form-control form-control-sm" style="font-size: 11px; padding: 3px 6px;">
|
||||
<option value="">Loading...</option>
|
||||
</select>
|
||||
</div>
|
||||
<!-- Labels Range Selection -->
|
||||
<div style="margin-bottom: 15px;">
|
||||
<label for="labels-range-input" style="font-size: 11px; font-weight: 600; color: #495057; margin-bottom: 3px; display: block;">
|
||||
Select Labels Range:
|
||||
</label>
|
||||
<input type="text" id="labels-range-input" class="form-control form-control-sm"
|
||||
placeholder="e.g., 003 or 003-007"
|
||||
style="font-size: 11px; padding: 3px 6px; text-align: center;">
|
||||
<div style="font-size: 9px; color: #6c757d; margin-top: 2px; text-align: center;">
|
||||
Single: "005" | Range: "003-007" | Leave empty for all
|
||||
</div>
|
||||
</div>
|
||||
<!-- Print Button -->
|
||||
<div style="width: 100%; text-align: center; margin-bottom: 10px;">
|
||||
<button id="print-label-btn" class="btn btn-success" style="font-size: 13px; padding: 8px 24px; border-radius: 5px; font-weight: 600;">
|
||||
🖨️ Print Labels
|
||||
</button>
|
||||
</div>
|
||||
<!-- Print Information -->
|
||||
<div style="width: 100%; text-align: center; color: #6c757d; font-size: 10px; line-height: 1.3;">
|
||||
<small>(e.g., CP00000711-001, 002, ...)</small>
|
||||
</div>
|
||||
<!-- QZ Tray Installation Info - Simplified -->
|
||||
<div id="qztray-info" style="width: 100%; margin-top: 15px; padding-top: 15px; border-top: 1px solid #e9ecef;">
|
||||
<div style="background: #f8f9fa; border: 1px solid #dee2e6; border-radius: 6px; padding: 10px; text-align: center;">
|
||||
<div style="font-size: 10px; color: #495057; margin-bottom: 8px;">
|
||||
QZ Tray is required for direct printing
|
||||
</div>
|
||||
<a href="https://filebrowser.moto-adv.com/filebrowser/api/public/dl/Fk0ZaiEY/QP_Tray/qz-tray-2.2.6-SNAPSHOT-x86_64.exe?token=TJ7gSu3CRcWWQuyFLoZv5I8j4diDjP47DDqWRtM0oKAx-2_orj1stfKPJsuuqKR9mE2GQNm1jlZ0BPR7lfZ3gHmu56SkY9fC5AJlC9n_80oX643ojlGc-U7XVb1SDd0w" class="btn btn-outline-secondary btn-sm" style="font-size: 10px; padding: 4px 16px;">
|
||||
📥 Download QZ Tray
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Orders Table Card (right, with load button and notification system) -->
|
||||
<div class="card scan-table-card" style="min-height: 700px; width: calc(100% - 350px); margin: 0;">
|
||||
@@ -231,11 +312,23 @@ table.view-orders-table.scan-table tbody tr.selected td {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- JavaScript Libraries -->
|
||||
<!-- JsBarcode library for real barcode generation -->
|
||||
<script src="{{ url_for('static', filename='JsBarcode.all.min.js') }}"></script>
|
||||
<!-- Add html2canvas library for capturing preview as image -->
|
||||
<script src="{{ url_for('static', filename='html2canvas.min.js') }}"></script>
|
||||
<!-- PATCHED QZ Tray library - works with custom server using pairing key authentication -->
|
||||
<script src="{{ url_for('static', filename='qz-tray.js') }}"></script>
|
||||
<script>
|
||||
|
||||
// Store all orders data for searching
|
||||
const allOrders = {{ orders|tojson|safe }};
|
||||
let selectedOrderData = null;
|
||||
|
||||
// QZ Tray Integration
|
||||
let qzTray = null;
|
||||
let availablePrinters = [];
|
||||
|
||||
function searchOrder() {
|
||||
const searchValue = document.getElementById('search-input').value.trim().toLowerCase();
|
||||
if (!searchValue) {
|
||||
@@ -274,13 +367,26 @@ function fetchMatchingOrders() {
|
||||
}
|
||||
matchingOrders.forEach((order, idx) => {
|
||||
const tr = document.createElement('tr');
|
||||
// Format data_livrare as DD/MM/YYYY if possible
|
||||
let dataLivrareFormatted = '-';
|
||||
if (order.data_livrare) {
|
||||
const d = new Date(order.data_livrare);
|
||||
if (!isNaN(d)) {
|
||||
const day = String(d.getDate()).padStart(2, '0');
|
||||
const month = String(d.getMonth() + 1).padStart(2, '0');
|
||||
const year = d.getFullYear();
|
||||
dataLivrareFormatted = `${day}/${month}/${year}`;
|
||||
} else {
|
||||
dataLivrareFormatted = order.data_livrare;
|
||||
}
|
||||
}
|
||||
tr.innerHTML = `
|
||||
<td>${order.id}</td>
|
||||
<td><strong>${order.comanda_productie}</strong></td>
|
||||
<td>${order.cod_articol || '-'}</td>
|
||||
<td>${order.descr_com_prod}</td>
|
||||
<td style="text-align: right; font-weight: 600;">${order.cantitate}</td>
|
||||
<td style="text-align: center;">${order.data_livrare || '-'}</td>
|
||||
<td style="text-align: center;">${dataLivrareFormatted}</td>
|
||||
<td style="text-align: center;">${order.dimensiune || '-'}</td>
|
||||
<td>${order.com_achiz_client || '-'}</td>
|
||||
<td style="text-align: right;">${order.nr_linie_com_client || '-'}</td>
|
||||
@@ -292,12 +398,296 @@ function fetchMatchingOrders() {
|
||||
<td style="font-size: 11px; color: #6c757d;">${order.created_at || '-'}</td>
|
||||
<td>1</td>
|
||||
`;
|
||||
tr.addEventListener('click', function() {
|
||||
document.querySelectorAll('.print-module-table tbody tr').forEach(row => {
|
||||
row.classList.remove('selected');
|
||||
const cells = row.querySelectorAll('td');
|
||||
cells.forEach(cell => {
|
||||
cell.style.backgroundColor = '';
|
||||
cell.style.color = '';
|
||||
});
|
||||
});
|
||||
this.classList.add('selected');
|
||||
const cells = this.querySelectorAll('td');
|
||||
cells.forEach(cell => {
|
||||
cell.style.backgroundColor = '#007bff';
|
||||
cell.style.color = 'white';
|
||||
});
|
||||
updatePreviewCard(order);
|
||||
});
|
||||
tbody.appendChild(tr);
|
||||
// Update preview card with the first matching order
|
||||
if (idx === 0) updatePreviewCard(order);
|
||||
});
|
||||
}
|
||||
|
||||
// QZ Tray and Print Button Logic (copied/adapted from print_module.html)
|
||||
async function initializeQZTray() {
|
||||
try {
|
||||
if (typeof qz === 'undefined') {
|
||||
document.getElementById('qztray-status').textContent = 'Library Error';
|
||||
document.getElementById('qztray-status').className = 'badge badge-danger';
|
||||
return false;
|
||||
}
|
||||
qz.websocket.setClosedCallbacks(function() {
|
||||
document.getElementById('qztray-status').textContent = 'Disconnected';
|
||||
document.getElementById('qztray-status').className = 'badge badge-warning';
|
||||
});
|
||||
await qz.websocket.connect();
|
||||
qzTray = qz;
|
||||
const version = await qz.api.getVersion();
|
||||
document.getElementById('qztray-status').textContent = 'Ready';
|
||||
document.getElementById('qztray-status').className = 'badge badge-success';
|
||||
document.getElementById('qztray-printer-selection').style.display = 'block';
|
||||
document.getElementById('pdf-option-container').style.display = 'none';
|
||||
await loadQZTrayPrinters();
|
||||
return true;
|
||||
} catch (error) {
|
||||
document.getElementById('qztray-status').textContent = 'Not Connected';
|
||||
document.getElementById('qztray-status').className = 'badge badge-danger';
|
||||
document.getElementById('qztray-printer-selection').style.display = 'none';
|
||||
document.getElementById('pdf-option-container').style.display = 'block';
|
||||
document.getElementById('pdfGenerate').checked = true;
|
||||
document.getElementById('qzTrayPrint').disabled = true;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function loadQZTrayPrinters() {
|
||||
try {
|
||||
if (!qzTray) return;
|
||||
const printers = await qzTray.printers.find();
|
||||
availablePrinters = printers;
|
||||
const printerSelect = document.getElementById('qztray-printer-select');
|
||||
printerSelect.innerHTML = '<option value="">Select a printer...</option>';
|
||||
printers.forEach(printer => {
|
||||
const option = document.createElement('option');
|
||||
option.value = printer;
|
||||
option.textContent = printer;
|
||||
printerSelect.appendChild(option);
|
||||
});
|
||||
const thermalPrinter = printers.find(p =>
|
||||
p.toLowerCase().includes('thermal') ||
|
||||
p.toLowerCase().includes('label') ||
|
||||
p.toLowerCase().includes('zebra') ||
|
||||
p.toLowerCase().includes('epson')
|
||||
);
|
||||
if (thermalPrinter) {
|
||||
printerSelect.value = thermalPrinter;
|
||||
}
|
||||
} catch (error) {}
|
||||
}
|
||||
|
||||
// Print Button Handler
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
setTimeout(initializeQZTray, 1000);
|
||||
document.getElementById('print-label-btn').addEventListener('click', async function(e) {
|
||||
e.preventDefault();
|
||||
const selectedRow = document.querySelector('.print-module-table tbody tr.selected');
|
||||
if (!selectedRow) {
|
||||
alert('Please select an order first from the table below.');
|
||||
return;
|
||||
}
|
||||
const printMethod = document.querySelector('input[name="printMethod"]:checked').value;
|
||||
if (printMethod === 'qztray') {
|
||||
await handleQZTrayPrint(selectedRow);
|
||||
} else {
|
||||
handlePDFGeneration(selectedRow);
|
||||
}
|
||||
});
|
||||
document.querySelectorAll('input[name="printMethod"]').forEach(radio => {
|
||||
radio.addEventListener('change', updatePrintMethodUI);
|
||||
});
|
||||
updatePrintMethodUI();
|
||||
});
|
||||
|
||||
function updatePrintMethodUI() {
|
||||
const printMethod = document.querySelector('input[name="printMethod"]:checked').value;
|
||||
const printerSelection = document.getElementById('qztray-printer-selection');
|
||||
const printButton = document.getElementById('print-label-btn');
|
||||
if (printMethod === 'qztray') {
|
||||
printButton.textContent = '🖨️ Print Labels';
|
||||
printButton.className = 'btn btn-primary';
|
||||
} else {
|
||||
printerSelection.style.display = 'none';
|
||||
printButton.textContent = '📄 Generate PDF';
|
||||
printButton.className = 'btn btn-success';
|
||||
}
|
||||
}
|
||||
|
||||
async function handleQZTrayPrint(selectedRow) {
|
||||
try {
|
||||
if (!qzTray) {
|
||||
await initializeQZTray();
|
||||
if (!qzTray) throw new Error('QZ Tray not available');
|
||||
}
|
||||
const selectedPrinter = document.getElementById('qztray-printer-select').value;
|
||||
if (!selectedPrinter) {
|
||||
alert('Please select a printer first');
|
||||
return;
|
||||
}
|
||||
const cells = selectedRow.querySelectorAll('td');
|
||||
const orderData = {
|
||||
id: cells[0].textContent,
|
||||
comanda_productie: cells[1].textContent.trim(),
|
||||
cod_articol: cells[2].textContent.trim(),
|
||||
descr_com_prod: cells[3].textContent.trim(),
|
||||
cantitate: parseInt(cells[4].textContent.trim()),
|
||||
data_livrare: cells[5].textContent.trim(),
|
||||
dimensiune: cells[6].textContent.trim(),
|
||||
com_achiz_client: cells[7].textContent.trim(),
|
||||
nr_linie_com_client: cells[8].textContent.trim(),
|
||||
customer_name: cells[9].textContent.trim()
|
||||
};
|
||||
|
||||
// Parse labels range input
|
||||
const labelsRangeInput = document.getElementById('labels-range-input').value.trim();
|
||||
let labelNumbers = [];
|
||||
|
||||
if (labelsRangeInput) {
|
||||
if (labelsRangeInput.includes('-')) {
|
||||
// Range format: "003-007"
|
||||
const rangeParts = labelsRangeInput.split('-');
|
||||
if (rangeParts.length === 2) {
|
||||
const start = parseInt(rangeParts[0]);
|
||||
const end = parseInt(rangeParts[1]);
|
||||
if (!isNaN(start) && !isNaN(end) && start > 0 && end >= start && end <= orderData.cantitate) {
|
||||
for (let i = start; i <= end; i++) {
|
||||
labelNumbers.push(i);
|
||||
}
|
||||
} else {
|
||||
alert(`Invalid range. Please use format "001-${String(orderData.cantitate).padStart(3, '0')}" or single number.`);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
alert('Invalid range format. Use "003-007" format.');
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
// Single number format: "005"
|
||||
const singleNumber = parseInt(labelsRangeInput);
|
||||
if (!isNaN(singleNumber) && singleNumber > 0 && singleNumber <= orderData.cantitate) {
|
||||
labelNumbers.push(singleNumber);
|
||||
} else {
|
||||
alert(`Invalid label number. Please use 1-${orderData.cantitate}.`);
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// No range specified, print all labels (original behavior)
|
||||
for (let i = 1; i <= orderData.cantitate; i++) {
|
||||
labelNumbers.push(i);
|
||||
}
|
||||
}
|
||||
|
||||
// Print the specified labels
|
||||
for (let i = 0; i < labelNumbers.length; i++) {
|
||||
const labelNumber = labelNumbers[i];
|
||||
await generatePDFAndPrint(selectedPrinter, orderData, labelNumber, orderData.cantitate);
|
||||
if (i < labelNumbers.length - 1) await new Promise(resolve => setTimeout(resolve, 500));
|
||||
}
|
||||
|
||||
// Show success message
|
||||
const rangeText = labelsRangeInput ?
|
||||
(labelNumbers.length === 1 ? `label ${String(labelNumbers[0]).padStart(3, '0')}` :
|
||||
`labels ${String(labelNumbers[0]).padStart(3, '0')}-${String(labelNumbers[labelNumbers.length-1]).padStart(3, '0')}`) :
|
||||
`all ${orderData.cantitate} labels`;
|
||||
alert(`Successfully printed ${rangeText} for order ${orderData.comanda_productie}`);
|
||||
|
||||
} catch (error) {
|
||||
alert('QZ Tray print error: ' + error.message);
|
||||
}
|
||||
}
|
||||
|
||||
async function generatePDFAndPrint(selectedPrinter, orderData, pieceNumber, totalPieces) {
|
||||
try {
|
||||
const pdfData = {
|
||||
...orderData,
|
||||
quantity: 1,
|
||||
piece_number: pieceNumber,
|
||||
total_pieces: totalPieces
|
||||
};
|
||||
const response = await fetch('/generate_label_pdf', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(pdfData)
|
||||
});
|
||||
if (!response.ok) throw new Error('Failed to generate PDF');
|
||||
const pdfBlob = await response.blob();
|
||||
const pdfBase64 = await new Promise((resolve, reject) => {
|
||||
const reader = new FileReader();
|
||||
reader.onloadend = () => resolve(reader.result.split(',')[1]);
|
||||
reader.onerror = reject;
|
||||
reader.readAsDataURL(pdfBlob);
|
||||
});
|
||||
const config = qz.configs.create(selectedPrinter, {
|
||||
scaleContent: false,
|
||||
rasterize: false,
|
||||
size: { width: 80, height: 100 },
|
||||
units: 'mm',
|
||||
margins: { top: 0, right: 0, bottom: 0, left: 0 }
|
||||
});
|
||||
const data = [{ type: 'pdf', format: 'base64', data: pdfBase64 }];
|
||||
await qz.print(config, data);
|
||||
} catch (error) {
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
function handlePDFGeneration(selectedRow) {
|
||||
// Check if labels range is specified
|
||||
const labelsRangeInput = document.getElementById('labels-range-input').value.trim();
|
||||
if (labelsRangeInput) {
|
||||
alert('PDF generation currently supports printing all labels only. Please use QZ Tray for custom label ranges, or leave the range field empty for PDF generation.');
|
||||
return;
|
||||
}
|
||||
|
||||
const orderId = selectedRow.querySelector('td').textContent;
|
||||
const quantityCell = selectedRow.querySelector('td:nth-child(5)');
|
||||
const quantity = quantityCell ? parseInt(quantityCell.textContent) : 1;
|
||||
const prodOrderCell = selectedRow.querySelector('td:nth-child(2)');
|
||||
const prodOrder = prodOrderCell ? prodOrderCell.textContent.trim() : 'N/A';
|
||||
const button = document.getElementById('print-label-btn');
|
||||
const originalText = button.textContent;
|
||||
button.textContent = 'Generating PDF...';
|
||||
button.disabled = true;
|
||||
fetch(`/generate_labels_pdf/${orderId}/true`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' }
|
||||
})
|
||||
.then(response => {
|
||||
if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
|
||||
return response.blob();
|
||||
})
|
||||
.then(blob => {
|
||||
const url = window.URL.createObjectURL(blob);
|
||||
const a = document.createElement('a');
|
||||
a.href = url;
|
||||
a.download = `labels_${prodOrder}_${quantity}pcs.pdf`;
|
||||
document.body.appendChild(a);
|
||||
a.click();
|
||||
document.body.removeChild(a);
|
||||
const printWindow = window.open(url, '_blank');
|
||||
if (printWindow) {
|
||||
printWindow.focus();
|
||||
setTimeout(() => {
|
||||
printWindow.print();
|
||||
setTimeout(() => { window.URL.revokeObjectURL(url); }, 2000);
|
||||
}, 1500);
|
||||
} else {
|
||||
setTimeout(() => { window.URL.revokeObjectURL(url); }, 1000);
|
||||
}
|
||||
setTimeout(() => {}, 1000);
|
||||
})
|
||||
.catch(error => {
|
||||
alert('Failed to generate PDF labels. Error: ' + error.message);
|
||||
})
|
||||
.finally(() => {
|
||||
button.textContent = originalText;
|
||||
button.disabled = false;
|
||||
});
|
||||
}
|
||||
|
||||
// Update the preview card with order data (as in print_module.html)
|
||||
function updatePreviewCard(order) {
|
||||
function set(id, value) {
|
||||
@@ -325,21 +715,128 @@ function updatePreviewCard(order) {
|
||||
set('customer-name-row', order.customer_name || '');
|
||||
set('quantity-ordered-value', order.cantitate || '');
|
||||
set('client-order-info', (order.com_achiz_client && order.nr_linie_com_client) ? `${order.com_achiz_client}-${order.nr_linie_com_client}` : '');
|
||||
set('delivery-date-value', order.data_livrare || '');
|
||||
// Format delivery date as DD/MM/YYYY
|
||||
let deliveryDateFormatted = '';
|
||||
if (order.data_livrare) {
|
||||
const d = new Date(order.data_livrare);
|
||||
if (!isNaN(d)) {
|
||||
const day = String(d.getDate()).padStart(2, '0');
|
||||
const month = String(d.getMonth() + 1).padStart(2, '0');
|
||||
const year = d.getFullYear();
|
||||
deliveryDateFormatted = `${day}/${month}/${year}`;
|
||||
} else {
|
||||
deliveryDateFormatted = order.data_livrare;
|
||||
}
|
||||
}
|
||||
set('delivery-date-value', deliveryDateFormatted);
|
||||
set('description-value', order.descr_com_prod || '');
|
||||
set('size-value', order.dimensiune || '');
|
||||
set('article-code-value', order.cod_articol || '');
|
||||
set('prod-order-value', (order.comanda_productie && order.cantitate) ? `${order.comanda_productie}-${order.cantitate}` : '');
|
||||
set('barcode-text', order.comanda_productie ? `${order.comanda_productie}/001` : '');
|
||||
set('vertical-barcode-text', (order.com_achiz_client && order.nr_linie_com_client) ? `${order.com_achiz_client}/${order.nr_linie_com_client}` : '');
|
||||
// Generate barcodes if JsBarcode is available
|
||||
if (typeof JsBarcode !== 'undefined') {
|
||||
try {
|
||||
JsBarcode("#barcode-display", order.comanda_productie ? `${order.comanda_productie}/001` : ' ', { format: "CODE128", width: 2, height: 40, displayValue: false, margin: 2 });
|
||||
} catch (e) {}
|
||||
try {
|
||||
JsBarcode("#vertical-barcode-display", (order.com_achiz_client && order.nr_linie_com_client) ? `${order.com_achiz_client}/${order.nr_linie_com_client}` : ' ', { format: "CODE128", width: 1.5, height: 35, displayValue: false, margin: 2 });
|
||||
} catch (e) {}
|
||||
// Generate barcodes if JsBarcode is available (with debugging like print_module.html)
|
||||
const horizontalBarcodeData = order.comanda_productie ? `${order.comanda_productie}/001` : 'N/A';
|
||||
const verticalBarcodeData = (order.com_achiz_client && order.nr_linie_com_client) ? `${order.com_achiz_client}/${order.nr_linie_com_client}` : '000000/00';
|
||||
|
||||
console.log('🔍 BARCODE DEBUG - Order data:', order);
|
||||
console.log('🔍 Attempting to generate horizontal barcode:', horizontalBarcodeData);
|
||||
console.log('🔍 JsBarcode available?', typeof JsBarcode !== 'undefined');
|
||||
console.log('🔍 JsBarcode object:', typeof JsBarcode !== 'undefined' ? JsBarcode : 'undefined');
|
||||
|
||||
// Function to generate barcodes (can be called after library loads)
|
||||
const generateBarcodes = () => {
|
||||
if (horizontalBarcodeData !== 'N/A' && typeof JsBarcode !== 'undefined') {
|
||||
try {
|
||||
const barcodeElement = document.querySelector("#barcode-display");
|
||||
console.log('🔍 Horizontal barcode element:', barcodeElement);
|
||||
console.log('🔍 Element innerHTML before:', barcodeElement ? barcodeElement.innerHTML : 'null');
|
||||
|
||||
JsBarcode("#barcode-display", horizontalBarcodeData, {
|
||||
format: "CODE128",
|
||||
width: 2,
|
||||
height: 40,
|
||||
displayValue: false,
|
||||
margin: 2,
|
||||
lineColor: "#000000",
|
||||
background: "#ffffff"
|
||||
});
|
||||
|
||||
console.log('🔍 Element innerHTML after:', barcodeElement ? barcodeElement.innerHTML : 'null');
|
||||
console.log('✅ Horizontal barcode generated successfully');
|
||||
|
||||
// Force black color on all barcode elements
|
||||
const barcodeSvg = document.getElementById('barcode-display');
|
||||
if (barcodeSvg) {
|
||||
console.log('🔍 SVG elements found:', barcodeSvg.querySelectorAll('rect, path').length);
|
||||
barcodeSvg.querySelectorAll('rect').forEach((r, i) => {
|
||||
console.log(`🔍 Setting rect ${i} to black`);
|
||||
r.setAttribute('fill', '#000000');
|
||||
r.setAttribute('stroke', '#000000');
|
||||
});
|
||||
barcodeSvg.querySelectorAll('path').forEach((p, i) => {
|
||||
console.log(`🔍 Setting path ${i} to black`);
|
||||
p.setAttribute('fill', '#000000');
|
||||
p.setAttribute('stroke', '#000000');
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('❌ Failed to generate horizontal barcode:', e);
|
||||
}
|
||||
} else {
|
||||
console.warn('⚠️ Skipping horizontal barcode generation:',
|
||||
horizontalBarcodeData === 'N/A' ? 'No data' : 'JsBarcode not loaded');
|
||||
}
|
||||
|
||||
// Generate vertical barcode visual using JsBarcode (will be rotated by CSS)
|
||||
console.log('🔍 Attempting to generate vertical barcode:', verticalBarcodeData);
|
||||
|
||||
if (verticalBarcodeData !== '000000/00' && typeof JsBarcode !== 'undefined') {
|
||||
try {
|
||||
const verticalElement = document.querySelector("#vertical-barcode-display");
|
||||
console.log('🔍 Vertical barcode element:', verticalElement);
|
||||
|
||||
JsBarcode("#vertical-barcode-display", verticalBarcodeData, {
|
||||
format: "CODE128",
|
||||
width: 1.5,
|
||||
height: 35,
|
||||
displayValue: false,
|
||||
margin: 2,
|
||||
lineColor: "#000000",
|
||||
background: "#ffffff"
|
||||
});
|
||||
console.log('✅ Vertical barcode generated successfully');
|
||||
|
||||
// Force black color on all vertical barcode elements
|
||||
const vbarcodeSvg = document.getElementById('vertical-barcode-display');
|
||||
if (vbarcodeSvg) {
|
||||
vbarcodeSvg.querySelectorAll('rect').forEach(r => {
|
||||
r.setAttribute('fill', '#000000');
|
||||
r.setAttribute('stroke', '#000000');
|
||||
});
|
||||
vbarcodeSvg.querySelectorAll('path').forEach(p => {
|
||||
p.setAttribute('fill', '#000000');
|
||||
p.setAttribute('stroke', '#000000');
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('❌ Failed to generate vertical barcode:', e);
|
||||
}
|
||||
} else {
|
||||
console.warn('⚠️ Skipping vertical barcode generation:',
|
||||
verticalBarcodeData === '000000/00' ? 'Default value' : 'JsBarcode not loaded');
|
||||
}
|
||||
};
|
||||
|
||||
// Try to generate immediately
|
||||
generateBarcodes();
|
||||
|
||||
// If JsBarcode is not loaded, wait a bit and try again (for CDN fallback)
|
||||
if (typeof JsBarcode === 'undefined') {
|
||||
setTimeout(() => {
|
||||
console.log('🔍 Retry after 1s - JsBarcode available?', typeof JsBarcode !== 'undefined');
|
||||
generateBarcodes();
|
||||
}, 1000);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user