@trusted-solutions/sdit.models 0.65.2-alpha.1 → 0.65.2-alpha.3

package/enums/payment-type.d.ts

@@ -52,6 +52,8 @@ export declare enum PaymentType {
     pxpayplusOn = "pxpayplusOn",
     /** 全盈 */
     pluspayOn = "pluspayOn",
+    /** TWQR */
+    twqrOn = "twqrOn",
     weixinOn = "weixinOn",
     aliOn = "aliOn",
     /**

package/enums/payment-type.js

@@ -56,6 +56,8 @@ var PaymentType;
     PaymentType["pxpayplusOn"] = "pxpayplusOn";
     /** 全盈 */
     PaymentType["pluspayOn"] = "pluspayOn";
+    /** TWQR */
+    PaymentType["twqrOn"] = "twqrOn";
     PaymentType["weixinOn"] = "weixinOn";
     PaymentType["aliOn"] = "aliOn";
     /**

package/enums/payment-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"payment-type.js","sourceRoot":"","sources":["../../../projects/sdit-model-lib/src/enums/payment-type.ts"],"names":[],"mappings":";;;AAAA,IAAY,WAyEX;AAzED,WAAY,WAAW;IACrB,oCAAqB,CAAA;IACrB,8BAAe,CAAA;IACf,8BAAe,CAAA;IACf,sCAAuB,CAAA;IAEvB,wCAAyB,CAAA;IACzB,8CAA+B,CAAA;IAE/B,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,wBAAS,CAAA;IACT,4BAAa,CAAA;IACb,sCAAuB,CAAA;IACvB,wCAAyB,CAAA;IACzB,gCAAiB,CAAA;IACjB,gCAAiB,CAAA;IACjB,4BAAa,CAAA;IACb,wCAAyB,CAAA;IACzB,oCAAqB,CAAA;IACrB,sCAAuB,CAAA;IACvB,SAAS;IACT,kCAAmB,CAAA;IACnB,eAAe;IACf,wCAAyB,CAAA;IACzB,sCAAsC;IACtC,4CAA6B,CAAA;IAC7B,iCAAiC;IACjC,8BAAe,CAAA;IACf,8BAA8B;IAC9B,gCAAiB,CAAA;IACjB,+BAA+B;IAC/B,gCAAiB,CAAA;IACjB,gCAAgC;IAChC,kCAAmB,CAAA;IACnB,gCAAgC;IAChC,kCAAmB,CAAA;IAEnB,kCAAmB,CAAA;IACnB,gCAAiB,CAAA;IACjB,4BAAa,CAAA;IAEb,0BAAW,CAAA;IAEX,kCAAmB,CAAA;IAGnB;;OAEG;IACH,sCAAuB,CAAA;IACvB,4BAAa,CAAA;IACb,gCAAiB,CAAA;IACjB,4CAA6B,CAAA;IAC7B,4CAA6B,CAAA;IAC7B,wCAAyB,CAAA;IACzB,0CAA2B,CAAA;IAC3B,SAAS;IACT,sCAAuB,CAAA;IAGvB,oCAAqB,CAAA;IACrB,8BAAe,CAAA;IAEd;;MAEE;IACF,oCAAqB,CAAA;IAErB,qCAAqC;IACrC,sDAAuC,CAAA;AAC1C,CAAC,EAzEW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAyEtB"}
+{"version":3,"file":"payment-type.js","sourceRoot":"","sources":["../../../projects/sdit-model-lib/src/enums/payment-type.ts"],"names":[],"mappings":";;;AAAA,IAAY,WA2EX;AA3ED,WAAY,WAAW;IACrB,oCAAqB,CAAA;IACrB,8BAAe,CAAA;IACf,8BAAe,CAAA;IACf,sCAAuB,CAAA;IAEvB,wCAAyB,CAAA;IACzB,8CAA+B,CAAA;IAE/B,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,wBAAS,CAAA;IACT,4BAAa,CAAA;IACb,sCAAuB,CAAA;IACvB,wCAAyB,CAAA;IACzB,gCAAiB,CAAA;IACjB,gCAAiB,CAAA;IACjB,4BAAa,CAAA;IACb,wCAAyB,CAAA;IACzB,oCAAqB,CAAA;IACrB,sCAAuB,CAAA;IACvB,SAAS;IACT,kCAAmB,CAAA;IACnB,eAAe;IACf,wCAAyB,CAAA;IACzB,sCAAsC;IACtC,4CAA6B,CAAA;IAC7B,iCAAiC;IACjC,8BAAe,CAAA;IACf,8BAA8B;IAC9B,gCAAiB,CAAA;IACjB,+BAA+B;IAC/B,gCAAiB,CAAA;IACjB,gCAAgC;IAChC,kCAAmB,CAAA;IACnB,gCAAgC;IAChC,kCAAmB,CAAA;IAEnB,kCAAmB,CAAA;IACnB,gCAAiB,CAAA;IACjB,4BAAa,CAAA;IAEb,0BAAW,CAAA;IAEX,kCAAmB,CAAA;IAGnB;;OAEG;IACH,sCAAuB,CAAA;IACvB,4BAAa,CAAA;IACb,gCAAiB,CAAA;IACjB,4CAA6B,CAAA;IAC7B,4CAA6B,CAAA;IAC7B,wCAAyB,CAAA;IACzB,0CAA2B,CAAA;IAC3B,SAAS;IACT,sCAAuB,CAAA;IACvB,WAAW;IACX,gCAAiB,CAAA;IAGjB,oCAAqB,CAAA;IACrB,8BAAe,CAAA;IAEd;;MAEE;IACF,oCAAqB,CAAA;IAErB,qCAAqC;IACrC,sDAAuC,CAAA;AAC1C,CAAC,EA3EW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QA2EtB"}

package/models/online-ordering.d.ts

@@ -148,6 +148,53 @@ export declare enum DeliveryTaskStatusIssueCode {
     /** 未知問題 */
     unknown = "unknown"
 }
