seven365-zyprinter 1.0.8 → 1.0.10

package/ios/Sources/Plugin/ZywellSDK.swift

@@ -13,6 +13,15 @@ import ExternalAccessory
 
 @objc public class ZywellSDK: NSObject {
     
+    // MARK: - Printer Configuration
+    
+    /// Default printer width in characters (for 80mm thermal paper)
+    /// Common widths: 32 chars (58mm paper), 48 chars (80mm paper)
+    private let printerWidth: Int = 48
+    
+    /// Default separator character (can be overridden per-template)
+    private let defaultSeparatorChar: String = "-"
+    
     private var bleManager: POSBLEManager?
     private var wifiManagers: [String: POSWIFIManager] = [:]
     private var discoveredPeripherals: [CBPeripheral] = []
@@ -393,6 +402,9 @@ import ExternalAccessory
     private func formatReceiptForPrinter(template: [String: Any]) -> Data? {
         var printData = Data()
         
+        // Get separator character from template (dynamic) or use default
+        let separatorChar = getString(template["separator"]) ?? defaultSeparatorChar
+        
         // Initialize printer
         printData.append(Data([0x1B, 0x40]))
         
@@ -451,22 +463,45 @@ import ExternalAccessory
             }
         }
         
-        // Left align (ESC a 0)
+        // Left align for separator (ESC a 0)
         printData.append(Data([0x1B, 0x61, 0x00]))
         
