@pisell/private-materials 6.5.13 → 6.5.15

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

@@ -200,7 +200,7 @@ var getTax = (state, options) => {
   var _a, _b, _c;
   const { isEdit, computed, tax_rate, is_price_include_tax } = options;
   if (!isEdit) {
-    return { tax: Number((_a = state.bookingDetail) == null ? void 0 : _a.tax_fee) };
+    return { tax: Number((_a = state.bookingDetail) == null ? void 0 : _a.tax_fee) || 0 };
   }
   let totalOriginTax = new import_decimal.default(0);
   let totalTax = new import_decimal.default(0);
@@ -313,7 +313,7 @@ var getSurcharge = (state, options) => {
   const { bookingDetail, bookingId } = state;
   if (!isEdit && bookingId) {
     if (Array.isArray(bookingDetail == null ? void 0 : bookingDetail.surcharge)) {
-      return (((_a = state.bookingDetail) == null ? void 0 : _a.surcharge) || []).map(
+      return (((_a = state.bookingDetail) == null ? void 0 : _a.surcharge) || []).filter((d) => Number(d.amount) > 0).map(
         (d, index) => {
           return {
             key: `custom_surcharge_${index}`,
@@ -396,6 +396,9 @@ var getSurcharge = (state, options) => {
       finalAmount = configTotal.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
     }
     const name = surchargeConfig.name || {};
+    if (Number(finalAmount) <= 0) {
+      continue;
+    }
     surchargeWithAmount.push({
       key: `custom_surcharge_${i}`,
       label: name[state.locale || "en"] || name["en"] || name["original"],

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

@@ -60,7 +60,7 @@ var import_materials = require("@pisell/materials");
 var import_useCustomer = require("../../../ticketBooking/hooks/pisellos/useCustomer");
 var import_ahooks = require("ahooks");
 var import_lodash = require("lodash");
-var import_hooks = require("../../../appointmentBooking/hooks");
+var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var Footer = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
   const { state, buttons, dispatch, source } = props;
@@ -1252,7 +1252,7 @@ var Footer = (props) => {
   const { selectCustomer } = (0, import_useCustomer.useCustomer)({
     changeCustomerToGlobalState
   });
-  const shopDiscount = (0, import_hooks.useShopDiscount)();
+  const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const { clearAllScanListenersTaskQueue } = (0, import_useScanManager.default)();
   const handleClearAllAndReset = () => {
     var _a2;

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

@@ -49,6 +49,7 @@ var import_utils5 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_utils6 = require("../../../../plus/clientName/utils");
 var import_lodash = require("lodash");
+var import_decimal = __toESM(require("decimal.js"));
 var formatNote = (data) => {
   var _a;
   return ((_a = data.notes) == null ? void 0 : _a.orderNote) || "";
@@ -101,6 +102,10 @@ var formatProductBundle = (bundle) => {
   } catch (error) {
   }
   return bundle.map((d) => {
+    const option = formatProductOption(d.option);
+    const option_price = option.reduce((temp, item) => {
+      return temp + Number(item.num) * item.custom_add_price;
+    }, 0);
     return {
       "bundle_group_id": d.group_id,
       "bundle_id": d.id,
@@ -113,7 +118,9 @@ var formatProductBundle = (bundle) => {
       // checkout 2.0 新增
       "price_type": d == null ? void 0 : d.price_type,
       // checkout 2.0 新增
-      "option": formatProductOption(d.option)
+      "custom_price": new import_decimal.default(d == null ? void 0 : d.price).sub(option_price).toNumber().toFixed(2),
+      "custom_price_type": d == null ? void 0 : d.price_type,
+      "option": option
     };
   });
 };

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface IProps {
     modal: any;

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

@@ -45,16 +45,7 @@ var import_ahooks = require("ahooks");
 var import_utils2 = require("./utils");
 var import_pisellos = require("../../../ticketBooking/hooks/pisellos");
 var import_utils3 = require("../../info/clientVariant/utils");
-var ShopDiscountHooks = {
-  onInited: "shopDiscount:onInited",
-  onDestroy: "shopDiscount:onDestroy",
-  onLoadDiscountList: "shopDiscount:onLoadDiscountList",
-  onCustomerChange: "shopDiscount:onCustomerChange",
-  onScanCustomerChange: "shopDiscount:onScanCustomerChange",
-  onDiscountListChange: "shopDiscount:onDiscountListChange",
-  onRulesListChange: "shopDiscount:onRulesListChange",
-  onLoadPrepareCalcResult: "shopDiscount:onLoadPrepareCalcResult"
-};
+var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var services = {};
 var VoucherCard = (props) => {
   var _a, _b, _c, _d;
@@ -67,7 +58,8 @@ var VoucherCard = (props) => {
   const serviceValueRef = (0, import_react.useRef)(state.service.value);
   const addonsValueRef = (0, import_react.useRef)(state.addons.value);
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
-  const shopDiscount = pisellos.getModule("shopDiscount");
+  const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
+  const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   services = state.service;
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
     dispatch({
@@ -93,7 +85,7 @@ var VoucherCard = (props) => {
     }
   );
   (0, import_react.useEffect)(() => {
-    if (isBooking4Shop) {
+    if (isBooking4Shop && shopDiscount) {
       shopDiscount.setProductList([
         ...state.service.value,
         ...state.addons.value
@@ -123,9 +115,10 @@ var VoucherCard = (props) => {
     onScanCode(e.detail.code);
   });
   (0, import_react.useEffect)(() => {
-    window.addEventListener("onScanWallPassCode", onScanWallPassCode);
+    const wrappedOnScanWallPassCode = executeIfActive(onScanWallPassCode);
+    window.addEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
     return () => {
-      window.removeEventListener("onScanWallPassCode", onScanWallPassCode);
+      window.removeEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
     };
   }, []);
   const addonsMemo = (0, import_react.useMemo)(() => {
@@ -176,14 +169,13 @@ var VoucherCard = (props) => {
     run();
   }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
   (0, import_react.useEffect)(() => {
-    var _a2;
-    if (pisellos) {
-      (_a2 = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a2.on("shopDiscount:onSelectedDiscountListChange", fn);
+    if (shopDiscount) {
+      const wrappedHandler = executeIfActive(fn);
+      shopDiscount == null ? void 0 : shopDiscount.effectsOn("onSelectedDiscountListChange", wrappedHandler);
       return () => {
-        var _a3;
-        (_a3 = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a3.off(
-          "shopDiscount:onSelectedDiscountListChange",
-          fn
+        shopDiscount == null ? void 0 : shopDiscount.effectsOff(
+          "onSelectedDiscountListChange",
+          wrappedHandler
         );
       };
     }
@@ -196,7 +188,7 @@ var VoucherCard = (props) => {
     productListToValue(result.productList);
   });
   (0, import_react.useEffect)(() => {
-    if (!isBooking4Shop) return;
+    if (!isBooking4Shop || !shopDiscount) return;
     const onScanCustomerChange = (customer) => {
       const clientVariantClose = (0, import_utils3.getClientVariantClose)();
       if (clientVariantClose) {
@@ -207,25 +199,28 @@ var VoucherCard = (props) => {
     const onDiscountListChange = (discount) => {
       setDisCountList(discount);
     };
-    pisellos.effects.on(
-      ShopDiscountHooks.onScanCustomerChange,
-      onScanCustomerChange
+    const wrappedOnScanCustomerChangeHandler = executeIfActive(onScanCustomerChange);
+    const wrappedOnDiscountListChangeHandler = executeIfActive(onDiscountListChange);
+    const wrappedFn = executeIfActive(fn);
+    shopDiscount.effectsOn(
+      "onScanCustomerChange",
+      wrappedOnScanCustomerChangeHandler
     );
-    pisellos.effects.on(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-    pisellos.effects.on(
-      ShopDiscountHooks.onDiscountListChange,
-      onDiscountListChange
+    shopDiscount.effectsOn("onLoadPrepareCalcResult", wrappedFn);
+    shopDiscount.effectsOn(
+      "onDiscountListChange",
+      wrappedOnDiscountListChangeHandler
     );
     return () => {
       shopDiscount.clear();
-      pisellos.effects.off(
-        ShopDiscountHooks.onScanCustomerChange,
-        onScanCustomerChange
+      shopDiscount.effectsOff(
+        "onScanCustomerChange",
+        wrappedOnScanCustomerChangeHandler
       );
-      pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-      pisellos.effects.off(
-        ShopDiscountHooks.onDiscountListChange,
-        onDiscountListChange
+      shopDiscount.effectsOff("onLoadPrepareCalcResult", wrappedFn);
+      shopDiscount.effectsOff(
+        "onDiscountListChange",
+        wrappedOnDiscountListChangeHandler
       );
     };
   }, [state.bookingId, isBooking4Shop, fn]);
@@ -273,12 +268,11 @@ var VoucherCard = (props) => {
   };
   const availableData = (0, import_react.useMemo)(() => {
     if (!isBooking4Shop) return [];
-    const shopDiscount2 = pisellos.getModule("shopDiscount");
     return discountList.filter((item) => !!item.isAvailable).map((discount) => {
       return {
         ...discount,
         isDisabled: discount.isDisabled || discount.isDisabledForProductUsed || disabled,
-        savedAmount: shopDiscount2.calcDiscountApplicableProductTotalPrice(discount)
+        savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
       };
     });
   }, [discountList, isBooking4Shop, disabled]);
@@ -321,8 +315,7 @@ var VoucherCard = (props) => {
         dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
         mixedSort,
         onChange: (val) => {
-          const shopDiscount2 = pisellos.getModule("shopDiscount");
-          const detail = shopDiscount2.setDiscountSelected({
+          const detail = shopDiscount.setDiscountSelected({
             discountId: val.id,
             isSelected: val.isSelected
           });

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

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

@@ -39,37 +39,31 @@ var import_useSendModal = __toESM(require("./sendModal/useSendModal"));
 var import_sendModal = __toESM(require("./sendModal"));
 var import_utils = require("@pisell/utils");
 var Footer = ({ state, reload }) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   const { open, setOpen, handleOpen, handleValuesChange, handleOk } = (0, import_useSendModal.default)(state == null ? void 0 : state.bookingId);
   const handleReload = async () => {
     await reload();
     import_materials.message.success(import_utils.locales.getText("pisell2.text.send-form-reminder-refresh"));
   };
-  const isAllCompleted = (0, import_react.useMemo)(() => {
-    var _a2;
-    return Object.values(((_a2 = state == null ? void 0 : state.form) == null ? void 0 : _a2.value) || {}).every(
-      (item) => item.length > 0
-    );
-  }, [(_a = state == null ? void 0 : state.form) == null ? void 0 : _a.value]);
   const defaultValues = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f, _g, _h, _i, _j;
+    var _a2, _b2, _c2, _d2, _e, _f, _g, _h, _i, _j;
     return {
       sendSms: !!((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.phone),
       sendEmail: !!((_d2 = (_c2 = state.client) == null ? void 0 : _c2.value) == null ? void 0 : _d2.email),
-      email: (_f = (_e2 = state.client) == null ? void 0 : _e2.value) == null ? void 0 : _f.email,
+      email: (_f = (_e = state.client) == null ? void 0 : _e.value) == null ? void 0 : _f.email,
       phone: {
         code: (_h = (_g = state.client) == null ? void 0 : _g.value) == null ? void 0 : _h.country_calling_code,
         phone: (_j = (_i = state.client) == null ? void 0 : _i.value) == null ? void 0 : _j.phone
       }
     };
-  }, [(_b = state.client) == null ? void 0 : _b.value]);
-  if (!state.bookingId || !((_c = state == null ? void 0 : state.form) == null ? void 0 : _c.forms.length)) {
+  }, [(_a = state.client) == null ? void 0 : _a.value]);
+  if (!state.bookingId || !((_b = state == null ? void 0 : state.form) == null ? void 0 : _b.forms.length)) {
     return null;
   }
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-form-footer" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Tooltip, { title: import_utils.locales.getText("pisell2.text.send-form-reminder-tooltip") }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", icon: /* @__PURE__ */ import_react.default.createElement(import_icons.ReloadOutlined, null), onClick: handleReload })), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", block: true, type: "primary", onClick: handleOpen, disabled: isAllCompleted }, !isAllCompleted ? import_utils.locales.getText("pisell2.text.send-form-reminder") : import_utils.locales.getText("pisell2.text.send-form-reminder-completed")), /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-form-footer" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Tooltip, { title: import_utils.locales.getText("pisell2.text.send-form-reminder-tooltip") }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", icon: /* @__PURE__ */ import_react.default.createElement(import_icons.ReloadOutlined, null), onClick: handleReload })), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", block: true, type: "primary", onClick: handleOpen }, import_utils.locales.getText("pisell2.text.send-form-reminder")), /* @__PURE__ */ import_react.default.createElement(
     import_sendModal.default,
     {
-      refreshKey: (_e = (_d = state.client) == null ? void 0 : _d.value) == null ? void 0 : _e.id,
+      refreshKey: (_d = (_c = state.client) == null ? void 0 : _c.value) == null ? void 0 : _d.id,
       open,
       onCancel: () => setOpen(false),
       onOk: handleOk,

package/lib/components/booking/forms/single/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/lib/components/booking/forms/table/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/lib/components/booking/info/addServiceVariant/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/lib/components/booking/info/date/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

package/lib/components/booking/info/header/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const header: ({ state, dispatch }: any) => JSX.Element;
 export default header;

package/lib/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

package/lib/components/booking/info/notes/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Notes: () => JSX.Element | null;
 export default Notes;

package/lib/components/booking/info/service/actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;

package/lib/components/booking/info/service/like/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

package/lib/components/booking/info/service/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/lib/components/booking/info/service2/utils.d.ts

@@ -248,4 +248,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

package/lib/components/booking/info2/cartClientCard/index.js

@@ -48,6 +48,7 @@ var import_useTranslationOriginal = __toESM(require("../../../../hooks/useTransl
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_model = require("../../info/model");
 var import_index = require("./index.less");
+var import_IsActiveContext = require("../../../ticketBooking/context/IsActiveContext");
 var CartClientCard = (0, import_react.forwardRef)(({
   clientCardProps = {},
   beforeSwitchModalOpen,
@@ -64,6 +65,7 @@ var CartClientCard = (0, import_react.forwardRef)(({
   const translationOriginal = (0, import_useTranslationOriginal.default)();
   const [keyword, setKeyword] = (0, import_react.useState)("");
   const keywordRef = (0, import_react.useRef)("");
+  const isActive = (0, import_IsActiveContext.useIsActive)();
   keywordRef.current = keyword;
   const Toast = (0, import_materials.useToast)();
   const { openScan, closeScan } = (0, import_useScanCustomer.default)();
@@ -231,13 +233,15 @@ var CartClientCard = (0, import_react.forwardRef)(({
     setPendingCustomer(null);
   };
   (0, import_react.useMemo)(() => {
-    (0, import_utils3.setHandleSetClient)(handleSetClient);
-  }, []);
+    if (isActive) {
+      (0, import_utils3.setHandleSetClient)(handleSetClient);
+    }
+  }, [isActive]);
   (0, import_react.useEffect)(() => {
     return () => {
       (0, import_utils3.setHandleSetClient)(null);
     };
-  }, []);
+  }, [isActive]);
   const tags = (0, import_react.useMemo)(() => {
     var _a2;
     if (!selectedCustomer) return;

package/lib/components/booking/info2/service/actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

package/lib/components/booking/info2/service/addService/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

package/lib/components/booking/info2/service/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/lib/components/booking/materiels/contacts/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

package/lib/components/booking/materiels/holder/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

package/lib/components/booking/materiels/startTime/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

package/lib/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;

package/lib/components/booking/notes/NoteBlock/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     title?: string;

package/lib/components/booking/notes/addNote/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const AddNote: ({ value, onChange, title, placeholder }: any) => JSX.Element;
 export default AddNote;

package/lib/components/booking/utils.js

@@ -503,7 +503,7 @@ var formatResource = (resourceItem, cacheItem, formatLabel) => {
   return _resourceItem;
 };
 var getLastServer = (list) => {
-  return list[list.length - 1];
+  return list == null ? void 0 : list[0];
 };
 var getCacheParams = () => {
   const sessionData = sessionStorage.getItem("pisell2.booking.serviceParams");

package/lib/components/checkout/PaymentModal.js

@@ -65,6 +65,7 @@ var import_usePaymentLogger = __toESM(require("./hooks/usePaymentLogger"));
 var import_antd = require("antd");
 var import_printer = __toESM(require("../../hooks/printer"));
 var import_priceKeyboard = require("../../pro/priceKeyboard");
+var import_pisellos = require("../ticketBooking/hooks/pisellos");
 var CheckoutHooks = {
   OnStateAmountChanged: "checkout:onStateAmountChanged",
   OnBalanceDueAmountChanged: "checkout:onBalanceDueAmountChanged",
@@ -105,6 +106,7 @@ var PaymentContent = (0, import_react.forwardRef)(
     const utils = context.appHelper.utils || {};
     const { pisellos, getData, pisellosAllModule, interaction } = utils;
     const Toast = (0, import_materials.useToast)();
+    const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
     const checkoutRef = (0, import_react.useRef)(null);
     const savePayLaterHandlerRef = (0, import_react.useRef)(null);
     const [customAmount, setCustomAmount] = (0, import_react.useState)("");
@@ -193,7 +195,8 @@ var PaymentContent = (0, import_react.forwardRef)(
       return surcharge;
     };
     const onPaymentOptionClick = async (method) => {
-      var _a2, _b2, _c2, _d;
+      var _a2, _b2, _c2, _d, _e;
+      if (syncingLock) return;
       const { id, code, name, type } = method || {};
       const finalAmount = method.totalAmount ?? customAmount;
       const eftposCodes = [
@@ -213,6 +216,7 @@ var PaymentContent = (0, import_react.forwardRef)(
         let data;
         const isSynced = await checkoutModule.isCurrentOrderSynced();
         if (!isSynced) {
+          (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast, "", 0);
           data = await checkoutModule.manualSyncOrderAsync();
         } else {
           const orderId = await checkoutModule.getCurrentOrderId();
@@ -220,7 +224,7 @@ var PaymentContent = (0, import_react.forwardRef)(
             orderId
           };
         }
-        (_a2 = paymentMethodsRef.current) == null ? void 0 : _a2.onPay(payType, {
+        (_b2 = paymentMethodsRef.current) == null ? void 0 : _b2.onPay(payType, {
           source: "normal",
           data: {
             payMethod: { id, code, name, type },
@@ -282,13 +286,13 @@ var PaymentContent = (0, import_react.forwardRef)(
             percentage: (method == null ? void 0 : method.percentage) || "0"
           };
         }
-        if (method.type === "custom" && ((_b2 = method.metadata) == null ? void 0 : _b2.order_open_cash_drawer)) {
+        if (method.type === "custom" && ((_c2 = method.metadata) == null ? void 0 : _c2.order_open_cash_drawer)) {
           logger == null ? void 0 : logger.addLog({
             type: "info",
             title: "open_till",
             metadata: {}
           });
-          (_d = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.postMessageToApp) == null ? void 0 : _d.call(_c2, {
+          (_e = (_d = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d.postMessageToApp) == null ? void 0 : _e.call(_d, {
             module: "till",
             key: "open_till",
             data: {
@@ -379,7 +383,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           if (core.effects && typeof core.effects.on === "function") {
             const unsubscribe = core.effects.on(
               CheckoutHooks.OnStateAmountChanged,
-              async (data) => {
+              executeIfActive(async (data) => {
                 var _a2, _b2;
                 console.log(
                   `Amount changed from ${data.oldAmount} to ${data.newAmount}`
@@ -405,26 +409,28 @@ var PaymentContent = (0, import_react.forwardRef)(
                 setCustomAmount(data.newAmount);
                 const items = await checkoutModule.getCurrentOrderPaymentItemsAsync();
                 setPaymentItems(items);
-              }
+              })
             );
             const amountChangedUnsubscribe = core.effects.on(
               CheckoutHooks.OnBalanceDueAmountChanged,
-              (data) => {
+              executeIfActive((data) => {
                 setBalanceDueAmount(data.newAmount);
                 setBalanceDueTotalAmount(data.totalAmount || "0");
-              }
+              })
             );
             const orderSubmitStartUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitStart,
-              () => {
-                var _a2;
-                setSyncingLock(true);
-                (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast);
-              }
+              executeIfActive(
+                () => {
+                  var _a2;
+                  setSyncingLock(true);
+                  (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast, "", 0);
+                }
+              )
             );
             const orderSubmitEndUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitEnd,
-              (res) => {
+              executeIfActive((res) => {
                 var _a2, _b2;
                 setSyncingLock(false);
                 if (res.success) {
@@ -439,11 +445,11 @@ var PaymentContent = (0, import_react.forwardRef)(
                     );
                   }
                 }
-              }
+              })
             );
             const orderPaymentAddedUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderPaymentAdded,
-              async (data) => {
+              executeIfActive(async (data) => {
                 var _a2, _b2;
                 console.log("orderPaymentAddedUnsubscribe>>>>", data);
                 const orderInfo2 = checkoutModule.getCurrentOrderInfo();
@@ -506,7 +512,7 @@ var PaymentContent = (0, import_react.forwardRef)(
                     }
                   });
                 }
-              }
+              })
             );
             return () => {
               if (unsubscribe && typeof unsubscribe === "function") {
@@ -1063,6 +1069,7 @@ var PaymentModal = ({
   const [windowHeight, setWindowHeight] = (0, import_react.useState)(0);
   const [showRetryModal, setShowRetryModal] = (0, import_react.useState)(false);
   const [currentEditOrderId, setCurrentEditOrderId] = (0, import_react.useState)(editOrderId || 0);
+  const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const Toast = (0, import_materials.useToast)();
   const { nativePrint } = (0, import_printer.default)();
   const handleRetry = async () => {
@@ -1466,7 +1473,7 @@ var PaymentModal = ({
           }
           unsubscribeRef.current = checkout.core.effects.on(
             "checkout:onOrderSynced",
-            async (data2) => {
+            executeIfActive(async (data2) => {
               var _a3, _b3, _c3, _d3, _e2;
               const currentOrderId = checkout.getCurrentOrderId();
               setCurrentEditOrderId(currentOrderId);
@@ -1573,7 +1580,7 @@ var PaymentModal = ({
               } else {
                 handlePaymentComplete(data2);
               }
-            }
+            })
           );
         } else if (isLocalOrderCreated.current) {
           console.log(

package/lib/components/checkout/PaymentPlugin.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const PaymentPlugin: () => JSX.Element;
 export default PaymentPlugin;