@pisell/private-materials 3.3.81 → 3.3.83

package/lib/components/index.js

@@ -34,13 +34,11 @@ __export(components_exports, {
   BookingForms: () => import_forms.default,
   BookingInfo: () => import_info.default,
   BookingNotes: () => import_notes.default,
-  EditBookingModal: () => import_editBookingModal.default,
   Login: () => import_login.default,
   PisellSelectCustomerModal: () => import_pisellSelectCustomerModal.default,
   ProductExtension: () => import_productExtension.default,
   RuleSetting: () => import_ruleSetting.default,
   Schedules: () => import_schedules.default,
-  StepController: () => import_stepController.default,
   SubTotal: () => import_subTotal.default,
   TaxSelect: () => import_taxSelect.default,
   ToCPay: () => import_toC.default,
@@ -67,8 +65,6 @@ 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"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Booking,
@@ -76,13 +72,11 @@ var import_editBookingModal = __toESM(require("./booking/editBookingModal"));
   BookingForms,
   BookingInfo,
   BookingNotes,
-  EditBookingModal,
   Login,
   PisellSelectCustomerModal,
   ProductExtension,
   RuleSetting,
   Schedules,
-  StepController,
   SubTotal,
   TaxSelect,
   ToCPay,

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

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

package/lib/components/ticketBooking/components/ticketBooking/index.d.ts

@@ -1,4 +1,3 @@
 import './index.less';
-export declare const _formatBookingDetail: (data: any, modalState: any) => any;
 declare const TicketBooking: () => JSX.Element;
 export default TicketBooking;

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

@@ -29,7 +29,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/ticketBooking/components/ticketBooking/index.tsx
 var ticketBooking_exports = {};
 __export(ticketBooking_exports, {
-  _formatBookingDetail: () => _formatBookingDetail,
   default: () => ticketBooking_default
 });
 module.exports = __toCommonJS(ticketBooking_exports);
@@ -46,163 +45,12 @@ 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 {
-    customer_id,
-    holder,
-    customer_name,
-    email,
-    phone,
-    country_calling_code,
-    bookings,
-    customer,
-    note,
-    payment_status,
-    is_other_entrance_edited,
-    shop_discount
-  } = data;
-  const clientValue = {
-    name: ((customer == null ? void 0 : customer.display_name) || "").trim() || ((customer == null ? void 0 : customer.nickname) || "").trim() || "",
-    id: customer_id || (customer == null ? void 0 : customer.id) || (customer == null ? void 0 : customer.customer_id) || 1,
-    email: customer == null ? void 0 : customer.email,
-    phone: (customer == null ? void 0 : customer.phone) || "",
-    country_calling_code: (customer == null ? void 0 : customer.country_calling_code) || "",
-    cover: (customer == null ? void 0 : customer.cover) || ""
-  };
-  const start_date = (_b = (_a = bookings == null ? void 0 : bookings.list) == null ? void 0 : _a[0]) == null ? void 0 : _b.start_date;
-  const dateValue = (0, import_dayjs.default)(
-    start_date ? start_date + " " + ((_d = (_c = bookings == null ? void 0 : bookings.list) == null ? void 0 : _c[0]) == null ? void 0 : _d.start_time) : /* @__PURE__ */ new Date()
-  );
-  const petsValue = holder;
-  const getCapacity = (resetD) => {
-    var _a2;
-    return (_a2 = resetD.metadata) == null ? void 0 : _a2.capacity;
-  };
-  const getResource = (resetD) => {
-    var _a2;
-    if (!bookings.relation_type) {
-      try {
-        if ((resetD == null ? void 0 : resetD.event_resources) && ((_a2 = resetD == null ? void 0 : resetD.event_resources) == null ? void 0 : _a2.length)) {
-          return resetD.event_resources.reduce((pre, cur) => {
-            if (pre[cur.form_id]) {
-              pre[cur.form_id].push(cur);
-            } else {
-              pre[cur.form_id] = [cur];
-            }
-            return pre;
-          }, {});
-        }
-      } catch (err) {
-        console.error(err);
-      }
-    }
-    return resetD.relation_id;
-  };
-  const serviceValue = bookings.list.map((d) => {
-    let { detail, product, ...resetD } = d;
-    let _detail = detail || mockProduct;
-    let start_date2 = (0, import_dayjs.default)(resetD.start_date + " " + resetD.start_time);
-    let end_date = (0, import_dayjs.default)(resetD.end_date + " " + resetD.end_time);
-    return {
-      _id: (Math.random() + "").replace(/\D/g, "").substring(0, 11),
-      ..._detail,
-      booking_id: resetD.id,
-      id: _detail.product_id,
-      title: _detail.product_title,
-      quantity: Number(_detail.product_quantity),
-      cover: _detail.product_cover,
-      // 商品本身的价格
-      price: Number(_detail.source_product_price),
-      relation_form_name: resetD.relation_form_name,
-      product_resource: product == null ? void 0 : product.product_resource,
-      capacity: product == null ? void 0 : product.capacity,
-      _extend: {
-        ...resetD,
-        quantity: Number(_detail.product_quantity),
-        startDate: start_date2,
-        start_date: start_date2,
-        endDate: end_date,
-        end_date,
-        // 商品本身的价格
-        price: Number(_detail.source_product_price),
-        product_name: _detail.product_title,
-        discount_reason: _detail.product_discount_reason,
-        // resource: resetD.relation_id,
-        order_detail_id: _detail.order_detail_id,
-        // 总价: 商品本身价格 + 套餐价格 + 单规格价格   包含折扣
-        total: Number(_detail.selling_price),
-        // 原总价: 商品本身价格 + 套餐价格 + 单规格价格 不包含折扣
-        origin_total: Number(_detail.original_price),
-        payment_price: Number(_detail.payment_price),
-        other: (0, import_utils2.restoreProductOtherData)(d),
-        // 是否编辑了套餐 默认为0  如果编辑之后为1
-        bundle_edit: 0,
-        discount_per: _detail.discount_per,
-        discount_type: _detail.discount_type,
-        discountway: _detail.discountway,
-        capacity: getCapacity(resetD),
-        resource: getResource(resetD)
-      }
-    };
-  });
-  let disabledEdit = (0, import_utils2.getDisabledEdit)(data);
-  let channelDisabledEdit = !!is_other_entrance_edited;
-  return {
-    ...modalState,
-    client: {
-      ...modalState.client,
-      value: clientValue,
-      edit: false,
-      showModal: false
-    },
-    date: {
-      ...modalState.date,
-      value: dateValue,
-      edit: false,
-      showModal: false
-    },
-    pet: {
-      ...modalState.pet,
-      showModal: false,
-      edit: false
-    },
-    service: {
-      ...modalState.service,
-      value: serviceValue,
-      addModal: false,
-      editModal: false,
-      edit: false
-    },
-    notes: {
-      ...modalState.notes,
-      orderNote: note,
-      edit: false
-    },
-    disabledEdit,
-    channelDisabledEdit,
-    appointment_status: bookings == null ? void 0 : bookings.appointment_status
-  };
-};
 var TicketBooking = () => {
   var _a;
   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 +137,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);
@@ -564,6 +306,144 @@ var TicketBooking = () => {
       (_a2 = dom == null ? void 0 : dom.scrollIntoView) == null ? void 0 : _a2.call(dom, { block: "center", behavior: "smooth" });
     }
   };
