@pisell/private-materials 6.5.26 → 6.6.1

package/lib/components/appointmentBooking/components/ConfirmInformation/index.js

@@ -41,6 +41,9 @@ var import_Item = __toESM(require("../Cart/Item"));
 var import_utils2 = require("../../utils");
 var import_utils3 = require("./utils");
 var import_index = require("./index.less");
+var import_ContactInfoContent = __toESM(require("../../../../plus/contactInfoModal/ContactInfoContent"));
+var import_antd = require("antd");
+var import_useLoginUser = __toESM(require("../../../../hooks/useLoginUser"));
 var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   var _a, _b;
   const hasSubscribedRef = (0, import_react.useRef)(false);
@@ -49,7 +52,69 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   const utils = (0, import_hooks.contextUtils)();
   const { pubsub } = context.appHelper.utils;
   const { appointmentBooking, summary, isAgreeDepositPolicy, setLoading } = (0, import_context.useAppointmentBookingContext)();
-  const { isRetailTemplate } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { isRetailTemplate, bookingSetting } = (0, import_hooks.useAppointmentBookingSetting)();
+  console.log(bookingSetting, "bookingSetting");
+  const [form] = import_antd.Form.useForm();
+  const userInfo = (0, import_useLoginUser.default)();
+  const getContactsInfo = async () => {
+    var _a2;
+    let contacts_info = null;
+    try {
+      const res = await ((_a2 = appointmentBooking == null ? void 0 : appointmentBooking.getContactInfo) == null ? void 0 : _a2.call(appointmentBooking, {
+        key: "contacts_info"
+      }));
+      if ((res == null ? void 0 : res.code) == 200 && (res == null ? void 0 : res.data)) {
+        contacts_info = res == null ? void 0 : res.data;
+      }
+    } catch (error) {
+      console.log("error", error);
+      contacts_info = null;
+    }
+    const transfromCountryCallingCode = (code) => {
+      if (!code) {
+        return "";
+      }
+      return (code == null ? void 0 : code.startsWith("+")) ? code : `+${code}`;
+    };
+    if (contacts_info) {
+      const { first_name, last_name, phone, email } = contacts_info || {};
+      form.setFieldsValue({
+        first_name,
+        last_name,
+        phone: {
+          phone: phone == null ? void 0 : phone.phone,
+          countryCallingCode: transfromCountryCallingCode(
+            phone == null ? void 0 : phone.country_calling_code
+          ),
+          countryCode: phone == null ? void 0 : phone.country_code
+        },
+        email
+      });
+    } else {
+      console.log("userInfo", userInfo);
+      const {
+        first_name,
+        last_name,
+        phone,
+        email,
+        country_calling_code,
+        country_code
+      } = userInfo || {};
+      form.setFieldsValue({
+        first_name,
+        last_name,
+        phone: {
+          phone,
+          countryCallingCode: transfromCountryCallingCode(country_calling_code),
+          countryCode: country_code
+        },
+        email
+      });
+    }
+  };
+  (0, import_react.useEffect)(() => {
+    getContactsInfo();
+  }, []);
   const goPaymentFinish = (order_id, amount) => {
     var _a2;
     const url = `/payment-finish/success?order_id=${order_id}&amount=${Number(
@@ -60,17 +125,17 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   };
   (0, import_react.useEffect)(() => {
     if (isRetailTemplate) {
-      handleForm();
+      handleForm(false);
     }
   }, [isRetailTemplate]);
-  const handleForm = async (isSubmit) => {
+  const handleForm = async (isSubmit, extraData) => {
     var _a2;
     const carts = await appointmentBooking.getCart();
     const key = "isRetailFormSubmit";
     const isRetailFormSubmit = appointmentBooking.getOtherData(key);
     const callback = () => {
       if (isSubmit) {
-        onCheckout();
+        onCheckout(extraData);
       }
     };
     if (isRetailFormSubmit) {
@@ -94,7 +159,7 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
       }
     });
   };
-  const handleNext = async () => {
+  const handleNext = async (extraData) => {
     var _a2;
     const { deposit } = summary;
     if ((deposit == null ? void 0 : deposit.hasDeposit) && ((_a2 = deposit == null ? void 0 : deposit.protocols) == null ? void 0 : _a2.length) > 0 && !isAgreeDepositPolicy) {
@@ -102,15 +167,15 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
     }
     setLoading(true);
     if (isRetailTemplate) {
-      handleForm(true);
+      handleForm(true, extraData);
       return;
     }
-    onCheckout();
+    onCheckout(extraData);
   };
-  const onCheckout = async () => {
+  const onCheckout = async (extraData) => {
     try {
       const { deposit } = summary;
-      const { data } = await appointmentBooking.submitOrder();
+      const { data } = await appointmentBooking.submitOrder(extraData);
       const { is_deposit, deposit_amount, total_amount, order_id } = data || {};
       const _total = is_deposit ? deposit_amount : total_amount;
       if (_total > 0) {
@@ -143,8 +208,8 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
       }, 50);
     }
   };
-  const handleSubmit = () => {
-    var _a2, _b2, _c, _d;
+  const handleSubmit = async () => {
+    var _a2, _b2, _c, _d, _e, _f, _g;
     if ((_b2 = (_a2 = utils == null ? void 0 : utils.businessUtils) == null ? void 0 : _a2.isGuestUser) == null ? void 0 : _b2.call(_a2)) {
       if (!hasSubscribedRef.current) {
         pubsub.subscribe("bind.guest.user", handleNext);
@@ -153,7 +218,28 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
       (_d = (_c = utils == null ? void 0 : utils.businessUtils) == null ? void 0 : _c.openRegisterModal) == null ? void 0 : _d.call(_c, true);
       return;
     }
-    handleNext();
+    let contacts_info = null;
+    try {
+      if (showContactInfo) {
+        contacts_info = await form.validateFields();
+        const newPhone = {
+          phone: ((_e = contacts_info == null ? void 0 : contacts_info.phone) == null ? void 0 : _e.phone) || "",
+          country_calling_code: ((_f = contacts_info == null ? void 0 : contacts_info.phone) == null ? void 0 : _f.countryCallingCode) || "",
+          country_code: ((_g = contacts_info == null ? void 0 : contacts_info.phone) == null ? void 0 : _g.countryCode) || ""
+        };
+        contacts_info.phone = newPhone;
+        if ((contacts_info == null ? void 0 : contacts_info.first_name) || (contacts_info == null ? void 0 : contacts_info.last_name)) {
+          contacts_info.display_name = `${(contacts_info == null ? void 0 : contacts_info.first_name) || ""} ${(contacts_info == null ? void 0 : contacts_info.last_name) || ""}`;
+        } else {
+          contacts_info.display_name = "";
+        }
+        console.log("contacts_info", contacts_info);
+      }
+    } catch (error) {
+      console.log("error", error);
+      return;
+    }
+    handleNext({ contacts_info });
   };
   (0, import_react.useEffect)(() => {
     return () => {
@@ -164,7 +250,64 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: handleSubmit
   }));
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-wrap" }, (0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement(import_Item.default, { onNext: handleSubmit }) : /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "image" }, /* @__PURE__ */ import_react.default.createElement(
+  const showContactInfo = (0, import_react.useMemo)(() => {
+    let visible = false;
+    const { showContactInfo: showContactInfoValue, contactInfoSetting } = bookingSetting || {};
+    if (showContactInfoValue === 1 || showContactInfoValue === "1") {
+      const { showName, showPhone, showEmail } = contactInfoSetting || {};
+      if ((showName === 0 || showName === "0") && (showPhone === 0 || showPhone === "0") && (showEmail === 0 || showEmail === "0")) {
+        visible = false;
+      } else {
+        visible = true;
+      }
+    } else {
+      visible = false;
+    }
+    return visible;
+  }, [bookingSetting == null ? void 0 : bookingSetting.showContactInfo, bookingSetting == null ? void 0 : bookingSetting.contactInfoSetting]);
+  const renderContactInfo = () => {
+    const {
+      emailRequired,
+      nameRequired,
+      phoneRequired,
+      showEmail,
+      showName,
+      showPhone
+    } = (bookingSetting == null ? void 0 : bookingSetting.contactInfoSetting) || {};
+    if (!showContactInfo) {
+      return null;
+    }
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-contact-info-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-contact-info-title" }, import_utils.locales.getText("pisell2.text.contact-info.title")), /* @__PURE__ */ import_react.default.createElement(
+      import_ContactInfoContent.default,
+      {
+        dataSource: null,
+        form,
+        config: {
+          first_name: {
+            visible: showName === 0 ? false : true,
+            required: nameRequired === "required" ? true : false
+            // 姓名默认选填
+          },
+          last_name: {
+            visible: showName === 0 ? false : true,
+            required: nameRequired === "required" ? true : false
+            // 姓名默认选填
+          },
+          phone: {
+            visible: showPhone === 0 ? false : true,
+            required: phoneRequired === "optional" ? false : true
+            // 手机号默认必填
+          },
+          email: {
+            visible: showEmail === 0 ? false : true,
+            required: emailRequired === "optional" ? false : true
+            // 邮箱默认选填
+          }
+        }
+      }
+    ));
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-wrap" }, (0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement(import_Item.default, { onNext: handleSubmit, renderContactInfo }) : showContactInfo ? renderContactInfo() : /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "image" }, /* @__PURE__ */ import_react.default.createElement(
     "img",
     {
       src: `${config == null ? void 0 : config.awsStatic}/checkout_confirm.png`,

package/lib/components/appointmentBooking/components/ConfirmInformation/index.less

@@ -33,3 +33,18 @@
     }
   }
 }
+.appointment-confirm-information-contact-info-wrap {
+  .appointment-confirm-information-contact-info-title {
+    color: #1b1b1b;
+    font-size: 20px;
+    font-weight: 600;
+  }
+
+  .pisell-contact-info-modal-content {
+    padding: 14px 0;
+  }
+
+  .pisell-lowcode-form-item {
+    margin-bottom: 14px;
+  }
+}

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

@@ -103,4 +103,5 @@ export declare const useAppointmentBookingSetting: () => {
     setOtherData: (key: string, val: any) => any;
     getOtherData: (key: string) => any;
     formName: any;
+    bookingSetting: any;
 };

package/lib/components/appointmentBooking/hooks.js

@@ -66,7 +66,16 @@ var contextUtils = () => {
 var useAppointmentBookingStep = () => {
   var _a, _b, _c;
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
-  const { appointmentBooking, setCurrentStep, carts, openPolicy, setLoading, setCurrentSelectedResources, currentStepParams, setIsErrorHolder } = (0, import_context.useAppointmentBookingContext)();
+  const {
+    appointmentBooking,
+    setCurrentStep,
+    carts,
+    openPolicy,
+    setLoading,
+    setCurrentSelectedResources,
+    currentStepParams,
+    setIsErrorHolder
+  } = (0, import_context.useAppointmentBookingContext)();
   const { isRetailTemplate } = useAppointmentBookingSetting();
   const stepList = ((_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList) || [];
   const { isLogin, openLoginModal } = useAppointmentBookingLogin();
@@ -79,14 +88,11 @@ var useAppointmentBookingStep = () => {
   };
   (0, import_react.useEffect)(() => {
     getCurrentAndLastStep();
-    pisellOS.effects.on(
-      "appointmentBooking_step:changed",
-      async (res) => {
-        if (res.path === "currentStep") {
-          getCurrentAndLastStep();
-        }
+    pisellOS.effects.on("appointmentBooking_step:changed", async (res) => {
+      if (res.path === "currentStep") {
+        getCurrentAndLastStep();
       }
-    );
+    });
   }, []);
   const getStepIndex = (type, skipNumber = 0) => {
     const currentStep = appointmentBooking == null ? void 0 : appointmentBooking.getCurrentStep();
@@ -105,11 +111,14 @@ var useAppointmentBookingStep = () => {
   };
   const addStep = (props, stepKey) => {
     const { index, key, description } = props;
-    return appointmentBooking.addStep({
-      index,
-      key,
-      description
-    }, stepKey);
+    return appointmentBooking.addStep(
+      {
+        index,
+        key,
+        description
+      },
+      stepKey
+    );
   };
   const updateStep = (key, step) => {
     appointmentBooking.updateStep(key, {
@@ -159,7 +168,9 @@ var useAppointmentBookingStep = () => {
           appointmentBooking.addStep(
             {
               key: "select-resource",
-              description: import_utils.locales.getText("pisell2.appointment.select.resource")
+              description: import_utils.locales.getText(
+                "pisell2.appointment.select.resource"
+              )
             },
             targetKey
           );
@@ -175,7 +186,9 @@ var useAppointmentBookingStep = () => {
           appointmentBooking.addStep(
             {
               key: "select-resource",
-              description: import_utils.locales.getText("pisell2.appointment.select.resource")
+              description: import_utils.locales.getText(
+                "pisell2.appointment.select.resource"
+              )
             },
             targetKey
           );
@@ -191,13 +204,19 @@ var useAppointmentBookingStep = () => {
       }
       const capacityResult = appointmentBooking.checkMaxDurationCapacity();
       if (!capacityResult.success) {
-        const getMessage = import_utils.locales.getText("pisell2.appointment.unuse.capacity");
+        const getMessage = import_utils.locales.getText(
+          "pisell2.appointment.unuse.capacity"
+        );
         const message = typeof getMessage === "function" ? getMessage(capacityResult.minAvailableCount) : getMessage;
         return (0, import_utils2.Toast)(message);
       }
     }
     if (!isRetailTemplate && (currentKey == null ? void 0 : currentKey.startsWith("select-resource"))) {
-      const { hasError, updatedCartList } = (0, import_utils2.checkAndMarkCartRenderError)(currentSelectedResources, appointmentBooking, utils);
+      const { hasError, updatedCartList } = (0, import_utils2.checkAndMarkCartRenderError)(
+        currentSelectedResources,
+        appointmentBooking,
+        utils
+      );
       if (hasError) {
         setCurrentSelectedResources(updatedCartList);
         (0, import_utils3.scrollToFirstErrorCard)();
@@ -214,7 +233,10 @@ var useAppointmentBookingStep = () => {
         if (formId) {
           const description = import_utils.locales.getText("pisell2.appointment.fill-form");
           const beforeKey = (0, import_utils2.getFormInsertBeforeKey)(currentKey, stepList2);
-          appointmentBooking.addStep({ key: formKey, description }, preKey || beforeKey);
+          appointmentBooking.addStep(
+            { key: formKey, description },
+            preKey || beforeKey
+          );
           preKey = formKey;
         } else {
           appointmentBooking.removeStep(formKey);
@@ -224,15 +246,20 @@ var useAppointmentBookingStep = () => {
       const selectedResource = (_c2 = currentSelectedResources == null ? void 0 : currentSelectedResources[0]) == null ? void 0 : _c2.currentSelectedResource;
       if (selectedResource) {
         const originRenderLists = ((_d = selectedResource == null ? void 0 : selectedResource.resourceItem) == null ? void 0 : _d.originRenderLists) || [];
-        const currentResourceIndex = originRenderLists == null ? void 0 : originRenderLists.findIndex((item) => {
-          var _a3;
-          return item.id === ((_a3 = selectedResource == null ? void 0 : selectedResource.renderItem) == null ? void 0 : _a3.form_id);
-        });
+        const currentResourceIndex = originRenderLists == null ? void 0 : originRenderLists.findIndex(
+          (item) => {
+            var _a3;
+            return item.id === ((_a3 = selectedResource == null ? void 0 : selectedResource.renderItem) == null ? void 0 : _a3.form_id);
+          }
+        );
         const nextResource = originRenderLists == null ? void 0 : originRenderLists[currentResourceIndex + 1];
         const resourceKey = `select-resource_@${nextResource == null ? void 0 : nextResource.form_id}-${nextResource == null ? void 0 : nextResource.code}`;
         if (nextResource) {
           const beforeKey = (_e = stepList2[stepList2.length - 2]) == null ? void 0 : _e.key;
-          appointmentBooking.addStep({ key: resourceKey, description: "" }, beforeKey);
+          appointmentBooking.addStep(
+            { key: resourceKey, description: "" },
+            beforeKey
+          );
         } else {
           appointmentBooking.removeStep(resourceKey);
         }
@@ -255,8 +282,14 @@ var useAppointmentBookingStep = () => {
         } else {
           cartLists = carts || [];
         }
-        const appoimentCarts = cartLists.filter((n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id)));
-        const { hasError } = (0, import_utils2.checkAndGoNext)(isFormSubject, checkAccount, appoimentCarts);
+        const appoimentCarts = cartLists.filter(
+          (n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id))
+        );
+        const { hasError } = (0, import_utils2.checkAndGoNext)(
+          isFormSubject,
+          checkAccount,
+          appoimentCarts
+        );
         setIsErrorHolder(hasError);
         if (hasError) {
           return;
@@ -370,12 +403,9 @@ var useAppointmentBookingCart = () => {
   };
   (0, import_react.useEffect)(() => {
     getCartAndSummary();
-    pisellOS.effects.on(
-      "appointmentBooking_cart:changed",
-      async () => {
-        getCartAndSummary();
-      }
-    );
+    pisellOS.effects.on("appointmentBooking_cart:changed", async () => {
+      getCartAndSummary();
+    });
   }, []);
 };
 var useAppointmentBookingLogin = () => {
@@ -441,7 +471,10 @@ var useAppointmentBookingAccount = () => {
   };
   const addAccount = async (val, type) => {
     const customer = (0, import_utils2.getCustomer)(utils);
-    const result = await appointmentBooking.addAccount(val, { type, customerId: customer == null ? void 0 : customer.id });
+    const result = await appointmentBooking.addAccount(val, {
+      type,
+      customerId: customer == null ? void 0 : customer.id
+    });
     return result;
   };
   const checkAccount = (type) => {
@@ -484,7 +517,11 @@ var useIsSkipResourceStep = () => {
     try {
       const { resources } = getResourceList();
       const accountLists = await appointmentBooking.getAccounts();
-      const { isSystem, isSkip, form_code } = (0, import_utils2.currentAppointmentBoard)(currentStepParams.key, resources, appointmentBooking);
+      const { isSystem, isSkip, form_code } = (0, import_utils2.currentAppointmentBoard)(
+        currentStepParams.key,
+        resources,
+        appointmentBooking
+      );
       if (isSystem) {
         nextStep();
         return true;
@@ -512,7 +549,7 @@ var useIsSkipResourceStep = () => {
   return { checkSkipResourceStep };
 };
 var useAppointmentBookingSetting = () => {
-  var _a, _b;
+  var _a, _b, _c;
   const utils = contextUtils();
   const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
   const { bookingProcess, bookingSubject, customPageId, channel } = ((_a = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a.productModuleParams) || {};
@@ -537,7 +574,8 @@ var useAppointmentBookingSetting = () => {
     bookingSubject,
     setOtherData,
     getOtherData,
-    formName
+    formName,
+    bookingSetting: ((_c = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _c.bookingSetting) || {}
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -117,6 +117,7 @@ declare const _default: {
         'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.contact-info.title': string;
     };
     'zh-CN': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -236,6 +237,7 @@ declare const _default: {
         'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.contact-info.title': string;
     };
     'zh-HK': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -355,6 +357,7 @@ declare const _default: {
         'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.contact-info.title': string;
     };
 };
 export default _default;

package/lib/components/appointmentBooking/locales.js

@@ -140,7 +140,8 @@ var locales_default = {
     "pisell2.text.goodpass.code-invalid": "Current code is invalid",
     "pisell2.text.goodpass.code-invalid-cart": "No eligible items in the cart",
     "pisell2.text.goodpass.login": "Login",
-    "pisell2.text.goodpass.login-tip": " for member benefit Or use account credit"
+    "pisell2.text.goodpass.login-tip": " for member benefit Or use account credit",
+    "pisell2.text.contact-info.title": "Contact info"
   },
   "zh-CN": {
     "pisell2.event.calendar.limit.unavailable": "不可预约",
@@ -259,7 +260,8 @@ var locales_default = {
     "pisell2.text.goodpass.code-invalid": "当前券码不可用",
     "pisell2.text.goodpass.code-invalid-cart": "当前购物车中无可用商品",
     "pisell2.text.goodpass.login": "登录",
-    "pisell2.text.goodpass.login-tip": "以获取会员福利或使用账户积分"
+    "pisell2.text.goodpass.login-tip": "以获取会员福利或使用账户积分",
+    "pisell2.text.contact-info.title": "联系信息"
   },
   "zh-HK": {
     "pisell2.event.calendar.limit.unavailable": "不可預約",
@@ -378,6 +380,7 @@ var locales_default = {
     "pisell2.text.goodpass.code-invalid": "當前券碼不可用",
     "pisell2.text.goodpass.code-invalid-cart": "當前購物車中無可用商品",
     "pisell2.text.goodpass.login": "登錄",
-    "pisell2.text.goodpass.login-tip": "以獲取會員福利或使用賬戶積分"
+    "pisell2.text.goodpass.login-tip": "以獲取會員福利或使用賬戶積分",
+    "pisell2.text.contact-info.title": "聯繫信息"
   }
 };

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

@@ -72,6 +72,7 @@ var ActionButtons = ({
   const { ScheduleModule } = pisellosAllModule;
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
+    var _a2, _b2;
     dispatch({
       type: "setClient",
       payload: {
@@ -79,6 +80,14 @@ var ActionButtons = ({
         edit: true
       }
     });
+    if ((_b2 = (_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) {
+      dispatch({
+        type: "setService",
+        payload: {
+          value: state.service.value.map((item) => ({ ...item, _extend: { ...item._extend, holder_id: [] } }))
+        }
+      });
+    }
   });
   const { selectCustomer } = (0, import_useCustomer.useCustomer)({
     changeCustomerToGlobalState
@@ -242,7 +251,8 @@ var ActionButtons = ({
     );
   };
   const handleClearAllAndReset = () => {
-    var _a2;
+    var _a2, _b2;
+    (_b2 = (_a2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a2.bookingTicket) == null ? void 0 : _b2.clearAllCart();
     clearAllScanListenersTaskQueue();
     dispatch({
       type: "setService",
@@ -286,7 +296,6 @@ var ActionButtons = ({
         value: {}
       }
     });
-    (_a2 = shopDiscount == null ? void 0 : shopDiscount.clear) == null ? void 0 : _a2.call(shopDiscount);
     setShowClearModal(false);
     Toast == null ? void 0 : Toast.success(
       createToastContent(

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

@@ -274,7 +274,7 @@ var CustomSelect = (props, ref) => {
           ref: searchRef,
           prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
           style: { marginTop: 16, height: 44 },
-          placeholder: import_utils2.locales.getText("pisell2.text.search"),
+          placeholder: import_utils2.locales.getText("pisell2.booking.text.search-placeholder"),
           value: search,
           allowClear: true,
           onChange: (e) => {

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

@@ -38,6 +38,7 @@ var import_utils = require("../../utils");
 var import_utils2 = require("@pisell/utils");
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils3 = require("../../info/service2/utils");
+var import_utils4 = require("../../info2/service/addService/utils");
 var getRelationDetailsTotal = (relation_details) => {
   let total = new import_decimal.default(0);
   for (let item of relation_details) {
@@ -52,16 +53,22 @@ var getProductExpectAmount = (state, isEdit) => {
   let price = new import_decimal.default(0);
   let duration = new import_decimal.default(0);
   const isDay = (0, import_utils3.isDayBooking)(state);
+  let dayDuration = new import_decimal.default(0);
+  let minuteDuration = new import_decimal.default(0);
   if (isEdit) {
     if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
       if (Array.isArray((_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value)) {
         for (let item of state.service.value) {
-          if (isDay || (0, import_utils3.isNormalProductByDurationSchedule)(item)) {
+          if (isDay || (0, import_utils3.isNormalProductByDurationSchedule)(item) || (0, import_utils4.isMultiDayProduct)(item)) {
             const quantity = new import_decimal.default(item._extend.quantity || 1);
             const itemTotal = new import_decimal.default(item._extend.total || 0);
             price = price.add(itemTotal.mul(quantity));
-            const _duration = (0, import_utils3.isDayBookingProduct)(item, state) ? new import_decimal.default(item._extend.duration || 0) : new import_decimal.default(0);
-            duration = duration.add(_duration);
+            const _duration = !(0, import_utils3.isNormalProductByDurationSchedule)(item) ? new import_decimal.default(item._extend.duration || 0) : new import_decimal.default(0);
+            if (isDay || (0, import_utils4.isMultiDayProduct)(item)) {
+              dayDuration = dayDuration.add(_duration);
+            } else {
+              minuteDuration = minuteDuration.add(_duration);
+            }
           } else {
             const quantity = new import_decimal.default(item._extend.quantity || 1);
             const itemTotal = new import_decimal.default(item._extend.total || 0);
@@ -72,6 +79,11 @@ var getProductExpectAmount = (state, isEdit) => {
             price = price.add(relationTotal);
             const itemDuration = new import_decimal.default(import_utils.flexibleObj.getValue(item._extend.duration) || 0);
             duration = duration.add(itemDuration);
+            if ((0, import_utils4.isMultiDayProduct)(item)) {
+              dayDuration = dayDuration.add(itemDuration);
+            } else {
+              minuteDuration = minuteDuration.add(itemDuration);
+            }
           }
         }
       }
@@ -89,18 +101,23 @@ var getProductExpectAmount = (state, isEdit) => {
     duration = services.reduce((pre, cur) => {
       var _a2;
       let current = new import_decimal.default(0);
-      if (isDay) {
-        const _duration = (0, import_utils3.isDayBookingProduct)(cur, state) ? new import_decimal.default(cur._extend.duration || 0) : new import_decimal.default(0);
+      if (isDay || (0, import_utils4.isMultiDayProduct)(cur)) {
+        const _duration = !(0, import_utils3.isNormalProductByDurationSchedule)(cur) ? new import_decimal.default(cur._extend.duration || 0) : new import_decimal.default(0);
         current = _duration;
       } else {
         current = new import_decimal.default(import_utils.flexibleObj.getValue(((_a2 = cur._extend) == null ? void 0 : _a2.duration) || 0) || 0);
       }
+      if (isDay || (0, import_utils4.isMultiDayProduct)(cur)) {
+        dayDuration = dayDuration.add(current);
+      } else {
+        minuteDuration = minuteDuration.add(current);
+      }
       return pre.add(current);
     }, new import_decimal.default(0));
   }
   return {
     productExpectAmount: price.toNumber(),
-    duration: (0, import_utils.getDiscountTime)(duration.toNumber(), isDay)
+    duration: (0, import_utils.getDiscountTimeByDayMinutes)(dayDuration.toNumber(), minuteDuration.toNumber())
   };
 };
 var getProductItemTax = (item, state, options) => {