-        // Separator
-        if let separatorData = ("--------------------------------\n").data(using: .utf8) {
+        // Separator (normal font size)
+        if let separatorData = generateSeparator(withChar: separatorChar).data(using: .utf8) {
             printData.append(separatorData)
         }
         
         // ========== ORDER INFO SECTION ==========
-        // Template type (e.g., "Kitchen Tickets")
+        // Center align for order info (ESC a 1)
+        printData.append(Data([0x1B, 0x61, 0x01]))
+        
+        // Template type (e.g., "Kitchen Tickets") - normal size
         if let orderType = getString(template["order_type"]),
            let orderTypeData = (orderType + "\n").data(using: .utf8) {
             printData.append(orderTypeData)
         }
         
-        // Table and order number with prefix
+        // Table and order number - Read formatting from order_info or use defaults
+        var orderInfoSizeCode: UInt8 = 0x11  // Default to 2x (large)
+        var orderInfoBold = true  // Default to bold
+        
+        if let orderInfo = template["order_info"] as? [String: Any] {
+            if let size = orderInfo["size"] {
+                orderInfoSizeCode = mapHeaderSizeToCode(size)
+            }
+            if let bold = orderInfo["bold"] as? Bool {
+                orderInfoBold = bold
+            }
+        }
+        
+        // Apply order info formatting
+        if orderInfoBold {
+            printData.append(Data([0x1B, 0x45, 0x01]))  // Bold on
+        }
+        if orderInfoSizeCode != 0x00 {
+            printData.append(Data([0x1D, 0x21, orderInfoSizeCode]))  // Set size from config
+        }
+        
         var orderInfoLine = ""
         if let tableName = getString(template["table_name"]) {
             orderInfoLine += tableName
@@ -482,16 +517,26 @@ import ExternalAccessory
             printData.append(orderInfoData)
         }
         
+        // Reset formatting back to normal
+        if orderInfoSizeCode != 0x00 {
+            printData.append(Data([0x1D, 0x21, 0x00]))  // Normal size
+        }
+        if orderInfoBold {
+            printData.append(Data([0x1B, 0x45, 0x00]))  // Bold off
+        }
         
-        // Separator for items section
-        if let separatorData = ("--------------------------------\n").data(using: .utf8) {
+        // Left align for items section (ESC a 0)
+        printData.append(Data([0x1B, 0x61, 0x00]))
+        
+        // Separator for items section (normal font size)
+        if let separatorData = generateSeparator(withChar: separatorChar).data(using: .utf8) {
             printData.append(separatorData)
         }
         
         // ========== ITEMS SECTION (NEW STRUCTURE) ==========
         if let kitchen = template["kitchen"] as? [[String: Any]] {
             // Get item formatting from item object
-            var itemSizeCode: UInt8 = 0x00
+            var itemSizeCode: UInt8 = 0x11  // Default to 2x (large) for better readability
             var itemBold = false
             
             if let item = template["item"] as? [String: Any] {
@@ -608,8 +653,8 @@ import ExternalAccessory
         }
         
         // ========== TOTAL SECTION ==========
-        // Separator before total
-        if let separatorData = ("--------------------------------\n").data(using: .utf8) {
+        // Separator before total (normal font size)
+        if let separatorData = generateSeparator(withChar: separatorChar).data(using: .utf8) {
             printData.append(separatorData)
         }
         
@@ -636,8 +681,8 @@ import ExternalAccessory
         
         // ========== TOTAL SECTION (NEW STRUCTURE) ==========
         if let total = getString(template["total"]) {
-            // Separator
-            if let separatorData = ("--------------------------------\n").data(using: .utf8) {
+            // Separator (may need to account for total font size)
+            if let separatorData = generateSeparator(withChar: separatorChar).data(using: .utf8) {
                 printData.append(separatorData)
             }
             
@@ -675,8 +720,8 @@ import ExternalAccessory
             }
         }
         
-        // Separator
-        if let separatorData = ("--------------------------------\n").data(using: .utf8) {
+        // Separator (normal font size)
+        if let separatorData = generateSeparator(withChar: separatorChar).data(using: .utf8) {
             printData.append(separatorData)
         }
         
@@ -686,8 +731,8 @@ import ExternalAccessory
             printData.append(paymentData)
         }
         
-        // Separator
-        if let separatorData = ("--------------------------------\n").data(using: .utf8) {
+        // Separator (normal font size)
+        if let separatorData = generateSeparator(withChar: separatorChar).data(using: .utf8) {
             printData.append(separatorData)
         }
         
@@ -723,10 +768,21 @@ import ExternalAccessory
                 printData.append(messageData)
             }
             
-            // Reset footer formatting
+            // Reset footer formatting before timestamp
             if footerSizeCode != 0x00 {
                 printData.append(Data([0x1D, 0x21, 0x00])) // Normal size
             }
+            if footerBold {
+                printData.append(Data([0x1B, 0x45, 0x00])) // Bold off
+            }
+            
+            // Print timestamp
+            let dateFormat = getString(footer["date_format"]) ?? "YYYY-MM-DD"
+            let timeFormat = getString(footer["time_format"]) ?? "24H"
+            let timestamp = formatTimestamp(dateFormat: dateFormat, timeFormat: timeFormat)
+            if let timestampData = (timestamp + "\n").data(using: .utf8) {
+                printData.append(timestampData)
+            }
         }
         
         // Line feeds
@@ -741,32 +797,40 @@ import ExternalAccessory
     // MARK: - Helper Functions
     
     private func mapHeaderSizeToCode(_ size: Any) -> UInt8 {
+        var resultCode: UInt8 = 0x00
+        
         if let sizeInt = size as? Int {
             switch sizeInt {
-            case 1: return 0x00
-            case 2: return 0x11
-            case 3: return 0x22
-            case 4: return 0x33
-            default: return 0x00
+            case 1: resultCode = 0x00
+            case 2: resultCode = 0x11
+            case 3: resultCode = 0x22
+            case 4: resultCode = 0x33
+            default: resultCode = 0x00
             }
+            print("ZywellSDK: Mapped size Int(\(sizeInt)) → 0x\(String(format: "%02X", resultCode))")
         } else if let sizeStr = size as? String {
             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
+            case "normal", "1": resultCode = 0x00
+            case "large", "2": resultCode = 0x11
+            case "xlarge", "3": resultCode = 0x22
+            case "4": resultCode = 0x33
+            default: resultCode = 0x00
             }
+            print("ZywellSDK: Mapped size String(\"\(sizeStr)\") → 0x\(String(format: "%02X", resultCode))")
         } 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
+             case 1: resultCode = 0x00
+             case 2: resultCode = 0x11
+             case 3: resultCode = 0x22
+             case 4: resultCode = 0x33
+             default: resultCode = 0x00
              }
+             print("ZywellSDK: Mapped size NSNumber(\(sizeNum.intValue)) → 0x\(String(format: "%02X", resultCode))")
+        } else {
+            print("ZywellSDK: Unknown size type: \(type(of: size)), defaulting to 0x00")
         }
-        return 0x00
+        
+        return resultCode
     }
     
     private func getBool(_ value: Any?) -> Bool {
@@ -788,6 +852,79 @@ import ExternalAccessory
         return String(describing: value)
     }
     
