@pisell/private-materials 6.5.1 → 6.5.3

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/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/Header/index.d.ts

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

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/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/actionButtons/index.js

@@ -20,7 +20,7 @@ import { createPortal } from 'react-dom';
 import { Button } from 'antd';
 import { Trash01, Calculator, PlusCircle, Sale03 } from '@pisell/icon';
 import { locales } from '@pisell/utils';
-import { PisellAdjustPrice } from '@pisell/materials';
+import { PisellAdjustPrice, useToast } from '@pisell/materials';
 import dayjs from 'dayjs';
 import ClearCartModal from "../clearCartModal";
 import CustomiseItemModal from "../customiseItemModal";
@@ -31,6 +31,7 @@ import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useMemoizedFn } from 'ahooks';
 import useEngineContext, { usePisellOS } from "../../../../hooks/useEngineContext";
 import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
+import { useShopDiscount } from "../../../appointmentBooking/hooks";
 // Toast 内容包装器，统一设置行高
 var createToastContent = function createToastContent(text) {
   return /*#__PURE__*/React.createElement("div", {
@@ -60,11 +61,12 @@ var ActionButtons = function ActionButtons(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     showVoucherModal = _useState8[0],
     setShowVoucherModal = _useState8[1];
+  var shopDiscount = useShopDiscount();
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
-    Toast = _context$appHelper$ut.Toast,
     getData = _context$appHelper$ut.getData,
     pisellosAllModule = _context$appHelper$ut.pisellosAllModule;
+  var Toast = useToast();
   var pisellOS = usePisellOS();
   var ScheduleModule = pisellosAllModule.ScheduleModule;
 
@@ -268,8 +270,8 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
-    var _window;
-    (_window = window) === null || _window === void 0 || (_window = _window.shopApi) === null || _window === void 0 || (_window = _window.bookingTicket) === null || _window === void 0 || _window.clearAllCart();
+    var _shopDiscount$clear;
+    // (window as any)?.shopApi?.bookingTicket?.clearAllCart();
     clearAllScanListenersTaskQueue();
     // 清空服务项目
     dispatch({
@@ -328,6 +330,8 @@ var ActionButtons = function ActionButtons(_ref) {
     // TODO: 如果需要重置更多信息，可以在这里添加
     // 比如重置优惠券、表单数据、宠物信息等
 
+    // 清空商品券
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$clear = shopDiscount.clear) === null || _shopDiscount$clear === void 0 || _shopDiscount$clear.call(shopDiscount);
     setShowClearModal(false);
     Toast === null || Toast === void 0 || Toast.success(createToastContent(locales.getText('pisell2.action-buttons.clear-success')));
   };

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

@@ -8,13 +8,13 @@ import React, { useState, useEffect, useRef } from 'react';
 import { Modal, Input, Checkbox, Button } from 'antd';
 // import { X } from '@pisell/icon';
 import { locales } from '@pisell/utils';
+import { useToast } from '@pisell/materials';
 // import PisellPriceRadio from '../../../../pro/pisellPriceRadio';
 import PisellNumberSelector from "../../../../pro/pisellNumberSelector";
 import PisellPriceKeyboardModal from "../../../../pro/pisellPriceKeyboardModal";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import "./index.less";
 var CustomiseItemModal = function CustomiseItemModal(_ref) {
-  var _context$appHelper;
   var _ref$visible = _ref.visible,
     visible = _ref$visible === void 0 ? false : _ref$visible,
     onClose = _ref.onClose,
@@ -60,7 +60,7 @@ var CustomiseItemModal = function CustomiseItemModal(_ref) {
   var sellPriceButtonRef = useRef(null);
   var deductionPriceButtonRef = useRef(null);
   var context = useEngineContext();
-  var Toast = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.Toast;
+  var Toast = useToast();
 
   // 重置表单数据
   var resetForm = function resetForm() {

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

@@ -26,6 +26,7 @@ import classNames from 'classnames';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import PaymentModal from "../../../checkout/PaymentModal";
+import { closeAllPaymentResultToasts } from "../../../checkout/components/PaymentResultToast";
 import { formatProducts } from "../../addons";
 import { getIsSubjectRequire, isDayBooking, isEventBooking, isHasDayAppointmentProduct } from "../../info/service2/utils";
 import { createBookings, editBookings } from "../../info2/serve";
@@ -45,6 +46,8 @@ import { Iconfont } from '@pisell/materials';
 import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useDebounceEffect, useMemoizedFn } from 'ahooks';
 import { cloneDeep } from 'lodash';
+import { useShopDiscount } from "../../../appointmentBooking/hooks";
+
 /**
  * @title: 底部
  * @description:
@@ -604,40 +607,42 @@ var Footer = function Footer(props) {
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
+            // 关闭页面上所有的PaymentResultToast
+            closeAllPaymentResultToasts();
             isNewOrder = !state.bookingId; // 如果有编辑内容, 则先保存
             if (!isEdit) {
-              _context4.next = 25;
+              _context4.next = 26;
               break;
             }
             if (!isDayBooking(state)) {
-              _context4.next = 6;
+              _context4.next = 7;
               break;
             }
             isHasDayProducts = handleDaySubmit();
             if (!isHasDayProducts) {
-              _context4.next = 6;
+              _context4.next = 7;
               break;
             }
             return _context4.abrupt("return");
-          case 6:
+          case 7:
             if (!state.isBookingTicket2) {
-              _context4.next = 19;
+              _context4.next = 20;
               break;
             }
-            _context4.next = 9;
+            _context4.next = 10;
             return handleSave({
               type: 'checkout',
               messageShow: !(isTerminal !== null && isTerminal !== void 0 && isTerminal()),
               noSubmit: true
             });
-          case 9:
+          case 10:
             res = _context4.sent;
             if (res) {
-              _context4.next = 12;
+              _context4.next = 13;
               break;
             }
             return _context4.abrupt("return");
-          case 12:
+          case 13:
             // 使用新版支付弹窗
             modalData = {
               order_info: res,
@@ -654,12 +659,12 @@ var Footer = function Footer(props) {
             setPaymentCallback(function () {
               return function (paymentResult) {
                 console.log('Payment result:', paymentResult);
+                setIsPaymentModalOpen(false);
                 if ((paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status) === 'success') {
                   var _window5;
                   console.log('Payment completed successfully');
                   (_window5 = window) === null || _window5 === void 0 || (_window5 = _window5.shopApi) === null || _window5 === void 0 || (_window5 = _window5.bookingTicket) === null || _window5 === void 0 || _window5.clearAllCart();
                   // 支付成功后关闭弹窗
-                  setIsPaymentModalOpen(false);
                   setPaymentModalData(null);
                   setPaymentCallback(null);
                 } else if ((paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status) === 'cancelled') {
@@ -669,36 +674,34 @@ var Footer = function Footer(props) {
                     (_window6 = window) === null || _window6 === void 0 || (_window6 = _window6.shopApi) === null || _window6 === void 0 || (_window6 = _window6.booking) === null || _window6 === void 0 || _window6.voidBooking(res.order_id);
                   }
                   // 支付取消后关闭弹窗
-                  setIsPaymentModalOpen(false);
                   setPaymentModalData(null);
                   setPaymentCallback(null);
                 } else {
                   console.log('Payment status:', paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status);
                   // 其他状态也关闭弹窗
-                  setIsPaymentModalOpen(false);
                   setPaymentModalData(null);
                   setPaymentCallback(null);
                 }
               };
             });
-            _context4.next = 24;
+            _context4.next = 25;
             break;
-          case 19:
-            _context4.next = 21;
+          case 20:
+            _context4.next = 22;
             return handleSave({
               type: 'checkout',
               messageShow: !(isTerminal !== null && isTerminal !== void 0 && isTerminal())
             });
-          case 21:
+          case 22:
             _res = _context4.sent;
             // goCheckout2(res);
             console.log(_res);
             goCheckout((_res === null || _res === void 0 ? void 0 : _res.order_id) || state.bookingId, isNewOrder);
-          case 24:
-            return _context4.abrupt("return");
           case 25:
-            return _context4.abrupt("return", goCheckout(state.bookingId, isNewOrder));
+            return _context4.abrupt("return");
           case 26:
+            return _context4.abrupt("return", goCheckout(state.bookingId, isNewOrder));
+          case 27:
           case "end":
             return _context4.stop();
         }
@@ -792,23 +795,26 @@ var Footer = function Footer(props) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             type = _ref6.type, _ref6$messageShow = _ref6.messageShow, messageShow = _ref6$messageShow === void 0 ? true : _ref6$messageShow, _ref6$noSubmit = _ref6.noSubmit, noSubmit = _ref6$noSubmit === void 0 ? false : _ref6$noSubmit;
+            // 关闭页面上所有的PaymentResultToast
+            closeAllPaymentResultToasts();
+            // 跨日预约验证是否有预约商品
             if (!isDayBooking(state)) {
-              _context6.next = 5;
+              _context6.next = 6;
               break;
             }
             isHasDayProducts = handleDaySubmit();
             if (!isHasDayProducts) {
-              _context6.next = 5;
+              _context6.next = 6;
               break;
             }
             return _context6.abrupt("return");
-          case 5:
+          case 6:
             if (!(isBooking4Shop && getIsSubjectRequire(state) && checkHolderIsError(state))) {
-              _context6.next = 7;
+              _context6.next = 8;
               break;
             }
             return _context6.abrupt("return");
-          case 7:
+          case 8:
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
@@ -817,31 +823,31 @@ var Footer = function Footer(props) {
             createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context6.next = 20;
+              _context6.next = 21;
               break;
             }
-            _context6.next = 16;
+            _context6.next = 17;
             return state === null || state === void 0 || (_state$onSave = state.onSave) === null || _state$onSave === void 0 ? void 0 : _state$onSave.call(state, state.client);
-          case 16:
+          case 17:
             _context6.t0 = _context6.sent;
             if (_context6.t0) {
-              _context6.next = 19;
+              _context6.next = 20;
               break;
             }
             _context6.t0 = {};
-          case 19:
-            saveOtherValue = _context6.t0;
           case 20:
-            _context6.prev = 20;
+            saveOtherValue = _context6.t0;
+          case 21:
+            _context6.prev = 21;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // checkout 2.0 补充商品总税费字段
             values.product_tax_fee = total.tax || 0;
             if (!noSubmit) {
-              _context6.next = 26;
+              _context6.next = 27;
               break;
             }
             return _context6.abrupt("return", values);
-          case 26:
+          case 27:
             // 区分是新增还是编辑
             api = state.bookingId ? editApi : createApi; // 增加日志记录
             sendWarningLog({
@@ -885,43 +891,43 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context6.next = 31;
+              _context6.next = 32;
               break;
             }
-            _context6.next = 31;
+            _context6.next = 32;
             return handleSaveAddons();
-          case 31:
+          case 32:
             if (!infoEdit) {
-              _context6.next = 36;
+              _context6.next = 37;
               break;
             }
-            _context6.next = 34;
+            _context6.next = 35;
             return api(values, state.bookingId);
-          case 34:
+          case 35:
             callbackData = _context6.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 36:
+          case 37:
             // 回调关闭弹窗
             state === null || state === void 0 || state.callback(callbackData, type);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context6.abrupt("return", callbackData || values);
-          case 41:
-            _context6.prev = 41;
-            _context6.t1 = _context6["catch"](20);
+          case 42:
+            _context6.prev = 42;
+            _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 46:
+          case 47:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[20, 41]]);
+      }, _callee6, null, [[21, 42]]);
     }));
     return function handleSave(_x5) {
       return _ref7.apply(this, arguments);
@@ -1656,12 +1662,15 @@ var Footer = function Footer(props) {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
+  var shopDiscount = useShopDiscount();
   var _useScanManager2 = useScanManager(),
     clearAllScanListenersTaskQueue = _useScanManager2.clearAllScanListenersTaskQueue;
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
-    var _window7;
-    (_window7 = window) === null || _window7 === void 0 || (_window7 = _window7.shopApi) === null || _window7 === void 0 || (_window7 = _window7.bookingTicket) === null || _window7 === void 0 || _window7.clearAllCart();
+    var _shopDiscount$clear;
+    // setTimeout(() => {
+    //   (window as any)?.shopApi?.bookingTicket?.clearAllCart();
+    // }, 0);
     clearAllScanListenersTaskQueue();
     // 清空服务项目
     dispatch({
@@ -1716,6 +1725,9 @@ var Footer = function Footer(props) {
         orderNote: ''
       }
     });
+
+    // 清空商品券
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$clear = shopDiscount.clear) === null || _shopDiscount$clear === void 0 || _shopDiscount$clear.call(shopDiscount);
   };
   return /*#__PURE__*/React.createElement(Skeleton, {
     title: false,
@@ -1800,13 +1812,23 @@ var Footer = function Footer(props) {
     state: state,
     dispatch: dispatch,
     onClose: function onClose(reset) {
-      console.log('🔄 Footer: Closing PaymentModal');
+      // console.log('🔄 Footer: Closing PaymentModal');
       setIsPaymentModalOpen(false);
       setPaymentModalData(null);
       setPaymentCallback(null);
+      // if (reset) {
+      //   handleClearAllAndReset();
+      // }
       if (reset) {
-        handleClearAllAndReset();
+        setTimeout(function () {
+          handleClearAllAndReset();
+        }, 0);
       }
+      // setPaymentModalData(null);
+      // setPaymentCallback(null);
+      // if (reset) {
+      //   handleClearAllAndReset();
+      // }
     }
   }));
 };

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

@@ -115,6 +115,18 @@ var VoucherCard = function VoucherCard(props) {
     });
     return val;
   }, [state.service.value]);
+  var onScanWallPassCode = useMemoizedFn(function (e) {
+    if (!e.detail.code) {
+      return;
+    }
+    onScanCode(e.detail.code);
+  });
+  useEffect(function () {
+    window.addEventListener('onScanWallPassCode', onScanWallPassCode);
+    return function () {
+      window.removeEventListener('onScanWallPassCode', onScanWallPassCode);
+    };
+  }, []);
   var addonsMemo = useMemo(function () {
     var _ref2;
     var val = (_ref2 = state.addons.value || []) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (value) {
@@ -237,7 +249,7 @@ var VoucherCard = function VoucherCard(props) {
 
   // apply code
   var onScanCode = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(codeParam) {
       var _state$client$value2;
       var customerId, val;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -246,7 +258,7 @@ var VoucherCard = function VoucherCard(props) {
             //'7d1163c32c01f288'
             customerId = (_state$client$value2 = state.client.value) === null || _state$client$value2 === void 0 ? void 0 : _state$client$value2.id;
             _context.next = 3;
-            return shopDiscount.scanCode(code, customerId);
+            return shopDiscount.scanCode(codeParam || code, customerId);
           case 3:
             val = _context.sent;
             console.log(val);
@@ -264,7 +276,7 @@ var VoucherCard = function VoucherCard(props) {
         }
       }, _callee);
     }));
-    return function onScanCode() {
+    return function onScanCode(_x) {
       return _ref3.apply(this, arguments);
     };
   }();
@@ -346,7 +358,9 @@ var VoucherCard = function VoucherCard(props) {
     // }
   })), /*#__PURE__*/React.createElement(Button, {
     size: "small",
-    onClick: onScanCode,
+    onClick: function onClick() {
+      return onScanCode();
+    },
     disabled: !code
   }, locales.getText('pisell2.text.apply')))));
 };

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

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

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/info/addServiceVariant/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

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/header/index.d.ts

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

package/es/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>;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

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/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/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;