seven365-zyprinter 0.3.0 → 0.4.0

package/README.md

@@ -178,6 +178,7 @@ getPrinterStatus(options: { identifier: string; }) => Promise<{ status: string;
 | ---------------- | ------------------------------------------------------------------------------ |
 | **`header`**     | <code>string</code>                                                            |
 | **`items`**      | <code><a href="#array">Array</a>&lt;{ name: string; price: string }&gt;</code> |
+| **`kitchen`**    | <code><a href="#array">Array</a>&lt;any&gt;</code>                             |
 | **`total`**      | <code>string</code>                                                            |
 | **`footer`**     | <code>string</code>                                                            |
 | **`formatting`** | <code><a href="#receiptformatting">ReceiptFormatting</a></code>                |

package/dist/docs.json

@@ -230,6 +230,15 @@
           ],
           "type": "Array<{ name: string; price: string }>"
         },
+        {
+          "name": "kitchen",
+          "tags": [],
+          "docs": "",
+          "complexTypes": [
+            "Array"
+          ],
+          "type": "Array<any>"
+        },
         {
           "name": "total",
           "tags": [],

package/dist/esm/definitions.d.ts

@@ -21,6 +21,7 @@ export interface ReceiptTemplate {
         name: string;
         price: string;
     }>;
+    kitchen?: Array<any>;
     total?: string;
     footer?: string;
     formatting?: ReceiptFormatting;

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["// Enhanced printer interface with connection type details\nexport interface ZyPrinter {\n  identifier: string;\n  model: string;\n  status: string;\n  connectionType: 'bluetooth' | 'wifi' | 'usb';\n  ipAddress?: string;\n  port?: number;\n  rssi?: number;\n}\n\nexport interface ReceiptFormatting {\n  headerSize?: 'normal' | 'large' | 'xlarge' | 1 | 2 | 3 | 4;\n  itemSize?: 'normal' | 'large' | 'xlarge' | 1 | 2 | 3 | 4;\n  itemBold?: boolean;\n  totalSize?: 'normal' | 'large' | 'xlarge' | 1 | 2 | 3 | 4;\n  totalBold?: boolean;\n  footerSize?: 'normal' | 'large' | 'xlarge' | 1 | 2 | 3 | 4;\n}\n\nexport interface ReceiptTemplate {\n  header?: string;\n  items?: Array<{ name: string; price: string }>;\n  total?: string;\n  footer?: string;\n  formatting?: ReceiptFormatting;\n}\n\nexport interface ZyprintPlugin {\n  echo(options: { value: string }): Promise<{ value: string }>;\n  \n  // Enhanced Printer Discovery Methods\n  discoverPrinters(): Promise<{ printers: ZyPrinter[] }>;\n  discoverBluetoothPrinters(): Promise<{ printers: ZyPrinter[] }>;\n  discoverWiFiPrinters(options?: { networkRange?: string }): Promise<{ printers: ZyPrinter[] }>;\n  \n  // Connection Management\n  connectToPrinter(options: { identifier: string }): Promise<{ connected: boolean }>;\n  disconnectFromPrinter(options: { identifier: string }): Promise<{ disconnected: boolean }>;\n  \n  // Printing Methods\n  printText(options: { text: string; identifier: string }): Promise<{ success: boolean }>;\n  printReceipt(options: { template: ReceiptTemplate; identifier: string }): Promise<{ success: boolean }>;\n  \n  // Printer Status\n  getPrinterStatus(options: { identifier: string }): Promise<{ status: string; paperStatus: string; connected: boolean }>;\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["// Enhanced printer interface with connection type details\nexport interface ZyPrinter {\n  identifier: string;\n  model: string;\n  status: string;\n  connectionType: 'bluetooth' | 'wifi' | 'usb';\n  ipAddress?: string;\n  port?: number;\n  rssi?: number;\n}\n\nexport interface ReceiptFormatting {\n  headerSize?: 'normal' | 'large' | 'xlarge' | 1 | 2 | 3 | 4;\n  itemSize?: 'normal' | 'large' | 'xlarge' | 1 | 2 | 3 | 4;\n  itemBold?: boolean;\n  totalSize?: 'normal' | 'large' | 'xlarge' | 1 | 2 | 3 | 4;\n  totalBold?: boolean;\n  footerSize?: 'normal' | 'large' | 'xlarge' | 1 | 2 | 3 | 4;\n}\n\nexport interface ReceiptTemplate {\n  header?: string;\n  items?: Array<{ name: string; price: string }>;\n  kitchen?: Array<any>; // Support for kitchen data payload\n  total?: string;\n  footer?: string;\n  formatting?: ReceiptFormatting;\n}\n\nexport interface ZyprintPlugin {\n  echo(options: { value: string }): Promise<{ value: string }>;\n  \n  // Enhanced Printer Discovery Methods\n  discoverPrinters(): Promise<{ printers: ZyPrinter[] }>;\n  discoverBluetoothPrinters(): Promise<{ printers: ZyPrinter[] }>;\n  discoverWiFiPrinters(options?: { networkRange?: string }): Promise<{ printers: ZyPrinter[] }>;\n  \n  // Connection Management\n  connectToPrinter(options: { identifier: string }): Promise<{ connected: boolean }>;\n  disconnectFromPrinter(options: { identifier: string }): Promise<{ disconnected: boolean }>;\n  \n  // Printing Methods\n  printText(options: { text: string; identifier: string }): Promise<{ success: boolean }>;\n  printReceipt(options: { template: ReceiptTemplate; identifier: string }): Promise<{ success: boolean }>;\n  \n  // Printer Status\n  getPrinterStatus(options: { identifier: string }): Promise<{ status: string; paperStatus: string; connected: boolean }>;\n}\n"]}

package/ios/Sources/Plugin/ZywellSDK.swift

@@ -252,6 +252,7 @@ import Network
     }
     
     @objc public func printReceipt(template: [String: Any], identifier: String, completion: @escaping (Bool, String?) -> Void) {
+        print("ZywellSDK: Received template: \(template)")
         guard let data = formatReceiptForPrinter(template: template) else {
             completion(false, "Failed to format receipt")
             return
@@ -323,7 +324,7 @@ import Network
         printData.append(Data([0x1B, 0x61, 0x01]))
         
         // Header
-        if let header = template["header"] as? String,
+        if let header = getString(template["header"]),
            let headerData = (header + "\n\n").data(using: .utf8) {
             
             // Get header size from formatting options
@@ -332,6 +333,7 @@ import Network
                let headerSize = formatting["headerSize"] {
                 sizeCode = mapHeaderSizeToCode(headerSize)
             }
+            print("ZywellSDK: Header size code: \(sizeCode)")
             
             // Set font size (GS ! n)
             printData.append(Data([0x1D, 0x21, sizeCode]))
@@ -346,7 +348,7 @@ import Network
         printData.append(Data([0x1B, 0x61, 0x00]))
         
         // Items
-        if let items = template["items"] as? [[String: Any]] {
+        if let kitchen = template["kitchen"] as? [[String: Any]] {
             // Get item formatting
             var itemSizeCode: UInt8 = 0x00
             var itemBold = false
@@ -354,9 +356,89 @@ import Network
                 if let itemSize = formatting["itemSize"] {
                     itemSizeCode = mapHeaderSizeToCode(itemSize)
                 }
-                itemBold = formatting["itemBold"] as? Bool ?? false
+                itemBold = getBool(formatting["itemBold"])
             }
             
+            // Apply item formatting
+            if itemBold {
+                printData.append(Data([0x1B, 0x45, 0x01])) // Bold on
+            }
+            if itemSizeCode != 0x00 {
+                printData.append(Data([0x1D, 0x21, itemSizeCode])) // Set size
+            }
+            
+            for item in kitchen {
+                var itemName = ""
+                var itemPrice = ""
+                
+                // Get name from menu object
+                if let menu = item["menu"] as? [String: Any],
+                   let name = getString(menu["name"]) {
+                    itemName = name
+                }
+                
+                // Add quantity
+                if let qty = item["quantity"] {
+                    itemName += " x\(getString(qty) ?? "1")"
+                }
+                
+                // Format price
+                if let price = item["total_price"] {
+                    if let priceDouble = Double(getString(price) ?? "0") {
+                        itemPrice = String(format: "$%.2f", priceDouble)
+                    } else {
+                        itemPrice = "$" + (getString(price) ?? "0.00")
+                    }
+                }
+                
+                // Print main item
+                let line = String(format: "%@\t%@\n", itemName, itemPrice)
+                if let lineData = line.data(using: .utf8) {
+                    printData.append(lineData)
+                }
+                
+                // Print modifiers
+                if let modifiers = item["modifiers"] as? [[String: Any]] {
+                    for mod in modifiers {
+                        if let modName = getString(mod["name"]) {
+                            var modLine = "  + \(modName)"
+                            
+                            // Only show price if > 0
+                            if let modPrice = mod["price"],
+                               let priceDouble = Double(getString(modPrice) ?? "0"),
+                               priceDouble > 0 {
+                                modLine += String(format: "\t$%.2f", priceDouble)
+                            }
+                            modLine += "\n"
+                            
+                            if let modData = modLine.data(using: .utf8) {
+                                printData.append(modData)
+                            }
+                        }
+                    }
+                }
+            }
+            
+            // Reset item formatting
+            if itemSizeCode != 0x00 {
+                printData.append(Data([0x1D, 0x21, 0x00])) // Normal size
+            }
+            if itemBold {
+                printData.append(Data([0x1B, 0x45, 0x00])) // Bold off
+            }
+            
+        } else if let items = template["items"] as? [[String: Any]] {
+            // Get item formatting
+            var itemSizeCode: UInt8 = 0x00
+            var itemBold = false
+            if let formatting = template["formatting"] as? [String: Any] {
+                if let itemSize = formatting["itemSize"] {
+                    itemSizeCode = mapHeaderSizeToCode(itemSize)
+                }
+                itemBold = getBool(formatting["itemBold"])
+            }
+            print("ZywellSDK: Item bold: \(itemBold)")
+            
             // Apply item formatting
             if itemBold {
                 printData.append(Data([0x1B, 0x45, 0x01])) // Bold on (ESC E 1)
@@ -366,8 +448,8 @@ import Network
             }
             
             for item in items {
-                if let name = item["name"] as? String,
-                   let price = item["price"] as? String {
+                if let name = getString(item["name"]),
+                   let price = getString(item["price"]) {
                     let line = String(format: "%@\t%@\n", name, price)
                     if let lineData = line.data(using: .utf8) {
                         printData.append(lineData)
@@ -385,7 +467,7 @@ import Network
         }
         
         // Total
-        if let total = template["total"] as? String,
+        if let total = getString(template["total"]),
            let totalData = ("\nTotal: " + total + "\n").data(using: .utf8) {
             // Get total formatting
             var totalSizeCode: UInt8 = 0x00
@@ -394,8 +476,10 @@ import Network
                 if let totalSize = formatting["totalSize"] {
                     totalSizeCode = mapHeaderSizeToCode(totalSize)
                 }
-                totalBold = formatting["totalBold"] as? Bool ?? false
+                totalBold = getBool(formatting["totalBold"])
             }
+            print("ZywellSDK: Total size code: \(totalSizeCode)")
+            print("ZywellSDK: Total bold: \(totalBold)")
             
             // Apply total formatting
             if totalBold {
@@ -417,7 +501,7 @@ import Network
         }
         
         // Footer
-        if let footer = template["footer"] as? String,
+        if let footer = getString(template["footer"]),
            let footerData = (footer + "\n").data(using: .utf8) {
             // Get footer formatting
             var footerSizeCode: UInt8 = 0x00
@@ -460,16 +544,44 @@ import Network
             default: return 0x00
             }
         } else if let sizeStr = size as? String {
-            switch sizeStr {
-            case "normal": return 0x00
-            case "large": return 0x11
-            case "xlarge": return 0x22
+            switch sizeStr.lowercased() {
+            case "normal", "1": return 0x00
+            case "large", "2": return 0x11
+            case "xlarge", "3": return 0x22
+            case "4": return 0x33
             default: return 0x00
             }
+        } else if let sizeNum = size as? NSNumber {
+             switch sizeNum.intValue {
+             case 1: return 0x00
+             case 2: return 0x11
+             case 3: return 0x22
+             case 4: return 0x33
+             default: return 0x00
+             }
         }
         return 0x00
     }
     
+    private func getBool(_ value: Any?) -> Bool {
+        guard let value = value else { return false }
+        if let boolVal = value as? Bool { return boolVal }
+        if let strVal = value as? String {
+            return ["true", "yes", "1"].contains(strVal.lowercased())
+        }
+        if let numVal = value as? NSNumber {
+            return numVal.boolValue
+        }
+        return false
+    }
+
+    private func getString(_ value: Any?) -> String? {
+        guard let value = value else { return nil }
+        if let strVal = value as? String { return strVal }
+        if let numVal = value as? NSNumber { return numVal.stringValue }
+        return String(describing: value)
+    }
+    
     // MARK: - Callback Storage
     
     private var discoveryCompletion: (([[String: Any]], String?) -> Void)?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "seven365-zyprinter",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Capacitor plugin for Zywell/Zyprint thermal printer integration with Bluetooth and WiFi support",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",