@pisell/pisellos 2.2.172 → 2.2.174

package/lib/modules/Order/utils.js

@@ -31,6 +31,7 @@ var utils_exports = {};
 __export(utils_exports, {
   buildManualProductDiscountItem: () => import_manualProductDiscount.buildManualProductDiscountItem,
   buildSubmitPayload: () => buildSubmitPayload,
+  clearTempOrderHolderAssignments: () => clearTempOrderHolderAssignments,
   composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
@@ -42,6 +43,7 @@ __export(utils_exports, {
   formatV1Product: () => formatV1Product,
   generateDuration: () => generateDuration,
   getAllDiscountList: () => getAllDiscountList,
+  hasAssignedHolderId: () => hasAssignedHolderId,
   isTempOrder: () => isTempOrder,
   mapPaymentItemToOrderPayment: () => mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments: () => mapPaymentItemsToOrderPayments,
@@ -201,7 +203,7 @@ function createDefaultOrderRulesHooks() {
         id: product.product_id,
         // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
-        // 不透明 identity 契约下，normalizeOrderProduct / restoreTempOrderFromStorage 已保证唯一值存在；
+        // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
         _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
           product.product_option_item,
@@ -613,7 +615,8 @@ function buildSubmitPayload(params) {
   }
   const payload = {
     ...tempOrderRest,
-    customer_id: tempOrder.customer_id ?? 0,
+    customer_id: tempOrder.customer_id ?? 1,
+    customer_name: tempOrder.customer_name || "Select a customer",
     order_number: null,
     shop_order_number: null,
     shop_full_order_number: null,
@@ -720,10 +723,58 @@ function formatV1Product(products) {
     };
   });
 }
+function hasAssignedHolderId(value) {
+  if (value === void 0 || value === null || value === "")
+    return false;
+  if (Array.isArray(value))
+    return value.length > 0;
+  return true;
+}
+function clearTempOrderHolderAssignments(tempOrder) {
+  var _a;
+  let changed = false;
+  const resetHolderField = (target, key = "holder_id") => {
+    if (!hasAssignedHolderId(target[key]))
+      return;
+    target[key] = null;
+    changed = true;
+  };
+  for (const product of tempOrder.products || []) {
+    if (product.metadata && typeof product.metadata === "object") {
+      resetHolderField(product.metadata);
+    }
+  }
+  for (const booking of tempOrder.bookings || []) {
+    const bookingRecord = booking;
+    if (booking.metadata && typeof booking.metadata === "object") {
+      resetHolderField(booking.metadata);
+    }
+    if (bookingRecord.holder !== void 0 && bookingRecord.holder !== null) {
+      delete bookingRecord.holder;
+      changed = true;
+    }
+  }
+  const productsByUid = (_a = tempOrder._extend) == null ? void 0 : _a.productsByUid;
+  if (productsByUid && typeof productsByUid === "object") {
+    for (const entry of Object.values(productsByUid)) {
+      const origin = entry == null ? void 0 : entry.origin;
+      if (!origin || typeof origin !== "object")
+        continue;
+      if (origin.metadata && typeof origin.metadata === "object") {
+        resetHolderField(origin.metadata);
+      }
+      if (origin._extend && typeof origin._extend === "object") {
+        resetHolderField(origin._extend);
+      }
+    }
+  }
+  return changed;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildManualProductDiscountItem,
   buildSubmitPayload,
+  clearTempOrderHolderAssignments,
   composeLinePrice,
   createDefaultOrderRulesHooks,
   createDefaultTempOrder,
@@ -735,6 +786,7 @@ function formatV1Product(products) {
   formatV1Product,
   generateDuration,
   getAllDiscountList,
+  hasAssignedHolderId,
   isTempOrder,
   mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments,

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

@@ -47,7 +47,6 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Map<string, string | null>;
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
-    private filterQuotationsByCustomer;
     private isQuotationVisibleForCustomer;
     private hasValidCustomerId;
     private isQuotationActiveAt;

package/lib/modules/Quotation/index.js

@@ -43,8 +43,6 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     const query = {};
     if (params == null ? void 0 : params.channel)
       query.channel = params.channel;
-    if (params == null ? void 0 : params.customer_id)
-      query.customer_id = String(params.customer_id);
     if ((params == null ? void 0 : params.channel) === "online_store") {
       query.channel = "online-store";
     }
@@ -53,10 +51,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
       query,
       { useCache: false }
     );
-    const list = this.filterQuotationsByCustomer(
-      ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [],
-      params == null ? void 0 : params.customer_id
-    );
+    const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
     list.sort((a, b) => a.sort - b.sort);
     this.store.list = list;
   }
@@ -130,9 +125,6 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
   setScheduleResolver(resolver) {
     this.scheduleResolver = resolver;
   }
-  filterQuotationsByCustomer(list, customerId) {
-    return list.filter((quotation) => this.isQuotationVisibleForCustomer(quotation, customerId));
-  }
   isQuotationVisibleForCustomer(quotation, customerId) {
     const customers = quotation.customer || [];
     if (customers.length === 0)

package/lib/server/modules/products/index.d.ts

@@ -21,7 +21,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     private isPriceFormatterRegistered;
     private quotationPriceBridge?;
     private quotationBridgeChannel?;
-    private quotationBridgeCustomerId?;
+    private quotationBridgeLoadedKey?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
     private productDataSource;

package/lib/server/modules/products/index.js

@@ -44,6 +44,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     this.formatters = [];
     // 是否已注册内置价格格式化器
     this.isPriceFormatterRegistered = false;
+    this.quotationBridgeLoadedKey = "";
     this.pendingSyncMessages = [];
   }
   async initialize(core, options) {
@@ -190,14 +191,25 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       this.quotationPriceBridge = quotation;
     }
     if (params.scheduleModule) {
+      const scheduleCache = /* @__PURE__ */ new Map();
+      let hasLoadedScheduleList = false;
       this.quotationPriceBridge.setScheduleResolver((id) => {
         var _a2, _b, _c, _d, _e, _f;
         const scheduleId = String(id);
-        const scheduleList = ((_b = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b.call(_a2)) || [];
-        const schedule = scheduleList.find((item) => String(item.id) === scheduleId);
-        if (schedule)
-          return schedule;
+        if (scheduleCache.has(scheduleId))
+          return scheduleCache.get(scheduleId);
+        if (!hasLoadedScheduleList) {
+          const scheduleList = ((_b = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b.call(_a2)) || [];
+          for (const schedule of scheduleList) {
+            scheduleCache.set(String(schedule.id), schedule);
+          }
+          hasLoadedScheduleList = true;
+        }
+        if (scheduleCache.has(scheduleId))
+          return scheduleCache.get(scheduleId);
         const schedules = ((_d = (_c = params.scheduleModule).getScheduleListByIds) == null ? void 0 : _d.call(_c, [id])) || ((_f = (_e = params.scheduleModule).getScheduleByIds) == null ? void 0 : _f.call(_e, [id])) || [];
+        if (schedules[0])
+          scheduleCache.set(scheduleId, schedules[0]);
         return schedules[0];
       });
     }
@@ -209,8 +221,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   async refreshQuotationPriceBridge(params) {
     if (!this.quotationPriceBridge)
       return;
-    const customerId = params && "customer_id" in params ? params.customer_id : this.quotationBridgeCustomerId;
-    const refreshKey = this.getQuotationBridgeScopeKey(customerId);
+    const refreshKey = this.getQuotationBridgeScopeKey();
     if (this.quotationBridgeRefreshPromise && this.quotationBridgeRefreshKey === refreshKey) {
       await this.quotationBridgeRefreshPromise;
       return;
@@ -220,10 +231,9 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     }
     this.quotationBridgeRefreshKey = refreshKey;
     this.quotationBridgeRefreshPromise = this.quotationPriceBridge.loadQuotations({
-      channel: this.quotationBridgeChannel,
-      customer_id: customerId
+      channel: this.quotationBridgeChannel
     }).then(() => {
-      this.quotationBridgeCustomerId = customerId;
+      this.quotationBridgeLoadedKey = refreshKey;
     }).finally(() => {
       this.quotationBridgeRefreshPromise = void 0;
       this.quotationBridgeRefreshKey = void 0;
@@ -242,12 +252,12 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     if (this.quotationBridgeRefreshPromise) {
       await this.quotationBridgeRefreshPromise;
     }
-    if (this.getQuotationBridgeScopeKey(customerId) !== this.getQuotationBridgeScopeKey(this.quotationBridgeCustomerId)) {
+    if (this.getQuotationBridgeScopeKey() !== this.quotationBridgeLoadedKey) {
       await this.refreshQuotationPriceBridge({ customer_id: customerId });
     }
   }
-  getQuotationBridgeScopeKey(customerId) {
-    return `${this.quotationBridgeChannel || ""}:${customerId ?? ""}`;
+  getQuotationBridgeScopeKey() {
+    return this.quotationBridgeChannel || "";
   }
   buildPriceDataFromQuotation(product, datetime, customerId) {
     var _a;
@@ -257,10 +267,11 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       customer_id: customerId
     });
     const productPrice = quotedPrice ?? product.price;
+    const productBasePrice = quotedPrice ?? product.base_price ?? product.price ?? 0;
     return {
       id: product.id,
       price: String(productPrice ?? 0),
-      base_price: String(product.base_price ?? product.price ?? 0),
+      base_price: String(productBasePrice),
       variant: this.buildVariantPriceData(product, datetime, customerId),
       bundle_group: this.buildBundleGroupPriceData(product, datetime, customerId)
     };
@@ -277,7 +288,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         customer_id: customerId
       });
       const price = quotedPrice ?? variant.price ?? product.price ?? 0;
-      const basePrice = variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
+      const basePrice = quotedPrice ?? variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
       return {
         id: Number(variant.id),
         product_id: Number(variant.product_id ?? product.id),
@@ -302,7 +313,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
           customer_id: customerId
         });
         const price = quotedPrice ?? item.price ?? 0;
-        const basePrice = item.base_price ?? item.price ?? 0;
+        const basePrice = quotedPrice ?? item.base_price ?? item.price ?? 0;
         return {
           id: Number(item.id),
           product_id: Number(item.product_id ?? product.id),

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

@@ -39,6 +39,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     window: WindowPlugin;
     request: RequestPlugin;
     protected currentSalesDetail: ISalesDetail | null;
+    protected discountConfigCacheKey: string | null;
+    protected hasManualDiscountSelection: boolean;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -113,23 +115,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     updateRemoteOrderNote(orderId: number | string, note: string): void;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
-    /**
-     * 运行时切换 tempOrder 是否写入 localStorage（委托 OrderModule）。
-     * SalesSdk 等内存态场景可在挂载后设为 false，避免污染本地缓存。
-     *
-     * @example
-     * bookingTicket.setEnableTempOrderPersist(false);
-     * await bookingTicket.addProductToOrder(product);
-     */
+    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     setEnableTempOrderPersist(enabled: boolean): void;
-    /**
-     * 读取当前 tempOrder localStorage 持久化开关（委托 OrderModule）。
-     *
-     * @example
-     * if (bookingTicket.isTempOrderPersistEnabled()) {
-     *   bookingTicket.restoreOrder();
-     * }
-     */
+    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     isTempOrderPersistEnabled(): boolean;
     private ensureTempOrder;
     addNewOrder(): Promise<OrderTempOrder>;

package/lib/solution/BaseSales/index.js

@@ -57,6 +57,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.otherParams = {};
     // 当前缓存中已加载的最新 SalesDetail；只读 getter 走它对外暴露详情数据。
     this.currentSalesDetail = null;
+    this.discountConfigCacheKey = null;
+    this.hasManualDiscountSelection = false;
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -417,30 +419,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     return this.store.order.updateTempOrderContactsInfo(contactsInfo);
   }
-  /**
-   * 运行时切换 tempOrder 是否写入 localStorage（委托 OrderModule）。
-   * SalesSdk 等内存态场景可在挂载后设为 false，避免污染本地缓存。
-   *
-   * @example
-   * bookingTicket.setEnableTempOrderPersist(false);
-   * await bookingTicket.addProductToOrder(product);
-   */
+  /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
   setEnableTempOrderPersist(enabled) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     this.store.order.setEnableTempOrderPersist(enabled);
   }
-  /**
-   * 读取当前 tempOrder localStorage 持久化开关（委托 OrderModule）。
-   *
-   * @example
-   * if (bookingTicket.isTempOrderPersistEnabled()) {
-   *   bookingTicket.restoreOrder();
-   * }
-   */
+  /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
   isTempOrderPersistEnabled() {
     if (!this.store.order)
-      return true;
+      return false;
     return this.store.order.isTempOrderPersistEnabled();
   }
   ensureTempOrder() {
@@ -477,6 +465,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
       const tempOrder = this.store.order.restoreOrder();
       this.currentSalesDetail = null;
+      this.discountConfigCacheKey = null;
+      this.hasManualDiscountSelection = false;
       await this.effectsEmit("onTempOrderReplaced", { tempOrder });
       if (this.syncAppDataToTempOrder(tempOrder)) {
         this.store.order.persistTempOrder();
@@ -615,7 +605,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
   }
   async loadDiscountConfig(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -627,18 +617,37 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       (params == null ? void 0 : params.customerId) || tempOrder.customer_id || ((_c = tempOrder.customer) == null ? void 0 : _c.id) || ((_e = (_d = tempOrder._extend) == null ? void 0 : _d.customerSnapshot) == null ? void 0 : _e.id) || ((_g = (_f = tempOrder._extend) == null ? void 0 : _f.customerSnapshot) == null ? void 0 : _g.customer_id) || 0
     );
     const currentDiscountList = ((_h = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _h.call(discountModule)) || [];
+    const originalDiscountList = ((_i = discountModule == null ? void 0 : discountModule.getOriginalDiscountList) == null ? void 0 : _i.call(discountModule)) || [];
+    const hasManualDiscountSelection = this.hasManualDiscountSelection || currentDiscountList.some((discount) => discount.isManualSelect);
+    const discountAction = (params == null ? void 0 : params.action) || (orderId ? "edit" : "create");
+    const discountConfigCacheKey = [
+      customerId,
+      discountAction,
+      Number(orderId) || 0
+    ].join(":");
     let preparedDiscountList = [];
     if (customerId && customerId !== 1) {
-      preparedDiscountList = await this.store.order.loadDiscountConfig({
-        customerId,
-        action: (params == null ? void 0 : params.action) || (orderId ? "edit" : "create"),
-        orderId: Number(orderId) || void 0,
-        apply: false
-      });
-      await ((_i = discountModule == null ? void 0 : discountModule.setOriginalDiscountList) == null ? void 0 : _i.call(discountModule, preparedDiscountList));
+      if (this.discountConfigCacheKey === discountConfigCacheKey) {
+        preparedDiscountList = originalDiscountList;
+      } else {
+        preparedDiscountList = await this.store.order.loadDiscountConfig({
+          customerId,
+          action: discountAction,
+          orderId: Number(orderId) || void 0,
+          apply: false
+        });
+        this.discountConfigCacheKey = discountConfigCacheKey;
+        await ((_j = discountModule == null ? void 0 : discountModule.setOriginalDiscountList) == null ? void 0 : _j.call(discountModule, preparedDiscountList));
+      }
+    }
+    if (hasManualDiscountSelection && currentDiscountList.length) {
+      return {
+        productList: tempOrder.products || [],
+        discountList: currentDiscountList
+      };
     }
     let nextDiscountList = this.mergeHistoricalDiscountList(
-      preparedDiscountList || ((_j = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _j.call(discountModule)) || [],
+      preparedDiscountList || ((_k = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _k.call(discountModule)) || [],
       tempOrder.products || []
     );
     nextDiscountList = this.mergeCurrentDiscountSelectionState(
@@ -647,17 +656,39 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     );
     await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
     if (rulesModule) {
-      const holders = ((_k = tempOrder.holder) == null ? void 0 : _k.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+      const holders = ((_l = tempOrder.holder) == null ? void 0 : _l.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
       const result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
         holders,
-        isFormSubject: !!((_l = tempOrder.holder) == null ? void 0 : _l.type) && tempOrder.holder.type === "form",
-        orderTotalAmount: Number(((_m = orderStore.summary) == null ? void 0 : _m.total_amount) || 0)
+        isFormSubject: !!((_m = tempOrder.holder) == null ? void 0 : _m.type) && tempOrder.holder.type === "form",
+        orderTotalAmount: Number(((_n = orderStore.summary) == null ? void 0 : _n.total_amount) || 0)
       }) || { productList: tempOrder.products, discountList: nextDiscountList };
       if (result.productList) {
         tempOrder.products = result.productList;
       }
+      for (const product of tempOrder.products || []) {
+        const productUid = (_o = product.metadata) == null ? void 0 : _o.unique_identification_number;
+        const runtimeOrigin = productUid ? (_r = (_q = (_p = tempOrder._extend) == null ? void 0 : _p.productsByUid) == null ? void 0 : _q[productUid]) == null ? void 0 : _r.origin : void 0;
+        if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || ((_s = product.metadata) == null ? void 0 : _s.is_manual_discount))
+          continue;
+        const totalPerUnitDiscount = (product.discount_list || []).reduce(
+          (sum, pd) => sum + Number(pd.amount || 0),
+          0
+        );
+        const optionSum = (0, import_utils.sumOptionUnitPrice)(product.product_option_item);
+        const sourcePrice = ((_t = product.metadata) == null ? void 0 : _t.source_product_price) ?? (((_u = product.metadata) == null ? void 0 : _u.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
+        const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+        const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+        if (product.metadata) {
+          product.metadata.main_product_selling_price = newMainSellingPrice;
+          product.metadata.price_schema_version = 2;
+        }
+        product.selling_price = (0, import_utils.composeLinePrice)({
+          mainPrice: newMainSellingPrice,
+          bundle: product.product_bundle
+        });
+      }
       if (result.discountList) {
         nextDiscountList = this.mergeHistoricalDiscountList(
           result.discountList,
@@ -668,6 +699,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         tempOrder.discount_list = nextDiscountList.filter((discount) => discount.isSelected);
       }
     }
+    const summary = await this.store.order.recalculateSummary({ createIfMissing: true });
     this.store.order.persistTempOrder();
     await this.effectsEmit("onDiscountApplied", {
       productList: tempOrder.products || [],
@@ -681,7 +713,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
   }
   async bestDiscount(cb) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -689,6 +721,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const discountModule = orderStore.discount;
     const rulesModule = orderStore.rules;
     const originalDiscountList = ((_a = discountModule == null ? void 0 : discountModule.getOriginalDiscountList) == null ? void 0 : _a.call(discountModule)) || this.getDiscountList();
+    const currentDiscountList = ((_b = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _b.call(discountModule)) || [];
     let nextDiscountList = this.mergeHistoricalDiscountList(
       originalDiscountList || [],
       tempOrder.products || []
@@ -699,13 +732,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
     await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
     if (rulesModule) {
-      const holders = ((_b = tempOrder.holder) == null ? void 0 : _b.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+      const holders = ((_c = tempOrder.holder) == null ? void 0 : _c.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
       result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
         holders,
-        isFormSubject: !!((_c = tempOrder.holder) == null ? void 0 : _c.type) && tempOrder.holder.type === "form",
-        orderTotalAmount: Number(((_d = orderStore.summary) == null ? void 0 : _d.total_amount) || 0)
+        isFormSubject: !!((_d = tempOrder.holder) == null ? void 0 : _d.type) && tempOrder.holder.type === "form",
+        orderTotalAmount: Number(((_e = orderStore.summary) == null ? void 0 : _e.total_amount) || 0)
       }) || result;
       if (result.productList) {
         tempOrder.products = result.productList;
@@ -766,6 +799,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           isManualSelect: !params.isSelected
         } : d
       );
+      this.hasManualDiscountSelection = true;
       const tempOrder = this.store.order.ensureTempOrder();
       const orderStore = this.store.order.store || {};
       const discountModule = orderStore.discount;
@@ -798,6 +832,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
             for (const d of nextDiscountList) {
               if (d.isSelected && !beforeSelectedIds.has(d.id)) {
                 d.isSelected = false;
+                d.isManualSelect = true;
               }
             }
           }
@@ -1000,11 +1035,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return this.store.order.updateVoucherOrderPayments(payments);
   }
   getWalletProductList() {
-    var _a, _b;
+    var _a, _b, _c;
     const tempOrder = (_a = this.store.order) == null ? void 0 : _a.getTempOrder();
     if (!((_b = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _b.length))
       return [];
-    return tempOrder.products.map((product) => {
+    const products = (_c = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _c.filter((n) => n.product_id);
+    return products.map((product) => {
       const metadata = product.metadata || {};
       return {
         product_id: product.product_id,

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

@@ -243,6 +243,19 @@ export interface BaseSalesProductBookingPriceSegment {
     quotation_shelf_id: number;
     source: BaseSalesProductBookingPriceSegmentSource;
 }
+export interface BaseSalesBundleProductBookingPriceResult {
+    bundle_id?: number;
+    group_id?: number;
+    bundle_group_id?: number;
+    bundle_product_id: number | null;
+    bundle_variant_id: number;
+    unit_price: string;
+    total_price: string;
+    quantity: number;
+    quotation_shelf_id: number;
+    source: BaseSalesProductBookingPriceSegmentSource;
+    segments: BaseSalesProductBookingPriceSegment[];
+}
 export interface BaseSalesProductBookingPriceResult {
     product_id: number | null;
     product_variant_id: number;
@@ -253,6 +266,7 @@ export interface BaseSalesProductBookingPriceResult {
     duration?: BaseSalesQuotationDurationConfig;
     quotation_shelf_id: number;
     segments: BaseSalesProductBookingPriceSegment[];
+    product_bundle?: BaseSalesBundleProductBookingPriceResult[];
 }
 export type BaseSalesAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface BaseSalesTableFormRecord {