@pisell/private-materials 3.4.61 → 3.4.62

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

@@ -55,7 +55,7 @@ var ShopDiscountHooks = {
 };
 var services = {};
 var VoucherCard = (props) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const context = (0, import_useEngineContext.default)();
   const { state, dispatch, source } = props;
   const [showDetail, setShowDetail] = (0, import_react.useState)(false);
@@ -66,6 +66,7 @@ var VoucherCard = (props) => {
   const addonsValueRef = (0, import_react.useRef)(state.addons.value);
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const shopDiscount = pisellos.getModule("shopDiscount");
+  const holderChangedRef = (0, import_react.useRef)(false);
   services = state.service;
   (0, import_ahooks.useDebounceEffect)(
     () => {
@@ -89,7 +90,7 @@ var VoucherCard = (props) => {
   const serviceMemo = (0, import_react.useMemo)(() => {
     var _a2;
     const val = (_a2 = state.service.value || []) == null ? void 0 : _a2.map((value) => {
-      var _a3, _b2;
+      var _a3, _b2, _c2;
       return {
         booking_id: value.booking_id,
         id: value.id,
@@ -97,9 +98,9 @@ var VoucherCard = (props) => {
         total: (_a3 = value == null ? void 0 : value._extend) == null ? void 0 : _a3.total,
         discount_list: value.discount_list,
         origin_total: (_b2 = value == null ? void 0 : value._extend) == null ? void 0 : _b2.origin_total,
+        holder_id: (_c2 = value == null ? void 0 : value._extend) == null ? void 0 : _c2.holder_id,
         quantity: value._extend.quantity,
-        startDate: value._extend.startDate,
-        quantity: value._extend.quantity
+        startDate: value._extend.startDate
       };
     });
     return val;
@@ -126,6 +127,29 @@ var VoucherCard = (props) => {
     });
     return val;
   }, [state.addons.value]);
+  const holdersMemo = (0, import_react.useMemo)(() => {
+    var _a2;
+    if (isBooking4Shop) {
+      let list = [];
+      if ((_a2 = state.pet) == null ? void 0 : _a2.value) {
+        let entries = Object.entries(state.pet.value);
+        if (entries.length === 1) {
+          list = entries[0][1];
+        }
+      }
+      shopDiscount.setHolders(list);
+      holderChangedRef.current = true;
+      return list || [];
+    }
+  }, [(_c = state.pet) == null ? void 0 : _c.value, isBooking4Shop]);
+  (0, import_react.useEffect)(() => {
+    var _a2, _b2, _c2, _d2;
+    console.log("update booking subject", state.bookingConfig);
+    (_d2 = shopDiscount == null ? void 0 : shopDiscount.setBookingSubject) == null ? void 0 : _d2.call(
+      shopDiscount,
+      (_c2 = (_b2 = (_a2 = state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject
+    );
+  }, [state.bookingConfig]);
   const disabled = (0, import_react.useMemo)(() => {
     var _a2;
     if (["paid", "partially_paid"].includes(
@@ -138,7 +162,7 @@ var VoucherCard = (props) => {
   const { run } = (0, import_ahooks.useDebounceFn)(
     () => {
       var _a2, _b2;
-      if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value || !((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length)) {
+      if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value && !holderChangedRef.current || !((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length)) {
         return;
       }
       if (isBooking4Shop) {
@@ -149,13 +173,19 @@ var VoucherCard = (props) => {
         console.log("input: ", state.service.value);
         console.log("output: ", val);
         productListToValue(val.productList);
+        holderChangedRef.current = false;
       }
     },
     { wait: 500 }
   );
   (0, import_react.useEffect)(() => {
     run();
-  }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
+  }, [
+    JSON.stringify(serviceMemo),
+    JSON.stringify(addonsMemo),
+    JSON.stringify(holdersMemo),
+    isBooking4Shop
+  ]);
   const fn = (0, import_ahooks.useMemoizedFn)((result) => {
     var _a2;
     if (!(result == null ? void 0 : result.productList) || ((_a2 = result == null ? void 0 : result.productList) == null ? void 0 : _a2.some((item) => !item))) {
@@ -293,7 +323,7 @@ var VoucherCard = (props) => {
       {
         style: { width: "100%" },
         mixedSort,
-        dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
+        dataSource: ((_e = (_d = state.service) == null ? void 0 : _d.value) == null ? void 0 : _e.length) ? availableData : [],
         onChange: (val) => {
           const shopDiscount2 = pisellos.getModule("shopDiscount");
           const detail = shopDiscount2.setDiscountSelected({

package/lib/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

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

@@ -178,7 +178,7 @@ var handleChangeHolder = (products, currentItem, other) => {
         ...item,
         _extend: {
           ...item._extend,
-          holder_id: (0, import_utils2.isArr)(other) ? other.map((item2) => item2.id) : item._extend.quantity > 1 ? [other.id] : other.id
+          holder_id: (0, import_utils2.isArr)(other) ? other.map((item2) => item2.id) : item._extend.quantity > 1 ? [other.id] : other == null ? void 0 : other.id
         }
       };
     }
@@ -513,6 +513,7 @@ var getGeneralParams = (item, state, isParallelResource) => {
     holders: formatHolders(holders),
     isShowChangeHolder: !isNormalProduct,
     isShowAction: (0, import_utils4.isShowAddTime)(state, item),
+    allowClearHolder: true,
     actionText: import_utils2.locales.getText("page.booking.text.add-time"),
     isMultipleResource: true,
     multiResources,

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

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -109,11 +108,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -10,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

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

package/lib/components/pay/toC/PaymentList/index.d.ts

@@ -12,7 +12,7 @@ export interface PaymentListProps {
     renderTitle?: () => React.ReactNode;
 }
 export interface PaymentListRef {
-    init: (props: any) => {};
+    init: (props: any, amount?: number) => {};
     calculateSurcharge: (amount: number) => any;
 }
 declare const _default: React.ForwardRefExoticComponent<PaymentListProps & React.RefAttributes<unknown>>;

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

@@ -90,11 +90,11 @@ var PaymentList = (props, ref) => {
     var _a2, _b2;
     return (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b2.call(_a2);
   }, []);
-  const init = (list) => {
+  const init = (list, amount) => {
     var _a2, _b2;
     setLoading(true);
     const platform = ((_b2 = (_a2 = context.appHelper) == null ? void 0 : _a2.constants) == null ? void 0 : _b2.platform) || "h5";
-    const { paymentList: paymentList2, walletPass } = (0, import_serve.filterPaymentList)(list, platform, isApp);
+    const { paymentList: paymentList2, walletPass } = (0, import_serve.filterPaymentList)(list, platform, isApp, amount);
     if (paymentList2.length > 0) {
       let first = paymentList2[0];
       setPaymentList(paymentList2);
@@ -147,6 +147,24 @@ var PaymentList = (props, ref) => {
       }
     ));
   };
+  const renderCreditCardToast = (_item) => {
+    var _a2;
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "surcharge-modal-wrap surcharge-modal-wrap-credit-card" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "surcharge-modal-lists" }, (_a2 = _item == null ? void 0 : _item.surcharge_config_result) == null ? void 0 : _a2.map((d) => {
+      var _a3, _b2;
+      return /* @__PURE__ */ import_react.default.createElement("div", { key: d.name, className: "surcharge-modal-list-item" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "surcharge-modal-list-item-header" }, (_a3 = d == null ? void 0 : d.icons) == null ? void 0 : _a3.map((icon) => {
+        return /* @__PURE__ */ import_react.default.createElement(
+          import_materials.Image,
+          {
+            src: icon,
+            className: "header-icon",
+            isPreview: false
+          }
+        );
+      }), /* @__PURE__ */ import_react.default.createElement("span", null, d.name)), /* @__PURE__ */ import_react.default.createElement("div", { className: "surcharge-modal-list-item-content" }, (_b2 = d == null ? void 0 : d.lists) == null ? void 0 : _b2.map((item) => {
+        return /* @__PURE__ */ import_react.default.createElement("div", { key: item.name, className: "content-item" }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils2.locales.getText(item.area_text)), /* @__PURE__ */ import_react.default.createElement("span", { className: "item-fee" }, item.surcharge_fee), /* @__PURE__ */ import_react.default.createElement("span", null, item.surcharge_text));
+      })));
+    })));
+  };
   const content = (0, import_react.useMemo)(() => {
     if (loading) {
       return null;
@@ -172,8 +190,9 @@ var PaymentList = (props, ref) => {
         onChange: paymentTypeChange,
         optionClassName: "payment-item",
         renderOption: (d, active) => {
-          var _a2, _b2;
+          var _a2, _b2, _c2;
           const showIcon = d.surcharge && d.service !== "pisell.other.cashmanual" && d.service !== "pisell.custom_payment" || ((_a2 = d == null ? void 0 : d.params) == null ? void 0 : _a2.description) && (d.service === "pisell.other.cashmanual" || d.service === "pisell.custom_payment");
+          const showCreditCardToast = (d == null ? void 0 : d.service) === "mw.credit_card" && ((_b2 = d == null ? void 0 : d.surcharge_config_result) == null ? void 0 : _b2.length) > 0;
           return /* @__PURE__ */ import_react.default.createElement(
             import_materials.PisellRow,
             {
@@ -199,12 +218,24 @@ var PaymentList = (props, ref) => {
                   d.title,
                   " "
                 ),
-                /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, (((_b2 = d == null ? void 0 : d.params) == null ? void 0 : _b2.description) || d.surcharge) && d.service !== "pisell.offline_payment" ? /* @__PURE__ */ import_react.default.createElement(
+                /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, (((_c2 = d == null ? void 0 : d.params) == null ? void 0 : _c2.description) || d.surcharge) && d.service !== "pisell.offline_payment" ? /* @__PURE__ */ import_react.default.createElement(
                   import_materials.PisellTooltip,
                   {
-                    title: renderToast(d),
+                    title: showCreditCardToast ? renderCreditCardToast(d) : renderToast(d),
                     onClick: (e) => {
                       e.stopPropagation();
+                    },
+                    overlayClassName: showCreditCardToast ? "surcharge-tooltip-overlay-wrap" : "",
+                    getPopupContainer: (triggerNode) => {
+                      var _a3;
+                      if (showCreditCardToast) {
+                        const modalContainer = (_a3 = triggerNode == null ? void 0 : triggerNode.closest) == null ? void 0 : _a3.call(
+                          triggerNode,
+                          ".toc-pay-modal-content .pisell-lowcode-modal"
+                        );
+                        return modalContainer || document.body;
+                      }
+                      return document.body;
                     }
                   },
                   /* @__PURE__ */ import_react.default.createElement(

package/lib/components/pay/toC/PaymentList/index.less

@@ -109,4 +109,61 @@
     font-style: normal;
     font-weight: 500;
   }
-}
+}
+
+.surcharge-tooltip-overlay-wrap{
+  max-width: 92% !important;
+  width: 92%;
+  left: 4% !important;
+  .pisell-lowcode-tooltip-inner{
+    background: #F2F4F7 !important;
+  }
+}
+
+.surcharge-modal-wrap-credit-card {
+  .surcharge-modal-lists {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    .surcharge-modal-list-item {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+      .surcharge-modal-list-item-header {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+        color: #101828;
+        font-size: 14px;
+        font-weight: 600;
+        line-height: 20px;
+        .header-icon{
+          width: 58px;
+        }
+      }
+      .surcharge-modal-list-item-content {
+        display: flex;
+        gap: 12px;
+        .content-item {
+          display: flex;
+          flex-direction: column;
+          flex: 1;
+          padding: 8px 12px;
+          border-radius: 8px;
+          box-shadow: 0px 2px 4px -2px rgba(16, 24, 40, 0.06);
+          background: white;
+          color: #475467;
+          font-size: 12px;
+          font-weight: 400;
+          line-height: 18px;
+          .item-fee {
+            color: black;
+            font-size: 24px;
+            font-weight: 700;
+            line-height: 32px;
+          }
+        }
+      }
+    }
+  }
+}

package/lib/components/pay/toC/PaymentList/serve.d.ts

@@ -20,7 +20,7 @@ export declare const getPaymentList: (values: any) => Promise<{
  * @Author: zhiwei.Wang
  * @Date: 2024-08-16 10:57
  */
-export declare const filterPaymentList: (list: any[], platform: string | undefined, isApp: boolean) => {
+export declare const filterPaymentList: (list: any[], platform: string | undefined, isApp: boolean, amount?: number) => {
     message: string;
     status: string;
     paymentList: any[];

package/lib/components/pay/toC/PaymentList/serve.js

@@ -27,6 +27,7 @@ var import_utils = require("../../../../utils");
 var import_status = require("./status");
 var import_utils2 = require("@pisell/utils");
 var import_status2 = require("./status");
+var import_utils3 = require("./utils");
 var getPaymentList = async (values) => {
   let { data = [] } = await import_utils.request.getRequest().get("/h5/pay/order/payments", values);
   return filterPaymentList(data);
@@ -43,7 +44,7 @@ var sortArr = [
   "pisell.other.cashmanual",
   "pisell.custom_payment"
 ];
-var filterPaymentList = (list, platform = "h5", isApp) => {
+var filterPaymentList = (list, platform = "h5", isApp, amount) => {
   let paymentList = [...list];
   let _paymentKeys = [...import_status.paymentKeys];
   const walletPass = paymentList.find((d) => d.service === "pisell.wallet_pass");
@@ -82,6 +83,10 @@ var filterPaymentList = (list, platform = "h5", isApp) => {
     if ((0, import_status2.isCustomPayment)(d.service)) {
       service = service + "|" + d.params.custom_payment_id;
     }
+    if (service === "mw.credit_card") {
+      d.surcharge = (0, import_utils3.formatCreditCardSurchargeText)(d == null ? void 0 : d.surcharge_config, d == null ? void 0 : d.surcharge_text);
+      d.surcharge_config_result = (0, import_utils3.formatCreditCardSurchargeList)(d, amount ?? 0);
+    }
     return {
       ...d,
       service,

package/lib/components/pay/toC/PaymentList/utils.d.ts

@@ -1,3 +1,29 @@
+/**
+ * @description: visa/master手续费是否一致
+ * @param {any} creditCardConfig
+ * @return {*}
+ */
+export declare const isCreditCardSurchargeSame: (creditCardConfig: any[]) => boolean;
+/**
+ * @description: 格式化visa/master手续费
+ * @param {any} item 支付列表项
+ * @param {number} amount 订单金额
+ * @param {boolean} isSame 手续费是否一致
+ * @return {*}
+ */
+export declare const formatCreditCardSurcharge: (item: any, amount: number, isSame: boolean) => any;
+/**
+ * @description: 格式化visa/master手续费列表
+ * @param {any} item
+ * @param {number} amount
+ * @return {*}
+ */
+export declare const formatCreditCardSurchargeList: (item: any, amount: number) => any;
+/**
+ * @description: 格式化visa/master手续费文案，只显示百分比区间
+ * @return {*}
+ */
+export declare const formatCreditCardSurchargeText: (surcharge_config: any[], surcharge_text: string) => string;
 /**
  * @title: 计算支付列表的手续费
  * @description: