@pisell/private-materials 3.4.37 → 3.4.39

package/es/businessModel/SalesModel/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/es/components/Sales/Event/Detail.js

@@ -237,8 +237,9 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
       return v.value === id;
     })) === null || _bookingOptions$filte === void 0 ? void 0 : _bookingOptions$filte[0];
     var setSelectedData = function setSelectedData(data) {
+      var _detailRef$current4;
       _setDetail({
-        introduction: _objectSpread(_objectSpread({}, introduction), {}, {
+        introduction: _objectSpread(_objectSpread({}, (detailRef === null || detailRef === void 0 || (_detailRef$current4 = detailRef.current) === null || _detailRef$current4 === void 0 ? void 0 : _detailRef$current4.introduction) || {}), {}, {
           price: data === null || data === void 0 ? void 0 : data.price,
           origin_price: data === null || data === void 0 ? void 0 : data.original_price
         }),
@@ -249,10 +250,10 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
 
     // 普通商品需要单独查询商品详情
     if ((option === null || option === void 0 || (_option$_originData = option._originData) === null || _option$_originData === void 0 ? void 0 : _option$_originData.is_eject) === 0) {
-      var _introduction$_origin;
+      var _eventRef$current;
       getProductDetailRequest.runAsync(id, {
         open_deposit: 1,
-        front_end_cache_id: (introduction === null || introduction === void 0 || (_introduction$_origin = introduction._originData) === null || _introduction$_origin === void 0 ? void 0 : _introduction$_origin.id) + '_' + id
+        front_end_cache_id: (eventRef === null || eventRef === void 0 || (_eventRef$current = eventRef.current) === null || _eventRef$current === void 0 ? void 0 : _eventRef$current.id) + '_' + id
       }).then(function (res) {
         var _res$data2;
         // 定金相关信息

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[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

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

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

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

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

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

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

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

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

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

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

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

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

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

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/service/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
 export default Lists;

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

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

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

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

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

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

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

package/es/components/booking/info/service2/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

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

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

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

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

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

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

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

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

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/eftpos/surcharge/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.css';
 /**
  * @title: 自定义组件设置

package/es/components/eftposPay/amount.d.ts

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/app.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PosProps, RouteType } from './const';
 declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
     action: RouteType;

package/es/components/eftposPay/device.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PayProps, PosProps } from './const';
 import './device.less';
 /**
@@ -10,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/hooks.d.ts

@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PosProps } from './const';
 import './index.less';
 declare const _default: (props: PosProps) => JSX.Element | null;

package/es/components/eftposPay/linkly/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Linkly: ({ api, onChange }: any) => JSX.Element;
 export default Linkly;

package/es/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "loading" | "warn" | "success" | "fail" | "question";
     };
 };
 /**
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.d.ts

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

package/es/components/eventBooking/components/Provider/Cart/Item/Total.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare type CallToBookProps = {
     show: boolean;
     type: string;

package/es/components/eventBooking/components/scheduleCalendar/calendarItem.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem } from '../../type';
 declare type CalendarItemProps = {
     month: string;

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

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

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

@@ -11,11 +11,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useImperativeHandle, forwardRef, useContext } from 'react';
 import { PisellModal } from '@pisell/materials';
 import ThreedsLoading from "../MWCreditCard/TDSPay/ThreedsLoading";
+import PaymentReturnContent from "../components/PaymentReturnContent";
 import { Context } from "../../model";
 import { locales } from '@pisell/utils';
 import { getPayGroupParamsFromStorage } from "../../payGroup";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import usePaymentLogger from "../../../../../hooks/usePaymentLogger";
+import { usePaymentRedirect } from "../hooks";
 import "./index.less";
 import { formatFranchiseeRoute } from "../../utils";
 /**
@@ -28,7 +30,7 @@ import { formatFranchiseeRoute } from "../../utils";
  * @Date: 2024-08-16 10:58
  */
 var ApplePay = function ApplePay(props, ref) {
-  var _context$appHelper, _state$payGroup;
+  var _context$appHelper, _state$payGroup, _state$payGroup2, _state$payGroup4;
   var _useContext = useContext(Context),
     state = _useContext.state;
   var _useState = useState(false),
@@ -45,6 +47,15 @@ var ApplePay = function ApplePay(props, ref) {
     step: '2'
   });
 
+  // 使用支付跳转 hooks
+  var _usePaymentRedirect = usePaymentRedirect({
+      orderId: (_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.order_id,
+      paymentType: 'applePay'
+    }),
+    isReturned = _usePaymentRedirect.isReturned,
+    handleRedirect = _usePaymentRedirect.handleRedirect,
+    resetState = _usePaymentRedirect.resetState;
+
   /**
    * @title: 初始化
    * @description:
@@ -56,7 +67,7 @@ var ApplePay = function ApplePay(props, ref) {
   var init = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var _utils$getStore;
-      var payGroup, utils, dvaStore, values, _dvaStore$core, _dvaStore$core2, _state$payGroup2, locale, shopId, currentURL, linkElement, shop_domain, _href;
+      var payGroup, utils, dvaStore, values, _dvaStore$core, _dvaStore$core2, _state$payGroup3, locale, shopId, currentURL, linkElement, shop_domain, _href;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -95,43 +106,50 @@ var ApplePay = function ApplePay(props, ref) {
               key: 'ApplePay获取支付参数成功',
               value: ""
             });
-            try {
-              // 语言
-              locale = ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en'; // 店铺id
-              shopId = (_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.shop) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.id; // 当前url
-              currentURL = window.location.href; // 创建一个a元素，用于解析URL
-              linkElement = document.createElement('a');
-              linkElement.href = currentURL;
+            _context.prev = 12;
+            // 语言
+            locale = ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en'; // 店铺id
+            shopId = (_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.shop) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.id; // 当前url
+            currentURL = window.location.href; // 创建一个a元素，用于解析URL
+            linkElement = document.createElement('a');
+            linkElement.href = currentURL;
+
+            // 提取域名
+            shop_domain = linkElement.hostname;
+            _href = "".concat(config.pay).concat(formatFranchiseeRoute("/apple-pay?order_id=".concat((_state$payGroup3 = state.payGroup) === null || _state$payGroup3 === void 0 ? void 0 : _state$payGroup3.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id, "&front_order_uuid=").concat(state.front_order_uuid), state.history)); // 记录即将跳转到ApplePay
+            paymentLogger.addLog({
+              key: 'ApplePay准备跳转',
+              value: ""
+            });
+            paymentLogger.sendLogs('ApplePay跳转成功');
 
-              // 提取域名
-              shop_domain = linkElement.hostname;
-              _href = "".concat(config.pay).concat(formatFranchiseeRoute("/apple-pay?order_id=".concat((_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id), state.history)); // 记录即将跳转到ApplePay
-              paymentLogger.addLog({
-                key: 'ApplePay准备跳转',
-                value: ""
-              });
-              paymentLogger.sendLogs('ApplePay跳转成功');
-              window.location.href = _href;
-            } catch (err) {
-              // 记录ApplePay处理错误
-              paymentLogger.addLog({
-                key: 'ApplePay处理错误',
-                value: {
-                  title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " ApplePay\u5904\u7406\u5931\u8D25: ").concat((err === null || err === void 0 ? void 0 : err.message) || '未知错误'),
-                  data: {
-                    payGroup: payGroup,
-                    values: values
-                  }
+            // 使用 hooks 提供的跳转方法
+            _context.next = 24;
+            return handleRedirect(_href);
+          case 24:
+            _context.next = 31;
+            break;
+          case 26:
+            _context.prev = 26;
+            _context.t0 = _context["catch"](12);
+            // 记录ApplePay处理错误
+            paymentLogger.addLog({
+              key: 'ApplePay处理错误',
+              value: {
+                title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " ApplePay\u5904\u7406\u5931\u8D25: ").concat((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || '未知错误'),
+                data: {
+                  payGroup: payGroup,
+                  values: values
                 }
-              });
-              paymentLogger.sendLogs('ApplePay处理失败', err);
-              setOpen(false);
-            }
-          case 13:
+              }
+            });
+            paymentLogger.sendLogs('ApplePay处理失败', _context.t0);
+            setOpen(false);
+          case 31:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[12, 26]]);
     }));
     return function init(_x) {
       return _ref3.apply(this, arguments);
@@ -142,6 +160,10 @@ var ApplePay = function ApplePay(props, ref) {
       init: init
     };
   });
+  var handleReturn = function handleReturn() {
+    setOpen(false);
+    resetState();
+  };
   return /*#__PURE__*/React.createElement(PisellModal, {
     platform: 'h5',
     open: open,
@@ -153,8 +175,19 @@ var ApplePay = function ApplePay(props, ref) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: ""
-  }, /*#__PURE__*/React.createElement(ThreedsLoading, {
+  }, !isReturned &&
+  /*#__PURE__*/
+  // 跳转前展示 Loading
+  React.createElement(ThreedsLoading, {
     title: locales.getText('tocPay.text.connectingApplePay')
+  }), isReturned &&
+  /*#__PURE__*/
+  // 跳转后返回时展示新组件内容
+  React.createElement(PaymentReturnContent, {
+    handleReturn: handleReturn,
+    state: state,
+    orderId: (_state$payGroup4 = state.payGroup) === null || _state$payGroup4 === void 0 ? void 0 : _state$payGroup4.order_id,
+    unique_payment_number: state === null || state === void 0 ? void 0 : state.front_order_uuid
   })));
 };
 export default /*#__PURE__*/forwardRef(ApplePay);