@posx/core 5.5.357 → 5.5.363

package/build/index.d.ts

@@ -1520,6 +1520,10 @@ interface ISectionItem extends IAppBaseModel {
   /** List of printer ID order */
   printer_id_order_list: number[];
   order_printer_uids: string[];
+  /** Receipt printer UID for this section item */
+  receipt_printer_uid: string;
+  /** Check printer UID for this section item */
+  check_printer_uid: string;
   /** Total amount */
   total: number;
   /** Time duration */
@@ -1557,6 +1561,8 @@ interface ISectionItem extends IAppBaseModel {
 declare class SectionItem extends AppBaseModel implements ISectionItem {
   printer_id_order_list: number[];
   order_printer_uids: string[];
+  receipt_printer_uid: string;
+  check_printer_uid: string;
   total: number;
   time: number;
   pax: number;
@@ -2719,9 +2725,11 @@ interface IInvoiceCoreLine {
   unit_of_measure: UomType;
   /** Quantity if it is quantity, e.g. 5*/
   quantity: number;
-  /** Whether it is sent to server, e.g. send = 3, it means 2 items are not sent to server*/
-  /** item A, qty = 5 sent 3 => kitchen slip will show quantity 2 on item A */
+  /** 已发送到厨房的数量，如 qty=5, sent=3 表示还有2个未发送 */
+  /** minusLineQuantity 用 (quantity - sent) 计算可自由删除的未发送数量 */
   sent: number;
+  /** UI标志，用于Order List区分已下单/未下单，应与 sent > 0 同步 */
+  is_sent: boolean;
   /** Whether cancel slip is printed */
   is_cancel_printed: boolean;
   /** Whether it is selected */
@@ -2936,6 +2944,7 @@ declare class InvoiceCoreLine implements IInvoiceCoreLine {
   unit_of_measure: UomType;
   quantity: number;
   sent: number;
+  is_sent: boolean;
   is_cancel_printed: boolean;
   selected: boolean;
   constructor();
@@ -2965,6 +2974,7 @@ declare class InvoiceLine extends AppCoreModel implements IInvoiceLine {
   modifiers: any[];
   duplicated_from_uid: string;
   sent: number;
+  is_sent: boolean;
   is_cancel_printed: boolean;
   selected: boolean;
   meta: {};
@@ -4154,6 +4164,8 @@ interface IPrinter extends IAppBaseModel {
   device_uid: string;
   /** Printer type */
   type: PrinterType;
+  /** If true, this printer is not the default for its type */
+  is_not_default?: boolean;
   /** Actual printer name using printer driver*/
   driver_printer_name: string;
   /** Backup printer ID */
@@ -4180,6 +4192,7 @@ interface IPrinter extends IAppBaseModel {
 declare class Printer extends AppBaseModel implements IPrinter {
   device_uid: string;
   type: PrinterType;
+  is_not_default?: boolean;
   driver_printer_name: string;
   fallback_printer_uid: number;
   protocol: PrinterProtocols;
@@ -4997,6 +5010,7 @@ declare class PrinterService extends AppRemoteService<IPrinter> implements IPrin
   getPhysicalPrintersFromNode(): Promise<INodePrinter[]>;
   getUnpairedNode(): Promise<CustomResponse<INode>>;
   pairNode(nodeUid: string): Promise<CustomResponse<INode>>;
+  private getDefaultPrinter;
   getDefaultReceiptPrinter(): Promise<IPrinter>;
   getDefaultPrinterByType(type: PrinterType): Promise<IPrinter>;
   getDefaultKioskPrinter(): Promise<IPrinter>;
@@ -5083,6 +5097,7 @@ type LineOptions = {
   quantity?: number;
   price?: number;
   remark?: string;
+  is_sent?: boolean;
 };
 declare class InvoiceBaseService extends AppRemoteService<IInvoice> implements IInvoiceBaseService {
   readonly http: AxiosInstance;
@@ -5371,7 +5386,7 @@ declare class LineOperationService extends InvoiceBaseService implements ILineOp
   addModifierQuantity(modifiers: IInvoiceCoreLine[], modifier: IInvoiceCoreLine, quantity?: number): IInvoiceCoreLine[];
   changeModifierPrice(modifier: IInvoiceCoreLine, price: number): IInvoiceCoreLine;
   overwriteNoteToLine(line: IInvoiceLine, note: string): IInvoiceLine;
-  findOrCreateLine(invoice: IInvoice, item: IItem, quantity: number, price?: number, modifiers?: IInvoiceCoreLine[], remark?: string, createNewLine?: boolean, comboLineUid?: string, comboGroupUid?: string): IInvoiceLine;
+  findOrCreateLine(invoice: IInvoice, item: IItem, quantity: number, price?: number, modifiers?: IInvoiceCoreLine[], remark?: string, createNewLine?: boolean, comboLineUid?: string, comboGroupUid?: string, is_sent?: boolean): IInvoiceLine;
   private createInvoiceLine;
   protected compareModifiers(target: IInvoiceCoreLine[], source: IInvoiceCoreLine[]): boolean;
   /**

package/build/index.js

@@ -419,6 +419,8 @@ var SectionItem = class extends AppBaseModel {
 		super();
 		_defineProperty(this, "printer_id_order_list", []);
 		_defineProperty(this, "order_printer_uids", []);
+		_defineProperty(this, "receipt_printer_uid", "");
+		_defineProperty(this, "check_printer_uid", "");
 		_defineProperty(this, "total", 0);
 		_defineProperty(this, "time", 0);
 		_defineProperty(this, "pax", 0);
@@ -1425,6 +1427,7 @@ var Printer = class extends AppBaseModel {
 		super();
 		_defineProperty(this, "device_uid", "");
 		_defineProperty(this, "type", PrinterType.ReceiptPrinter);
+		_defineProperty(this, "is_not_default", false);
 		_defineProperty(this, "driver_printer_name", "");
 		_defineProperty(this, "fallback_printer_uid", 0);
 		_defineProperty(this, "protocol", PrinterProtocols.ESCPOS);
@@ -1712,6 +1715,7 @@ var InvoiceCoreLine = class {
 		_defineProperty(this, "unit_of_measure", UomType.quantity);
 		_defineProperty(this, "quantity", 0);
 		_defineProperty(this, "sent", 0);
+		_defineProperty(this, "is_sent", false);
 		_defineProperty(this, "is_cancel_printed", false);
 		_defineProperty(this, "selected", false);
 	}
@@ -1743,6 +1747,7 @@ var InvoiceLine = class extends AppCoreModel {
 		_defineProperty(this, "modifiers", []);
 		_defineProperty(this, "duplicated_from_uid", "");
 		_defineProperty(this, "sent", 0);
+		_defineProperty(this, "is_sent", false);
 		_defineProperty(this, "is_cancel_printed", false);
 		_defineProperty(this, "selected", false);
 		_defineProperty(this, "meta", {});
@@ -2453,23 +2458,27 @@ var PrinterService = class extends AppRemoteService {
 	async pairNode(nodeUid) {
 		return this.http.get(`api/v5/merchants/` + this.options.merchant_uid + `/nodes/${nodeUid}/pair-node`);
 	}
+	async getDefaultPrinter(type) {
+		const printers = await this.db.table("printers").filter((p) => p.type === type && p.deleted_at == null).toArray();
+		return printers.find((p) => !p.is_not_default) || printers[0] || null;
+	}
 	async getDefaultReceiptPrinter() {
-		return this.getOneByParams({ type: PrinterType.ReceiptPrinter });
+		return this.getDefaultPrinter(PrinterType.ReceiptPrinter);
 	}
 	async getDefaultPrinterByType(type) {
-		return this.getOneByParams({ type });
+		return this.getDefaultPrinter(type);
 	}
 	async getDefaultKioskPrinter() {
-		return this.getOneByParams({ type: PrinterType.KioskPrinter });
+		return this.getDefaultPrinter(PrinterType.KioskPrinter);
 	}
 	async getDefaultCheckPrinter() {
-		return this.getOneByParams({ type: PrinterType.CheckPrinter });
+		return this.getDefaultPrinter(PrinterType.CheckPrinter);
 	}
 	async getDefaultKitchenPrinter() {
-		return this.getOneByParams({ type: PrinterType.KitchenPrinter });
+		return this.getDefaultPrinter(PrinterType.KitchenPrinter);
 	}
 	async getDefaultOrderPrinter() {
-		return this.getOneByParams({ type: PrinterType.OrderPrinter });
+		return this.getDefaultPrinter(PrinterType.OrderPrinter);
 	}
 	async getPrintersByUids(uids) {
 		return this.db.table("printers").where("uid").anyOf(uids).filter((printer) => printer.deleted_at == null).toArray();
@@ -3304,8 +3313,10 @@ var InvoiceBaseService = class extends AppRemoteService {
 			invoice.service_chargeable_subtotal = 0;
 		}
 		this.calculateInvoiceCharges(invoice, CalcFlow.AfterSubtotal);
-		const serviceChargeableDiscountRatio = invoice.discountable_subtotal > 0 ? invoice.service_chargeable_subtotal / invoice.discountable_subtotal : 0;
-		invoice.service_chargeable_subtotal = preciseRound(Math.max(0, invoice.service_chargeable_subtotal - invoice.discount_amount * serviceChargeableDiscountRatio));
+		if (invoice.subtotal > 0 && invoice.discount_amount > 0) {
+			const discountRatio = 1 - invoice.discount_amount / invoice.subtotal;
+			invoice.service_chargeable_subtotal = preciseRound(Math.max(0, invoice.service_chargeable_subtotal * discountRatio), 2);
+		} else if (invoice.discount_amount >= invoice.subtotal) invoice.service_chargeable_subtotal = 0;
 		const serviceChargeRate = appConfig.config.charges.service_charge ? appConfig.config.charges.service_charge_rate : 0;
 		this.calculateServiceCharge(invoice, serviceChargeRate);
 		this.calculateDiscount(invoice, CalcFlow.AfterServiceCharge);
@@ -3482,16 +3493,11 @@ var InvoiceBaseService = class extends AppRemoteService {
 		invoice.tax = 0;
 		if (taxRate <= 0) return;
 		const ratio = this.calculateTaxSubtotalRatio(invoice);
-		if (taxMethod === TaxMethod.Inclusive) {
-			invoice.tax = preciseRound((invoice.grand_total - invoice.service_chargeable_subtotal) * ratio * taxRate / (100 + taxRate), 2);
-			invoice.tax += preciseRound(invoice.service_chargeable_subtotal * taxRate * ratio / (100 + taxRate), 2);
-			invoice.tax = preciseRound(invoice.tax, 2);
-		} else {
-			invoice.tax = preciseRound((invoice.grand_total - invoice.service_chargeable_subtotal) * ratio * taxRate / 100, 2);
-			invoice.tax += preciseRound(invoice.service_chargeable_subtotal * taxRate * ratio / 100, 2);
-			invoice.tax = preciseRound(invoice.tax, 2);
-			invoice.grand_total += invoice.tax;
-			invoice.grand_total = preciseRound(invoice.grand_total, 2);
+		const taxableBase = invoice.grand_total - invoice.service_charge;
+		if (taxMethod === TaxMethod.Inclusive) invoice.tax = preciseRound(taxableBase * ratio * taxRate / (100 + taxRate) + invoice.service_charge * taxRate / (100 + taxRate), 2);
+		else {
+			invoice.tax = preciseRound(taxableBase * ratio * taxRate / 100 + invoice.service_charge * taxRate / 100, 2);
+			invoice.grand_total = preciseRound(invoice.grand_total + invoice.tax, 2);
 		}
 	}
 	/**
@@ -3618,7 +3624,7 @@ var LineOperationService = class extends InvoiceBaseService {
 			...lineOptions
 		};
 		if (invoice.lines == null) invoice.lines = [];
-		const line = this.findOrCreateLine(invoice, item, options.quantity, options.price, modifiers, options.remark, createNewLine, comboLineUid, comboGroupUid);
+		const line = this.findOrCreateLine(invoice, item, options.quantity, options.price, modifiers, options.remark, createNewLine, comboLineUid, comboGroupUid, options.is_sent);
 		if (item.type == ProductType.Combo) line.is_combo = true;
 		if (line.uid) {
 			line.quantity += options.quantity;
@@ -3739,7 +3745,7 @@ var LineOperationService = class extends InvoiceBaseService {
 		line.remark = note;
 		return line;
 	}
-	findOrCreateLine(invoice, item, quantity, price = 0, modifiers = [], remark = "", createNewLine = false, comboLineUid, comboGroupUid) {
+	findOrCreateLine(invoice, item, quantity, price = 0, modifiers = [], remark = "", createNewLine = false, comboLineUid, comboGroupUid, is_sent) {
 		price = price ?? item.price;
 		if (!invoice.lines || invoice.lines.length <= 0 || createNewLine) return this.createInvoiceLine(item, quantity, price, modifiers, remark);
 		else {
@@ -3748,7 +3754,7 @@ var LineOperationService = class extends InvoiceBaseService {
 			else {
 				if (comboLineUid && comboGroupUid) {
 					for (const line of lines.filter((l) => l.is_combo_item)) if (this.compareModifiers(line.modifiers, modifiers) && line.remark === remark && line.price === price && line.combo_line_uid === comboLineUid && line.combo_group_uid === comboGroupUid) return line;
-				} else for (const line of lines) if (this.compareModifiers(line.modifiers, modifiers) && line.remark === remark && line.price === price && !line.is_take_out) return line;
+				} else for (const line of lines) if (this.compareModifiers(line.modifiers, modifiers) && line.remark === remark && line.price === price && !line.is_take_out && (is_sent === void 0 || line.is_sent === is_sent)) return line;
 				return this.createInvoiceLine(item, quantity, price, modifiers, remark);
 			}
 		}
@@ -4369,8 +4375,12 @@ var InvoiceOperationService = class extends LineOperationService {
 	async createReceiptPrintJob(invoice, printerType, saveOnly = false, printTimes = 0, specificPrinter = null, specificDeviceUid) {
 		let printer;
 		if (specificPrinter) printer = specificPrinter;
-		else if (printerType == PrinterType.ReceiptPrinter) printer = await this.printerService.getDefaultReceiptPrinter();
-		else if (printerType == PrinterType.CheckPrinter) printer = await this.printerService.getDefaultCheckPrinter();
+		else if (printerType == PrinterType.ReceiptPrinter || printerType == PrinterType.CheckPrinter) {
+			const sectionItem = invoice.table_uid ? await this.sectionItemService.getOne(invoice.table_uid) : null;
+			const printerUid = printerType == PrinterType.ReceiptPrinter ? sectionItem?.receipt_printer_uid : sectionItem?.check_printer_uid;
+			if (printerUid) printer = await this.printerService.getOne(printerUid);
+			if (!printer) printer = printerType == PrinterType.ReceiptPrinter ? await this.printerService.getDefaultReceiptPrinter() : await this.printerService.getDefaultCheckPrinter();
+		}
 		if (!printer || !printer.print_template_uid) return null;
 		if (!printTimes) printTimes = printer.print_times;
 		const appConfig = await this.configService.getDefaultOne();
@@ -4579,7 +4589,10 @@ var InvoiceOperationService = class extends LineOperationService {
 		});
 	}
 	async preprocessInvoice(invoice) {
-		if (invoice.lines) for (const line of invoice.lines) line.sent = line.quantity;
+		if (invoice.lines) for (const line of invoice.lines) {
+			line.sent = line.quantity;
+			line.is_sent = true;
+		}
 		return invoice;
 	}
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posx/core",
-  "version": "5.5.357",
+  "version": "5.5.363",
   "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.357",
+  "version": "5.5.363",
   "description": "POSX core libraries",
   "type": "module",
   "main": "./build/index.js",