@pisell/private-materials 6.6.60 → 6.6.61

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

@@ -323,7 +323,7 @@ var processItemsTax = (items, state, options) => {
       }
     }
   }
-  return { originTax: expectedOriginTax, tax: expectedTax, taxDecimal: preciseTax };
+  return { originTax: expectedOriginTax, tax: expectedTax };
 };
 var clearTaxFee = (state) => {
   var _a, _b;
@@ -376,7 +376,7 @@ var getTax = (state, options) => {
         computed
       });
       totalOriginTax = totalOriginTax.plus(serviceResult.originTax);
-      totalTax = totalTax.plus(serviceResult.taxDecimal);
+      totalTax = totalTax.plus(serviceResult.tax);
     }
     if ((_c = state == null ? void 0 : state.addons) == null ? void 0 : _c.value) {
       const addonsResult = processItemsTax(state.addons.value, state, {
@@ -385,7 +385,7 @@ var getTax = (state, options) => {
         computed
       });
       totalOriginTax = totalOriginTax.plus(addonsResult.originTax);
-      totalTax = totalTax.plus(addonsResult.taxDecimal);
+      totalTax = totalTax.plus(addonsResult.tax);
     }
   }
   return {

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

@@ -111,14 +111,13 @@ var formatProductBundle = (bundle) => {
   } catch (error) {
   }
   return bundle.map((d) => {
-    var _a;
     const option = formatProductOption(d.option);
     const option_price = option.reduce((temp, item) => {
       return temp + Number(item.num) * item.custom_add_price;
     }, 0);
     const product_discount_difference = ((d == null ? void 0 : d.discount_list) || []).reduce((pre, cur) => {
-      var _a2;
-      return pre + (((_a2 = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a2.product_discount_difference) || 0);
+      var _a;
+      return pre + (((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
     }, 0);
     return {
       "is_charge_tax": d.is_charge_tax,
@@ -139,7 +138,7 @@ var formatProductBundle = (bundle) => {
       "bundle_selling_price": Math.abs(d == null ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
       "metadata": {
-        custom_product_bundle_map_id: ((_a = d == null ? void 0 : d.metadata) == null ? void 0 : _a.custom_product_bundle_map_id) || d._id,
+        custom_product_bundle_map_id: d._id,
         // 子商品单数量附加费
         "surcharge_fee": d.surcharge_fee,
         // 可选，附加费均摊舍入金额
@@ -254,10 +253,13 @@ var formatHolders = (state, item, values) => {
   return obj;
 };
 var formatProductPrice = (item) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g;
   const other = (_a = item._extend) == null ? void 0 : _a.other;
   let price = Number((item == null ? void 0 : item.price) ?? ((_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.price));
-  if ((other == null ? void 0 : other.product_variant_id) > 0 && ((_c = item == null ? void 0 : item.variant) == null ? void 0 : _c.length) > 0) {
+  if ((0, import_utils5.isString)((_c = item._extend) == null ? void 0 : _c.priceOverride) || (0, import_utils5.isNumber)((_d = item._extend) == null ? void 0 : _d.priceOverride)) {
+    price = Number((_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.price);
+  }
+  if ((other == null ? void 0 : other.product_variant_id) > 0 && ((_f = item == null ? void 0 : item.variant) == null ? void 0 : _f.length) > 0) {
     const variant = item.variant.find(
       (d) => d.id === (other == null ? void 0 : other.product_variant_id)
     );
@@ -266,7 +268,7 @@ var formatProductPrice = (item) => {
     }
   }
   if (other == null ? void 0 : other.option) {
-    price = (_d = other == null ? void 0 : other.option) == null ? void 0 : _d.reduce((pre, cur) => {
+    price = (_g = other == null ? void 0 : other.option) == null ? void 0 : _g.reduce((pre, cur) => {
       return pre + Number(cur.price) * Number(cur.num);
     }, price);
   }
@@ -371,7 +373,7 @@ var getMainProductSellingPrice = (item) => {
   }
   return new import_decimal.default((_f = item._extend) == null ? void 0 : _f.main_product_selling_price).add(optionPrice).toNumber();
 };
-var formatProducts = (item, quantity, options) => {
+var formatProducts = (item, quantity) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const total = Number(item._extend.total);
   const origin_total = Number(item._extend.origin_total);
@@ -385,9 +387,6 @@ var formatProducts = (item, quantity, options) => {
       ...d.metadata,
       unique_identification_number: `${item._extend.unique_identification_number}_${d.discount.resource_id}`
     };
-    if ((options == null ? void 0 : options.isServiceEdit) && (options == null ? void 0 : options.isMultiDay)) {
-      delete d.id;
-    }
   });
   const notManualDiscount = discount_list.filter(
     (item2) => item2.type !== "product"
@@ -528,10 +527,7 @@ var formatBookings = (data, values) => {
       item._extend.unique_identification_number = unique_identification_number;
     }
     const booking = {
-      product: formatProducts(item, void 0, {
-        isServiceEdit: data.service.edit,
-        isMultiDay
-      }),
+      product: formatProducts(item),
       relation_products: formatRelationDetails(item._extend.relation_details),
       id: item.booking_id || 0,
       relation_id: item._extend.relation_id || 0,

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

@@ -111,7 +111,7 @@ var VoucherCard = (props) => {
     const val = (_a2 = state.service.value || []) == null ? void 0 : _a2.map((value) => {
       var _a3, _b2, _c2;
       return {
-        // booking_id: value.booking_id,
+        booking_id: value.booking_id,
         id: value.id,
         price: value.price,
         total: (_a3 = value == null ? void 0 : value._extend) == null ? void 0 : _a3.total,

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

@@ -5,6 +5,11 @@ export interface BookingDashboardProps extends React.HTMLAttributes<HTMLDivEleme
     valueColor?: string;
     otherParams?: Record<string, any>;
     refreshKey?: string;
+    /**
+     * 组件是否可见。为 false 时会暂停内部的定时刷新 interval，避免后台无意义地拉数据。
+     * 默认 true，保持原有行为向后兼容。
+     */
+    isVisible?: boolean;
     onDataChange?: (data: {
         groupsOnSiteNow: string | number;
         peopleOnSiteNow: string | number;

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

@@ -65,6 +65,7 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
     labelColor,
     valueColor,
     refreshKey,
+    isVisible = true,
     onDataChange,
     ...others
   } = props;
@@ -144,7 +145,7 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
     calcBookingDataCount();
   };
   const calcBookingDataCount = () => {
-    var _a2, _b2, _c, _d, _e, _f;
+    var _a2, _b2, _c, _d, _e, _f, _g, _h;
     let groupsOnSiteNow = statisticData.groups_today_num || 0;
     let peopleOnSiteNow = statisticData.people_on_site_now_num || (hasTurnstileApp ? 0 : "-");
     let totalVisitorsToday = ((_a2 = statisticData.total_visitors_today) == null ? void 0 : _a2.num) || 0;
@@ -154,8 +155,8 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
     let upcoming = ((_e = statisticData.upcoming_visitors) == null ? void 0 : _e.num) || 0;
     let upcomingChildren = ((_f = statisticData.upcoming_visitors) == null ? void 0 : _f.statistics) || [];
     let overdue = statisticData.overdue_visitors_num || (hasTurnstileApp ? 0 : "-");
-    let completed = statisticData.completed_visitors.num || 0;
-    let completedChildren = statisticData.completed_visitors.statistics || [];
+    let completed = ((_g = statisticData.completed_visitors) == null ? void 0 : _g.num) || 0;
+    let completedChildren = ((_h = statisticData.completed_visitors) == null ? void 0 : _h.statistics) || [];
     let departed = statisticData.departed_visitors_num || (hasTurnstileApp ? 0 : "-");
     onDataChange == null ? void 0 : onDataChange(
       {
@@ -236,6 +237,7 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
     ]);
   };
   (0, import_react.useEffect)(() => {
+    if (!isVisible) return;
     getData();
     const timer = setInterval(() => {
       getData();
@@ -243,10 +245,9 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
     return () => {
       clearInterval(timer);
     };
-  }, [JSON.stringify(otherParams), refreshKey]);
+  }, [JSON.stringify(otherParams), refreshKey, isVisible]);
   (0, import_react.useImperativeHandle)(ref, () => ({
     refresh: () => {
-      debugger;
       getData();
     }
   }));

package/lib/components/booking/info/service2/Group/utils.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/booking/info/service2/Group/utils.ts
@@ -31,7 +41,9 @@ module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var import_utils2 = require("../../../utils");
 var import_distributeDiscount = require("../../service/serviceManager/distributeDiscount");
-var import_utils3 = require("../../../../ticketBooking/utils");
+var import_utils3 = require("../../../info2/service/editService/utils");
+var import_utils4 = require("../../../../ticketBooking/utils");
+var import_decimal = __toESM(require("decimal.js"));
 var getGroupTotalPrice = (items) => {
   return items.reduce((prev, next) => {
     prev.duration += next._extend.duration;
@@ -100,7 +112,7 @@ var createBookingItemsByGroup = (item, isBatchEdit) => {
     cacheItem._extend.total = totalPrice;
     cacheItem._extend.origin_total = origin_total ?? totalPrice;
     cacheItem._extend.items = void 0;
-    cacheItem._serviceKey = (0, import_utils3.genServiceKey)(cacheItem);
+    cacheItem._serviceKey = (0, import_utils4.genServiceKey)(cacheItem);
     bookings.push(cacheItem);
   }
   if (isBatchEdit) {
@@ -108,7 +120,34 @@ var createBookingItemsByGroup = (item, isBatchEdit) => {
     const groupOriginTotalPrice = item._extend.origin_total;
     const discountAmount = (groupOriginTotalPrice - groupTotalPrice) * -1;
     if (discountAmount !== 0) {
-      bookings = (0, import_distributeDiscount.distributeDiscountOrIncrease)(bookings, discountAmount, groupOriginTotalPrice);
+      if (groupOriginTotalPrice !== 0) {
+        bookings = (0, import_distributeDiscount.distributeDiscountOrIncrease)(bookings, discountAmount, groupOriginTotalPrice);
+        bookings = bookings.map((booking) => {
+          var _a2, _b2;
+          return (0, import_utils3.setProductPrice)(booking, {
+            newTotal: (_a2 = booking == null ? void 0 : booking._extend) == null ? void 0 : _a2.total,
+            origin_total: (_b2 = booking == null ? void 0 : booking._extend) == null ? void 0 : _b2.origin_total
+          });
+        });
+      } else {
+        const count = bookings.length;
+        const avgTotal = new import_decimal.default(groupTotalPrice).div(count).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+        let assignedSum = new import_decimal.default(0);
+        bookings = bookings.map((booking, i) => {
+          const newTotal = i === count - 1 ? new import_decimal.default(groupTotalPrice).sub(assignedSum).toNumber() : avgTotal.toNumber();
+          if (i !== count - 1) {
+            assignedSum = assignedSum.add(avgTotal);
+          }
+          return {
+            ...booking,
+            _extend: {
+              ...booking._extend,
+              total: newTotal,
+              price: newTotal
+            }
+          };
+        });
+      }
     }
   }
   console.log("bookings", bookings);

package/lib/components/booking/info2/service/editService/index.js

@@ -64,7 +64,6 @@ var import_utils9 = require("../../../info/service2/Group/utils");
 var import_useShopDiscountModule = require("../../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var import_DiscountChangeModal = __toESM(require("./DiscountChangeModal"));
 var import_decimal = __toESM(require("decimal.js"));
-var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var submitLock = false;
 var Info = (_, ref) => {
   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, _H, _I, _J, _K;
@@ -80,7 +79,6 @@ var Info = (_, ref) => {
   const useEndDate = import_antd.Form.useWatch("end_date", form);
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const [discountChangeModalOpen, setDiscountChangeModalOpen] = (0, import_react.useState)(false);
-  const context = (0, import_useEngineContext.default)();
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const resourcesRef = (0, import_react.useRef)(null);
   const isChangeTotal = (0, import_react.useRef)(false);
@@ -502,23 +500,17 @@ var Info = (_, ref) => {
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
   }, [(_o = (_n = (_m = (_l = state.service) == null ? void 0 : _l.cacheItem) == null ? void 0 : _m._extend) == null ? void 0 : _n.other) == null ? void 0 : _o.bundle]);
   const handleEdit = (0, import_ahooks.useMemoizedFn)((e) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
+    var _a2, _b2, _c2, _d2, _e2;
     const item = state.service.cacheItem;
     let values = form.getFieldsValue();
     const isSession = (0, import_utils6.isSessionProduct)(item);
     const sessionValue = {};
-    let oldSession = {};
     if (isSession) {
       sessionValue.startEndTime = {
         startDate: (_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.start_date,
         endDate: (_b2 = item == null ? void 0 : item._extend) == null ? void 0 : _b2.end_date,
         duration: (_c2 = item == null ? void 0 : item._extend) == null ? void 0 : _c2.duration
       };
-      oldSession = {
-        start_date: (0, import_dayjs.default)((_d2 = item == null ? void 0 : item._extend) == null ? void 0 : _d2.start_date).format("YYYY-MM-DD"),
-        end_date: (0, import_dayjs.default)((_e2 = item == null ? void 0 : item._extend) == null ? void 0 : _e2.end_date).format("YYYY-MM-DD"),
-        duration: (_f2 = item == null ? void 0 : item._extend) == null ? void 0 : _f2.duration
-      };
     }
     state.action({
       type: "pisell1.handleOpenProductModal",
@@ -533,16 +525,15 @@ var Info = (_, ref) => {
           number: (0, import_utils3.getIsShowNumber)(item, state)
         },
         isOS: isSession,
-        customer_id: (_h2 = (_g2 = state.client) == null ? void 0 : _g2.value) == null ? void 0 : _h2.id,
+        customer_id: (_e2 = (_d2 = state.client) == null ? void 0 : _d2.value) == null ? void 0 : _e2.id,
         value: {
           ...item._extend.other,
-          bundle: (0, import_utils8.mergeBundles)(item._extend.other),
           ...sessionValue,
           quantity: values.quantity || item._extend.quantity
         }
       },
       callback: (e2, extension_type, detail) => {
-        var _a3, _b3, _c3, _d3, _e3, _f3, _g3, _h3, _i2, _j2, _k2, _l2, _m2, _n2, _o2, _p2, _q2;
+        var _a3, _b3, _c3, _d3, _e3;
         isEditedRef.current = true;
         const _detail = detail || item;
         let other = JSON.parse(JSON.stringify(e2));
@@ -579,29 +570,6 @@ var Info = (_, ref) => {
         } catch (err) {
         }
         const sessionDetail = (0, import_utils5.editSessionProduct)(cacheItem, e2.session);
-        try {
-          (0, import_utils.sendWarningLog)({
-            title: "修改商品数据",
-            content: [
-              { key: "productId", value: item.id },
-              { key: "isSession", value: isSession },
-              { key: "oldSession", value: JSON.stringify(oldSession) },
-              { key: "sessionValue", value: JSON.stringify({
-                startTime: (_d3 = e2.session) == null ? void 0 : _d3.start_time,
-                endTime: (_e3 = e2.session) == null ? void 0 : _e3.end_time,
-                startDate: (0, import_dayjs.default)((_f3 = e2.session) == null ? void 0 : _f3.start_at).format("YYYY-MM-DD"),
-                endDate: (0, import_dayjs.default)((_g3 = e2.session) == null ? void 0 : _g3.end_at).format("YYYY-MM-DD"),
-                duration: (_h3 = e2.session) == null ? void 0 : _h3.duration
-              }) },
-              { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
-              {
-                key: "店铺id",
-                value: (_o2 = (_n2 = (_m2 = (_l2 = (_k2 = (_j2 = (_i2 = context.appHelper) == null ? void 0 : _i2.utils) == null ? void 0 : _j2.store) == null ? void 0 : _k2.getState) == null ? void 0 : _l2.call(_k2)) == null ? void 0 : _m2.global) == null ? void 0 : _n2.globalConfig) == null ? void 0 : _o2.id
-              }
-            ]
-          });
-        } catch (err) {
-        }
         if (sessionDetail) {
           setTimeout(() => {
             form.setFieldsValue({
@@ -615,7 +583,7 @@ var Info = (_, ref) => {
           origin_total = (0, import_utils6.getProductOriginTotalPrice)(cacheItem);
         }
         cacheItem._extend.origin_total = origin_total;
-        (((_p2 = cacheItem._extend) == null ? void 0 : _p2.items) || []).forEach((item2) => item2._extend.origin_total = origin_total);
+        (((_d3 = cacheItem._extend) == null ? void 0 : _d3.items) || []).forEach((item2) => item2._extend.origin_total = origin_total);
         dispatch({
           type: "setService",
           payload: {
@@ -624,7 +592,7 @@ var Info = (_, ref) => {
         });
         form.setFieldsValue({
           total: _total,
-          capacity: (_q2 = cacheItem._extend) == null ? void 0 : _q2.capacity,
+          capacity: (_e3 = cacheItem._extend) == null ? void 0 : _e3.capacity,
           quantity: (e2 == null ? void 0 : e2.quantity) || (values == null ? void 0 : values.quantity) || 1
         });
       }
@@ -1055,8 +1023,6 @@ var Info = (_, ref) => {
     var _a2, _b2, _c2;
     delete cacheItem.discount_list;
     (_c2 = (_b2 = (_a2 = cacheItem._extend.other) == null ? void 0 : _a2.bundle) == null ? void 0 : _b2.forEach) == null ? void 0 : _c2.call(_b2, (bundle) => {
-      var _a3;
-      (_a3 = bundle == null ? void 0 : bundle.metadata) == null ? true : delete _a3.custom_product_bundle_map_id;
       bundle == null ? true : delete bundle.discount_list;
       bundle == null ? true : delete bundle.booking_id;
       bundle == null ? true : delete bundle.bundle_selling_price;

package/lib/components/booking/info2/service/editService/utils.d.ts

@@ -32,7 +32,6 @@ export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total
  * @returns 折扣列表
  */
 export declare const getProductAllDiscountList: (cacheItem: any) => any;
-export declare const mergeBundles: (other: any) => any[];
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值
  * @param other - callback 返回的新数据

package/lib/components/booking/info2/service/editService/utils.js

@@ -32,7 +32,6 @@ __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
   getProductAllDiscountList: () => getProductAllDiscountList,
   mergeBundleWithOriginalPrice: () => mergeBundleWithOriginalPrice,
-  mergeBundles: () => mergeBundles,
   setAutoAllocationStorage: () => setAutoAllocationStorage,
   setProductPrice: () => setProductPrice
 });
@@ -97,20 +96,6 @@ var getProductAllDiscountList = (cacheItem) => {
   discountList.push(...bundleDiscountList);
   return discountList;
 };
-var mergeBundles = (other) => {
-  const bundle = (other == null ? void 0 : other.bundle) || [];
-  const newBundle = [];
-  bundle.forEach((item) => {
-    const newItem = newBundle.find((newItem2) => newItem2.id === item.id);
-    if (newItem) {
-      newItem.num += item.num || 1;
-      newItem.quantity += item.quantity || 1;
-    } else {
-      newBundle.push({ ...item });
-    }
-  });
-  return newBundle;
-};
 var mergeBundleWithOriginalPrice = (other, originalOther) => {
   var _a, _b;
   if (!((_a = other == null ? void 0 : other.bundle) == null ? void 0 : _a.length) || !((_b = originalOther == null ? void 0 : originalOther.bundle) == null ? void 0 : _b.length)) return other;
@@ -130,7 +115,6 @@ var mergeBundleWithOriginalPrice = (other, originalOther) => {
   getAutoAllocationStorage,
   getProductAllDiscountList,
   mergeBundleWithOriginalPrice,
-  mergeBundles,
   setAutoAllocationStorage,
   setProductPrice
 });

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

@@ -134,7 +134,7 @@ var Payments = (0, import_model.Provider)((props) => {
           item.service_fee,
           2,
           (state == null ? void 0 : state.amountSymbol) || "$"
-        ), ")") : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-list-item-date" }, (0, import_dayjs.default)(item.payment_time || item.created_at).format(
+        ), ")") : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-list-item-date" }, (0, import_dayjs.default)(item.payment_time).format(
           "HH:mm YYYY/MM/DD"
         ), /* @__PURE__ */ import_react.default.createElement("span", { className: "payment-list-item-platform-type" }, item.platform && import_utils.locales.getText("pisell2.text.platform.type")(
           item.platform

package/lib/components/checkout/hooks/useWalletPass.js

@@ -43,10 +43,14 @@ var import_usePaymentLogger = __toESM(require("./usePaymentLogger"));
 var import_utils3 = require("../../booking/utils");
 var import_pisellos = require("../../ticketBooking/hooks/pisellos");
 var import_useShopDiscountModule = require("../../ticketBooking/hooks/pisellos/useShopDiscountModule");
+var import_context = require("../../ticketBooking/context");
+var import_utils4 = require("../../ticketBooking/utils");
 var useWalletPass = (props) => {
   const { onSelectChange, customAmount, clientId } = props;
   const logger = (0, import_usePaymentLogger.default)();
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
+  const osKey = (0, import_context.useOsKey)();
+  const moduleKey = (0, import_utils4.getShopDiscountKey)(osKey || "ticket");
   const [walletRecommendList, setWalletRecommendList] = (0, import_react.useState)([]);
   const [userIdentificationCodes, setUserIdentificationCodes] = (0, import_react.useState)(
     []
@@ -506,7 +510,7 @@ var useWalletPass = (props) => {
       );
       setDiscountList(sortedDiscountList);
       (_a = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a.emit(
-        "shopDiscount:onSelectedDiscountListChange",
+        `${moduleKey}:onSelectedDiscountListChange`,
         detail
       );
       return;
@@ -603,24 +607,27 @@ var useWalletPass = (props) => {
     }
   });
   const handleSelectDiscount = (0, import_ahooks.useMemoizedFn)((value, option) => {
-    var _a, _b, _c;
+    var _a;
     setLoading(true);
-    const isSelected = value.includes(option.id);
-    const detail = shopDiscount.setDiscountSelected({
-      discountId: option.id,
-      isSelected
-    });
-    if (!((_b = (_a = detail == null ? void 0 : detail.discountList) == null ? void 0 : _a.find((item) => item.id === option.id)) == null ? void 0 : _b.isSelected)) {
+    try {
+      const isSelected = value.includes(option.id);
+      const detail = shopDiscount.setDiscountSelected({
+        discountId: option.id,
+        isSelected
+      });
+      const sortedDiscountList = sortDiscountListWithInitialOrder(
+        detail.discountList
+      );
+      setDiscountList(sortedDiscountList);
+      (_a = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a.emit(
+        `${moduleKey}:onSelectedDiscountListChange`,
+        detail
+      );
+    } catch (err) {
+      console.log(err, "1234err");
+    } finally {
       setLoading(false);
     }
-    const sortedDiscountList = sortDiscountListWithInitialOrder(
-      detail.discountList
-    );
-    setDiscountList(sortedDiscountList);
-    (_c = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _c.emit(
-      "shopDiscount:onSelectedDiscountListChange",
-      detail
-    );
   });
   const clearDisabledWalletData = (0, import_ahooks.useMemoizedFn)(() => {
     setDisabledWalletData([]);

package/lib/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/store/index.d.ts

@@ -301,8 +301,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | "huifu" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/lib/components/index.d.ts

@@ -20,4 +20,5 @@ import PinModal from './pinModal';
 import PinVerifyModal from './pinVerifyModal';
 import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './authentication/admin';
 import Registry from './systemSettings/registry';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry, };
+import PisellCashCounting from './pisellCashCounting';
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry, PisellCashCounting, };

package/lib/components/index.js

@@ -45,6 +45,7 @@ __export(components_exports, {
   POSOperatorAuth: () => import_admin.POSOperatorAuth,
   PinModal: () => import_pinModal.default,
   PinVerifyModal: () => import_pinVerifyModal.default,
+  PisellCashCounting: () => import_pisellCashCounting.default,
   PisellSelectCustomerModal: () => import_pisellSelectCustomerModal.default,
   ProductExtension: () => import_productExtension.default,
   Registry: () => import_registry.default,
@@ -83,6 +84,7 @@ var import_pinModal = __toESM(require("./pinModal"));
 var import_pinVerifyModal = __toESM(require("./pinVerifyModal"));
 var import_admin = require("./authentication/admin");
 var import_registry = __toESM(require("./systemSettings/registry"));
+var import_pisellCashCounting = __toESM(require("./pisellCashCounting"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Booking,
@@ -101,6 +103,7 @@ var import_registry = __toESM(require("./systemSettings/registry"));
   POSOperatorAuth,
   PinModal,
   PinVerifyModal,
+  PisellCashCounting,
   PisellSelectCustomerModal,
   ProductExtension,
   Registry,

package/lib/components/pisellCashCounting/PisellCashCounting.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { PisellCashCountingProps } from './types';
+import './PisellCashCounting.less';
+declare const PisellCashCounting: React.FC<PisellCashCountingProps>;
+export default PisellCashCounting;