@pisell/private-materials 3.3.68 → 3.3.69

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

@@ -74,9 +74,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
     let type = "";
     if (!isRetailTemplate) {
       type = await checkProductType(item == null ? void 0 : item.id);
-      if (type === "session") {
-        appointmentBooking.openProductDetail(item.id);
-      }
+      appointmentBooking.openProductDetail(item.id);
     }
     utils == null ? void 0 : utils.action({
       type: "pisell1.productDetail",
@@ -86,6 +84,10 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
       },
       callback: async (data) => {
         var _a, _b;
+        if (data.isCancel) {
+          appointmentBooking.closeProductDetail();
+          return;
+        }
         const product = {
           ...data,
           options: (data == null ? void 0 : data.option) || []
@@ -96,13 +98,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
           appointmentBooking.storeProduct(product);
           return;
         }
-        if (data == null ? void 0 : data.isCancel) {
-          if (type === "session") {
-            appointmentBooking.closeProductDetail();
-            appointmentBooking.getAvailableDate();
-          }
-          return;
-        }
         const session = data == null ? void 0 : data.session;
         if (session) {
           const startDate = (0, import_dayjs.default)(session == null ? void 0 : session.start_at).format("YYYY-MM-DD");
@@ -114,7 +109,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
               endTime: `${endDate} ${session == null ? void 0 : session.end_time}`
             }
           });
-          appointmentBooking.closeProductDetail();
           await appointmentBooking.getAvailableDate({
             startDate,
             endDate
@@ -128,10 +122,8 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
             );
           }
           appointmentBooking.storeProduct(product);
-          if (type === "duration") {
-            await appointmentBooking.getAvailableDate();
-          }
         }
