@pisell/private-materials 6.5.11 → 6.5.13

package/es/components/eftposPay/linkly/hooks/useTimeQuery.js

@@ -4,13 +4,14 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { useRef } from 'react';
 import { getUniqueId, locales, sendWarningLog } from '@pisell/utils';
+import dayjs from 'dayjs';
 import { useDispatch, updateCustom, updateStatus, updateState } from "../../store";
 import { useFail, useStoreRef } from "../../hooks";
 import { ModeEnum, PayStatus, StatusEnum } from "../../const";
 import { LinklyActionStatus } from "../const";
 
 // 全局超时时间
-var GlobalTimeout = 1000 * 60;
+var GlobalTimeout = 1000 * 60 * 2;
 // 单次请求超时时间
 var RequestTimeout = 1000 * 5;
 export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, handleLinklySuccess) {
@@ -18,7 +19,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
   var _useStoreRef = useStoreRef(),
     numRef = _useStoreRef.numRef,
     modeRef = _useStoreRef.modeRef,
-    deviceRef = _useStoreRef.deviceRef;
+    deviceRef = _useStoreRef.deviceRef,
+    orderIdRef = _useStoreRef.orderIdRef;
   var fail = useFail(0);
   var failRef = useRef(fail);
   var isPay = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay;
@@ -82,22 +84,31 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 console.log('Success: 全局超时或不需要处理结果，终止查询');
                 return;
               }
-              _log("Success", result);
               isQueryFinishedRef.current = true;
               var data = (result === null || result === void 0 ? void 0 : result.data) || {};
               // 交易成功，终止查询
-              if (data.status === 1) {
+              if (data.status == 1) {
                 console.log('交易成功，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u6210\u529F"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
+                });
                 reset();
                 handleLinklySuccess(result);
                 return;
               }
 
               // 交易状态为0，且不需要签名，则继续查询
-              if (data.status !== undefined && (data === null || data === void 0 ? void 0 : data.status) === 0) {
+              if ((data === null || data === void 0 ? void 0 : data.status) == 0 && (data === null || data === void 0 ? void 0 : data.signature_flag) != 1) {
                 console.log('交易状态为0需要继续查询');
+                _log("Querying", result);
                 isQueryFinishedRef.current = false;
-                _resultQuery();
+                setTimeout(function () {
+                  _resultQuery();
+                }, 1500);
                 return;
               }
 
@@ -105,6 +116,13 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               if (data.status < 0) {
                 var _failRef$current;
                 console.log('交易失败，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u5931\u8D25"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
+                });
                 reset();
                 // 交易失败，code码转换为支付失败code码
                 result.code = PayStatus.Unknown;
@@ -113,8 +131,15 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               }
 
               // 需要签名
-              if (data.signature_flag === 1) {
+              if (data.signature_flag == 1) {
                 console.log('交易需要签名，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u9700\u8981\u7B7E\u540D"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
+                });
                 reset();
                 gotoSignature();
                 return;
@@ -132,7 +157,20 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 _log("AbortError");
                 console.log('Error: 请求被取消，将继续查询');
                 isQueryFinishedRef.current = false;
-                _resultQuery();
+                setTimeout(function () {
+                  _resultQuery();
+                }, 1500);
+                return;
+              }
+
+              // 网关类报错，继续查询
+              if (!(error !== null && error !== void 0 && error.code) || "".concat(error.code) === PayStatus.Timeout) {
+                _log("NetworkError");
+                console.log('Error: 网关类报错，将继续查询');
+                isQueryFinishedRef.current = false;
+                setTimeout(function () {
+                  _resultQuery();
+                }, 1500);
                 return;
               }
               _log("Error", error);
@@ -222,33 +260,36 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
       session_id: numRef.current
     };
     var content = [{
-      key: 'queryId',
-      value: JSON.stringify(queryIdRef.current)
+      key: 'description',
+      value: JSON.stringify({
+        queryId: queryIdRef.current,
+        orderId: orderIdRef.current,
+        type: type,
+        date: dayjs().format('YYYY-MM-DD HH:mm:ss')
+      })
     }, {
       key: 'params',
       value: JSON.stringify(params)
     }];
