@pisell/private-materials 6.3.116 → 6.3.117

package/lib/components/booking/editBookingModal/mock.js

@@ -447,6 +447,8 @@ var mockBooking = {
                   "en": "Guests",
                   "zh-CN": "人数",
                   "zh-HK": "人數",
+                  "ja": "ゲスト",
+                  "pt": "Convidados",
                   "original": "Guests"
                 },
                 "min": 1,
@@ -489,6 +491,8 @@ var mockBooking = {
               "auto": "",
               "zh-CN": null,
               "zh-HK": null,
+              "ja": null,
+              "pt": null,
               "kitchen": null,
               "original": ""
             },
@@ -2844,6 +2848,8 @@ var mockProps = {
             "auto": "预约商品-Wang",
             "zh-CN": null,
             "zh-HK": null,
+            "ja": null,
+            "pt": null,
             "kitchen": null,
             "original": "预约商品-Wang"
           },
@@ -2900,6 +2906,8 @@ var mockProps = {
                   "auto": "",
                   "zh-CN": null,
                   "zh-HK": null,
+                  "ja": null,
+                  "pt": null,
                   "kitchen": null,
                   "original": ""
                 },
@@ -2933,6 +2941,8 @@ var mockProps = {
             "auto": "预约商品-Wang",
             "zh-CN": null,
             "zh-HK": null,
+            "ja": null,
+            "pt": null,
             "kitchen": null,
             "original": "预约商品-Wang"
           },
@@ -2989,6 +2999,8 @@ var mockProps = {
                   "auto": "",
                   "zh-CN": null,
                   "zh-HK": null,
+                  "ja": null,
+                  "pt": null,
                   "kitchen": null,
                   "original": ""
                 },
@@ -3022,6 +3034,8 @@ var mockProps = {
             "auto": "预约商品-Wang",
             "zh-CN": null,
             "zh-HK": null,
+            "ja": null,
+            "pt": null,
             "kitchen": null,
             "original": "预约商品-Wang"
           },
@@ -3078,6 +3092,8 @@ var mockProps = {
                   "auto": "",
                   "zh-CN": null,
                   "zh-HK": null,
+                  "ja": null,
+                  "pt": null,
                   "kitchen": null,
                   "original": ""
                 },
@@ -3111,6 +3127,8 @@ var mockProps = {
             "auto": "预约商品-Wang",
             "zh-CN": null,
             "zh-HK": null,
+            "ja": null,
+            "pt": null,
             "kitchen": null,
             "original": "预约商品-Wang"
           },
@@ -3256,6 +3274,8 @@ var mockProps = {
                   "auto": "",
                   "zh-CN": null,
                   "zh-HK": null,
+                  "ja": null,
+                  "pt": null,
                   "kitchen": null,
                   "original": ""
                 },
@@ -3289,6 +3309,8 @@ var mockProps = {
             "auto": "预约商品-Wang",
             "zh-CN": null,
             "zh-HK": null,
+            "ja": null,
+            "pt": null,
             "kitchen": null,
             "original": "预约商品-Wang"
           },

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

@@ -0,0 +1,18 @@
+/**
+ * 获取表单数据
+ */
+export declare const getFormData: (params: {
+    form_id: number;
+    form_record_ids: number[];
+    num: number;
+    skip: number;
+}) => Promise<any>;
+/**
+ * 发送表单填写提醒
+ */
+export declare const sendFormReminder: (params: {
+    email?: string;
+    phone?: string;
+    order_id: number;
+    country_calling_code?: string;
+}) => Promise<any>;

package/lib/components/booking/hooks/useClearCart.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const useClearCart: (state: any, dispatch: any) => false | React.JSX.Element;
+declare const useClearCart: (state: any, dispatch: any) => React.JSX.Element;
 export default useClearCart;

package/lib/components/booking/hooks/useClearCart.js

