@pisell/pisellos 2.2.42 → 2.2.43

package/lib/modules/Rules/types.d.ts

@@ -26,6 +26,7 @@ export interface RulesModuleAPI {
             form_record_id: number;
         }[];
         isFormSubject: boolean;
+        orderTotalAmount: number;
     }) => DiscountResult;
 }
 type ProductDetail = {

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

@@ -25,15 +25,6 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     setOtherProductsIds(ids: number[]): void;
     getOtherProductsIds(): number[];
     storeChange(): void;
-    /**
-     * 传入一个时间, 判断改时间是否在schedule 内
-     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
-     * @returns
-     */
-    isInScheduleByDate({ date, schedule, }: {
-        date: string;
-        schedule: any;
-    }): boolean | undefined;
     /**
      * 传入一个时间, 判断改时间是否在schedule 内
      * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule

package/lib/modules/Schedule/index.js

@@ -159,17 +159,6 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
       });
     }
   }
-  /**
-   * 传入一个时间, 判断改时间是否在schedule 内
-   * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
-   * @returns
-   */
-  isInScheduleByDate({
-    date,
-    schedule
-  }) {
-    return ScheduleModule.isInScheduleByDate({ date, schedule });
-  }
   /**
    * 传入一个时间, 判断改时间是否在schedule 内
    * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule

package/lib/modules/Summary/types.d.ts

@@ -5,6 +5,8 @@ export interface ISummaryState {
         subtotal: string | number;
         /** 最终总价 */
         total: string | number;
+        /** 最终原始价格 不包含折扣卡商品券折扣 */
+        originTotal: string | number;
         /** 税率标题 */
         taxTitle?: string;
         /** 商品总费率 */

package/lib/modules/Summary/utils.d.ts

@@ -13,6 +13,12 @@ export declare const getBundleDiscountList: (bundle: any[]) => any[];
  * @returns 商品总价字符串，保留2位小数
  */
 export declare const calculateSubtotal: (items: CartItem[]) => string;
+/**
+ * 计算商品小计（不含其他费用 不包含折扣卡商品券抵扣金额）
+ * @param items - 购物车商品数组
+ * @returns 商品总价字符串，保留2位小数
+ */
+export declare const calculateOriginSubtotal: (items: CartItem[]) => string;
 /**
  * @title: 单个商品的税费
  * @description:

package/lib/modules/Summary/utils.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   calculateDeposit: () => calculateDeposit,
+  calculateOriginSubtotal: () => calculateOriginSubtotal,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
   calculateTaxFee: () => calculateTaxFee,
@@ -39,12 +40,15 @@ module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
 var calculatePriceDetails = (shopInfo, items) => {
   const subtotal = new import_decimal.default(calculateSubtotal(items));
+  const subOriginTotal = new import_decimal.default(calculateOriginSubtotal(items));
   const totalTaxFee = new import_decimal.default(calculateTaxFee(shopInfo, items));
   const total = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subtotal : subtotal.plus(totalTaxFee);
+  const originTotal = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subOriginTotal : subOriginTotal.plus(totalTaxFee);
   const deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
     total: total.toFixed(2),
+    originTotal: originTotal.toFixed(2),
     taxTitle: shopInfo == null ? void 0 : shopInfo.tax_title,
     totalTaxFee: totalTaxFee.toFixed(2),
     isPriceIncludeTax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax,
@@ -83,6 +87,16 @@ var calculateSubtotal = (items) => {
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
 };
+var calculateOriginSubtotal = (items) => {
+  if (!(items == null ? void 0 : items.length)) {
+    return "0.00";
+  }
+  const subtotal = items.reduce((sum, item) => {
+    const cartItemTotalPrice = new import_decimal.default(item.summaryOriginTotal || 0);
+    return sum.plus(cartItemTotalPrice);
+  }, new import_decimal.default(0));
+  return subtotal.toFixed(2);
+};
 var calculateTaxFee = (shopInfo, items) => {
   if (!(items == null ? void 0 : items.length)) {
     return "0.00";
@@ -124,6 +138,7 @@ var calculateDeposit = (items) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calculateDeposit,
+  calculateOriginSubtotal,
   calculatePriceDetails,
   calculateSubtotal,
   calculateTaxFee,

package/lib/plugins/window.d.ts

@@ -1,3 +1,4 @@
+import { WalletPassEvaluator } from '../model';
 import { Plugin } from '../types';
 /**
  * WindowPlugin 接口定义
@@ -14,6 +15,7 @@ export interface WindowPlugin extends Plugin {
     document: Partial<Document>;
     history: History;
     interaction?: any;
+    getWalletPassEvaluator?: () => WalletPassEvaluator;
 }
 /**
  * 简单的 Storage 接口实现

package/lib/solution/BookingByStep/index.d.ts

@@ -144,6 +144,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getSummary(): Promise<{
         subtotal: string | number;
         total: string | number;
+        originTotal: string | number;
         taxTitle?: string | undefined;
         totalTaxFee?: string | number | undefined;
         isPriceIncludeTax?: 0 | 1 | undefined;

package/lib/solution/Checkout/index.js

@@ -224,6 +224,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           product_id: item.product_id,
           product_variant_id: item.product_variant_id,
           quantity: item.num,
+          is_price_include_tax: item.is_price_include_tax,
           // 商品是否含税：1；0
           is_charge_tax: item.is_charge_tax ?? 0,
           // 若商品不含税，计算得到的税费，单位（元）
@@ -248,6 +249,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           },
           product_bundle: item.product_bundle.map((bundle) => {
             return {
+              is_price_include_tax: item.is_price_include_tax,
               bundle_id: bundle.bundle_id,
               bundle_product_id: bundle.bundle_product_id,
               bundle_variant_id: bundle.bundle_variant_id,
@@ -1212,10 +1214,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           voucherPaymentItems,
           savedVoucherPaymentItems
         });
-        if ((savedVoucherPaymentItems == null ? void 0 : savedVoucherPaymentItems.length) === 0) {
-          this.updateStateAmountToRemaining(false);
+        if ((savedVoucherPaymentItems == null ? void 0 : savedVoucherPaymentItems.length) === 0)
           return;
-        }
       }
       const allPaymentItemsSynced = paymentItems.every((item) => item.isSynced);
       const remainingAmount = await this.calculateRemainingAmountAsync();

package/lib/solution/RegisterAndLogin/config.js

@@ -796,274 +796,10 @@ var webposConfig = {
     })
   }
 };
-var shopWebposConfig = {
-  sendEmailVerificationCode: {
-    url: "/auth/email/register-code",
-    method: "GET",
-    transformParams: (params) => ({
-      email: params.target
-    })
-  },
-  sendEmailLoginCode: {
-    url: "/auth/send-email-code",
-    method: "POST",
-    transformParams: (params) => ({
-      email: params.target,
-      purpose: params.purpose,
-      type: params.type
-    })
-  },
-  sendSmsRegisterCode: {
-    url: "/auth/mobile/sms-register",
-    method: "POST",
-    transformParams: (params) => ({
-      phone: String(params.phone),
-      country_calling_code: String(params.country_calling_code)
-    })
-  },
-  sendEmailRegisterLink: {
-    url: "/auth/email/link/new-send-register-link",
-    method: "POST",
-    transformParams: (email) => ({
-      email
-    })
-  },
-  verifyEmailRegistrationLink: {
-    url: "/auth/email/link/new-register",
-    method: "POST",
-    transformParams: (params) => ({
-      code: params.code,
-      password: params.password
-    })
-  },
-  emailPasswordLogin: {
-    url: "/tenant/auth/login/email",
-    method: "POST",
-    transformParams: (params) => ({
-      email: params.email,
-      password: params.password,
-      device: "webpos" + (/* @__PURE__ */ new Date()).getTime()
-    }),
-    options: (values) => ({
-      // withCredentials: true,
-      prefix: false,
-      cache: {
-        mode: "remote_local",
-        type: "indexDB",
-        cacheKeyData: values
-      }
-    })
-  },
-  emailCodeRegister: {
-    url: "/auth/email/register",
-    method: "POST",
-    transformParams: (params) => ({
-      email: params.email,
-      code: params.code,
-      password: params.password
-    })
-  },
-  phoneCodeRegister: {
-    url: "/auth/mobile/register",
-    method: "POST",
-    transformParams: (params) => ({
-      phone: String(params.phone),
-      password: params.password,
-      code: params.code,
-      country_calling_code: String(params.country_calling_code)
-    })
-  },
-  resendEmailRegisterLink: {
-    url: "/auth/email/link/resend_register_link",
-    method: "POST",
-    transformParams: (params) => ({
-      code: params.code
-    })
-  },
-  checkEmailLinkCode: {
-    url: "/auth/email/link/new-register-check-code",
-    method: "GET",
-    transformParams: (params) => ({
-      code: params.code
-    })
-  },
-  sendSmsLoginCode: {
-    url: "/auth/send-login-msg",
-    method: "POST",
-    transformParams: (params) => ({
-      phone: String(params.phone),
-      country_calling_code: String(params.country_calling_code)
-    })
-  },
-  phoneCodeLogin: {
-    url: "/auth/mobile-login",
-    method: "POST",
-    transformParams: (params) => ({
-      phone: String(params.phone),
-      country_calling_code: String(params.country_calling_code),
-      code: params.code
-    })
-  },
-  guestLogin: {
-    url: "/auth/guest/login",
-    method: "POST",
-    transformParams: (params) => ({
-      login_channel: params.login_channel,
-      guest_code: params.guest_code
-    })
-  },
-  checkEmailExists: {
-    url: "/auth/email/check-email",
-    method: "GET",
-    transformParams: (params) => ({
-      email: params.email,
-      sales_channel: "online_store"
-    })
-  },
-  checkEmailCode: {
-    url: "/auth/email/check-email-code",
-    method: "GET",
-    transformParams: (params) => ({
-      email: params.email,
-      code: params.code,
-      action: params.action
-    })
-  },
-  checkMobileCode: {
-    url: "/auth/mobile/check-mobile-code",
-    method: "GET",
-    transformParams: (params) => ({
-      phone: String(params.phone),
-      code: params.code,
-      country_calling_code: String(params.country_calling_code),
-      action: params.action
-    })
-  },
-  phonePasswordLogin: {
-    url: "/auth/mobile/login",
-    method: "POST",
-    transformParams: (params) => ({
-      phone: String(params.phone),
-      password: params.password,
-      country_calling_code: String(params.country_calling_code)
-    })
-  },
-  sendPasswordResetEmail: {
-    url: "/auth/email/reset-password-code",
-    method: "GET",
-    transformParams: (params) => ({
-      email: params.email
-    })
-  },
-  sendPasswordResetSms: {
-    url: "/auth/mobile/sms-forget",
-    method: "POST",
-    transformParams: (params) => ({
-      phone: String(params.phone),
-      country_calling_code: String(params.country_calling_code)
-    })
-  },
-  sendResetPasswordLink: {
-    url: "/auth/email/link/send_reset_pwd_link",
-    method: "POST",
-    transformParams: (params) => ({
-      email: params.email
-    })
-  },
-  checkResetPasswordCode: {
-    url: "/auth/email/link/check_code",
-    method: "GET",
-    transformParams: (params) => ({
-      code: params.code
-    })
-  },
-  resetPasswordByCode: {
-    url: "/auth/email/link/reset_pwd_by_code",
-    method: "POST",
-    transformParams: (params) => ({
-      code: params.code,
-      password: params.password
-    })
-  },
-  resetPasswordByEmail: {
-    url: "/auth/email/reset-password",
-    method: "POST",
-    transformParams: (params) => ({
-      email: params.email,
-      password: params.password,
-      code: params.code
-    })
-  },
-  resetPasswordByPhone: {
-    url: "/auth/mobile/reset-password",
-    method: "POST",
-    transformParams: (params) => ({
-      phone: String(params.phone),
-      password: params.password,
-      code: params.code,
-      country_calling_code: String(params.country_calling_code)
-    })
-  },
-  verifyCode: {
-    url: "/auth/verify-code",
-    method: "POST",
-    transformParams: (params) => params
-  },
-  register: {
-    url: "/auth/register",
-    method: "POST",
-    transformParams: (params) => params
-  },
-  login: {
-    url: "/auth/login",
-    method: "POST",
-    transformParams: (params) => params
-  },
-  oauthLogin: {
-    url: "/auth/oauth-login",
-    method: "POST",
-    transformParams: (params) => params
-  },
-  validateToken: {
-    url: "/auth/validate",
-    method: "GET",
-    transformParams: (token) => ({}),
-    options: {
-      headers: (token) => ({
-        Authorization: `Bearer ${token}`
-      })
-    }
-  },
-  logout: {
-    url: "/auth/logout",
-    method: "POST",
-    transformParams: () => ({})
-  },
-  getCountries: {
-    url: "/area/country",
-    method: "GET",
-    transformParams: () => ({})
-  },
-  facebookLogin: {
-    url: "/auth/facebook/login",
-    method: "POST",
-    transformParams: (params) => ({
-      token: params.token
-    })
-  },
-  appleLogin: {
-    url: "/auth/apple/login",
-    method: "POST",
-    transformParams: (params) => ({
-      code: params.code
-    })
-  }
-};
 var channelConfigMap = {
   "online-store": onlineStoreConfig,
   "default": defaultConfig,
-  "webpos": webposConfig,
-  "shop.webpos": shopWebposConfig
+  "webpos": webposConfig
 };
 function getChannelConfig(channel) {
   return channelConfigMap[channel] || channelConfigMap["default"];

package/lib/solution/ShopDiscount/index.d.ts

@@ -21,6 +21,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     getCurrentBookingTime(): string | null;
     private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
+    setOriginTotalAmount(amount: number): void;
     setHolders(holders: {
         form_record_id: number;
     }[]): void;

package/lib/solution/ShopDiscount/index.js

@@ -55,7 +55,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      bookingSubject: void 0
+      bookingSubject: void 0,
+      orderTotalAmount: 0
     };
   }
   // =========== 生命周期方法 ===========
