@pisell/private-materials 6.1.1 → 6.2.2

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

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/appointmentBooking/components/Deposit/index.tsx
 var Deposit_exports = {};
 __export(Deposit_exports, {
+  DepositContent: () => DepositContent,
   default: () => Deposit_default
 });
 module.exports = __toCommonJS(Deposit_exports);
@@ -38,9 +39,13 @@ var import_deposit = __toESM(require("../../deposit"));
 var import_context = require("../../context");
 var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
-var Deposit = () => {
-  const { setIsAgreeDepositPolicy, isAgreeDepositPolicy, summary } = (0, import_context.useAppointmentBookingContext)();
-  const { deposit } = summary;
+var DepositContent = (props) => {
+  const {
+    isAgreeDepositPolicy,
+    setIsAgreeDepositPolicy,
+    deposit,
+    depositProtocolRequest
+  } = props;
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-deposit-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-deposit-top" }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.appointment.deposit")), /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellText.Amount,
     {
@@ -54,8 +59,35 @@ var Deposit = () => {
       total: deposit == null ? void 0 : deposit.total,
       protocols: deposit == null ? void 0 : deposit.protocols,
       isAgreePolicy: isAgreeDepositPolicy,
-      onChange: (value) => setIsAgreeDepositPolicy(value)
+      onChange: (value) => setIsAgreeDepositPolicy(value),
+      depositProtocolRequest
     }
   ));
 };
+var Deposit = () => {
+  const {
+    setIsAgreeDepositPolicy,
+    isAgreeDepositPolicy,
+    summary,
+    appointmentBooking
+  } = (0, import_context.useAppointmentBookingContext)();
+  const { deposit } = summary;
+  const depositProtocolRequest = (id) => {
+    var _a;
+    return (_a = appointmentBooking == null ? void 0 : appointmentBooking.getProtocol) == null ? void 0 : _a.call(appointmentBooking, id);
+  };
+  return /* @__PURE__ */ import_react.default.createElement(
+    DepositContent,
+    {
+      isAgreeDepositPolicy: !!isAgreeDepositPolicy,
+      setIsAgreeDepositPolicy,
+      deposit,
+      depositProtocolRequest
+    }
+  );
+};
 var Deposit_default = Deposit;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DepositContent
+});

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

