@trusted-solutions/sdit.models 0.15.0-alpha.0 → 0.16.0-alpha.2

package/enums/order-status.d.ts

@@ -5,7 +5,7 @@ export declare enum OrderStatus {
     preparing = "preparing",
     /** 廚房出餐完成 */
     completed = "completed",
-    /** 送餐完成 */
+    /** 出餐完成 */
     confirmed = "confirmed",
     /** 已刪除 */
     deleted = "deleted",

package/enums/order-status.js

@@ -9,7 +9,7 @@ var OrderStatus;
     OrderStatus["preparing"] = "preparing";
     /** 廚房出餐完成 */
     OrderStatus["completed"] = "completed";
-    /** 送餐完成 */
+    /** 出餐完成 */
     OrderStatus["confirmed"] = "confirmed";
     /** 已刪除 */
     OrderStatus["deleted"] = "deleted";

package/enums/payment-service-provider.d.ts

@@ -23,5 +23,6 @@ export declare enum PaymentServiceProvider {
     ncccVX520 = "ncccVX520",
     /** MyPay PayPage 線上金流 */
     MyPayPayPage = "MyPayPayPage",
-    none = "none"
+    none = "none",
+    mix = "mix"
 }

package/enums/payment-service-provider.js

@@ -28,5 +28,6 @@ var PaymentServiceProvider;
     /** MyPay PayPage 線上金流 */
     PaymentServiceProvider["MyPayPayPage"] = "MyPayPayPage";
     PaymentServiceProvider["none"] = "none";
+    PaymentServiceProvider["mix"] = "mix";
 })(PaymentServiceProvider = exports.PaymentServiceProvider || (exports.PaymentServiceProvider = {}));
 //# sourceMappingURL=payment-service-provider.js.map

package/enums/payment-service-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"payment-service-provider.js","sourceRoot":"","sources":["../../../projects/sdit-model-lib/src/enums/payment-service-provider.ts"],"names":[],"mappings":";;;AAAA,IAAY,sBA6BX;AA7BD,WAAY,sBAAsB;IAChC,YAAY;IACZ,+CAAqB,CAAA;IACrB,gBAAgB;IAChB,2CAAiB,CAAA;IACjB,eAAe;IACf,2CAAiB,CAAA;IACjB,eAAe;IACf,6CAAmB,CAAA;IACnB,aAAa;IACb,+CAAqB,CAAA;IACrB,WAAW;IACX,6CAAmB,CAAA;IACnB,wBAAwB;IACxB,qEAA2C,CAAA;IAC3C,oBAAoB;IACpB,uEAA6C,CAAA;IAE7C,oBAAoB;IACpB,6CAAmB,CAAA;IACnB,uBAAuB;IACvB,+CAAqB,CAAA;IACrB,kCAAkC;IAClC,iDAAuB,CAAA;IAEvB,yBAAyB;IACzB,uDAA6B,CAAA;IAE7B,uCAAa,CAAA;AACf,CAAC,EA7BW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QA6BjC"}
+{"version":3,"file":"payment-service-provider.js","sourceRoot":"","sources":["../../../projects/sdit-model-lib/src/enums/payment-service-provider.ts"],"names":[],"mappings":";;;AAAA,IAAY,sBA8BX;AA9BD,WAAY,sBAAsB;IAChC,YAAY;IACZ,+CAAqB,CAAA;IACrB,gBAAgB;IAChB,2CAAiB,CAAA;IACjB,eAAe;IACf,2CAAiB,CAAA;IACjB,eAAe;IACf,6CAAmB,CAAA;IACnB,aAAa;IACb,+CAAqB,CAAA;IACrB,WAAW;IACX,6CAAmB,CAAA;IACnB,wBAAwB;IACxB,qEAA2C,CAAA;IAC3C,oBAAoB;IACpB,uEAA6C,CAAA;IAE7C,oBAAoB;IACpB,6CAAmB,CAAA;IACnB,uBAAuB;IACvB,+CAAqB,CAAA;IACrB,kCAAkC;IAClC,iDAAuB,CAAA;IAEvB,yBAAyB;IACzB,uDAA6B,CAAA;IAE7B,uCAAa,CAAA;IACb,qCAAW,CAAA;AACb,CAAC,EA9BW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QA8BjC"}

