diff --git a/.gitignore b/.gitignore index 92890b8c..c46fc1b8 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ ury/www/URYMosaic.html build *.lock +ury/public/pos/assets/ury/files/cert.pem diff --git a/URYMosaic/index.html b/URYMosaic/index.html index 6cb0d2b4..b85b430e 100644 --- a/URYMosaic/index.html +++ b/URYMosaic/index.html @@ -4,7 +4,7 @@ - URY Mosaic + Ex Kitchen
diff --git a/URYMosaic/public/URY.svg b/URYMosaic/public/URY.svg index 79c9accb..d7811615 100644 --- a/URYMosaic/public/URY.svg +++ b/URYMosaic/public/URY.svg @@ -1,48 +1,104 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/URYMosaic/public/ury.ico b/URYMosaic/public/ury.ico index 5e542eec..99a08f5d 100644 Binary files a/URYMosaic/public/ury.ico and b/URYMosaic/public/ury.ico differ diff --git a/pos/find-complete-flow.sh b/pos/find-complete-flow.sh new file mode 100755 index 00000000..acba0c0e --- /dev/null +++ b/pos/find-complete-flow.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +echo "=== Finding Complete Print Flow ===" +echo "" + +echo "1. Print function usage:" +grep -r "print(" . --include="*.ts" --include="*.tsx" 2>/dev/null | grep -v node_modules | grep -v "console.log\|print:" | head -10 + +echo "" +echo "2. Invoice/Payment completion:" +grep -r "complete.*payment\|submit.*invoice\|process.*payment" . --include="*.ts" --include="*.tsx" 2>/dev/null | grep -v node_modules | head -10 + +echo "" +echo "3. Files that import print functions:" +grep -r "from.*print" . --include="*.ts" --include="*.tsx" 2>/dev/null | grep -v node_modules + +echo "" +echo "4. Checking PaymentDialog.tsx for print calls:" +grep -n "print\|complete\|submit" components/PaymentDialog.tsx 2>/dev/null | head -15 + +echo "" +echo "5. Checking pos-store.ts for relevant functions:" +grep -n "const.*=.*(" store/pos-store.ts 2>/dev/null | grep -i "pay\|invoice\|order\|complete" | head -10 + +echo "" +echo "=== Flow search complete ===" diff --git a/pos/index.html b/pos/index.html index 1b94143c..65da65c0 100644 --- a/pos/index.html +++ b/pos/index.html @@ -5,7 +5,7 @@ - URY POS + Ex POS
diff --git a/pos/public/assets/ury/files/cert.pem b/pos/public/assets/ury/files/cert.pem new file mode 100644 index 00000000..3f19eec9 --- /dev/null +++ b/pos/public/assets/ury/files/cert.pem @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDCTCCAfGgAwIBAgIUIZxF0ANqYD5fB1Vyri+tz31AM1YwDQYJKoZIhvcNAQEL +BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI1MTIwNjE2MTAzMloXDTI2MTIw +NjE2MTAzMlowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAwHFxEeKJKuPZvaERJToplCFmr+UnEBCOdWb1LfCw99W/ +TnRwDjpYMdlHbhZKGVVOLE+CBZNR2lJ1OBZffYDqP75gbv4XLblxZkdwfTDpydXS +q3UFrZe1fqYI0BGZnnF405FQhKNxf7Vmmd8V7zw5V6mvx/GQF9DNNhbJWZvCixRZ +DrtHFGh8CJFqxxRjdg2uwAa7g7UuCED9Sd3xrw++7PB3T+wYVer2FOLiNBBMXihz +vyGq3vb1MatssfAfvqq4fzeogDLx5mAzn0TbFkfeSEgmb5kuYY/WtcTgfNGZYnTr +VDCMED0EF3SxB2FhPkGxtjxe/toG1RRLu1imYNGOaQIDAQABo1MwUTAdBgNVHQ4E +FgQU9A6xJl0jtU7wXrEJ5bcK3q78VKMwHwYDVR0jBBgwFoAU9A6xJl0jtU7wXrEJ +5bcK3q78VKMwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAF0Kr +ArH3A8FbJlVMAHdemGrufsW2P5LPRgBZONuWKuJuHmIqfLTAD4hiVFoqmp17y6+x +kMARzXn1zRNb+tnKzK9CfKmQlm9N6b8JG/TjUeFFOkPJmdoPjaqHj1e8Ivjhe6u/ +Kp0l2BEvwpIIKu+jYt83N8M8tPCivfcSyG5zSXt8skzkEQM2myFhMAhjM0tieDCY +nRLiGdMCVX8F7xNvG1Mn/oUKAVTgzfdHMglEF4LKpvSx0qYo/A328/5pV4c54832 +c5Bs9xG2FrfGejatNEzuXO8Bj8XQAjPNHJ3daH5KzTB/Jl5/qvR9/Vh13y8X4iZb +ylJEHZBAxeWVR5RpUg== +-----END CERTIFICATE----- diff --git a/pos/public/ury.ico b/pos/public/ury.ico index 5e542eec..99a08f5d 100644 Binary files a/pos/public/ury.ico and b/pos/public/ury.ico differ diff --git a/pos/public/ury_pos.png b/pos/public/ury_pos.png index af89f40e..de48464d 100644 Binary files a/pos/public/ury_pos.png and b/pos/public/ury_pos.png differ diff --git a/pos/src/App.tsx b/pos/src/App.tsx index e74b5635..bef486ca 100644 --- a/pos/src/App.tsx +++ b/pos/src/App.tsx @@ -10,6 +10,8 @@ import ScreenSizeProvider from './components/ScreenSizeProvider'; import { ToastProvider } from './components/ui/toast'; import { usePOSStore } from './store/pos-store'; import { useEffect } from 'react'; +import { setupKotListener } from './lib/kot-listener'; +import { initPosDisplay, destroyPosDisplay } from './lib/pos-display'; function App() { const { @@ -18,7 +20,16 @@ function App() { useEffect(() => { initializeApp(); + // Initialize KOT listener after app is ready + setupKotListener(); + // Initialize POS display for dual screen + initPosDisplay(); + + return () => { + destroyPosDisplay(); + }; }, [initializeApp]); + return ( <> @@ -45,4 +56,4 @@ function App() { ); } -export default App; +export default App; \ No newline at end of file diff --git a/pos/src/components/ProductDialog.tsx b/pos/src/components/ProductDialog.tsx index c83f9d58..711aaab3 100644 --- a/pos/src/components/ProductDialog.tsx +++ b/pos/src/components/ProductDialog.tsx @@ -247,11 +247,12 @@ const ProductDialog: React.FC = ({ removeFromOrder(itemToReplace.uniqueId); } - // Add main item as a cart line + // Add main item as a cart line with comments const orderItem: OrderItem = { ...selectedItem, quantity: numericQuantity, - price: basePrice + price: basePrice, + comment: comments.trim() || undefined }; addToOrder(orderItem); @@ -484,4 +485,4 @@ const ProductDialog: React.FC = ({ ); }; -export default ProductDialog; \ No newline at end of file +export default ProductDialog; \ No newline at end of file diff --git a/pos/src/lib/kot-listener.ts b/pos/src/lib/kot-listener.ts new file mode 100644 index 00000000..5be4fc1b --- /dev/null +++ b/pos/src/lib/kot-listener.ts @@ -0,0 +1,118 @@ +import { printKotWithQz } from './print-qz'; + +let pollingInterval: NodeJS.Timeout | null = null; +let lastCheckedKot: string | null = null; + +export function setupKotListener() { + if (typeof window === 'undefined') return; + + console.log('✅ KOT polling listener initialized'); + + // Poll every 3 seconds for new KOTs + pollingInterval = setInterval(async () => { + try { + await checkForNewKots(); + } catch (error) { + console.error('Error checking for KOTs:', error); + } + }, 3000); +} + +async function checkForNewKots() { + try { + // Get the latest KOT + const response = await fetch('/api/method/ury.ury_pos.api.get_latest_kot'); + const result = await response.json(); + + if (!result?.message) return; + + const { kot_name, pos_profile, printers, kot_printed } = result.message; + + // Skip if already printed or if we've already processed this KOT + if (kot_printed || kot_name === lastCheckedKot) return; + + console.log('🔔 New KOT detected:', kot_name); + lastCheckedKot = kot_name; + + if (!printers || printers.length === 0) { + console.error('No printers configured for KOT'); + return; + } + + // Print to each configured printer + for (const printerSetting of printers) { + const printerName = printerSetting.printer; + const printFormat = printerSetting.custom_kot_print_format || 'KOT Print'; + + try { + console.log(`🖨️ Printing KOT ${kot_name} to ${printerName}`); + + // Fetch KOT HTML + const html = await getKotPrintHtml(kot_name, printFormat); + + // Print with QZ to specific printer + await printKotWithQz(printerName, html); + + console.log(`✅ KOT printed to ${printerName}`); + + // Mark as printed + await markKotAsPrinted(kot_name); + } catch (error) { + console.error(`❌ Failed to print KOT to ${printerName}:`, error); + } + } + } catch (error) { + // Silently fail if no KOTs found + } +} + +async function getKotPrintHtml(kotName: string, printFormat: string): Promise { + const params = new URLSearchParams({ + doc: 'URY KOT', + name: kotName, + print_format: printFormat, + _lang: 'en', + no_letterhead: '1', + letterhead: 'No Letterhead', + settings: '{}' + }); + + const response = await fetch(`/api/method/frappe.www.printview.get_html_and_style?${params}`); + const result = await response.json(); + + if (!result?.message?.html) { + throw new Error('Failed to fetch KOT HTML'); + } + + return ` + + + + + ${result.message.html} + + `; +} + +async function markKotAsPrinted(kotName: string): Promise { + try { + // Use GET request which doesn't require CSRF + const response = await fetch(`/api/method/ury.ury_pos.api.mark_kot_printed?kot_name=${encodeURIComponent(kotName)}`); + + if (!response.ok) { + console.error('Failed to mark KOT as printed:', response.status); + } else { + console.log('✅ KOT marked as printed in database'); + } + } catch (error) { + console.error('Error marking KOT as printed:', error); + } +} + +export function stopKotListener() { + if (pollingInterval) { + clearInterval(pollingInterval); + pollingInterval = null; + console.log('🛑 KOT polling listener stopped'); + } +} \ No newline at end of file diff --git a/pos/src/lib/pos-display.ts b/pos/src/lib/pos-display.ts new file mode 100644 index 00000000..33255b3e --- /dev/null +++ b/pos/src/lib/pos-display.ts @@ -0,0 +1,174 @@ +// src/lib/pos-display.ts + +const BRIDGE_URL = "http://localhost:8000"; +const DEBUG = true; + +const log = (...args: unknown[]) => DEBUG && console.log("[ury_display]", ...args); + +let lastTotal: number | null = null; +let isDialogOpen = false; +let enabled = false; +let posType = ""; +let observer: MutationObserver | null = null; +let initialized = false; + +async function fetchSettings(): Promise { + try { + const [enabledRes, posTypeRes] = await Promise.all([ + fetch("/api/method/frappe.client.get_single_value?" + new URLSearchParams({ + doctype: "POS Dual Screen Settings", + field: "enabled" + })), + fetch("/api/method/frappe.client.get_single_value?" + new URLSearchParams({ + doctype: "POS Dual Screen Settings", + field: "pos_type" + })) + ]); + + const [enabledData, posTypeData] = await Promise.all([ + enabledRes.json(), + posTypeRes.json() + ]); + + enabled = enabledData.message === 1 || enabledData.message === "1"; + posType = (posTypeData.message || "").toLowerCase().trim(); + + log("Settings loaded:", { enabled, posType }); + return true; + } catch (e) { + log("Settings fetch error:", e); + enabled = true; + posType = "ury"; + return false; + } +} + +async function sendTotal(value: number): Promise { + try { + const r = await fetch(`${BRIDGE_URL}/update_display`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ type: "total", value }), + }); + const j = await r.json(); + log("Sent total:", value, "| Response:", j.status); + return j?.status === "success"; + } catch (e) { + log("Bridge error:", e); + return false; + } +} + +async function clearDisplay(): Promise { + await sendTotal(0); + log("Display cleared"); +} + +function isPaymentDialogVisible(): boolean { + const h2s = document.querySelectorAll("h2"); + const h3s = document.querySelectorAll("h3"); + + let hasPayment = false; + let hasOrderSummary = false; + + for (const h2 of h2s) { + if (h2.textContent?.trim() === "Payment") { hasPayment = true; break; } + } + for (const h3 of h3s) { + if (h3.textContent?.trim() === "Order Summary") { hasOrderSummary = true; break; } + } + + return hasPayment && hasOrderSummary; +} + +function extractFinalTotal(): number | null { + const h3s = document.querySelectorAll("h3"); + + for (const h3 of h3s) { + if (h3.textContent?.trim() !== "Order Summary") continue; + + const container = h3.parentElement; + if (!container) continue; + + const borderTDiv = container.querySelector(".border-t"); + if (borderTDiv) { + const text = borderTDiv.textContent || ""; + const matches = text.match(/[\d,]+\.?\d*/g); + if (matches) { + for (const match of matches) { + const value = parseFloat(match.replace(/,/g, "")); + if (value > 0) return value; + } + } + } + } + return null; +} + +async function checkAndUpdate(): Promise { + if (!enabled || posType !== "ury") return; + + const dialogVisible = isPaymentDialogVisible(); + + if (dialogVisible && !isDialogOpen) { + log("✅ Payment dialog OPENED"); + isDialogOpen = true; + } + + if (!dialogVisible && isDialogOpen) { + log("❌ Payment dialog CLOSED"); + isDialogOpen = false; + lastTotal = null; + await clearDisplay(); + return; + } + + if (dialogVisible) { + const total = extractFinalTotal(); + if (total !== null && total !== lastTotal) { + log("💰 Sending total:", total); + await sendTotal(total); + lastTotal = total; + } + } +} + +export async function initPosDisplay(): Promise { + if (initialized) { + log("Already initialized, skipping"); + return; + } + + log("🚀 Initializing POS Display..."); + + await fetchSettings(); + + if (!enabled) { + log("⛔ POS Display is disabled"); + return; + } + + if (posType !== "ury") { + log("⛔ POS type is not Ury:", posType); + return; + } + + observer = new MutationObserver(() => { + setTimeout(checkAndUpdate, 50); + }); + + observer.observe(document.body, { childList: true, subtree: true }); + checkAndUpdate(); + + initialized = true; + log("✅ Ury POS Display active"); +} + +export function destroyPosDisplay(): void { + if (observer) { + observer.disconnect(); + observer = null; + } + initialized = false; + log("POS Display destroyed"); +} \ No newline at end of file diff --git a/pos/src/lib/print-qz.ts b/pos/src/lib/print-qz.ts index 1de0a89f..220b3de6 100644 --- a/pos/src/lib/print-qz.ts +++ b/pos/src/lib/print-qz.ts @@ -1,14 +1,21 @@ -import qz from 'qz-tray'; +import qz from './qz-init'; import axios from 'axios'; -import { privateKey } from '../../privateKey'; -import { KEYUTIL, KJUR, stob64, hextorstr } from 'jsrsasign'; export async function loadQzPrinter(host: string): Promise { qz.security.setCertificatePromise((resolve: (data: string) => void, reject: (err?: string) => void) => { - axios.get('/assets/ury/files/cert.pem') + axios.get('/assets/ury/pos/assets/ury/files/cert.pem') .then(({ data }) => resolve(data)) .catch((err) => reject('Error fetching certificate: ' + String(err))); }); + + // Bypass signature - return empty string + qz.security.setSignaturePromise((toSign: string) => { + return (resolve: (sig: string) => void) => { + console.log('⚠️ Signature bypassed for testing'); + resolve(''); + }; + }); + if (!qz.websocket.isActive()) { await qz.websocket.connect({ host, usingSecure: false }); } @@ -19,26 +26,16 @@ export function disconnectQzPrinter(): void { } export async function printWithQz(host: string, htmlToPrint: string): Promise { - qz.security.setSignatureAlgorithm('SHA512'); - qz.security.setSignaturePromise((toSign: string) => (resolve: (sig: string) => void, reject: (err?: string) => void) => { - try { - // @ts-expect-error: privateKey must be provided securely - const pk = KEYUTIL.getKey(privateKey); - const sig = new KJUR.crypto.Signature({ alg: 'SHA512withRSA' }); - sig.init(pk); - sig.updateString(toSign); - const hex = sig.sign(); - resolve(stob64(hextorstr(hex))); - } catch (err) { - reject(String(err)); - } - }); - const printing = async () => { const printer = await qz.printers.getDefault(); + console.log('🖨️ Selected printer:', printer); + const data = [{ type: 'html', format: 'plain', data: htmlToPrint }]; const config = qz.configs.create(printer); + + console.log('📄 Sending to printer...'); await qz.print(config, data as any); + console.log('✅ Print job sent successfully'); }; if (qz.websocket.isActive()) { @@ -47,4 +44,26 @@ export async function printWithQz(host: string, htmlToPrint: string): Promise { + const host = 'localhost'; + + const printing = async () => { + console.log(`🖨️ Printing to specific printer: ${printerName}`); + + const data = [{ type: 'html', format: 'plain', data: htmlToPrint }]; + const config = qz.configs.create(printerName); + + console.log('📄 Sending KOT to printer...'); + await qz.print(config, data as any); + console.log('✅ KOT print job sent successfully'); + }; + + if (qz.websocket.isActive()) { + await printing(); + } else { + await loadQzPrinter(host); + await printing(); + } +} diff --git a/pos/src/lib/print-qz.ts.backup b/pos/src/lib/print-qz.ts.backup new file mode 100644 index 00000000..1de0a89f --- /dev/null +++ b/pos/src/lib/print-qz.ts.backup @@ -0,0 +1,50 @@ +import qz from 'qz-tray'; +import axios from 'axios'; +import { privateKey } from '../../privateKey'; +import { KEYUTIL, KJUR, stob64, hextorstr } from 'jsrsasign'; + +export async function loadQzPrinter(host: string): Promise { + qz.security.setCertificatePromise((resolve: (data: string) => void, reject: (err?: string) => void) => { + axios.get('/assets/ury/files/cert.pem') + .then(({ data }) => resolve(data)) + .catch((err) => reject('Error fetching certificate: ' + String(err))); + }); + if (!qz.websocket.isActive()) { + await qz.websocket.connect({ host, usingSecure: false }); + } +} + +export function disconnectQzPrinter(): void { + if (qz.websocket.isActive()) qz.websocket.disconnect(); +} + +export async function printWithQz(host: string, htmlToPrint: string): Promise { + qz.security.setSignatureAlgorithm('SHA512'); + qz.security.setSignaturePromise((toSign: string) => (resolve: (sig: string) => void, reject: (err?: string) => void) => { + try { + // @ts-expect-error: privateKey must be provided securely + const pk = KEYUTIL.getKey(privateKey); + const sig = new KJUR.crypto.Signature({ alg: 'SHA512withRSA' }); + sig.init(pk); + sig.updateString(toSign); + const hex = sig.sign(); + resolve(stob64(hextorstr(hex))); + } catch (err) { + reject(String(err)); + } + }); + + const printing = async () => { + const printer = await qz.printers.getDefault(); + const data = [{ type: 'html', format: 'plain', data: htmlToPrint }]; + const config = qz.configs.create(printer); + await qz.print(config, data as any); + }; + + if (qz.websocket.isActive()) { + await printing(); + } else { + await loadQzPrinter(host); + await printing(); + } +} \ No newline at end of file diff --git a/pos/src/lib/print.ts b/pos/src/lib/print.ts index feffd6b5..faecb06d 100644 --- a/pos/src/lib/print.ts +++ b/pos/src/lib/print.ts @@ -13,9 +13,10 @@ interface PrintOrderParams { } export async function printOrder({ orderId, posProfile }: PrintOrderParams): Promise<'qz' | 'network' | 'socket'> { - const { print_type, qz_host, print_format, printer, name, cashier, multiple_cashier } = posProfile; + const { qz_print, qz_host, print_format, printer, name, cashier, multiple_cashier } = posProfile; - if (print_type === 'qz') { + // Use qz_print field instead of print_type + if (qz_print === 1) { if (!qz_host) { throw new Error('QZ host is not set'); } @@ -23,7 +24,8 @@ export async function printOrder({ orderId, posProfile }: PrintOrderParams): Pro await printWithQz(qz_host, html); await updatePrintStatus(orderId); return 'qz'; - } else if (print_type === 'network') { + } else if (printer) { + // Network printing if (cashier && !multiple_cashier) { await networkPrint(orderId, printer as string, print_format as string); } else { @@ -38,4 +40,4 @@ export async function printOrder({ orderId, posProfile }: PrintOrderParams): Pro await updatePrintStatus(orderId); return 'socket'; } -} \ No newline at end of file +} diff --git a/pos/src/lib/print.ts.backup b/pos/src/lib/print.ts.backup new file mode 100644 index 00000000..feffd6b5 --- /dev/null +++ b/pos/src/lib/print.ts.backup @@ -0,0 +1,41 @@ +import { printWithQz } from './print-qz'; +import { + getInvoicePrintHtml, + networkPrint, + selectNetworkPrinter, + updatePrintStatus +} from './invoice-api'; +import { PosProfileCombined } from './pos-profile-api'; + +interface PrintOrderParams { + orderId: string; + posProfile: PosProfileCombined +} + +export async function printOrder({ orderId, posProfile }: PrintOrderParams): Promise<'qz' | 'network' | 'socket'> { + const { print_type, qz_host, print_format, printer, name, cashier, multiple_cashier } = posProfile; + + if (print_type === 'qz') { + if (!qz_host) { + throw new Error('QZ host is not set'); + } + const html = await getInvoicePrintHtml(orderId, print_format as string); + await printWithQz(qz_host, html); + await updatePrintStatus(orderId); + return 'qz'; + } else if (print_type === 'network') { + if (cashier && !multiple_cashier) { + await networkPrint(orderId, printer as string, print_format as string); + } else { + await selectNetworkPrinter(orderId, name, print_format); + } + await updatePrintStatus(orderId); + return 'network'; + } else { + // Redirect to printview page + const url = `/printview?doctype=POS Invoice&name=${orderId}&format=${print_format}&no_letterhead=1&settings={}&letterhead=No Letterhead&trigger_print=1&_lang=en`; + window.open(url, '_blank', 'noopener,noreferrer'); + await updatePrintStatus(orderId); + return 'socket'; + } +} \ No newline at end of file diff --git a/pos/src/lib/qz-init.ts b/pos/src/lib/qz-init.ts new file mode 100644 index 00000000..7f1d74e7 --- /dev/null +++ b/pos/src/lib/qz-init.ts @@ -0,0 +1,9 @@ +import qz from 'qz-tray'; + +// Expose QZ Tray globally so it's available as window.qz +if (typeof window !== 'undefined') { + (window as any).qz = qz; + console.log('✅ QZ Tray exposed globally as window.qz'); +} + +export default qz; diff --git a/pos/src/main.tsx b/pos/src/main.tsx index bef5202a..5f67222b 100644 --- a/pos/src/main.tsx +++ b/pos/src/main.tsx @@ -2,9 +2,11 @@ import { StrictMode } from 'react' import { createRoot } from 'react-dom/client' import './index.css' import App from './App.tsx' +import './lib/qz-init'; +import { setupKotListener } from './lib/kot-listener'; createRoot(document.getElementById('root')!).render( , -) +) \ No newline at end of file diff --git a/pos/src/main.tsx.backup b/pos/src/main.tsx.backup new file mode 100644 index 00000000..bef5202a --- /dev/null +++ b/pos/src/main.tsx.backup @@ -0,0 +1,10 @@ +import { StrictMode } from 'react' +import { createRoot } from 'react-dom/client' +import './index.css' +import App from './App.tsx' + +createRoot(document.getElementById('root')!).render( + + + , +) diff --git a/pos/src/pages/Orders.tsx b/pos/src/pages/Orders.tsx index 4a281e7a..4f3e547a 100644 --- a/pos/src/pages/Orders.tsx +++ b/pos/src/pages/Orders.tsx @@ -72,6 +72,7 @@ export default function Orders() { }; const handleOrderClick = (order: any) => { + console.log('Order clicked:', order); selectOrder(order); }; @@ -92,6 +93,14 @@ export default function Orders() { } }; + // Helper function to get order total with fallback + const getOrderTotal = (order: any) => { + // Try rounded_total first, then grand_total, then fallback to 0 + const total = order.rounded_total || order.grand_total || 0; + console.log(`Order ${order.name}: rounded_total=${order.rounded_total}, grand_total=${order.grand_total}, using=${total}`); + return total; + }; + async function handleCancelOrder() { if (!selectedOrder) return; if (!cancelReason.trim()) { @@ -258,7 +267,7 @@ export default function Orders() { {/* Total - pushed to bottom like MenuCard */}
- {formatCurrency(order.rounded_total)} + {formatCurrency(getOrderTotal(order))}
@@ -480,7 +489,7 @@ export default function Orders() { )} {/* Total */} - {formatCurrency(selectedOrder.rounded_total)} + {formatCurrency(getOrderTotal(selectedOrder))} @@ -491,7 +500,7 @@ export default function Orders() { setShowPaymentDialog(false)} grandTotal={selectedOrder.grand_total} - roundedTotal={selectedOrder.rounded_total} + roundedTotal={selectedOrder.rounded_total || selectedOrder.grand_total} invoice={selectedOrder.name} customer={selectedOrder.customer} posProfile={posStore.posProfile?.name || ''} @@ -504,4 +513,4 @@ export default function Orders() { )} ); -}; +}; \ No newline at end of file diff --git a/pos/src/privateKey.ts b/pos/src/privateKey.ts new file mode 100644 index 00000000..6ef16850 --- /dev/null +++ b/pos/src/privateKey.ts @@ -0,0 +1,31 @@ +// Private key for QZ Tray signing +export const privateKey = `PRIVATE_KEY_PLACEHOLDER`; + +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDAcXER4okq49m9 +oRElOimUIWav5ScQEI51ZvUt8LD31b9OdHAOOlgx2UduFkoZVU4sT4IFk1HaUnU4 +Fl99gOo/vmBu/hctuXFmR3B9MOnJ1dKrdQWtl7V+pgjQEZmecXjTkVCEo3F/tWaZ +3xXvPDlXqa/H8ZAX0M02FslZm8KLFFkOu0cUaHwIkWrHFGN2Da7ABruDtS4IQP1J +3fGvD77s8HdP7BhV6vYU4uI0EExeKHO/Iare9vUxq2yx8B++qrh/N6iAMvHmYDOf +RNsWR95ISCZvmS5hj9a1xOB80ZlidOtUMIwQPQQXdLEHYWE+QbG2PF7+2gbVFEu7 +WKZg0Y5pAgMBAAECggEASBU16SEVh/84vBLsvSkAEgBA2nnXG+lXsxoRlFense1a +bySmJG4uQt3EJ7QppTuSwH43kacQ7dodFhkrQ3NaSu4gaPK78+CWXV09AWek6nkx +JA/9RHyi+wFuI6G0DOkr/PNdWZFvHgrwl4o8SRQh1ng044vUEVegxjXazbnOMRGS +eGf62r5iHWjQZZurlSSI3DpIMThSmTXU++3LnKp8XwLMAEPeL7jKfgEm0kpU6mmE +DG0QV2prLJ9nQbKUs6b9MyQ+Wg7eWadv7sEZRzLYxc0awPgVbUaBpRGUK96frYpw +1GzITE7koHMbpKj0m30eRsEIuA3aSsQ61Ik8VcC+0QKBgQD8IzcG0m4e5M37U71k +kqL2kq9ZqjetfJdIBLtS5CeGQp67YBR6XAuOd9apf0e9XLBOuWfwkt/zpW8nAKuG +bA6icnil/1oQyXDFcGb8YhqPtZn8xtFYqC2xa2fAEKcsl8jpqmSbLxqbbAxU6lkb +w8C38VXsNdBUu5HZw4AAEY7VRwKBgQDDZCDlQCven2pbUaz/dsALuQJn8e3sfGQb +HiUrbVytMvvQLZSj51y7mMFAo0BevBLA41dmPPXmUYRFrlQszQCbw2XEffTIKZkG +FVOrpH27cLSUt89RhIg98rBKtKLGbwuh5jlEK9pb1BTuMu0PfuhTNKjiO/mx18iM +0vhik4kWzwKBgHNx0EUgXmloy+NSYTpGZbVOTllYtauKi13fRMHcUziHElSq1lV8 +BZKSzkfHTlqmsNcqzyt4pG/ThIQwK1kd6sl4bkNbGqrrAOZ148GVTaIVPU9e3QWh +42ID0no/ZbvmN4i9itj/BUi6fR74OhqbU4clSfkgXqYdR9eUSuw9HdALAoGAONfW +YhtrJ9cE4BBA3gk0EbT/KDJP327IyMLaWWn1fkXI0GWSSqSya7ki76UOwwDAC/GX +qZyuhRTOAF+ZCXeSZ75Oyv1By0GezRBDSToPggpl3qYi4DpIUI1cED/A4y3HGpCZ +tGV1nyVx+WJDaTCochxtzXNZTw3RwHZX4IW/ai0CgYEAxPO2sRB+3EEf4KWwlVpb +vJlClKnlw/DYruy5Hroj+a0tPb127yVNnDpO3STbV//m0O+5m79aDTfCZkAs+owi +rD9OpDmd8hY49FCrNTuO5PnAMUAY+Rx9XlytKadnsrC0BkjjIK3UHSu2jbyTz/0k +F8ClKaiiP80SzOe1E0e+jh0= +-----END PRIVATE KEY----- diff --git a/pos/test-qz-setup.sh b/pos/test-qz-setup.sh new file mode 100755 index 00000000..27f59ad5 --- /dev/null +++ b/pos/test-qz-setup.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +echo "=== QZ Tray Setup Verification ===" +echo "" + +echo "1. Checking certificate file..." +if [ -f "public/assets/ury/files/cert.pem" ]; then + echo " ✓ cert.pem exists" + echo " Size: $(wc -c < public/assets/ury/files/cert.pem) bytes" +else + echo " ✗ cert.pem NOT FOUND" +fi + +echo "" +echo "2. Checking private key..." +if [ -f "src/privateKey.ts" ]; then + echo " ✓ privateKey.ts exists" + if grep -q "BEGIN PRIVATE KEY" src/privateKey.ts; then + echo " ✓ Private key appears valid" + else + echo " ✗ Private key appears empty or invalid" + fi +else + echo " ✗ privateKey.ts NOT FOUND" +fi + +echo "" +echo "3. Checking print-qz.ts..." +if [ -f "src/lib/print-qz.ts" ]; then + echo " ✓ print-qz.ts exists" +else + echo " ✗ print-qz.ts NOT FOUND" +fi + +echo "" +echo "4. Checking dependencies..." +if grep -q "qz-tray" package.json; then + echo " ✓ qz-tray is in package.json" +else + echo " ✗ qz-tray NOT in package.json" +fi + +if grep -q "jsrsasign" package.json; then + echo " ✓ jsrsasign is in package.json" +else + echo " ✗ jsrsasign NOT in package.json" +fi + +echo "" +echo "=== Setup verification complete ===" diff --git a/ury/hooks.py b/ury/hooks.py index e75c3fcf..34f44d5f 100644 --- a/ury/hooks.py +++ b/ury/hooks.py @@ -19,6 +19,7 @@ "/assets/ury/js/pos_print.js", "/assets/ury/js/restrict_qty_edit_pos.js", "/assets/ury/js/ury_pos_kot.js" + ] # include js, css files in header of web template @@ -144,7 +145,10 @@ }, "URY Menu Course": { "validate": "ury.ury.api.ury_menu_course_validation.validate_priority", - } + }, + "URY KOT":{ + "after_insert":"ury.ury.api.ury_print.print_kot_on_create" + } } # Scheduled Tasks diff --git a/ury/public/Images/URY-POS.jpg b/ury/public/Images/URY-POS.jpg index 781f3b69..de48464d 100644 Binary files a/ury/public/Images/URY-POS.jpg and b/ury/public/Images/URY-POS.jpg differ diff --git a/ury/public/Images/ury-logo.jpg b/ury/public/Images/ury-logo.jpg index 185cc1b1..de48464d 100644 Binary files a/ury/public/Images/ury-logo.jpg and b/ury/public/Images/ury-logo.jpg differ diff --git a/ury/public/js/qz_test.js b/ury/public/js/qz_test.js new file mode 100644 index 00000000..05bfc155 --- /dev/null +++ b/ury/public/js/qz_test.js @@ -0,0 +1,65 @@ +console.log("🖨️ QZ Test Script Loaded"); + +// Wait for page to fully load +frappe.ready(function() { + console.log("Frappe ready, testing QZ Tray in 2 seconds..."); + + setTimeout(async function() { + try { + // Check if QZ is loaded + if (typeof qz === 'undefined') { + console.error("❌ QZ Tray library not found!"); + return; + } + console.log("✓ QZ Tray library loaded"); + + // Get certificates + console.log("Fetching certificates from server..."); + const certResponse = await frappe.call({ + method: 'ury.ury.page.ury_print.qz_certificate' + }); + + const keyResponse = await frappe.call({ + method: 'ury.ury.page.ury_print.signature_promise' + }); + + console.log("✓ Certificates fetched"); + console.log(" Cert length:", certResponse.message ? certResponse.message.length : 0); + console.log(" Key length:", keyResponse.message ? keyResponse.message.length : 0); + + // Set up security + qz.security.setCertificatePromise(function(resolve, reject) { + resolve(certResponse.message); + }); + + qz.security.setSignaturePromise(function(toSign) { + return function(resolve, reject) { + // For testing, we'll skip actual signing + resolve(); + }; + }); + + // Try to connect + console.log("Attempting to connect to QZ Tray..."); + await qz.websocket.connect(); + console.log("✅ QZ Tray connected successfully!"); + + // List printers + const printers = await qz.printers.find(); + console.log("✅ Available printers:", printers); + + frappe.show_alert({ + message: 'QZ Tray Connected! Found ' + printers.length + ' printer(s)', + indicator: 'green' + }, 5); + + } catch (error) { + console.error("❌ Error:", error); + frappe.msgprint({ + title: 'QZ Tray Error', + message: error.toString(), + indicator: 'red' + }); + } + }, 2000); +}); diff --git a/ury/public/js/qz_tray_handler.js b/ury/public/js/qz_tray_handler.js new file mode 100644 index 00000000..e69de29b diff --git a/ury/translations/en.csv b/ury/translations/en.csv new file mode 100644 index 00000000..30d6271b --- /dev/null +++ b/ury/translations/en.csv @@ -0,0 +1,23 @@ +URY, ExPOS, +URY Menu, ExPOS Menu, +URY Restaurant, ExPOS Restaurant, +URY Menu Course, ExPOS Menu Course, +URY Table, ExPOS Table, +URY Room, ExPOS Room, +URY KOT, ExPOS KOT, +URY KOT Items, ExPOS KOT Items, +URY User, ExPOS User, +URY Report Settings, ExPOS Report Settings, +URY Order, ExPOS Order, +URY Daily P and L, ExPOS Daily P and L, +URY Materials, ExPOS Materials, +URY Notification Recipient, ExPOS Notification Recipient, +URY Order Item, ExPOS Order Item, +URY P and L Breakup, ExPOS P and L Breakup, +URY Variable Expenses, ExPOS Variable Expenses, +URY Fixed Expenses, ExPOS Fixed Expenses, +URY Printer Settings, ExPOS Printer Expenses, +URY Production Item Groups, ExPOS Production Item Groups, +URY KOT Error Log, ExPOS KOT Error Log, +URY Cost Of Goods, ExPOS Cost Of Goods + diff --git a/ury/ury/api/ury_print.py b/ury/ury/api/ury_print.py index 75255bd5..d0721065 100644 --- a/ury/ury/api/ury_print.py +++ b/ury/ury/api/ury_print.py @@ -1,191 +1,487 @@ import frappe from frappe import _ - import os +import tempfile +import traceback + +# Safe import for cups +try: + import cups +except ImportError: + cups = None -from pypdf import PdfWriter +from frappe.www.printview import validate_print_permission -no_cache = 1 +logger = frappe.logger("pos_printing") -base_template_path = "www/printview.html" -standard_format = "templates/print_formats/standard.html" +def _get_qz_status(pos_profile): + """ + Helper to check if QZ Print is enabled for the given POS Profile. + Returns True if QZ is enabled, False otherwise. + """ + if not pos_profile: + return False + + return frappe.db.get_value("POS Profile", pos_profile, "qz_print") == 1 -from frappe.www.printview import validate_print_permission +def _print_as_text(conn, printer_name, doc_obj, doctype, name): + """Print document as plain text template (CUPS Only)""" + try: + text_content = "" + + # ========== KOT-SPECIFIC TEMPLATE ========== + if doctype == "URY KOT": + text_content = f""" +{'=' * 50} +{'KITCHEN ORDER TICKET'.center(50)} +{'=' * 50} +KOT #: {doc_obj.name} +Time: {doc_obj.creation} +Table: {doc_obj.get('restaurant_table', 'N/A')} +Order Type: {doc_obj.get('order_type', 'Dine In')} +Customer: {doc_obj.get('customer_name', 'N/A')} +{'-' * 50} +{'ITEMS'.center(50)} +{'-' * 50} +""" + # KOT items + if hasattr(doc_obj, 'items'): + for item in doc_obj.items: + if isinstance(item, dict): + item_name = item.get('item_name', '') + qty = item.get('qty', 0) + notes = item.get('notes') + item_variant = item.get('item_variant') + else: + item_name = getattr(item, 'item_name', '') + qty = getattr(item, 'qty', 0) + notes = getattr(item, 'notes', None) + item_variant = getattr(item, 'item_variant', None) + + display_name = (item_name[:27] + '...') if len(item_name) > 30 else item_name + text_content += f"\n{qty:<5.1f} x {display_name:<30}\n" + + if notes: + text_content += f" NOTE: {notes[:40]}\n" + if item_variant: + text_content += f" Variant: {item_variant}\n" + + text_content += f""" +{'-' * 50} +Special Instructions: {doc_obj.get('special_instructions', 'None')} +{'-' * 50} +Urgent: {'YES' if doc_obj.get('is_urgent') else 'NO'} +Course: {doc_obj.get('course', 'Main')} +{'-' * 50} +""" + + # ========== INVOICE TEMPLATE ========== + else: + text_content = f""" +{'=' * 50} +{'INVOICE'.center(50)} +{'=' * 50} +Invoice: {doc_obj.name} +Date: {doc_obj.posting_date} {doc_obj.posting_time} +Customer: {doc_obj.customer_name if hasattr(doc_obj, 'customer_name') else doc_obj.customer} +Table: {doc_obj.get('restaurant_table', 'Take Away') or 'Take Away'} +Order Type: {doc_obj.get('order_type', 'N/A')} +Waiter: {doc_obj.get('waiter', 'N/A')} +{'-' * 50} +{'ITEMS'.center(50)} +{'-' * 50} +""" + if hasattr(doc_obj, 'items'): + text_content += f"{'Qty':<5} {'Item':<30} {'Rate':>10} {'Amount':>12}\n" + text_content += f"{'-' * 57}\n" + + for item in doc_obj.items: + if isinstance(item, dict): + item_name = item.get('item_name', '') + qty = item.get('qty', 0) + rate = item.get('rate', 0) + amount = item.get('amount', 0) + else: + item_name = getattr(item, 'item_name', '') + qty = getattr(item, 'qty', 0) + rate = getattr(item, 'rate', 0) + amount = getattr(item, 'amount', 0) + + display_name = (item_name[:27] + '...') if len(item_name) > 30 else item_name + text_content += f"{qty:<5.1f} {display_name:<30} {float(rate):>10.2f} {float(amount):>12.2f}\n" + + text_content += f""" +{'-' * 50} +{'TOTALS'.center(50)} +{'-' * 50} +""" + if hasattr(doc_obj, 'net_total'): + val = doc_obj.net_total + net_total = float(val) if val else 0.0 + text_content += f"Net Total: {net_total:>40.2f}\n" + + if hasattr(doc_obj, 'total_taxes_and_charges'): + val = doc_obj.total_taxes_and_charges + tax = float(val) if val else 0.0 + text_content += f"Tax: {tax:>44.2f}\n" + + if hasattr(doc_obj, 'grand_total'): + val = doc_obj.grand_total + grand_total = float(val) if val else 0.0 + text_content += f"{'=' * 50}\n" + text_content += f"GRAND TOTAL: {grand_total:>37.2f}\n" + text_content += f"{'=' * 50}\n" + + text_content += "\nThank you for your business!\n" + + with tempfile.NamedTemporaryFile(mode='w', delete=False, suffix='.txt') as f: + f.write(text_content) + file_path = f.name + + try: + conn.printFile(printer_name, file_path, name, {}) + return {"status": "success", "message": "Printed text successfully"} + finally: + if os.path.exists(file_path): + os.unlink(file_path) + + except Exception as e: + logger.error(f"Text Print Error: {traceback.format_exc()}") + return {"status": "error", "message": f"Failed to print text: {str(e)}"} + + +def _update_kot_status(kot_name): + """Update KOT printed status safely""" + try: + if not frappe.db.exists("URY KOT", kot_name): + return + + meta = frappe.get_meta("URY KOT") + if meta.has_field("kot_printed"): + frappe.db.set_value("URY KOT", kot_name, "kot_printed", 1, update_modified=False) + elif meta.has_field("printed"): + frappe.db.set_value("URY KOT", kot_name, "printed", 1, update_modified=False) + except Exception: + logger.error(f"Failed to update KOT status for {kot_name}") @frappe.whitelist() -def network_printing( - doctype, - name, - printer_setting, - print_format=None, - doc=None, - no_letterhead=0, - file_path=None, -): +def network_printing(doctype, name, printer_setting, print_format=None, doc=None, no_letterhead=0, file_path=None, is_kot=False): + """ + Standard Server-Side CUPS Printing. + NOTE: This does NOT handle QZ Tray logic. That is handled in the wrappers. + """ try: - print_settings = frappe.get_doc("Network Printer Settings", printer_setting) + if not cups: + return {"status": "error", "message": "CUPS module not installed on server"} - try: - import cups - except ImportError: - return "Failed to import cups" + if not frappe.db.exists("Network Printer Settings", printer_setting): + return {"status": "error", "message": f"Printer setting '{printer_setting}' not found"} + + print_settings = frappe.get_doc("Network Printer Settings", printer_setting) try: cups.setServer(print_settings.server_ip) cups.setPort(print_settings.port) conn = cups.Connection() except Exception as e: - return f"Failed to connect to the printer: {str(e)}" - - try: - output = PdfWriter() - output = frappe.get_print( - doctype, - name, - print_format, - doc=doc, - no_letterhead=no_letterhead, - as_pdf=True, - output=output, - ) - if not file_path: - file_path = os.path.join( - "/", "tmp", f"frappe-pdf-{frappe.generate_hash()}.pdf" - ) - with open(file_path, "wb") as f: - output.write(f) - conn.printFile(print_settings.printer_name, file_path, name, {}) - - restaurant_table, invoice_printed, name = frappe.db.get_value( - "POS Invoice", name, ["restaurant_table", "invoice_printed", "name"] - ) + return {"status": "error", "message": f"Connection to printer failed: {str(e)}"} - if restaurant_table and invoice_printed == 0: - frappe.db.set_value("POS Invoice", name, "invoice_printed", 1) - frappe.db.set_value( - "URY Table", - restaurant_table, - {"occupied": 0, "latest_invoice_time": None}, + doc_obj = frappe.get_doc(doctype, name) if not doc else doc + + # 1. HTML/PDF Printing + if print_format: + try: + html = frappe.get_print( + doctype=doctype, + name=name, + print_format=print_format, + doc=doc_obj, + no_letterhead=no_letterhead ) - else: - frappe.db.set_value("POS Invoice", name, "invoice_printed", 1) - - return "Success" - except Exception as e: - return f"Failed to print: {str(e)}" + from frappe.utils.pdf import get_pdf + pdf_content = get_pdf(html) + + with tempfile.NamedTemporaryFile(mode='wb', delete=False, suffix='.pdf') as f: + f.write(pdf_content) + pdf_file_path = f.name + + try: + conn.printFile(print_settings.printer_name, pdf_file_path, f"{name} - {print_format}", {}) + if os.path.exists(pdf_file_path): + os.unlink(pdf_file_path) + + if doctype == "URY KOT": + _update_kot_status(name) + + return {"status": "success", "message": "Printed PDF successfully"} + except Exception as e: + if os.path.exists(pdf_file_path): + os.unlink(pdf_file_path) + raise e + except Exception as e: + logger.error(f"PDF Print failed for {print_format}, falling back to text. Error: {e}") + + # 2. Fallback Text Printing + return _print_as_text(conn, print_settings.printer_name, doc_obj, doctype, name) + except Exception as e: - import traceback - - traceback.print_exc() # Print the full traceback for debugging - return f"An error occurred: {str(e)}" + logger.error(f"Network Printing Error: {traceback.format_exc()}") + return {"status": "error", "message": str(e)} @frappe.whitelist() def select_network_printer(pos_profile, invoice_id): + """ + Called by JS to decide how to print an invoice. + """ + # 1. CHECK QZ STATUS FIRST + if _get_qz_status(pos_profile): + # If QZ is enabled, we DO NOT print here. + # We return a specific status so the JS knows to run the QZ logic. + return {"status": "qz_enabled", "message": "Client will handle printing"} + + # 2. Proceed with CUPS Logic table = frappe.db.get_value("POS Invoice", invoice_id, "restaurant_table") print_format = frappe.db.get_value("POS Profile", pos_profile, "print_format") + + printer_setting_name = None if table: room = frappe.db.get_value("URY Table", table, "restaurant_room") - room_bill_printer = frappe.db.get_value( - "URY Printer Settings", {"parent": room, "bill": 1}, "printer" + printer_setting_name = frappe.db.get_value( + "URY Printer Settings", + {"parent": room, "bill": 1}, + "printer" ) - if room_bill_printer: - print = network_printing( - "POS Invoice", invoice_id, room_bill_printer, print_format - ) - return print - else: - pos_bill_printer = frappe.db.get_value( - "URY Printer Settings", {"parent": pos_profile, "bill": 1}, "printer" + if not printer_setting_name: + printer_setting_name = frappe.db.get_value( + "URY Printer Settings", + {"parent": pos_profile, "bill": 1}, + "printer" ) - if pos_bill_printer: - print = network_printing( - "POS Invoice", invoice_id, pos_bill_printer, print_format - ) - return print + + if printer_setting_name: + return network_printing( + "POS Invoice", invoice_id, printer_setting_name, print_format + ) + + return {"status": "error", "message": "No suitable printer found configuration"} @frappe.whitelist() def qz_print_update(invoice): + """ + Called by JS AFTER QZ Tray successfully prints, or to update status. + """ try: table = frappe.db.get_value("POS Invoice", invoice, "restaurant_table") - if table == None or table == "": - # Update invoice_printed - frappe.db.set_value( - "POS Invoice", invoice, "invoice_printed", 1, update_modified=False - ) - - # Validate the update - new_invoice_printed = frappe.db.get_value("POS Invoice", invoice, "invoice_printed") - if new_invoice_printed != 1: - return {"status": "Failure"} - else: - invoice_printed = frappe.db.get_value("POS Invoice", invoice, "invoice_printed") + frappe.db.set_value("POS Invoice", invoice, "invoice_printed", 1, update_modified=False) + + if frappe.db.get_value("POS Invoice", invoice, "invoice_printed") != 1: + return {"status": "Failure"} - if invoice_printed == 0: - # Update invoice_printed - frappe.db.set_value( - "POS Invoice", invoice, "invoice_printed", 1, update_modified=False - ) - - # Update table status - frappe.db.set_value( - "URY Table", table, {"occupied": 0, "latest_invoice_time": None} - ) - - # Validate both updates - new_invoice_printed = frappe.db.get_value("POS Invoice", invoice, "invoice_printed") - new_table_status = frappe.db.get_value("URY Table", table, "occupied") - - if new_invoice_printed != 1 or new_table_status != 0: - return {"status": "Failure"} + if table: + frappe.db.set_value( + "URY Table", + table, + {"occupied": 0, "latest_invoice_time": None}, + update_modified=True + ) + + if frappe.db.get_value("URY Table", table, "occupied") != 0: + return {"status": "Failure"} return {"status": "Success"} except Exception as e: - frappe.log_error(message=e, title="Print Fail") - frappe.throw(_("Error while printing order",e)) + frappe.log_error(title="Print Update Fail", message=traceback.format_exc()) return {"status": "Failure"} @frappe.whitelist() def print_pos_page(doctype, name, print_format): - data = {"name": name, "doctype": doctype, "print_format": print_format} + """ + Endpoint to trigger printing. + If QZ is enabled, it returns 'qz_enabled' so JS takes over. + If QZ is disabled, it prints via CUPS. + """ + logger.debug(f"print_pos_page called for {name}") + + try: + # Fetch POS Profile from the Invoice + pos_profile = frappe.db.get_value(doctype, name, "pos_profile") + + # 1. CHECK QZ STATUS + if _get_qz_status(pos_profile): + # QZ is ON. We do NOT print from server. + # We return success/qz status so the JS knows to proceed with client-side print. + return {"status": "qz_enabled", "message": "QZ Enabled, Handled by Client"} + + # 2. CUPS PRINTING (Legacy/Server-side) + printer_settings = frappe.get_all('Network Printer Settings', limit=1) + if not printer_settings: + return {"status": "error", "message": "No printer configured"} + + printer_setting = printer_settings[0]['name'] + + result = network_printing( + doctype=doctype, + name=name, + printer_setting=printer_setting, + print_format=print_format + ) + + # UI Realtime updates (Only needed for Server side print usually) + restaurant_table, branch = frappe.db.get_value( + "POS Invoice", name, ["restaurant_table", "branch"] + ) + + if branch: + print_channel = f"print_{branch}" + frappe.publish_realtime(print_channel, { + "data": {"name": name, "doctype": doctype, "print_format": print_format} + }) + + # Update Status (Since server handled the print) + if frappe.db.get_value("POS Invoice", name, "invoice_printed") == 0: + frappe.db.set_value("POS Invoice", name, "invoice_printed", 1) - restaurant_table, branch, name = frappe.db.get_value( - "POS Invoice", name, ["restaurant_table", "branch", "name"] - ) - print_channel = "{}_{}".format("print", branch) - frappe.publish_realtime(print_channel, {"data": data}) + if restaurant_table: + frappe.db.set_value( + "URY Table", + restaurant_table, + {"occupied": 0, "latest_invoice_time": None}, + ) + + return result + + except Exception as e: + frappe.log_error(f"print_pos_page error: {str(e)}", "Print Error") + return {"status": "error", "message": str(e)} - invoice_printed = frappe.db.get_value("POS Invoice", name, "invoice_printed") - if invoice_printed == 0: - frappe.db.set_value("POS Invoice", name, "invoice_printed", 1) +@frappe.whitelist() +def qz_certificate(): + return frappe.get_site_config().get("qz_cert") - if restaurant_table: - frappe.db.set_value( - "URY Table", - restaurant_table, - {"occupied": 0, "latest_invoice_time": None}, - ) + +@frappe.whitelist() +def signature_promise(): + return frappe.get_site_config().get("qz_private_key") @frappe.whitelist() -def qz_certificate(): - site_config = frappe.get_site_config() - qz_key_value = site_config.get("qz_cert") +def print_kot_on_create(doc, method=None): + """ + Auto-print KOT. + If QZ is enabled, publish realtime event for client-side printing. + Otherwise use CUPS server-side printing. + """ + try: + if isinstance(doc, str): + kot_name = doc + kot = frappe.get_doc("URY KOT", kot_name) + else: + kot = doc + kot_name = doc.name + + pos_profile = kot.pos_profile + + # 1. CHECK QZ STATUS + if _get_qz_status(pos_profile): + # Get printer settings for this POS Profile + printer_settings = frappe.get_all( + "URY Printer Settings", + filters={ + "parent": pos_profile, + "parentfield": "printer_settings", + "custom_kot_print": 1 + }, + fields=["name", "printer", "custom_kot_print_format"] + ) + + if not printer_settings: + return {"status": "error", "message": "No KOT printer configured"} + + # Publish realtime event with printer details + frappe.publish_realtime( + event="ury_kot_created", + message={ + "kot_name": kot_name, + "pos_profile": pos_profile, + "printers": printer_settings + }, + user=frappe.session.user + ) + + logger.info(f"Published KOT event for {kot_name} to {len(printer_settings)} printer(s)") + return {"status": "qz_enabled", "message": f"KOT event published for {len(printer_settings)} printer(s)"} + + # 2. CUPS PRINTING (unchanged) + if not pos_profile: + return {"status": "error", "message": "No POS Profile configured"} + + printer_settings = frappe.get_all( + "URY Printer Settings", + filters={ + "parent": pos_profile, + "parentfield": "printer_settings", + "custom_kot_print": 1 + }, + fields=["name", "printer", "custom_kot_print_format"] + ) + + if not printer_settings: + return {"status": "error", "message": "No KOT printer configured"} + + results = [] + success_count = 0 - return qz_key_value + for setting in printer_settings: + printer = setting.get("printer") + fmt = setting.get("custom_kot_print_format") + + if not printer: continue + + res = network_printing( + doctype="URY KOT", + name=kot_name, + printer_setting=printer, + print_format=fmt, + doc=kot + ) + + status = res.get("status") if isinstance(res, dict) else "unknown" + if status == "success": + success_count += 1 + + results.append({ + "printer": printer, + "status": status, + "message": res.get("message") if isinstance(res, dict) else str(res) + }) + + if success_count > 0: + _update_kot_status(kot_name) + + return { + "status": "success", + "message": f"KOT printed to {success_count} printer(s)", + "results": results + } + + except Exception as e: + frappe.log_error(f"KOT Print Error: {str(e)}", "KOT Print Error") + return {"status": "error", "message": str(e)} @frappe.whitelist() -def signature_promise(): - site_config = frappe.get_site_config() - key_value = site_config.get("qz_private_key") - - return key_value +def get_kot_printers(pos_profile): + return frappe.get_all( + "URY Printer Settings", + filters={"parent": pos_profile, "custom_kot_print": 1}, + fields=["name", "printer", "custom_kot_print_format"] + ) diff --git a/ury/ury/doctype/ury_kot/ury_kot.json b/ury/ury/doctype/ury_kot/ury_kot.json index c2adbf61..57dfbfaf 100644 --- a/ury/ury/doctype/ury_kot/ury_kot.json +++ b/ury/ury/doctype/ury_kot/ury_kot.json @@ -39,7 +39,8 @@ "customer_group", "table_takeaway", "user", - "amended_from" + "amended_from", + "kot_printed" ], "fields": [ { @@ -253,13 +254,20 @@ "fieldtype": "Data", "label": "Total Production Time", "read_only": 1 + }, + { + "allow_on_submit": 1, + "default": "0", + "fieldname": "kot_printed", + "fieldtype": "Check", + "label": "KOT Printed" } ], "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-08-26 12:28:58.664903", - "modified_by": "Administrator", + "modified": "2025-12-09 11:16:15.073592", + "modified_by": "obed.odai@gmail.com", "module": "URY", "name": "URY KOT", "naming_rule": "By \"Naming Series\" field", @@ -305,6 +313,7 @@ "write": 1 } ], + "row_format": "Dynamic", "sort_field": "modified", "sort_order": "DESC", "states": [] diff --git a/ury/ury/hooks/ury_pos_invoice.py b/ury/ury/hooks/ury_pos_invoice.py index 3236237d..2a7acbd3 100644 --- a/ury/ury/hooks/ury_pos_invoice.py +++ b/ury/ury/hooks/ury_pos_invoice.py @@ -1,6 +1,7 @@ import frappe from datetime import datetime from frappe.utils import now_datetime, get_time,now +from frappe.utils import now, get_datetime def before_insert(doc, method): @@ -83,15 +84,22 @@ def validate_customer(doc, method): ) + + def calculate_and_set_times(doc, method): + # Set arrived_time to creation time doc.arrived_time = doc.creation - current_time_str = now() + # Get current time as datetime object + current_time = get_datetime(now()) - current_time = datetime.strptime(current_time_str, "%Y-%m-%d %H:%M:%S.%f") + # Convert doc.creation from string to datetime object + creation_datetime = get_datetime(doc.creation) - time_difference = current_time - doc.creation + # Calculate time difference (both are now datetime objects) + time_difference = current_time - creation_datetime + # Format the time difference total_seconds = int(time_difference.total_seconds()) hours, remainder = divmod(total_seconds, 3600) minutes, seconds = divmod(remainder, 60) diff --git a/ury/ury/workspace/ury/ury.json b/ury/ury/workspace/ury/ury.json index 3abdf2a3..258a63be 100644 --- a/ury/ury/workspace/ury/ury.json +++ b/ury/ury/workspace/ury/ury.json @@ -1,15 +1,11 @@ { "charts": [], - "content": "[{\"id\":\"3XhkKI6EJA\",\"type\":\"card\",\"data\":{\"card_name\":\"URY Setup\",\"col\":3}},{\"id\":\"YXLBzy46Bq\",\"type\":\"custom_block\",\"data\":{\"custom_block_name\":\"URY POS\",\"col\":2}},{\"id\":\"OJsNZQxJi3\",\"type\":\"custom_block\",\"data\":{\"custom_block_name\":\"POS V1\",\"col\":2}}]", + "content": "[{\"id\":\"3XhkKI6EJA\",\"type\":\"card\",\"data\":{\"card_name\":\"URY Setup\",\"col\":3}},{\"id\":\"YXLBzy46Bq\",\"type\":\"custom_block\",\"data\":{\"custom_block_name\":\"URY POS\",\"col\":2}}]", "creation": "2023-11-30 12:04:38.330350", "custom_blocks": [ { "custom_block_name": "URY POS", "label": "URY POS" - }, - { - "custom_block_name": "POS V1", - "label": "POS V1" } ], "docstatus": 0, @@ -25,7 +21,7 @@ "hidden": 0, "is_query_report": 0, "label": "URY Setup", - "link_count": 8, + "link_count": 10, "link_type": "DocType", "onboard": 0, "type": "Card Break" @@ -43,7 +39,7 @@ { "hidden": 0, "is_query_report": 0, - "label": "URY Restaurant", + "label": "ExPOS Restaurant", "link_count": 0, "link_to": "URY Restaurant", "link_type": "DocType", @@ -63,7 +59,7 @@ { "hidden": 0, "is_query_report": 0, - "label": "URY Menu", + "label": "ExPOS Menu", "link_count": 0, "link_to": "URY Menu", "link_type": "DocType", @@ -73,7 +69,7 @@ { "hidden": 0, "is_query_report": 0, - "label": "URY Menu Course", + "label": "ExPOS Menu Course", "link_count": 0, "link_to": "URY Menu Course", "link_type": "DocType", @@ -83,7 +79,7 @@ { "hidden": 0, "is_query_report": 0, - "label": "URY Table", + "label": "ExPOS Table", "link_count": 0, "link_to": "URY Table", "link_type": "DocType", @@ -93,7 +89,7 @@ { "hidden": 0, "is_query_report": 0, - "label": "URY Room", + "label": "ExPOS Room", "link_count": 0, "link_to": "URY Room", "link_type": "DocType", @@ -109,10 +105,30 @@ "link_type": "DocType", "onboard": 0, "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "POS Opening Entry", + "link_count": 0, + "link_to": "POS Opening Entry", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "POS Closing Entry", + "link_count": 0, + "link_to": "POS Closing Entry", + "link_type": "DocType", + "onboard": 0, + "type": "Link" } ], - "modified": "2025-07-25 10:51:43.683224", - "modified_by": "Administrator", + "modified": "2025-12-12 14:35:22.770117", + "modified_by": "obed.odai@gmail.com", "module": "URY", "name": "URY", "number_cards": [], diff --git a/ury/ury_pos/api.py b/ury/ury_pos/api.py index 0cbf4b72..163106e8 100644 --- a/ury/ury_pos/api.py +++ b/ury/ury_pos/api.py @@ -683,3 +683,122 @@ def validate_pos_close(pos_profile): return "Success" +@frappe.whitelist(allow_guest=True) +def get_latest_kot(): + """Get the latest unprinted KOT for the current user's POS Profile""" + try: + current_user = frappe.session.user + + # Get user's active POS Profile + pos_opening = frappe.get_all( + "POS Opening Entry", + filters={ + "user": current_user, + "docstatus": 1, + "status": "Open" + }, + fields=["pos_profile"], + limit=1 + ) + + if not pos_opening: + return {"debug": "no_pos_opening", "user": current_user} + + pos_profile = pos_opening[0].pos_profile + + # Check if QZ is enabled + qz_print = frappe.db.get_value("POS Profile", pos_profile, "qz_print") + + if qz_print != 1: + return {"debug": "qz_not_enabled", "qz_print": qz_print, "pos_profile": pos_profile} + + # Get latest unprinted KOT + kot = frappe.get_all( + "URY KOT", + filters={ + "pos_profile": pos_profile, + "kot_printed": 0, + "docstatus": ["!=", 2] + }, + fields=["name", "kot_printed", "creation"], + order_by="creation desc", + limit=1 + ) + + if not kot: + return {"debug": "no_unprinted_kots", "pos_profile": pos_profile} + + kot_doc = kot[0] + + # Get printer settings - FIXED: Removed item_group which doesn't exist + printer_settings = frappe.get_all( + "URY Printer Settings", + filters={ + "parent": pos_profile, + "parentfield": "printer_settings", + "custom_kot_print": 1 + }, + fields=["printer", "custom_kot_print_format"] + ) + + if not printer_settings: + return { + "debug": "no_printers", + "pos_profile": pos_profile, + "kot_name": kot_doc.name # FIXED: Include kot_name in debug response + } + + # FIXED: Return proper structure + return { + "kot_name": kot_doc.name, + "pos_profile": pos_profile, + "kot_printed": kot_doc.kot_printed, + "printers": printer_settings + } + + except Exception as e: + import traceback + return { + "debug": "exception", + "error": str(e), + "traceback": traceback.format_exc() + } + +@frappe.whitelist(methods=['GET']) +def mark_kot_printed(kot_name): + """Mark a KOT as printed""" + try: + if not frappe.db.exists("URY KOT", kot_name): + return {"status": "error", "message": "KOT not found"} + + frappe.db.set_value("URY KOT", kot_name, "kot_printed", 1, update_modified=False) + frappe.db.commit() + + return {"status": "success"} + except Exception as e: + frappe.log_error(f"mark_kot_printed error: {str(e)}") + return {"status": "error", "message": str(e)} + + +@frappe.whitelist() +def test_get_kots(): + """Test function to see all unprinted KOTs""" + try: + kots = frappe.get_all( + "URY KOT", + filters={ + "kot_printed": 0, + "docstatus": ["!=", 2] + }, + fields=["name", "kot_printed", "pos_profile", "creation"], + order_by="creation desc", + limit=3 + ) + + return { + "user": frappe.session.user, + "kots_count": len(kots), + "kots": kots + } + except Exception as e: + return {"error": str(e)} diff --git a/ury/www/pos.js b/ury/www/pos.js new file mode 100644 index 00000000..e11d1608 --- /dev/null +++ b/ury/www/pos.js @@ -0,0 +1,126 @@ +console.log("🖨️ POS Page JS Loaded"); + +// Load QZ Tray library first +function loadQZTray() { + return new Promise((resolve, reject) => { + // Check if already loaded + if (typeof qz !== 'undefined') { + console.log("✓ QZ Tray already loaded"); + resolve(); + return; + } + + // Load the script + const script = document.createElement('script'); + script.src = '/assets/ury/js/qz-tray.js'; + script.onload = () => { + console.log("✓ QZ Tray library loaded"); + resolve(); + }; + script.onerror = () => { + console.error("❌ Failed to load QZ Tray library"); + reject(new Error("Failed to load QZ Tray")); + }; + document.head.appendChild(script); + }); +} + +// Initialize QZ Tray +async function initQZTray() { + console.log("🔧 Initializing QZ Tray..."); + + try { + // Load library first + await loadQZTray(); + + // Get certificates from server + console.log("📜 Fetching certificates from server..."); + const certResponse = await frappe.call({ + method: 'ury.ury.page.ury_print.qz_certificate' + }); + + const keyResponse = await frappe.call({ + method: 'ury.ury.page.ury_print.signature_promise' + }); + + if (!certResponse.message || !keyResponse.message) { + console.error("❌ Certificates not found in server"); + frappe.msgprint({ + title: 'QZ Configuration Error', + message: 'QZ certificates not found. Please contact administrator.', + indicator: 'red' + }); + return false; + } + + console.log("✓ Certificates fetched"); + console.log(" Cert length:", certResponse.message.length); + console.log(" Key length:", keyResponse.message.length); + + // Set up QZ security + qz.security.setCertificatePromise(function(resolve, reject) { + resolve(certResponse.message); + }); + + qz.security.setSignaturePromise(function(toSign) { + return function(resolve, reject) { + // For now, we'll skip signing + // In production, you'd sign the data here + resolve(); + }; + }); + + // Connect to QZ Tray + if (qz.websocket.isActive()) { + console.log("✓ QZ Tray already connected"); + } else { + console.log("🔌 Connecting to QZ Tray..."); + await qz.websocket.connect(); + console.log("✅ QZ Tray connected successfully!"); + } + + // Get available printers + const printers = await qz.printers.find(); + console.log("✅ Found printers:", printers); + + // Show success message + frappe.show_alert({ + message: '✅ QZ Tray Connected! Found ' + printers.length + ' printer(s)', + indicator: 'green' + }, 5); + + return true; + + } catch (error) { + console.error("❌ QZ Tray Error:", error); + frappe.msgprint({ + title: 'QZ Tray Connection Failed', + message: 'Could not connect to QZ Tray. Make sure it is running.

