@pisell/pisellos 3.0.57 → 3.0.58

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

@@ -1,399 +1,47 @@
-/**
- * 支付相关类型定义
- */
-/**
- * 支付方式枚举
- */
-export declare enum PaymentMethodType {
-    Cash = "CASHMANUAL",
-    Eftpos = "EFTPOS",
-    Wallet = "WALLET"
-}
-/**
- * 支付状态枚举
- */
-export declare enum PaymentStatus {
-    /** 支付处理中 - 订单正在进行支付操作 */
-    Processing = "payment_processing",
-    /** 同步中 - 暂时不使用，为了向后兼容保留 */
-    Sync = "sync",
-    /** 部分支付 - 支付金额不足订单总金额 */
-    PartiallyPaid = "partially_paid",
-    /** 已完成 - 本地支付完成，后台自动同步到服务器 */
-    Finished = "finish"
-}
-/**
- * 任务状态枚举
- */
-export declare enum TaskRunStatus {
-    Pending = "pending",
-    Running = "running",
-    Success = "success",
-    Failed = "failed"
-}
-/**
- * 支付方式信息
- */
-export interface PaymentMethod {
-    /** 支付方式ID */
-    id: number;
-    /** 支付方式代码 */
-    code: string;
-    /** 支付方式名称 */
-    name: string;
-    /** 支付方式类型 */
-    type: string;
-    /** 是否启用 */
-    enabled: boolean;
-    /** 其他配置信息 */
-    [key: string]: any;
+export declare enum PaymentHooks {
+    OnPaymentInit = "payment:onPaymentInit",
+    OnPaymentSuccess = "payment:onPaymentSuccess",
+    OnPaymentFailure = "payment:onPaymentFailure",
+    OnPaymentRefund = "payment:onPaymentRefund"
 }
 /**
- * 支付项
+ * 支付方式
  */
-export interface PaymentItem {
-    /** 当前支付项的唯一 ID */
-    uuid: string;
-    /** 当前支付方式付出去多少钱 */
-    amount: string;
-    /** 支付类型，跟支付列表上对应的支付方式保持一致 */
-    code: string;
-    /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    id: number;
-    /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
-    name: string;
-    /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
-    type: string;
-    /** 代金券、充值卡、积分卡等wallet pass id */
-    voucher_id?: string;
-    /** 拓展参数字段 */
-    metadata?: {
-        /** 钱箱 ID */
-        shop_wallet_pass_id?: string;
-        /** 唯一支付号 */
-        unique_payment_number?: string;
-        /** rouding规则 */
-        rounding_rule?: any;
-    };
-    /** rouding金额 */
-    rounding_amount?: string;
-    /** 三方支付手续费 */
-    service_charge?: {
-        percentage: string;
-        amount: string;
-    };
-    /** 该支付项是否已经同步给后端服务器（只有网络请求成功后才为true） */
-    isSynced?: boolean;
-    /** 同步错误信息（业务错误时记录错误信息，用于区分"未同步"和"同步失败"） */
-    syncError?: {
-        error: string;
-        errorCode?: string;
-        statusCode?: number;
-        timestamp: number;
-    };
-}
+export type PaymentMethod = 'credit_card' | 'debit_card' | 'paypal' | 'alipay' | 'wechat_pay' | 'bank_transfer';
 /**
- * 订单信息
+ * 支付状态
  */
-export interface OrderInfo {
-    /** 订单 id */
-    order_id: number;
-    /** 订单总金额 */
-    total_amount: string;
-    /** 是否是定金订单 */
-    is_deposit: number;
-    /** 定金金额 */
-    deposit_amount: string;
-}
+export type PaymentStatus = 'pending' | 'processing' | 'completed' | 'failed' | 'refunded';
 /**
- * 支付订单（简化版，仅保留支付相关信息）
+ * 支付信息
  */
-export interface PaymentOrder {
-    /** 当前订单的唯一 ID */
-    uuid: string;
-    /** 订单ID（字符串类型，支持本地虚拟ID） */
+export interface Payment {
     id: string;
-    /** 订单ID（数字类型，兼容旧版本） */
-    order_id: string;
-    /** 支付项列表 */
-    payment: PaymentItem[];
-    /** 修改的支付项列表 */
-    adjust_offline_payments: PaymentItem[];
-    /** 总计金额 */
-    total_amount: string;
-    /** 待付金额 */
-    expect_amount: string;
-    /** 支付状态 */
-    payment_status: PaymentStatus;
-    /** 是否是定金订单 */
-    is_deposit: number;
-    /** 定金金额 */
-    deposit_amount: string;
-    /** 总税费 */
-    tax_fee: string;
-    /** 原始订单数据（由 Checkout 模块传入） */
-    order_info?: any;
+    orderId: string;
+    amount: number;
+    currency: string;
+    method: PaymentMethod;
+    status: PaymentStatus;
+    transactionId?: string;
+    createdAt: Date;
+    updatedAt: Date;
+    metadata?: Record<string, any>;
 }
 /**
- * 支付状态
+ * 支付模块状态
  */
 export interface PaymentState {
+    currentPayment: Payment | null;
+    paymentHistory: Payment[];
 }
 /**
- * 推送订单参数（简化版）
- */
-export interface PushOrderParams {
-    /** 订单ID */
-    order_id: string;
-    /** 总金额 */
-    total_amount: string;
-    /** 是否是定金订单 */
-    is_deposit?: number;
-    /** 定金金额 */
-    deposit_amount?: string;
-    /** 原始订单数据（可选，由 Checkout 模块传入） */
-    order_info?: any;
-}
-/**
- * 更新订单参数
- */
-export interface UpdateOrderParams {
-    /** 订单UUID */
-    uuid: string;
-    /** 更新的字段 */
-    [key: string]: any;
-}
-/**
- * 支付项输入类型（允许 amount 为数字）
- */
-export interface PaymentItemInput {
-    /** 当前支付方式付出去多少钱 */
-    amount: string | number;
-    /** 支付类型，跟支付列表上对应的支付方式保持一致 */
-    code: string;
-    /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    id: number;
-    /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
-    name: string;
-    /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
-    type: string;
-    /** 代金券、充值卡、积分卡等wallet pass id */
-    voucher_id?: string;
-}
-/**
- * 推送支付项参数
- */
-export interface PushPaymentParams {
-    /** 订单UUID */
-    orderUuid: string;
-    /** 支付项信息 */
-    paymentItem: PaymentItemInput;
-}
-/**
- * 更新支付项参数中的字段类型（允许 amount 为数字）
- */
-export interface PaymentUpdateFields {
-    /** 当前支付项的唯一 ID */
-    uuid?: string;
-    /** 当前支付方式付出去多少钱 */
-    amount?: string | number;
-    /** 支付类型，跟支付列表上对应的支付方式保持一致 */
-    code?: string;
-    /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    id?: number;
-    /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
-    name?: string;
-    /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
-    type?: string;
-    /** 代金券、充值卡、积分卡等wallet pass id */
-    voucher_id?: string;
-    /** 该支付项是否已经同步给后端服务器（只有网络请求成功后才为true） */
-    isSynced?: boolean;
-    /** 同步错误信息（业务错误时记录错误信息，用于区分"未同步"和"同步失败"） */
-    syncError?: {
-        error: string;
-        errorCode?: string;
-        statusCode?: number;
-        timestamp: number;
-    };
-}
-/**
- * 更新支付项参数
- */
-export interface UpdatePaymentParams {
-    /** 订单UUID */
-    orderUuid: string;
-    /** 支付项UUID */
-    paymentUuid: string;
-    /** 更新的字段 */
-    params: PaymentUpdateFields;
-}
-/**
- * 删除支付项参数
- */
-export interface DeletePaymentParams {
-    /** 订单UUID */
-    orderUuid: string;
-    /** 支付项UUID */
-    paymentUuid: string;
-}
-/**
- * 现金支付接口
- */
-export interface CashPayment {
-    /** 处理现金支付 */
-    processCashPayment: (amount: number, orderUuid: string) => Promise<void>;
-    /** 获取现金余额 */
-    getCashBalance: () => Promise<number>;
-}
-/**
- * Eftpos支付接口
- */
-export interface EftposPayment {
-    /** 处理Eftpos支付 */
-    processEftposPayment: (amount: number, orderUuid: string) => Promise<void>;
-    /** 检查Eftpos设备状态 */
-    checkDeviceStatus: () => Promise<boolean>;
-}
-/**
- * 钱包支付接口
- */
-export interface WalletPayment {
-    /** 处理钱包支付 */
-    processWalletPayment: (amount: number, orderUuid: string, voucherId?: string) => Promise<void>;
-    /** 获取钱包余额 */
-    getWalletBalance: (voucherId: string) => Promise<number>;
-}
-/**
- * 支付模块API接口
+ * 支付模块 API
  */
 export interface PaymentModuleAPI {
-    /** 现金支付相关方法 */
-    cash: CashPayment;
-    /** Eftpos支付相关方法 */
-    eftpos: EftposPayment;
-    /** 钱包支付相关方法 */
-    wallet: WalletPayment;
-    /** 获取支付方式列表 */
-    getPayMethodListAsync: () => Promise<PaymentMethod[]>;
-    /** 创建支付订单（仅保存支付相关信息） */
-    createPaymentOrderAsync: (params: PushOrderParams) => Promise<PaymentOrder>;
-    /** 根据订单UUID获取支付订单 */
-    getPaymentOrderByUuidAsync: (orderUuid: string) => Promise<PaymentOrder | null>;
-    /** 基于UUID替换订单ID */
-    replaceOrderIdByUuidAsync: (orderUuid: string, newOrderId: string) => Promise<PaymentOrder | null>;
-    /** 删除支付订单 */
-    deletePaymentOrderAsync: (orderUuid: string) => Promise<void>;
-    /** 获取支付项 */
-    getPaymentItemsAsync: (orderUuid: string) => Promise<PaymentItem[]>;
-    /** 为某个订单添加支付项 */
-    addPaymentItemAsync: (orderUuid: string, paymentItem: PaymentItemInput) => Promise<void>;
-    /** 删除支付项 */
-    deletePaymentItemAsync: (orderUuid: string, paymentUuid: string) => Promise<void>;
-    /** 更新支付项 */
-    updatePaymentItemAsync: (orderUuid: string, paymentUuid: string, params: PaymentUpdateFields) => Promise<void>;
-    /** 获取订单剩余待付金额 */
-    getRemainingAmountAsync: (orderUuid: string) => Promise<number>;
-    /** 获取订单剩余待付金额（基于用户输入的金额） */
-    getRemainingAmountWithInputAsync: (inputAmount: string | number, orderUuid: string) => Promise<number>;
-    /** 提交支付 */
-    submitPaymentAsync: (orderUuid: string) => Promise<{
-        status: 'success' | 'failed';
-    }>;
-    /** 获取部分支付的订单 */
-    getPartiallyPaidOrdersAsync: () => Promise<PaymentOrder[]>;
-    /** 获取未同步到服务器的订单 */
-    getUnsyncedOrdersAsync: () => Promise<PaymentOrder[]>;
-    /** 检测未同步的订单并重新加入任务队列 */
-    recheckAndRequeueUnsyncedOrders: () => Promise<number>;
-    /** 手动执行支付同步队列 */
-    runPaymentSyncQueue: () => Promise<void>;
-    /** @deprecated 使用 createPaymentOrderAsync 替代 */
-    pushOrderAsync: (params: PushOrderParams) => Promise<PaymentOrder>;
-    /** @deprecated 使用 getPaymentItemsAsync 替代 */
-    getPaymentAsync: (orderUuid: string) => Promise<PaymentItem[]>;
-    /** @deprecated 使用 addPaymentItemAsync 替代 */
-    pushPaymentAsync: (orderUuid: string, paymentItem: PaymentItemInput) => Promise<void>;
-    /** @deprecated 使用 deletePaymentItemAsync 替代 */
-    deletePaymentAsync: (orderUuid: string, paymentUuid: string) => Promise<void>;
-    /** @deprecated 使用 updatePaymentItemAsync 替代 */
-    updatePaymentAsync: (orderUuid: string, paymentUuid: string, params: PaymentUpdateFields) => Promise<void>;
-    /** @deprecated 使用 submitPaymentAsync 替代 */
-    submitPayAsync: (orderUuid?: string) => Promise<{
-        status: 'success' | 'failed';
-    }>;
-    /** @deprecated 使用 getRemainingAmountAsync 替代 */
-    getRemainingOrderAmountAsync: (orderUuid: string) => Promise<number>;
-    /** @deprecated 使用 getRemainingAmountWithInputAsync 替代 */
-    getRemainingOrderAmountWithInputAsync: (inputAmount: string | number, orderUuid: string) => Promise<number>;
-}
-/**
- * 订单变化事件数据
- */
-export interface OnOrderChangedEventData {
-    /** 操作类型 */
-    action: 'add' | 'delete' | 'update' | 'payment_add' | 'payment_delete' | 'payment_update' | 'submit';
-    /** 当前订单 */
-    order: PaymentOrder;
-    /** 原始订单（仅在 update 操作时提供） */
-    originalOrder?: PaymentOrder;
-    /** 相关的支付项（仅在 payment_* 操作时提供） */
-    paymentItem?: PaymentItem;
-}
-/**
- * 支付方式变化事件数据
- */
-export interface OnPaymentMethodsChangedEventData {
-    /** 旧的支付方式列表 */
-    oldMethods: PaymentMethod[];
-    /** 新的支付方式列表 */
-    newMethods: PaymentMethod[];
-}
-/**
- * 支付同步错误事件数据
- */
-export interface OnPaymentSyncErrorEventData {
-    /** 订单UUID */
-    orderUuid: string;
-    /** 订单ID */
-    orderId: number;
-    /** 错误信息 */
-    error: string;
-    /** 错误代码 */
-    errorCode?: string;
-    /** HTTP状态码 */
-    statusCode?: number;
-    /** 错误发生时间 */
-    timestamp: number;
-    /** 响应数据（当HTTP请求成功但业务失败时） */
-    responseData?: any;
-}
-/**
- * 支付同步成功事件数据
- */
-export interface OnPaymentSyncSuccessEventData {
-    /** 订单UUID */
-    orderUuid: string;
-    /** 订单ID */
-    orderId: number;
-    /** 成功时间 */
-    timestamp: number;
-}
-/**
- * 支付钩子事件
- */
-export declare enum PaymentHooks {
-    OnPaymentMethodsLoaded = "payment:onPaymentMethodsLoaded",
-    OnPaymentMethodsChanged = "payment:onPaymentMethodsChanged",
-    OnOrderChanged = "payment:onOrderChanged",
-    OnOrderAdded = "payment:onOrderAdded",
-    OnOrderUpdated = "payment:onOrderUpdated",
-    OnOrderDeleted = "payment:onOrderDeleted",
-    OnPaymentAdded = "payment:onPaymentAdded",
-    OnPaymentUpdated = "payment:onPaymentUpdated",
-    OnPaymentDeleted = "payment:onPaymentDeleted",
-    OnPaymentSubmitted = "payment:onPaymentSubmitted",
-    OnOrderAmountChanged = "payment:onOrderAmountChanged",
-    OnPaymentSyncError = "payment:onPaymentSyncError",
-    OnPaymentSyncSuccess = "payment:onPaymentSyncSuccess"
+    processPayment: (paymentId: string) => Promise<void>;
+    getPayment: (paymentId: string) => Promise<Payment>;
+    getPaymentHistory: () => Promise<Payment[]>;
+    refund: (paymentId: string) => Promise<void>;
+    getAvailablePaymentMethods: () => PaymentMethod[];
+    checkPaymentStatus: (paymentId: string) => Promise<PaymentStatus>;
 }

package/lib/modules/Payment/types.js

@@ -19,52 +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,
-  TaskRunStatus: () => TaskRunStatus
+  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 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["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,
-  TaskRunStatus
+  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

@@ -54,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);
     }
@@ -92,12 +87,8 @@ 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,
-        with_schedule,
-        schedule_datetime,
         application_code: (_b = this.otherParams) == null ? void 0 : _b.channel
       },
       { useCache: true }
