@trusted-solutions/sdit.models 0.57.3 → 0.57.4-alpha.1

package/lambda/online-ordering.d.ts

@@ -194,14 +194,14 @@ export interface SOGetStoreInfoResponse {
     brand?: any;
     /** 加入購物車時，是否與相同品相合併 */
     mergeSameItem?: boolean;
-    /** 內用服務費 0~100(%) */
+    /** 內用服務費 1~100(%) undefined為關閉 */
     dineInServiceChargePercent?: number;
-    /** 外帶服務費 0~100(%) */
+    /** 外帶服務費 1~100(%) undefined為關閉 */
     takeoutServiceChargePercent?: number;
     /**
      * 服務費計算基準，無值時預設subtotal
-     * "subtotal": 先折扣再服務費
-     * "subtotal+discount": 先服務費再折扣。
+     * "subtotal": serviceCharge = (subtotal * servicePercent)
+     * "subtotal+discount": serviceCharge = ((subtotal+discount) * servicePercent)
      */
     serviceBase?: "subtotal" | "subtotal+discount";
 }
@@ -271,6 +271,11 @@ export interface SOValidateMutationResponse {
      * undefined=沒有此收費名目
      */
     serviceCharge?: number;
+    /**
+     * 服務費費率
+     * undefined=沒有此收費名目
+     */
+    serviceChargePercent?: number;
     /**
      * 點數折抵前總金額＝小計+折扣+外送費+服務費
      */

package/models/online-ordering.d.ts

@@ -115,6 +115,8 @@ export interface SOOrder {
     totalDiscountAmount: number;
     deliveryCharge?: number;
     serviceCharge?: number;
+    /** 服務費費率undefined=沒有此收費名目 */
+    serviceChargePercent?: number;
     totalBeforePoints: number;
     taxAmount: number;
     salesAmountExcludeTax: 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;AAmDD,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,iCAAe,CAAA;IACf,mCAAiB,CAAA;AACnB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AAgHD,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;AAkCD,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;AAmDD,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,iCAAe,CAAA;IACf,mCAAiB,CAAA;AACnB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AAkHD,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;AAkCD,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

@@ -102,6 +102,8 @@ export interface Order extends BaseOrder {
      * undefined=沒有此收費名目
      */
     serviceCharge?: number;
+    /** 服務費費率undefined=沒有此收費名目 */
+    serviceChargePercent?: number;
     /** subtotal - sigma(discount.discountReferences.orderItemId === null) + deliveryCharge */
     totalAmount: number;
     salesAmountExcludeTax: number;

package/models/store.d.ts

@@ -227,14 +227,14 @@ export interface Store {
     brandNo?: string;
     /** 加入購物車時，是否與相同品相合併 */
     onlineMergeSameItem?: boolean;
-    /** 內用服務費 0~100(%) */
+    /** 內用服務費 1~100(%) undefined為關閉 */
     dineInServiceChargePercent?: number;
-    /** 外帶服務費 0~100(%) */
+    /** 外帶服務費 1~100(%) undefined為關閉 */
     takeoutServiceChargePercent?: number;
     /**
      * 服務費計算基準，無值時預設subtotal
-     * "subtotal": 先折扣再服務費
-     * "subtotal+discount": 先服務費再折扣。
+     * "subtotal": serviceCharge = (subtotal * servicePercent)
+     * "subtotal+discount": serviceCharge = ((subtotal+discount) * servicePercent)
      */
     serviceBase?: "subtotal" | "subtotal+discount";
 }

package/package.json

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