@pisell/pisellos 0.0.346 → 0.0.348

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/solution/Checkout/index.js

@@ -3191,8 +3191,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 depositPaidAmount = paymentItems.filter(function (item) {
                   return item.order_payment_type === 'deposit' && item.status !== 'voided';
                 }).reduce(function (sum, item) {
-                  // 如果是 wallet，并且还没同步到后端，则不计入这一部分金额
-                  if (item.voucher_id && !item.isSynced) {
+                  // 如果是 wallet，并且还没同步到后端，且此时还没有其他类型的支付项（现金，eftpos，标记支付）,不计入已付金额
+                  // 如果有其他支付项了，代表此时处于马上要同步的状态，所以计入
+                  if (item.voucher_id && !item.isSynced && paymentItems.filter(function (item) {
+                    return !item.voucher_id;
+                  }).length === 0) {
                     return sum;
                   }
                   var amount = new Decimal(item.amount || '0');

package/dist/solution/RegisterAndLogin/config.js

@@ -177,7 +177,8 @@ var onlineStoreConfig = {
     transformParams: function transformParams(params) {
       return {
         email: params.email,
-        code: params.code
+        code: params.code,
+        action: params.action
       };
     }
   },

package/dist/solution/RegisterAndLogin/types.d.ts

@@ -318,6 +318,7 @@ export interface CheckEmailCodeParams {
     email: string;
     shop_id: number;
     code: string;
+    action: string;
 }
 /**
  * 检查手机验证码是否有效参数接口

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/solution/Checkout/index.js

@@ -1967,7 +1967,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         const depositPaidAmount = paymentItems.filter(
           (item) => item.order_payment_type === "deposit" && item.status !== "voided"
         ).reduce((sum, item) => {
-          if (item.voucher_id && !item.isSynced) {
+          if (item.voucher_id && !item.isSynced && paymentItems.filter((item2) => !item2.voucher_id).length === 0) {
             return sum;
           }
           const amount = new import_decimal.default(item.amount || "0");

package/lib/solution/RegisterAndLogin/config.js

@@ -147,7 +147,8 @@ var onlineStoreConfig = {
     method: "GET",
     transformParams: (params) => ({
       email: params.email,
-      code: params.code
+      code: params.code,
+      action: params.action
     })
   },
   checkMobileCode: {

package/lib/solution/RegisterAndLogin/types.d.ts

@@ -318,6 +318,7 @@ export interface CheckEmailCodeParams {
     email: string;
     shop_id: number;
     code: string;
+    action: string;
 }
 /**
  * 检查手机验证码是否有效参数接口

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.346",
+  "version": "0.0.348",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",