@pisell/private-materials 3.4.72 → 3.4.74

package/es/plus/saasAttendance/settings/types.d.ts

@@ -0,0 +1,128 @@
+/**
+ * 多语言名称
+ */
+export interface MultiLangName {
+    en?: string;
+    'zh-CN'?: string;
+    'zh-HK'?: string;
+    original?: string;
+}
+/**
+ * 未排班时的打卡规则
+ * - anytime: 随时打卡
+ * - business_hours: 正常上下班（按照店铺营业时间打卡）
+ * - select_shift: 自选班次（员工需先选班次后打卡）
+ */
+export declare type NoShiftPolicy = 'anytime' | 'business_hours' | 'select_shift';
+/**
+ * 考勤规则
+ */
+export interface AttendanceRule {
+    no_shift_policy: NoShiftPolicy;
+}
+/**
+ * 考勤地点
+ */
+export interface AttendanceLocation {
+    id: string;
+    name: MultiLangName;
+    radius?: number;
+    address: {
+        lat: number;
+        lng: number;
+    };
+}
+/**
+ * 考勤地点配置
+ */
+export interface AttendancePlace {
+    radius: number;
+    location: AttendanceLocation[];
+}
+/**
+ * 补卡类型
+ * - normal: 正常
+ * - late: 迟到
+ * - early_leave: 早退
+ * - missing: 缺卡
+ */
+export declare type CorrectionType = 'normal' | 'late' | 'early_leave' | 'missing';
+/**
+ * 补卡周期类型
+ * - natural_month: 自然月
+ * - custom: 自定义周期
+ */
+export declare type FrequencyType = 'natural_month' | 'custom';
+/**
+ * 补卡配置
+ */
+export interface AttendanceCorrection {
+    allow: boolean;
+    types: CorrectionType[];
+    approver_ids: number[];
+    days_limit: number;
+    monthly_times: number;
+    period_type: FrequencyType;
+    period_custom: number | null;
+}
+/**
+ * 考勤组设置值 - 完整的API数据结构
+ */
+export interface AttendanceGroupSettingsValue {
+    id?: number;
+    name: MultiLangName;
+    timezone: string;
+    rule: AttendanceRule;
+    place: AttendancePlace;
+    member_ids: number[];
+    correction: AttendanceCorrection;
+    creator_type?: string;
+    creator_id?: number;
+    editor_type?: string;
+    editor_id?: number;
+    created_at?: string;
+    updated_at?: string;
+}
+/**
+ * 基本信息Tab的值
+ */
+export interface BasicInfoTabValue {
+    name: MultiLangName;
+    timezone: string;
+    member_ids: number[];
+}
+/**
+ * 排班规则Tab的值
+ */
+export interface ShiftScheduleTabValue {
+    rule: AttendanceRule;
+}
+/**
+ * 打卡方式Tab的值
+ */
+export interface ClockInMethodTabValue {
+    place: AttendancePlace;
+}
+/**
+ * 补卡规则Tab的值
+ */
+export interface CorrectionPolicyTabValue {
+    correction: AttendanceCorrection;
+}
+export declare type AttendanceGroupSettingsSection = 'basic' | 'shift' | 'clock' | 'correction';
+export interface TenantAccount {
+    account?: {
+        id: number;
+        email: string;
+        avatar: string;
+    };
+    account_id: number;
+    created_at: string;
+    id: number;
+    member_id: string;
+    nickname: string;
+    status: 'active' | 'inactive';
+    tenant_id: number;
+    type: 'founder' | 'staff';
+    updated_at: string;
+}

package/es/plus/saasAttendance/settings/types.js

@@ -0,0 +1 @@
+export {};

package/es/plus/selectHolder/locales.d.ts

@@ -17,5 +17,11 @@ declare const _default: {
         'pisell-select-holder-selected': string;
         'pisell-select-holder-skip': string;
     };
+    'zh-HK': {
+        'pisell-select-holder-create': string;
+        'pisell-select-holder-please-select': string;
+        'pisell-select-holder-selected': string;
+        'pisell-select-holder-skip': string;
+    };
 };
 export default _default;

package/es/plus/selectHolder/locales.js

