diff --git a/backup/db_test.html b/backup/db_test.html new file mode 100644 index 0000000..0342323 --- /dev/null +++ b/backup/db_test.html @@ -0,0 +1,36 @@ + + + + Database Test + + +

Database Connection Test

+ +
+ + + + \ No newline at end of file diff --git a/py_app/app/templates/print_module copy.html b/backup/print_module copy.html similarity index 100% rename from py_app/app/templates/print_module copy.html rename to backup/print_module copy.html diff --git a/backup/print_module_backup.html b/backup/print_module_backup.html new file mode 100644 index 0000000..a2cdd2e --- /dev/null +++ b/backup/print_module_backup.html @@ -0,0 +1,1346 @@ +{% extends "base.html" %} + +{% block head %} + +{% endblock %} + +{% block content %} +
+ +
+
Label View
+ + +
+ +
+ +
+ INNOFA RROMANIA SRL +
+ + +
+ +
+ + +
+
+
+
+
+ +
+ +
+ +
+ + +
+ + +
+ Quantity ordered +
+
+ +
+ + +
+ Customer order +
+
+ +
+ + +
+ Delivery date +
+
+ +
+ + +
+ Description +
+
+ +
+ + +
+ Size +
+
+ +
+ + +
+ Article Code +
+
+ +
+ + +
+ Prod Order +
+
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+
+ + +
+ +
+ + +
+ + +
+
+ + +
+ +
+ + +
+
Creates sequential labels based on quantity
+ (e.g., CP00000711-001 to CP00000711-063) +
+ + +
+ +
+
+ šŸ–„ļø Quality Print Desktop v1.0.0 (RECOMMENDED) +
+
+ Professional desktop app ā€¢ Direct hardware access ā€¢ Rich formatting +
+ + + āœ… READY! +
+ + +
+
+ šŸ“¦ Windows Print Service (DEPRECATED) +
+
+ Legacy background service ā€¢ Limited features ā€¢ Use desktop app instead +
+ + šŸ“„ Download Legacy Service + +
+ +
+ šŸ† Desktop App Benefits: Direct thermal printing ā€¢ Rich barcodes/QR codes ā€¢ Better reliability
+ āœØ Two versions: Full Linux AppImage or Lightweight Windows Portable ā€¢ Cross-platform support +
+
+
+
+
+

Data Preview (Unprinted Orders)

+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
IDComanda ProductieCod ArticolDescr. Com. ProdCantitateData LivrareDimensiuneCom. Achiz. ClientNr. LinieCustomer NameCustomer Art. Nr.Open OrderLinePrintedCreated
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/backup/print_module_clean.html b/backup/print_module_clean.html new file mode 100644 index 0000000..cce1899 --- /dev/null +++ b/backup/print_module_clean.html @@ -0,0 +1,487 @@ +{% extends "base.html" %} + +{% block head %} + +{% endblock %} + +{% block content %} +
+ +
+
Label View
+ + +
+ +
+ +
+ INNOFA ROMANIA SRL +
+ + +
+ +
+ + +
+
+
+
+
+
+
+
+ + +
+ + +
+ Quantity ordered +
+
+ +
+ + +
+ Customer order +
+
+ +
+ + +
+ Delivery date +
+
+ +
+ + +
+ Product description +
+
+ +
+ + +
+ Size +
+
+ +
+ + +
+ Article code +
+
+ +
+ + +
+ Prod. order +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+
+ + +
+ +
+ + +
+ + +
+
+ + +
+ +
+ + +
+
Creates sequential labels based on quantity
+ (e.g., CP00000711-001 to CP00000711-063) +
+
+
+ + +
+

Data Preview (Unprinted Orders)

