@pisell/private-materials 3.3.94 → 3.3.95

package/lib/components/eftposPay/hooks.js

@@ -128,7 +128,6 @@ var useFail = (index) => {
         return;
       }
       const [code] = [`${res.code}`];
-      console.log("code---->>>>>>>", code);
       if (code === import_const.PayStatus.Unknown) {
         steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.failed")(
           modeRef.current
@@ -169,12 +168,8 @@ var useFail = (index) => {
         if (isMark) {
           if (clientRef.current === import_const2.ClientEnum.User) {
             steps[index].status = "fail";
-            steps[index].title = import_utils.locales.getText(
-              "page.eftpos-pay.text.timedout.title"
-            );
-            steps[index].fail = import_utils.locales.getText(
-              "page.eftpos-pay.text.transaction.eftpos.fail.other"
-            );
+            steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.timedout.title");
+            steps[index].fail = import_utils.locales.getText("page.eftpos-pay.text.transaction.eftpos.fail.other");
             steps[index].custom = steps[index].custom ? { ...steps[index].custom, isPosNetworkError: true } : { isPosNetworkError: true };
             dispatch((0, import_store.updateSteps)(steps));
             dispatch((0, import_store.updateComponent)("Fail"));
@@ -315,9 +310,7 @@ ${import_utils.locales.getText(
         )}
 ${import_utils.locales.getText(
           "page.eftpos-pay.text.transaction.eftpos.fail.if"
-        )(modeRef.current)}` : import_utils.locales.getText(
-          "page.eftpos-pay.text.transaction.eftpos.fail.other"
-        );
+        )(modeRef.current)}` : import_utils.locales.getText("page.eftpos-pay.text.transaction.eftpos.fail.other");
         steps[index].status = "warn";
         steps[index].custom = steps[index].custom ? { ...steps[index].custom, isPosNetworkError: true } : { isPosNetworkError: true };
         dispatch((0, import_store.updateSteps)(steps));
@@ -366,7 +359,7 @@ ${import_utils.locales.getText(
         );
         return;
       }
-      if (code === import_const.PayStatus.UserConfigError || code === import_const.PayStatus.PairingFailure) {
+      if (code === import_const.PayStatus.UserConfigError) {
         steps[index].title = import_utils.locales.getText(
           "page.eftpos-pay.text.transaction.user.config.title"
         );

package/lib/components/eftposPay/index.js

@@ -139,7 +139,7 @@ var eftposPay_default = (props) => {
   }, [mode, state]);
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
-    console.log("初始化 ........112218017777");
+    console.log("初始化 ........11221801");
   }, []);
   console.log("props?.params?.device_number = ", (_e = props == null ? void 0 : props.params) == null ? void 0 : _e.device_number);
   const api = (0, import_react.useMemo)(() => {

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

@@ -3,5 +3,4 @@ export { getAmonunt } from './helper';
 export { default as Payo } from './payo';
 export { default as Windcave } from './windcave/windcave';
 export { default as Tyro } from './tyro';
-export { default as Linkly } from './linkly';
 export declare const getInitState: (type: string, params?: any) => State;

package/lib/components/eftposPay/manufacturer.js

@@ -29,7 +29,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/eftposPay/manufacturer.tsx
 var manufacturer_exports = {};
 __export(manufacturer_exports, {
-  Linkly: () => import_linkly.default,
   Payo: () => import_payo.default,
   Tyro: () => import_tyro.default,
   Windcave: () => import_windcave.default,
@@ -41,12 +40,10 @@ var import_const = require("./const");
 var import_const2 = __toESM(require("./payo/const"));
 var import_const3 = __toESM(require("./tyro/const"));
 var import_const4 = __toESM(require("./windcave/const"));
-var import_const5 = __toESM(require("./linkly/const"));
 var import_helper = require("./helper");
 var import_payo = __toESM(require("./payo"));
 var import_windcave = __toESM(require("./windcave/windcave"));
 var import_tyro = __toESM(require("./tyro"));
-var import_linkly = __toESM(require("./linkly"));
 var getInitState = (type, params) => {
   switch (type) {
     case import_const.EftposEnum.Payo:
@@ -55,15 +52,12 @@ var getInitState = (type, params) => {
       return (0, import_const4.default)(params);
     case import_const.EftposEnum.Tyro:
       return (0, import_const3.default)(params);
-    case import_const.EftposEnum.Linkly:
-      return (0, import_const5.default)(params);
     default:
       throw new Error("未知的厂商类型");
   }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Linkly,
   Payo,
   Tyro,
   Windcave,

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

@@ -6,7 +6,7 @@ import './index.less';
  * @Author: hongbing.wang
  * @Date: 2024-08-20 14:59
  */
-declare const Pay: ({ api, onChange: onChangeStatus, className, terminal, net, isMobile, tyroUrl, tyroVersion, formatAmount, client, }: PayProps & {
+declare const Pay: ({ api, onChange: onChangeStatus, className, terminal, net, isMobile, tyroUrl, tyroVersion, formatAmount, client }: PayProps & {
     terminal: {
         network: boolean;
     };

package/lib/components/eftposPay/pay.js

@@ -145,7 +145,6 @@ var Pay = ({
       }
     };
   }, []);
-  console.log("data =>>>>>> ", data);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, data.render ? /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -161,16 +160,7 @@ var Pay = ({
       }
     ),
     data.eftpos === "payo" ? /* @__PURE__ */ import_react.default.createElement(import_manufacturer.Payo, { api, onChange }, data.warn && data.status !== import_const.StatusEnum.Success && client === import_const.ClientEnum.Merchant ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-warn" }, data.warn) : null, data.status === import_const.StatusEnum.Success ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-tip" }, import_utils.locales.getText("page.eftpos-pay.text.transaction.end")) : null) : null,
-    data.eftpos === "tyro" ? /* @__PURE__ */ import_react.default.createElement(
-      import_manufacturer.Tyro,
-      {
-        api,
-        onChange,
-        key: data.key,
-        url: tyroUrl,
-        version: tyroVersion
-      }
-    ) : null,
+    data.eftpos === "tyro" ? /* @__PURE__ */ import_react.default.createElement(import_manufacturer.Tyro, { api, onChange, key: data.key, url: tyroUrl, version: tyroVersion }) : null,
     data.eftpos === "windcave" ? /* @__PURE__ */ import_react.default.createElement(
       import_manufacturer.Windcave,
       {
@@ -179,8 +169,7 @@ var Pay = ({
         key: data.key,
         formatAmount
       }
-    ) : null,
-    data.eftpos === "linkly" ? /* @__PURE__ */ import_react.default.createElement(import_manufacturer.Linkly, { key: data.key, api, onChange }) : null
+    ) : null
   ) : null, data.type === import_const.PayRouteEnum.Unset && Comm ? /* @__PURE__ */ import_react.default.createElement(
     Comm,
     {

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

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

package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.js

@@ -43,7 +43,6 @@ var import_serve = require("../../../../../Sales/Event/serve");
 var import_ahooks = require("ahooks");
 var import_useEngineContext = __toESM(require("../../../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
-var import_utils3 = require("../../../../../appointmentBooking/utils");
 var ContinueButton = () => {
   var _a, _b;
   const { data } = (0, import_Sales.useSales)();
@@ -54,11 +53,9 @@ var ContinueButton = () => {
     onCheckout,
     createBooking,
     onCheckBeforeBooking,
-    checkBeforeBooking,
-    freePay
+    checkBeforeBooking
   } = (0, import_Sales.useCheckout)();
   const { openLoginModal, isLogin } = (0, import_Sales.useCustomer)();
-  const { deposit, isAgreeDepositPolicy } = (0, import_Sales.useSummary)();
   const [openCheckout, setOpenCheckout] = (0, import_react.useState)(false);
   const [checkedNumber, setCheckedNumber] = (0, import_react.useState)(0);
   const [openEmptyHolder, setOpenEmptyHolder] = (0, import_react.useState)(false);
@@ -229,13 +226,8 @@ var ContinueButton = () => {
     handleNextStep();
   };
   const handleContinue = async () => {
-    var _a2;
     if (isLastStep) {
       const value = (0, import_utils2.formatValues)(data);
-      if ((deposit == null ? void 0 : deposit.hasDeposit) && ((_a2 = deposit == null ? void 0 : deposit.protocols) == null ? void 0 : _a2.length) > 0 && !isAgreeDepositPolicy) {
-        (0, import_utils3.Toast)(import_utils.locales.getText("pisell2.appointment.deposit.agree.policy"));
-        return;
-      }
       const checkRes = await onCheckBeforeBooking(value);
       if ((checkRes == null ? void 0 : checkRes.result) === false) {
         setCheckedNumber(checkRes == null ? void 0 : checkRes.num);
@@ -271,13 +263,8 @@ var ContinueButton = () => {
   }, [currentStepData == null ? void 0 : currentStepData.key]);
   const confirmLoading = (0, import_react.useMemo)(() => {
     if (!isLastStep) return false;
-    return (createBooking == null ? void 0 : createBooking.loading) || (checkBeforeBooking == null ? void 0 : checkBeforeBooking.loading) || (freePay == null ? void 0 : freePay.loading);
-  }, [
-    isLastStep,
-    createBooking == null ? void 0 : createBooking.loading,
-    checkBeforeBooking == null ? void 0 : checkBeforeBooking.loading,
-    freePay == null ? void 0 : freePay.loading
-  ]);
+    return (createBooking == null ? void 0 : createBooking.loading) || (checkBeforeBooking == null ? void 0 : checkBeforeBooking.loading);
+  }, [isLastStep, createBooking == null ? void 0 : createBooking.loading, checkBeforeBooking == null ? void 0 : checkBeforeBooking.loading]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_materials.Button,
     {

package/lib/components/eventBooking/components/Provider/Cart/Item/Total.js

@@ -40,9 +40,8 @@ var import_useEngineContext = __toESM(require("../../../../../../hooks/useEngine
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
 var Total = ({ className, isFooter }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
-  const { cartData } = (0, import_Sales.useCart)();
-  const { taxTitle, totalTaxFee, isPriceIncludeTax, total, deposit } = (0, import_Sales.useSummary)();
+  var _a, _b, _c, _d, _e, _f;
+  const { taxTitle, totalTaxFee, isPriceIncludeTax, total } = (0, import_Sales.useSummary)();
   const context = (0, import_useEngineContext.default)();
   console.log(
     taxTitle,
@@ -50,10 +49,8 @@ var Total = ({ className, isFooter }) => {
     totalTaxFee,
     total,
     (_c = (_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getSymbolic) == null ? void 0 : _c.call(_b),
-    deposit,
     "wh97978"
   );
-  const showDeposit = ((_d = cartData == null ? void 0 : cartData.cartItems) == null ? void 0 : _d.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: `event-total-wrap ${className}` }, !isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "gst-wrap" }, /* @__PURE__ */ import_react.default.createElement("span", null, taxTitle, isFooter ? ": " : ""), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellText.Amount, { value: totalTaxFee, showCurrencySymbol: true })) : null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -61,16 +58,16 @@ var Total = ({ className, isFooter }) => {
         [["total-gst-wrap"]]: !isPriceIncludeTax && Number(totalTaxFee) > 0
       })
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "left" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", null, isFooter && showDeposit ? import_utils.locales.getText("pisell2.appointment.deposit") : import_utils.locales.getText("pisell2.event.total"), isFooter ? ": " : ""), isFooter ? /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "left" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.event.total"), isFooter ? ": " : ""), isFooter ? /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellText.Amount,
       {
-        value: ((_e = cartData == null ? void 0 : cartData.cartItems) == null ? void 0 : _e.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? deposit == null ? void 0 : deposit.total : total,
+        value: total,
         showCurrencySymbol: true,
         className: "event-amount"
       }
     ) : null), isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("span", { className: "gst" }, import_utils.locales.getText("pisell2.event.total.gst")(
       `${isFooter ? `${taxTitle}: ` : taxTitle}`,
-      `${(_h = (_g = (_f = context == null ? void 0 : context.appHelper) == null ? void 0 : _f.utils) == null ? void 0 : _g.getSymbolic) == null ? void 0 : _h.call(_g)}${totalTaxFee}`
+      `${(_f = (_e = (_d = context == null ? void 0 : context.appHelper) == null ? void 0 : _d.utils) == null ? void 0 : _e.getSymbolic) == null ? void 0 : _f.call(_e)}${totalTaxFee}`
     )) : null),
     !isFooter ? /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellText.Amount,

package/lib/components/eventBooking/components/Provider/Cart/Item/index.js

@@ -39,10 +39,8 @@ var import_Sales = require("../../../../../Sales");
 var import_SelectHolderModal = __toESM(require("../../SelectHolderModal"));
 var import_ContinueButton = __toESM(require("../ContinueButton"));
 var import_Total = __toESM(require("./Total"));
-var import_Deposit = __toESM(require("../Deposit"));
 var import_index = require("./index.less");
 var CartItem = () => {
-  var _a;
   const { open, holderData, selectedHolderIds } = (0, import_Sales.useHolder)();
   const {
     deleteCartItem,
@@ -50,7 +48,7 @@ var CartItem = () => {
     cartData,
     addNoteToCartItem
   } = (0, import_Sales.useCart)();
-  const { deposit } = (0, import_Sales.useSummary)();
+  const { subtotal } = (0, import_Sales.useSummary)();
   const { isLastStep } = (0, import_Sales.useStep)();
   const handleClickCard = (e, type, key) => {
     if (type === "note") {
@@ -88,7 +86,7 @@ var CartItem = () => {
         onChange: (e, type, key) => handleClickCard(e, type, key)
       }
     )),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "event-footer" }, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), ((_a = cartData == null ? void 0 : cartData.cartItems) == null ? void 0 : _a.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, null))
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "event-footer" }, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, null))
   ), /* @__PURE__ */ import_react.default.createElement(import_SelectHolderModal.default, { open }));
 };
 var Item_default = CartItem;

package/lib/components/eventBooking/components/bookingDetailModal/index.js

@@ -239,7 +239,7 @@ var BookingDetailModal = (props) => {
     utils == null ? void 0 : utils.action({
       type: "pisell1.productDetail",
       data: {
-        detail: { ...(bookingOption == null ? void 0 : bookingOption._originData) || {}, open_deposit: 1 },
+        detail: { ...(bookingOption == null ? void 0 : bookingOption._originData) || {} },
         isOS: false
       },
       callback: (data) => {

package/lib/components/eventBooking/locales.d.ts

@@ -71,14 +71,6 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': string;
-        'pisell2.appointment.deposit': string;
-        'pisell2.appointment.deposit.agreed': string;
-        'pisell2.appointment.deposit.agree.policy': string;
-        'pisell2.appointment.deposit.and': string;
-        'pisell2.appointment.deposit.amount.tip1': string;
-        'pisell2.appointment.deposit.amount.tip2': string;
-        'pisell2.appointment.deposit.close': string;
-        'pisell2.appointment.booking.empty.data': string;
     };
     'zh-CN': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -152,14 +144,6 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': string;
-        'pisell2.appointment.deposit': string;
-        'pisell2.appointment.deposit.agreed': string;
-        'pisell2.appointment.deposit.agree.policy': string;
-        'pisell2.appointment.deposit.and': string;
-        'pisell2.appointment.deposit.amount.tip1': string;
-        'pisell2.appointment.deposit.amount.tip2': string;
-        'pisell2.appointment.deposit.close': string;
-        'pisell2.appointment.booking.empty.data': string;
     };
     'zh-HK': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -233,14 +217,6 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': string;
-        'pisell2.appointment.deposit': string;
-        'pisell2.appointment.deposit.agreed': string;
-        'pisell2.appointment.deposit.agree.policy': string;
-        'pisell2.appointment.deposit.and': string;
-        'pisell2.appointment.deposit.amount.tip1': string;
-        'pisell2.appointment.deposit.amount.tip2': string;
-        'pisell2.appointment.deposit.close': string;
-        'pisell2.appointment.booking.empty.data': string;
     };
 };
 export default _default;

package/lib/components/eventBooking/locales.js

@@ -94,15 +94,7 @@ var locales_default = {
     "pisell2.event.capacity.limit.reached.title": "Capacity limit reached",
     "pisell2.event.capacity.limit.reached.tip": "One or more events in your cart are no longer available due to full capacity. Please remove unavailable events from your cart to complete checkout.",
     "pisell2.event.schedule.item.expand": "See more",
-    "pisell2.event.schedule.item.collapse": "See less",
-    "pisell2.appointment.deposit": "Deposit",
-    "pisell2.appointment.deposit.agreed": "I have read and agree to the ",
-    "pisell2.appointment.deposit.agree.policy": "You need to agree the policy to proceed",
-    "pisell2.appointment.deposit.and": " & ",
-    "pisell2.appointment.deposit.amount.tip1": " needs to be paid as deposit.",
-    "pisell2.appointment.deposit.amount.tip2": " ",
-    "pisell2.appointment.deposit.close": "Close",
-    "pisell2.appointment.booking.empty.data": "No data"
+    "pisell2.event.schedule.item.collapse": "See less"
   },
   "zh-CN": {
     "pisell2.event.calendar.limit.unavailable": "不可预约",
@@ -175,15 +167,7 @@ var locales_default = {
     "pisell2.event.capacity.limit.reached.title": "活动名额已满",
     "pisell2.event.capacity.limit.reached.tip": "购物车中有一个或多个活动已达预约上限，请将已满额的活动从购物车中移除后再完成结算。",
     "pisell2.event.schedule.item.expand": "查看更多",
-    "pisell2.event.schedule.item.collapse": "收起",
-    "pisell2.appointment.deposit": "定金",
-    "pisell2.appointment.deposit.agreed": "我已阅读并同意 ",
-    "pisell2.appointment.deposit.agree.policy": "您需要同意协议才能继续",
-    "pisell2.appointment.deposit.and": " 和 ",
-    "pisell2.appointment.deposit.amount.tip1": "请支付 ",
-    "pisell2.appointment.deposit.amount.tip2": " 定金。",
-    "pisell2.appointment.deposit.close": "关闭",
-    "pisell2.appointment.booking.empty.data": "暂无数据"
+    "pisell2.event.schedule.item.collapse": "收起"
   },
   "zh-HK": {
     "pisell2.event.calendar.limit.unavailable": "不可預約",
@@ -256,14 +240,6 @@ var locales_default = {
     "pisell2.event.capacity.limit.reached.title": "活動名額已滿",
     "pisell2.event.capacity.limit.reached.tip": "購物車中有一個或多個活動已達預約上限，請將已滿額的活動從購物車中移除後再完成結算。",
     "pisell2.event.schedule.item.expand": "查看更多",
-    "pisell2.event.schedule.item.collapse": "收起",
-    "pisell2.appointment.deposit": "定金",
-    "pisell2.appointment.deposit.agreed": "我已閱讀並同意 ",
-    "pisell2.appointment.deposit.agree.policy": "您需要同意協議才能繼續",
-    "pisell2.appointment.deposit.and": " 和 ",
-    "pisell2.appointment.deposit.amount.tip1": "請支付 ",
-    "pisell2.appointment.deposit.amount.tip2": " 定金。",
-    "pisell2.appointment.deposit.close": "关闭",
-    "pisell2.appointment.booking.empty.data": "暫無數據"
+    "pisell2.event.schedule.item.collapse": "收起"
   }
 };

package/lib/components/index.d.ts

@@ -15,6 +15,6 @@ import WorkspaceListDetail from './workSpaceListDetail/';
 import WorkspaceList from './workSpaceList';
 import PisellSelectCustomerModal from './pisellSelectCustomerModal';
 import SubTotal from './subTotal';
-import StepController from './stepController';
 import EditBookingModal from './booking/editBookingModal';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, StepController, EditBookingModal };
+import StepController from './stepController';
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController };

package/lib/components/index.js

@@ -67,8 +67,8 @@ var import_workSpaceListDetail = __toESM(require("./workSpaceListDetail/"));
 var import_workSpaceList = __toESM(require("./workSpaceList"));
 var import_pisellSelectCustomerModal = __toESM(require("./pisellSelectCustomerModal"));
 var import_subTotal = __toESM(require("./subTotal"));
-var import_stepController = __toESM(require("./stepController"));
 var import_editBookingModal = __toESM(require("./booking/editBookingModal"));
+var import_stepController = __toESM(require("./stepController"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Booking,

package/lib/components/pay/toC/PaymentMethods/index.js

@@ -65,7 +65,7 @@ var isOfflinePayment = (type) => {
   ].includes(type);
 };
 var PaymentMethods = (props, ref) => {
-  var _a, _b, _c;
+  var _a;
   const MWCreditCardRef2 = (0, import_react.useRef)(null);
   const SuperPayAliPayH5Ref2 = (0, import_react.useRef)(null);
   const StripePayRef2 = (0, import_react.useRef)(null);
@@ -83,9 +83,9 @@ var PaymentMethods = (props, ref) => {
   const context = (0, import_useEngineContext.default)();
   const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const init = async ({ type, payGroup }) => {
-    var _a2, _b2;
+    var _a2, _b;
     const waitAmount = (payGroup == null ? void 0 : payGroup.wait_amount) || 0;
-    const cards = (_b2 = (_a2 = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a2.cards) == null ? void 0 : _b2.length;
+    const cards = (_b = (_a2 = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a2.cards) == null ? void 0 : _b.length;
     if (cards && (waitAmount <= 0 || isOfflinePayment(type))) {
       try {
         await (0, import_serve.walletPassPay)((0, import_utils.formatWalletPassParams)(payGroup));
@@ -115,11 +115,10 @@ var PaymentMethods = (props, ref) => {
     }
     await onPayByType({ type, payGroup });
   };
-  console.log("paymentResult isAppEnv", (_c = (_b = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _b.isAppEnv) == null ? void 0 : _c.call(_b), interaction, context);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c2, _d;
-    console.log("paymentResult isAppEnv", (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b2.call(_a2));
-    if ((_d = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d.call(_c2)) {
+    var _a2, _b, _c, _d;
+    console.log("paymentResult isAppEnv", (_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2));
+    if ((_d = (_c = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c.isAppEnv) == null ? void 0 : _d.call(_c)) {
       interaction.utils.mountFunction("global", "paymentResult", (strResult) => {
         console.log("paymentResult", strResult);
         if (!(0, import_utils2.isJson)(strResult)) return;
@@ -135,18 +134,18 @@ var PaymentMethods = (props, ref) => {
     }
   }, []);
   const onPayByType = async ({ type, payGroup }) => {
-    var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     console.log(type, payGroup);
     if (type === "mw.apple") {
       await ((_a2 = ApplePayRef2.current) == null ? void 0 : _a2.init({ payGroup }));
       return;
     }
     if (type === "mw.google") {
-      await ((_b2 = GooglePayRef2.current) == null ? void 0 : _b2.init({ payGroup }));
+      await ((_b = GooglePayRef2.current) == null ? void 0 : _b.init({ payGroup }));
       return;
     }
     if (type === "mw.credit_card") {
-      (_c2 = MWCreditCardRef2.current) == null ? void 0 : _c2.init({ payGroup });
+      (_c = MWCreditCardRef2.current) == null ? void 0 : _c.init({ payGroup });
       return;
     }
     if (type === "superpay.alipay.h5") {

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -406,7 +406,7 @@ var AddSerivce = (props) => {
             isTitle: 1,
             isSubtitle: 1,
             isPrice: 1,
-            isOriginPrice: 0,
+            isOriginPrice: 1,
             isStock: 1
           }
         }

package/lib/components/ticketBooking/components/ticketBooking/index.js

@@ -46,9 +46,6 @@ var import_utils2 = require("../../utils");
 var import_addServiceVariant = __toESM(require("../addServiceVariant"));
 var import_timeBar = __toESM(require("../timeBar"));
 var import_index = require("./index.less");
-var import_utils3 = require("../../../booking/info/service2/utils");
-var import_amount = require("../../../booking/components/footer/amount");
-var import_formatProductMessage = __toESM(require("../../utils/formatProductMessage"));
 var _formatBookingDetail = (data, modalState) => {
   var _a, _b, _c, _d;
   let {
@@ -192,17 +189,7 @@ var TicketBooking = () => {
   const [state, setState] = (0, import_miniRedux.useStore)();
   const engineContext = (0, import_useEngineContext.default)();
   const { props: engineProps } = engineContext.engine;
-  const {
-    action,
-    isTerminal,
-    lowcodeRef,
-    interaction,
-    store,
-    storage,
-    Toast,
-    getSymbolic,
-    translation
-  } = (_a = engineContext.appHelper) == null ? void 0 : _a.utils;
+  const { action, isTerminal, lowcodeRef, interaction, store, storage, Toast } = (_a = engineContext.appHelper) == null ? void 0 : _a.utils;
   const _persistentRef = (0, import_react.useRef)(false);
   const _initStateRef = (0, import_react.useRef)({});
   const _listTimerRef = (0, import_react.useRef)();
@@ -289,112 +276,6 @@ var TicketBooking = () => {
       intervalSetTime: isInterval
     });
   };
-  (0, import_react.useEffect)(() => {
-    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-    const cartItems = (_b = (_a2 = state == null ? void 0 : state.modalState) == null ? void 0 : _a2.service) == null ? void 0 : _b.value;
-    if (!Array.isArray(cartItems) || cartItems.length === 0) {
-      (_d = (_c = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c.postMessageToApp) == null ? void 0 : _d.call(_c, {
-        module: "cds",
-        key: "cartUpdate",
-        data: {
-          currency_symbol: getSymbolic(),
-          total: "0",
-          // 小计
-          products: [],
-          fees: []
-        }
-      });
-    }
-    const total = (0, import_amount.getSumTotal)(state.modalState, true);
-    let formatedProducts = [];
-    try {
-      formatedProducts = (0, import_utils3.formatProducts)(
-        cartItems,
-        state.modalState,
-        false,
-        true,
-        true
-      );
-    } catch (error) {
-      console.error(error);
-    }
-    console.log("formatedProducts", total, formatedProducts);
-    let fees = [];
-    let products = [];
-    for (const item of formatedProducts) {
-      const { id, name, image, origin_total, total: total2, num, note, _origin } = item;
-      (_e = _origin == null ? void 0 : _origin.discount_list) == null ? void 0 : _e.forEach((dl) => {
-        fees.push({
-          isReduce: dl.type === "good_pass",
-          title: translation(dl == null ? void 0 : dl.discount.title),
-          price: dl.amount,
-          type: dl.type
-        });
-      });
-      let msg = "";
-      try {
-        msg = (0, import_formatProductMessage.default)(
-          {
-            ...item,
-            currency_symbol: getSymbolic()
-          },
-          (_f = engineContext.appHelper) == null ? void 0 : _f.utils
-        );
-      } catch (error) {
-        console.error(error);
-      }
-      let _item = {
-        productID: id,
-        title: name,
-        cover: image,
-        //  封面图
-        price: total2,
-        // 售价
-        buyCount: num,
-        // 购买数量
-        productFormatMessage: msg,
-        note
-      };
-      if (origin_total !== total2) _item.modifyPrice = origin_total;
-      products.push(_item);
-    }
-    console.log(
-      "formatedProducts",
-      (_g = import_utils.locales.getText("pisell2.product.card.cart-items")) == null ? void 0 : _g(products.length)
-    );
-    if (products.length > 0) {
-      fees.unshift({
-        title: import_utils.locales.getText("pisell2.product.card.subtotal"),
-        price: total.productAmount,
-        type: "subtotal",
-        message: (_h = import_utils.locales.getText("pisell2.product.card.cart-items")) == null ? void 0 : _h(
-          products.length
-        )
-      });
-    }
-    console.log("start post message, config:", {
-      module: "cds",
-      key: "cartUpdate",
-      data: {
-        currency_symbol: getSymbolic(),
-        total: total.productAmount,
-        // 小计
-        products,
-        fees
-      }
-    });
-    (_j = (_i = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _i.postMessageToApp) == null ? void 0 : _j.call(_i, {
-      module: "cds",
-      key: "cartUpdate",
-      data: {
-        currency_symbol: getSymbolic(),
-        total: total.expectAmount,
-        // 小计
-        products,
-        fees
-      }
-    });
-  }, [state.modalState]);
   const _setModalState = (props) => {
     var _a2, _b;
     console.log("同步state到外层", props);