@pisell/private-materials 6.3.107 → 6.3.109

package/es/components/pay/toC/index.js

@@ -23,14 +23,13 @@ import PayAmount from "./PayAmount";
 import WalletPassBlock from "./WalletPassBlock";
 import PaymentList from "./PaymentList";
 import PaymentMethods from "./PaymentMethods";
-import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus, getOrderBasicDetail } from "./serve";
+import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus } from "./serve";
 import { Provider, Context } from "./model";
 import useEngineContext from "../../../hooks/useEngineContext";
 import usePaymentLogger from "../../../hooks/usePaymentLogger";
 import { request } from "../../../utils";
 import { removePayGroupFromStorage } from "./payGroup";
 import localeTexts from "./locales";
-import { getMachineCodeList } from "./PaymentMethods/WalletPass/serve";
 import { getIsWalletPassAndTripartitePayment } from "./utils";
 import { saleChannelMap } from "./status";
 import "./index.less";
@@ -264,7 +263,7 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var _getPaymentsAndWalletPass = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(order) {
-      var _order$_order, _state$payGroup2, _paymentListRef$curre, _yield$Promise$all, _yield$Promise$all2, data, allList, orderBasicDetail, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass, products, _res, recommended, transformList, noApplicableVoucher, recommendedAmount, _waitAmount2;
+      var _state$payGroup2, _paymentListRef$curre, data, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass, withCustomerIdList;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -277,79 +276,46 @@ var ToCPay = function ToCPay(props, ref) {
             });
             _context3.prev = 1;
             _context3.next = 4;
-            return Promise.all([getPaymentsAndWalletPass({
+            return getPaymentsAndWalletPass({
               order_id: order.order_id,
               total_amount: order.amount,
               sale_channel: order.sale_channel || 'online-store'
-            }), getMachineCodeList({
-              order_id: order.order_id,
-              available: 2,
-              prepare_payments: [],
-              filter_prepare_wallet_pass: 1,
-              sale_channel: ((_order$_order = order._order) === null || _order$_order === void 0 ? void 0 : _order$_order.sale_channel) || 'online-store',
-              other_exact_codes: []
-            }), getOrderBasicDetail(order.order_id)]);
-          case 4:
-            _yield$Promise$all = _context3.sent;
-            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 3);
-            data = _yield$Promise$all2[0];
-            allList = _yield$Promise$all2[1];
-            orderBasicDetail = _yield$Promise$all2[2];
-            _ref4 = data || {}, _ref4$remain_amount = _ref4.remain_amount, remain_amount = _ref4$remain_amount === void 0 ? 0 : _ref4$remain_amount, wallet_pass_recommend_list = _ref4.wallet_pass_recommend_list, wallet_pass_amount = _ref4.wallet_pass_amount, payment_list = _ref4.payment_list, walletPass = _ref4.walletPass;
-            products = (orderBasicDetail.detail || []).map(function (item) {
-              var _ref5;
-              return _objectSpread(_objectSpread({}, item), {}, {
-                is_price_include_tax: orderBasicDetail.is_price_include_tax,
-                product_bundle: (_ref5 = item.product_bundle || []) === null || _ref5 === void 0 ? void 0 : _ref5.map(function (bundle) {
-                  return _objectSpread(_objectSpread({}, bundle), {}, {
-                    is_price_include_tax: orderBasicDetail.is_price_include_tax
-                  });
-                })
-              });
-            });
-            _res = utils.walletPassEvaluator.getRecommendedVouchers({
-              orderTotalAmount: Math.min(orderBasicDetail.product_unpaid_total_pay_amount, order.amount),
-              products: products,
-              vouchers: allList || []
             });
-            recommended = _res.recommended, transformList = _res.transformList, noApplicableVoucher = _res.noApplicableVoucher, recommendedAmount = _res.recommendedAmount; // 记录获取到的数据
+          case 4:
+            data = _context3.sent;
+            _ref4 = data || {}, _ref4$remain_amount = _ref4.remain_amount, remain_amount = _ref4$remain_amount === void 0 ? 0 : _ref4$remain_amount, wallet_pass_recommend_list = _ref4.wallet_pass_recommend_list, wallet_pass_amount = _ref4.wallet_pass_amount, payment_list = _ref4.payment_list, walletPass = _ref4.walletPass; // 记录获取到的数据
             paymentLogger.addLog({
               key: '支付数据获取',
               value: ''
             });
-            _waitAmount2 = new Decimal((order === null || order === void 0 ? void 0 : order.amount) || 0).minus(new Decimal(recommendedAmount)).toNumber(); // 设置交易组
+            withCustomerIdList = (wallet_pass_recommend_list || []).map(function (item) {
+              return _objectSpread(_objectSpread({}, item), {}, {
+                customer_id: customer_id || item.customer_id
+              });
+            }); // 设置交易组
             dispatch({
               type: 'setPayGroup',
               payload: {
                 // ...state.payGroup,
                 order_id: order === null || order === void 0 ? void 0 : order.order_id,
                 // total_amount: order?.amount,
-                orderDetail: orderBasicDetail,
                 // 原订单信息
                 _order: order,
                 payment_group_id: order === null || order === void 0 ? void 0 : order.payment_group_id,
                 // 支付方式没有walletPass时walletPass设置null
                 walletPass: walletPass ? _objectSpread(_objectSpread(_objectSpread({}, (_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.walletPass), walletPass), {}, {
-                  // 推荐钱包
-                  cards: recommended,
-                  // 推荐金额
-                  amount: recommendedAmount,
-                  // 不可用钱包
-                  noApplicableVoucher: noApplicableVoucher,
-                  // 转换列表
-                  transformList: transformList
-                  // amount: wallet_pass_amount,
-                  // cards: wallet_pass_recommend_list,
+                  amount: wallet_pass_amount,
+                  cards: withCustomerIdList
                 }) : null,
                 total_amount: order === null || order === void 0 ? void 0 : order.amount,
-                wait_amount: Math.max(0, _waitAmount2)
+                wait_amount: remain_amount
               }
             });
 
             // 初始化支付列表
-            _context3.next = 18;
+            _context3.next = 11;
             return (_paymentListRef$curre = paymentListRef.current) === null || _paymentListRef$curre === void 0 ? void 0 : _paymentListRef$curre.init(payment_list, remain_amount || 0);
-          case 18:
+          case 11:
             // 解除loading
             setTimeout(function () {
               setLoading(false);
@@ -360,10 +326,10 @@ var ToCPay = function ToCPay(props, ref) {
               key: '获取支付列表成功',
               value: ''
             });
-            _context3.next = 28;
+            _context3.next = 21;
             break;
-          case 22:
-            _context3.prev = 22;
+          case 15:
+            _context3.prev = 15;
             _context3.t0 = _context3["catch"](1);
             console.log('err', _context3.t0);
 
@@ -386,11 +352,11 @@ var ToCPay = function ToCPay(props, ref) {
                 fn: '_getPaymentsAndWalletPass'
               }
             });
-          case 28:
+          case 21:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 22]]);
+      }, _callee3, null, [[1, 15]]);
     }));
     return function _getPaymentsAndWalletPass(_x3) {
       return _ref3.apply(this, arguments);
@@ -407,7 +373,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-16 10:46
    */
   var handlePaymentByType = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
       var _state$payGroup3;
       var paymentType, currentPayGroup, _paymentMethodsRef$cu;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -467,7 +433,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee4, null, [[3, 12]]);
     }));
     return function handlePaymentByType(_x4, _x5) {
-      return _ref6.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -479,7 +445,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:41
    */
   var paymentInit = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
       var _state$payGroup4;
       var orderId, _state$payGroup5, data;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -553,7 +519,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee5, null, [[3, 12]]);
     }));
     return function paymentInit(_x6) {
-      return _ref7.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -612,7 +578,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-30 10:23:48
    */
   var getIsShowDetectIncognitoConfirm = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payGroup) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payGroup) {
       var _yield$detectIncognit, isPrivate;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -630,7 +596,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee6);
     }));
     return function getIsShowDetectIncognitoConfirm(_x7) {
-      return _ref8.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
@@ -642,7 +608,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:25
    */
   var onSubmit = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(newOrderId) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(newOrderId) {
       var _state$payGroup10, _state$payGroup11, _state$payGroup12;
       var newPayGroup, _state$payGroup13, _newPayGroup, _newPayGroup2, _state$payGroup14, result, _state$payGroup15;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
@@ -720,7 +686,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee7, null, [[2, 20]]);
     }));
     return function onSubmit(_x8) {
-      return _ref9.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -777,7 +743,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-09 14:25
    */
   var payCallback = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
       var _res$data, _state$payGroup20, _props$callback;
       var orderId, _res$data2;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
@@ -817,7 +783,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee8);
     }));
     return function payCallback(_x9) {
-      return _ref10.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
 

package/es/components/pay/toC/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -29,13 +28,5 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
     front_order_uuid?: string;
-    orderDetail: any;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/pay/toC/serve.d.ts

@@ -62,21 +62,3 @@ export declare const getWalletNameAndPopupStatus: (values: {
  * @description: 获取支付结果
  */
 export declare const getPaymentResult: (values: any) => Promise<any>;
-declare type OrderBasicDetail = {
-    id: number;
-    status: string;
-    payment_status: string;
-    order_time: string;
-    detail: any[];
-    product_unpaid_total_pay_amount: number;
-    product_paid_total_pay_amount: number;
-    is_price_include_tax: 1 | 0;
-};
-/**
- * @title: 查询订单基础信息和订单商品信息
- * @description: 查询订单基础信息和订单商品信息
- * @param {string} order_id
- * @return {*}
- */
-export declare const getOrderBasicDetail: (order_id: string) => Promise<OrderBasicDetail>;
-export {};

package/es/components/pay/toC/serve.js

@@ -185,32 +185,4 @@ export var getWalletNameAndPopupStatus = /*#__PURE__*/function () {
  */
 export var getPaymentResult = function getPaymentResult(values) {
   return request.getRequest().get("/h5/pay/order/payment/result", values);
-};
-/**
- * @title: 查询订单基础信息和订单商品信息
- * @description: 查询订单基础信息和订单商品信息
- * @param {string} order_id
- * @return {*}
- */
-export var getOrderBasicDetail = /*#__PURE__*/function () {
-  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(order_id) {
-    var _yield$request$getReq5, data;
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
-        case 0:
-          _context5.next = 2;
-          return request.getRequest().get("/h5/order/order/".concat(order_id, "/basic-detail"), {});
-        case 2:
-          _yield$request$getReq5 = _context5.sent;
-          data = _yield$request$getReq5.data;
-          return _context5.abrupt("return", data);
-        case 5:
-        case "end":
-          return _context5.stop();
-      }
-    }, _callee5);
-  }));
-  return function getOrderBasicDetail(_x5) {
-    return _ref5.apply(this, arguments);
-  };
-}();
+};

