@pisell/private-materials 6.9.6 → 6.10.2

package/lib/components/booking/components/customiseItemModal/index.js

@@ -36,7 +36,7 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_utils = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
-var import_NumericStepper = __toESM(require("../../../../pro/NumericStepper"));
+var import_pisellNumberSelector = __toESM(require("../../../../pro/pisellNumberSelector"));
 var import_pisellPriceKeyboardModal = __toESM(require("../../../../pro/pisellPriceKeyboardModal"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
@@ -244,9 +244,8 @@ var CustomiseItemModal = ({
       },
       import_utils.locales.getText("pisell2.customise-item.save")
     )))), /* @__PURE__ */ import_react.default.createElement("div", { className: "customise-item-quantity-selector-fixed" }, /* @__PURE__ */ import_react.default.createElement(
-      import_NumericStepper.default,
+      import_pisellNumberSelector.default,
       {
-        variant: "capsule",
         value: quantity,
         min: 1,
         max: 999,
@@ -258,7 +257,9 @@ var CustomiseItemModal = ({
           } else {
             setQuantity(value);
           }
-        }
+        },
+        size: "middle",
+        enablePriceAdjust: true
       }
     ))),
     /* @__PURE__ */ import_react.default.createElement(

package/lib/components/booking/components/footer/amount.d.ts

@@ -1,5 +1,4 @@
 export declare const getRelationDetailsTotal: (relation_details: any) => number;
-export declare const getProductDiscountProductDiscountDifference: (product: any) => any;
 export declare const getIsPriceIncludeTax: (state: any) => any;
 /**
  * 总金额

package/lib/components/booking/components/footer/amount.js

@@ -30,7 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var amount_exports = {};
 __export(amount_exports, {
   getIsPriceIncludeTax: () => getIsPriceIncludeTax,
-  getProductDiscountProductDiscountDifference: () => getProductDiscountProductDiscountDifference,
   getRelationDetailsTotal: () => getRelationDetailsTotal,
   getSumTotal: () => getSumTotal
 });
@@ -40,7 +39,6 @@ var import_utils2 = require("@pisell/utils");
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils3 = require("../../info/service2/utils");
 var import_utils4 = require("../../info2/service/addService/utils");
-var import_utils5 = require("./utils");
 var getRelationDetailsTotal = (relation_details) => {
   let total = new import_decimal.default(0);
   for (let item of relation_details) {
@@ -50,16 +48,6 @@ var getRelationDetailsTotal = (relation_details) => {
   }
   return total.toNumber();
 };
-var getProductDiscountProductDiscountDifference = (product) => {
-  var _a, _b;
-  const mainDiscountList = product.discount_list || [];
-  const bundleDiscountList = (0, import_utils5.getBundleDiscountList)(((_b = (_a = product._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []);
-  const discountList = [...mainDiscountList, ...bundleDiscountList];
-  return discountList.reduce((pre, cur) => {
-    var _a2;
-    return pre + (((_a2 = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a2.product_discount_difference) || 0);
-  }, 0);
-};
 var getProductExpectAmount = (state, isEdit, isOriginTotal) => {
   var _a, _b, _c, _d;
   let price = new import_decimal.default(0);
@@ -76,7 +64,6 @@ var getProductExpectAmount = (state, isEdit, isOriginTotal) => {
             const itemTotal = new import_decimal.default(item._extend.total || 0);
             const itemOriginTotal = new import_decimal.default(item._extend.origin_total || 0);
             price = price.add((isOriginTotal ? itemOriginTotal : itemTotal).mul(quantity));
-            price = price.sub(getProductDiscountProductDiscountDifference(item));
             const _duration = !(0, import_utils3.isNormalProductByDurationSchedule)(item) ? new import_decimal.default(item._extend.duration || 0) : new import_decimal.default(0);
             if (isDay || (0, import_utils4.isMultiDayProduct)(item)) {
               dayDuration = dayDuration.add(_duration);
@@ -92,7 +79,6 @@ var getProductExpectAmount = (state, isEdit, isOriginTotal) => {
               item._extend.relation_details || []
             ));
             price = price.add(relationTotal);
-            price = price.sub(getProductDiscountProductDiscountDifference(item));
             const itemDuration = new import_decimal.default(import_utils.flexibleObj.getValue(item._extend.duration) || 0);
             duration = duration.add(itemDuration);
             if ((0, import_utils4.isMultiDayProduct)(item)) {
@@ -164,22 +150,19 @@ var getProductItemTax = (item, state, options) => {
       }
     }
   }
-  return singleItemTax.times(quantity);
+  return singleItemTax.times(quantity).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
 };
 var processItemsTax = (items, state, options) => {
   var _a, _b, _c;
   const { tax_rate, is_price_include_tax, computed } = options;
   const { shopDiscount, productExpectAmount } = computed;
-  let preciseOriginTax = new import_decimal.default(0);
-  let preciseTax = new import_decimal.default(0);
-  let roundedOriginTax = new import_decimal.default(0);
-  let roundedTax = new import_decimal.default(0);
-  let lastTaxableItem = null;
+  let originTax = new import_decimal.default(0);
+  let tax = new import_decimal.default(0);
   for (let item of items) {
     const quantity = new import_decimal.default(item._extend.quantity || 1);
     const unitPrice = new import_decimal.default(item._extend.total || 0);
     const mainProductPrice = new import_decimal.default(getMainProductTotal(item) || 0);
-    let originalTaxPerItemPrecise = getProductItemTax(
+    let originalTaxPerItem = getProductItemTax(
       {
         ...item,
         total: mainProductPrice.add(((_a = item._extend) == null ? void 0 : _a.surcharge_fee) || 0).toNumber(),
@@ -197,7 +180,7 @@ var processItemsTax = (items, state, options) => {
       mainItemDiscount = mainProductPrice.dividedBy(productExpectAmount).times(shopDiscount);
     }
     const mainItemDiscountedUnitPrice = mainProductPrice.minus(mainItemDiscount).add(((_b = item._extend) == null ? void 0 : _b.surcharge_fee) || 0);
-    const maxDiscountedTaxPerItemPrecise = getProductItemTax(
+    const maxDiscountedTaxPerItem = getProductItemTax(
       {
         ...item,
         total: mainItemDiscountedUnitPrice.toNumber(),
@@ -207,13 +190,8 @@ var processItemsTax = (items, state, options) => {
       state,
       { tax_rate, is_price_include_tax }
     );
-    const maxDiscountedTaxPerItemRounded = maxDiscountedTaxPerItemPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
-    item._extend.main_product_attached_bundle_tax_fee = maxDiscountedTaxPerItemRounded.toNumber();
-    if (maxDiscountedTaxPerItemPrecise.gt(0)) {
-      lastTaxableItem = { type: "main", item };
-    }
-    let addTimePreciseTax = new import_decimal.default(0);
-    let addTimeRoundedTax = new import_decimal.default(0);
+    item._extend.main_product_attached_bundle_tax_fee = maxDiscountedTaxPerItem.toNumber();
+    let addTimeTotalTax = new import_decimal.default(0);
     if (Array.isArray(item._extend.relation_details)) {
       for (let atItem of item._extend.relation_details) {
         const _originTotal = new import_decimal.default(
@@ -225,7 +203,7 @@ var processItemsTax = (items, state, options) => {
             _originTotal.dividedBy(productExpectAmount).times(shopDiscount)
           );
         }
-        const addTimeTaxPerItemPrecise = getProductItemTax(
+        const addTimeTaxPerItem = getProductItemTax(
           {
             ...atItem,
             total: _discountedTotal.add((atItem == null ? void 0 : atItem.surcharge_fee) || 0).toNumber(),
@@ -234,19 +212,11 @@ var processItemsTax = (items, state, options) => {
           state,
           { tax_rate, is_price_include_tax }
         );
-        const addTimeTaxPerItemRounded = addTimeTaxPerItemPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
-        atItem.tax_fee = addTimeTaxPerItemRounded.toNumber();
-        addTimePreciseTax = addTimePreciseTax.plus(addTimeTaxPerItemPrecise);
-        addTimeRoundedTax = addTimeRoundedTax.plus(addTimeTaxPerItemRounded);
-        if (addTimeTaxPerItemPrecise.gt(0)) {
-          lastTaxableItem = { type: "addTime", item: atItem };
-        }
+        addTimeTotalTax = addTimeTotalTax.plus(addTimeTaxPerItem);
       }
     }
-    let bundlePreciseOriginTax = new import_decimal.default(0);
-    let bundlePreciseTax = new import_decimal.default(0);
-    let bundleRoundedOriginTax = new import_decimal.default(0);
-    let bundleRoundedTax = new import_decimal.default(0);
+    let bundleTotalOriginTax = new import_decimal.default(0);
+    let bundleTotalTax = new import_decimal.default(0);
     if (Array.isArray((_c = item._extend.other) == null ? void 0 : _c.bundle)) {
       for (let bundleItem of item._extend.other.bundle) {
         if (getBundleItemIsOriginalPrice(bundleItem)) {
@@ -254,7 +224,7 @@ var processItemsTax = (items, state, options) => {
           const bundleUnitPrice = new import_decimal.default(
             bundleItem.bundle_selling_price ?? bundleItem.price ?? 0
           );
-          const bundleOriginalTaxPerItemPrecise = getProductItemTax(
+          const bundleOriginalTaxPerItem = getProductItemTax(
             {
               ...bundleItem,
               total: bundleUnitPrice.add((bundleItem == null ? void 0 : bundleItem.surcharge_fee) || 0).toNumber(),
@@ -268,7 +238,7 @@ var processItemsTax = (items, state, options) => {
             bundleItemDiscount = bundleUnitPrice.dividedBy(productExpectAmount).times(shopDiscount);
           }
           const bundleDiscountedUnitPrice = bundleUnitPrice.minus(bundleItemDiscount).add((bundleItem == null ? void 0 : bundleItem.surcharge_fee) || 0);
-          const bundleDiscountedTaxPerItemPrecise = getProductItemTax(
+          const bundleDiscountedTaxPerItem = getProductItemTax(
             {
               ...bundleItem,
               total: bundleDiscountedUnitPrice.toNumber(),
@@ -277,86 +247,21 @@ var processItemsTax = (items, state, options) => {
             state,
             { tax_rate, is_price_include_tax }
           );
-          const bundleOriginalTaxPerItemRounded = bundleOriginalTaxPerItemPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
-          const bundleDiscountedTaxPerItemRounded = bundleDiscountedTaxPerItemPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
-          bundleItem.original_tax_fee = bundleOriginalTaxPerItemRounded.toNumber();
-          bundleItem.tax_fee = bundleDiscountedTaxPerItemRounded.toNumber();
-          bundlePreciseOriginTax = bundlePreciseOriginTax.plus(bundleOriginalTaxPerItemPrecise.times(bundleQuantity));
-          bundlePreciseTax = bundlePreciseTax.plus(bundleDiscountedTaxPerItemPrecise.times(bundleQuantity));
-          bundleRoundedOriginTax = bundleRoundedOriginTax.plus(bundleOriginalTaxPerItemRounded.times(bundleQuantity));
-          bundleRoundedTax = bundleRoundedTax.plus(bundleDiscountedTaxPerItemRounded.times(bundleQuantity));
-          if (bundleDiscountedTaxPerItemPrecise.gt(0)) {
-            lastTaxableItem = { type: "bundle", item: bundleItem };
-          }
+          bundleItem.original_tax_fee = new import_decimal.default(bundleOriginalTaxPerItem).toNumber();
+          bundleItem.tax_fee = new import_decimal.default(bundleDiscountedTaxPerItem).toNumber();
+          bundleTotalOriginTax = bundleTotalOriginTax.plus(bundleOriginalTaxPerItem.times(bundleQuantity));
+          bundleTotalTax = bundleTotalTax.plus(bundleDiscountedTaxPerItem.times(bundleQuantity));
         }
       }
     }
-    const originalTaxFeePrecise = originalTaxPerItemPrecise.plus(bundlePreciseOriginTax);
-    const taxFeePrecise = maxDiscountedTaxPerItemPrecise.plus(bundlePreciseTax);
-    const originalTaxFeeRounded = originalTaxPerItemPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).plus(bundleRoundedOriginTax);
-    const taxFeeRounded = maxDiscountedTaxPerItemRounded.plus(bundleRoundedTax);
-    item._extend.original_tax_fee = originalTaxFeeRounded.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
-    item._extend.tax_fee = taxFeeRounded.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
-    preciseOriginTax = preciseOriginTax.plus(originalTaxFeePrecise.times(quantity)).plus(addTimePreciseTax);
-    preciseTax = preciseTax.plus(taxFeePrecise.times(quantity)).plus(addTimePreciseTax);
-    roundedOriginTax = roundedOriginTax.plus(originalTaxFeeRounded.times(quantity)).plus(addTimeRoundedTax);
-    roundedTax = roundedTax.plus(taxFeeRounded.times(quantity)).plus(addTimeRoundedTax);
-  }
-  const expectedOriginTax = preciseOriginTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
-  const expectedTax = preciseTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
-  const originTaxRemainder = expectedOriginTax.minus(roundedOriginTax).toNumber();
-  const taxRemainder = expectedTax.minus(roundedTax).toNumber();
-  if (lastTaxableItem) {
-    if (originTaxRemainder !== 0) {
-      if (lastTaxableItem.type === "main") {
-        lastTaxableItem.item._extend.original_tax_fee_rounding_remainder = originTaxRemainder;
-      } else {
-        lastTaxableItem.item.original_tax_fee_rounding_remainder = originTaxRemainder;
-      }
-    }
-    if (taxRemainder !== 0) {
-      if (lastTaxableItem.type === "main") {
-        lastTaxableItem.item._extend.tax_fee_rounding_remainder = taxRemainder;
-      } else {
-        lastTaxableItem.item.tax_fee_rounding_remainder = taxRemainder;
-      }
-    }
-  }
-  return { originTax: expectedOriginTax, tax: expectedTax };
-};
-var clearTaxFee = (state) => {
-  var _a, _b;
-  const { service, addons } = state;
-  if (Array.isArray(service == null ? void 0 : service.value)) {
-    for (let item of service.value) {
-      item._extend.tax_fee = 0;
-      item._extend.original_tax_fee = 0;
-      item._extend.tax_fee_rounding_remainder = void 0;
-      item._extend.main_product_attached_bundle_tax_fee = 0;
-      for (let bundleItem of ((_a = item._extend.other) == null ? void 0 : _a.bundle) || []) {
-        bundleItem.tax_fee = 0;
-        bundleItem.original_tax_fee = 0;
-        bundleItem.tax_fee_rounding_remainder = void 0;
-      }
-      for (let relationDetail of item._extend.relation_details || []) {
-        relationDetail.tax_fee = 0;
-        relationDetail.tax_fee_rounding_remainder = void 0;
-      }
-    }
-  }
-  if (Array.isArray(addons == null ? void 0 : addons.value)) {
-    for (let item of addons.value) {
-      item._extend.tax_fee = 0;
-      item._extend.original_tax_fee = 0;
-      item._extend.tax_fee_rounding_remainder = void 0;
-      item._extend.main_product_attached_bundle_tax_fee = 0;
-      for (let bundleItem of ((_b = item._extend.other) == null ? void 0 : _b.bundle) || []) {
-        bundleItem.tax_fee = 0;
-        bundleItem.original_tax_fee = 0;
-        bundleItem.tax_fee_rounding_remainder = void 0;
-      }
-    }
+    const original_tax_fee = originalTaxPerItem.add(bundleTotalOriginTax);
+    const tax_fee = maxDiscountedTaxPerItem.add(bundleTotalTax);
+    item._extend.original_tax_fee = original_tax_fee.toNumber();
+    item._extend.tax_fee = tax_fee.toNumber();
+    originTax = originTax.plus(original_tax_fee.times(quantity)).plus(addTimeTotalTax);
+    tax = tax.plus(tax_fee.times(quantity)).plus(addTimeTotalTax);
   }
+  return { originTax, tax };
 };
 var getTax = (state, options) => {
   var _a, _b, _c;
@@ -364,7 +269,6 @@ var getTax = (state, options) => {
   if (!isEdit) {
     return { tax: Number((_a = state.bookingDetail) == null ? void 0 : _a.tax_fee) || 0 };
   }
-  clearTaxFee(state);
   let totalOriginTax = new import_decimal.default(0);
   let totalTax = new import_decimal.default(0);
   if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
@@ -498,7 +402,7 @@ var getMainProductTotal = (item) => {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
       const discountAmount = getDiscountAmount(bundleItem.discount_list);
       const bundleItemPrice = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
-      const bundleItemTotal = bundleItemPrice;
+      const bundleItemTotal = bundleItemPrice.minus(discountAmount);
       total = total.add(bundleItemTotal);
     }
   }
@@ -917,7 +821,6 @@ var getSumTotal = (state, options) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getIsPriceIncludeTax,
-  getProductDiscountProductDiscountDifference,
   getRelationDetailsTotal,
   getSumTotal
 });

package/lib/components/booking/components/footer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

package/lib/components/booking/components/footer/index.js

@@ -63,12 +63,6 @@ var import_ahooks = require("ahooks");
 var import_lodash = require("lodash");
 var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var import_utils5 = require("../../utils");
-var import_useLogger = __toESM(require("../../../../hooks/useLogger"));
-var import_useActiveExecute = require("../../../ticketBooking/hooks/pisellos/useActiveExecute");
-var import_printer = __toESM(require("../../../../hooks/printer"));
-var import_PaymentResultToastUtils = require("../../../checkout/utils/PaymentResultToastUtils");
-var import_materials2 = require("@pisell/materials");
-var import_icon = require("@pisell/icon");
 var Footer = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
   const { state, buttons, dispatch, source } = props;
@@ -79,7 +73,6 @@ var Footer = (props) => {
   const [isPaymentModalOpen, setIsPaymentModalOpen] = (0, import_react.useState)(false);
   const [paymentModalData, setPaymentModalData] = (0, import_react.useState)(null);
   const [paymentCallback, setPaymentCallback] = (0, import_react.useState)(null);
-  const logger = (0, import_useLogger.default)();
   const [editOrderId, setEditOrderId] = (0, import_react.useState)(0);
   const [isShowPaymentLink, setIsShowPaymentLink] = (0, import_react.useState)(false);
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
@@ -140,207 +133,6 @@ var Footer = (props) => {
       setEditOrderId(0);
     }
   }, [state.service.value, (_b = state.paymentPaid) == null ? void 0 : _b.value]);
-  const { executeIfActive } = (0, import_useActiveExecute.useActiveExecute)();
-  const { nativePrint } = (0, import_printer.default)();
-  const Toast = (0, import_materials2.useToast)();
-  const paymentResultToastConfig = {
-    context,
-    pisellos,
-    getData,
-    interaction,
-    Toast,
-    onToastClose: () => {
-    }
-  };
-  const generateActionButtons = (paymentStatus, enabledAutoPrint = false, orderId = "") => {
-    const getClassName = (suffix) => `payment-result-toast-${suffix}`;
-    const handleDetailsClick = async () => {
-      var _a2;
-      setTimeout(() => {
-        (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
-      }, 0);
-      const { isTerminal: isTerminal2, isWebPos: isWebPos2, NativePage } = (_a2 = context.appHelper) == null ? void 0 : _a2.utils;
-      if (isWebPos2) {
-        const nativePage = NativePage == null ? void 0 : NativePage();
-        nativePage.open({ page: "/native/order/detail", params: { order_id: orderId } });
-        return;
-      }
-      if (isTerminal2 == null ? void 0 : isTerminal2()) {
-        return interaction.utils.postMessageToApp({
-          module: "booking",
-          key: "view_order",
-          data: {
-            order_id: orderId
-          },
-          origin: "/booking"
-        });
-      }
-    };
-    const handlePrintReceiptClick = async () => {
-      setTimeout(() => {
-        (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
-      }, 0);
-      let data = {
-        orderId
-      };
-      if (data.orderId) {
-        const params2 = {
-          type: "0",
-          data: { order_id: data.orderId }
-        };
-        try {
-          nativePrint(params2, (res) => {
-            console.log("handleButtonClick_print-receipt_res>>>>", res);
-            if (!(res == null ? void 0 : res.result)) {
-              Toast == null ? void 0 : Toast.error((res == null ? void 0 : res.msg) || "");
-            }
-          });
-        } catch (error) {
-          console.error("handleButtonClick_print-receipt_error>>>>", error);
-        }
-      }
-    };
-    return [
-      [
-        {
-          id: "details",
-          buttonProps: {
-            className: getClassName("action-button"),
-            onClick: handleDetailsClick,
-            icon: /* @__PURE__ */ import_react.default.createElement(import_icon.FileCheck02, { className: getClassName("action-icon") }),
-            children: import_utils.locales.getText("payment.result.details")
-          }
-        },
-        {
-          id: "print",
-          buttonProps: {
-            className: getClassName("action-button"),
-            onClick: handlePrintReceiptClick,
-            icon: /* @__PURE__ */ import_react.default.createElement(import_icon.Printer, { className: getClassName("action-icon") }),
-            children: import_utils.locales.getText("payment.result.printReceipt")
-          }
-        }
-      ]
-    ];
-  };
-  let isCurrentOrderSynceFromCart = (0, import_react.useRef)(false);
-  (0, import_react.useEffect)(() => {
-    const orderSubmitStartUnsubscribe = pisellos.effects.on(
-      "checkout:onOrderSubmitStart",
-      executeIfActive(() => {
-        var _a2;
-        if (isPaymentModalOpen) return;
-        isCurrentOrderSynceFromCart.current = true;
-        (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast, "", 0);
-      })
-    );
-    const orderSubmitEndUnsubscribe = pisellos.effects.on(
-      "checkout:onOrderSubmitEnd",
-      executeIfActive(() => {
-        var _a2;
-        if (isPaymentModalOpen) return;
-        (_a2 = Toast == null ? void 0 : Toast.hide) == null ? void 0 : _a2.call(Toast);
-      })
-    );
-    const orderSyncedUnsubscribe = pisellos.effects.on(
-      "checkout:onOrderSynced",
-      executeIfActive(async (data) => {
-        var _a2, _b2, _c2, _d2, _e2, _f2;
-        if (!isCurrentOrderSynceFromCart.current) return;
-        isCurrentOrderSynceFromCart.current = false;
-        const responseData = (_a2 = data.response) == null ? void 0 : _a2.data;
-        const paymentStatus = responseData == null ? void 0 : responseData.payment_status;
-        const orderTotalAmount = Number((responseData == null ? void 0 : responseData.total_amount) || 0);
-        const gapAmount = Number((responseData == null ? void 0 : responseData.amount_gap) || 0);
-        const currentChangeGivenAmount = Number(
-          (_b2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b2.current_change_given_amount
-        );
-        const failureReason = responseData == null ? void 0 : responseData.failure_reason;
-        if (paymentStatus) {
-          console.log("print_order_onOrderSynced>>>>", responseData);
-          logger == null ? void 0 : logger.addLog({
-            type: "info",
-            title: "print_order_onOrderSynced",
-            metadata: {
-              responseData
-            }
-          });
-          try {
-            const params2 = {
-              type: "99",
-              // 打印订单全部信息
-              data: {
-                order_id: responseData.order_id,
-                machine_code_print_info: responseData == null ? void 0 : responseData.machine_code_print_info,
-                small_ticket_data: (_c2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c2.small_ticket_data,
-                machine_code_print_info_v2: responseData == null ? void 0 : responseData.machine_code_print_info_v2
-              }
-            };
-            console.log("print_order_onOrderSynced_params>>>>", params2);
-            logger == null ? void 0 : logger.addLog({
-              type: "info",
-              title: "print_order_onOrderSynced_params",
-              metadata: {
-                params: params2
-              }
-            });
-            nativePrint(params2, (res) => {
-              console.log("print_order_onOrderSynced_res>>>>", res);
-              logger == null ? void 0 : logger.addLog({
-                type: "info",
-                title: "print_order_onOrderSynced_res",
-                metadata: {
-                  res
-                }
-              });
-            });
-          } catch (error) {
-            console.error("print_order_onOrderSynced_error>>>>", error);
-            logger == null ? void 0 : logger.addLog({
-              type: "info",
-              title: "print_order_onOrderSynced_error",
-              metadata: {
-                error
-              }
-            });
-          }
-          const autoCloseConfig = (0, import_PaymentResultToastUtils.calculateAutoCloseConfig)(
-            paymentStatus,
-            !!currentChangeGivenAmount
-          );
-          let enabledAutoPrint = false;
-          if (isWebPos) {
-            enabledAutoPrint = false;
-          } else {
-            enabledAutoPrint = await ((_e2 = (_d2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d2.asyncDataManager) == null ? void 0 : _e2.call(_d2, {
-              module: "get",
-              key: "auto_print_receipt"
-            }));
-          }
-          autoCloseConfig.autoClose = false;
-          autoCloseConfig.autoCloseDelay = 0;
-          autoCloseConfig.maskClosable = false;
-          (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
-            {
-              paymentStatus,
-              orderTotalAmount: (_f2 = data.response.data) == null ? void 0 : _f2.total_amount,
-              gapAmount: paymentStatus === "partially_paid" ? gapAmount : currentChangeGivenAmount,
-              failureReason,
-              autoCloseConfig,
-              actionButtons: generateActionButtons(paymentStatus, enabledAutoPrint, responseData == null ? void 0 : responseData.order_id)
-            },
-            paymentResultToastConfig
-          );
-        }
-        handleClearAll();
-      })
-    );
-    return () => {
-      orderSubmitStartUnsubscribe();
-      orderSubmitEndUnsubscribe();
-      orderSyncedUnsubscribe();
-    };
-  }, [isPaymentModalOpen]);
   const [modal, contextHolder] = import_antd.Modal.useModal();
   const { setActiveTab } = state;
   const isTeam = (0, import_react.useMemo)(() => {
@@ -478,15 +270,6 @@ var Footer = (props) => {
       ...getDataFromHost()
     });
   }, [state, isEdit]);
-  (0, import_react.useEffect)(() => {
-    window.dispatchEvent(
-      new CustomEvent("onOriginExpectAmountWithoutDiscountChange", {
-        detail: {
-          originExpectAmountWithoutDiscount: total == null ? void 0 : total.originExpectAmountWithoutDiscount
-        }
-      })
-    );
-  }, [total == null ? void 0 : total.originExpectAmountWithoutDiscount]);
   const orderTotalList = (0, import_react.useMemo)(() => {
     return [
       // 订单已付金额
@@ -589,8 +372,6 @@ var Footer = (props) => {
         type: "pisell1.handleOpenPayment",
         data: { order: { id: order_id2 } },
         callback: (res) => {
-          var _a3;
-          if ((_a3 = res == null ? void 0 : res.data) == null ? void 0 : _a3.isCallbackFromToast) return;
           state == null ? void 0 : state.callback({}, "save");
         }
       });
@@ -686,10 +467,6 @@ var Footer = (props) => {
     if (isToastMode) {
       (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
     }
-    logger.addLog({
-      title: "Footer: handleCheckoutInternal 调用",
-      metadata: { isToastMode }
-    });
     const isNewOrder = !state.bookingId;
     if (isEdit) {
       if ((0, import_utils2.isDayBooking)(state)) {
@@ -716,17 +493,18 @@ var Footer = (props) => {
         setIsPaymentModalOpen(true);
         setCheckoutLoading(false);
         setPaymentCallback(() => (paymentResult) => {
-          var _a3, _b3, _c3, _d2;
+          var _a3, _b3, _c3, _d2, _e2, _f2, _g2, _h2;
           console.log("Payment result:", paymentResult);
           setIsPaymentModalOpen(false);
           if ((paymentResult == null ? void 0 : paymentResult.status) === "success" || ((_b3 = (_a3 = paymentResult == null ? void 0 : paymentResult.response) == null ? void 0 : _a3.data) == null ? void 0 : _b3.payment_status) === "paid") {
             console.log("Payment completed successfully");
+            (_d2 = (_c3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c3.bookingTicket) == null ? void 0 : _d2.clearAllCart();
             setPaymentModalData(null);
             setPaymentCallback(null);
           } else if ((paymentResult == null ? void 0 : paymentResult.status) === "cancelled") {
             console.log("Payment cancelled");
             if (res == null ? void 0 : res.order_id) {
-              (_d2 = (_c3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c3.booking) == null ? void 0 : _d2.voidBooking(res.order_id);
+              (_f2 = (_e2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _e2.booking) == null ? void 0 : _f2.voidBooking(res.order_id);
             }
             setPaymentModalData(null);
             setPaymentCallback(null);
@@ -734,6 +512,7 @@ var Footer = (props) => {
             console.log("Payment status:", paymentResult == null ? void 0 : paymentResult.status);
             setPaymentModalData(null);
             setPaymentCallback(null);
+            (_h2 = (_g2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _g2.bookingTicket) == null ? void 0 : _h2.clearAllCart();
           }
         });
       } else {
@@ -818,13 +597,6 @@ var Footer = (props) => {
     noSubmit = false
   }) => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2;
-    logger.addLog({
-      title: "Footer: handleSave 调用",
-      metadata: {
-        type,
-        noSubmit
-      }
-    });
     const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
     if (isToastMode) {
       (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
@@ -879,7 +651,6 @@ var Footer = (props) => {
           state == null ? void 0 : state.callback(res, type);
           _setLoading(false);
         }
-        setEditOrderId(0);
         return;
       }
       if (type === "save") {
@@ -1509,10 +1280,6 @@ var Footer = (props) => {
   const { clearAllScanListenersTaskQueue } = (0, import_useScanManager.default)();
   const handleClearAllAndReset = () => {
     var _a2, _b2;
-    logger.addLog({
-      title: "Footer: PaymentOnClose reset 清空所有内容并重置购物车",
-      metadata: {}
-    });
     clearAllScanListenersTaskQueue();
     (_b2 = (_a2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a2.bookingTicket) == null ? void 0 : _b2.clearAllCart();
   };
@@ -1524,10 +1291,7 @@ var Footer = (props) => {
     dispatch({
       type: "setService",
       payload: {
-        value: state.service.value.map((item) => {
-          var _a2;
-          return { ...item, edit: true, booking_id: "checkout_edit", discount_list: ((_a2 = item.discount_list) == null ? void 0 : _a2.map((d) => ({ ...d, id: d.discount.resource_id }))) || [] };
-        })
+        value: state.service.value.map((item) => ({ ...item, edit: true, booking_id: "checkout_edit", discount_list: item.discount_list.map((d) => ({ ...d, id: d.discount.resource_id })) }))
       }
     });
     dispatch({
@@ -1656,9 +1420,6 @@ var Footer = (props) => {
           handleClearAllAndReset();
         }
         setEditOrderId(0);
-      },
-      onSetLocalOrderId: (e) => {
-        setEditOrderId(e);
       }
     }
   ), /* @__PURE__ */ import_react.default.createElement(import_confirmHolderModal.ConfirmHolderModal, null));

package/lib/components/booking/components/footer/utils.d.ts

@@ -15,7 +15,7 @@ export declare const formatProductOption: (option: any) => any;
  * @Author: zhiwei.Wang
  * @Date: 2024-02-19 09:26
  */
-export declare const formatProductBundle: (bundle: any, is_price_include_tax: number) => any;
+export declare const formatProductBundle: (bundle: any) => any;
 /**
  * 获取子商品折扣信息
  * @param item