@pisell/pisellos 2.2.169 → 2.2.171

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

@@ -2,7 +2,6 @@ import { CartItem } from '../Cart/types';
 import type { DiscountModule } from '../Discount';
 import type { RulesModule } from '../Rules';
 import type { Discount } from '../Discount/types';
-import type { UnavailableReason } from '../Rules/types';
 import type { SubmitPayloadEnhancer } from './utils';
 import type { PaymentItem } from '../Payment/types';
 import type { ICustomer } from '../AccountList/types';
@@ -49,13 +48,6 @@ export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
 }
-export interface OrderScanCodeResult {
-    isAvailable: boolean;
-    discountList: Discount[];
-    scannedDiscountList: Discount[];
-    type: 'server' | 'clientCalc';
-    unavailableReason?: UnavailableReason;
-}
 export interface OrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;
@@ -111,11 +103,11 @@ export interface OrderSummary {
 export interface OrderTempOrder {
     order_id: number | null;
     external_sale_number: string;
-    order_number: string | null;
-    shop_order_number: string | null;
-    shop_full_order_number: string | null;
+    order_number: string;
+    shop_order_number: string;
+    shop_full_order_number: string;
     type: string;
-    business_code?: string;
+    business_code: string;
     platform: string;
     sales_channel: string;
     order_sales_channel: string;
@@ -165,7 +157,7 @@ export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identific
     payment_price: string;
     product_sku: Record<string, any>;
 }
-export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer'> {
+export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'shop_full_order_number'> {
     platform: string;
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{
@@ -184,32 +176,16 @@ export interface OrderState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
 }
-export interface ReplaceTempOrderOptions {
-    recalculateSummary?: boolean;
-    persist?: boolean;
-    saveDraft?: boolean;
-}
-export type AddProductBookingInput = Record<string, any>;
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
-export interface UpdateOrderProductParams {
+export interface UpdateProductInOrderParams {
     product_id: number | null;
     product_variant_id: number;
     updates: Partial<OrderProduct>;
     unique_identification_number?: string;
-    identity_key?: string;
     product_option_item?: any[];
     product_bundle?: any[];
-    booking?: AddProductBookingInput;
-}
-/** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
-export interface UpdateOrderProductQuantityParams extends OrderProductIdentity {
-    num: number;
-    identity_key?: string;
-}
-export interface UpdateOrderBookingParams {
-    unique_identification_number: string;
-    updates: AddProductBookingInput;
 }
+export type AddProductBookingInput = Record<string, any>;
 export interface OrderProductMergeDecisionContext {
     incomingProduct: Partial<OrderProduct> & OrderProductIdentity;
     normalizedIncoming: OrderProduct;
@@ -260,11 +236,10 @@ export interface SubmitSalesOrderParams {
     query: {
         order_id: number | null;
         external_sale_number: string;
-        order_number: string | null;
-        shop_order_number: string | null;
-        shop_full_order_number: string | null;
+        order_number: string;
+        shop_order_number: string;
         type: string;
-        business_code?: string;
+        business_code: string;
         platform: string;
         request_unique_idempotency_token?: string;
         sales_channel: string;
@@ -375,7 +350,6 @@ export interface SyncPaymentsToOrderParams {
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
     smallTicketDataFlag?: number;
-    channel?: string;
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
@@ -472,7 +446,6 @@ export interface OrderModuleAPI {
     }) => void;
     getTempOrder: () => OrderTempOrder | null;
     ensureTempOrder: () => OrderTempOrder;
-    replaceTempOrder: (tempOrder: OrderTempOrder, options?: ReplaceTempOrderOptions) => Promise<OrderTempOrder>;
     addNewOrder: () => Promise<OrderTempOrder>;
     restoreOrder: () => OrderTempOrder;
     getOrderProducts: () => OrderProduct[];
@@ -485,19 +458,13 @@ export interface OrderModuleAPI {
     getOrderSyncState: () => OrderSyncState;
     getOrderAmountSnapshot: () => OrderAmountSnapshot | null;
     getTempOrderNote: () => string;
-    updateTempOrderNote: {
-        (note: string): string;
-        (note: string, sync: true): Promise<string>;
-        (note: string, sync: boolean): string | Promise<string>;
-    };
+    updateTempOrderNote: (note: string) => string;
     updateTempOrderShopDiscount: (amount: string | number) => string;
     updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
     addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput) => Promise<OrderProduct[]>;
-    updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
-    updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
-    updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
+    updateProductInOrder: (params: UpdateProductInOrderParams) => Promise<OrderProduct[]>;
     removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
     persistTempOrder: () => void;
     submitTempOrder: <T = any>(params?: {
@@ -549,10 +516,8 @@ export interface OrderModuleAPI {
     clearOrderCustomer: () => void;
     loadDiscountConfig: (params: {
         customerId: number;
-        action?: 'create' | 'edit';
-        orderId?: number;
-        apply?: boolean;
-    }) => Promise<Discount[]>;
+        action?: 'create';
+    }) => Promise<void>;
     getDiscountList: () => Discount[];
     applyDiscount: () => void;
     /**

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

@@ -65,21 +65,6 @@ export declare function sumOptionUnitPrice(options?: Array<{
  *
  * 导出为纯函数方便单测直接驱动钩子，不依赖 OrderModule 实例。
  */
-/** Rules calcDiscount 用手动价标记；undefined 表示交给 Rules 用 total/origin_total 推断 */
-export declare function resolveRulesManualDiscountFlag(metadata: Record<string, any> | null | undefined): boolean | undefined;
-/**
- * 手动改价（price_override）时行级 original_price（composite 单价）：
- * 购物车划线价应对齐 metadata.origin._extend.origin_total（改价前单价 composite，如 40），
- * 而非 bundle 子项 catalog 原价合成的 composedOriginalPrice（如 30）。
- *
- * origin_total 与 SkuDetailModal / cacheItem._extend 一致，为单价语义，不再除以 num。
- */
-export declare function resolveManualOverrideLineOriginalPrice(params: {
-    num?: number;
-    metadata?: Record<string, any> | null;
-    /** 已有行级 original_price（origin 被裁剪时兜底划线价） */
-    lineOriginalPrice?: string | number | null;
-}, fallbackCompositeOriginal: string): string;
 export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
@@ -156,5 +141,3 @@ export declare function formatV1Product(products: OrderSubmitProduct[]): {
     unique: string;
 }[];
 export { createEmptySummary } from '../../solution/ScanOrder/utils';
-export { buildManualProductDiscountItem, ensureManualProductDiscountList, findManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountMessage, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, resolveSafeProductNum, shouldBuildManualProductDiscount, syncManualProductDiscountProductNum, stripManualProductDiscountItems, } from './utils/manualProductDiscount';
-export type { ManualProductDiscountItem } from './utils/manualProductDiscount';

package/lib/modules/Order/utils.js

@@ -29,15 +29,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Order/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
-  buildManualProductDiscountItem: () => import_manualProductDiscount.buildManualProductDiscountItem,
   buildSubmitPayload: () => buildSubmitPayload,
   composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
   createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => createUuidV4,
-  ensureManualProductDiscountList: () => import_manualProductDiscount.ensureManualProductDiscountList,
-  findManualProductDiscountItem: () => import_manualProductDiscount.findManualProductDiscountItem,
   formatDateTime: () => formatDateTime,
   formatV1Product: () => formatV1Product,
   generateDuration: () => generateDuration,
@@ -45,30 +42,19 @@ __export(utils_exports, {
   isTempOrder: () => isTempOrder,
   mapPaymentItemToOrderPayment: () => mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments: () => mapPaymentItemsToOrderPayments,
-  mergeManualProductDiscountIntoList: () => import_manualProductDiscount.mergeManualProductDiscountIntoList,
   mergeRelationForms: () => mergeRelationForms,
   normalizeBookingIsAll: () => normalizeBookingIsAll,
   normalizeBookingSubType: () => normalizeBookingSubType,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
-  resolveManualDiscountMessage: () => import_manualProductDiscount.resolveManualDiscountMessage,
-  resolveManualDiscountOriginTotal: () => import_manualProductDiscount.resolveManualDiscountOriginTotal,
-  resolveManualDiscountReasonFromSources: () => import_manualProductDiscount.resolveManualDiscountReasonFromSources,
-  resolveManualOverrideLineOriginalPrice: () => resolveManualOverrideLineOriginalPrice,
-  resolveRulesManualDiscountFlag: () => resolveRulesManualDiscountFlag,
-  resolveSafeProductNum: () => import_manualProductDiscount.resolveSafeProductNum,
   resolveSubmitCollectPax: () => resolveSubmitCollectPax,
-  shouldBuildManualProductDiscount: () => import_manualProductDiscount.shouldBuildManualProductDiscount,
-  stripManualProductDiscountItems: () => import_manualProductDiscount.stripManualProductDiscountItems,
-  sumOptionUnitPrice: () => sumOptionUnitPrice,
-  syncManualProductDiscountProductNum: () => import_manualProductDiscount.syncManualProductDiscountProductNum
+  sumOptionUnitPrice: () => sumOptionUnitPrice
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../solution/ScanOrder/utils");
 var import_utils2 = require("../../solution/ScanOrder/utils");
-var import_manualProductDiscount = require("./utils/manualProductDiscount");
 function composeLinePrice(params) {
   const { mainPrice, bundle, useOriginalBundle } = params;
   let total = new import_decimal.default(Number(mainPrice) || 0);
@@ -94,42 +80,6 @@ function sumOptionUnitPrice(options) {
   }
   return total;
 }
-function resolveRulesManualDiscountFlag(metadata) {
-  if (!metadata)
-    return void 0;
-  if (metadata.is_manual_discount === true || metadata.is_manual_discount === 1) {
-    return true;
-  }
-  const priceOverride = metadata.price_override;
-  if (priceOverride !== void 0 && priceOverride !== null && priceOverride !== "") {
-    return true;
-  }
-  return void 0;
-}
-function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOriginal) {
-  var _a, _b;
-  const metadata = params.metadata || {};
-  const priceOverride = metadata.price_override;
-  if (priceOverride === void 0 || priceOverride === null || priceOverride === "") {
-    return fallbackCompositeOriginal;
-  }
-  const refTotal = (_b = (_a = metadata.origin) == null ? void 0 : _a._extend) == null ? void 0 : _b.origin_total;
-  if (refTotal !== void 0 && refTotal !== null && refTotal !== "") {
-    const parsed = Number(refTotal);
-    if (Number.isFinite(parsed)) {
-      return new import_decimal.default(parsed).toDecimalPlaces(2).toFixed(2);
-    }
-  }
-  const lineOriginal = params.lineOriginalPrice;
-  if (lineOriginal !== void 0 && lineOriginal !== null && lineOriginal !== "") {
-    const parsedLine = Number(lineOriginal);
-    const parsedFallback = Number(fallbackCompositeOriginal);
-    if (Number.isFinite(parsedLine) && Number.isFinite(parsedFallback) && parsedLine > parsedFallback) {
-      return new import_decimal.default(parsedLine).toDecimalPlaces(2).toFixed(2);
-    }
-  }
-  return fallbackCompositeOriginal;
-}
 function createDefaultOrderRulesHooks() {
   const toUnitPriceString = (totalLike, num) => {
     const effectiveNum = Number(num) > 0 ? Number(num) : 1;
@@ -137,7 +87,7 @@ function createDefaultOrderRulesHooks() {
   };
   return {
     getProduct: (product) => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d, _e, _f;
       const metadataAny = product.metadata || {};
       const optionSum = sumOptionUnitPrice(product.product_option_item);
       let sourcePrice;
@@ -185,11 +135,9 @@ function createDefaultOrderRulesHooks() {
         bundle: product.product_bundle || [],
         booking_id: ((_b = product.metadata) == null ? void 0 : _b.booking_id) || null,
         isClient: false,
-        // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
-        // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
-        isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
-        holder_id: (_c = product.metadata) == null ? void 0 : _c.holder_id,
-        startDate: ((_d = product.metadata) == null ? void 0 : _d.start_date) || ((_e = product.metadata) == null ? void 0 : _e.startDate)
+        isManualDiscount: ((_c = product.metadata) == null ? void 0 : _c.is_manual_discount) || false,
+        holder_id: (_d = product.metadata) == null ? void 0 : _d.holder_id,
+        startDate: ((_e = product.metadata) == null ? void 0 : _e.start_date) || ((_f = product.metadata) == null ? void 0 : _f.startDate)
       };
     },
     setProduct: (product, values) => {
@@ -212,14 +160,10 @@ function createDefaultOrderRulesHooks() {
         bundle: nextBundle,
         useOriginalBundle: true
       });
-      const finalOriginalPrice = resolveManualOverrideLineOriginalPrice(
-        { num: nextNum, metadata: metadataAny, lineOriginalPrice: product.original_price },
-        composedOriginalPrice
-      );
       return {
         ...product,
         selling_price: composedSellingPrice,
-        original_price: finalOriginalPrice,
+        original_price: composedOriginalPrice,
         discount_list: values.discount_list ?? product.discount_list,
         num: values.quantity ?? product.num,
         product_bundle: nextBundle,
@@ -377,11 +321,6 @@ function normalizeSubmitProduct(product) {
     num,
     product_option_item: productOptionItem,
     surcharge_fee: _productSurchargeFee,
-    discount_amount: _deprecatedDiscountAmount,
-    discount_type: _deprecatedDiscountType,
-    discountway: _deprecatedDiscountway,
-    product_discount_reason: _deprecatedProductDiscountReason,
-    discount_per: _deprecatedDiscountPer,
     ...productRest
   } = submitProduct;
   const rawMetadata = submitProduct.metadata || {};
@@ -486,23 +425,22 @@ function createDefaultTempOrder(params) {
   return {
     order_id: null,
     external_sale_number: "",
-    order_number: null,
-    shop_order_number: null,
-    shop_full_order_number: null,
-    type: "",
-    business_code: void 0,
+    order_number: "",
+    shop_order_number: "",
+    shop_full_order_number: "",
+    type: "appointment_booking",
+    business_code: "appointment_booking",
     platform: "h5",
     sales_channel: "my_pisel",
     order_sales_channel: "online_store",
     status: "normal",
     payment_status: "payment_processing",
     shipping_status: "unfulfilled",
-    customer_id: 0,
+    customer_id: null,
     customer_name: "",
     country_calling_code: "",
     phone: "",
     email: "",
-    customer: null,
     is_price_include_tax: 1,
     tax_title: "",
     tax_country_code: "",
@@ -533,7 +471,6 @@ function createDefaultTempOrder(params) {
   };
 }
 function buildSubmitPayload(params) {
-  var _a;
   const {
     tempOrder,
     cacheId,
@@ -559,6 +496,7 @@ function buildSubmitPayload(params) {
     shop_service_type: _shopServiceType,
     start_time: _startTime,
     customer: _customer,
+    shop_full_order_number: _shopFullOrderNumber,
     tax_fee: _rootTaxFee,
     total_amount: _totalAmount,
     total_refund_amount: _totalRefundAmount,
@@ -566,23 +504,12 @@ function buildSubmitPayload(params) {
     holder_id: _holderId,
     ...tempOrderRest
   } = tempOrder;
-  let submitType = type ?? tempOrder.type;
-  if (!submitType) {
-    if ((_a = tempOrder == null ? void 0 : tempOrder.bookings) == null ? void 0 : _a.length) {
-      submitType = "appointment_booking";
-    } else {
-      submitType = "virtual";
-    }
-  }
   const payload = {
     ...tempOrderRest,
-    order_number: null,
-    shop_order_number: null,
-    shop_full_order_number: null,
     platform: normalizeSubmitPlatform(platform),
     request_unique_idempotency_token: tempOrder.request_unique_idempotency_token || `${tempOrder.external_sale_number}_${now.getTime()}`,
-    type: submitType,
-    business_code: businessCode ?? tempOrder.business_code,
+    type: type ?? tempOrder.type ?? "table-order",
+    business_code: businessCode ?? tempOrder.business_code ?? "table-order",
     sales_channel: tempOrder.sales_channel || "my_pisel",
     order_sales_channel: channel ?? tempOrder.order_sales_channel ?? "online_store",
     status: tempOrder.status || "normal",
@@ -597,9 +524,9 @@ function buildSubmitPayload(params) {
     note: tempOrder.note || "",
     delivery_type: tempOrder.delivery_type || "nil",
     schedule_date: scheduleDate,
-    // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
+    created_at: tempOrder.created_at || formatDateTime(now),
     bookings: (tempOrder.bookings || []).filter(
-      (booking) => Number(booking.parent_id) !== 0
+      (booking) => Number(booking.parent_id ?? 0) !== 0
     ).map((booking) => normalizeSubmitBooking(booking)),
     payments: tempOrder.payments || [],
     // discount_list: tempOrder.discount_list || [],
@@ -685,15 +612,12 @@ function formatV1Product(products) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  buildManualProductDiscountItem,
   buildSubmitPayload,
   composeLinePrice,
   createDefaultOrderRulesHooks,
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
-  ensureManualProductDiscountList,
-  findManualProductDiscountItem,
   formatDateTime,
   formatV1Product,
   generateDuration,
@@ -701,21 +625,11 @@ function formatV1Product(products) {
   isTempOrder,
   mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments,
-  mergeManualProductDiscountIntoList,
   mergeRelationForms,
   normalizeBookingIsAll,
   normalizeBookingSubType,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
-  resolveManualDiscountMessage,
-  resolveManualDiscountOriginTotal,
-  resolveManualDiscountReasonFromSources,
-  resolveManualOverrideLineOriginalPrice,
-  resolveRulesManualDiscountFlag,
-  resolveSafeProductNum,
   resolveSubmitCollectPax,
-  shouldBuildManualProductDiscount,
-  stripManualProductDiscountItems,
-  sumOptionUnitPrice,
-  syncManualProductDiscountProductNum
+  sumOptionUnitPrice
 });

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

@@ -32,10 +32,6 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         unavailableReason?: UnavailableReason;
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
-    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
-    excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
-    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
-    resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];

package/lib/modules/Rules/index.js

@@ -159,14 +159,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   filterDiscountListByType(discountList, type) {
     return (discountList || []).filter((item) => item.type === type || item.tag === type);
   }
-  /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
-  excludeDiscountListByType(discountList, type) {
-    return (discountList || []).filter((item) => item.type !== type && item.tag !== type);
-  }
-  /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
-  resolveDiscountListForManualOverride(discountList) {
-    return this.excludeDiscountListByType(discountList, "promotion");
-  }
   // 获取券不可用的原因
   getUnavailableReason(discountList, productList) {
     var _a;
@@ -681,7 +673,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }, 0);
     };
     sortedFlattenedList.forEach((flatItem, index) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -904,7 +896,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   price: product.price,
                   options: restoredOptions
                 },
-                discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(product.discount_list) : this.filterDiscountListByType(product.discount_list, "promotion")
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           } else {
@@ -926,14 +918,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   main_product_selling_price,
                   options: restoredOptions
                 },
-                discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(product.discount_list) : this.filterDiscountListByType(product.discount_list, "promotion")
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           }
         } else {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
-            discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(((_v = flatItem.bundleItem) == null ? void 0 : _v.discount_list) || []) : this.filterDiscountListByType(((_w = flatItem.bundleItem) == null ? void 0 : _w.discount_list) || [], "promotion"),
+            discount_list: this.filterDiscountListByType(((_v = flatItem.bundleItem) == null ? void 0 : _v.discount_list) || [], "promotion"),
             price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
             processed: true
           }]);
@@ -984,13 +976,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           if (this.filterDiscountListByType(product.discount_list, "promotion").length && product.origin_total) {
             productOriginTotal = product.origin_total;
           }
-          if (Number(((_x = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _x.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+          if (Number(((_w = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _w.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
           const isOrderLevel = (0, import_utils3.isOrderLevelFixedAmountDiscount)(selectedDiscount2);
           const orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount2.id) : null;
           const productAllocation = orderLevelAllocation == null ? void 0 : orderLevelAllocation.get(flatItem._id);
-          const isDeductOptionPrice = !!((_y = selectedDiscount2.config) == null ? void 0 : _y.deductOptionPrice);
+          const isDeductOptionPrice = !!((_x = selectedDiscount2.config) == null ? void 0 : _x.deductOptionPrice);
           let mainProductSellingPrice;
           let amount;
           let productDiscountDifference;
@@ -1008,7 +1000,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             );
             amount = new import_decimal.default(product.price).minus(new import_decimal.default(mainProductSellingPrice)).toNumber();
           }
-          if (isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length)) {
+          if (isDeductOptionPrice && ((_y = product.options) == null ? void 0 : _y.length)) {
             const optionResult = applyDiscountToOptions(
               product.options,
               selectedDiscount2
@@ -1016,7 +1008,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             discountedOptions = optionResult.discountedOptions;
             optionDiscountAmount = optionResult.optionDiscountAmount;
           }
-          const optionsForLineTotal = isDeductOptionPrice && ((_A = product.options) == null ? void 0 : _A.length) ? discountedOptions : product.options;
+          const optionsForLineTotal = isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length) ? discountedOptions : product.options;
           const optionsLineTotal = getOptionTotal(optionsForLineTotal || []);
           const total = new import_decimal.default(mainProductSellingPrice).plus(optionsLineTotal).toNumber();
           const mainProductDiscountAmount = amount;
@@ -1027,9 +1019,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: lineDiscountAmount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
-              discount_card_type: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_card_type,
+              discount_card_type: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_card_type,
               fixed_amount: lineDiscountAmount,
-              discount_calculation_mode: (_C = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _C.discount_calculation_mode,
+              discount_calculation_mode: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.price,
@@ -1111,7 +1103,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               type: "good_pass",
               discount: {
                 fixed_amount: product.origin_total,
-                discount_calculation_mode: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.discount_calculation_mode,
+                discount_calculation_mode: (_C = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _C.discount_calculation_mode,
                 resource_id: selectedDiscount2.id,
                 title: selectedDiscount2.format_title,
                 original_amount: product.origin_total,
@@ -1185,9 +1177,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: fixedAmountPerItem * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
-              discount_card_type: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_card_type,
+              discount_card_type: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.discount_card_type,
               fixed_amount: fixedAmountPerItem,
-              discount_calculation_mode: (_F = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _F.discount_calculation_mode,
+              discount_calculation_mode: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
@@ -1203,7 +1195,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             },
             config: selectedDiscount2 == null ? void 0 : selectedDiscount2.config,
-            _num: (product.num || 1) * (((_G = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _G.num) || 1)
+            _num: (product.num || 1) * (((_F = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _F.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);

package/lib/modules/SalesSummary/index.js

@@ -30,8 +30,7 @@ __reExport(SalesSummary_exports, require("./types"), module.exports);
 var salesSummaryDataKeys = {
   isPriceIncludeTax: "is_price_include_tax",
   taxRate: "tax_rate",
-  taxTitle: "tax_title",
-  taxCountryCode: "tax_country_code"
+  taxTitle: "tax_title"
 };
 var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -85,8 +84,7 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     return {
       isPriceIncludeTax: this.getAppData(salesSummaryDataKeys.isPriceIncludeTax),
       taxRate: this.getAppData(salesSummaryDataKeys.taxRate),
-      taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle),
-      taxCountryCode: this.getAppData(salesSummaryDataKeys.taxCountryCode)
+      taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle)
     };
   }
   async getSummary(params) {

package/lib/modules/index.d.ts

@@ -16,4 +16,3 @@ export * from './Schedule';
 export * from './Quotation';
 export * from './ScanOrderLogger';
 export * from './OpenData';
-export * from './BookingContext';

package/lib/modules/index.js

@@ -34,7 +34,6 @@ __reExport(modules_exports, require("./Schedule"), module.exports);
 __reExport(modules_exports, require("./Quotation"), module.exports);
 __reExport(modules_exports, require("./ScanOrderLogger"), module.exports);
 __reExport(modules_exports, require("./OpenData"), module.exports);
-__reExport(modules_exports, require("./BookingContext"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
@@ -54,6 +53,5 @@ __reExport(modules_exports, require("./BookingContext"), module.exports);
   ...require("./Schedule"),
   ...require("./Quotation"),
   ...require("./ScanOrderLogger"),
-  ...require("./OpenData"),
-  ...require("./BookingContext")
+  ...require("./OpenData")
 });

package/lib/server/modules/order/utils/filterOrders.js

@@ -33,13 +33,6 @@ __export(filterOrders_exports, {
 });
 module.exports = __toCommonJS(filterOrders_exports);
 var import_dayjs = __toESM(require("dayjs"));
-function getOrderPaymentCodes(order) {
-  const payments = order.payments;
-  if (!Array.isArray(payments) || payments.length === 0) {
-    return [];
-  }
-  return payments.map((item) => item == null ? void 0 : item.code).filter((code) => typeof code === "string" && code.length > 0);
-}
 function filterOrders(orders, filters) {
   const safeFilters = filters || {};
   if (!orders || !Array.isArray(orders)) {
@@ -140,27 +133,26 @@ function filterOrders(orders, filters) {
       }
     }
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
-      const orderPaymentCodes = getOrderPaymentCodes(order);
-      if (orderPaymentCodes.length === 0) {
+      if (!order.payment_methods || !Array.isArray(order.payment_methods) || order.payment_methods.length === 0) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: "payment_methods",
-            actual: order.payments,
+            actual: order.payment_methods,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      const hasMatch = orderPaymentCodes.some((code) => safeFilters.payment_methods.includes(code));
+      const hasMatch = order.payment_methods.some((pm) => safeFilters.payment_methods.includes(pm));
       if (!hasMatch) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: "payment_methods",
-            actual: orderPaymentCodes,
+            actual: order.payment_methods,
             expected: safeFilters.payment_methods
           }
         });