@pisell/pisellos 3.0.76 → 3.0.77

package/lib/modules/Payment/types.js

@@ -19,90 +19,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Payment/types.ts
 var types_exports = {};
 __export(types_exports, {
-  PaymentHooks: () => PaymentHooks,
-  PaymentMethodType: () => PaymentMethodType,
-  PaymentStatus: () => PaymentStatus,
-  RoundingInterval: () => RoundingInterval,
-  RoundingRule: () => RoundingRule,
-  TaskRunStatus: () => TaskRunStatus,
-  WalletPassHooks: () => WalletPassHooks
+  PaymentHooks: () => PaymentHooks
 });
 module.exports = __toCommonJS(types_exports);
-var PaymentMethodType = /* @__PURE__ */ ((PaymentMethodType2) => {
-  PaymentMethodType2["Cash"] = "CASHMANUAL";
-  PaymentMethodType2["Eftpos"] = "EFTPOS";
-  PaymentMethodType2["Wallet"] = "WALLET";
-  return PaymentMethodType2;
-})(PaymentMethodType || {});
-var PaymentStatus = /* @__PURE__ */ ((PaymentStatus2) => {
-  PaymentStatus2["Processing"] = "payment_processing";
-  PaymentStatus2["Sync"] = "sync";
-  PaymentStatus2["PartiallyPaid"] = "partially_paid";
-  PaymentStatus2["Finished"] = "finish";
-  return PaymentStatus2;
-})(PaymentStatus || {});
-var TaskRunStatus = /* @__PURE__ */ ((TaskRunStatus2) => {
-  TaskRunStatus2["Pending"] = "pending";
-  TaskRunStatus2["Running"] = "running";
-  TaskRunStatus2["Success"] = "success";
-  TaskRunStatus2["Failed"] = "failed";
-  return TaskRunStatus2;
-})(TaskRunStatus || {});
-var RoundingRule = /* @__PURE__ */ ((RoundingRule2) => {
-  RoundingRule2["Standard"] = "standard_rounding";
-  RoundingRule2["StandardDown"] = "standard_down";
-  RoundingRule2["AlwaysUp"] = "always_up";
-  RoundingRule2["AlwaysDown"] = "always_down";
-  return RoundingRule2;
-})(RoundingRule || {});
-var RoundingInterval = /* @__PURE__ */ ((RoundingInterval2) => {
-  RoundingInterval2[RoundingInterval2["Interval005"] = 0.05] = "Interval005";
-  RoundingInterval2[RoundingInterval2["Interval01"] = 0.1] = "Interval01";
-  RoundingInterval2[RoundingInterval2["Interval05"] = 0.5] = "Interval05";
-  RoundingInterval2[RoundingInterval2["Interval1"] = 1] = "Interval1";
-  return RoundingInterval2;
-})(RoundingInterval || {});
-var WalletPassHooks = /* @__PURE__ */ ((WalletPassHooks2) => {
-  WalletPassHooks2["OnWalletRecommendListUpdated"] = "wallet:onWalletRecommendListUpdated";
-  WalletPassHooks2["OnWalletRecommendListCleared"] = "wallet:onWalletRecommendListCleared";
-  WalletPassHooks2["OnUserIdentificationCodesUpdated"] = "wallet:onUserIdentificationCodesUpdated";
-  WalletPassHooks2["OnUserIdentificationCodesCleared"] = "wallet:onUserIdentificationCodesCleared";
-  WalletPassHooks2["OnWalletCacheCleared"] = "wallet:onWalletCacheCleared";
-  WalletPassHooks2["OnSearchIdentificationCodeCompleted"] = "wallet:onSearchIdentificationCodeCompleted";
-  WalletPassHooks2["OnWalletInitializationStarted"] = "wallet:onWalletInitializationStarted";
-  WalletPassHooks2["OnWalletInitializationCompleted"] = "wallet:onWalletInitializationCompleted";
-  WalletPassHooks2["OnWalletInitializationFailed"] = "wallet:onWalletInitializationFailed";
-  return WalletPassHooks2;
-})(WalletPassHooks || {});
 var PaymentHooks = /* @__PURE__ */ ((PaymentHooks2) => {
-  PaymentHooks2["OnPaymentMethodsLoaded"] = "payment:onPaymentMethodsLoaded";
-  PaymentHooks2["OnPaymentMethodsChanged"] = "payment:onPaymentMethodsChanged";
-  PaymentHooks2["OnOrderChanged"] = "payment:onOrderChanged";
-  PaymentHooks2["OnOrderAdded"] = "payment:onOrderAdded";
-  PaymentHooks2["OnOrderUpdated"] = "payment:onOrderUpdated";
-  PaymentHooks2["OnOrderDeleted"] = "payment:onOrderDeleted";
-  PaymentHooks2["OnPaymentAdded"] = "payment:onPaymentAdded";
-  PaymentHooks2["OnPaymentUpdated"] = "payment:onPaymentUpdated";
-  PaymentHooks2["OnPaymentDeleted"] = "payment:onPaymentDeleted";
-  PaymentHooks2["OnPaymentSubmitted"] = "payment:onPaymentSubmitted";
-  PaymentHooks2["OnOrderAmountChanged"] = "payment:onOrderAmountChanged";
-  PaymentHooks2["OnPaymentSyncError"] = "payment:onPaymentSyncError";
-  PaymentHooks2["OnPaymentSyncSuccess"] = "payment:onPaymentSyncSuccess";
-  PaymentHooks2["OnWalletRecommendListUpdated"] = "wallet:onWalletRecommendListUpdated" /* OnWalletRecommendListUpdated */;
-  PaymentHooks2["OnWalletRecommendListCleared"] = "wallet:onWalletRecommendListCleared" /* OnWalletRecommendListCleared */;
-  PaymentHooks2["OnUserIdentificationCodesUpdated"] = "wallet:onUserIdentificationCodesUpdated" /* OnUserIdentificationCodesUpdated */;
-  PaymentHooks2["OnUserIdentificationCodesCleared"] = "wallet:onUserIdentificationCodesCleared" /* OnUserIdentificationCodesCleared */;
-  PaymentHooks2["OnWalletCacheCleared"] = "wallet:onWalletCacheCleared" /* OnWalletCacheCleared */;
-  PaymentHooks2["OnSearchIdentificationCodeCompleted"] = "wallet:onSearchIdentificationCodeCompleted" /* OnSearchIdentificationCodeCompleted */;
+  PaymentHooks2["OnPaymentInit"] = "payment:onPaymentInit";
+  PaymentHooks2["OnPaymentSuccess"] = "payment:onPaymentSuccess";
+  PaymentHooks2["OnPaymentFailure"] = "payment:onPaymentFailure";
+  PaymentHooks2["OnPaymentRefund"] = "payment:onPaymentRefund";
   return PaymentHooks2;
 })(PaymentHooks || {});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  PaymentHooks,