Error: ' + error.message, + indicator: 'red' + }); + return false; + } +} + +// Auto-initialize when page loads +frappe.ready(function() { + console.log("📄 Frappe ready on POS page"); + + // Wait a bit for page to fully load + setTimeout(function() { + initQZTray(); + }, 1000); +}); + +// Make functions globally available for manual testing +window.qz_init = initQZTray; +window.qz_test = async function() { + console.log("Running manual QZ test..."); + await initQZTray(); + + if (qz.websocket.isActive()) { + const printers = await qz.printers.find(); + console.log("Test successful! Printers:", printers); + return printers; + } +}; diff --git a/urypos/public/URY.svg b/urypos/public/URY.svg index 248c66a2..aaa6a22b 100644 --- a/urypos/public/URY.svg +++ b/urypos/public/URY.svg @@ -1,73 +1,1897 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/urypos/public/ury.ico b/urypos/public/ury.ico index 5e542eec..c11df359 100644 Binary files a/urypos/public/ury.ico and b/urypos/public/ury.ico differ diff --git a/urypos/src/assets/logos/URY_POS.jpg b/urypos/src/assets/logos/URY_POS.jpg index 781f3b69..7f44b353 100644 Binary files a/urypos/src/assets/logos/URY_POS.jpg and b/urypos/src/assets/logos/URY_POS.jpg differ