@posx/core 5.5.340 → 5.5.351

package/build/index.js

@@ -2063,6 +2063,7 @@ var OrderConfig = class {
 };
 var OrderDisplaySystemConfig = class {
 	constructor() {
+		_defineProperty(this, "enabled", false);
 		_defineProperty(this, "language", "en");
 	}
 };
@@ -3039,23 +3040,49 @@ const getByPath = (obj, path) => {
 	if (!obj || !path) return void 0;
 	return path.split(".").reduce((o, k) => o?.[k], obj);
 };
+const parseConditions = (args) => {
+	const conditions = [];
+	for (let i = 0; i < args.length - 1; i += 2) if (typeof args[i] === "string" && !isOptions(args[i + 1])) conditions.push({
+		prop: args[i],
+		value: args[i + 1]
+	});
+	return conditions;
+};
+/**
+* Find first object matching ALL conditions (AND logic)
+* {{findAnd categories "name" "Topping" "active" true}}
+*/
+const findAnd = function(collection, ...args) {
+	if (!Array.isArray(collection)) return null;
+	const conditions = parseConditions(args);
+	return collection.find((item) => conditions.every((c) => getByPath(item, c.prop) === c.value)) || null;
+};
 /**
-* Find first object in array by property (supports nested path like "item.category_uid")
-* {{findBy modifiers "item.category_uid" "imc_xxx"}} - returns first matching object
-* {{lookup (findBy modifiers "item.category_uid" "imc_xxx") "item.name"}} - get item.name
+* Find first object matching ANY condition (OR logic)
+* {{findOr categories "name" "Topping" "name" "Topping one"}}
 */