-  PaymentMethodType,
-  PaymentStatus,
-  RoundingInterval,
-  RoundingRule,
-  TaskRunStatus,
-  WalletPassHooks
+  PaymentHooks
 });

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

@@ -11,17 +11,12 @@ export declare class ProductList extends BaseModule implements Module {
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, }: {
+    loadProducts({ category_ids, product_ids, collection, schedule_date, cacheId }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
         schedule_date?: string;
         cacheId?: string;
-        customer_id?: number;
-        menu_list_ids?: number[];
-        schedule_datetime?: string;
-        with_count?: string[];
-        with_schedule?: number;
     }): Promise<any>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];
@@ -33,10 +28,4 @@ export declare class ProductList extends BaseModule implements Module {
     getProduct(id: number): Promise<ProductData | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;
-    /**
-     * 根据商品编码或条码搜索商品
-     * @param code 商品编码或条码
-     * @returns 匹配的商品列表，如果没有匹配则返回空数组
-     */
-    findProductsByCodeOrBarcode(code: string): ProductData[];
 }

package/lib/modules/ProductList/index.js

@@ -24,6 +24,7 @@ __export(ProductList_exports, {
 });
 module.exports = __toCommonJS(ProductList_exports);
 var import_BaseModule = require("../BaseModule");
+var import_types = require("./types");
 var import_lodash_es = require("lodash-es");
 __reExport(ProductList_exports, require("./types"), module.exports);
 var ProductList = class extends import_BaseModule.BaseModule {
@@ -53,19 +54,14 @@ var ProductList = class extends import_BaseModule.BaseModule {
     category_ids = [],
     product_ids = [],
     collection = [],
-    menu_list_ids = [],
-    customer_id: paramsCustomerId,
-    with_count = [],
-    schedule_datetime,
     schedule_date,
-    cacheId,
-    with_schedule
+    cacheId
   }) {
     var _a, _b;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
     try {
-      customer_id = paramsCustomerId || ((_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id);
+      customer_id = (_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id;
     } catch (error) {
       console.error(error);
     }
@@ -91,18 +87,21 @@ var ProductList = class extends import_BaseModule.BaseModule {
         ids: product_ids,
         collection,
         front_end_cache_id: cacheId,
-        menu_list_ids,
-        with_count,
         // client_schedule_ids: schedule_ids,
         schedule_date,
         application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
-        with_schedule,
-        schedule_datetime,
         is_eject: 1
       },
       { useCache: true }
     );
     const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    if (sortedList.length) {
+      sortedList.forEach((n) => {
+        if (n.is_eject !== 1 && n["schedule.ids"] && n["schedule.ids"].length) {
+          n.is_eject = 1;
+        }
+      });
+    }
     this.addProduct(sortedList);
     return sortedList;
   }
@@ -126,14 +125,14 @@ var ProductList = class extends import_BaseModule.BaseModule {
   }
   async getProducts() {
     await this.core.effects.emit(
-      `${this.name}:onGetProducts`,
+      import_types.ProductListHooks.onGetProducts,
       this.store.list
     );
     return (0, import_lodash_es.cloneDeep)(this.store.list);
   }
   async getProduct(id) {
     await this.core.effects.emit(
-      `${this.name}:onGetProduct`,
+      import_types.ProductListHooks.onGetProduct,
       this.store.list
     );
     const product = this.store.list.find((product2) => product2.id === id);
@@ -157,24 +156,6 @@ var ProductList = class extends import_BaseModule.BaseModule {
   async selectProducts(products) {
     this.store.selectProducts = products;
   }
-  /**
-   * 根据商品编码或条码搜索商品
-   * @param code 商品编码或条码
-   * @returns 匹配的商品列表，如果没有匹配则返回空数组
-   */
-  findProductsByCodeOrBarcode(code) {
-    if (!code || typeof code !== "string") {
-      return [];
-    }
-    const trimmedCode = code.trim();
-    if (!trimmedCode) {
-      return [];
-    }
-    const matchingProducts = this.store.list.filter((product) => {
-      return product.code && product.code.trim() === trimmedCode || product.barcode && product.barcode.trim() === trimmedCode;
-    });
-    return (0, import_lodash_es.cloneDeep)(matchingProducts);
-  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Resource/index.js

@@ -42,7 +42,7 @@ var ResourceListModule = class extends import_BaseModule.BaseModule {
     if (!resource)
       return;
     this.store.selectedResource = resource;
-    await this.core.effects.emit(`${this.name}:onResourceSelect`, resource);
+    await this.core.effects.emit(import_types.ResourceHooks.OnResourceSelect, resource);
   }
   getSelectedResource() {
     return this.store.selectedResource;

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

@@ -2,7 +2,6 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { Rules, RulesModuleAPI, DiscountResult } from './types';
 import { Discount } from "../Discount/types";
-import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -36,7 +35,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     }, options?: {
         isSelected?: boolean;
         discountId?: number;
-        selectedList?: SetDiscountSelectedParams[];
+        selectedList?: any[];
         scan?: boolean;
     }): DiscountResult;
     /**

package/lib/modules/Rules/index.js

@@ -33,6 +33,7 @@ __export(Rules_exports, {
 });
 module.exports = __toCommonJS(Rules_exports);
 var import_BaseModule = require("../BaseModule");
+var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
@@ -52,7 +53,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   }
   async setRulesList(rulesList) {
     this.store.rulesList = rulesList;
-    await this.core.effects.emit(`${this.name}:onRulesListChange`, rulesList);
+    await this.core.effects.emit(import_types.RulesHooks.OnRulesListChange, rulesList);
   }
   getRulesList() {
     return this.store.rulesList;
@@ -495,7 +496,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           ].includes(discount2.tag || discount2.type)
         ))) : !((flatItem == null ? void 0 : flatItem.booking_id) && !!((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.discount_list) == null ? void 0 : _d.length) && ((_f = (_e = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _e.discount_list) == null ? void 0 : _f.every((discount2) => discount2.id)));
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
-        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
+        if (isAvailableProduct && isLimitedProduct && isBundleAvailable && timeLimit) {
           (_g = discountApplicability.get(discount.id)) == null ? void 0 : _g.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
@@ -562,7 +563,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         var _a2, _b2;
         if ((Number(product.price) <= 0 || !product.price) && !((_a2 = product.discount_list) == null ? void 0 : _a2.length) && (discount.tag || discount.type) === "good_pass")
           return false;
-        if ((Number(product.price) <= 0 || !product.price) && !((_b2 = product.discount_list) == null ? void 0 : _b2.find((n) => {
+        if ((Number(product.price) === 0 || !product.price) && !((_b2 = product.discount_list) == null ? void 0 : _b2.find((n) => {
           var _a3;
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) !== "good_pass")
@@ -664,7 +665,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           }
         }
       }
-      if (applicableDiscounts.length === 0 || isManualDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+      if (applicableDiscounts.length === 0 || isManualDiscount) {
         if (flatItem.type === "main") {
           if (product.isClient) {
             processedProductsMap.set(
@@ -696,10 +697,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             processedProductsMap.set(
               product._id,
               [this.hooks.setProduct(originProduct, {
-                ...isManualDiscount ? {
-                  price: product.price,
-                  main_product_selling_price: product.price
-                } : {
+                ...isManualDiscount ? {} : {
                   _id: product._id.split("___")[0] + "___" + index,
                   total: product.origin_total || product.total,
                   price: product.price,
@@ -713,7 +711,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
             discount_list: [],
-            price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
+            price: flatItem.bundleItem.original_price,
             processed: true
           }]);
         }
@@ -1089,16 +1087,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               const allDiscountAmount = (0, import_utils.getDiscountListAmountTotal)(mainDiscountList);
               newTotalWithDiscount = new import_decimal.default(mainProductData.price || 0).minus(allDiscountAmount).toNumber() ?? newTotalWithDiscount;
               newOriginTotalWithDiscount = mainProductData.origin_total ?? newOriginTotalWithDiscount;
-            }
-            if (newBundleWithDiscount.length > 0) {
-              newBundleWithDiscount.forEach((item) => {
-                newTotalWithDiscount += Number(item.price) * Number(item.num);
-              });
-              newBundleWithDiscount.forEach((item) => {
-                var _a, _b, _c;
-                const originalPrice = ((_c = (_b = (_a = item.discount_list) == null ? void 0 : _a[0]) == null ? void 0 : _b.discount) == null ? void 0 : _c.original_amount) || item.price;
-                newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
-              });
+              if (newBundleWithDiscount.length > 0) {
+                newBundleWithDiscount.forEach((item) => {
+                  var _a, _b, _c;
+                  newTotalWithDiscount += Number(item.price) * Number(item.num);
+                  const originalPrice = ((_c = (_b = (_a = item.discount_list) == null ? void 0 : _a[0]) == null ? void 0 : _b.discount) == null ? void 0 : _c.original_amount) || item.price;
+                  newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
+                });
+              }
             }
             if (product == null ? void 0 : product.options) {
               newTotalWithDiscount = product.options.reduce((accumulator, currentValue) => {
@@ -1151,12 +1147,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 const allDiscountAmount = (0, import_utils.getDiscountListAmount)(mainDiscountListOriginal);
                 newTotalOriginal = new import_decimal.default(mainProductData.price || 0).minus(allDiscountAmount).toNumber() ?? newTotalOriginal;
                 newOriginTotalOriginal = mainProductData.origin_total ?? newOriginTotalOriginal;
-              }
-              if (newBundleOriginal.length > 0) {
-                newBundleOriginal.forEach((item) => {
-                  newTotalOriginal += Number(item.price) * Number(item.num);
-                  newOriginTotalOriginal += Number(item.price) * Number(item.num);
-                });
+                if (newBundleOriginal.length > 0) {
+                  newBundleOriginal.forEach((item) => {
+                    newTotalOriginal += Number(item.price) * Number(item.num);
+                    newOriginTotalOriginal += Number(item.price) * Number(item.num);
+                  });
+                }
               }
               if (product == null ? void 0 : product.options) {
                 newTotalOriginal = product.options.reduce((accumulator, currentValue) => {
@@ -1231,11 +1227,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   newOriginTotal = mainProductData.origin_total ?? newOriginTotal;
                 }
                 if (newBundle.length > 0) {
-                  newBundle.forEach((item) => {
-                    newTotal += Number(item.price) * Number(item.num);
-                  });
                   newBundle.forEach((item) => {
                     var _a2, _b2, _c2;
+                    newTotal += Number(item.price) * Number(item.num);
                     const originalPrice = ((_c2 = (_b2 = (_a2 = item.discount_list) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.discount) == null ? void 0 : _c2.original_amount) || item.price;
                     newOriginTotal += Number(originalPrice) * Number(item.num);
                   });
@@ -1376,18 +1370,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (isBundleItem) {
         const priceType = (_c = flatItem.bundleItem) == null ? void 0 : _c.price_type;
         const priceTypeExt = (_d = flatItem.bundleItem) == null ? void 0 : _d.price_type_ext;
-        const isOriginalPrice = priceType === "markup" && priceTypeExt === "product_price";
-        const isMarkupPrice = priceType === "markup" && (priceTypeExt === "" || !priceTypeExt);
-        if (rules.length > 0) {
-          if (isOriginalPrice && rules.includes("original_price")) {
-            return true;
-          }
-          if (isMarkupPrice && rules.includes("markup_price")) {
-            return true;
-          }
-          return false;
-        }
-        return isOriginalPrice;
+        return priceType === "markup" && priceTypeExt === "product_price";
       }
       return false;
     }
@@ -1398,7 +1381,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   }
   async destroy() {
     this.core.effects.offByModuleDestroy(this.name);
-    await this.core.effects.emit(`${this.name}:onDestroy`, {});
+    await this.core.effects.emit(import_types.RulesHooks.OnDestroy, {});
     console.log("[Rules] 已销毁");
   }
   async clear() {

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

@@ -44,7 +44,6 @@ type ProductDetail = {
     num?: number;
     quantity: number;
     holder_id?: number | string;
-    vouchersApplicable?: boolean;
     startDate?: any;
 };
 export interface RulesParamsHooks {

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

@@ -25,13 +25,4 @@ 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
-     */
-    static isInScheduleByDate({ date, schedule, }: {
-        date: string;
-        schedule: any;
-    }): boolean | undefined;
 }

package/lib/modules/Schedule/index.js

@@ -38,7 +38,6 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
 var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
 var import_utils = require("../Date/utils");
-var import_utils2 = require("./utils");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 import_dayjs.default.extend(import_isSameOrAfter.default);
 var ScheduleModule = class extends import_BaseModule.BaseModule {
@@ -159,65 +158,6 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
       });
     }
   }
