@pisell/private-materials 6.4.35 → 6.4.36

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/es/components/booking/components/TabProduct/productItem/index.d.ts

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

package/es/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

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";
@@ -62,9 +62,9 @@ var ActionButtons = function ActionButtons(_ref) {
     setShowVoucherModal = _useState8[1];
   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;
 

package/es/components/booking/components/collapsibleList/utils.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

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

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

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";
@@ -606,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,
@@ -681,24 +684,24 @@ var Footer = function Footer(props) {
                 }
               };
             });
-            _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);

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface IProps {
     modal: any;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/es/components/booking/forms/table/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

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/clientVariant/hooks/useClientFn.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

package/es/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => 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/hooks/useInfoHolder.d.ts

@@ -1,4 +1,3 @@
-/// <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/notes/index.d.ts

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

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

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

@@ -15,7 +15,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useImperativeHandle, useMemo, useState, forwardRef, useRef } from 'react';
 import { useMemoizedFn, useDebounceFn } from 'ahooks';
-import { PisellModal } from '@pisell/materials';
+import { PisellModal, useToast } from '@pisell/materials';
 import { locales } from '@pisell/utils';
 import localeTexts from "./locales";
 import ClientCard from "../../../../plus/clientCard";
@@ -25,7 +25,6 @@ import { isWalkIn } from "../../../../components/booking/utils";
 import useScanCustomer from "../../../../components/ticketBooking/hooks/pisellos/useScanCustomer";
 import { setHandleSetClient } from "./utils";
 import { getClientName } from "../../../../plus/clientName/utils";
-import useToast from "../../../../hooks/useToast";
 import useTranslationOriginal from "../../../../hooks/useTranslationOriginal";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { Context } from "../../info/model";

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

package/es/components/booking/materiels/duration/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

package/es/components/booking/materiels/holder/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

package/es/components/booking/materiels/startTime/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

package/es/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;

package/es/components/booking/notes/NoteBlock/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     title?: string;

package/es/components/booking/notes/addNote/index.d.ts

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