+        appointmentBooking.closeProductDetail();
         if (isDateSelectedFirst) {
           const index = (currentStep == null ? void 0 : currentStep.index) + 2;
           if (type === "duration") {

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

@@ -76,6 +76,7 @@ var VoucherCard = (props) => {
     return discountList.filter((item) => !!item.isAvailable).map((discount) => {
       return {
         ...discount,
+        isDisabled: discount.isDisabled || discount.isDisabledForProductUsed,
         savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
       };
     });
@@ -122,6 +123,7 @@ var VoucherCard = (props) => {
     );
     pisellos.effects.on("appointmentBooking_cart:onAddItem", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onUpdateQuotationPrice", onCartChange);
+    pisellos.effects.on("appointmentBooking_cart:onUpdateCartItemNums", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onRemoveItem", onCartChange);
     pisellos.effects.on(
       ShopDiscountHooks.onDiscountListChange,
@@ -169,6 +171,11 @@ var VoucherCard = (props) => {
       import_utils.locales.getText("pisell2.text.goodpass.login")
     ), /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.text.goodpass.login-tip"))));
   };
+  const mixedSort = (val) => {
+    return [...val].sort((a, b) => {
+      return Number(b == null ? void 0 : b.isSelected) - Number(a == null ? void 0 : a.isSelected);
+    });
+  };
   const renderVoucherInfo = () => {
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "voucher-title" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "voucher-title-left" }, import_utils.locales.getText("pisell2.text.goodpass")), /* @__PURE__ */ import_react.default.createElement(
       "span",
@@ -201,6 +208,7 @@ var VoucherCard = (props) => {
         {
           style: { width: "100%" },
           dataSource: availableData,
+          mixedSort,
           onChange: (val) => {
             const detail = shopDiscount.setDiscountSelected({
               discountId: val.id,
@@ -215,6 +223,7 @@ var VoucherCard = (props) => {
         import_materials.PisellInput,
         {
           value: code,
+          allowClear: true,
           onChange: (e) => {
             var _a2;
             setCode((_a2 = e.target) == null ? void 0 : _a2.value);

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.js

@@ -63,7 +63,6 @@ var DepositModal = (props) => {
     } catch (error) {
       console.log(error);
       onChange && onChange(error);
-      debugger;
     } finally {
       setLoading(false);
     }

package/lib/components/appointmentBooking/locales.js

@@ -132,7 +132,7 @@ var locales_default = {
     "pisell2.appointment.policy.confirm": "Confirm",
     "pisell2.appointment.resource.tip": (val) => `Tip: Change ${val || "resource"} using the dropdown in the cart.`,
     "pisell2.text.apply": "Apply",
-    "pisell2.text.goodpass": "GoodPass",
+    "pisell2.text.goodpass": "Promotion",
     "pisell2.text.goodpass.product-vouchers": "Product Vouchers",
     "pisell2.text.goodpass.view-more": "View More",
     "pisell2.text.goodpass.code": "Code",
@@ -250,7 +250,7 @@ var locales_default = {
     "pisell2.appointment.policy.confirm": "确定",
     "pisell2.appointment.resource.tip": (val) => `提示：在右侧购物车中，通过下拉框修改“${val || "资源"}”`,
     "pisell2.text.apply": "应用",
-    "pisell2.text.goodpass": "商品券",
+    "pisell2.text.goodpass": "促销",
     "pisell2.text.goodpass.product-vouchers": "商品兑换券",
     "pisell2.text.goodpass.view-more": "查看更多",
     "pisell2.text.goodpass.code": "券码",
@@ -368,7 +368,7 @@ var locales_default = {
     "pisell2.appointment.policy.confirm": "確定",
     "pisell2.appointment.resource.tip": (val) => `提示：在右側購物車中，透過下拉框修改“${val || "資源"}”`,
     "pisell2.text.apply": "應用",
-    "pisell2.text.goodpass": "商品券",
+    "pisell2.text.goodpass": "促銷",
     "pisell2.text.goodpass.product-vouchers": "商品兌換券",
     "pisell2.text.goodpass.view-more": "查看更多",
     "pisell2.text.goodpass.code": "券碼",

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

@@ -106,11 +106,13 @@ var formatProductValues = (data) => {
       ...d,
       id: d.product_id,
       title: d.product_title,
+      isAddons: true,
       quantity: d.product_quantity,
       cover: d.product_cover,
       price: Number(d.source_product_price),
       _extend: {
         total: Number(d.selling_price),
+        origin_total: Number(d.selling_price),
         payment_price: Number(d.payment_price),
         price: Number(d.source_product_price),
         quantity: d.product_quantity,
@@ -236,6 +238,7 @@ var Addons = (0, import_model.Provider)((props) => {
         let product = {
           ..._detail,
           _id: (0, import_utils3.getUniqueId)(),
+          isAddons: true,
           _key: e.key,
           _extend: {
             price: _detail.price,
@@ -246,7 +249,11 @@ var Addons = (0, import_model.Provider)((props) => {
         };
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
-        let _item = _list.find((d) => d._extend.other.rowKey === e.rowKey);
+        product._extend.origin_total = _total;
+        let _item = _list.find((d) => {
+          var _a2;
+          return d._extend.other.rowKey === e.rowKey && !d.booking_id && !((_a2 = d.discount_list) == null ? void 0 : _a2.length);
+        });
         if (_item) {
           _item._extend.quantity = _item._extend.quantity + product.quantity;
         } else {
@@ -392,6 +399,7 @@ var Addons = (0, import_model.Provider)((props) => {
         let product = {
           ...item,
           ..._detail,
+          isAddons: true,
           // 编辑商品时清除折扣信息
           discount_list: [],
           _extend: {
@@ -405,8 +413,8 @@ var Addons = (0, import_model.Provider)((props) => {
         }
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
+        product._extend.origin_total = _total;
         let _list = [...state.addons.value];
-        console.log("cacheItem", product);
         _list = _list.map((d) => d._id === product._id ? product : d);
         dispatch({
           type: "setAddons",

package/lib/components/booking/addons/model.js

@@ -34,6 +34,9 @@ var { Provider, Context } = (0, import_utils.miniRedux)({
     },
     setAddons(state, payload) {
       state.setGlobalState({ addons: { ...state.addons, ...payload } });
+    },
+    setService(state, payload) {
+      state.setGlobalState({ service: { ...state.service, ...payload } });
     }
   }
 });

package/lib/components/booking/components/TabProduct/selectProductItem/index.js

@@ -101,7 +101,11 @@ var SelectProductItem = ({
           disabled
         }
       ),
-      /* @__PURE__ */ import_react.default.createElement("div", { className: "server-select-product-total" }, (0, import_utils.formatAmount)(
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "server-select-product-total" }, item._extend.origin_total !== item._extend.total && /* @__PURE__ */ import_react.default.createElement("span", { className: "server-select-product-origin-total" }, (0, import_utils.formatAmount)(
+        item._extend.origin_total * item._extend.quantity,
+        2,
+        amountSymbol
+      )), (0, import_utils.formatAmount)(
         item._extend.total * item._extend.quantity,
         2,
         amountSymbol

package/lib/components/booking/components/TabProduct/selectProductItem/index.less

@@ -66,6 +66,7 @@
       font-style: normal;
       font-weight: 400;
 
+
       .server-select-product-total {
         color: var(--Base-Black, #000);
         font-size: 16px;
@@ -73,6 +74,11 @@
         font-weight: 500;
         line-height: 24px;
       }
+      .server-select-product-origin-total {
+        text-decoration: line-through;
+        color: #4e4e4e;
+        margin-right: 12px;
+      }
     }
 
 

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

@@ -54,7 +54,7 @@ var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_utils4 = require("@pisell/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var Footer = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const { state, buttons, dispatch, source } = props;
   const [showDetail, setShowDetail] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
@@ -194,6 +194,7 @@ var Footer = (props) => {
     return false;
   }, [state, params]);
   const hasGoodPassApp = !!((_h = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _h.call(businessUtils, "goodpass"));
+  const hasDiscountCardApp = !!((_i = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _i.call(businessUtils, "discountcard"));
   console.log("has goodpass app:", hasGoodPassApp);
   const goCheckout = async (order_id) => {
     var _a2, _b2;
@@ -798,7 +799,7 @@ var Footer = (props) => {
   }, [
     state.bookingId,
     state.bookingDetail,
-    (_i = state.addons) == null ? void 0 : _i.load,
+    (_j = state.addons) == null ? void 0 : _j.load,
     state.renderType
   ]);
   const menuChange = (e) => {
@@ -881,7 +882,7 @@ var Footer = (props) => {
         label: import_utils.locales.getText("pisell1.text.rounding")
       }
     ];
-  }, [total, (_j = state.bookingDetail) == null ? void 0 : _j.surcharge, state, state.bookingId]);
+  }, [total, (_k = state.bookingDetail) == null ? void 0 : _k.surcharge, state, state.bookingId]);
   const orderTotalList = (0, import_react.useMemo)(() => {
     return [
       // 订单已付金额
@@ -915,8 +916,12 @@ var Footer = (props) => {
         label: import_utils.locales.getText("pisell2.text.refunded-amount")
       }
     ];
-  }, [total, (_k = state.bookingDetail) == null ? void 0 : _k.surcharge, state, state.bookingId]);
-  return /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { title: false, round: true, loading: showFooter, active: true }, hasGoodPassApp && source === "info" ? /* @__PURE__ */ import_react.default.createElement(import_voucher.default, { state, dispatch }) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-total" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-total" }, totalText), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-arrears" }, arrearsText)), /* @__PURE__ */ import_react.default.createElement(
+  }, [total, (_l = state.bookingDetail) == null ? void 0 : _l.surcharge, state, state.bookingId]);
+  const paymentRefundedStatus = (0, import_react.useMemo)(() => {
+    var _a2;
+    return ["partially_refunded", "refunded"].includes((_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.payment_status);
+  }, [state == null ? void 0 : state.bookingDetail]);
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { title: false, round: true, loading: showFooter, active: true }, (hasGoodPassApp || hasDiscountCardApp) && ["addons", "info"].includes(source) && !paymentRefundedStatus ? /* @__PURE__ */ import_react.default.createElement(import_voucher.default, { state, dispatch, source }) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-total" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-total" }, totalText), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-arrears" }, arrearsText)), /* @__PURE__ */ import_react.default.createElement(
     "span",
     {
       className: "pisell-lowcode__booking-footer-right",

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

@@ -177,12 +177,16 @@ var formatResource = (service) => {
   }
 };
 var formatHolders = (state, item, values) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const form_id = ((_d = (_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.form_id) || 0;
+  let form_record = ((_e = item._extend) == null ? void 0 : _e.holder_id) ? [(_f = item._extend) == null ? void 0 : _f.holder_id] : [];
+  if (((_g = item._extend) == null ? void 0 : _g.holder_id) && (0, import_utils5.isArr)((_h = item._extend) == null ? void 0 : _h.holder_id)) {
+    form_record = (_i = item._extend) == null ? void 0 : _i.holder_id;
+  }
   let obj = {
     customer_id: values.customer_id,
     form_id,
-    form_record: ((_e = item._extend) == null ? void 0 : _e.holder_id) ? [(_f = item._extend) == null ? void 0 : _f.holder_id] : []
+    form_record
   };
   if (state.isFranchisee) {
     obj.is_source_shop = 1;
@@ -217,7 +221,7 @@ var formatMetaData = (item) => {
   }
   return metadata;
 };
-var formatProducts = (item) => {
+var formatProducts = (item, quantity) => {
   var _a, _b, _c, _d, _e, _f, _g;
   const total = Number(item._extend.total);
   const origin_total = Number(item._extend.origin_total);
@@ -226,7 +230,7 @@ var formatProducts = (item) => {
   const discount_type = discount_amount < 0 ? "change_price" : "discount";
   const notManualDiscount = discount_list.filter((item2) => item2.type !== "product");
   return {
-    "num": item._extend.quantity,
+    "num": quantity || item._extend.quantity,
     "price": formatProductPrice(item),
     "source_product_price": (_a = item._extend) == null ? void 0 : _a.price,
     "product_id": (item == null ? void 0 : item.product_id) || item.id,
@@ -268,6 +272,13 @@ var formatAppointmentProductLists = (data) => {
   } catch (error) {
   }
 };
+var getHolderByIndex = (holder, index) => {
+  var _a;
+  return {
+    ...holder,
+    form_record: [(_a = holder == null ? void 0 : holder.form_record) == null ? void 0 : _a[index]].filter(Boolean)
+  };
+};
 var formatBookings = (data, values) => {
   const isDay = (0, import_utils4.isDaysBooking)(data);
   const isEvent = (0, import_utils4.isEventBooking)(data);
@@ -287,7 +298,7 @@ var formatBookings = (data, values) => {
   let dayParams = {};
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
-  bookings = list.map((item) => {
+  list.forEach((item) => {
     var _a, _b, _c, _d;
     let start_date = item._extend.startDate.format("YYYY-MM-DD");
     let end_date = item._extend.endDate.format("YYYY-MM-DD");
@@ -309,7 +320,7 @@ var formatBookings = (data, values) => {
       dayParams.holder = formatHolders(data, item, values);
       dayParams.duration = (0, import_utils3.getDays)({ _extend: { start_date: startDateTime, end_date: endDateTime } }, "minutes");
     }
-    return {
+    const booking = {
       "product": formatProducts(item),
       "relation_products": formatRelationDetails(item._extend.relation_details),
       "id": item.booking_id || 0,
@@ -331,6 +342,18 @@ var formatBookings = (data, values) => {
       ...eventOtherParams || {},
       ...dayParams
     };
+    if (isDay) {
+      bookings.push(booking);
+      return;
+    }
+    for (let i = 0; i < (item._extend.quantity || 1); i++) {
+      bookings.push({
+        ...booking,
+        "product": formatProducts(item, 1),
+        "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }, false) : item._extend.number || 1,
+        "holder": getHolderByIndex(booking.holder, i)
+      });
+    }
   });
   return bookings;
 };
@@ -375,7 +398,7 @@ var formatHolder = (state, values) => {
   return obj;
 };
 var formatValues = (state) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   let values = {
     type: state.renderType === "eventBooking" ? "event_booking_v2" : "appointment_booking",
     platform: "shop",
@@ -409,17 +432,20 @@ var formatValues = (state) => {
     values.relation_products = formatRelationProducts(state);
   } else {
     values.relation_products = formatNormalProducts(state);
+    if (!((_b = values.relation_products) == null ? void 0 : _b.length)) {
+      values.relation_products = void 0;
+    }
   }
   values.bookings = formatBookings(state, values);
-  if (((_c = (_b = values == null ? void 0 : values.bookings) == null ? void 0 : _b[0]) == null ? void 0 : _c.select_date) && !(state == null ? void 0 : state.bookingId)) {
-    let startTime = `${(_e = (_d = values == null ? void 0 : values.bookings) == null ? void 0 : _d[0]) == null ? void 0 : _e.start_time}`;
+  if (((_d = (_c = values == null ? void 0 : values.bookings) == null ? void 0 : _c[0]) == null ? void 0 : _d.select_date) && !(state == null ? void 0 : state.bookingId)) {
+    let startTime = `${(_f = (_e = values == null ? void 0 : values.bookings) == null ? void 0 : _e[0]) == null ? void 0 : _f.start_time}`;
     startTime = `${startTime || "00:00"}:00`;
     values.schedule_date = `${values.bookings[0].select_date} ${startTime}`;
   }
   if (isDay) {
     values.metadata.is_multiday_appointment = 1;
   }
-  if (!((_f = values == null ? void 0 : values.bookings) == null ? void 0 : _f.length)) {
+  if (!((_g = values == null ? void 0 : values.bookings) == null ? void 0 : _g.length)) {
     values.type = "virtual";
   }
   return values;
@@ -427,7 +453,17 @@ var formatValues = (state) => {
 var checkHolderIsError = (state) => {
   var _a, _b;
   const holderError = state.service.value.some((item) => {
-    return !item._extend.holder_id && !(0, import_utils4.isNormalProductByDurationSchedule)(item);
+    var _a2, _b2;
+    if ((0, import_utils4.isNormalProductByDurationSchedule)(item)) {
+      return false;
+    }
+    if (item._extend.quantity === 1 && !item._extend.holder_id) {
+      return true;
+    }
+    if (item._extend.quantity > 1 && ((_b2 = (_a2 = item._extend) == null ? void 0 : _a2.holder_id) == null ? void 0 : _b2.length) !== item._extend.quantity) {
+      return true;
+    }
+    return false;
   });
   const clientId = (_b = (_a = state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id;
   if (holderError && (!clientId || clientId === 0 || clientId === 1)) {