-    if (type === "Success") {
+    if (type === "Error") {
       content.push({
-        key: 'response',
+        key: 'error',
         value: JSON.stringify(res)
       });
-    } else if (type === "Error") {
+    } else {
       content.push({
-        key: 'error',
+        key: 'response',
         value: JSON.stringify(res)
       });
     }
     sendWarningLog({
-      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u7ED3\u679C\u67E5\u8BE2--").concat(type),
+      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u7ED3\u679C\u8F6E\u8BE2"),
       content: content
     });
   };
   var run = function run() {
     // 重置状态
     reset();
-    console.log('开始查询linkly结果---->>>>>>>');
-    _log("Start");
 
     // 设置全局超时定时器
     globalTimeoutIdRef.current = setTimeout(function () {
@@ -264,6 +305,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
     startTimeRef.current = Date.now();
     isQueryFinishedRef.current = false;
     queryIdRef.current = getUniqueId();
+    console.log('开始查询linkly结果---->>>>>>>');
+    _log("Start");
     return _resultQuery();
   };
   return {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**

package/es/components/eftposPay/payo/config.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StatusEnum } from '../const';
 export declare const POS: ({ api, onChange, }: {
     api: {

package/es/components/eftposPay/payo/config.js

@@ -152,15 +152,15 @@ export var POS = function POS(_ref) {
     controllerRef.current = new AbortController();
     // 支付 or 退款
     var resultPromise = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay ? api.pay(_objectSpread(_objectSpread({}, custom !== null && custom !== void 0 && custom.platform ? {
-      "operator_id": custom.operator_id,
-      "operator_type": custom.operator_type,
-      "platform": custom.platform,
-      "custom_payment_id": custom.custom_payment_id,
-      "service_charge": {
-        "amount": payRef.current.surMoney,
-        "percentage": payRef.current.surPercentRate
+      operator_id: custom.operator_id,
+      operator_type: custom.operator_type,
+      platform: custom.platform,
+      custom_payment_id: custom.custom_payment_id,
+      service_charge: {
+        amount: payRef.current.surMoney,
+        percentage: payRef.current.surPercentRate
       },
-      "original_amount": payRef.current.amount
+      original_amount: payRef.current.amount
     } : {}), {}, {
       order_id: orderIdRef.current,
       amount: payRef.current.total,
@@ -199,8 +199,8 @@ export var POS = function POS(_ref) {
       if (unloadRef.current || !netRef.current) {
         return;
       }
-      // 支付接口超时 进行支付状态查询
-      if (err && "".concat(err.code) === PayStatus.Timeout) {
+      // 支付接口超时 进行支付状态查询（超时或者其它错误）
+      if (!(err !== null && err !== void 0 && err.code) || "".concat(err.code) === PayStatus.Timeout) {
         checkApi();
         return;
       }

package/es/components/eftposPay/serve.js

@@ -232,7 +232,7 @@ export var linklyPayQuery = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee15$(_context15) {
       while (1) switch (_context15.prev = _context15.next) {
         case 0:
-          return _context15.abrupt("return", request.getRequest().get('/shop/shop/linkly/pay/query', params, config));
+          return _context15.abrupt("return", request.getRequest().get('/shop/linkly/pay/query', params, config));
         case 1:
         case "end":
           return _context15.stop();

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: "success" | "warn" | "loading" | "fail" | "question";
     };
 };
 /**
@@ -295,20 +295,20 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
+        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
         subTitle?: string | undefined;
-        type?: "unset" | "step" | undefined;
+        type?: "step" | "unset" | undefined;
         render?: boolean | undefined;
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './tip.less';
 /**
  * @title: 支付状态未知页面

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/es/components/eftposPay/windcave/receiptAction.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 按钮操作区
  * @description: 仅包含签名

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ api, onChange, formatAmount, }: {
     api: any;
     onChange: any;

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

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

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

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

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

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

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

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

package/es/components/eventBooking/components/Provider/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/eventBooking/components/Provider/EmptyHolderModal/index.d.ts

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

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

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

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

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

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

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

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

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

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

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

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

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

package/es/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts

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

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

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

package/es/components/eventBooking/components/Provider/SelectHolderModal.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts

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

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

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

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

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts

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

package/es/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const BookingOptions: (props: {
     onChangeBookingOption?: ((bookingOption: any) => void) | undefined;
 }) => JSX.Element;

package/es/components/eventBooking/components/bookingDetailModal/components/Resource.d.ts

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

package/es/components/eventBooking/components/bookingDetailModal/components/Schedule.d.ts

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare type Item = any;
 interface ProductItemProps {

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

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

package/es/components/index.d.ts

@@ -17,4 +17,6 @@ import PisellSelectCustomerModal from './pisellSelectCustomerModal';
 import SubTotal from './subTotal';
 import EditBookingModal from './booking/editBookingModal';
 import StepController from './stepController';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController };
+import PinModal from './pinModal';
+import PinVerifyModal from './pinVerifyModal';
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, };

package/es/components/index.js

@@ -17,4 +17,6 @@ import PisellSelectCustomerModal from "./pisellSelectCustomerModal";
 import SubTotal from "./subTotal";
 import EditBookingModal from "./booking/editBookingModal";
 import StepController from "./stepController";
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController };
+import PinModal from "./pinModal";
+import PinVerifyModal from "./pinVerifyModal";
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal };

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

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

package/es/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -262,7 +262,9 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
           }
           return _context3.abrupt("return", defaultReturnParams);
         case 5:
-          displayBox = document.getElementById('threeds-container'); // 创建iframe
+          displayBox = document.getElementById('threeds-container'); // 清空dom中的内容
+          displayBox.innerHTML = '';
+          // 创建iframe
           iframe = document.createElement('iframe'); // iframe.src = "about:blank";
           iframe.classList.add('hidden_TDS_From');
           iframe.name = 'threeDSMethodIframe';
@@ -315,7 +317,7 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
               }
             }, false);
           }));
-        case 27:
+        case 28:
         case "end":
           return _context3.stop();
       }
@@ -436,7 +438,8 @@ export var checkTDSAuth = /*#__PURE__*/function () {
  */
 export var createChallengeIframe = function createChallengeIframe(challengeData, callback) {
   var displayBox = document.getElementById('threeds-container');
-
+  // 清空dom中的内容
+  displayBox.innerHTML = '';
   // 创建iframe
   var iframe = document.createElement('iframe');
   iframe.classList.add('tdsv2challengeIframe');

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts

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

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts

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

package/es/components/pay/toC/PaymentMethods/WalletPass/List/index.d.ts

@@ -11,6 +11,8 @@ export interface WalletPassListProps {
         name: string;
     };
     onChangeDebounce?: boolean;
+    loading?: boolean;
+    onLoadingChange?: (loading: boolean) => void;
 }
 export declare type WalletPassListRef = {
     init: (params: MachineCodeListParams, formatList?: (val: WalletPassDataType[]) => WalletPassDataType[]) => void;