@@ -157,24 +148,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/Rules/index.js

@@ -37,7 +37,6 @@ 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"));
-var import_lodash_es = require("lodash-es");
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -189,23 +188,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
-          const discountType = discount.tag || discount.type;
-          const productData = {
+          applicableProducts.push({
             amount: product.price,
-            type: discountType,
-            tag: discountType,
+            type: discount.tag || discount.type,
+            tag: discount.tag || discount.type,
             discount: {
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.origin_total,
               pre_value: discount.par_value,
               product_id: originProduct.id
-            }
-          };
-          if (discountType !== "good_pass") {
-            productData.num = product.num || 1;
-          }
-          applicableProducts.push(productData);
+            },
+            num: product.num || 1
+          });
           discountApplicableProducts.set(discount.id, applicableProducts);
         }
       });
@@ -220,9 +215,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
         var _a2;
-        if ((Number(product.price) <= 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
+        if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
           return false;
-        if ((Number(product.total) <= 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
+        if ((Number(product.total) === 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
           var _a3;
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) !== "good_pass")
@@ -247,7 +242,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }))) {
         isManualDiscount = false;
       }
-      if (applicableDiscounts.length === 0 || isManualDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+      if (applicableDiscounts.length === 0 || isManualDiscount) {
         if (product.isClient) {
           processedProductsMap.set(
             product._id,
@@ -314,21 +309,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           productOriginTotal = product.total;
         }
         const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();
-        const discountType = selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag;
         const discountDetail = {
           amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
-          type: discountType,
+          type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
           discount: {
             resource_id: selectedDiscount2.id,
             title: selectedDiscount2.format_title,
             original_amount: productOriginTotal,
             product_id: originProduct.id,
             percent: selectedDiscount2.par_value
-          }
+          },
+          num: product.num || 1
         };
-        if ((selectedDiscount2.tag || selectedDiscount2.type) !== "good_pass") {
-          discountDetail.num = product.num || 1;
-        }
         appliedProducts.push(discountDetail);
         appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
         if (product.isClient) {

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

@@ -39,7 +39,6 @@ type ProductDetail = {
     original_price?: number | string;
     num?: number;
     quantity: number;
-    vouchersApplicable?: boolean;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

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';