+export interface DeliveryTask {
+    /** 外送服務商，目前只有 METE */
+    provider: DeliveryProvider;
+    /** 我們給第三方的訂單 ID。目前 METE 使用 POS Order.id 當 client_order_id */
+    clientOrderId: string;
+    /** 第三方平台自己的配送單號。例如 METE createOrder 回傳的 order_id */
+    providerOrderId?: string;
+    /** 第三方原始狀態碼，例如 METE ST01 / ST02 / ST04。只供後台、POS、debug 使用 */
+    statusCode?: string;
+    /** 第三方原始狀態文字。只供後台、POS、debug 使用 */
+    status?: string;
+    /** 後端標準化後的外送狀態。前端流程判斷請以這個欄位為主 */
+    normalizedStatus?: DeliveryTaskStatus;
+    /** 此物流狀態發生時間，timestamp ms */
+    statusAt?: number;
+    /** 第三方回傳的外送費。消費者前端不要用這個取代訂單 deliveryCharge */
+    fee?: number;
+    /** 第三方回傳的外送距離 */
+    distance?: number;
+    /** 第三方提供的追蹤連結 */
+    trackUrl?: string;
+    /** 司機資訊 */
+    courier?: DeliveryTaskCourier;
+    /** 後端最後更新 deliveryTask 的時間，timestamp ms */
+    updatedAt?: number;
+    /** 最後一次同步第三方狀態的時間，timestamp ms */
+    lastSyncedAt?: number;
+    /** 配送進入終態的時間，例如送達或取消，timestamp ms */
+    terminalAt?: number;
+    /** 給消費者前端可顯示的產品化狀態異常提示 */
+    statusIssue?: DeliveryTaskStatusIssue;
+    /** 後台、POS、debug 用的原始錯誤資訊。消費者前端不應直接顯示 raw error */
+    error?: DeliveryTaskError;
+}
+export interface DeliveryTaskCourier {
+    name?: string;
+    phone?: string;
+    /** 第三方原始司機資訊，格式不保證固定 */
+    raw?: string;
+}
+export interface DeliveryTaskError {
+    code?: string;
+    message: string;
+    raw?: unknown;
+    occurredAt: number;
+}
+export declare type SOPaymentFlowState = 'payable' | 'onlinePaymentActive' | 'paymentFailed' | 'paidProcessing' | 'paidAfterExpired' | 'placed' | 'expired' | 'refunded' | 'failedAfterPosNotified' | 'onsitePayment';
 export interface SOOrder {
     id?: string;
     storeId: string;
@@ -177,6 +224,10 @@ export interface SOOrder {
     estimatedReadyForPickupAt: number;
     /** 訂單建立時間 */
     createdAt: number;
+    /** 等待線上付款逾時時間，超過時間未付款則視為取消 */
+    expiredAt?: number;
+    /** 線上付款流程狀態，供前端判斷付款頁重開、等待、過期或退款狀態 */
+    paymentFlowState?: SOPaymentFlowState;
     /** 訂單接受時間 */
     acceptedAt: number;
     /** 訂單拒絕時間 */

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,gBAmBX;AAnBD,WAAY,gBAAgB;IAC1B,YAAY;IACZ,qDAAiC,CAAA;IACjC,eAAe;IACf,iEAA6C,CAAA;IAC7C,WAAW;IACX,+CAA2B,CAAA;IAC3B,aAAa;IACb,mDAA+B,CAAA;IAC/B,YAAY;IACZ,uDAAmC,CAAA;IACnC,gBAAgB;IAChB,uDAAmC,CAAA;IACnC,YAAY;IACZ,6DAAyC,CAAA;IACzC,YAAY;IACZ,2DAAuC,CAAA;IACvC,cAAc;IACd,2DAAuC,CAAA;AACzC,CAAC,EAnBW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAmB3B;AAoED,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,iCAAe,CAAA;IACf,mCAAiB,CAAA;AACnB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AA2BD,IAAY,gBAEX;AAFD,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;AACf,CAAC,EAFW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAE3B;AAED,IAAY,kBAaX;AAbD,WAAY,kBAAkB;IAC5B,aAAa;IACb,mCAAa,CAAA;IACb,WAAW;IACX,mCAAa,CAAA;IACb,WAAW;IACX,mCAAa,CAAA;IACb,WAAW;IACX,mCAAa,CAAA;IACb,cAAc;IACd,mCAAa,CAAA;IACb,eAAe;IACf,mCAAa,CAAA;AACf,CAAC,EAbW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAa7B;AAWD,IAAY,2BASX;AATD,WAAY,2BAA2B;IACrC,eAAe;IACf,oEAAqC,CAAA;IACrC,mBAAmB;IACnB,0EAA2C,CAAA;IAC3C,gBAAgB;IAChB,8DAA+B,CAAA;IAC/B,WAAW;IACX,kDAAmB,CAAA;AACrB,CAAC,EATW,2BAA2B,GAA3B,mCAA2B,KAA3B,mCAA2B,QAStC;AA0HD,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;AAuCD,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,gBAmBX;AAnBD,WAAY,gBAAgB;IAC1B,YAAY;IACZ,qDAAiC,CAAA;IACjC,eAAe;IACf,iEAA6C,CAAA;IAC7C,WAAW;IACX,+CAA2B,CAAA;IAC3B,aAAa;IACb,mDAA+B,CAAA;IAC/B,YAAY;IACZ,uDAAmC,CAAA;IACnC,gBAAgB;IAChB,uDAAmC,CAAA;IACnC,YAAY;IACZ,6DAAyC,CAAA;IACzC,YAAY;IACZ,2DAAuC,CAAA;IACvC,cAAc;IACd,2DAAuC,CAAA;AACzC,CAAC,EAnBW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAmB3B;AAoED,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,iCAAe,CAAA;IACf,mCAAiB,CAAA;AACnB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AA2BD,IAAY,gBAEX;AAFD,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;AACf,CAAC,EAFW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAE3B;AAED,IAAY,kBAaX;AAbD,WAAY,kBAAkB;IAC5B,aAAa;IACb,mCAAa,CAAA;IACb,WAAW;IACX,mCAAa,CAAA;IACb,WAAW;IACX,mCAAa,CAAA;IACb,WAAW;IACX,mCAAa,CAAA;IACb,cAAc;IACd,mCAAa,CAAA;IACb,eAAe;IACf,mCAAa,CAAA;AACf,CAAC,EAbW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAa7B;AAWD,IAAY,2BASX;AATD,WAAY,2BAA2B;IACrC,eAAe;IACf,oEAAqC,CAAA;IACrC,mBAAmB;IACnB,0EAA2C,CAAA;IAC3C,gBAAgB;IAChB,8DAA+B,CAAA;IAC/B,WAAW;IACX,kDAAmB,CAAA;AACrB,CAAC,EATW,2BAA2B,GAA3B,mCAA2B,KAA3B,mCAA2B,QAStC;AA2LD,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;AAuCD,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

@@ -11,7 +11,7 @@ import { Receipt, Transaction } from './receipt';
 import { Customer, CustomerPointDetail } from './customer';
 import { Address, Operator } from './store';
 import { OnlinePlatformType, OOReasonCode, OnlineOrderMappingWarningCode } from './online-integration';
-import { SOEater, SOOperateParty } from './online-ordering';
+import { DeliveryTask, SOEater, SOOperateParty } from './online-ordering';
 import { DiscountMethod } from './discount-module';
 export interface BaseOrder {
     id?: string;
@@ -190,6 +190,8 @@ export interface Order extends BaseOrder {
     deliveryAddress?: Address;
     /** 外送地址經緯度，格式固定為 [longitude, latitude] */
     deliveryAddressLonLat?: number[];
+    /** 第三方外送任務。只有使用 METE 等第三方外送時才會有；店家自己送不會有。 */
+    deliveryTask?: DeliveryTask;
     /**
      * 線上點餐、UberEats等等外送平台，線上成功收款後的
      * Transaction會暫時存在這個Property，待POS接單後，

package/models/payment-config.d.ts

@@ -4,7 +4,7 @@ export interface MultiplePaymentConfig {
     name: string;
     paymentConfigs: PaymentConfig[];
 }
-export declare type PaymentConfig = BasePaymentConfig | EasyCardConfig | TSBankCreditCardConfig | OnePayConfig | ESunMPayConfig | CustomPaymentConfig | CashPaymentConfig | NcccV3pPaymentConfig | NcccD200PaymentConfig | NcccVX520PaymentConfig | SgSmoochpayOnlineConfig;
+export declare type PaymentConfig = BasePaymentConfig | EasyCardConfig | TSBankCreditCardConfig | OnePayConfig | ESunMPayConfig | CustomPaymentConfig | CashPaymentConfig | NcccV3pPaymentConfig | NcccD200PaymentConfig | NcccVX520PaymentConfig | MyPayPayPagePaymentConfig | SgSmoochpayOnlineConfig | DdpayOnlineConfig | DdpayConfig | LinepayOnlineConfig | NewebpayOnlineConfig | NewebpayConfig;
 export interface BasePaymentConfig {
     provider: PaymentServiceProvider;
     type: PaymentType;
@@ -97,7 +97,7 @@ export interface LinepayOnlineConfig extends BasePaymentConfig {
 }
 export interface NewebpayOnlineConfig extends BasePaymentConfig {
     provider: PaymentServiceProvider.newebpayOnline;
-    type: PaymentType.creditCardOn;
+    type: PaymentType.creditCardOn | PaymentType.linePayOn | PaymentType.eSunWallet | PaymentType.taiwanPay | PaymentType.twqrOn | PaymentType.aliOn | PaymentType.weixinOn | PaymentType.unknown;
     merchantId: string;
     hashKey: string;
     hashIV: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trusted-solutions/sdit.models",
-  "version": "0.65.2-alpha.1",
+  "version": "0.65.2-alpha.3",
   "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": {