-const findBy = function(collection, prop, value) {
+const findOr = function(collection, ...args) {
 	if (!Array.isArray(collection)) return null;
-	return collection.find((item) => getByPath(item, prop) === value) || null;
+	const conditions = parseConditions(args);
+	return collection.find((item) => conditions.some((c) => getByPath(item, c.prop) === c.value)) || null;
 };
 /**
-* Filter array by property value (supports nested path), returns array for indexing
-* {{filterBy modifiers "item.category_uid" "imc_xxx"}} - returns matching array
-* {{lookup (filterBy modifiers "item.category_uid" "imc_xxx") 0}} - get first match
+* Filter array matching ALL conditions (AND logic)
+* {{filterAnd modifiers "item.category_uid" "imc_xxx" "price" 0}}
 */
-const filterBy = function(collection, prop, value) {
+const filterAnd = function(collection, ...args) {
 	if (!Array.isArray(collection)) return [];
-	return collection.filter((item) => getByPath(item, prop) === value);
+	const conditions = parseConditions(args);
+	return collection.filter((item) => conditions.every((c) => getByPath(item, c.prop) === c.value));
+};
+/**
+* Filter array matching ANY condition (OR logic)
+* {{filterOr modifiers "name" "Topping" "name" "Topping one"}}
+*/
+const filterOr = function(collection, ...args) {
+	if (!Array.isArray(collection)) return [];
+	const conditions = parseConditions(args);
+	return collection.filter((item) => conditions.some((c) => getByPath(item, c.prop) === c.value));
 };
 /**
 * Returns the first truthy value, or default
@@ -3109,8 +3136,10 @@ const comparisonHelpers = {
 	contains,
 	includes,
 	in: inArray,
-	findBy,
-	filterBy,
+	findAnd,
+	findOr,
+	filterAnd,
+	filterOr,
 	default: defaultValue,
 	neither,
 	ifEven,
@@ -3163,6 +3192,69 @@ function helpers(options) {
 */
 var helpers_register_default = helpers;
 
+//#endregion
+//#region src/types/ods.type.ts
+var OrderDisplay = class extends AppCoreModel {
+	constructor() {
+		super();
+		_defineProperty(this, "uid", ModelPrefix.OrderDisplaySystem + nanoid());
+		_defineProperty(this, "order_number", "");
+		_defineProperty(this, "status", OrderDisplayStatus.Preparing);
+	}
+};
+let OrderDisplayStatus = /* @__PURE__ */ function(OrderDisplayStatus$1) {
+	OrderDisplayStatus$1["Preparing"] = "preparing";
+	OrderDisplayStatus$1["ReadyForPickup"] = "ready_for_pickup";
+	return OrderDisplayStatus$1;
+}({});
+
+//#endregion
+//#region src/services/ods.service.ts
+var OrderDisplayService = class extends AppRemoteService {
+	constructor(http, db, options, moduleName = "order_displays", methodName = "order_display") {
+		super();
+		this.http = http;
+		this.db = db;
+		this.options = options;
+		this.moduleName = moduleName;
+		this.methodName = methodName;
+	}
+	async toPickUp(uid) {
+		const orderDisplay = await this.getOne(uid);
+		if (!orderDisplay) throw new SystemError("Display order not found");
+		if (orderDisplay.status == "ready_for_pickup") throw new SystemError("Order is already ready for pickup");
+		orderDisplay.status = OrderDisplayStatus.ReadyForPickup;
+		orderDisplay.updated_at = /* @__PURE__ */ new Date();
+		if (orderDisplay.id_in_server == 0) throw new SystemError("Order is not synced with server");
+		await this.updateOne(orderDisplay.id_in_server, orderDisplay);
+		return orderDisplay;
+	}
+	async toPreparing(uid) {
+		const orderDisplay = await this.getOne(uid);
+		if (!orderDisplay) throw new SystemError("Display order not found");
+		if (orderDisplay.status == "preparing") throw new SystemError("Order is already preparing");
+		orderDisplay.status = OrderDisplayStatus.Preparing;
+		orderDisplay.updated_at = /* @__PURE__ */ new Date();
+		if (orderDisplay.id_in_server == 0) throw new SystemError("Order is not synced with server");
+		await this.updateOne(orderDisplay.id_in_server, orderDisplay);
+		return orderDisplay;
+	}
+	async undo() {
+		const orderDisplays = await this.db.table(this.moduleName).filter((x) => x.status == OrderDisplayStatus.ReadyForPickup).reverse().limit(100).toArray();
+		if (orderDisplays.length === 0) throw new SystemError("No order to undo");
+		orderDisplays.sort((a, b) => {
+			const dateA = new Date(a.updated_at).getTime();
+			return new Date(b.updated_at).getTime() - dateA;
+		});
+		const latestOrderDisplay = orderDisplays[0];
+		latestOrderDisplay.status = OrderDisplayStatus.Preparing;
+		latestOrderDisplay.updated_at = /* @__PURE__ */ new Date();
+		if (latestOrderDisplay.id_in_server == 0) throw new SystemError("Order is not synced with server");
+		await this.updateOne(latestOrderDisplay.id_in_server, latestOrderDisplay);
+		return latestOrderDisplay;
+	}
+};
+
 //#endregion
 //#region src/services/invoice.service.ts
 helpers_register_default({ handlebars: Handlebars });
@@ -3186,6 +3278,7 @@ var InvoiceBaseService = class extends AppRemoteService {
 		_defineProperty(this, "printerService", void 0);
 		_defineProperty(this, "printJobService", void 0);
 		_defineProperty(this, "itemService", void 0);
+		_defineProperty(this, "orderDisplayService", void 0);
 		this.tillService = new TillService(http, db, options, "tills", "till");
 		this.sectionItemService = new SectionItemService(http, db, options, "section_items", "section_item");
 		this.configService = new ConfigService(http, db, options, "configs", "config");
@@ -3193,6 +3286,7 @@ var InvoiceBaseService = class extends AppRemoteService {
 		this.printerService = new PrinterService(http, db, options, "printers", "printer");
 		this.printJobService = new PrintJobService(http, db, options, "print_jobs", "print_job");
 		this.itemService = new ItemService(http, db, options, "items", "item");
+		this.orderDisplayService = new OrderDisplayService(http, db, options);
 	}
 	calculate(invoice, appConfig, disableRounding = false) {
 		if (invoice.lines == null || invoice.lines.length < 1) {
@@ -3940,7 +4034,8 @@ var InvoiceOperationService = class extends LineOperationService {
 		sectionItem.status = SectionItemStatus.CLOSED;
 		this.addEmployeeToInvoice(invoice, employee);
 		invoice.paid_at = /* @__PURE__ */ new Date();
-		const datetimeFormat = (await this.configService.getDefaultOne()).config?.order?.datetime_format;
+		const config = (await this.configService.getDefaultOne()).config;
+		const datetimeFormat = config?.order?.datetime_format;
 		invoice.humanized_paid_at = humanizedData(invoice.paid_at, datetimeFormat);
 		invoice.payment_has_cash = invoice.payments?.some((payment) => payment.payment_method?.is_cash === true);
 		const stockChanges = await this.getStockChangeList(invoice, false);
@@ -3982,7 +4077,13 @@ var InvoiceOperationService = class extends LineOperationService {
 				this.sectionItemService.saveOne(res.data);
 				options.section_item = res.data;
 				throw new SystemError(`${res.error}, system has updated the data and please try again`);
-			} else if (stockChanges.length > 0) await this.itemService.changeItemsStock(stockChanges);
+			}
+			if (stockChanges.length > 0) await this.itemService.changeItemsStock(stockChanges);
+			if (invoice.call_num && config?.ods?.enabled) {
+				const orderDisplay = new OrderDisplay();
+				orderDisplay.order_number = invoice.call_num;
+				await this.orderDisplayService.addOne(orderDisplay);
+			}
 			return options;
 		} catch (error) {
 			invoice.kitchen_print_job_uids.length = previousKitchenUidsLength;
@@ -3994,7 +4095,8 @@ var InvoiceOperationService = class extends LineOperationService {
 		invoice.status = InvoiceStatus.Paid;
 		if (employee != null) this.addEmployeeToInvoice(invoice, employee);
 		invoice.paid_at = /* @__PURE__ */ new Date();
-		const datetimeFormat = (await this.configService.getDefaultOne()).config?.order?.datetime_format;
+		const config = (await this.configService.getDefaultOne()).config;
+		const datetimeFormat = config?.order?.datetime_format;
 		invoice.humanized_paid_at = humanizedData(invoice.paid_at, datetimeFormat);
 		invoice.created_at = /* @__PURE__ */ new Date();
 		invoice.created_at_timestamp = invoice.created_at.getTime();
@@ -4035,7 +4137,13 @@ var InvoiceOperationService = class extends LineOperationService {
 			this.saveOne(res.data);
 			options.invoice = res.data;
 			throw new SystemError(res.error);
-		} else if (stockChanges.length > 0) await this.itemService.changeItemsStock(stockChanges);
+		}
+		if (stockChanges.length > 0) await this.itemService.changeItemsStock(stockChanges);
+		if (invoice.call_num && config?.ods?.enabled) {
+			const orderDisplay = new OrderDisplay();
+			orderDisplay.order_number = invoice.call_num;
+			await this.orderDisplayService.addOne(orderDisplay);
+		}
 		return options;
 	}
 	async voidInvoice(invoice, till, reason, employee) {
@@ -5679,69 +5787,6 @@ function createInstance(baseURL, uid, token) {
 	return instance;
 }
 
-//#endregion
-//#region src/types/ods.type.ts
-var OrderDisplay = class extends AppCoreModel {
-	constructor() {
-		super();
-		_defineProperty(this, "uid", ModelPrefix.OrderDisplaySystem + nanoid());
-		_defineProperty(this, "order_number", "");
-		_defineProperty(this, "status", OrderDisplayStatus.Preparing);
-	}
-};
-let OrderDisplayStatus = /* @__PURE__ */ function(OrderDisplayStatus$1) {
-	OrderDisplayStatus$1["Preparing"] = "preparing";
-	OrderDisplayStatus$1["ReadyForPickup"] = "ready_for_pickup";
-	return OrderDisplayStatus$1;
-}({});
-
-//#endregion
-//#region src/services/ods.service.ts
-var OrderDisplayService = class extends AppRemoteService {
-	constructor(http, db, options, moduleName = "order_displays", methodName = "order_display") {
-		super();
-		this.http = http;
-		this.db = db;
-		this.options = options;
-		this.moduleName = moduleName;
-		this.methodName = methodName;
-	}
-	async toPickUp(uid) {
-		const orderDisplay = await this.getOne(uid);
-		if (!orderDisplay) throw new SystemError("Display order not found");
-		if (orderDisplay.status == "ready_for_pickup") throw new SystemError("Order is already ready for pickup");
-		orderDisplay.status = OrderDisplayStatus.ReadyForPickup;
-		orderDisplay.updated_at = /* @__PURE__ */ new Date();
-		if (orderDisplay.id_in_server == 0) throw new SystemError("Order is not synced with server");
-		await this.updateOne(orderDisplay.id_in_server, orderDisplay);
-		return orderDisplay;
-	}
-	async toPreparing(uid) {
-		const orderDisplay = await this.getOne(uid);
-		if (!orderDisplay) throw new SystemError("Display order not found");
-		if (orderDisplay.status == "preparing") throw new SystemError("Order is already preparing");
-		orderDisplay.status = OrderDisplayStatus.Preparing;
-		orderDisplay.updated_at = /* @__PURE__ */ new Date();
-		if (orderDisplay.id_in_server == 0) throw new SystemError("Order is not synced with server");
-		await this.updateOne(orderDisplay.id_in_server, orderDisplay);
-		return orderDisplay;
-	}
-	async undo() {
-		const orderDisplays = await this.db.table(this.moduleName).filter((x) => x.status == OrderDisplayStatus.ReadyForPickup).reverse().limit(100).toArray();
-		if (orderDisplays.length === 0) throw new SystemError("No order to undo");
-		orderDisplays.sort((a, b) => {
-			const dateA = new Date(a.updated_at).getTime();
-			return new Date(b.updated_at).getTime() - dateA;
-		});
-		const latestOrderDisplay = orderDisplays[0];
-		latestOrderDisplay.status = OrderDisplayStatus.Preparing;
-		latestOrderDisplay.updated_at = /* @__PURE__ */ new Date();
-		if (latestOrderDisplay.id_in_server == 0) throw new SystemError("Order is not synced with server");
-		await this.updateOne(latestOrderDisplay.id_in_server, latestOrderDisplay);
-		return latestOrderDisplay;
-	}
-};
-
 //#endregion
 //#region src/service.factory.ts
 const serviceProvider = new Map([

package/jest.config.cjs

@@ -1,36 +1,36 @@
-// jest.config.js
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'jsdom',
-  setupFilesAfterEnv: ['<rootDir>/jest.setup.cjs'],
-  transform: {
-    '^.+\\.ts$': ['ts-jest', {
-      tsconfig: {
-        module: 'commonjs',
-        esModuleInterop: true,
-      }
-    }],
-    '^.+\\.(mjs|js)$': ['ts-jest', {
-      tsconfig: {
-        allowJs: true,
-        module: 'commonjs',
-        esModuleInterop: true,
-      }
-    }]
-  },
-  transformIgnorePatterns: [
-    'node_modules/(?!(.pnpm|nanoid|@litepos|dexie)/)', // Transform ESM packages
-  ],
-  testMatch: [
-    '<rootDir>/src/test/**/*.test.ts'
-  ],
-  moduleNameMapper: {
-    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/scripts/testMock.cjs',
-    '\\.(css|less)$': '<rootDir>/scripts/testMock.cjs',
-    '^nanoid$': '<rootDir>/src/test/__mocks__/nanoid.js',
-    '^dexie$': '<rootDir>/src/test/__mocks__/dexie.js',
-    '^@awesome-cordova-plugins/network-interface$': '<rootDir>/src/test/__mocks__/@awesome-cordova-plugins/network-interface.js',
-    '^canvas$': '<rootDir>/scripts/testMock.cjs'
-  },
-  moduleFileExtensions: ['web.js', 'js', 'web.ts', 'ts', 'web.tsx', 'tsx', 'json', 'web.jsx', 'jsx', 'node'],
-};
+// jest.config.js
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'jsdom',
+  setupFilesAfterEnv: ['<rootDir>/jest.setup.cjs'],
+  transform: {
+    '^.+\\.ts$': ['ts-jest', {
+      tsconfig: {
+        module: 'commonjs',
+        esModuleInterop: true,
+      }
+    }],
+    '^.+\\.(mjs|js)$': ['ts-jest', {
+      tsconfig: {
+        allowJs: true,
+        module: 'commonjs',
+        esModuleInterop: true,
+      }
+    }]
+  },
+  transformIgnorePatterns: [
+    'node_modules/(?!(.pnpm|nanoid|@litepos|dexie)/)', // Transform ESM packages
+  ],
+  testMatch: [
+    '<rootDir>/src/test/**/*.test.ts'
+  ],
+  moduleNameMapper: {
+    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/scripts/testMock.cjs',
+    '\\.(css|less)$': '<rootDir>/scripts/testMock.cjs',
+    '^nanoid$': '<rootDir>/src/test/__mocks__/nanoid.js',
+    '^dexie$': '<rootDir>/src/test/__mocks__/dexie.js',
+    '^@awesome-cordova-plugins/network-interface$': '<rootDir>/src/test/__mocks__/@awesome-cordova-plugins/network-interface.js',
+    '^canvas$': '<rootDir>/scripts/testMock.cjs'
+  },
+  moduleFileExtensions: ['web.js', 'js', 'web.ts', 'ts', 'web.tsx', 'tsx', 'json', 'web.jsx', 'jsx', 'node'],
+};

package/jest.setup.cjs

@@ -1,80 +1,80 @@
-// Jest setup file to polyfill File and Blob APIs
-// This ensures consistent behavior across different Node.js versions and test environments
-
-// Polyfill Blob.text() if not available
-if (typeof Blob !== 'undefined' && !Blob.prototype.text) {
-  Blob.prototype.text = async function() {
-    const reader = new FileReader();
-    return new Promise((resolve, reject) => {
-      reader.onload = () => resolve(reader.result);
-      reader.onerror = reject;
-      reader.readAsText(this);
-    });
-  };
-}
-
-// Polyfill FileReader if not available
-if (typeof FileReader === 'undefined') {
-  global.FileReader = class FileReader {
-    result = null;
-    error = null;
-    onload = null;
-    onerror = null;
-
-    readAsText(blob) {
-      try {
-        // For our polyfilled Blob
-        if (blob.parts) {
-          this.result = blob.parts.join('');
-        } else if (typeof blob === 'string') {
-          this.result = blob;
-        } else {
-          this.result = String(blob);
-        }
-
-        if (this.onload) {
-          setTimeout(() => this.onload({ target: this }), 0);
-        }
-      } catch (err) {
-        this.error = err;
-        if (this.onerror) {
-          setTimeout(() => this.onerror({ target: this }), 0);
-        }
-      }
-    }
-  };
-}
-
-// Polyfill Blob if not available (for Node.js < 18)
-if (typeof Blob === 'undefined') {
-  global.Blob = class Blob {
-    constructor(parts = [], options = {}) {
-      this.parts = parts;
-      this.type = options.type || '';
-      this.size = parts.reduce((acc, part) => {
-        return acc + (typeof part === 'string' ? part.length : part.length || 0);
-      }, 0);
-    }
-
-    async text() {
-      return this.parts.join('');
-    }
-
-    async arrayBuffer() {
-      const text = await this.text();
-      const buffer = Buffer.from(text);
-      return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
-    }
-  };
-}
-
-// Polyfill File if not available (for Node.js < 18)
-if (typeof File === 'undefined') {
-  global.File = class File extends global.Blob {
-    constructor(bits, name, options = {}) {
-      super(bits, options);
-      this.name = name;
-      this.lastModified = options.lastModified || Date.now();
-    }
-  };
-}
+// Jest setup file to polyfill File and Blob APIs
+// This ensures consistent behavior across different Node.js versions and test environments
+
+// Polyfill Blob.text() if not available
+if (typeof Blob !== 'undefined' && !Blob.prototype.text) {
+  Blob.prototype.text = async function() {
+    const reader = new FileReader();
+    return new Promise((resolve, reject) => {
+      reader.onload = () => resolve(reader.result);
+      reader.onerror = reject;
+      reader.readAsText(this);
+    });
+  };
+}
+
+// Polyfill FileReader if not available
+if (typeof FileReader === 'undefined') {
+  global.FileReader = class FileReader {
+    result = null;
+    error = null;
+    onload = null;
+    onerror = null;
+
+    readAsText(blob) {
+      try {
+        // For our polyfilled Blob
+        if (blob.parts) {
+          this.result = blob.parts.join('');
+        } else if (typeof blob === 'string') {
+          this.result = blob;
+        } else {
+          this.result = String(blob);
+        }
+
+        if (this.onload) {
+          setTimeout(() => this.onload({ target: this }), 0);
+        }
+      } catch (err) {
+        this.error = err;
+        if (this.onerror) {
+          setTimeout(() => this.onerror({ target: this }), 0);
+        }
+      }
+    }
+  };
+}
+
+// Polyfill Blob if not available (for Node.js < 18)
+if (typeof Blob === 'undefined') {
+  global.Blob = class Blob {
+    constructor(parts = [], options = {}) {
+      this.parts = parts;
+      this.type = options.type || '';
+      this.size = parts.reduce((acc, part) => {
+        return acc + (typeof part === 'string' ? part.length : part.length || 0);
+      }, 0);
+    }
+
+    async text() {
+      return this.parts.join('');
+    }
+
+    async arrayBuffer() {
+      const text = await this.text();
+      const buffer = Buffer.from(text);
+      return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
+    }
+  };
+}
+
+// Polyfill File if not available (for Node.js < 18)
+if (typeof File === 'undefined') {
+  global.File = class File extends global.Blob {
+    constructor(bits, name, options = {}) {
+      super(bits, options);
+      this.name = name;
+      this.lastModified = options.lastModified || Date.now();
+    }
+  };
+}

package/package.json

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