+  const _formatBookingDetail = (data, modalState) => {
+    var _a2, _b, _c, _d;
+    let {
+      customer_id,
+      holder,
+      customer_name,
+      email,
+      phone,
+      country_calling_code,
+      bookings,
+      customer,
+      note,
+      payment_status,
+      is_other_entrance_edited,
+      shop_discount
+    } = data;
+    const clientValue = {
+      name: ((customer == null ? void 0 : customer.display_name) || "").trim() || ((customer == null ? void 0 : customer.nickname) || "").trim() || "",
+      id: customer_id || (customer == null ? void 0 : customer.id) || (customer == null ? void 0 : customer.customer_id) || 1,
+      email: customer == null ? void 0 : customer.email,
+      phone: (customer == null ? void 0 : customer.phone) || "",
+      country_calling_code: (customer == null ? void 0 : customer.country_calling_code) || "",
+      cover: (customer == null ? void 0 : customer.cover) || ""
+    };
+    const start_date = (_b = (_a2 = bookings == null ? void 0 : bookings.list) == null ? void 0 : _a2[0]) == null ? void 0 : _b.start_date;
+    const dateValue = (0, import_dayjs.default)(
+      start_date ? start_date + " " + ((_d = (_c = bookings == null ? void 0 : bookings.list) == null ? void 0 : _c[0]) == null ? void 0 : _d.start_time) : /* @__PURE__ */ new Date()
+    );
+    const petsValue = holder;
+    const getCapacity = (resetD) => {
+      var _a3;
+      return (_a3 = resetD.metadata) == null ? void 0 : _a3.capacity;
+    };
+    const getResource = (resetD) => {
+      var _a3;
+      if (!bookings.relation_type) {
+        try {
+          if ((resetD == null ? void 0 : resetD.event_resources) && ((_a3 = resetD == null ? void 0 : resetD.event_resources) == null ? void 0 : _a3.length)) {
+            return resetD.event_resources.reduce((pre, cur) => {
+              if (pre[cur.form_id]) {
+                pre[cur.form_id].push(cur);
+              } else {
+                pre[cur.form_id] = [cur];
+              }
+              return pre;
+            }, {});
+          }
+        } catch (err) {
+          console.error(err);
+        }
+      }
+      return resetD.relation_id;
+    };
+    const serviceValue = bookings.list.map((d) => {
+      let { detail, product, ...resetD } = d;
+      let _detail = detail || mockProduct;
+      let start_date2 = (0, import_dayjs.default)(resetD.start_date + " " + resetD.start_time);
+      let end_date = (0, import_dayjs.default)(resetD.end_date + " " + resetD.end_time);
+      return {
+        _id: (Math.random() + "").replace(/\D/g, "").substring(0, 11),
+        ..._detail,
+        booking_id: resetD.id,
+        id: _detail.product_id,
+        title: _detail.product_title,
+        quantity: Number(_detail.product_quantity),
+        cover: _detail.product_cover,
+        // 商品本身的价格
+        price: Number(_detail.source_product_price),
+        relation_form_name: resetD.relation_form_name,
+        product_resource: product == null ? void 0 : product.product_resource,
+        capacity: product == null ? void 0 : product.capacity,
+        _extend: {
+          ...resetD,
+          quantity: Number(_detail.product_quantity),
+          startDate: start_date2,
+          start_date: start_date2,
+          endDate: end_date,
+          end_date,
+          // 商品本身的价格
+          price: Number(_detail.source_product_price),
+          product_name: _detail.product_title,
+          discount_reason: _detail.product_discount_reason,
+          // resource: resetD.relation_id,
+          order_detail_id: _detail.order_detail_id,
+          // 总价: 商品本身价格 + 套餐价格 + 单规格价格   包含折扣
+          total: Number(_detail.selling_price),
+          // 原总价: 商品本身价格 + 套餐价格 + 单规格价格 不包含折扣
+          origin_total: Number(_detail.original_price),
+          payment_price: Number(_detail.payment_price),
+          other: (0, import_utils2.restoreProductOtherData)(d),
+          // 是否编辑了套餐 默认为0  如果编辑之后为1
+          bundle_edit: 0,
+          discount_per: _detail.discount_per,
+          discount_type: _detail.discount_type,
+          discountway: _detail.discountway,
+          capacity: getCapacity(resetD),
+          resource: getResource(resetD)
+        }
+      };
+    });
+    let disabledEdit = (0, import_utils2.getDisabledEdit)(data);
+    let channelDisabledEdit = !!is_other_entrance_edited;
+    return {
+      ...modalState,
+      client: {
+        ...modalState.client,
+        value: clientValue,
+        edit: false,
+        showModal: false
+      },
+      date: {
+        ...modalState.date,
+        value: dateValue,
+        edit: false,
+        showModal: false
+      },
+      pet: {
+        ...modalState.pet,
+        showModal: false,
+        edit: false
+      },
+      service: {
+        ...modalState.service,
+        value: serviceValue,
+        addModal: false,
+        editModal: false,
+        edit: false
+      },
+      notes: {
+        ...modalState.notes,
+        orderNote: note,
+        edit: false
+      },
+      disabledEdit,
+      channelDisabledEdit,
+      appointment_status: bookings == null ? void 0 : bookings.appointment_status
+    };
+  };
   const _initBookingData = (type, data) => {
     var _a2, _b, _c, _d, _e, _f, _g;
     let initState = _getInitState({
@@ -908,7 +788,3 @@ var TicketBooking = () => {
   ));
 };
 var ticketBooking_default = TicketBooking;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  _formatBookingDetail
-});