-  /**
-   * 传入一个时间, 判断改时间是否在schedule 内
-   * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
-   * @returns
-   */
-  static isInScheduleByDate({
-    date,
-    schedule
-  }) {
-    var _a, _b, _c, _d;
-    if (schedule.start_time && schedule.end_time) {
-      const isBeforeStartTime = (0, import_dayjs.default)(date).isBefore(
-        (0, import_dayjs.default)(schedule.start_time)
-      );
-      const isAfterEndTime = (0, import_dayjs.default)(date).isAfter((0, import_dayjs.default)(schedule.end_time));
-      if (isBeforeStartTime || isAfterEndTime) {
-        return false;
-      }
-    }
-    let _schedule = {
-      ...schedule,
-      // 开始时间向前推一天
-      start_time: (0, import_dayjs.default)(date).subtract(1, "day").format("YYYY-MM-DD HH:mm:ss"),
-      end_time: (0, import_dayjs.default)(date).add(1, "day").format("YYYY-MM-DD HH:mm:ss")
-    };
-    if (((_b = (_a = _schedule.repeat_rule) == null ? void 0 : _a.end) == null ? void 0 : _b.type) === "never") {
-      _schedule = {
-        ..._schedule,
-        repeat_rule: {
-          ..._schedule.repeat_rule,
-          end: {
-            type: "date",
-            end_date: _schedule.end_time,
-            occurrence: null
-          }
-        }
-      };
-    }
-    if (((_d = (_c = _schedule.repeat_rule) == null ? void 0 : _c.end) == null ? void 0 : _d.type) === "date") {
-      _schedule = {
-        ..._schedule,
-        repeat_rule: {
-          ..._schedule.repeat_rule,
-          end: {
-            ..._schedule.repeat_rule.end,
-            end_date: _schedule.end_time
-          }
-        }
-      };
-    }
-    const dateRanges = (0, import_utils2.calcScheduleDateRange)({ ..._schedule });
-    for (const range of dateRanges) {
-      const startTime = (0, import_dayjs.default)(range.start);
-      const endTime = (0, import_dayjs.default)(range.end);
-      if ((0, import_dayjs.default)(date).isSameOrAfter(startTime) && (0, import_dayjs.default)(date).isSameOrBefore(endTime)) {
-        return true;
-      }
-    }
-  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/index.d.ts

@@ -3,7 +3,6 @@ export * from './ProductList';
 export * from './Cart';
 export * from './Account';
 export * from './AccountList';
-export * from './Customer';
 export * from './Date';
 export * from './Guests';
 export * from './Order';

package/lib/modules/index.js

@@ -21,7 +21,6 @@ __reExport(modules_exports, require("./ProductList"), module.exports);
 __reExport(modules_exports, require("./Cart"), module.exports);
 __reExport(modules_exports, require("./Account"), module.exports);
 __reExport(modules_exports, require("./AccountList"), module.exports);
-__reExport(modules_exports, require("./Customer"), module.exports);
 __reExport(modules_exports, require("./Date"), module.exports);
 __reExport(modules_exports, require("./Guests"), module.exports);
 __reExport(modules_exports, require("./Order"), module.exports);
@@ -37,7 +36,6 @@ __reExport(modules_exports, require("./Schedule"), module.exports);
   ...require("./Cart"),
   ...require("./Account"),
   ...require("./AccountList"),
-  ...require("./Customer"),
   ...require("./Date"),
   ...require("./Guests"),
   ...require("./Order"),

package/lib/plugins/window.d.ts

@@ -13,7 +13,6 @@ export interface WindowPlugin extends Plugin {
     navigator: Partial<Navigator>;
     document: Partial<Document>;
     history: History;
-    interaction?: any;
 }
 /**
  * 简单的 Storage 接口实现

package/lib/solution/BookingByStep/index.js

@@ -95,7 +95,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       "step",
       "products",
       "date",
-      "order"
+      "order",
+      "payment"
     ];
     moduleArr.forEach((step) => {
       var _a2, _b2;
@@ -116,7 +117,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.store.schedule.loadAllSchedule();
-    this.core.effects.emit(`${this.name}:onInited`, {});
+    this.core.effects.emit(import_types.BookingByStepHooks.onInited, {});
   }
   // 初始化step
   initStep(stepList) {
@@ -185,19 +186,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     collection = [],
     schedule_date
   }) {
-    const res = await this.store.products.loadProducts({
+    return this.store.products.loadProducts({
       category_ids,
       product_ids,
       collection,
       schedule_date,
       cacheId: this.cacheId
     });
-    this.getAvailableDate({
-      startDate: schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD"),
-      endDate: schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD"),
-      products: [...res]
-    });
-    return res;
   }
   /**
    * 通过 schedule 来读取商品，适用于 session 类商品
@@ -234,12 +229,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const allProductIds = [...newProductIds, ...otherProductsIds].filter(
       (n, index, self) => self.indexOf(n) === index
     );
-    const res = await this.loadProducts({
+    return await this.loadProducts({
       product_ids: allProductIds,
       category_ids,
       schedule_date: date
     });
-    return res;
   }
   /**
    * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
@@ -606,12 +600,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       quantity = 1
     } = product || {};
     const productData = { ...origin, product_variant_id };
-    debugger;
-    if ((0, import_products.isSessionProduct)(productData)) {
-      if (!date || !date.startTime || !date.endTime) {
-        return { success: false, errorCode: "date_or_time_required" };
-      }
-    }
     const currentCartItems = this.store.cart.getItems();
     const stockCheckResult = (0, import_stock.checkProductStock)({
       productData,
@@ -1741,7 +1729,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         let currentResourcesSummaryCount = 0;
         const currentResourcesTimeSlotCanUsedArr = [];
         const mTimes = m.times.filter((n) => {
-          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || m.onlyComputed && (0, import_dayjs.default)(n.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
+          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
         });
         if (mTimes.length === 0) {
           return;

package/lib/solution/BookingByStep/utils/capacity.js

@@ -230,7 +230,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       let totalAvailableCapacity = 0;
       resourcesInType.forEach((resource) => {
         const availableTimes = resource.times.filter((time) => {
-          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || resource.onlyComputed && (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
+          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
         });
         if (availableTimes.length > 0) {
           totalAvailableCapacity += resource.capacity || 0;

package/lib/solution/BookingByStep/utils/products.d.ts

@@ -9,9 +9,3 @@ export declare const getAvailableProductResources: (products: ProductData[]) =>
     rules: any[];
     resourcesMap: Record<number, ProductResourceItem>;
 };
-/**
- * 判断商品是否是 session 商品
- * @param product 商品数据
- * @returns 是否是 session 商品
- */
-export declare const isSessionProduct: (product: ProductData) => boolean;

package/lib/solution/BookingByStep/utils/products.js

@@ -19,8 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/BookingByStep/utils/products.ts
 var products_exports = {};
 __export(products_exports, {
-  getAvailableProductResources: () => getAvailableProductResources,
-  isSessionProduct: () => isSessionProduct
+  getAvailableProductResources: () => getAvailableProductResources
 });
 module.exports = __toCommonJS(products_exports);
 var getAvailableProductResources = (products) => {
@@ -58,12 +57,7 @@ var getAvailableProductResources = (products) => {
   });
   return { resourceIds: [...new Set(resourceIds)], rules, resourcesMap };
 };
-var isSessionProduct = (product) => {
-  var _a;
-  return (((_a = product == null ? void 0 : product["schedule.ids"]) == null ? void 0 : _a.length) ?? 0) > 0;
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getAvailableProductResources,
-  isSessionProduct
+  getAvailableProductResources
 });