@@ -193,6 +194,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       );
     }
   }
+  setOriginTotalAmount(amount) {
+    this.store.orderTotalAmount = amount;
+  }
   // 设置holders
   setHolders(holders) {
     this.store.holders = holders;
@@ -212,6 +216,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       {
         productList,
         discountList: this.getDiscountList(),
+        orderTotalAmount: this.store.orderTotalAmount || 0,
         holders: this.store.holders || [],
         isFormSubject: ((_a = this.store.bookingSubject) == null ? void 0 : _a.type) === "form"
       },
@@ -304,7 +309,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         oldDiscountList: this.getDiscountList(),
         newDiscountList: withScanList,
         holders: this.store.holders || [],
-        isFormSubject: ((_b = this.store.bookingSubject) == null ? void 0 : _b.type) === "form"
+        isFormSubject: ((_b = this.store.bookingSubject) == null ? void 0 : _b.type) === "form",
+        orderTotalAmount: this.store.orderTotalAmount || 0
       }) || {
         isAvailable: false,
         productList: this.store.productList || [],

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

@@ -31,6 +31,7 @@ export interface ShopDiscountState {
     originalDiscountList: Discount[];
     currentBookingTime: string | null;
     filteredDiscountList: Discount[];
+    orderTotalAmount?: number;
     bookingSubject?: {
         type?: 'form' | 'customer';
         [key: string]: any;

package/package.json

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