@pisell/private-materials 6.4.45 → 6.4.47

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

@@ -30,7 +30,7 @@ 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[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts

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

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

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

package/es/components/appointmentBooking/components/Cart/index.d.ts

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

package/es/components/appointmentBooking/components/Content/index.d.ts

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;

package/es/components/appointmentBooking/components/Footer/index.d.ts

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

package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

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

package/es/components/appointmentBooking/components/Voucher/index.d.ts

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

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

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

package/es/components/appointmentBooking/deposit/index.d.ts

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

package/es/components/appointmentBooking/index.d.ts

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

package/es/components/booking/addons/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-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/booking/components/footer/amount.js

@@ -705,7 +705,6 @@ export var getSumTotal = function getSumTotal(state, options) {
   var _getProductExpectAmou = getProductExpectAmount(state, options.isEdit),
     productExpectAmount = _getProductExpectAmou.productExpectAmount,
     duration = _getProductExpectAmou.duration;
-  debugger;
 
   // 整单折扣金额
   var shopDiscount = getShopDiscount(state);

package/es/components/booking/components/footer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

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

@@ -837,7 +837,7 @@ var Footer = function Footer(props) {
    */
   var handleSave = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref6) {
-      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isHasDayProducts, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, callbackData, values, checkout, subtotal_info, res, api;
+      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isHasDayProducts, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, callbackData, values, checkout, subtotal_info, res, isNeedDeposit, api;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -895,11 +895,11 @@ var Footer = function Footer(props) {
             }
             return _context6.abrupt("return", values);
           case 27:
+            checkout = pisellos.getModule('checkout'); // 如果有 orderid，则应该走更新逻辑
             if (!editOrderId) {
               _context6.next = 37;
               break;
             }
-            checkout = pisellos.getModule('checkout');
             subtotal_info = {
               subTotalList: cloneDeep(subTotalList),
               orderTotalList: cloneDeep(orderTotalList),
@@ -926,6 +926,15 @@ var Footer = function Footer(props) {
             }
             return _context6.abrupt("return");
           case 37:
+            // 如果是保存，检查是否需要支付定金
+            if (type === 'save') {
+              isNeedDeposit = checkout.checkIsNeedDepositAsync(values.bookings, values.relation_products);
+              if (isNeedDeposit !== null && isNeedDeposit !== void 0 && isNeedDeposit.hasDeposit) {
+                values.is_deposit = 1;
+                values.deposit_amount = isNeedDeposit === null || isNeedDeposit === void 0 ? void 0 : isNeedDeposit.total;
+              }
+            }
+
             // 区分是新增还是编辑
             api = state.bookingId ? editApi : createApi; // 增加日志记录
             sendWarningLog({
@@ -969,43 +978,43 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context6.next = 42;
+              _context6.next = 43;
               break;
             }
-            _context6.next = 42;
+            _context6.next = 43;
             return handleSaveAddons();
-          case 42:
+          case 43:
             if (!infoEdit) {
-              _context6.next = 47;
+              _context6.next = 48;
               break;
             }
-            _context6.next = 45;
+            _context6.next = 46;
             return api(values, state.bookingId || editOrderId);
-          case 45:
+          case 46:
             callbackData = _context6.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 47:
+          case 48:
             // 回调关闭弹窗
             state === null || state === void 0 || state.callback(callbackData, type);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context6.abrupt("return", callbackData || values);
-          case 52:
-            _context6.prev = 52;
+          case 53:
+            _context6.prev = 53;
             _context6.t1 = _context6["catch"](21);
             console.log(_context6.t1);
             if ((_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.code) === 70101) {
               message.error(_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.message);
             }
             _setLoading(false);
-          case 57:
+          case 58:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[21, 52]]);
+      }, _callee6, null, [[21, 53]]);
     }));
     return function handleSave(_x5) {
       return _ref7.apply(this, arguments);

package/es/components/booking/components/voucher/index.d.ts

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

package/es/components/booking/forms/footer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface FooterProps {
     state: any;
     reload: () => void;

package/es/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-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/booking/forms/sendModal/useSendModal.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

package/es/components/booking/hooks/useQuotation.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const calculateTotalPrice: (data: any) => number;
 declare const useQuotation: (state: any, dispatch: any) => {
     dom: JSX.Element;

package/es/components/booking/info/dateRange/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

package/es/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-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/booking/info/service/addService/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {

package/es/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info/service/addTimeModal/index.d.ts

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

package/es/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const BookingList: ({ items }: {
     items: any[];
 }) => JSX.Element;

package/es/components/booking/info/service/serviceItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info2/service/serviceItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -106,11 +105,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-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/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-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/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-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/booking/utils.js

@@ -18,6 +18,7 @@ import { locales } from '@pisell/utils';
 import { isDayBooking, formatDayDate } from "./info/service2/utils";
 import { intersectionBy } from 'lodash';
 import { getAppointmentTimingPreference } from "./info2/utilsByBooking";
+import Decimal from 'decimal.js';
 var Request = /*#__PURE__*/function () {
   function Request() {
     _classCallCheck(this, Request);
@@ -757,27 +758,31 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
 // 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量 + 单规格价格 * 单规格数量)  * 商品数量
 export var getProductTotalPrice = function getProductTotalPrice(item) {
   var _item$_extend;
-  var price = Number(item._extend.price);
+  var price = new Decimal(item._extend.price || 0);
   var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
 
   // 多规格
   if (other !== null && other !== void 0 && other.product_variant_id) {
-    price = Number(other === null || other === void 0 ? void 0 : other.price);
+    price = new Decimal((other === null || other === void 0 ? void 0 : other.price) || 0);
   }
   if (other !== null && other !== void 0 && other.bundle) {
     // bundle
     price = other === null || other === void 0 ? void 0 : other.bundle.reduce(function (accumulator, currentValue) {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+      var currentPrice = new Decimal(currentValue.price || 0);
+      var currentNum = new Decimal(currentValue.num || 0);
+      return accumulator.add(currentPrice.mul(currentNum));
     }, price);
   }
 
   // 单规格
   if (other !== null && other !== void 0 && other.option) {
     price = other === null || other === void 0 ? void 0 : other.option.reduce(function (accumulator, currentValue) {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+      var currentPrice = new Decimal(currentValue.price || 0);
+      var currentNum = new Decimal(currentValue.num || 0);
+      return accumulator.add(currentPrice.mul(currentNum));
     }, price);
   }
-  return price;
+  return price.toNumber();
 };
 /**
  * @title: 判断 duration

package/es/components/checkout/PaymentModal.js

@@ -194,7 +194,19 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               var _method$name;
               return method.code === 'CASHMANUAL' || method.type === 'CASHMANUAL' || ((_method$name = method.name) === null || _method$name === void 0 ? void 0 : _method$name.toLowerCase().includes('cash'));
             });
-            _context.next = 3;
+            logger === null || logger === void 0 || logger.addLog({
+              type: 'info',
+              title: 'open_till',
+              metadata: {}
+            });
+            interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 || _interaction$utils$po.call(_interaction$utils, {
+              module: 'till',
+              key: 'open_till',
+              data: {
+                type: 'cash' // cash 不需要验证钱箱权限
+              }
+            });
+            _context.next = 5;
             return checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.addPaymentItemAsync({
               amount: result.amount,
               /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -209,19 +221,6 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               voucher_id: 0,
               rounding_amount: result.roundingAmount
             });
-          case 3:
-            logger === null || logger === void 0 || logger.addLog({
-              type: 'info',
-              title: 'open_till',
-              metadata: {}
-            });
-            interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 || _interaction$utils$po.call(_interaction$utils, {
-              module: 'till',
-              key: 'open_till',
-              data: {
-                type: 'cash' // cash 不需要验证钱箱权限
-              }
-            });
           case 5:
           case "end":
             return _context.stop();
@@ -233,11 +232,12 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
   }();
 
-  // 处理 surcharge 字符串，去除前面的 $ 符号
+  // 处理 surcharge 字符串，提取其中的金额数字（包括小数点）
   var processSurcharge = function processSurcharge(surcharge) {
     if (typeof surcharge === 'string') {
-      // 去除前面的 $ 符号和其他货币符号
-      return surcharge.replace(/^[$¥€£]+/, '');
+      // 使用正则表达式提取字符串中的数字（包括小数点）
+      var match = surcharge.match(/\d+(?:\.\d+)?/);
+      return match ? match[0] : undefined;
     }
     if (typeof surcharge === 'number') {
       // 如果是数字，转换为字符串
@@ -372,7 +372,10 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               // handleToastClose();
               interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$p = _interaction$utils2.postMessageToApp) === null || _interaction$utils2$p === void 0 || _interaction$utils2$p.call(_interaction$utils2, {
                 module: 'till',
-                key: 'open_till'
+                key: 'open_till',
+                data: {
+                  type: 'cash' // cash 不需要验证钱箱权限
+                }
               });
             }
             // 从支付方式列表中查找现金支付方式
@@ -614,7 +617,10 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                       // handleToastClose();
                       interaction === null || interaction === void 0 || (_interaction$utils3 = interaction.utils) === null || _interaction$utils3 === void 0 || (_interaction$utils3$p = _interaction$utils3.postMessageToApp) === null || _interaction$utils3$p === void 0 || _interaction$utils3$p.call(_interaction$utils3, {
                         module: 'till',
-                        key: 'open_till'
+                        key: 'open_till',
+                        data: {
+                          type: 'cash' // cash 不需要验证钱箱权限
+                        }
                       });
                     }
                   case 16:
@@ -932,7 +938,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             voucherItems = [];
             select.forEach(function (item) {
               var mapCode = item.code ? WALLET_PASS_CODE_MAP[item.code] : null;
-              if (mapCode) {
+              if (mapCode && walletPassDetail.map[mapCode]) {
                 var _walletPassDetail$map, _walletPassDetail$map2, _walletPassDetail$map3, _walletPassDetail$map4;
                 voucherItems.push({
                   /** 支付金额 */
@@ -2461,6 +2467,20 @@ var PaymentModal = function PaymentModal(_ref18) {
               className: getClassName('menu-icon')
             }),
             onClick: handleOrderNoteClick
+          }, enabledAutoPrint ? {
+            key: 'print',
+            label: locales.getText('payment.result.printReceipt'),
+            icon: /*#__PURE__*/React.createElement(Printer, {
+              className: getClassName('action-icon')
+            }),
+            onClick: handlePrintReceiptClick
+          } : {
+            key: 'details',
+            label: locales.getText('payment.result.details'),
+            icon: /*#__PURE__*/React.createElement(FileCheck02, {
+              className: getClassName('action-icon')
+            }),
+            onClick: handleDetailsClick
           }],
           buttonProps: {
             className: getClassName('action-button'),
@@ -2471,7 +2491,7 @@ var PaymentModal = function PaymentModal(_ref18) {
         }]];
       case 'partially_paid':
         // 部分支付状态
-        return [[{
+        return [[enabledAutoPrint ? {
           id: 'details',
           buttonProps: {
             className: getClassName('action-button'),
@@ -2481,6 +2501,16 @@ var PaymentModal = function PaymentModal(_ref18) {
             }),
             children: locales.getText('payment.result.details')
           }
+        } : {
+          id: 'print',
+          buttonProps: {
+            className: getClassName('action-button'),
+            onClick: handlePrintReceiptClick,
+            icon: /*#__PURE__*/React.createElement(Printer, {
+              className: getClassName('action-icon')
+            }),
+            children: locales.getText('payment.result.printReceipt')
+          }
         }, {
           id: 'more',
           isMore: true,
@@ -2491,6 +2521,20 @@ var PaymentModal = function PaymentModal(_ref18) {
               className: getClassName('menu-icon')
             }),
             onClick: handleOrderNoteClick
+          }, enabledAutoPrint ? {
+            key: 'print',
+            label: locales.getText('payment.result.printReceipt'),
+            icon: /*#__PURE__*/React.createElement(Printer, {
+              className: getClassName('action-icon')
+            }),
+            onClick: handlePrintReceiptClick
+          } : {
+            key: 'details',
+            label: locales.getText('payment.result.details'),
+            icon: /*#__PURE__*/React.createElement(FileCheck02, {
+              className: getClassName('action-icon')
+            }),
+            onClick: handleDetailsClick
           }],
           buttonProps: {
             className: getClassName('action-button'),
@@ -2684,10 +2728,10 @@ var PaymentModal = function PaymentModal(_ref18) {
       open: showRetryModal,
       title: locales.getText('pisell2.checkout.tips'),
       footer: null,
-      closable: false,
-      maskClosable: false,
       keyboard: false,
-      onCancel: function onCancel() {} // 禁用关闭
+      onCancel: function onCancel() {
+        setShowRetryModal(false);
+      } // 禁用关闭
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {

package/es/components/checkout/components/AdditionalModule/index.less

@@ -1,5 +1,5 @@
 .additional-module {
-  // padding-bottom: 16px; // 底部间距
+  padding-bottom: 2px; // 底部间距
 
   // 标题样式
   &-title {