@@ -87,7 +87,12 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
     setOtherData(key, { ...newData });
     appointmentBooking.updateCart({
       _id: appointmentBoard == null ? void 0 : appointmentBoard.cart_id,
-      relationForms: (0, import_utils2.updateRelationForms)(carts, appointmentBoard, values)
+      relationForms: (0, import_utils2.updateRelationForms)(
+        carts,
+        appointmentBoard,
+        values,
+        currentStepParams == null ? void 0 : currentStepParams.key
+      )
     });
   };
   const handleFormFinish = (status, values) => {

package/lib/components/appointmentBooking/components/Form/utils.d.ts

@@ -5,4 +5,4 @@
  * @Author: WangHan
  * @Date: 2025-05-26 16:58
  */
-export declare const updateRelationForms: (carts: any[], currentCart: any, values: any) => any;
+export declare const updateRelationForms: (carts: any[], currentCart: any, values: any, currentStepKey?: string) => any;

package/lib/components/appointmentBooking/components/Form/utils.js

@@ -22,24 +22,21 @@ __export(utils_exports, {
   updateRelationForms: () => updateRelationForms
 });
 module.exports = __toCommonJS(utils_exports);
-var updateRelationForms = (carts, currentCart, values) => {
-  var _a, _b;
+var updateRelationForms = (carts, currentCart, values, currentStepKey) => {
+  var _a;
   if (!(currentCart == null ? void 0 : currentCart.cart_id)) return [];
   const cartItem = carts == null ? void 0 : carts.find(
     (item) => (item == null ? void 0 : item._id) === (currentCart == null ? void 0 : currentCart.cart_id)
   );
   let oldLists = ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.relation_forms) || [];
-  const newData = { form_id: Number(values == null ? void 0 : values.form_id), form_record_id: values == null ? void 0 : values.form_record_id };
-  const exist = oldLists.find((item) => item.form_id === (newData == null ? void 0 : newData.form_id));
-  if (exist) {
-    if (!((_b = exist == null ? void 0 : exist.form_record_ids) == null ? void 0 : _b.includes(newData.form_record_id))) {
-      exist.form_record_ids.push(newData.form_record_id);
-    }
+  const newData = { form_id: Number(values == null ? void 0 : values.form_id), form_record_ids: [values == null ? void 0 : values.form_record_id], cartId: currentCart == null ? void 0 : currentCart.cart_id, currentStepKey };
+  const existIndex = oldLists.findIndex(
+    (item) => item.cartId === newData.cartId && item.form_id === newData.form_id && item.currentStepKey === newData.currentStepKey
+  );
+  if (existIndex > -1) {
+    oldLists[existIndex].form_record_ids = newData.form_record_ids;
   } else {
-    oldLists.push({
-      form_id: newData.form_id,
-      form_record_ids: [newData.form_record_id]
-    });
+    oldLists = oldLists.concat(newData);
   }
   return oldLists;
 };

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

@@ -99,6 +99,7 @@ var Header = () => {
     if (key.startsWith("fill-form")) {
       const form_key = "booking_form";
       let booking_form = getOtherData(form_key);
+      removeStep(key);
       setOtherData(form_key, { ...booking_form, [key]: {} });
     }
     appointmentBooking.back();

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

@@ -154,6 +154,7 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
       const index = carts.findIndex(
         (n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id))
       );
+      e.like_status = "like";
       return appointmentBooking.updateCart({
         _id: (_a = carts == null ? void 0 : carts[index]) == null ? void 0 : _a._id,
         resources: (0, import_utils.updateCartResources)(carts == null ? void 0 : carts[index], e)

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

@@ -36,7 +36,6 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
-var import_context = require("../../../context");
 var import_index = require("./index.less");
 var DepositModal = (props) => {
   const {
@@ -45,9 +44,10 @@ var DepositModal = (props) => {
     item,
     onChange,
     onConfirm,
-    isHideCheckout = true
+    isHideCheckout = true,
+    depositProtocolRequest
+    // 定金协议请求
   } = props;
-  const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
   const [policy, setPolicy] = (0, import_react.useState)(null);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [disabled, setDisabled] = (0, import_react.useState)(false);
@@ -55,9 +55,13 @@ var DepositModal = (props) => {
     setDisabled(!isHideCheckout);
   }, [isHideCheckout]);
   const getPolicy = async (id) => {
+    if (!depositProtocolRequest) {
+      console.error("depositProtocolRequest is not defined");
+      return;
+    }
     setLoading(true);
     try {
-      const { data } = await appointmentBooking.getProtocol(id);
+      const { data } = await (depositProtocolRequest == null ? void 0 : depositProtocolRequest(id));
       setPolicy(data);
       onChange && onChange(data);
     } catch (error) {

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

@@ -48,7 +48,8 @@ var Deposit = (props) => {
     title,
     isAgreePolicy = true,
     isShowTitle = true,
-    onChange
+    onChange,
+    depositProtocolRequest
   } = props;
   const context = (0, import_useEngineContext.default)();
   const [visible, setVisible] = (0, import_react.useState)(false);
@@ -102,7 +103,8 @@ var Deposit = (props) => {
     {
       open: visible,
       onCancel: () => setVisible(false),
-      item: policyItem
+      item: policyItem,
+      depositProtocolRequest
     }
   ));
 };

package/lib/components/booking/components/TabProduct/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

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

@@ -63,7 +63,7 @@ var Footer = (props) => {
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const appointmentProductRef = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
-  const { isTerminal, isWebPos, interaction, store, storage, businessUtils } = (_a = context.appHelper) == null ? void 0 : _a.utils;
+  const { isTerminal, interaction, store, storage, businessUtils } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   (0, import_react.useEffect)(() => {
     store == null ? void 0 : store.dispatch({
       type: "global/_getMetadataMap",
@@ -196,26 +196,9 @@ var Footer = (props) => {
   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, totalAmount) => {
+  const goCheckout = async (order_id) => {
     var _a2, _b2;
     if (!order_id) return;
-    if (isWebPos) {
-      state.action({
-        type: "pisell1.handleOpenPayment",
-        data: { order_id, total_amount: totalAmount },
-        callback: (res) => {
-          var _a3, _b3, _c2, _d2;
-          console.log("webpos_pay_result", res);
-          if ((res == null ? void 0 : res.status) === "success") {
-            (_b3 = (_a3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a3.booking) == null ? void 0 : _b3.refreshBookingDetail();
-          } else if ((res == null ? void 0 : res.status) === "cancel") {
-            (_d2 = (_c2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c2.booking) == null ? void 0 : _d2.voidBooking(order_id);
-          } else {
-          }
-        }
-      });
-      return;
-    }
     if (isTerminal == null ? void 0 : isTerminal()) {
       return (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
         module: "booking",
@@ -246,7 +229,7 @@ var Footer = (props) => {
         type: "checkout",
         messageShow: !(isTerminal == null ? void 0 : isTerminal())
       });
-      goCheckout((res == null ? void 0 : res.order_id) || state.bookingId, res.total_amount);
+      goCheckout((res == null ? void 0 : res.order_id) || state.bookingId);
       return;
     }
     return goCheckout(state.bookingId);
@@ -936,9 +919,7 @@ var Footer = (props) => {
   }, [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
-    );
+    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",

package/lib/components/booking/components/footer/utils.d.ts

@@ -27,6 +27,7 @@ export interface ResourceItem {
  * @Author: jinglin.tan
  */
 export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
+export declare const checkResourcesFormat: (resources: any[], service: any, isChild?: boolean) => any[];
 /**
  * @title: 格式化商品单价
  * @description:

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

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   checkHolderIsError: () => checkHolderIsError,
+  checkResourcesFormat: () => checkResourcesFormat,
   checkSubResourcesCapacity: () => checkSubResourcesCapacity,
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
@@ -194,11 +195,17 @@ var formatHolders = (state, item, values) => {
   return obj;
 };
 var formatProductPrice = (item) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const other = (_a = item._extend) == null ? void 0 : _a.other;
   let price = Number((_b = item._extend) == null ? void 0 : _b.price);
+  if ((other == null ? void 0 : other.product_variant_id) > 0 && ((_c = item == null ? void 0 : item.variant) == null ? void 0 : _c.length) > 0) {
+    const variant = item.variant.find((d) => d.id === (other == null ? void 0 : other.product_variant_id));
+    if (variant) {
+      price = Number(variant == null ? void 0 : variant.price) || 0;
+    }
+  }
   if (other == null ? void 0 : other.option) {
-    price = (_c = other == null ? void 0 : other.option) == null ? void 0 : _c.reduce((pre, cur) => {
+    price = (_d = other == null ? void 0 : other.option) == null ? void 0 : _d.reduce((pre, cur) => {
       return pre + Number(cur.price) * Number(cur.num);
     }, price);
   }
@@ -221,8 +228,20 @@ var formatMetaData = (item) => {
   }
   return metadata;
 };
+var getSourceProductPrice = (item) => {
+  var _a, _b, _c;
+  const other = (_a = item._extend) == null ? void 0 : _a.other;
+  let price = Number((_b = item._extend) == null ? void 0 : _b.price);
+  if ((other == null ? void 0 : other.product_variant_id) > 0 && ((_c = item == null ? void 0 : item.variant) == null ? void 0 : _c.length) > 0) {
+    const variant = item.variant.find((d) => d.id === (other == null ? void 0 : other.product_variant_id));
+    if (variant) {
+      price = Number(variant == null ? void 0 : variant.price) || 0;
+    }
+  }
+  return price;
+};
 var formatProducts = (item, quantity) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f;
   const total = Number(item._extend.total);
   const origin_total = Number(item._extend.origin_total);
   const discount_amount = origin_total - total;
@@ -232,7 +251,7 @@ var formatProducts = (item, quantity) => {
   return {
     "num": quantity || item._extend.quantity,
     "price": formatProductPrice(item),
-    "source_product_price": (_a = item._extend) == null ? void 0 : _a.price,
+    "source_product_price": getSourceProductPrice(item),
     "product_id": (item == null ? void 0 : item.product_id) || item.id,
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || "",
@@ -242,10 +261,10 @@ var formatProducts = (item, quantity) => {
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
+    "product_bundle": formatProductBundle((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
-    "product_variant_id": ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_d = (_c = item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.option),
+    "product_variant_id": ((_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item)
   };
@@ -473,6 +492,7 @@ var checkHolderIsError = (state) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkHolderIsError,
+  checkResourcesFormat,
   checkSubResourcesCapacity,
   formatProductBundle,
   formatProductOption,

package/lib/components/booking/components/formItemChildrenWrap/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

package/lib/components/booking/components/reloadResourceModal/index.d.ts

@@ -0,0 +1,8 @@
+import './index.less';
+interface IProps {
+    modal: any;
+    onReload: () => Promise<any>;
+    onCancel: () => void;
+}
+declare const ReloadResourceModal: ({ modal, onReload, onCancel }: IProps) => JSX.Element;
+export default ReloadResourceModal;

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

@@ -0,0 +1,74 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/components/reloadResourceModal/index.tsx
+var reloadResourceModal_exports = {};
+__export(reloadResourceModal_exports, {
+  default: () => reloadResourceModal_default
+});
+module.exports = __toCommonJS(reloadResourceModal_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_utils = require("@pisell/utils");
+var import_icons = require("@ant-design/icons");
+var import_index = require("./index.less");
+var ReloadResourceModal = ({ modal, onReload, onCancel }) => {
+  var _a;
+  const [loading, setLoading] = (0, import_react.useState)(false);
+  const handleReload = async () => {
+    setLoading(true);
+    try {
+      await (onReload == null ? void 0 : onReload());
+    } catch {
+    }
+    setLoading(false);
+  };
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Modal,
+    {
+      className: "pisell-resource-reload-modal",
+      title: /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(import_icons.WarningOutlined, { style: {
+        color: "#d89614",
+        marginRight: 8
+      } }), import_utils.locales.getText("pisell2.booking.info.resource.warning-title")),
+      cancelText: null,
+      okText: import_utils.locales.getText("pisell2.booking.info.resource.retry"),
+      confirmLoading: loading,
+      open: (_a = modal.state.service) == null ? void 0 : _a.reloadResourceModal,
+      onOk: handleReload,
+      cancelButtonProps: {
+        style: {
+          display: "none"
+        }
+      },
+      onCancel
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.booking.info.resource.warning-content"))
+  );
+};
+var reloadResourceModal_default = ReloadResourceModal;

package/lib/components/booking/components/reloadResourceModal/index.less

@@ -0,0 +1,6 @@
+.pisell-resource-reload-modal {
+
+  .pisell-lowcode-modal-header {
+    padding: 0;
+  }
+}

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

@@ -41,8 +41,8 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_materials = require("@pisell/materials");
 var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_index = require("./index.less");
-var import_utils2 = require("./utils");
 var import_ahooks = require("ahooks");
+var import_utils2 = require("./utils");
 var ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -274,8 +274,8 @@ var VoucherCard = (props) => {
       import_materials.PisellGoodPassCard,
       {
         style: { width: "100%" },
-        mixedSort,
         dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
+        mixedSort,
         onChange: (val) => {
           const shopDiscount2 = pisellos.getModule("shopDiscount");
           const detail = shopDiscount2.setDiscountSelected({

package/lib/components/booking/editBookingModal/index.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { EditBookingModalProps } from './type';
+import './index.less';
+declare const _default: React.ForwardRefExoticComponent<EditBookingModalProps & React.RefAttributes<unknown>>;
+export default _default;