@trusted-solutions/sdit.models 0.28.0-alpha.0 → 0.28.0-alpha.10

package/lambda/online-ordering.d.ts

@@ -108,6 +108,14 @@ export interface SOGetStoreInfoResponse {
      * @Default false
      */
     storeDeliveryEnabled: boolean;
+    /**
+     * 外送費 @Default 0
+     */
+    storeDeliveryCharge: number;
+    /**
+     * 免外送費門檻 @Default 0
+     */
+    storeDeliveryFreeThresholdAmount: number;
     /**
      * 內用桌ID
      */
@@ -144,6 +152,7 @@ export interface SOGetStoreMenuResponse {
 export interface SOValidateMutationRequest {
     storeId: string;
     traceId: string;
+    serveType: ServeType;
     /**
      * 預計取餐時間 timestamp ms
      * 不給值 = 盡快
@@ -169,6 +178,10 @@ export interface SOValidateMutationResponse {
      * 總折扣金額
      */
     totalDiscountAmount: number;
+    /**
+     * 外送費
+     */
+    deliveryCharge?: number;
     /**
      * 結帳金額
      */
@@ -196,11 +209,7 @@ export interface SOSendOrderRequest {
      */
     expectedPickupAt?: number;
     /** 外送地址 serveType === deliveryByStore 時有效 */
-    deliveryAddress?: {
-        city: string;
-        district: string;
-        address: string;
-    };
+    deliveryAddress?: Address;
     /** 內用桌ID serveType === dineIn 時有效 */
     tableId?: string;
 }

package/lambda/request/menu.d.ts

@@ -1,4 +1,4 @@
-import { ProductCategory, Product, ProductAttributeCategory, ProductAttribute, ReorderConfig, ProductProductAttribute } from "./../../models";
+import { ProductCategory, Product, ProductAttributeCategory, ProductAttribute, ReorderConfig, ProductProductAttribute, Table } from "./../../models";
 import { BlockVersion } from "../../enums/block-storage";
 import { AttributeIdsInProduct } from "../../models/array-mutations";
 import { CursorPaginationEnabled, Filterable } from './common';
@@ -85,4 +85,5 @@ export interface OverwriteMenuRequest extends StoreTemplateItemRequest {
     productCategories: ProductCategory[];
     productAttributeCategories: ProductAttributeCategory[];
     productProductAttributeRelations: ProductProductAttribute[];
+    tables?: Table[];
 }

package/models/online-ordering.d.ts

@@ -1,6 +1,6 @@
 import { PaymentServiceProvider, PaymentType, ServeType } from '../enums';
 import { MultiLanguageText, OrderDiscount, Quantity, OOReasonCode } from '../models';
-import { DayOfWeekTimePeriod } from './store';
+import { Address, DayOfWeekTimePeriod } from './store';
 export interface SOOrderError {
     type: SOOrderErrorType;
     /**
@@ -76,6 +76,7 @@ export interface SOOrder {
     id?: string;
     storeId: string;
     tableId?: string;
+    tableName?: string;
     displayId: string;
     state: SOOrderState;
     serveType: ServeType;
@@ -102,6 +103,7 @@ export interface SOOrder {
     subtotal: number;
     discount: OrderDiscount;
     totalDiscountAmount: number;
+    deliveryCharge?: number;
     taxAmount: number;
     salesAmountExcludeTax: number;
     exemptTaxSalesAmount: number;
@@ -125,6 +127,8 @@ export interface SOOrder {
     paidAt?: number;
     /** 訂單被取消或拒絕後，已付款的退款時間 undefined 為未退款 */
     refundedAt?: number;
+    /** 外送地址 */
+    deliveryAddress?: Address;
 }
 export interface SOUnavailableCartItem {
     menuItemType: 'product' | 'attribute';
@@ -132,6 +136,10 @@ export interface SOUnavailableCartItem {
      * 線上品項或Attr Id
      */
     menuItemId: string;
+    /**
+     * 品項名稱
+     */
+    menuItemName: string;
 }
 export declare enum SOUnavailableCartItemReasonCode {
     soldOut = "soldOut",
@@ -148,6 +156,8 @@ export interface SOValidateCartItem {
     menuId: string;
     productCategoryId: string;
     productId: string;
+    /** 商品名稱 */
+    productName: string;
     /** 原單價 */
     productAmount: 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,gBAaX;AAbD,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;AACrC,CAAC,EAbW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAa3B;AAmDD,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,iCAAe,CAAA;IACf,mCAAiB,CAAA;AACnB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AAoFD,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;AA8BD,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,gBAaX;AAbD,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;AACrC,CAAC,EAbW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAa3B;AAmDD,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,iCAAe,CAAA;IACf,mCAAiB,CAAA;AACnB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AA8FD,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;AAgCD,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

@@ -9,7 +9,7 @@ import { OrderStatus } from '../enums/order-status';
 import { DiscountModuleTypeEnum, OrderSourceType, CloseType, OrderItemPaidStatus, OrderItemStatus } from '../enums';
 import { Receipt, Transaction } from './receipt';
 import { Customer } from './customer';
-import { Operator } from './store';
+import { Address, Operator } from './store';
 import { OnlinePlatformType, OOReasonCode, OnlineOrderMappingWarningCode } from './online-integration';
 import { SOEater, SOOperateParty } from './online-ordering';
 import { DiscountMethod } from './discount-module';
@@ -58,6 +58,7 @@ export interface BaseOrder {
     /**
      * 線上訂單。
      * 若消費者要打統編，會記錄在這裡
+     * @deprecated 一律記在 `onlineBuyer.buyerId`
      */
     buyerId?: string;
     /** 線上訂購人 */
@@ -93,7 +94,9 @@ export interface Order extends BaseOrder {
     items: OrderItem[];
     /** sigma(items.amount) */
     subtotal: number;
-    /** subtotal - sigma(discount.discountReferences.orderItemId === null) */
+    /** 外送費 */
+    deliveryCharge?: number;
+    /** subtotal - sigma(discount.discountReferences.orderItemId === null) + deliveryCharge */
     totalAmount: number;
     salesAmountExcludeTax: number;
     exemptTaxSalesAmount: number;
@@ -157,6 +160,7 @@ export interface Order extends BaseOrder {
     /**
      * 線上訂單。
      * 若消費者要打統編，會記錄在這裡
+     * @deprecated 一律記在 `onlineBuyer.buyerId`
      */
     buyerId?: string;
     /** 線上訂購人 */
@@ -169,6 +173,8 @@ export interface Order extends BaseOrder {
     expectedPickupAt?: number;
     /** 訂單取消方 */
     canceledByParty?: SOOperateParty;
+    /** 外送地址 */
+    deliveryAddress?: Address;
     /**
      * 線上點餐、UberEats等等外送平台，線上成功收款後的
      * Transaction會暫時存在這個Property，待POS接單後，

package/models/store.d.ts

@@ -159,6 +159,16 @@ export interface Store {
      * 線上點餐預計等待時間(分)
      */
     onlineEstimatedReadyForPickupTime?: number;
+    /** 線上點餐開放預訂 */
+    onlineReserveEnabled?: boolean;
+    /** 線上點餐開放預訂天數 */
+    onlineAvailableReservedDays?: number;
+    /** 線上點餐開放外送 */
+    onlineStoreDeliveryEnabled?: boolean;
+    /** 線上點餐外送費 */
+    onlineStoreDeliveryCharge?: number;
+    /** 線上點餐免外送費訂單金額門檻 */
+    onlineStoreDeliveryFreeThresholdAmount?: number;
 }
 export interface SimpleStore {
     id: string;
@@ -202,7 +212,7 @@ export interface OrderStatusAlert {
 export interface Address {
     city: string;
     district: string;
-    zipCode: number;
+    zipCode?: number;
     address?: string;
 }
 export interface DayOfWeekTimePeriod {

package/models/table.d.ts

@@ -17,6 +17,7 @@ export interface MapTable extends BaseTable {
     x: number;
     y: number;
     capacity?: number;
+    sort?: number;
 }
 export declare enum ServeInputType {
     AnyString = "AnyString",

package/models/table.js.map

@@ -1 +1 @@
-{"version":3,"file":"table.js","sourceRoot":"","sources":["../../../projects/sdit-model-lib/src/models/table.ts"],"names":[],"mappings":";;;AAyBA,IAAY,cAIX;AAJD,WAAY,cAAc;IACtB,yCAAuB,CAAA;IACvB,yCAAuB,CAAA;IACvB,+BAAa,CAAA;AACjB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB"}
+{"version":3,"file":"table.js","sourceRoot":"","sources":["../../../projects/sdit-model-lib/src/models/table.ts"],"names":[],"mappings":";;;AA0BA,IAAY,cAIX;AAJD,WAAY,cAAc;IACtB,yCAAuB,CAAA;IACvB,yCAAuB,CAAA;IACvB,+BAAa,CAAA;AACjB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trusted-solutions/sdit.models",
-  "version": "0.28.0-alpha.0",
+  "version": "0.28.0-alpha.10",
   "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": {
@@ -15,8 +15,7 @@
   "license": "ISC",
   "peerDependencies": {
     "moment": "^2.29.1",
-    "tslib": "^2.0.0",
-    "uuid": "^8.3.1"
+    "tslib": "^2.0.0"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^11.2.1",