@@ -16,5 +16,11 @@ export default {
     'pisell-select-holder-please-select': '請選擇',
     'pisell-select-holder-selected': '已選擇：',
     'pisell-select-holder-skip': '跳過'
+  },
+  'zh-HK': {
+    'pisell-select-holder-create': '創建',
+    'pisell-select-holder-please-select': '請選擇',
+    'pisell-select-holder-selected': '已選擇：',
+    'pisell-select-holder-skip': '跳過'
   }
 };

package/es/plus/skuOptionsSelection/components/NormalCard/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { RenderItemProps } from '../../../../pro/Selector/types';
 declare const NormalCard: (props: RenderItemProps & {
     parentDataSource: any;

package/es/plus/skuOptionsSelection/components/OptionsCard/OptionItemCard.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const OptionItemCard: (props: any) => JSX.Element;
 export default OptionItemCard;

package/es/plus/skuOptionsSelection/components/OptionsModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface OptionsModalProps {
     parentDataSource: any;
     dataSource: any;

package/lib/components/Sales/Cart/index.d.ts

@@ -13,7 +13,7 @@ interface CartContextType {
     createCartItemFromEvent: (eventItem: any) => CartItem;
     createCartItemFromHolder: (holderItem: any) => CartItem;
     addToCart: () => void;
-    updateCartItem: (cartItem: CartItem) => CartItem;
+    updateCartItem: (cartItem: CartItem, updateType?: 'deposit') => CartItem;
     deleteCartItem: (cartItem: CartItem) => void;
     clickCartItem: (cartItem: CartItem) => void;
     updateCurrentCartItem: (cartItem: Partial<CartItem>) => void;

package/lib/components/Sales/Cart/index.js

@@ -241,10 +241,7 @@ var CartProvider = ({ children }) => {
       const endDateInfo = (_g = (_f = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _f.selectDate) == null ? void 0 : _g.endDateInfo;
       const endTime = (_j = (_i = (_h = endDateInfo == null ? void 0 : endDateInfo.times) == null ? void 0 : _h.slice(-1)) == null ? void 0 : _i[0]) == null ? void 0 : _j.end_at;
       const num = 1;
-      const { price, totalPrice, originTotal, is_charge_tax } = (0, import_utils3.handleProductInfo)(
-        eventDetail,
-        num
-      );
+      const { price, totalPrice, originTotal, is_charge_tax } = (0, import_utils3.handleProductInfo)(eventDetail, num);
       const transformProduct = (_temp) => {
         var _a2;
         if (!((_a2 = _temp == null ? void 0 : _temp.variant) == null ? void 0 : _a2.length)) {
@@ -305,6 +302,7 @@ var CartProvider = ({ children }) => {
           event_unique_identifier: _id
           // 传递给接口用于商品可用性检测的比对
         },
+        _eventDetail: eventDetail,
         _productDetail: eventDetail.productDetail,
         _productOrigin: transformProduct(
           ((_p = eventDetail == null ? void 0 : eventDetail.productDetail) == null ? void 0 : _p.origin) || bookingOptionData
@@ -337,9 +335,24 @@ var CartProvider = ({ children }) => {
       });
     }
   };
-  const updateCartItem = (cartItem) => {
-    const newCartItems = getCurrentData().cartData.cartItems.map(
-      (item) => item._id === cartItem._id ? cartItem : item
+  const updateCartItem = (cartItem, updateType) => {
+    var _a, _b, _c;
+    let newCartItems = (_c = (_b = (_a = getCurrentData()) == null ? void 0 : _a.cartData) == null ? void 0 : _b.cartItems) == null ? void 0 : _c.map(
+      (item) => {
+        if (item._id === cartItem._id) {
+          const _tempCartItem = { ...cartItem || {} };
+          if (updateType === "deposit") {
+            const eventDetail = _tempCartItem == null ? void 0 : _tempCartItem._eventDetail;
+            if (eventDetail) {
+              const num = (_tempCartItem == null ? void 0 : _tempCartItem.num) || 1;
+              const deposit = (0, import_utils3.handleProductDeposit)(_tempCartItem, eventDetail, num);
+              _tempCartItem.deposit = deposit;
+            }
+          }
+          return _tempCartItem;
+        }
+        return item;
+      }
     );
     setCartData({
       cartItems: newCartItems

package/lib/components/Sales/Checkout/utils.js

@@ -1,6 +1,8 @@
+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)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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/Sales/Checkout/utils.ts
@@ -25,6 +35,7 @@ __export(utils_exports, {
   getFormParams: () => getFormParams
 });
 module.exports = __toCommonJS(utils_exports);
+var import_decimal = __toESM(require("decimal.js"));
 var formatProductOption = (option) => {
   if (!option) {
     return [];
@@ -57,10 +68,62 @@ var formatProductBundle = (bundle) => {
 var formatBookings = (list) => {
   let bookings = [];
   bookings = list.map((item) => {
-    return item._originData;
+    var _a, _b, _c;
+    const newOriginData = { ...item._originData || {} };
+    const product = (newOriginData == null ? void 0 : newOriginData.product) || {};
+    const discount_list = product == null ? void 0 : product.discount_list;
+    const main_product_discount = discount_list == null ? void 0 : discount_list.filter(
+      (d) => {
+        var _a2;
+        return !((_a2 = d.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+      }
+    );
+    if (main_product_discount == null ? void 0 : main_product_discount.length) {
+      product.metadata = {
+        product_discount_difference: handleProductDiscountDifference([
+          main_product_discount
+        ])
+      };
+    }
+    console.log("main_product_discount", main_product_discount);
+    if ((_a = product == null ? void 0 : product.product_bundle) == null ? void 0 : _a.length) {
+      product.product_bundle = (_c = (_b = product == null ? void 0 : product.product_bundle) == null ? void 0 : _b.map) == null ? void 0 : _c.call(_b, (v) => {
+        var _a2, _b2, _c2, _d;
+        const bundle_item_discount = [];
+        (_b2 = (_a2 = item == null ? void 0 : item.selectedBundle) == null ? void 0 : _a2.forEach) == null ? void 0 : _b2.call(_a2, (s) => {
+          if ((s == null ? void 0 : s.id) === (v == null ? void 0 : v.bundle_id) && (s == null ? void 0 : s.group_id) === (v == null ? void 0 : v.bundle_group_id) && (s == null ? void 0 : s._bundle_product_id) === (v == null ? void 0 : v.bundle_product_id)) {
+            bundle_item_discount.push(...(s == null ? void 0 : s.discount_list) || []);
+          }
+        });
+        console.log("bundle_item_discount", bundle_item_discount);
+        const newBundleItem = { ...v || {} };
+        if (bundle_item_discount == null ? void 0 : bundle_item_discount.length) {
+          newBundleItem.metadata = {
+            custom_product_bundle_map_id: (_d = (_c2 = bundle_item_discount == null ? void 0 : bundle_item_discount[0]) == null ? void 0 : _c2.metadata) == null ? void 0 : _d.custom_product_bundle_map_id,
+            product_discount_difference: handleProductDiscountDifference(bundle_item_discount)
+          };
+        }
+        return newBundleItem;
+      });
+    }
+    newOriginData.product = product;
+    return newOriginData;
   });
+  console.log("bookings>>>>", bookings);
   return bookings;
 };
+var handleProductDiscountDifference = (discount_list) => {
+  const product_discount_difference = discount_list == null ? void 0 : discount_list.reduce(
+    (pre, cur) => {
+      var _a;
+      return pre.plus(
+        new import_decimal.default(((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0)
+      );
+    },
+    new import_decimal.default(0)
+  );
+  return product_discount_difference.toNumber();
+};
 var formatValues = (params) => {
   var _a, _b;
   const { state, otherValue, platform, excludeDisabled, extra } = params;

package/lib/components/Sales/Summary/index.d.ts

@@ -7,6 +7,8 @@ interface SummaryContextType {
     taxTitle?: string;
     totalTaxFee?: string;
     isPriceIncludeTax?: 0 | 1;
+    taxRate?: number;
+    surcharge?: any;
     deposit?: {
         total: string;
         protocols: any[];

package/lib/components/Sales/Summary/index.js

@@ -40,6 +40,7 @@ var import_Cart = require("../Cart");
 var import_utils = require("./utils");
 var import_Init = require("../Init");
 var import_serve = require("./serve");
+var import_useEngineContext = require("../../../hooks/useEngineContext");
 var defaultState = {};
 var SummaryContext = (0, import_react.createContext)(
   void 0
@@ -47,15 +48,18 @@ var SummaryContext = (0, import_react.createContext)(
 var SummaryProvider = ({
   children
 }) => {
+  const pisellos = (0, import_useEngineContext.usePisellOS)();
   const { cartData } = (0, import_Cart.useCart)();
   const { initData } = (0, import_Init.useInit)();
   const [isAgreeDepositPolicy, setIsAgreeDepositPolicy] = (0, import_react.useState)(false);
+  const summaryModule = pisellos.getModule("summary");
   const summaryData = (0, import_react.useMemo)(() => {
     return (0, import_utils.calculatePriceDetails)(
       (initData == null ? void 0 : initData.shop) || {},
-      cartData.cartItems
+      cartData.cartItems,
+      summaryModule
     );
-  }, [cartData.cartItems, initData == null ? void 0 : initData.shop]);
+  }, [cartData.cartItems, initData == null ? void 0 : initData.shop, summaryModule]);
   const contextValue = {
     // 商品总价
     subtotal: summaryData.subtotal,
@@ -64,6 +68,8 @@ var SummaryProvider = ({
     taxTitle: summaryData.taxTitle,
     totalTaxFee: summaryData.totalTaxFee,
     isPriceIncludeTax: summaryData.isPriceIncludeTax,
+    taxRate: summaryData.taxRate,
+    surcharge: summaryData.surcharge,
     deposit: summaryData.deposit,
     isAgreeDepositPolicy,
     setIsAgreeDepositPolicy,

package/lib/components/Sales/Summary/utils.d.ts

@@ -1,4 +1,3 @@
-import Decimal from 'decimal.js';
 interface CartItem {
     price: number | string;
     quantity?: number;
@@ -10,6 +9,8 @@ interface PriceDetail {
     taxTitle?: string;
     totalTaxFee?: string;
     isPriceIncludeTax?: 0 | 1;
+    taxRate?: number;
+    surcharge?: any;
     deposit?: {
         total: string;
         protocols: any[];
@@ -22,6 +23,12 @@ interface PriceDetail {
  * @returns 商品总价字符串，保留2位小数
  */
 export declare const calculateSubtotal: (items: CartItem[]) => string;
+/**
+ * @description: 将购物车数据格式化成summaryModule需要的格式
+ * @param {any} items 购物车数据
+ * @return {*}
+ */
+export declare const formatCartsToSummaryModule: (items: any[]) => any[];
 /**
  * @title: 单个商品的税费
  * @description:
@@ -30,14 +37,14 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[], summaryModule: any) => any;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组
  * @param options - 其他费用配置
  * @returns 价格明细对象
  */
-export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => PriceDetail;
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], summaryModule: any) => PriceDetail;
 /**
  * @title: 计算定金
  * @param items - 购物车商品数组

package/lib/components/Sales/Summary/utils.js

@@ -32,7 +32,8 @@ __export(utils_exports, {
   calculateDeposit: () => calculateDeposit,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
-  calculateTaxFee: () => calculateTaxFee
+  calculateTaxFee: () => calculateTaxFee,
+  formatCartsToSummaryModule: () => formatCartsToSummaryModule
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
@@ -45,25 +46,46 @@ var calculateSubtotal = (items) => {
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
 };
-var calculateTaxFee = (shopInfo, items) => {
+var formatCartsToSummaryModule = (items) => {
+  if (!Array.isArray(items) || !(items == null ? void 0 : items.length)) return [];
+  return items.map((item) => {
+    const { selectedBundle, selectedOptions, ...rest } = item;
+    return {
+      ...rest,
+      bundle: selectedBundle || [],
+      option: selectedOptions || []
+    };
+  });
+};
+var calculateTaxFee = (shopInfo, items, summaryModule) => {
   if (!(items == null ? void 0 : items.length)) {
     return "0.00";
   }
   const { is_price_include_tax, tax_rate } = shopInfo || {};
   console.log("shopInfo>>>", is_price_include_tax, tax_rate);
-  const totalTaxFee = items.reduce((sum, item) => {
-    const price = new import_decimal.default(item.total || 0);
-    const taxRate = new import_decimal.default(tax_rate || 0).div(100);
-    const productTaxRate = price.times(taxRate).times((item == null ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
-    return sum.plus(productTaxRate);
-  }, new import_decimal.default(0));
+  const subtotal = new import_decimal.default(calculateSubtotal(items));
+  const totalTax = summaryModule.getTaxforUtils(
+    items,
+    {
+      tax_rate: Number(tax_rate),
+      is_price_include_tax: Number(is_price_include_tax || 0)
+    },
+    subtotal
+  );
+  const totalTaxFee = totalTax == null ? void 0 : totalTax.tax;
   return totalTaxFee;
 };
-var calculatePriceDetails = (shopInfo, items) => {
+var calculatePriceDetails = (shopInfo, items, summaryModule) => {
   const subtotal = new import_decimal.default(calculateSubtotal(items));
-  const totalTaxFee = new import_decimal.default(calculateTaxFee(shopInfo, items));
-  console.log("totalTaxFee", totalTaxFee.toFixed(2));
-  const total = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subtotal : subtotal.plus(totalTaxFee);
+  const _carts = formatCartsToSummaryModule(items);
+  const surcharge = summaryModule.getSurchargeforUtils(_carts);
+  const surchargeFee = new import_decimal.default((surcharge == null ? void 0 : surcharge.surchargeAmount) || 0);
+  const totalTaxFee = new import_decimal.default(
+    calculateTaxFee(shopInfo, _carts, summaryModule)
+  );
+  const taxRate = new import_decimal.default((shopInfo == null ? void 0 : shopInfo.tax_rate) || 0).div(100);
+  let total = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subtotal : subtotal.plus(totalTaxFee);
+  total = total.plus(surchargeFee);
   const deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
@@ -71,6 +93,8 @@ var calculatePriceDetails = (shopInfo, items) => {
     taxTitle: shopInfo == null ? void 0 : shopInfo.tax_title,
     totalTaxFee: totalTaxFee.toFixed(2),
     isPriceIncludeTax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax,
+    taxRate: taxRate.toNumber(),
+    surcharge,
     deposit
   };
 };
@@ -104,5 +128,6 @@ var calculateDeposit = (items) => {
   calculateDeposit,
   calculatePriceDetails,
   calculateSubtotal,
-  calculateTaxFee
+  calculateTaxFee,
+  formatCartsToSummaryModule
 });

package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const CartItem: ({ onNext, renderContactInfo }: any) => JSX.Element;
 export default CartItem;

package/lib/components/appointmentBooking/components/Cart/Item/index.js

@@ -36,12 +36,12 @@ var import_react = __toESM(require("react"));
 var import_utils = require("@pisell/utils");
 var import_shoppingCart = __toESM(require("../../../../shoppingCart"));
 var import_ContinueButton = __toESM(require("../ContinueButton"));
+var import__ = require("../../../../../index");
 var import_hooks = require("../../../hooks");
 var import_context = require("../../../context");
 var import_hooks2 = require("../../../hooks");
 var import_utils2 = require("../../../utils");
 var import_Voucher = __toESM(require("../../Voucher"));
-var import_Total = __toESM(require("./Total"));
 var import_Deposit = __toESM(require("../../Deposit"));
 var import_utils3 = require("../utils");
 var import_index = require("./index.less");
@@ -64,8 +64,8 @@ var CartItem = ({ onNext, renderContactInfo }) => {
   const { isFormSubject, bookingSubject, isRetailTemplate } = (0, import_hooks2.useAppointmentBookingSetting)();
   const { isLogin } = (0, import_hooks2.useAppointmentBookingLogin)();
   const utils = (0, import_hooks2.contextUtils)();
-  const { businessUtils } = utils;
-  const { deposit } = summary;
+  const { businessUtils, translation } = utils;
+  const { taxTitle, totalTaxFee, isPriceIncludeTax, total, deposit } = summary;
   const currentUser = (0, import_react.useMemo)(() => {
     return (0, import_utils2.formatCurrentUser)(utils) || {};
   }, []);
@@ -178,6 +178,47 @@ var CartItem = ({ onNext, renderContactInfo }) => {
       return carts;
     }
   }, [carts, currentSelectedResources, currentStepParams == null ? void 0 : currentStepParams.key, isErrorHolder]);
+  const subTotalList = (0, import_react.useMemo)(() => {
+    const hideDeposit = (carts == null ? void 0 : carts.length) === 0 || !(deposit == null ? void 0 : deposit.hasDeposit);
+    const surcharge = ((summary == null ? void 0 : summary.surcharge) || []).map(
+      (d, index) => {
+        return {
+          key: `custom_surcharge_${index}`,
+          label: translation(d == null ? void 0 : d.name),
+          value: d.amount
+        };
+      }
+    );
+    return [
+      {
+        key: "deposit",
+        value: deposit == null ? void 0 : deposit.total,
+        label: import_utils.locales.getText("pisell2.appointment.deposit"),
+        hidden: hideDeposit
+      },
+      {
+        key: "sub_total",
+        value: summary == null ? void 0 : summary.subtotal
+      },
+      ...surcharge,
+      {
+        key: "tax",
+        value: totalTaxFee,
+        hidden: Number(totalTaxFee) <= 0,
+        tax: {
+          rate: Number((summary == null ? void 0 : summary.taxRate) / 100),
+          is_price_include_tax: isPriceIncludeTax,
+          title: taxTitle
+        }
+      },
+      {
+        key: "custom_total",
+        value: total,
+        label: import_utils.locales.getText("pisell2.event.total"),
+        bold: !!hideDeposit
+      }
+    ];
+  }, [total, summary, carts == null ? void 0 : carts.length]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -209,7 +250,14 @@ var CartItem = ({ onNext, renderContactInfo }) => {
         onChange: (e, type, key) => handleClickCard(e, type, key)
       }
     )),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-footer" }, hasGoodPassApp || hasDiscountCardApp ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, { currentUser, products: carts }) : null, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), (carts == null ? void 0 : carts.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, { onNext }))
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-footer" }, hasGoodPassApp || hasDiscountCardApp ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, { currentUser, products: carts }) : null, /* @__PURE__ */ import_react.default.createElement(
+      import__.SubTotal,
+      {
+        list: subTotalList,
+        style: { padding: 0 },
+        children: !!((carts == null ? void 0 : carts.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit)) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, { showTitle: false }) : null
+      }
+    ), /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, { onNext }))
   ));
 };
 var Item_default = CartItem;

package/lib/components/appointmentBooking/components/Deposit/index.d.ts

@@ -1,10 +1,14 @@
 /// <reference types="react" />
 import './index.less';
+interface DepositProps {
+    showTitle?: boolean;
+}
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;
     setIsAgreeDepositPolicy: (value: boolean) => void;
     deposit: any;
     depositProtocolRequest?: any;
+    showTitle?: boolean | undefined;
 }) => JSX.Element;
-declare const Deposit: () => JSX.Element;
+declare const Deposit: (props: DepositProps) => JSX.Element;
 export default Deposit;

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

@@ -44,16 +44,17 @@ var DepositContent = (props) => {
     isAgreeDepositPolicy,
     setIsAgreeDepositPolicy,
     deposit,
-    depositProtocolRequest
+    depositProtocolRequest,
+    showTitle = true
   } = 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(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-deposit-wrap" }, showTitle ? /* @__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,
     {
       value: deposit == null ? void 0 : deposit.total,
       showCurrencySymbol: true,
       className: "amount"
     }
-  )), /* @__PURE__ */ import_react.default.createElement(
+  )) : null, /* @__PURE__ */ import_react.default.createElement(
     import_deposit.default,
     {
       total: deposit == null ? void 0 : deposit.total,
@@ -64,7 +65,8 @@ var DepositContent = (props) => {
     }
   ));
 };
-var Deposit = () => {
+var Deposit = (props) => {
+  const { showTitle = true } = props;
   const {
     setIsAgreeDepositPolicy,
     isAgreeDepositPolicy,
@@ -79,6 +81,7 @@ var Deposit = () => {
   return /* @__PURE__ */ import_react.default.createElement(
     DepositContent,
     {
+      showTitle,
       isAgreeDepositPolicy: !!isAgreeDepositPolicy,
       setIsAgreeDepositPolicy,
       deposit,

package/lib/components/booking/info/date/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;