package/es/components/pay/toC/utils.d.ts

@@ -22,7 +22,7 @@ export declare const formatWalletPassParams: (payGroup: PayGroup) => {
     order_id: string;
     payment_group_id: number;
     payments: {
-        amount: string | number;
+        amount: string;
         wallet_pass_use_value: any;
         voucher_id: any;
         tag: any;
@@ -48,7 +48,7 @@ export declare const isFranchiseeShop: (path?: any, history?: any) => any;
  */
 export declare const getFranchiseeShopId: (path?: any, history?: any) => number;
 export declare const formatFranchiseeRoute: (url: string, history?: any) => string;
-export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string | number;
+export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string;
 export declare const clientPayment: (params: {
     order_id: number;
     type: "aliPay" | "wxPay" | 'google_pay';

package/es/components/pay/toC/utils.js

@@ -6,7 +6,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { Decimal } from 'decimal.js';
 import { isTripartitePayment } from "./status";
-import { isNumber } from "@pisell/utils";
 /**
  * 计算walletPass列表数据的总金额
  * @param list
@@ -96,9 +95,6 @@ export var formatFranchiseeRoute = function formatFranchiseeRoute(url, history)
 
 // 获取walletPass可用最大金额
 export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
-  if (isNumber(data._available_max_amount)) {
-    return data._available_max_amount;
-  }
   return data.tag !== 'point_card' ? data.available_max_amount : data === null || data === void 0 ? void 0 : data.recommended_usage_amount;
 };
 export var clientPayment = function clientPayment(params) {

package/es/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,11 +68,4 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/shoppingCart/components/Cart/index.less

@@ -40,6 +40,7 @@
     line-height: 24px; /* 150% */
     display: flex;
     align-items: center;
+    width: max-content;
     .anticon {
       font-size: 18px;
       margin-right: 6px;

package/es/components/shoppingCart/components/Empty/index.d.ts

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

package/es/components/shoppingCart/hooks/useClearCart.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const useClearCart: (key?: number | undefined) => React.JSX.Element | null;
+declare const useClearCart: (key?: number | undefined) => React.JSX.Element;
 export default useClearCart;

package/es/components/shoppingCart/hooks/useClearCart.js

@@ -1,15 +1,23 @@
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-import React from 'react';
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useState, useCallback, useMemo } from 'react';
 import classNames from 'classnames';
-import { Iconfont } from '@pisell/materials';
+import { Iconfont, PisellModal } from '@pisell/materials';
 import { useContext } from "./useContext";
 import { locales } from '@pisell/utils';
 var useClearCart = function useClearCart(key) {
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
   var _useContext = useContext(),
     state = _useContext.state,
     onChange = _useContext.onChange;
@@ -36,6 +44,7 @@ var useClearCart = function useClearCart(key) {
         return item === null || item === void 0 ? void 0 : item._id;
       });
       onChange(ids, 'delete_holders', key);
+      setOpen(false);
       return;
       products = products.filter(function (item) {
         return (item === null || item === void 0 ? void 0 : item.holder_id) !== key;
@@ -46,13 +55,34 @@ var useClearCart = function useClearCart(key) {
     // updateState(updateProduct(state, products));
     // onChange(products);
   };
-  return !disabledEdit && (holders === null || holders === void 0 ? void 0 : holders.length) > 0 && !isHideClearCart ? /*#__PURE__*/React.createElement("span", {
-    className: classNames('pisell-lowcode__shopping-cart-clear-btn', {
-      'pisell-lowcode__shopping-cart-clear-btn-empty': isProductList
-    }),
-    onClick: handleClear
-  }, /*#__PURE__*/React.createElement(Iconfont, {
-    type: "pisell2-trash-01"
-  }), /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart'))) : null;
+  var handleOpenModal = useCallback(function () {
+    setOpen(true);
+  }, []);
+  var handleCancel = useCallback(function () {
+    setOpen(false);
+  }, []);
+  return useMemo(function () {
+    var showClearBtn = !disabledEdit && (holders === null || holders === void 0 ? void 0 : holders.length) > 0 && !isHideClearCart;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, showClearBtn ? /*#__PURE__*/React.createElement("span", {
+      className: classNames('pisell-lowcode__shopping-cart-clear-btn', {
+        'pisell-lowcode__shopping-cart-clear-btn-empty': isProductList
+      }),
+      onClick: handleOpenModal
+    }, /*#__PURE__*/React.createElement(Iconfont, {
+      type: "pisell2-trash-01"
+    }), /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart'))) : null, /*#__PURE__*/React.createElement(PisellModal, {
+      open: open,
+      title: locales.getText('pisell2.booking.info.text.clear-cart-modal.title'),
+      onOk: handleClear,
+      onCancel: handleCancel,
+      okText: locales.getText('pisell2.booking.info.text.clear-cart-modal.confirm'),
+      cancelText: locales.getText('pisell2.booking.info.text.clear-cart-modal.cancel'),
+      destroyOnClose: true
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        margin: '24px 0'
+      }
+    }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart-modal.content')))));
+  }, [open, disabledEdit, holders === null || holders === void 0 ? void 0 : holders.length, isHideClearCart, isProductList]);
 };
 export default useClearCart;

package/es/hooks/usePaymentLogger.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface LogData {
     key: string;
     value: any;

package/es/plus/pisellSalesManagement/config/booking.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const getBookingStatusMap: () => Record<string, string>;
 export declare const BOOKING_STATUS_COLOR_MAP: Record<string, string>;
 export declare const getBookingPlatformMap: () => Record<string, string>;

package/es/plus/walletPassGallery/components/recharge/index.js

@@ -129,17 +129,25 @@ var Recharge = function Recharge(_ref) {
       className: "card-content-left"
     }, /*#__PURE__*/React.createElement("p", {
       className: "pisell-card-amount-item-name"
-    }, item.name), /*#__PURE__*/React.createElement(PisellText.Amount, {
+    }, item.name), /*#__PURE__*/React.createElement("div", {
+      className: "pisell-card-amount-item-arrival"
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "pisell-card-amount-item-label"
+    }, locales.getText('wallet-pass-gallery.rechargeArrivalAmount')), /*#__PURE__*/React.createElement(PisellText.Amount, {
       showCurrencySymbol: true,
-      className: "pisell-card-amount-item-value",
+      className: "highlight-amount",
       useThousandsSeparator: true,
       value: item.gift_price
-    })), /*#__PURE__*/React.createElement(PisellText.Amount, {
+    }))), /*#__PURE__*/React.createElement("div", {
+      className: "card-content-right"
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "pay-label"
+    }, locales.getText('wallet-pass-gallery.rechargePayAmount')), /*#__PURE__*/React.createElement(PisellText.Amount, {
       showCurrencySymbol: true,
-      className: "pisell-card-amount-item-value",
+      className: "pay-amount",
       useThousandsSeparator: true,
       value: item.price
-    }))));
+    })))));
   }))));
 };
 export default Recharge;