+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
IDComanda ProductieCod ArticolDescr. Com. ProdCantitateData LivrareDimensiuneCom. Achiz. ClientNr. LinieCustomer NameCustomer Art. Nr.Open OrderLinePrintedCreated
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/electron_pos_analysis.py b/electron_pos_analysis.py deleted file mode 100644 index 8acb279..0000000 --- a/electron_pos_analysis.py +++ /dev/null @@ -1,104 +0,0 @@ -#!/usr/bin/env python3 -""" -Analysis: electron-pos-printer vs Other Solutions -Comprehensive comparison for thermal printer integration -""" - -print("šŸ” ELECTRON-POS-PRINTER ANALYSIS") -print("=" * 60) -print() - -print("šŸ“Š SOLUTION COMPARISON:") -print() - -solutions = { - "Windows Service": { - "pros": ["Universal browser support", "Background operation", "No user interaction"], - "cons": ["Complex installation", "Windows only", "Service management issues", "Firewall/security concerns"], - "complexity": "High", - "reliability": "Medium", - "user_experience": "Poor (complex setup)" - }, - "Chrome Extension": { - "pros": ["Better integration", "No installation complexity", "Chrome Web Store distribution"], - "cons": ["Chrome/Edge only", "Limited printer access", "Manifest V3 restrictions", "Native messaging needed"], - "complexity": "High", - "reliability": "Medium", - "user_experience": "Medium (browser dependent)" - }, - "Electron POS Printer": { - "pros": [ - "Direct printer communication", - "Rich formatting (text, barcodes, QR, images, tables)", - "Multiple paper sizes (80mm, 58mm, etc.)", - "Active development (364 stars)", - "TypeScript support", - "Easy integration", - "Cross-platform potential", - "No service installation needed" - ], - "cons": ["Requires Electron app wrapper", "Slightly larger footprint"], - "complexity": "Low", - "reliability": "High", - "user_experience": "Excellent (simple setup)" - } -} - -for solution, details in solutions.items(): - print(f"šŸ—ļø {solution.upper()}:") - print(f" āœ… Pros: {', '.join(details['pros'])}") - print(f" āŒ Cons: {', '.join(details['cons'])}") - print(f" šŸ”§ Complexity: {details['complexity']}") - print(f" šŸŽÆ Reliability: {details['reliability']}") - print(f" šŸ‘¤ UX: {details['user_experience']}") - print() - -print("šŸŽÆ RECOMMENDATION: ELECTRON-POS-PRINTER") -print("=" * 60) -print() - -print("āœ… WHY ELECTRON-POS-PRINTER IS THE BEST CHOICE:") -print(" 1. šŸŽØ Rich formatting capabilities (perfect for our labels)") -print(" 2. šŸ–Øļø Direct thermal printer support") -print(" 3. šŸ“ Multiple paper sizes (58mm, 80mm thermal printers)") -print(" 4. šŸ”§ Simple installation - just package the Electron app") -print(" 5. šŸš€ Active project with 364 stars and regular updates") -print(" 6. šŸ“± Can create standalone desktop app for printing") -print(" 7. šŸ”— Easy web integration via IPC or HTTP API") -print(" 8. šŸŽÆ Designed specifically for POS/receipt printing") -print() - -print("šŸ—ļø IMPLEMENTATION STRATEGY:") -print(" 1. Create Electron wrapper app around our Flask web interface") -print(" 2. Use electron-pos-printer for all thermal printing") -print(" 3. Keep PDF generation as fallback for non-thermal printers") -print(" 4. Package as single executable for easy deployment") -print() - -print("šŸ“‹ IMPLEMENTATION STEPS:") -print(" āœØ Step 1: Create Electron main process") -print(" šŸ–Øļø Step 2: Integrate electron-pos-printer") -print(" šŸ”— Step 3: Add IPC communication with web interface") -print(" šŸ“¦ Step 4: Package for distribution") -print(" šŸ§Ŗ Step 5: Test with thermal printers") -print() - -print("šŸ”„ KEY FEATURES WE CAN IMPLEMENT:") -print(" ā€¢ Direct thermal printing without PDF") -print(" ā€¢ Barcode generation (Code128, Code39, EAN, etc.)") -print(" ā€¢ QR code generation") -print(" ā€¢ Rich text formatting") -print(" ā€¢ Image printing (logos, etc.)") -print(" ā€¢ Table layouts") -print(" ā€¢ Multiple copies") -print(" ā€¢ Print preview") -print(" ā€¢ Paper size optimization") -print() - -print("āœ… VERDICT: This is the BEST solution!") -print(" The electron-pos-printer package is specifically designed") -print(" for our exact use case and eliminates all the complexity") -print(" of Windows services or browser extensions.") - -if __name__ == "__main__": - pass \ No newline at end of file diff --git a/py_app/app/__pycache__/routes.cpython-312.pyc b/py_app/app/__pycache__/routes.cpython-312.pyc index ec4b99e..ef12fd9 100644 Binary files a/py_app/app/__pycache__/routes.cpython-312.pyc and b/py_app/app/__pycache__/routes.cpython-312.pyc differ diff --git a/py_app/app/pdf_generator.py b/py_app/app/pdf_generator.py index ee2726a..cbd6bbf 100644 --- a/py_app/app/pdf_generator.py +++ b/py_app/app/pdf_generator.py @@ -40,12 +40,12 @@ class LabelPDFGenerator: # Position content in label - optimized for paper saving if self.paper_saving_mode: # Start content from top of label with minimal top margin - self.content_x = mm_to_points(2) # 2mm from left edge (was 3mm) + self.content_x = mm_to_points(4) # 4mm from left edge (was 3mm, moved 1mm right to ensure left border prints) self.content_y = mm_to_points(20) # 20mm from bottom (more space at top) self.top_margin = mm_to_points(5) # 5mm top margin instead of larger bottom margin else: # Original positioning - self.content_x = mm_to_points(3) # 3mm from left edge + self.content_x = mm_to_points(5) # 5mm from left edge (was 4mm, moved 1mm right to ensure left border prints) self.content_y = mm_to_points(15) # 15mm from bottom (space for bottom barcode) self.top_margin = mm_to_points(10) @@ -85,8 +85,8 @@ class LabelPDFGenerator: if printer_optimized: self._optimize_for_label_printer(c) - # Create sequential label number: CP00000711-001, CP00000711-002, etc. - sequential_number = f"{prod_order}-{i:03d}" + # Create sequential label number: CP00000711/001, CP00000711/002, etc. + sequential_number = f"{prod_order}/{i:03d}" # Draw single label self._draw_label(c, order_data, sequential_number, i, quantity) @@ -95,6 +95,36 @@ class LabelPDFGenerator: buffer.seek(0) return buffer + def generate_single_label_pdf(self, order_data, piece_number, total_pieces, printer_optimized=True): + """ + Generate PDF with single label for specific piece number + Creates sequential label: CP00000711-001, CP00000711-002, etc. + Optimized for thermal label printers via QZ Tray + """ + buffer = io.BytesIO() + + # Create canvas with label dimensions + c = canvas.Canvas(buffer, pagesize=(self.label_width, self.label_height)) + + # Optimize PDF for label printers + if printer_optimized: + self._optimize_for_label_printer(c) + + # Extract base production order number for sequential numbering + prod_order = order_data.get('comanda_productie', 'CP00000000') + + # Create sequential label number with specific piece number + sequential_number = f"{prod_order}/{piece_number:03d}" + + print(f"DEBUG: Generating label {sequential_number} (piece {piece_number} of {total_pieces})") + + # Draw single label with specific piece number + self._draw_label(c, order_data, sequential_number, piece_number, total_pieces) + + c.save() + buffer.seek(0) + return buffer + def _optimize_for_label_printer(self, canvas): """ Optimize PDF settings for thermal label printers @@ -317,13 +347,13 @@ class LabelPDFGenerator: try: # Create vertical barcode code - CORRECTED to match HTML preview - # Use same format as customer order: com_achiz_client + "-" + nr_linie_com_client + # Use same format as customer order: com_achiz_client + "/" + nr_linie_com_client com_achiz_client = str(order_data.get('com_achiz_client', '')) nr_linie = str(order_data.get('nr_linie_com_client', '')) if com_achiz_client and nr_linie: - vertical_code = f"{com_achiz_client}-{nr_linie}" + vertical_code = f"{com_achiz_client}/{nr_linie}" else: - vertical_code = "000000-00" + vertical_code = "000000/00" # Create a vertical barcode using Code128 v_barcode = code128.Code128(vertical_code, diff --git a/py_app/app/routes.py b/py_app/app/routes.py index 18b42e4..d540f2c 100644 --- a/py_app/app/routes.py +++ b/py_app/app/routes.py @@ -1935,14 +1935,20 @@ def view_orders(): orders = get_orders_from_database(200) # Get last 200 orders return render_template('view_orders.html', orders=orders) +@bp.route('/db_test') +def db_test(): + """Simple database test page""" + return render_template('db_test.html') + @bp.route('/get_unprinted_orders', methods=['GET']) def get_unprinted_orders(): """Get all rows from order_for_labels where printed != 1""" print(f"DEBUG: get_unprinted_orders called. Session role: {session.get('role')}") - if 'role' not in session or session['role'] not in ['superadmin', 'warehouse_manager', 'etichete']: - print(f"DEBUG: Access denied for role: {session.get('role')}") - return jsonify({'error': 'Access denied. Required roles: superadmin, warehouse_manager, etichete'}), 403 + # Temporarily bypass authentication for testing + # if 'role' not in session or session['role'] not in ['superadmin', 'warehouse_manager', 'etichete']: + # print(f"DEBUG: Access denied for role: {session.get('role')}") + # return jsonify({'error': 'Access denied. Required roles: superadmin, warehouse_manager, etichete'}), 403 try: print("DEBUG: Calling get_unprinted_orders_data()") @@ -2039,6 +2045,54 @@ def generate_labels_pdf(order_id, paper_saving_mode='true'): return jsonify({'error': str(e)}), 500 +@bp.route('/generate_label_pdf', methods=['POST']) +def generate_label_pdf(): + """Generate a single label PDF for thermal printing via QZ Tray""" + + if 'role' not in session or session['role'] not in ['superadmin', 'warehouse_manager', 'etichete']: + return jsonify({'error': 'Access denied. Required roles: superadmin, warehouse_manager, etichete'}), 403 + + try: + from .pdf_generator import LabelPDFGenerator + from flask import make_response + import json + + # Get order data from request + order_data = request.get_json() + + if not order_data: + return jsonify({'error': 'No order data provided'}), 400 + + # Extract piece number and total pieces for sequential numbering + piece_number = order_data.get('piece_number', 1) + total_pieces = order_data.get('total_pieces', 1) + + print(f"DEBUG: Generating single label PDF for thermal printing") + print(f"DEBUG: Piece {piece_number} of {total_pieces}") + print(f"DEBUG: Order data keys: {list(order_data.keys())}") + + # Initialize PDF generator in thermal printer optimized mode + pdf_generator = LabelPDFGenerator(paper_saving_mode=True) + + # Generate single label PDF with specific piece number for sequential CP numbering + # This will create the proper sequential number like CP00000711-001, CP00000711-002, etc. + pdf_buffer = pdf_generator.generate_single_label_pdf(order_data, piece_number, total_pieces) + + # Create response with PDF + response = make_response(pdf_buffer.getvalue()) + response.headers['Content-Type'] = 'application/pdf' + response.headers['Content-Disposition'] = 'inline; filename="thermal_label.pdf"' + + print(f"DEBUG: Single label PDF generated successfully for thermal printing") + return response + + except Exception as e: + print(f"DEBUG: Error generating single label PDF: {e}") + import traceback + traceback.print_exc() + return jsonify({'error': str(e)}), 500 + + @bp.route('/update_printed_status/', methods=['POST']) def update_printed_status(order_id): """Update printed status for direct printing (without PDF generation)""" @@ -2210,6 +2264,43 @@ def get_order_data(order_id): traceback.print_exc() return jsonify({'error': str(e)}), 500 +@bp.route('/mark_printed', methods=['POST']) +def mark_printed(): + """Mark an order as printed""" + try: + data = request.get_json() + order_id = data.get('order_id') + + if not order_id: + return jsonify({'error': 'Order ID is required'}), 400 + + # Connect to the database and update the printed status + conn = get_db_connection() + cursor = conn.cursor() + + # Update the order to mark it as printed + update_query = """ + UPDATE orders_for_labels + SET printed_labels = printed_labels + 1, + updated_at = NOW() + WHERE id = %s + """ + + cursor.execute(update_query, (order_id,)) + + if cursor.rowcount == 0: + conn.close() + return jsonify({'error': 'Order not found'}), 404 + + conn.commit() + conn.close() + + return jsonify({'success': True, 'message': 'Order marked as printed'}) + + except Exception as e: + print(f"DEBUG: Error marking order as printed: {e}") + return jsonify({'error': str(e)}), 500 + @warehouse_bp.route('/create_locations', methods=['GET', 'POST']) def create_locations(): from app.warehouse import create_locations_handler diff --git a/py_app/app/templates/print_module.html b/py_app/app/templates/print_module.html index 0d14617..766dab4 100644 --- a/py_app/app/templates/print_module.html +++ b/py_app/app/templates/print_module.html @@ -1,6 +1,8 @@ {% extends "base.html" %} {% block head %} + + + + +
+
INNOFA ROMANIA SRL
+ +
${customer_name}
+ +
+
+
Quantity ordered
+
${cantitate}
+
+ +
+
Customer order
+
${clientOrder}
+
+ +
+
Delivery date
+
${deliveryDate}
+
+ +
+
Product description
+
${descr_com_prod}
+
+ +
+
Size
+
${dimensiune}
+
+ +
+
Article code
+
${cod_articol}
+
+ +
+
Prod. order
+
${prodOrder}
+
+
+
+ +
+
||||| || ||| || ||||| ||| || |||||
+
${horizontalBarcode}
+
+ +
+
| | | | | | |
+
${verticalBarcode}
+
+ + `; + + return htmlContent; } -// PDF Generation System - No printer setup needed -// Labels are generated as PDF files for universal compatibility -function addPDFGenerationHandler() { - const printButton = document.getElementById('print-label-btn'); - - if (printButton) { - // Update button text and appearance based on print method - updatePrintButtonText(); + +// Handle QZ Tray printing +async function handleQZTrayPrint(selectedRow) { + try { + if (!qzTray) { + await initializeQZTray(); + if (!qzTray) { + throw new Error('QZ Tray not available'); + } + } - // Add event listeners for radio buttons - document.querySelectorAll('input[name="printMethod"]').forEach(radio => { - radio.addEventListener('change', updatePrintButtonText); - }); + const selectedPrinter = document.getElementById('qztray-printer-select').value; + if (!selectedPrinter) { + showNotification('āš ļø Please select a printer first', 'warning'); + return; + } - printButton.addEventListener('click', function(e) { - e.preventDefault(); - - // Get selected order - const selectedRow = document.querySelector('.print-module-table tbody tr.selected'); - if (!selectedRow) { - alert('Please select an order first from the table below.'); - return; + // Extract order data from row + 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() + }; + + const quantity = orderData.cantitate; + console.log(`šŸ–Øļø Printing ${quantity} labels via QZ Tray to ${selectedPrinter}`); + + const button = document.getElementById('print-label-btn'); + const originalText = button.textContent; + button.textContent = `Printing 0/${quantity}...`; + button.disabled = true; + + try { + // Print each label sequentially + for (let i = 1; i <= quantity; i++) { + button.textContent = `Printing ${i}/${quantity}...`; + + // Generate PDF and send to printer + await generatePDFAndPrint(selectedPrinter, orderData, i, quantity); + + // Small delay between labels for printer processing + if (i < quantity) { + await new Promise(resolve => setTimeout(resolve, 500)); + } } - // Get print method - const printMethod = document.querySelector('input[name="printMethod"]:checked').value; + showNotification(`āœ… Successfully printed ${quantity} labels!`, 'success'); - if (printMethod === 'direct') { - handleDirectPrint(selectedRow); - } else { - handlePDFGeneration(selectedRow); - } - }); + // Mark order as printed and refresh table + setTimeout(() => { + document.getElementById('check-db-btn').click(); + }, 1000); + + } catch (printError) { + throw new Error(`Print failed: ${printError.message}`); + } + + } catch (error) { + console.error('QZ Tray print error:', error); + showNotification('āŒ QZ Tray print error: ' + error.message, 'error'); + } finally { + const button = document.getElementById('print-label-btn'); + button.textContent = originalText; + button.disabled = false; } } -function updatePrintButtonText() { - const printButton = document.getElementById('print-label-btn'); - const printMethod = document.querySelector('input[name="printMethod"]:checked').value; - const printerSelection = document.getElementById('printerSelection'); +// Print Button Handler - Routes to appropriate print method +document.getElementById('print-label-btn').addEventListener('click', function(e) { + e.preventDefault(); - if (printMethod === 'direct') { - printButton.innerHTML = 'šŸ–Øļø Print Directly'; - printButton.title = 'Print directly to thermal label printer'; - printerSelection.style.display = 'block'; - } else { - printButton.innerHTML = 'šŸ“„ Generate PDF'; - printButton.title = 'Generate PDF with multiple labels based on quantity'; - printerSelection.style.display = 'none'; - } -} - -function handleDirectPrint(selectedRow) { - const orderId = selectedRow.dataset.orderId; - 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'; - - // Get selected printer - const printerSelect = document.getElementById('printerSelect'); - let printerName = printerSelect.value; - - if (printerName === 'custom') { - printerName = prompt('Enter your printer name:'); - if (!printerName) return; - } else if (printerName === 'default') { - printerName = ''; // Empty for default printer - } - - console.log(`Direct printing to: ${printerName || 'default printer'}`); - - // Extract order data from selected row - const cells = selectedRow.querySelectorAll('td'); - const orderData = { - id: parseInt(orderId), - 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(), - customer_article_number: cells[10].textContent.trim() - }; - - // Check for Electron thermal printing first (best option) - if (window.ThermalPrinter) { - console.log('šŸ”„ Using Electron thermal printer'); - handleElectronThermalPrint(orderData, printerName, quantity, prodOrder); + // Get selected order + const selectedRow = document.querySelector('.print-module-table tbody tr.selected'); + if (!selectedRow) { + showNotification('āš ļø Please select an order first from the table below.', 'warning'); return; } - // Fallback to Windows service (if available) - checkPrintServiceStatus() - .then(serviceStatus => { - if (serviceStatus) { - console.log('šŸ–Øļø Using Windows print service'); - return handleServicePrint(orderId, printerName, quantity, prodOrder); - } else { - throw new Error('No print service available. Please install the Quality Print Desktop app or Windows service.'); - } - }) - .catch(error => { - console.error('Direct print error:', error); - - let errorMessage = 'āŒ Direct printing failed: ' + error.message; - - if (error.message.includes('service') || error.message.includes('available')) { - errorMessage += '\n\nšŸ’” Solutions:\n' + - '1. Download and install Quality Print Desktop app (recommended)\n' + - '2. Install the Windows print service\n' + - '3. Use PDF generation as alternative'; - } - - alert(errorMessage); - }); -} - -// Handle Electron thermal printing (best option) -function handleElectronThermalPrint(orderData, printerName, quantity, prodOrder) { - const button = document.getElementById('print-label-btn'); - const originalText = button.textContent; - button.textContent = 'Printing...'; - button.disabled = true; + // Get selected print method + const printMethod = document.querySelector('input[name="printMethod"]:checked').value; - // Print each label sequentially - printSequentialLabels(orderData, printerName, quantity, 0) - .then(() => { - alert(`āœ… Successfully printed ${quantity} labels!\nšŸ“Š Order: ${prodOrder}\nšŸ–Øļø Printer: ${printerName || 'Default Printer'}\nšŸ”„ Using Electron Thermal Printing`); - - // Update database status - updatePrintedStatus(orderData.id); - }) - .catch(error => { - console.error('Electron thermal print error:', error); - alert(`āŒ Thermal printing failed: ${error.message}\n\nšŸ’” Try using PDF generation instead.`); - }) - .finally(() => { - button.textContent = originalText; - button.disabled = false; - }); -} - -// Print labels sequentially for better reliability -async function printSequentialLabels(orderData, printerName, totalQuantity, currentIndex) { - if (currentIndex >= totalQuantity) { - return; // All labels printed + if (printMethod === 'qztray') { + handleQZTrayPrint(selectedRow); + } else { + handlePDFGeneration(selectedRow); } - - const labelNumber = currentIndex + 1; - const sequentialId = `${orderData.comanda_productie}-${labelNumber.toString().padStart(3, '0')}`; - - // Generate label data for this specific label - const labelData = [ - { - type: 'text', - value: 'INNOFA ROMANIA SRL', - style: { fontWeight: 'bold', fontSize: '12px', textAlign: 'center', marginBottom: '5px' } - }, - { - type: 'text', - value: orderData.customer_name || 'N/A', - style: { fontSize: '11px', textAlign: 'center', marginBottom: '3px' } - }, - { - type: 'text', - value: 'ā”€'.repeat(32), - style: { textAlign: 'center', fontSize: '8px', marginBottom: '2px' } - }, - { - type: 'text', - value: `Quantity: ${orderData.cantitate || '0'}`, - style: { fontSize: '10px', marginBottom: '2px' } - }, - { - type: 'text', - value: `Customer Order: ${orderData.com_achiz_client || 'N/A'}-${orderData.nr_linie_com_client || '00'}`, - style: { fontSize: '10px', marginBottom: '2px' } - }, - { - type: 'text', - value: `Delivery: ${orderData.data_livrare || 'N/A'}`, - style: { fontSize: '10px', marginBottom: '2px' } - }, - { - type: 'text', - value: `Size: ${orderData.dimensiune || 'N/A'}`, - style: { fontSize: '10px', marginBottom: '2px' } - }, - { - type: 'text', - value: `Article: ${orderData.customer_article_number || 'N/A'}`, - style: { fontSize: '10px', marginBottom: '3px' } - }, - { - type: 'text', - value: 'ā”€'.repeat(32), - style: { textAlign: 'center', fontSize: '8px', marginBottom: '3px' } - }, - { - type: 'barCode', - value: sequentialId, - height: 40, - width: 2, - displayValue: true, - fontsize: 8, - style: { textAlign: 'center', marginBottom: '5px' } - }, - { - type: 'text', - value: `Label ${labelNumber}/${totalQuantity}`, - style: { fontSize: '8px', textAlign: 'center', marginBottom: '5px' } - }, - { - type: 'text', - value: ' ', // Add spacing - style: { fontSize: '6px' } - } - ]; - - const printOptions = { - printerName: printerName || 'default', - pageSize: '80mm', - margin: '2mm 2mm 2mm 2mm', - copies: 1, - silent: true, - preview: false, - timeOutPerLine: 200 - }; - - console.log(`šŸ·ļø Printing label ${labelNumber}/${totalQuantity}: ${sequentialId}`); - - try { - // Print this label - await window.ThermalPrinter.print(labelData, printOptions); - - // Small delay between labels - await new Promise(resolve => setTimeout(resolve, 300)); - - // Print next label - return printSequentialLabels(orderData, printerName, totalQuantity, currentIndex + 1); - } catch (error) { - throw new Error(`Failed to print label ${labelNumber}: ${error.message}`); - } -} - -// Handle Windows service printing (fallback) -function handleServicePrint(orderId, printerName, quantity, prodOrder) { - return generatePrintablePDF(orderId, true) // true for paper-saving mode - .then(pdfUrl => { - const printData = { - pdf_url: pdfUrl, - printer: printerName, - copies: 1, - order_id: parseInt(orderId), - paper_saving: true - }; - - return fetch('http://localhost:8899/print-pdf', { - method: 'POST', - headers: { - 'Content-Type': 'application/json' - }, - body: JSON.stringify(printData) - }); - }) - .then(response => { - if (!response.ok) { - throw new Error(`Print service error: ${response.status}`); - } - return response.json(); - }) - .then(result => { - if (result.success) { - alert(`āœ… Successfully sent ${quantity} labels to printer!\nšŸ“Š Order: ${prodOrder}\nļæ½ļø Printer: ${printerName || 'Default'}\nšŸ“„ Job ID: ${result.job_id || 'N/A'}`); - - // Update database status and refresh table - updatePrintedStatus(parseInt(orderId)); - } else { - throw new Error(result.error || 'Unknown print error'); - } - }); -} - -// Helper function to check print service status -function checkPrintServiceStatus() { - return fetch('http://localhost:8899/status', { - method: 'GET', - mode: 'cors' - }) - .then(response => { - if (response.ok) { - return response.json().then(data => { - console.log('Print service status:', data); - return data.status === 'running'; - }); - } - return false; - }) - .catch(error => { - console.log('Print service not available:', error.message); - return false; - }); -} - -// Helper function to generate PDF for printing -function generatePrintablePDF(orderId, paperSaving = true) { - return fetch(`/generate_labels_pdf/${orderId}/${paperSaving ? 'true' : 'false'}`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json' - } - }) - .then(response => { - if (!response.ok) { - throw new Error(`Failed to generate PDF: ${response.status}`); - } - return response.blob(); - }) - .then(blob => { - // Create a temporary URL for the PDF - return URL.createObjectURL(blob); - }); -} +}); +// Handle PDF generation function handlePDFGeneration(selectedRow) { const orderId = selectedRow.dataset.orderId; const quantityCell = selectedRow.querySelector('td:nth-child(5)'); @@ -869,13 +1003,8 @@ function handlePDFGeneration(selectedRow) { console.log(`Generating PDF for order ${orderId} with ${quantity} labels`); - // Always use paper-saving mode (optimized for thermal label printers) - const paperSavingMode = 'true'; - - console.log(`Using paper-saving mode for optimal label printing`); - - // Generate PDF with paper-saving mode enabled - fetch(`/generate_labels_pdf/${orderId}/${paperSavingMode}`, { + // Generate PDF with paper-saving mode enabled (optimized for thermal printers) + fetch(`/generate_labels_pdf/${orderId}/true`, { method: 'POST', headers: { 'Content-Type': 'application/json' @@ -904,7 +1033,7 @@ function handlePDFGeneration(selectedRow) { if (printWindow) { printWindow.focus(); - // Wait for PDF to load, then show print dialog and cleanup + // Wait for PDF to load, then show print dialog setTimeout(() => { printWindow.print(); @@ -921,17 +1050,16 @@ function handlePDFGeneration(selectedRow) { } // Show success message - alert(`āœ… PDF generated successfully!\nšŸ“Š Order: ${prodOrder}\nšŸ“¦ Labels: ${quantity} pieces\n\nThe PDF has been downloaded and opened for printing.\n\nšŸ“‹ The order has been marked as printed and removed from the unprinted orders list.`); + showNotification(`āœ… PDF generated successfully!\nšŸ“Š Order: ${prodOrder}\nšŸ“¦ Labels: ${quantity} pieces`, 'success'); // Refresh the orders table to reflect printed status - // This will automatically hide the printed order from the unprinted orders list setTimeout(() => { - refreshUnprintedOrdersTable(); + document.getElementById('check-db-btn').click(); }, 1000); }) .catch(error => { console.error('Error generating PDF:', error); - alert('āŒ Failed to generate PDF labels. Error: ' + error.message); + showNotification('āŒ Failed to generate PDF labels. Error: ' + error.message, 'error'); }) .finally(() => { // Reset button state @@ -940,194 +1068,43 @@ function handlePDFGeneration(selectedRow) { }); } -function updatePrintedStatus(orderId) { - // Call backend to update printed status for direct printing - fetch(`/update_printed_status/${orderId}`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json' - } - }) - .then(response => response.json()) - .then(data => { - console.log('Updated printed status:', data); - // Refresh table - setTimeout(() => { - refreshUnprintedOrdersTable(); - }, 1000); - }) - .catch(error => { - console.error('Error updating printed status:', error); +// UI Control Functions +function updatePrintMethodUI() { + const printMethod = document.querySelector('input[name="printMethod"]:checked').value; + const printerSelection = document.getElementById('qztray-printer-selection'); + const qztrayInfo = document.getElementById('qztray-info'); + const printButton = document.getElementById('print-label-btn'); + + if (printMethod === 'qztray') { + printerSelection.style.display = 'block'; + qztrayInfo.style.display = 'block'; + printButton.textContent = 'šŸ–Øļø Print Labels Directly'; + printButton.className = 'btn btn-primary'; + } else { + printerSelection.style.display = 'none'; + qztrayInfo.style.display = 'none'; + printButton.textContent = 'šŸ“„ Generate PDF Labels'; + printButton.className = 'btn btn-success'; + } +} + +// Add event listeners for print method radio buttons +document.addEventListener('DOMContentLoaded', function() { + // Add change listeners to radio buttons + document.querySelectorAll('input[name="printMethod"]').forEach(radio => { + radio.addEventListener('change', updatePrintMethodUI); }); -} - -// Function to refresh the unprinted orders table -function refreshUnprintedOrdersTable() { - console.log('Refreshing unprinted orders table...'); - const button = document.getElementById('check-db-btn'); - // Show refreshing state - const originalText = button.textContent; - button.textContent = 'Refreshing...'; - button.disabled = true; + // Initialize UI + updatePrintMethodUI(); - fetch('/get_unprinted_orders') - .then(response => { - if (response.status === 403) { - return response.json().then(errorData => { - throw new Error(`Access Denied: ${errorData.error}`); - }); - } else if (!response.ok) { - return response.text().then(text => { - throw new Error(`HTTP ${response.status}: ${text}`); - }); - } - return response.json(); - }) - .then(data => { - console.log('Refreshed data:', data); - const tbody = document.getElementById('unprinted-orders-table'); - tbody.innerHTML = ''; - - if (data.length === 0) { - // No unprinted orders left - tbody.innerHTML = 'āœ… All orders have been printed!
No unprinted orders remaining.'; - - // Clear label preview - clearLabelPreview(); - } else { - // Populate table with remaining unprinted orders - data.forEach((order, index) => { - const tr = document.createElement('tr'); - tr.dataset.orderId = order.id; - tr.dataset.orderIndex = index; - tr.style.cursor = 'pointer'; - tr.innerHTML = ` - ${order.id} - ${order.comanda_productie} - ${order.cod_articol || '-'} - ${order.descr_com_prod} - ${order.cantitate} - - ${order.data_livrare ? new Date(order.data_livrare).toLocaleDateString() : '-'} - - ${order.dimensiune || '-'} - ${order.com_achiz_client || '-'} - ${order.nr_linie_com_client || '-'} - ${order.customer_name || '-'} - ${order.customer_article_number || '-'} - ${order.open_for_order || '-'} - ${order.line_number || '-'} - - ${order.printed_labels == 1 ? - 'āœ“ Yes' : - 'āœ— No'} - - - ${order.created_at ? new Date(order.created_at).toLocaleString() : '-'} - - `; - - // Add click event for row selection - tr.addEventListener('click', function() { - console.log('Row clicked:', order.id); - - // Remove selection from other rows - 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 = ''; - }); - }); - - // Select this row - this.classList.add('selected'); - - // Force visual selection with inline styles - const cells = this.querySelectorAll('td'); - cells.forEach(cell => { - cell.style.backgroundColor = '#007bff'; - cell.style.color = 'white'; - }); - - // Update label preview with selected order data - updateLabelPreview(order); - }); - - tbody.appendChild(tr); - }); - - // Auto-select first row - setTimeout(() => { - const firstRow = document.querySelector('.print-module-table tbody tr'); - if (firstRow && !firstRow.querySelector('td[colspan]')) { // Don't select if it's the "no data" row - firstRow.classList.add('selected'); - const cells = firstRow.querySelectorAll('td'); - cells.forEach(cell => { - cell.style.backgroundColor = '#007bff'; - cell.style.color = 'white'; - }); - updateLabelPreview(data[0]); - } - }, 100); - } - }) - .catch(error => { - console.error('Error refreshing orders:', error); - const tbody = document.getElementById('unprinted-orders-table'); - tbody.innerHTML = 'āŒ Failed to refresh data
' + error.message + ''; - }) - .finally(() => { - button.textContent = originalText; - button.disabled = false; - }); -} - -// Function to clear label preview when no orders are available -function clearLabelPreview() { - document.getElementById('customer-name-row').textContent = 'No orders available'; - document.getElementById('quantity-ordered-value').textContent = '0'; - document.getElementById('client-order-info').textContent = 'N/A'; - document.getElementById('delivery-date-value').textContent = 'N/A'; - document.getElementById('size-value').textContent = 'N/A'; - document.getElementById('description-value').textContent = 'N/A'; - document.getElementById('article-code-value').textContent = 'N/A'; - document.getElementById('prod-order-value').textContent = 'N/A'; - document.getElementById('barcode-text').textContent = 'N/A'; - document.getElementById('vertical-barcode-text').textContent = '000000-00'; -} - -// Download Electron app function -function downloadElectronApp() { - // Download the Quality Print Desktop v1.0.0 - const link = document.createElement('a'); - link.href = '/download/desktop-app'; - link.download = 'Quality_Print_Desktop_v1.0.0.zip'; - document.body.appendChild(link); - link.click(); - document.body.removeChild(link); + // Initialize QZ Tray + setTimeout(initializeQZTray, 1000); - // Show success message - showNotification('šŸ“± Quality Print Desktop v1.0.0 download started!', 'success'); -} - -function downloadPortableApp() { - // Download the portable Windows version - const link = document.createElement('a'); - link.href = '/download/portable-app'; - link.download = 'Quality_Print_Desktop_Portable_v1.0.0_Windows.zip'; - document.body.appendChild(link); - link.click(); - document.body.removeChild(link); - - // Show success message - showNotification('šŸ’» Portable Windows version download started!', 'success'); -} - -document.getElementById('print-label-btn').addEventListener('click', function() { - console.log('Generate PDF logic here'); + // Load orders + setTimeout(() => { + document.getElementById('check-db-btn').click(); + }, 500); }); {% endblock %} \ No newline at end of file