@posx/core 5.5.326 → 5.5.329

package/build/index.d.ts

@@ -4039,6 +4039,7 @@ declare class PrintTemplateCore implements IPrintTemplateCore {
 }
 type IPrintTemplate = IPrintTemplateCore & IAppBaseModel & {
   printer_type: PrinterType;
+  codepage?: Codepages;
   report_code_name: string;
 };
 declare class PrintTemplate extends AppBaseModel implements IPrintTemplate {
@@ -4047,6 +4048,7 @@ declare class PrintTemplate extends AppBaseModel implements IPrintTemplate {
   footer: string;
   commands: string;
   printer_type: PrinterType;
+  codepage?: Codepages;
   uid: string;
   report_code_name: string;
   constructor();

package/build/index.js

@@ -733,6 +733,159 @@ _defineProperty(ElectronSocket, "State", {
 });
 _defineProperty(ElectronSocket, "electronSocket", null);
 
+//#endregion
+//#region src/libs/viscii.encoding.ts
+const VISCII_CODEPAGE = "69";
+function isVISCIICodepage(codepage) {
+	return codepage === VISCII_CODEPAGE;
+}
+const VISCII_TABLE = {
+	"Ẳ": 2,
+	"Ẵ": 5,
+	"Ẫ": 6,
+	"Ỷ": 20,
+	"Ỹ": 25,
+	"Ỵ": 30,
+	"Ạ": 128,
+	"Ắ": 129,
+	"Ằ": 130,
+	"Ặ": 131,
+	"Ấ": 132,
+	"Ầ": 133,
+	"Ẩ": 134,
+	"Ậ": 135,
+	"Ẽ": 136,
+	"Ẹ": 137,
+	"Ế": 138,
+	"Ề": 139,
+	"Ể": 140,
+	"Ễ": 141,
+	"Ệ": 142,
+	"Ố": 143,
+	"Ồ": 144,
+	"Ổ": 145,
+	"Ỗ": 146,
+	"Ộ": 147,
+	"Ợ": 148,
+	"Ớ": 149,
+	"Ờ": 150,
+	"Ở": 151,
+	"Ị": 152,
+	"Ỏ": 153,
+	"Ọ": 154,
+	"Ỉ": 155,
+	"Ủ": 156,
+	"Ũ": 157,
+	"Ụ": 158,
+	"Ỳ": 159,
+	"Õ": 160,
+	"ắ": 161,
+	"ằ": 162,
+	"ặ": 163,
+	"ấ": 164,
+	"ầ": 165,
+	"ẩ": 166,
+	"ậ": 167,
+	"ẽ": 168,
+	"ẹ": 169,
+	"ế": 170,
+	"ề": 171,
+	"ể": 172,
+	"ễ": 173,
+	"ệ": 174,
+	"ố": 175,
+	"ồ": 176,
+	"ổ": 177,
+	"ỗ": 178,
+	"Ỡ": 179,
+	"Ơ": 180,
+	"ộ": 181,
+	"ờ": 182,
+	"ở": 183,
+	"ị": 184,
+	"Ự": 185,
+	"Ứ": 186,
+	"Ừ": 187,
+	"Ử": 188,
+	"ơ": 189,
+	"ớ": 190,
+	"Ư": 191,
+	"À": 192,
+	"Á": 193,
+	"Â": 194,
+	"Ã": 195,
+	"Ả": 196,
+	"Ă": 197,
+	"ẳ": 198,
+	"ẵ": 199,
+	"È": 200,
+	"É": 201,
+	"Ê": 202,
+	"Ẻ": 203,
+	"Ì": 204,
+	"Í": 205,
+	"Ĩ": 206,
+	"ỳ": 207,
+	"Đ": 208,
+	"ứ": 209,
+	"Ò": 210,
+	"Ó": 211,
+	"Ô": 212,
+	"ạ": 213,
+	"ỷ": 214,
+	"ừ": 215,
+	"ử": 216,
+	"Ù": 217,
+	"Ú": 218,
+	"ỹ": 219,
+	"ỵ": 220,
+	"Ý": 221,
+	"ỡ": 222,
+	"ư": 223,
+	"à": 224,
+	"á": 225,
+	"â": 226,
+	"ã": 227,
+	"ả": 228,
+	"ă": 229,
+	"ữ": 230,
+	"ẫ": 231,
+	"è": 232,
+	"é": 233,
+	"ê": 234,
+	"ẻ": 235,
+	"ì": 236,
+	"í": 237,
+	"ĩ": 238,
+	"ỉ": 239,
+	"đ": 240,
+	"ự": 241,
+	"ò": 242,
+	"ó": 243,
+	"ô": 244,
+	"õ": 245,
+	"ỏ": 246,
+	"ọ": 247,
+	"ụ": 248,
+	"ù": 249,
+	"ú": 250,
+	"ũ": 251,
+	"ủ": 252,
+	"ý": 253,
+	"ợ": 254,
+	"Ữ": 255
+};
+function utf8ToVISCII(text, fallback = 63) {
+	const bytes = [];
+	for (const ch of text) if (VISCII_TABLE[ch] !== void 0) bytes.push(VISCII_TABLE[ch]);
+	else {
+		const code = ch.charCodeAt(0);
+		if (code <= 127) bytes.push(code);
+		else bytes.push(fallback);
+	}
+	return Uint8Array.from(bytes);
+}
+
 //#endregion
 //#region src/libs/escpos.printer.ts
 function getSocket() {
@@ -811,8 +964,19 @@ var EscPosPrinter = class {
 	}
 	async interpret(template) {
 		const encoder = new EscPosEncoder();
-		if (template.codepage) encoder.codepage(template.codepage);
 		const printing = encoder.initialize();
+		if (template.codepage && !Object.values(Codepages).includes(template.codepage)) {
+			const codepageNum = parseInt(template.codepage, 10);
+			printing.raw([
+				31,
+				27,
+				31,
+				255,
+				codepageNum,
+				10,
+				0
+			]);
+		} else if (template.codepage && Object.values(Codepages).includes(template.codepage)) encoder.codepage(template.codepage);
 		for (const printItem of template.items) {
 			if (!printItem) throw new Error("Item is undefined or null");
 			switch (printItem.style) {
@@ -844,7 +1008,10 @@ var EscPosPrinter = class {
 								sizeValue
 							]);
 						} else if (printItem.item.size) printing.size(printItem.item.size);
-						printing.text(printItem.item.text, printItem.item.line_width ?? 48);
+						if (isVISCIICodepage(template.codepage)) {
+							const visciiBytes = utf8ToVISCII(printItem.item.text);
+							printing.raw(Array.from(visciiBytes));
+						} else printing.text(printItem.item.text, printItem.item.line_width ?? 48);
 						if (printItem.item.size === PrintSize.Custom) printing.raw([
 							29,
 							33,
@@ -864,7 +1031,10 @@ var EscPosPrinter = class {
 							]);
 						} else if (printItem.table.size) printing.size(printItem.table.size);
 						this.formatTable(printItem.table.items, printItem.table.line_width ?? 48).forEach((line) => {
-							printing.text(line, printItem?.table?.line_width ?? 48);
+							if (isVISCIICodepage(template.codepage)) {
+								const visciiBytes = utf8ToVISCII(line);
+								printing.raw(Array.from(visciiBytes));
+							} else printing.text(line, printItem.table.line_width ?? 48);
 							printing.newline();
 						});
 						if (printItem.table.size === PrintSize.Custom) printing.raw([
@@ -1208,6 +1378,7 @@ var PrintTemplate = class extends AppBaseModel {
 		_defineProperty(this, "footer", "");
 		_defineProperty(this, "commands", "");
 		_defineProperty(this, "printer_type", PrinterType.ReceiptPrinter);
+		_defineProperty(this, "codepage", void 0);
 		_defineProperty(this, "uid", ModelPrefix.PrintTemplate + nanoid());
 		_defineProperty(this, "report_code_name", "");
 	}
@@ -5094,8 +5265,8 @@ var PrintTemplateService = class extends AppRemoteService {
 	}
 	async renderPrintTemplate(invoice, config, template, options = new RenderPrintTemplateOptions()) {
 		const printCommand = new PrintCommand();
-		printCommand.codepage = this.getCodepageByCountryCode(config.receipt.language);
-		if (template.printer_type == PrinterType.KitchenPrinter) printCommand.codepage = this.getCodepageByCountryCode(config.kitchen.language);
+		if (template.printer_type == PrinterType.KitchenPrinter || template.printer_type == PrinterType.OrderPrinter) printCommand.codepage = template.codepage || this.getCodepageByCountryCode(config.kitchen.language);
+		else printCommand.codepage = template.codepage || this.getCodepageByCountryCode(config.receipt.language);
 		const templateData = new TemplateData();
 		templateData.invoice = invoice;
 		templateData.config = config;
@@ -5111,7 +5282,6 @@ var PrintTemplateService = class extends AppRemoteService {
 		const templateData = new TemplateData();
 		templateData.report_data = reportData;
 		templateData.config = config;
-		printCommand.codepage = Codepages.SimplifiedChinese;
 		printCommand.items.push(...await this.renderPrintCommand(template.header, templateData));
 		printCommand.items.push(...await this.renderPrintCommand(template.body, templateData));
 		printCommand.items.push(...await this.renderPrintCommand(template.footer, templateData));
@@ -5131,32 +5301,39 @@ var PrintTemplateService = class extends AppRemoteService {
 	getCodepageByCountryCode(countryCode) {
 		const countryCodeToCodepage = {
 			US: Codepages.English,
+			GR: Codepages.Greek,
 			DE: Codepages.WesternEurope,
 			LT: Codepages.BalticRim,
 			PL: Codepages.CentralEurope,
 			RU: Codepages.Cyrillic,
+			TR: Codepages.Turkish,
+			EU: Codepages.MultilingualLatin1WithEuro,
 			PT: Codepages.Portuguese,
 			IS: Codepages.Icelandic,
+			IL: Codepages.Hebrew,
 			CA: Codepages.FrenchCanadian,
 			EG: Codepages.Arabic,
 			NO: Codepages.Nordic,
-			ZH: Codepages.SimplifiedChinese,
+			BY: Codepages.Russian,
+			MK: Codepages.ModernGreek,
+			CN: Codepages.SimplifiedChinese,
 			KR: Codepages.Korean,
 			TW: Codepages.TraditionalChinese,
 			FR: Codepages.WesternEuropeanLatin,
+			AE: Codepages.ArabicISO,
 			JP: Codepages.Japanese,
 			CZ: Codepages.CentralEuropeanLatinWindows,
 			BG: Codepages.CyrillicWindows,
 			ES: Codepages.WesternEuropeanLatinWindows,
-			GR: Codepages.GreekWindows,
-			TR: Codepages.TurkishWindows,
-			IL: Codepages.HebrewWindows,
+			CY: Codepages.GreekWindows,
+			AZ: Codepages.TurkishWindows,
+			PS: Codepages.HebrewWindows,
 			SA: Codepages.ArabicWindows,
 			LV: Codepages.BalticWindows,
 			VN: Codepages.Vietnamese
 		};
-		if (!countryCode) return countryCodeToCodepage["ZH"];
-		return countryCodeToCodepage[countryCode.toUpperCase()] || countryCodeToCodepage["ZH"];
+		if (!countryCode) return countryCodeToCodepage["CN"];
+		return countryCodeToCodepage[countryCode.toUpperCase()] || countryCodeToCodepage["CN"];
 	}
 	async renderPrintCommand(template, data) {
 		try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posx/core",
-  "version": "5.5.326",
+  "version": "5.5.329",
   "description": "POSX core libraries",
   "main": "./build/index.js",
   "author": "Steven Lee",

package/package.publish.json

@@ -1,6 +1,6 @@
 {
   "name": "@posx/core",
-  "version": "5.5.326",
+  "version": "5.5.329",
   "description": "POSX core libraries",
   "type": "module",
   "main": "./build/index.js",