@posx/core 5.5.363 → 5.5.367

package/build/index.d.ts

@@ -2725,15 +2725,15 @@ interface IInvoiceCoreLine {
   unit_of_measure: UomType;
   /** Quantity if it is quantity, e.g. 5*/
   quantity: number;
-  /** 已发送到厨房的数量，如 qty=5, sent=3 表示还有2个未发送 */
-  /** minusLineQuantity 用 (quantity - sent) 计算可自由删除的未发送数量 */
+  /** 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 */
   sent: number;
-  /** UI标志，用于Order List区分已下单/未下单，应与 sent > 0 同步 */
-  is_sent: boolean;
   /** Whether cancel slip is printed */
   is_cancel_printed: boolean;
   /** Whether it is selected */
   selected: boolean;
+  /** Sales user uid for this line item */
+  sales_user_uid: string;
 }
 /**
  * Represents a line item on an invoice.
@@ -2863,7 +2863,7 @@ interface IInvoice extends IAppCoreModel {
   customer_id: number;
   /** Remark */
   remark: string;
-  /** Sales User ID */
+  /** Sales User UID */
   sales_user_uid: string;
   /** Status */
   status: InvoiceStatus;
@@ -2944,9 +2944,9 @@ declare class InvoiceCoreLine implements IInvoiceCoreLine {
   unit_of_measure: UomType;
   quantity: number;
   sent: number;
-  is_sent: boolean;
   is_cancel_printed: boolean;
   selected: boolean;
+  sales_user_uid: string;
   constructor();
 }
 declare class InvoiceLine extends AppCoreModel implements IInvoiceLine {
@@ -2974,9 +2974,9 @@ declare class InvoiceLine extends AppCoreModel implements IInvoiceLine {
   modifiers: any[];
   duplicated_from_uid: string;
   sent: number;
-  is_sent: boolean;
   is_cancel_printed: boolean;
   selected: boolean;
+  sales_user_uid: string;
   meta: {};
   constructor();
 }
@@ -4281,6 +4281,8 @@ interface IEmployee extends IAppCoreModel {
   role_uid: string;
   /** language preference */
   language: string;
+  /** Whether employee can login to the system */
+  can_login: boolean;
 }
 declare class Employee extends AppCoreModel implements IEmployee {
   user_uid: string;
@@ -4290,6 +4292,7 @@ declare class Employee extends AppCoreModel implements IEmployee {
   uid: string;
   role_uid: string;
   language: string;
+  can_login: boolean;
   constructor();
 }
 //#endregion
@@ -5097,7 +5100,6 @@ type LineOptions = {
   quantity?: number;
   price?: number;
   remark?: string;
-  is_sent?: boolean;
 };
 declare class InvoiceBaseService extends AppRemoteService<IInvoice> implements IInvoiceBaseService {
   readonly http: AxiosInstance;
@@ -5386,7 +5388,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, is_sent?: boolean): IInvoiceLine;
+  findOrCreateLine(invoice: IInvoice, item: IItem, quantity: number, price?: number, modifiers?: IInvoiceCoreLine[], remark?: string, createNewLine?: boolean, comboLineUid?: string, comboGroupUid?: string): IInvoiceLine;
   private createInvoiceLine;
   protected compareModifiers(target: IInvoiceCoreLine[], source: IInvoiceCoreLine[]): boolean;
   /**

package/build/index.js

@@ -1715,9 +1715,9 @@ 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);
+		_defineProperty(this, "sales_user_uid", "");
 	}
 };
 var InvoiceLine = class extends AppCoreModel {
@@ -1747,9 +1747,9 @@ 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, "sales_user_uid", "");
 		_defineProperty(this, "meta", {});
 	}
 };
@@ -1843,6 +1843,7 @@ var Employee = class extends AppCoreModel {
 		_defineProperty(this, "uid", ModelPrefix.Employee + nanoid());
 		_defineProperty(this, "role_uid", "");
 		_defineProperty(this, "language", "en");
+		_defineProperty(this, "can_login", true);
 	}
 };
 
@@ -3624,7 +3625,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, options.is_sent);
+		const line = this.findOrCreateLine(invoice, item, options.quantity, options.price, modifiers, options.remark, createNewLine, comboLineUid, comboGroupUid);
 		if (item.type == ProductType.Combo) line.is_combo = true;
 		if (line.uid) {
 			line.quantity += options.quantity;
@@ -3745,7 +3746,7 @@ var LineOperationService = class extends InvoiceBaseService {
 		line.remark = note;
 		return line;
 	}
-	findOrCreateLine(invoice, item, quantity, price = 0, modifiers = [], remark = "", createNewLine = false, comboLineUid, comboGroupUid, is_sent) {
+	findOrCreateLine(invoice, item, quantity, price = 0, modifiers = [], remark = "", createNewLine = false, comboLineUid, comboGroupUid) {
 		price = price ?? item.price;
 		if (!invoice.lines || invoice.lines.length <= 0 || createNewLine) return this.createInvoiceLine(item, quantity, price, modifiers, remark);
 		else {
@@ -3754,7 +3755,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 && (is_sent === void 0 || line.is_sent === is_sent)) 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;
 				return this.createInvoiceLine(item, quantity, price, modifiers, remark);
 			}
 		}
@@ -4009,7 +4010,7 @@ var InvoiceOperationService = class extends LineOperationService {
 		if (targetSectionItem.status != SectionItemStatus.CLOSED) throw new SystemError("target table is occupied");
 		if (invoice.lines == null || invoice.lines.length <= 0) throw new SystemError("source table has nothing to switch");
 		targetSectionItem.invoice_uid = invoice.uid;
-		targetSectionItem.status = SectionItemStatus.OPENED;
+		targetSectionItem.status = sourceSectionItem.status;
 		sourceSectionItem.invoice_uid = "";
 		sourceSectionItem.status = SectionItemStatus.CLOSED;
 		invoice.table_uid = targetSectionItem.uid;
@@ -4214,7 +4215,8 @@ var InvoiceOperationService = class extends LineOperationService {
 			if (!response.results || response.results.length <= 0) throw new SystemError("The invoice does not have a receipt");
 			printJob = response.results[0];
 		}
-		const printer = await this.printerService.getDefaultReceiptPrinter();
+		let printer = await this.printerService.getOne(printJob.printer_uid);
+		if (!printer) printer = await this.printerService.getDefaultReceiptPrinter();
 		if (!printer) throw new SystemError("Receipt printer not found");
 		printJob = this.printJobService.replacePrinter(printJob, printer);
 		printJob.uid = ModelPrefix.PrintJob + nanoid();
@@ -4589,10 +4591,7 @@ var InvoiceOperationService = class extends LineOperationService {
 		});
 	}
 	async preprocessInvoice(invoice) {
-		if (invoice.lines) for (const line of invoice.lines) {
-			line.sent = line.quantity;
-			line.is_sent = true;
-		}
+		if (invoice.lines) for (const line of invoice.lines) line.sent = line.quantity;
 		return invoice;
 	}
 	/**

package/package.json

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