package/lambda/online-ordering.d.ts

@@ -145,7 +145,7 @@ export interface SOSendOrderRequest {
     serveType: ServeType;
     eater: SOEater;
     cart: SOValidateCart;
-    expectedPaymentMethod: SOPaymentMethod;
+    isOnSitePayment: boolean;
     /**
      *  包裝、免洗餐具
      */
@@ -165,6 +165,17 @@ export interface SOSendOrderResponse {
     state: SOOrderState;
     /** 消費者識別用 id的末五碼 == Order.serialNumber */
     displayId: string;
+    isOnSitePayment: boolean;
+}
+/*******************************/
+/*******************************/
+export interface SOGetPaymentUrlRequest {
+    storeId: string;
+    /** online Order Id */
+    id: string;
+}
+export interface SOGetPaymentUrlResponse {
+    payUrl: string;
 }
 /*******************************/
 /*******************************/

package/lambda/request/closing.d.ts

@@ -1,7 +1,7 @@
-import { PaymentServiceProvider, PaymentType, ReceiptStatusType, CloseType } from "../../enums";
-import { CursorPaginationEnabled, Filterable, QueryOptions } from "./common";
-import { ClosingSalesProductDetail, Expenditure, Operator, Order } from "../../models";
-import { SummarizeClosingResponse } from "../response";
+import { PaymentServiceProvider, PaymentType, ReceiptStatusType, CloseType } from '../../enums';
+import { CursorPaginationEnabled, Filterable, QueryOptions } from './common';
+import { ClosingSalesProductDetail, Expenditure, Operator, Order, Transaction } from '../../models';
+import { SummarizeClosingResponse } from '../response';
 export interface AggregateShiftClosingRequest {
     storeId: string;
     accountId: string;
@@ -10,6 +10,7 @@ export interface AggregateShiftClosingRequest {
     paymentServiceProvider: PaymentServiceProvider;
     paymentType: PaymentType;
     customName?: string;
+    mixPayments?: Transaction[];
     amount: number;
     order: Order;
     voidedInvoiceNumber?: string;

package/models/online-ordering.d.ts

@@ -104,8 +104,8 @@ export interface SOOrder {
     canceledReasonCode?: OOReasonCode;
     /** 店家方取消理由 */
     canceledReason?: string;
-    /** 消費者預計付款方式 */
-    expectedPaymentMethod: SOPaymentMethod;
+    /** 消費者是否選擇線上付款 */
+    isOnSitePayment: boolean;
     /** 消費者實際付款方式 */
     actualPaymentMethod?: SOPaymentMethod;
     /** 消費者付款時間 undefined為未付款 */

package/models/online-ordering.js.map

@@ -1 +1 @@
-{"version":3,"file":"online-ordering.js","sourceRoot":"","sources":["../../../projects/sdit-model-lib/src/models/online-ordering.ts"],"names":[],"mappings":";;;AAeA,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,+CAA2B,CAAA;IAC3B,mDAA+B,CAAA;IAC/B,uDAAmC,CAAA;IACnC,uDAAmC,CAAA;AACrC,CAAC,EALW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAK3B;AAgDD,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,iCAAe,CAAA;AACjB,CAAC,EAHW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAGzB;AAiFD,IAAY,+BAGX;AAHD,WAAY,+BAA+B;IACzC,sDAAmB,CAAA;IACnB,kEAA+B,CAAA;AACjC,CAAC,EAHW,+BAA+B,GAA/B,uCAA+B,KAA/B,uCAA+B,QAG1C;AA4BD,IAAY,YAMX;AAND,WAAY,YAAY;IACtB,mCAAmB,CAAA;IACnB,qCAAqB,CAAA;IACrB,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,qCAAqB,CAAA;AACvB,CAAC,EANW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAMvB"}
+{"version":3,"file":"online-ordering.js","sourceRoot":"","sources":["../../../projects/sdit-model-lib/src/models/online-ordering.ts"],"names":[],"mappings":";;;AAeA,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,+CAA2B,CAAA;IAC3B,mDAA+B,CAAA;IAC/B,uDAAmC,CAAA;IACnC,uDAAmC,CAAA;AACrC,CAAC,EALW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAK3B;AAgDD,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,iCAAe,CAAA;AACjB,CAAC,EAHW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAGzB;AAkFD,IAAY,+BAGX;AAHD,WAAY,+BAA+B;IACzC,sDAAmB,CAAA;IACnB,kEAA+B,CAAA;AACjC,CAAC,EAHW,+BAA+B,GAA/B,uCAA+B,KAA/B,uCAA+B,QAG1C;AA4BD,IAAY,YAMX;AAND,WAAY,YAAY;IACtB,mCAAmB,CAAA;IACnB,qCAAqB,CAAA;IACrB,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,qCAAqB,CAAA;AACvB,CAAC,EANW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAMvB"}

package/models/order.d.ts

@@ -7,11 +7,12 @@ import { InvoiceConfig, Tax } from './invoice-config';
 import { InvoiceCarrierType } from './../enums/invoice-carrier-type';
 import { OrderStatus } from '../enums/order-status';
 import { DiscountModuleTypeEnum, OrderSourceType, CloseType, OrderItemPaidStatus, OrderItemStatus } from '../enums';
-import { Receipt, Transaction } from './receipt';
+import { Receipt } from './receipt';
 import { Customer } from './customer';
 import { Operator } from './store';
 import { OnlinePlatformType, OOReasonCode, OnlineOrderMappingWarningCode } from './online-integration';
-import { SOEater, SOOperateParty, SOPaymentMethod } from './online-ordering';
+import { SOEater, SOOperateParty } from './online-ordering';
+import { DiscountMethod } from './discount-module';
 export interface Order {
     id?: string;
     source: OrderSourceType;
@@ -51,13 +52,9 @@ export interface Order {
     /** Use attachPayment method to add this info */
     /** @Deprecated */
     payment?: OrderPayment;
-    /** 混合支付細項 */
-    mixPayments?: Transaction[];
     /** Use issueInvoice method to add this info */
     /** @Deprecated */
     invoice?: OrderInvoice;
-    /** 混合支付細項 */
-    mixRefunds?: Transaction[];
     /** Created by attachPayment method */
     /** @Deprecated */
     receipt?: OrderReceipt;
@@ -73,7 +70,7 @@ export interface Order {
     preparingAt?: number;
     /** 廚房出餐時間 */
     completedAt?: number;
-    /** 送餐時間 */
+    /** 出餐時間 */
     confirmedAt?: number;
     /** POS刪除時間 */
     deletedAt?: number;
@@ -114,8 +111,8 @@ export interface Order {
     expectedPickupAt?: number;
     /** 訂單取消方 */
     canceledByParty?: SOOperateParty;
-    /** 消費者預計付款方式 */
-    expectedPaymentMethod?: SOPaymentMethod;
+    /** 消費者是否選擇線上付款 */
+    isOnSitePayment: boolean;
 }
 export interface OrderItem {
     id?: string;
@@ -125,14 +122,25 @@ export interface OrderItem {
     /** amount of single product */
     productAmount: number;
     productTax: Tax;
-    /** (attrs + product amount) * quantity */
+    attributes: OrderItemAttr[];
+    /**
+     * 經由註記調整價格後的一個品項金額
+     * 原價 `productAmount` + 註記總價 `Sum(attribute.additionalAmount)`
+     */
     subtotal?: number;
-    /** sigma(discount.discountReferences.orderItemId === id)) */
+    /**
+     * 一個品項的手動折扣方式
+     */
+    manualDiscountMethod?: DiscountMethod;
+    /**
+     * 一個品項的折扣金額，為`subtotal`與`discountMethod`計算後結果
+     */
     discountAmount?: number;
-    /** (subtotal - discountAmount) */
-    amount: number;
     quantity: number;
-    attributes: OrderItemAttr[];
+    /**
+     * （`subtotal` - `discountAmount`) * `quantity`
+     */
+    amount: number;
     status?: OrderItemStatus;
     /** 所屬第x次出單的品項，初始為undefined，第一次出單為0，每出單一次+1 */
     round?: number;
@@ -144,7 +152,7 @@ export interface OrderItem {
     preparingAt?: number;
     /** 廚房出餐時間 */
     completedAt?: number;
-    /** 送餐時間 */
+    /** 出餐時間 */
     confirmedAt?: number;
     /** POS刪除時間 */
     deletedAt?: number;
@@ -161,7 +169,8 @@ export interface OrderItemChangelog {
     amount?: number;
     attributes?: OrderItemAttr[];
     note?: string;
-    discountRefs?: DiscountReference[];
+    manualDiscountMethod?: DiscountMethod;
+    discountAmount?: number;
     modifiedBy?: Operator;
 }
 export interface OrderItemAttr {
@@ -247,13 +256,13 @@ export interface ShiftClosingResult {
     currentVoidedCount: number;
     /** 本期收據 作廢金額 */
     currentVoidedAmount: number;
-    /** 本期收據 作廢收據號碼或發票號碼 */
+    /** 本期收據 作廢收據編號或發票號碼 */
     currentVoidedInvoiceNumbers: string[];
     /** 非本期收據 作廢數 */
     nonCurrentVoidedCount: number;
     /** 非本期收據 作廢金額 */
     nonCurrentVoidedAmount: number;
-    /** 非本期收據 作廢收據號碼或發票號碼 */
+    /** 非本期收據 作廢收據編號或發票號碼 */
     nonCurrentVoidedInvoiceNumbers: string[];
 }
 export interface ClosingResult {
@@ -274,13 +283,13 @@ export interface ClosingResult {
     currentVoidedCount: number;
     /** 本期收據 作廢金額 */
     currentVoidedAmount: number;
-    /** 本期收據 作廢收據號碼或發票號碼 */
+    /** 本期收據 作廢收據編號或發票號碼 */
     currentVoidedInvoiceNumbers: string[];
     /** 非本期收據 作廢數 */
     nonCurrentVoidedCount: number;
     /** 非本期收據 作廢金額 */
     nonCurrentVoidedAmount: number;
-    /** 非本期收據 作廢收據號碼或發票號碼 */
+    /** 非本期收據 作廢收據編號或發票號碼 */
     nonCurrentVoidedInvoiceNumbers: string[];
     /** 註銷品項數量 */
     cancelledSalesCount?: number;

package/models/payment-config.d.ts

@@ -9,6 +9,7 @@ export interface BasePaymentConfig {
     provider: PaymentServiceProvider;
     type: PaymentType;
     disableInventory?: boolean;
+    name?: string;
 }
 export interface EasyCardConfig extends BasePaymentConfig {
     provider: PaymentServiceProvider.easyCard;

package/models/receipt.d.ts

@@ -50,6 +50,8 @@ export interface Transaction {
     detail: any;
     operator?: Operator;
     note?: string;
-    /** for mix only */
+    /** for sub transaction only (parent is mix) */
     amount?: number;
+    cashActualAmount?: number;
+    cashReturnAmount?: number;
 }

package/models/store.d.ts

@@ -164,7 +164,7 @@ export interface FlowConfig {
 export interface OrderStatusAlert {
     /** 出單後，狀態設定為confirmed（適合餐點已經事先做好的店） */
     autoConfirm: boolean;
-    /** 結帳後自動出店（單子消失在pos上） */
+    /** 結帳後自動完成訂單（單子消失在pos上） */
     autoLeave: boolean;
     /** Kiosk接單後POS自動接受 */
     autoAccept: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trusted-solutions/sdit.models",
-  "version": "0.15.0-alpha.0",
+  "version": "0.16.0-alpha.2",
   "description": "TODO: Give a short introduction of your project. Let this section explain the objectives or the motivation behind this project.",
   "main": "index.js",
   "scripts": {