@posx/core 5.5.111 → 5.5.112

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2019 Francisco Hodge
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2019 Francisco Hodge
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,85 +1,85 @@
-# 第一阶段
-- 1. 创建，更新，删除都是通过 -> Http API
-- 2. 读取是通过本地数据库 -> 本地， （例外：订单从云端读取）
-
-# 第二阶段 （单机版）
-1. 创建，更新，删除，读取都通过本地数据库，然后进行数据和云端同步(Web Worker)
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <div align="center">
- <img align="center" width="230" src="https://i.imgur.com/iHgtvmg.png" />
-  <h2>Typescript Library Boilerplate Basic</h2>
-  <blockquote>Minimal Library Starter Kit for your Typescript projects</blockquote>
- 
- <a href="https://www.npmjs.com/package/@hodgef/ts-library-boilerplate-basic"><img src="https://badgen.net/npm/v/@hodgef/ts-library-boilerplate-basic?color=blue" alt="npm version"></a> <a href="https://github.com/hodgef/ts-library-boilerplate"><img src="https://img.shields.io/github/last-commit/hodgef/ts-library-boilerplate" alt="latest commit"></a> <a href="https://github.com/hodgef/ts-library-boilerplate-basic/actions"><img alt="Build Status" src="https://github.com/hodgef/ts-library-boilerplate-basic/workflows/Build/badge.svg?color=green" /></a> <a href="https://github.com/hodgef/ts-library-boilerplate-basic/actions"> <img alt="Publish Status" src="https://github.com/hodgef/ts-library-boilerplate-basic/workflows/Publish/badge.svg?color=green" /></a>
-
-<strong>For a plain Javascript alternative, check out [js-library-boilerplate-basic](https://github.com/hodgef/js-library-boilerplate-basic).</strong>
-
-</div>
-
-## ⭐️ Features
-
-- Webpack 5
-- Babel 7
-- Hot reloading (`npm start`)
-- Automatic Types file generation (index.d.ts)
-- UMD exports, so your library works everywhere.
-- Jest unit testing
-- Customizable file headers for your build [(Example 1)](https://github.com/hodgef/ts-library-boilerplate-basic/blob/master/build/index.js) [(Example2)](https://github.com/hodgef/ts-library-boilerplate-basic/blob/master/build/css/index.css)
-- Daily [dependabot](https://dependabot.com) dependency updates
-
-## 📦 Getting Started
-
-```
-git clone https://github.com/hodgef/ts-library-boilerplate-basic.git myLibrary
-npm install
-```
-
-## 💎 Customization
-
-> Before shipping, make sure to:
-
-1. Edit `LICENSE` file
-2. Edit `package.json` information (These will be used to generate the headers for your built files)
-3. Edit `library: "MyLibrary"` with your library's export name in `./webpack.config.js`
-
-## 🚀 Deployment
-
-1. `npm publish`
-2. Your users can include your library as usual
-
-### npm
-
-```
-import MyLibrary from 'my-library';
-const libraryInstance = new MyLibrary();
-...
-```
-
-### self-host/cdn
-
-```
-<script src="build/index.js"></script>
-
-const MyLibrary = window.MyLibrary.default;
-const libraryInstance = new MyLibrary();
-...
-```
-
-## ✅ Libraries built with this boilerplate
-
-> Made a library using this starter kit? Share it here by [submitting a pull request](https://github.com/hodgef/ts-library-boilerplate-basic/pulls)!
-
-- [simple-keyboard](https://github.com/hodgef/simple-keyboard) - Javascript Virtual Keyboard
-- [react-simple-keyboard](https://github.com/hodgef/react-simple-keyboard) - React Virtual Keyboard
-- [simple-keyboard-layouts](https://github.com/hodgef/simple-keyboard-layouts) - Keyboard layouts for simple-keyboard
-- [atlas-monaco](https://github.com/datdao/atlas-monaco) - AtlasHCL for monaco editor
+# 第一阶段
+- 1. 创建，更新，删除都是通过 -> Http API
+- 2. 读取是通过本地数据库 -> 本地， （例外：订单从云端读取）
+
+# 第二阶段 （单机版）
+1. 创建，更新，删除，读取都通过本地数据库，然后进行数据和云端同步(Web Worker)
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ <div align="center">
+ <img align="center" width="230" src="https://i.imgur.com/iHgtvmg.png" />
+  <h2>Typescript Library Boilerplate Basic</h2>
+  <blockquote>Minimal Library Starter Kit for your Typescript projects</blockquote>
+ 
+ <a href="https://www.npmjs.com/package/@hodgef/ts-library-boilerplate-basic"><img src="https://badgen.net/npm/v/@hodgef/ts-library-boilerplate-basic?color=blue" alt="npm version"></a> <a href="https://github.com/hodgef/ts-library-boilerplate"><img src="https://img.shields.io/github/last-commit/hodgef/ts-library-boilerplate" alt="latest commit"></a> <a href="https://github.com/hodgef/ts-library-boilerplate-basic/actions"><img alt="Build Status" src="https://github.com/hodgef/ts-library-boilerplate-basic/workflows/Build/badge.svg?color=green" /></a> <a href="https://github.com/hodgef/ts-library-boilerplate-basic/actions"> <img alt="Publish Status" src="https://github.com/hodgef/ts-library-boilerplate-basic/workflows/Publish/badge.svg?color=green" /></a>
+
+<strong>For a plain Javascript alternative, check out [js-library-boilerplate-basic](https://github.com/hodgef/js-library-boilerplate-basic).</strong>
+
+</div>
+
+## ⭐️ Features
+
+- Webpack 5
+- Babel 7
+- Hot reloading (`npm start`)
+- Automatic Types file generation (index.d.ts)
+- UMD exports, so your library works everywhere.
+- Jest unit testing
+- Customizable file headers for your build [(Example 1)](https://github.com/hodgef/ts-library-boilerplate-basic/blob/master/build/index.js) [(Example2)](https://github.com/hodgef/ts-library-boilerplate-basic/blob/master/build/css/index.css)
+- Daily [dependabot](https://dependabot.com) dependency updates
+
+## 📦 Getting Started
+
+```
+git clone https://github.com/hodgef/ts-library-boilerplate-basic.git myLibrary
+npm install
+```
+
+## 💎 Customization
+
+> Before shipping, make sure to:
+
+1. Edit `LICENSE` file
+2. Edit `package.json` information (These will be used to generate the headers for your built files)
+3. Edit `library: "MyLibrary"` with your library's export name in `./webpack.config.js`
+
+## 🚀 Deployment
+
+1. `npm publish`
+2. Your users can include your library as usual
+
+### npm
+
+```
+import MyLibrary from 'my-library';
+const libraryInstance = new MyLibrary();
+...
+```
+
+### self-host/cdn
+
+```
+<script src="build/index.js"></script>
+
+const MyLibrary = window.MyLibrary.default;
+const libraryInstance = new MyLibrary();
+...
+```
+
+## ✅ Libraries built with this boilerplate
+
+> Made a library using this starter kit? Share it here by [submitting a pull request](https://github.com/hodgef/ts-library-boilerplate-basic/pulls)!
+
+- [simple-keyboard](https://github.com/hodgef/simple-keyboard) - Javascript Virtual Keyboard
+- [react-simple-keyboard](https://github.com/hodgef/react-simple-keyboard) - React Virtual Keyboard
+- [simple-keyboard-layouts](https://github.com/hodgef/simple-keyboard-layouts) - Keyboard layouts for simple-keyboard
+- [atlas-monaco](https://github.com/datdao/atlas-monaco) - AtlasHCL for monaco editor

package/build/index.d.ts

@@ -32,6 +32,17 @@ declare module '@posx/core/index' {
   export * from '@posx/core/types/condition.type';
   export * from '@posx/core/types/merchant.type';
 
+}
+declare module '@posx/core/libs/FindOptions' {
+  export const Include: (query?: string) => (val: any) => any;
+  export const In: (query?: never[]) => (val: never) => boolean;
+  export const Between: (begin: number, end: number) => (val: number) => boolean;
+  export const Not: (query?: any) => (val: any, values: any) => boolean;
+  export const Raw: (fn: any) => any;
+  export const filterByParams: (params: {
+      [key: string]: any;
+  }) => (values: any) => boolean;
+
 }
 declare module '@posx/core/libs/electron.socket' {
   export class ElectronSocket {
@@ -247,17 +258,6 @@ declare module '@posx/core/libs/escpos.printer' {
       items: IPrintCommandLine[];
   }
 
-}
-declare module '@posx/core/libs/FindOptions' {
-  export const Include: (query?: string) => (val: any) => any;
-  export const In: (query?: never[]) => (val: never) => boolean;
-  export const Between: (begin: number, end: number) => (val: number) => boolean;
-  export const Not: (query?: any) => (val: any, values: any) => boolean;
-  export const Raw: (fn: any) => any;
-  export const filterByParams: (params: {
-      [key: string]: any;
-  }) => (values: any) => boolean;
-
 }
 declare module '@posx/core/service.factory' {
   import { IServiceOptions } from '@posx/core/types/misc.type';
@@ -912,6 +912,12 @@ declare module '@posx/core/services/app.service' {
       printReport(request: IReportRequest): Promise<void>;
       private getReportData;
       processReportInvoicesData(reportData: IReportData, invoices?: IInvoice[]): IReportData;
+      /**
+       * 生成唯一的菜品key
+       * 格式: 菜品uid-modifier1:modifier1.quantity-modifier2:modifier2.quantity-modifier3:modifier3.quantity
+       * 修饰符按uid排序，去除相同菜品不同modifier顺序的影响
+       */
+      private generateItemKey;
   }
   export type IPrintJobService = IAppRemoteService<IPrintJob> & {
       /**
@@ -4199,6 +4205,7 @@ declare module '@posx/core/types/product.type' {
 declare module '@posx/core/types/report.type' {
   import { IAppBase, IAppCoreModel, AppCoreModel } from '@posx/core/types/abstract.type';
   import { IConfig } from '@posx/core/types/config.type';
+  import { IItem } from '@posx/core/types/product.type';
   export type IReportCategory = IAppBase & {
       reports: IReport[];
   };
@@ -4275,6 +4282,9 @@ declare module '@posx/core/types/report.type' {
       drawer_summary: IDrawerSummary;
       payments_summary: IPaymentSummary[];
       loyalty_program_summary: ILoyaltyProgramSummary;
+      item_sales_summary: TItemSalesSummary[];
+      item_sales_summary_total: number;
+      item_sales_summary_total_count: number;
       config: IConfig;
   };
   export class ReportData implements IReportData {
@@ -4282,10 +4292,14 @@ declare module '@posx/core/types/report.type' {
       humanized_start_datetime: string;
       end_datetime: string;
       humanized_end_datetime: string;
+      humanized_printed_datetime: string;
       sales_summary: SalesSummary;
       drawer_summary: DrawerSummary;
       payments_summary: PaymentSummary[];
       loyalty_program_summary: LoyaltyProgramSummary;
+      item_sales_summary: ItemSalesSummary[];
+      item_sales_summary_total: number;
+      item_sales_summary_total_count: number;
       config: IConfig;
   }
   export type ISalesSummary = {
@@ -4382,6 +4396,20 @@ declare module '@posx/core/types/report.type' {
       minus_point_total: number;
       minus_point_count: number;
   }
+  export type TItemCoreSalesSummary = {
+      item: IItem;
+      quantity: number;
+      total_amount: number;
+  };
+  export type TItemSalesSummary = TItemCoreSalesSummary & {
+      modifiers?: TItemCoreSalesSummary[];
+  };
+  export class ItemSalesSummary implements TItemSalesSummary {
+      item: IItem;
+      quantity: number;
+      total_amount: number;
+      modifiers: TItemCoreSalesSummary[];
+  }
 
 }
 declare module '@posx/core/types/request.type' {