package/es/plus/walletPassGallery/components/recharge/index.less

@@ -7,10 +7,79 @@
 
   &-card-item {
     cursor: pointer;
+    min-width: 0;
+  }
+
+  .pisell-card-item {
+    border-radius: 8px;
+    border: 1px solid transparent;
+    transition: all 0.3s;
+    background: #fff;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+    min-width: 0;
   }
 
   .pisell-card-selected {
-    border: 1px solid var(--theme-color, #7f56d9);
+    border-color: var(--theme-color, #7f56d9);
     background: var(--Primary-50, #f9f5ff);
+    box-shadow: 0 4px 12px rgba(127, 86, 217, 0.1);
+  }
+
+  .card-content {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    gap: 16px;
+  }
+
+  .card-content-left {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    flex: 1;
+    min-width: 0;
+  }
+
+  .pisell-card-amount-item-name {
+    font-size: 16px;
+    font-weight: 600;
+    color: #333;
+    margin: 0;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .pisell-card-amount-item-arrival {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    font-size: 13px;
+    color: #666;
+    flex-wrap: wrap;
+
+    .highlight-amount {
+      color: #ff4d4f;
+      font-weight: 500;
+    }
+  }
+
+  .card-content-right {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    margin-top: 4px;
+    flex-shrink: 0;
+  }
+
+  .pay-label {
+    font-size: 12px;
+    color: #666;
+  }
+
+  .pay-amount {
+    font-size: 20px;
+    font-weight: bold;
+    color: var(--theme-color, #7f56d9);
   }
 }

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

@@ -92,6 +92,8 @@ declare const _default: {
         'page.wallet.tempHolderSelector.confirm': string;
         'page.wallet.notValidDate': string;
         'page.wallet.includedDate': string;
+        'wallet-pass-gallery.rechargeArrivalAmount': string;
+        'wallet-pass-gallery.rechargePayAmount': string;
     };
     'zh-CN': {
         'wallet-pass-gallery.rechargeableCard': string;
@@ -186,6 +188,8 @@ declare const _default: {
         'page.wallet.tempHolderSelector.confirm': string;
         'page.wallet.notValidDate': string;
         'page.wallet.includedDate': string;
+        'wallet-pass-gallery.rechargeArrivalAmount': string;
+        'wallet-pass-gallery.rechargePayAmount': string;
     };
     'zh-HK': {
         'wallet-pass-gallery.rechargeableCard': string;
@@ -280,6 +284,8 @@ declare const _default: {
         'page.wallet.tempHolderSelector.confirm': string;
         'page.wallet.notValidDate': string;
         'page.wallet.includedDate': string;
+        'wallet-pass-gallery.rechargeArrivalAmount': string;
+        'wallet-pass-gallery.rechargePayAmount': string;
     };
     ja: {
         'wallet-pass-gallery.rechargeableCard': string;
@@ -374,6 +380,8 @@ declare const _default: {
         'page.wallet.tempHolderSelector.confirm': string;
         'page.wallet.notValidDate': string;
         'page.wallet.includedDate': string;
+        'wallet-pass-gallery.rechargeArrivalAmount': string;
+        'wallet-pass-gallery.rechargePayAmount': string;
     };
     pt: {
         'wallet-pass-gallery.rechargeableCard': string;
@@ -468,6 +476,8 @@ declare const _default: {
         'page.wallet.tempHolderSelector.confirm': string;
         'page.wallet.notValidDate': string;
         'page.wallet.includedDate': string;
+        'wallet-pass-gallery.rechargeArrivalAmount': string;
+        'wallet-pass-gallery.rechargePayAmount': string;
     };
 };
 export default _default;