+    /**
+     * Formats the current timestamp based on date and time format preferences
+     * - Parameters:
+     *   - dateFormat: Format string like "YYYY-MM-DD", "DD-MM-YYYY", "MM-DD-YYYY"
+     *   - timeFormat: "12H" or "24H"
+     * - Returns: Formatted timestamp string
+     */
+    private func formatTimestamp(dateFormat: String, timeFormat: String) -> String {
+        let now = Date()
+        let calendar = Calendar.current
+        
+        let year = calendar.component(.year, from: now)
+        let month = calendar.component(.month, from: now)
+        let day = calendar.component(.day, from: now)
+        let hour = calendar.component(.hour, from: now)
+        let minute = calendar.component(.minute, from: now)
+        let second = calendar.component(.second, from: now)
+        
+        // Format date
+        var formattedDate: String
+        switch dateFormat {
+        case "DD-MM-YYYY", "DD/MM/YYYY":
+            formattedDate = String(format: "%02d-%02d-%04d", day, month, year)
+        case "MM-DD-YYYY", "MM/DD/YYYY":
+            formattedDate = String(format: "%02d-%02d-%04d", month, day, year)
+        default: // "YYYY-MM-DD"
+            formattedDate = String(format: "%04d-%02d-%02d", year, month, day)
+        }
+        
+        // Format time
+        var formattedTime: String
+        if timeFormat == "12H" {
+            let hour12 = hour % 12 == 0 ? 12 : hour % 12
+            let ampm = hour >= 12 ? "PM" : "AM"
+            formattedTime = String(format: "%d:%02d:%02d %@", hour12, minute, second, ampm)
+        } else { // 24H
+            formattedTime = String(format: "%02d:%02d:%02d", hour, minute, second)
+        }
+        
+        return "\(formattedDate) \(formattedTime)"
+    }
+    
+    /**
+     * Generates a separator line based on current printer width and font magnification
+     * - Parameter sizeCode: The current font size code (0x00, 0x11, 0x22, 0x33)
+     * - Returns: A separator string with appropriate width
+     *
+     * Font magnification affects character width:
+     * - 0x00 (normal): 1x width
+     * - 0x11 (2x2): 2x width (half as many characters fit)
+     * - 0x22 (3x3): 3x width (one-third as many characters fit)
+     * - 0x33 (4x4): 4x width (one-quarter as many characters fit)
+     */
+    private func generateSeparator(forSizeCode sizeCode: UInt8 = 0x00, withChar separatorChar: String? = nil) -> String {
+        // Calculate width divisor based on font magnification
+        let widthMultiplier: Int
+        switch sizeCode {
+        case 0x11: widthMultiplier = 2  // 2x width
+        case 0x22: widthMultiplier = 3  // 3x width
+        case 0x33: widthMultiplier = 4  // 4x width
+        default: widthMultiplier = 1     // Normal width
+        }
+        
+        // Calculate actual character count that fits on the line
+        let effectiveWidth = printerWidth / widthMultiplier
+        
+        // Use provided separator character or fall back to default
+        let charToUse = separatorChar ?? defaultSeparatorChar
+        
+        // Generate separator string
+        return String(repeating: charToUse, count: effectiveWidth) + "\n"
+    }
+    
     // MARK: - Callback Storage
     
     private var discoveryCompletion: (([[String: Any]], String?) -> Void)?

package/package.json

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