@@ -38,28 +38,50 @@ var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var useClearCart = (state, dispatch) => {
   var _a, _b;
-  const handleClear = () => {
+  const [open, setOpen] = (0, import_react.useState)(false);
+  const handleOpenModal = (0, import_react.useCallback)(() => {
+    setOpen(true);
+  }, []);
+  const handleConfirm = (0, import_react.useCallback)(() => {
     dispatch({
       type: "setService",
       payload: {
         value: []
       }
     });
-  };
+    setOpen(false);
+  }, []);
+  const handleCancel = (0, import_react.useCallback)(() => {
+    setOpen(false);
+  }, []);
   return (0, import_react.useMemo)(() => {
     var _a2, _b2, _c, _d;
-    return !!((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) && !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
+    const showClearBtn = !!((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) && !state.channelDisabledEdit;
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showClearBtn && /* @__PURE__ */ import_react.default.createElement(
       "span",
       {
         className: (0, import_classnames.default)("pisell-lowcode__booking-service-clear-btn", {
           ["pisell-lowcode__booking-service-clear-btn-disabled"]: !((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length)
         }),
-        onClick: handleClear
+        onClick: handleOpenModal
       },
       /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }),
       " ",
       /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart"))
-    );
-  }, [(_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length, state.channelDisabledEdit]);
+    ), /* @__PURE__ */ import_react.default.createElement(
+      import_materials.PisellModal,
+      {
+        open,
+        platform: "pc",
+        title: import_utils.locales.getText("pisell2.booking.info.text.clear-cart-modal.title"),
+        onOk: handleConfirm,
+        onCancel: handleCancel,
+        okText: import_utils.locales.getText("pisell2.booking.info.text.clear-cart-modal.confirm"),
+        cancelText: import_utils.locales.getText("pisell2.booking.info.text.clear-cart-modal.cancel"),
+        destroyOnClose: true
+      },
+      /* @__PURE__ */ import_react.default.createElement("div", { style: { margin: "24px 0" } }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart-modal.content")))
+    ));
+  }, [(_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length, state.channelDisabledEdit, open]);
 };
 var useClearCart_default = useClearCart;

package/lib/components/booking/info/client/serve.d.ts

@@ -0,0 +1,2 @@
+export declare const getFranchiseeCustomerInfo: (params: any) => Promise<any>;
+export declare const getFranchiseeCustomerList: (params: any) => Promise<any>;

package/lib/components/booking/info/header/index.js

