@pisell/private-materials 3.0.183 → 3.0.185

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/booking/info/utils.js

@@ -88,6 +88,6 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087];
+  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726];
   return booking4Shops.includes(shopId);
 };

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

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => any;
+declare const Notes: any;
 export default Notes;

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/index.js

@@ -111,6 +111,8 @@ var TDSPay = function TDSPay(props, ref) {
             payCallback === null || payCallback === void 0 ? void 0 : payCallback({
               key: 'fail',
               data: {
+                res: res,
+                fn: '_fastPayNew1',
                 message: locales.getText('tocPay.text.getParamsFail')
               }
             });
@@ -149,7 +151,11 @@ var TDSPay = function TDSPay(props, ref) {
             // 失败
             payCallback === null || payCallback === void 0 ? void 0 : payCallback({
               key: 'fail',
-              data: _context2.t0
+              data: {
+                res: res,
+                fn: '_fastPayNew2',
+                message: locales.getText('tocPay.text.getParamsFail')
+              }
             });
           case 17:
           case "end":
@@ -187,7 +193,9 @@ var TDSPay = function TDSPay(props, ref) {
       payCallback === null || payCallback === void 0 ? void 0 : payCallback({
         key: 'fail',
         data: {
-          message: locales.getText('tocPay.text.getParamsFail')
+          _cardInfo: _cardInfo,
+          message: locales.getText('tocPay.text.getParamsFail'),
+          fn: 'newCardPay'
         }
       });
       return;

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

@@ -8,6 +8,8 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 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 { request } from "../../../../../utils";
+import dayjs from 'dayjs';
+import { sendWarningLog } from '@pisell/utils';
 import { PisellToast } from '@pisell/materials';
 import { setPayNumber } from "../../payGroup";
 var REACT_APP_API_ENV = process.env.REACT_APP_API_ENV;
@@ -29,7 +31,21 @@ var paymentInfo = {
 var paymentData = {};
 var postmessageUrl = 'merchantwarrior';
 var log = function log(data) {
-  // warningLog('tds2', data);
+  var _template = {
+    module: module,
+    contents: {
+      path: location.href,
+      data: data,
+      date: dayjs().format('YYYY-MM-DD HH:mm')
+    }
+  };
+  sendWarningLog({
+    title: '3ds支付失败',
+    content: [{
+      key: 'res',
+      value: JSON.stringify(_template)
+    }]
+  });
 };
 
 /**

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

@@ -78,7 +78,12 @@ var PaymentMethods = function PaymentMethods(props, ref) {
             _context.prev = 10;
             _context.t0 = _context["catch"](4);
             return _context.abrupt("return", props.payCallback({
-              key: 'fail'
+              key: 'fail',
+              data: {
+                err: _context.t0,
+                payGroup: payGroup,
+                fn: 'init'
+              }
             }));
           case 13:
             if (!(waitAmount <= 0)) {

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

@@ -221,7 +221,11 @@ var ToCPay = function ToCPay(props, ref) {
             console.log('err', _context2.t0);
             payCallback({
               key: 'fail',
-              data: {}
+              data: {
+                err: _context2.t0,
+                order: order,
+                fn: '_getPaymentsAndWalletPass'
+              }
             });
           case 15:
           case "end":
@@ -319,7 +323,11 @@ var ToCPay = function ToCPay(props, ref) {
             setSubmitLoading(false);
             payCallback({
               key: 'fail',
-              data: {}
+              data: {
+                err: _context4.t0,
+                orderId: orderId,
+                fn: 'paymentInit'
+              }
             });
           case 14:
           case "end":

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

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => any;
+declare const Schedules: (props: any) => JSX.Element;
 export default Schedules;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,7 +68,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/info/utils.js

@@ -83,7 +83,7 @@ var isBooking4Shop = (shopId, renderType) => {
   if (renderType === "eventBooking") {
     return false;
   }
-  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087];
+  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726];
   return booking4Shops.includes(shopId);
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/booking/notes/index.d.ts

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => any;
+declare const Notes: any;
 export default Notes;

package/lib/components/booking/notes/model.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/payments/model.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/index.js

@@ -72,7 +72,11 @@ var TDSPay = (props, ref) => {
       if (!params) {
         payCallback == null ? void 0 : payCallback({
           key: "fail",
-          data: { message: import_utils.locales.getText("tocPay.text.getParamsFail") }
+          data: {
+            res,
+            fn: "_fastPayNew1",
+            message: import_utils.locales.getText("tocPay.text.getParamsFail")
+          }
         });
         return;
       }
@@ -88,7 +92,14 @@ var TDSPay = (props, ref) => {
         (0, import_tds2.startPayment)({ payData: data }, payCallback);
       }
     } catch (e) {
-      payCallback == null ? void 0 : payCallback({ key: "fail", data: e });
+      payCallback == null ? void 0 : payCallback({
+        key: "fail",
+        data: {
+          res,
+          fn: "_fastPayNew2",
+          message: import_utils.locales.getText("tocPay.text.getParamsFail")
+        }
+      });
     }
   };
   const newCardPay = (res) => {
@@ -108,7 +119,11 @@ var TDSPay = (props, ref) => {
     if (!_cardInfo) {
       payCallback == null ? void 0 : payCallback({
         key: "fail",
-        data: { message: import_utils.locales.getText("tocPay.text.getParamsFail") }
+        data: {
+          _cardInfo,
+          message: import_utils.locales.getText("tocPay.text.getParamsFail"),
+          fn: "newCardPay"
+        }
       });
       return;
     }

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/pay/toC/PaymentMethods/MWCreditCard/tds2.tsx
@@ -29,6 +39,8 @@ __export(tds2_exports, {
 });
 module.exports = __toCommonJS(tds2_exports);
 var import_utils = require("../../../../../utils");
+var import_dayjs = __toESM(require("dayjs"));
+var import_utils2 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_payGroup = require("../../payGroup");
 var { REACT_APP_API_ENV } = process.env;
@@ -50,6 +62,18 @@ var paymentInfo = {
 var paymentData = {};
 var postmessageUrl = "merchantwarrior";
 var log = (data) => {
+  let _template = {
+    module,
+    contents: {
+      path: location.href,
+      data,
+      date: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm")
+    }
+  };
+  (0, import_utils2.sendWarningLog)({
+    title: "3ds支付失败",
+    content: [{ key: "res", value: JSON.stringify(_template) }]
+  });
 };
 var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
   let paymentInfo2 = {

package/lib/components/pay/toC/PaymentMethods/index.js

@@ -94,7 +94,12 @@ var PaymentMethods = (props, ref) => {
         });
       } catch (err) {
         return props.payCallback({
-          key: "fail"
+          key: "fail",
+          data: {
+            err,
+            payGroup,
+            fn: "init"
+          }
         });
       }
     }

package/lib/components/pay/toC/index.js

@@ -134,7 +134,14 @@ var ToCPay = (props, ref) => {
       }, 100);
     } catch (err) {
       console.log("err", err);
-      payCallback({ key: "fail", data: {} });
+      payCallback({
+        key: "fail",
+        data: {
+          err,
+          order,
+          fn: "_getPaymentsAndWalletPass"
+        }
+      });
     }
   };
   const handlePaymentByType = async (type, payGroup) => {
@@ -173,7 +180,14 @@ var ToCPay = (props, ref) => {
       };
     } catch (err) {
       setSubmitLoading(false);
-      payCallback({ key: "fail", data: {} });
+      payCallback({
+        key: "fail",
+        data: {
+          err,
+          orderId,
+          fn: "paymentInit"
+        }
+      });
     }
   };
   const waitAmount = (0, import_react.useMemo)(() => {

package/lib/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => any;
+declare const Schedules: (props: any) => JSX.Element;
 export default Schedules;

package/lib/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,7 +68,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.183",
+  "version": "3.0.185",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,9 +60,9 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
-    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "1.0.100",
-    "@pisell/materials": "3.0.52"
+    "@pisell/materials": "3.0.52",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",