@posx/core 5.5.331 → 5.5.332

package/build/index.d.ts

@@ -316,7 +316,7 @@ interface IAppCoreModel {
    * the date when the object is deleted
    * @ignore
    */
-  deleted_at: Date;
+  deleted_at: Date | null;
   /**
    * timestamp in milliseconds
    * @ignore
@@ -3553,6 +3553,8 @@ interface IOrderConfig {
   hide_categories_when_ordering: boolean;
   /** Flag to end shift with open tables */
   end_shift_with_open_tables: boolean;
+  /** Date time format for humanized dates */
+  datetime_format: string;
 }
 declare class OrderConfig implements IOrderConfig {
   separation_line: boolean;
@@ -3564,6 +3566,7 @@ declare class OrderConfig implements IOrderConfig {
   hide_combo_item_on_interactive_view: boolean;
   hide_categories_when_ordering: boolean;
   end_shift_with_open_tables: boolean;
+  datetime_format: string;
   constructor();
 }
 interface IPaymentConfig {
@@ -4180,6 +4183,7 @@ declare class TemplateData implements ITemplateData {
   normalized_printed_at: string;
   meta: Record<string, any>;
   is_cancel: boolean;
+  constructor();
 }
 type IRenderPrintTemplateOptions = {
   printer_name: string;
@@ -5616,7 +5620,7 @@ declare const filterByParams: (params: {
 }) => (values: any) => boolean;
 //#endregion
 //#region src/utils/misc.utils.d.ts
-declare function humanizedData(date: Date): string;
+declare function humanizedData(date: Date, format?: string): string;
 declare function normalizedDate(date: Date): string;
 //#endregion
 //#region src/types/ods.type.d.ts

package/build/index.js

@@ -1266,21 +1266,8 @@ var PrintCommand = class {
 
 //#endregion
 //#region src/utils/misc.utils.ts
-function humanizedData(date) {
-	return `${date.getFullYear()}-${[
-		"Jan",
-		"Feb",
-		"Mar",
-		"Apr",
-		"May",
-		"Jun",
-		"Jul",
-		"Aug",
-		"Sep",
-		"Oct",
-		"Nov",
-		"Dec"
-	][date.getMonth()]}-${date.getDate().toString().padStart(2, "0")} ${date.getHours().toString().padStart(2, "0")}:${date.getMinutes().toString().padStart(2, "0")}:${date.getSeconds().toString().padStart(2, "0")}`;
+function humanizedData(date, format) {
+	return dayjs(date).format(format || "YYYY-MMM-DD HH:mm:ss");
 }
 function normalizedDate(date) {
 	return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, "0")}-${date.getDate().toString().padStart(2, "0")} ${date.getHours().toString().padStart(2, "0")}:${date.getMinutes().toString().padStart(2, "0")}:${date.getSeconds().toString().padStart(2, "0")}`;
@@ -1458,9 +1445,10 @@ var TemplateData = class {
 		_defineProperty(this, "section_item", {});
 		_defineProperty(this, "printer_name", "");
 		_defineProperty(this, "printed_at", /* @__PURE__ */ new Date());
-		_defineProperty(this, "normalized_printed_at", humanizedData(this.printed_at));
+		_defineProperty(this, "normalized_printed_at", "");
 		_defineProperty(this, "meta", {});
 		_defineProperty(this, "is_cancel", false);
+		this.normalized_printed_at = humanizedData(this.printed_at);
 	}
 };
 var RenderPrintTemplateOptions = class {
@@ -2062,6 +2050,7 @@ var OrderConfig = class {
 		_defineProperty(this, "hide_combo_item_on_interactive_view", false);
 		_defineProperty(this, "hide_categories_when_ordering", false);
 		_defineProperty(this, "end_shift_with_open_tables", false);
+		_defineProperty(this, "datetime_format", "YYYY-MMM-DD HH:mm:ss");
 	}
 };
 var PaymentConfig = class {
@@ -3463,7 +3452,8 @@ var InvoiceOperationService = class extends LineOperationService {
 		this.addEmployeeToInvoice(invoice, employee);
 		invoice.created_at = /* @__PURE__ */ new Date();
 		invoice.created_at_timestamp = invoice.created_at.getTime();
-		invoice.humanized_created_at = humanizedData(invoice.created_at);
+		const datetimeFormat = (await this.configService.getDefaultOne()).config?.order?.datetime_format;
+		invoice.humanized_created_at = humanizedData(invoice.created_at, datetimeFormat);
 		sectionItem.invoice_created_at = /* @__PURE__ */ new Date();
 		const kitchenPrintJobs = await this.createKitchenPrintJobs(invoice);
 		const labelPrintJobs = await this.createLabelPrintJobs(invoice);
@@ -3662,7 +3652,8 @@ var InvoiceOperationService = class extends LineOperationService {
 		sectionItem.status = SectionItemStatus.CLOSED;
 		this.addEmployeeToInvoice(invoice, employee);
 		invoice.paid_at = /* @__PURE__ */ new Date();
-		invoice.humanized_paid_at = humanizedData(invoice.paid_at);
+		const datetimeFormat = (await this.configService.getDefaultOne()).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);
 		const labelPrintJobs = await this.createLabelPrintJobs(invoice);
@@ -3715,10 +3706,11 @@ var InvoiceOperationService = class extends LineOperationService {
 		invoice.status = InvoiceStatus.Paid;
 		if (employee != null) this.addEmployeeToInvoice(invoice, employee);
 		invoice.paid_at = /* @__PURE__ */ new Date();
-		invoice.humanized_paid_at = humanizedData(invoice.paid_at);
+		const datetimeFormat = (await this.configService.getDefaultOne()).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();
-		invoice.humanized_created_at = humanizedData(invoice.created_at);
+		invoice.humanized_created_at = humanizedData(invoice.created_at, datetimeFormat);
 		if (!invoice.ref_id) invoice.ref_id = await this.getRefId();
 		if (!invoice.call_num) invoice.call_num = invoice.ref_id.slice(-3);
 		invoice.payment_has_cash = invoice.payments?.some((payment) => payment.payment_method?.is_cash === true);
@@ -3763,7 +3755,8 @@ var InvoiceOperationService = class extends LineOperationService {
 		const originalStatus = invoice.status;
 		invoice.status = InvoiceStatus.Void;
 		invoice.voided_at = /* @__PURE__ */ new Date();
-		invoice.humanized_voided_at = humanizedData(invoice.voided_at);
+		const datetimeFormat = (await this.configService.getDefaultOne()).config?.order?.datetime_format;
+		invoice.humanized_voided_at = humanizedData(invoice.voided_at, datetimeFormat);
 		if (till) till.deleted_at = /* @__PURE__ */ new Date();
 		this.addEmployeeToInvoice(invoice, employee);
 		const config = (await this.configService.getDefaultOne()).config;
@@ -4909,12 +4902,12 @@ var AppReportService = class extends AppRemoteService {
 		if (!printer) throw new SystemError("No default receipt printer found");
 		const template = await this.printTemplateService.getOneByParams({ report_code_name: request.report_code_name });
 		if (!template) throw new SystemError("No print template found");
-		const reportData = await this.getReportData(request);
 		const appConfig = await this.configService.getDefaultOne();
+		const reportData = await this.getReportData(request, appConfig.config?.order?.datetime_format);
 		const printJob = new PrintJob(printer, await this.printTemplateService.renderReportPrintTemplate(reportData, appConfig.config, template), false, request.copies);
 		await this.printJobService.addOne(printJob);
 	}
-	async getReportData(request) {
+	async getReportData(request, datetimeFormat) {
 		const reportData = new ReportData();
 		if (request.shift_uid) {
 			await this.db.table("shifts").where("uid").equals(request.shift_uid).and((shift) => shift.deleted_at == null || shift.deleted_at == void 0).first();
@@ -4932,9 +4925,9 @@ var AppReportService = class extends AppRemoteService {
 		}
 		reportData.start_datetime = new Date(request.start_datetime).toISOString();
 		reportData.end_datetime = new Date(request.end_datetime).toISOString();
-		reportData.humanized_start_datetime = humanizedData(new Date(request.start_datetime));
-		reportData.humanized_end_datetime = humanizedData(new Date(request.end_datetime));
-		reportData.humanized_printed_datetime = humanizedData(/* @__PURE__ */ new Date());
+		reportData.humanized_start_datetime = humanizedData(new Date(request.start_datetime), datetimeFormat);
+		reportData.humanized_end_datetime = humanizedData(new Date(request.end_datetime), datetimeFormat);
+		reportData.humanized_printed_datetime = humanizedData(/* @__PURE__ */ new Date(), datetimeFormat);
 		const query = new QueryBuilder().addParam("paid_at", "GreaterThanOrEqualTo", new Date(request.start_datetime).toISOString()).addParam("paid_at", "LessThanOrEqualTo", new Date(request.end_datetime).toISOString()).addParam("deleted_at", "IsNull", true).includeTotal(true);
 		const invoices = (await this.invoiceService.autoQuery(query)).results || [];
 		return this.processReportInvoicesData(reportData, invoices);
@@ -5272,6 +5265,7 @@ var PrintTemplateService = class extends AppRemoteService {
 		const templateData = new TemplateData();
 		templateData.invoice = invoice;
 		templateData.config = config;
+		templateData.normalized_printed_at = humanizedData(templateData.printed_at, config?.order?.datetime_format);
 		templateData.printer_name = options.printer_name;
 		if (options.is_cancel) templateData.is_cancel = options.is_cancel;
 		printCommand.items.push(...await this.renderPrintCommand(template.header, templateData));
@@ -5284,6 +5278,7 @@ var PrintTemplateService = class extends AppRemoteService {
 		const templateData = new TemplateData();
 		templateData.report_data = reportData;
 		templateData.config = config;
+		templateData.normalized_printed_at = humanizedData(templateData.printed_at, config?.order?.datetime_format);
 		printCommand.codepage = template.codepage || Codepages.SimplifiedChinese;
 		printCommand.items.push(...await this.renderPrintCommand(template.header, templateData));
 		printCommand.items.push(...await this.renderPrintCommand(template.body, templateData));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posx/core",
-  "version": "5.5.331",
+  "version": "5.5.332",
   "description": "POSX core libraries",
   "main": "./build/index.js",
   "author": "Steven Lee",
@@ -19,7 +19,7 @@
     "buffer": "6.0.3",
     "crypto-browserify": "3.12.0",
     "crypto-js": "4.2.0",
-    "dayjs": "1.11.10",
+    "dayjs": "^1.11.10",
     "dexie": "3.2.4",
     "esc-pos-encoder-ionic": "1.1.3",
     "handlebars": "4.7.8",

package/package.publish.json

@@ -1,6 +1,6 @@
 {
   "name": "@posx/core",
-  "version": "5.5.331",
+  "version": "5.5.332",
   "description": "POSX core libraries",
   "type": "module",
   "main": "./build/index.js",
@@ -92,7 +92,7 @@
     "buffer": "6.0.3",
     "crypto-browserify": "3.12.0",
     "crypto-js": "4.2.0",
-    "dayjs": "1.11.10",
+    "dayjs": "^1.11.10",
     "dexie": "3.2.4",
     "esc-pos-encoder-ionic": "1.1.3",
     "handlebars": "4.7.8",