@@ -59,37 +59,37 @@ var header = ({ state, dispatch }) => {
     {
       label: import_utils.locales.getText("pisell2.text.status.new"),
       key: "new",
-      color: "#079455"
+      color: "#91caff"
     },
     {
       label: import_utils.locales.getText("pisell2.text.status.confirmed"),
       key: "confirmed",
-      color: "#7F56D9"
+      color: "#b7eb8f"
     },
     {
       label: import_utils.locales.getText("pisell2.text.status.arrived"),
       key: "arrived",
-      color: "#088AB2"
+      color: "#d3adf7"
     },
     {
       label: import_utils.locales.getText("pisell2.text.status.started"),
       key: "started",
-      color: "#155EEF"
+      color: "#fffb8f"
     },
     {
       label: /* @__PURE__ */ import_react.default.createElement("span", { style: { color: "#D92D20" } }, import_utils.locales.getText("pisell2.text.status.cancelled")),
       key: "cancelled",
-      color: "#DC6803"
+      color: "#bfbfbf"
     },
     {
       label: /* @__PURE__ */ import_react.default.createElement("span", { style: { color: "#D92D20" } }, import_utils.locales.getText("pisell2.text.status.no_show")),
       key: "no_show",
-      color: "#D92D20"
+      color: "#ffa39e"
     },
     {
       label: import_utils.locales.getText("pisell2.text.status.completed"),
       key: "completed",
-      color: "#4A5578"
+      color: "#ffd591"
     }
   ];
   const orderSalesChannel = {

package/lib/components/booking/info/header/index.less

@@ -21,7 +21,7 @@
 
   .booking-order-sales-channel {
     width: 100%;
-    color: var(--Base-White, #FFF);
+    color: var(--Gray-900, #101828);
     font-size: 14px;
     font-style: normal;
     font-weight: 400;
@@ -37,7 +37,7 @@
   }
 
   .booking-header-left {
-    color: var(--Base-White, #FFF);
+    color: var(--Gray-900, #101828);
     font-size: 18px;
     font-style: normal;
     font-weight: 400;
@@ -48,17 +48,17 @@
       display: flex;
       align-items: center;
       gap: 10px;
-      color: var(--Base-White, #FFF) !important;
+      color: var(--Gray-900, #101828) !important;
       font-size: 18px;
       font-style: normal;
       font-weight: 400;
       cursor: pointer;
-      border: 1px solid #fff;
+      border: 1px solid var(--Gray-900, #101828);
       padding: 4px 12px;
       border-radius: 24px;
 
       span {
-        color: var(--Base-White, #FFF) !important;
+        color: var(--Gray-900, #101828) !important;
       }
 
       .booking-header-right-status-icon {

package/lib/components/booking/info/hooks/useHolderConfig.d.ts

@@ -0,0 +1,9 @@
+declare const useHolderConfig: (state: any) => {
+    appointment_subject: any;
+    holder: any;
+    isFormSubject: boolean;
+    isCustomerSubject: boolean;
+    isWalkInBol: boolean;
+    isShowChangeHolder: boolean;
+};
+export default useHolderConfig;

package/lib/components/booking/info/pet/serve.d.ts

@@ -0,0 +1 @@
+export declare const getFormDetail: (id: number) => Promise<any>;

package/lib/components/booking/info/service/addTimeModal/serve.d.ts

@@ -0,0 +1,5 @@
+export declare const getAddTimeProducts: (params: any, config: any) => Promise<any>;
+export declare const saveAddTimeProduct: ({ orderId, params }: {
+    orderId: number | string;
+    params: any;
+}) => Promise<any>;

package/lib/components/booking/info/service/index.less

@@ -8,8 +8,10 @@
     line-height: 24px; /* 150% */
     display: flex;
     align-items: center;
-    margin-bottom: 4px;
-    padding: 12px 0;
+    margin-bottom: 16px !important;
+    // padding: 12px 0;
+    padding: 0 !important;
+    width: max-content;
     .anticon {
       font-size: 18px;
       margin-right: 6px;

package/lib/components/booking/info/service/serve.d.ts

@@ -0,0 +1,20 @@
+export declare const getProductDetail: (id: string, params: any) => Promise<any>;
+/**
+ * @title: 跨日预约获取预约商品报价单
+ * @description:
+ * @param {string} id
+ * @param {any} params
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-23 17:06
+ */
+export declare const postMultiDay: (id: string, params: any) => Promise<any>;
+/**
+ * 批量查询指定商品的最新价格
+ * @param params
+ */
+export declare const getProductPrice: (params: {
+    ids: number[];
+    customer_id: number;
+    schedule_date: string;
+}) => Promise<any>;

package/lib/components/booking/info2/serve.d.ts

@@ -0,0 +1,6 @@
+export declare const getResourceList: (params: any, bookingId?: number[]) => Promise<{
+    list: any[];
+    listMap: any;
+}>;
+export declare const createBookings: (params: any) => Promise<any>;
+export declare const editBookings: (params: any, id?: number) => Promise<any>;

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

@@ -0,0 +1,216 @@
+declare const _default: {
+    id: number;
+    shop_id: number;
+    source_shop_id: number;
+    extension_id: number;
+    extension_type: string;
+    title: string;
+    slug: string;
+    title_letter: string;
+    category_letter: string;
+    vendor_letter: string;
+    tag_letter: string;
+    subtitle: string;
+    description: string;
+    cover: string;
+    price: string;
+    original_price: string;
+    cost_price: string;
+    sort_price: string;
+    is_gst: number;
+    is_delivery: number;
+    weight_unit: string;
+    weight_value: string;
+    code: string;
+    barcode: string;
+    unit: string;
+    is_track: number;
+    stock_quantity: number;
+    sum_stock: number;
+    sales_quantity: number;
+    order_sales_quantity: number;
+    over_sold: number;
+    status: string;
+    sell_status: number;
+    published_time: string;
+    shop_update_time: string;
+    audit_time: null;
+    is_recommend: number;
+    audit_status: string;
+    shop_status: string;
+    weight: number;
+    sort: number;
+    type: string;
+    channel_application: string[];
+    channel_id: number;
+    rebate_type: string;
+    rebate_value: string;
+    create_account_id: number;
+    update_account_id: number;
+    source_product_id: number;
+    start_at: null;
+    created_at: string;
+    updated_at: string;
+    deleted_at: null;
+    seo: {
+        title: string;
+        is_set_title: number;
+        description: string;
+        is_set_desc: number;
+        keywords: string;
+        is_set_keywords: number;
+    };
+    service_times: number;
+    product_resource: {
+        resources: ({
+            id: number;
+            title: string;
+            status: number;
+            code: string;
+            created_at: string;
+            updated_at: string;
+            type: string;
+            optional_resource: number[];
+            default_resource: number[];
+            select_type: {
+                type: string;
+                min: number;
+                max: number;
+            };
+            resource_type_id: number;
+        } | {
+            id: number;
+            title: string;
+            status: number;
+            code: string;
+            created_at: string;
+            updated_at: null;
+            type: string;
+            optional_resource: never[];
+            default_resource: never[];
+            select_type: {
+                type: string;
+                min: number;
+                max: number;
+            };
+            resource_type_id: number;
+        })[];
+    };
+    capacity: {
+        type: string;
+        custom: {
+            name: {
+                en: string;
+                "zh-CN": string;
+                "zh-HK": string;
+                ja: string;
+                pt: string;
+                original: string;
+            };
+            id: number;
+            min: number;
+            max: number;
+        }[];
+        package: {
+            product_ids: never[];
+        };
+    };
+    is_grey: number;
+    is_eject: number;
+    share_url: string;
+    token_check_msg: string;
+    is_charge_tax: number;
+    media: never[];
+    tag: never[];
+    vendor: never[];
+    category: {
+        id: number;
+        shop_id: number;
+        parent_id: number;
+        name: string;
+        slug: string;
+        icon: string;
+        status: string;
+        last_applicable_time: number;
+        sort: number;
+        create_account_id: number;
+        update_account_id: number;
+        created_at: string;
+        updated_at: string;
+    }[];
+    collection: ({
+        id: number;
+        shop_id: number;
+        title: string;
+        title_letter: string;
+        description: null;
+        cover: string;
+        rule_type: string;
+        rule: {
+            class: string;
+            value: number;
+            operator: string;
+        }[];
+        product_quantity: number;
+        type: string;
+        order_type: string;
+        disabled: number;
+        create_account_id: number;
+        update_account_id: number;
+        created_at: string;
+        updated_at: string;
+    } | {
+        id: number;
+        shop_id: number;
+        title: string;
+        title_letter: string;
+        description: string;
+        cover: string;
+        rule_type: string;
+        rule: {
+            class: string;
+            value: string;
+            operator: string;
+        }[];
+        product_quantity: number;
+        type: string;
+        order_type: string;
+        disabled: number;
+        create_account_id: number;
+        update_account_id: number;
+        created_at: string;
+        updated_at: string;
+    } | {
+        id: number;
+        shop_id: number;
+        title: string;
+        title_letter: string;
+        description: null;
+        cover: string;
+        rule_type: string;
+        rule: {
+            class: string;
+            value: string;
+            operator: string;
+        }[];
+        product_quantity: number;
+        type: string;
+        order_type: string;
+        disabled: number;
+        create_account_id: number;
+        update_account_id: number;
+        created_at: string;
+        updated_at: string;
+    })[];
+    variant_group: never[];
+    option_group: never[];
+    variant: never[];
+    shop: {
+        id: number;
+        name: string;
+        default_domain: string;
+        default_url: string;
+    };
+    bundle_group: never[];
+};
+export default _default;

package/lib/components/booking/info2/service/addService/mock.js

@@ -230,6 +230,8 @@ var mock_default = {
           "en": "",
           "zh-CN": "",
           "zh-HK": "",
+          "ja": "",
+          "pt": "",
           "original": "成人"
         },
         id: 1,
@@ -241,6 +243,8 @@ var mock_default = {
           "en": "",
           "zh-CN": "",
           "zh-HK": "",
+          "ja": "",
+          "pt": "",
           "original": "儿童"
         },
         id: 2,

package/lib/components/booking/info2/service/editService/index.js

@@ -52,6 +52,8 @@ var import_materials = require("@pisell/materials");
 var import_utils5 = require("../../../info/utils");
 var import_utils6 = require("../../../info/service2/utils");
 var import_utils7 = require("../../../../ticketBooking/utils");
+var import_decimal = require("decimal.js");
+var import_utils8 = require("./utils");
 var submitLock = false;
 var Info = (_, ref) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I;
@@ -165,7 +167,7 @@ var Info = (_, ref) => {
     form.setFieldsValue({ discount });
   };
   const onFinish = (values) => {
-    var _a2, _b2;
+    var _a2, _b2, _c2, _d2, _e2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -193,6 +195,23 @@ var Info = (_, ref) => {
     const { startDate, endDate } = (0, import_utils3.getServiceTimes)({ _extend });
     _extend.startDate = startDate;
     _extend.endDate = endDate;
+    if (isChangeTotal.current) {
+      const discountRatio = new import_decimal.Decimal(values.total).div(_item._extend.origin_total);
+      const bundles2 = ((_c2 = _extend == null ? void 0 : _extend.other) == null ? void 0 : _c2.bundle) || [];
+      let childProductsTotal = new import_decimal.Decimal(0);
+      if (bundles2.length > 0) {
+        bundles2.forEach((bundle) => {
+          const discountedPrice = new import_decimal.Decimal(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, import_decimal.Decimal.ROUND_HALF_UP);
+          bundle.bundle_selling_price = discountedPrice.toNumber();
+          childProductsTotal = childProductsTotal.add(
+            discountedPrice.mul(bundle.quantity)
+          );
+        });
+      }
+      const mainProductTotal = new import_decimal.Decimal(values.total).sub(childProductsTotal);
+      const mainProductQuantity = ((_d2 = _extend.other) == null ? void 0 : _d2.quantity) || _extend.quantity || 1;
+      _extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
+    }
     if (_extend.bundle_edit !== void 0) {
       _extend.bundle_edit = 1;
     }
@@ -200,6 +219,10 @@ var Info = (_, ref) => {
     _item._time = (/* @__PURE__ */ new Date()).getTime();
     _item._serviceKey = (0, import_utils7.genServiceKey)(_item);
     let _id = _item == null ? void 0 : _item._id;
+    _item = (0, import_utils8.setProductPrice)(_item, {
+      newTotal: values.total,
+      origin_total: (_e2 = _item._extend) == null ? void 0 : _e2.origin_total
+    });
     if (!_list.some((d) => d._id === _id)) {
       const detail = (0, import_utils7.addService)(_list, _item, state);
       _list = detail.list;

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

@@ -11,3 +11,18 @@ export declare const getAutoAllocationStorage: (id: string | number) => any;
 export declare const setAutoAllocationStorage: (data: {
     [key: string]: boolean;
 }) => void;
+/**
+ * 手动折扣后给商品价格和子商品价格重新计算
+ *
+ * 计算逻辑：
+ * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
+ * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
+ *
+ * @param cacheItem - 缓存的商品项
+ * @param newTotal - 折扣后的新总价
+ * @param origin_total - 原始总价
+ */
+export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total }: {
+    newTotal: number;
+    origin_total: number;
+}) => any;