@pisell/private-materials 6.2.6 → 6.2.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/lowcode/assets-daily.json +11 -11
- package/build/lowcode/assets-dev.json +2 -2
- package/build/lowcode/assets-prod.json +11 -11
- package/build/lowcode/meta.js +1 -1
- package/build/lowcode/render/default/view.css +1 -1
- package/build/lowcode/render/default/view.js +7 -7
- package/build/lowcode/view.css +1 -1
- package/build/lowcode/view.js +7 -7
- package/es/components/Sales/Summary/utils.d.ts +1 -1
- package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts +1 -0
- package/es/components/appointmentBooking/components/Cart/Item/index.d.ts +1 -0
- package/es/components/appointmentBooking/components/Cart/index.d.ts +1 -0
- package/es/components/appointmentBooking/components/Deposit/index.d.ts +1 -0
- package/es/components/appointmentBooking/components/Footer/index.d.ts +1 -0
- package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +1 -0
- package/es/components/appointmentBooking/components/Voucher/index.d.ts +1 -0
- package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +1 -0
- package/es/components/appointmentBooking/deposit/index.d.ts +1 -0
- package/es/components/appointmentBooking/index.d.ts +1 -0
- package/es/components/booking/components/TabProduct/index.d.ts +1 -0
- package/es/components/booking/components/TabProduct/productItem/index.d.ts +1 -0
- package/es/components/booking/components/footer/index.d.ts +1 -0
- package/es/components/booking/components/reloadResourceModal/index.d.ts +1 -0
- package/es/components/booking/components/voucher/index.d.ts +1 -0
- package/es/components/booking/deposit/index.d.ts +1 -0
- package/es/components/booking/forms/footer.d.ts +1 -0
- package/es/components/booking/forms/sendModal/useSendModal.d.ts +1 -0
- package/es/components/booking/forms/single/index.d.ts +1 -0
- package/es/components/booking/hooks/useClearCart.d.ts +1 -0
- package/es/components/booking/info/addServiceVariant/index.d.ts +1 -0
- package/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts +1 -0
- package/es/components/booking/info/date/index.d.ts +1 -0
- package/es/components/booking/info/dateRange/index.d.ts +1 -0
- package/es/components/booking/info/hooks/useInfoHolder.d.ts +1 -0
- package/es/components/booking/info/index.d.ts +1 -0
- package/es/components/booking/info/notes/index.d.ts +1 -0
- package/es/components/booking/info/service/Lists.d.ts +1 -0
- package/es/components/booking/info/service/actions/index.d.ts +1 -0
- package/es/components/booking/info/service/addService/index.d.ts +1 -0
- package/es/components/booking/info/service/addTimeModal/index.d.ts +1 -0
- package/es/components/booking/info/service/editService/BookingList/index.d.ts +1 -0
- package/es/components/booking/info/service/serviceItem/index.d.ts +1 -0
- package/es/components/booking/info/service/serviceList/index.d.ts +1 -0
- package/es/components/booking/info/service2/Lists.d.ts +1 -0
- package/es/components/booking/info/utils.js +1 -1
- package/es/components/booking/info2/service/actions/index.d.ts +1 -0
- package/es/components/booking/info2/service/addService/index.d.ts +1 -0
- package/es/components/booking/info2/service/addTimeModal/index.d.ts +1 -0
- package/es/components/booking/info2/service/serviceItem/index.d.ts +1 -0
- package/es/components/booking/info2/service/serviceList/index.d.ts +1 -0
- package/es/components/booking/materiels/duration/index.d.ts +1 -0
- package/es/components/booking/materiels/holder/index.d.ts +1 -0
- package/es/components/booking/materiels/startTime/index.d.ts +1 -0
- package/es/components/eftposPay/amount.d.ts +1 -1
- package/es/components/eftposPay/device.d.ts +1 -1
- package/es/components/eftposPay/hooks.d.ts +1 -1
- package/es/components/eftposPay/store/index.d.ts +3 -3
- package/es/components/eventBooking/components/ErrorTip/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Cart/Item/Total.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Cart/Item/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Cart/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Event/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Footer/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Information/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Resource/index.d.ts +1 -0
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts +1 -0
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +1 -0
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +1 -0
- package/es/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +1 -0
- package/es/components/eventBooking/components/scheduleCalendar/calendarItem.d.ts +1 -0
- package/es/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +1 -0
- package/es/components/pay/toC/PaymentMethods/GlobePayAliPayH5/index.js +18 -3
- package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.d.ts +1 -2
- package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.js +7 -2
- package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.less +8 -0
- package/es/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js +44 -18
- package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +1 -0
- package/es/components/pay/toC/PaymentMethods/SuperPayAliPayH5/index.js +18 -3
- package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +1 -0
- package/es/components/pay/toC/locales.d.ts +3 -0
- package/es/components/pay/toC/locales.js +3 -0
- package/es/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +1 -0
- package/es/components/pisellSelectCustomerModal/index.d.ts +1 -0
- package/es/components/productExtension/fields/Actor/index.d.ts +1 -0
- package/es/components/productExtension/fields/Forms/index.d.ts +1 -0
- package/es/components/productExtension/fields/SelectProducts/index.d.ts +1 -0
- package/es/components/productExtension/index.d.ts +1 -0
- package/es/components/productSelect/components/TabProduct/index.d.ts +1 -0
- package/es/components/productSelect/components/productGroup/index.d.ts +1 -0
- package/es/components/shoppingCart/components/Cart/Product.d.ts +1 -0
- package/es/components/shoppingCart/components/Cart/index.d.ts +1 -0
- package/es/components/shoppingCart/hooks/useAddService.d.ts +1 -0
- package/es/components/shoppingCart/hooks/useClearCart.d.ts +1 -0
- package/es/components/ticketBooking/components/addServiceVariant/addService.d.ts +1 -0
- package/es/components/ticketBooking/components/ticketBooking/index.d.ts +1 -0
- package/es/components/ticketBooking/components/timeBar/index.d.ts +1 -0
- package/es/components/ticketBooking/index.d.ts +1 -0
- package/es/components/workSpaceList/components/Modal/index.d.ts +1 -0
- package/es/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts +1 -0
- package/lib/components/Sales/Summary/utils.d.ts +1 -1
- package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Cart/index.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Deposit/index.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Footer/index.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Voucher/index.d.ts +1 -0
- package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +1 -0
- package/lib/components/appointmentBooking/deposit/index.d.ts +1 -0
- package/lib/components/appointmentBooking/index.d.ts +1 -0
- package/lib/components/booking/components/TabProduct/index.d.ts +1 -0
- package/lib/components/booking/components/TabProduct/productItem/index.d.ts +1 -0
- package/lib/components/booking/components/footer/index.d.ts +1 -0
- package/lib/components/booking/components/reloadResourceModal/index.d.ts +1 -0
- package/lib/components/booking/components/voucher/index.d.ts +1 -0
- package/lib/components/booking/deposit/index.d.ts +1 -0
- package/lib/components/booking/forms/footer.d.ts +1 -0
- package/lib/components/booking/forms/sendModal/useSendModal.d.ts +1 -0
- package/lib/components/booking/forms/single/index.d.ts +1 -0
- package/lib/components/booking/hooks/useClearCart.d.ts +1 -0
- package/lib/components/booking/info/addServiceVariant/index.d.ts +1 -0
- package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts +1 -0
- package/lib/components/booking/info/date/index.d.ts +1 -0
- package/lib/components/booking/info/dateRange/index.d.ts +1 -0
- package/lib/components/booking/info/hooks/useInfoHolder.d.ts +1 -0
- package/lib/components/booking/info/index.d.ts +1 -0
- package/lib/components/booking/info/notes/index.d.ts +1 -0
- package/lib/components/booking/info/service/Lists.d.ts +1 -0
- package/lib/components/booking/info/service/actions/index.d.ts +1 -0
- package/lib/components/booking/info/service/addService/index.d.ts +1 -0
- package/lib/components/booking/info/service/addTimeModal/index.d.ts +1 -0
- package/lib/components/booking/info/service/editService/BookingList/index.d.ts +1 -0
- package/lib/components/booking/info/service/serviceItem/index.d.ts +1 -0
- package/lib/components/booking/info/service/serviceList/index.d.ts +1 -0
- package/lib/components/booking/info/service2/Lists.d.ts +1 -0
- package/lib/components/booking/info/utils.js +2 -1
- package/lib/components/booking/info2/service/actions/index.d.ts +1 -0
- package/lib/components/booking/info2/service/addService/index.d.ts +1 -0
- package/lib/components/booking/info2/service/addTimeModal/index.d.ts +1 -0
- package/lib/components/booking/info2/service/serviceItem/index.d.ts +1 -0
- package/lib/components/booking/info2/service/serviceList/index.d.ts +1 -0
- package/lib/components/booking/materiels/duration/index.d.ts +1 -0
- package/lib/components/booking/materiels/holder/index.d.ts +1 -0
- package/lib/components/booking/materiels/startTime/index.d.ts +1 -0
- package/lib/components/eftposPay/amount.d.ts +1 -1
- package/lib/components/eftposPay/device.d.ts +1 -1
- package/lib/components/eftposPay/hooks.d.ts +1 -1
- package/lib/components/eftposPay/store/index.d.ts +3 -3
- package/lib/components/eventBooking/components/ErrorTip/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Cart/Item/Total.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Cart/Item/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Cart/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Event/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Footer/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Information/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Resource/index.d.ts +1 -0
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts +1 -0
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +1 -0
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +1 -0
- package/lib/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +1 -0
- package/lib/components/eventBooking/components/scheduleCalendar/calendarItem.d.ts +1 -0
- package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +1 -0
- package/lib/components/pay/toC/PaymentMethods/GlobePayAliPayH5/index.js +13 -1
- package/lib/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.d.ts +1 -2
- package/lib/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.js +2 -2
- package/lib/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.less +8 -0
- package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js +66 -47
- package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +1 -0
- package/lib/components/pay/toC/PaymentMethods/SuperPayAliPayH5/index.js +13 -1
- package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +1 -0
- package/lib/components/pay/toC/locales.d.ts +3 -0
- package/lib/components/pay/toC/locales.js +3 -0
- package/lib/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +1 -0
- package/lib/components/pisellSelectCustomerModal/index.d.ts +1 -0
- package/lib/components/productExtension/fields/Actor/index.d.ts +1 -0
- package/lib/components/productExtension/fields/Forms/index.d.ts +1 -0
- package/lib/components/productExtension/fields/SelectProducts/index.d.ts +1 -0
- package/lib/components/productExtension/index.d.ts +1 -0
- package/lib/components/productSelect/components/TabProduct/index.d.ts +1 -0
- package/lib/components/productSelect/components/productGroup/index.d.ts +1 -0
- package/lib/components/shoppingCart/components/Cart/Product.d.ts +1 -0
- package/lib/components/shoppingCart/components/Cart/index.d.ts +1 -0
- package/lib/components/shoppingCart/hooks/useAddService.d.ts +1 -0
- package/lib/components/shoppingCart/hooks/useClearCart.d.ts +1 -0
- package/lib/components/ticketBooking/components/addServiceVariant/addService.d.ts +1 -0
- package/lib/components/ticketBooking/components/ticketBooking/index.d.ts +1 -0
- package/lib/components/ticketBooking/components/timeBar/index.d.ts +1 -0
- package/lib/components/ticketBooking/index.d.ts +1 -0
- package/lib/components/workSpaceList/components/Modal/index.d.ts +1 -0
- package/lib/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts +1 -0
- package/package.json +2 -2
@@ -9,7 +9,7 @@ import { PosProps } from './const';
|
|
9
9
|
*/
|
10
10
|
declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
|
11
11
|
className?: string | undefined;
|
12
|
-
onChange?: ((status: "
|
12
|
+
onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
|
13
13
|
[keys: string]: unknown;
|
14
14
|
} | undefined, other?: any) => void) | undefined;
|
15
15
|
onClose: () => void;
|
@@ -11,7 +11,7 @@ import './device.less';
|
|
11
11
|
declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
|
12
12
|
api: PayProps['api'];
|
13
13
|
className?: string | undefined;
|
14
|
-
onChange?: ((status: "
|
14
|
+
onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
|
15
15
|
[keys: string]: unknown;
|
16
16
|
} | undefined, other?: any) => void) | undefined;
|
17
17
|
onClose: () => void;
|
@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
|
|
15
15
|
readonly numRef: React.MutableRefObject<string | number | undefined>;
|
16
16
|
readonly orderIdRef: React.MutableRefObject<string | number>;
|
17
17
|
readonly modeRef: React.MutableRefObject<ModeEnum>;
|
18
|
-
readonly statusRef: React.MutableRefObject<"
|
18
|
+
readonly statusRef: React.MutableRefObject<"warn" | "success" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
|
19
19
|
readonly netRef: React.MutableRefObject<boolean | undefined>;
|
20
20
|
readonly symbolRef: React.MutableRefObject<string>;
|
21
21
|
readonly amountRef: React.MutableRefObject<string | number>;
|
@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
|
|
174
174
|
export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
|
175
175
|
type: EActionTypes;
|
176
176
|
payload: {
|
177
|
-
status: "
|
177
|
+
status: "warn" | "success" | "loading" | "fail" | "question";
|
178
178
|
};
|
179
179
|
};
|
180
180
|
/**
|
@@ -295,7 +295,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
|
|
295
295
|
name?: string | undefined;
|
296
296
|
symbol?: string | undefined;
|
297
297
|
amount?: string | number | undefined;
|
298
|
-
mode?: "
|
298
|
+
mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
|
299
299
|
order_id?: string | number | undefined;
|
300
300
|
eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
|
301
301
|
action?: "amount" | "pay" | "deviceList" | undefined;
|
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
|
|
308
308
|
net?: boolean | undefined;
|
309
309
|
component?: string | undefined;
|
310
310
|
form?: string | undefined;
|
311
|
-
status?: "
|
311
|
+
status?: "warn" | "success" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
|
312
312
|
warn?: string | undefined;
|
313
313
|
steps?: {
|
314
314
|
/** 用于重置当前步骤 */
|
@@ -37,11 +37,14 @@ var import_materials = require("@pisell/materials");
|
|
37
37
|
var import_utils = require("@pisell/utils");
|
38
38
|
var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoading"));
|
39
39
|
var import_serve = require("./serve");
|
40
|
+
var import_model = require("../../model");
|
40
41
|
var import_payGroup = require("../../payGroup");
|
41
42
|
var import_index = require("./index.less");
|
42
43
|
var GlobePayAliPayH5 = (props, ref) => {
|
44
|
+
const { state } = (0, import_react.useContext)(import_model.Context);
|
43
45
|
const { onChange } = props;
|
44
46
|
const [open, setOpen] = (0, import_react.useState)(false);
|
47
|
+
const [showSuccessBackButton, setShowSuccessBackButton] = (0, import_react.useState)(false);
|
45
48
|
const init = async ({ payGroup }) => {
|
46
49
|
setOpen(true);
|
47
50
|
const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
|
@@ -54,6 +57,7 @@ var GlobePayAliPayH5 = (props, ref) => {
|
|
54
57
|
const url = data.url || (data == null ? void 0 : data.pay_url);
|
55
58
|
if (url) {
|
56
59
|
(0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
|
60
|
+
setShowSuccessBackButton(true);
|
57
61
|
window.location.href = url;
|
58
62
|
} else {
|
59
63
|
setOpen(false);
|
@@ -68,6 +72,12 @@ var GlobePayAliPayH5 = (props, ref) => {
|
|
68
72
|
init
|
69
73
|
})
|
70
74
|
);
|
75
|
+
const handleSuccessBack = () => {
|
76
|
+
var _a;
|
77
|
+
(_a = state.payCallback) == null ? void 0 : _a.call(state, {
|
78
|
+
key: "success"
|
79
|
+
});
|
80
|
+
};
|
71
81
|
return /* @__PURE__ */ import_react.default.createElement(
|
72
82
|
import_materials.PisellModal,
|
73
83
|
{
|
@@ -81,7 +91,9 @@ var GlobePayAliPayH5 = (props, ref) => {
|
|
81
91
|
/* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
|
82
92
|
import_ThreedsLoading.default,
|
83
93
|
{
|
84
|
-
title: import_utils.locales.getText("tocPay.text.redirectingToAlipay")
|
94
|
+
title: import_utils.locales.getText("tocPay.text.redirectingToAlipay"),
|
95
|
+
onSuccessBack: handleSuccessBack,
|
96
|
+
showSuccessBackButton
|
85
97
|
}
|
86
98
|
))
|
87
99
|
);
|
@@ -36,7 +36,7 @@ var import_react = __toESM(require("react"));
|
|
36
36
|
var import_useEngineContext = __toESM(require("../../../../../../../hooks/useEngineContext"));
|
37
37
|
var import_index = require("./index.less");
|
38
38
|
var import_utils = require("@pisell/utils");
|
39
|
-
var ThreedsLoading = ({ title }) => {
|
39
|
+
var ThreedsLoading = ({ title, showSuccessBackButton, onSuccessBack }) => {
|
40
40
|
var _a;
|
41
41
|
const context = (0, import_useEngineContext.default)();
|
42
42
|
const { config } = ((_a = context.appHelper) == null ? void 0 : _a.constants) || {};
|
@@ -47,6 +47,6 @@ var ThreedsLoading = ({ title }) => {
|
|
47
47
|
src: config.static + "/static/stripe_loading.gif",
|
48
48
|
alt: ""
|
49
49
|
}
|
50
|
-
), /* @__PURE__ */ import_react.default.createElement("div", { className: "threeds-loading-title" }, title || import_utils.locales.getText("tocPay.text.waitingForBankVerification")));
|
50
|
+
), /* @__PURE__ */ import_react.default.createElement("div", { className: "threeds-loading-title" }, title || import_utils.locales.getText("tocPay.text.waitingForBankVerification")), showSuccessBackButton && /* @__PURE__ */ import_react.default.createElement("div", { onClick: onSuccessBack, className: "threeds-loading-success-back-button" }, import_utils.locales.getText("tocPay.text.successBack")));
|
51
51
|
};
|
52
52
|
var ThreedsLoading_default = ThreedsLoading;
|
@@ -95,7 +95,10 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
|
|
95
95
|
if (step3 === "N") {
|
96
96
|
return;
|
97
97
|
}
|
98
|
-
const step4 = await checkTDSAuth(step2, step3);
|
98
|
+
const step4 = await checkTDSAuth(step2, step3, callback);
|
99
|
+
if (step4 === 0) {
|
100
|
+
return;
|
101
|
+
}
|
99
102
|
paymentData.step4 = step4;
|
100
103
|
if (step4) {
|
101
104
|
const step5 = await createChallengeIframe(step4, callback);
|
@@ -216,54 +219,70 @@ var createThreeDSMethodIframe = async (threeDSMethodData, callback) => {
|
|
216
219
|
});
|
217
220
|
};
|
218
221
|
var checkTDSAuth = async (step2, step3, callback) => {
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
let { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/tds_auth_pay", {
|
227
|
-
order_id,
|
228
|
-
pay_number,
|
229
|
-
mw_data: {
|
230
|
-
accessToken: pay_info.check_tds_auth.access_token,
|
231
|
-
method: "checkTDSAuth",
|
232
|
-
cardID: pay_info.check_tds_auth.card_id,
|
233
|
-
// paymentCardNumber: cardInfo.paymentCardNumber,
|
234
|
-
paymentCardExpiry: pay_info.check_tds_auth.card_expiry,
|
235
|
-
paymentCardName: pay_info.check_tds_auth.card_name,
|
236
|
-
// paymentCardCSC: cardInfo.paymentCardCSC,
|
237
|
-
customerName: pay_info.check_tds_auth.card_name,
|
238
|
-
transactionAmount: amount,
|
239
|
-
transactionCurrency: paymentInfo.transactionInfo.transactionCurrency,
|
240
|
-
transactionProduct: pay_info.check_tds_auth.product_name,
|
241
|
-
browserAcceptHeader: "*/*",
|
242
|
-
browserColorDepth: screen.colorDepth,
|
243
|
-
browserJavaEnabled: navigator.javaEnabled(),
|
244
|
-
browserJavascriptEnabled: true,
|
245
|
-
browserLanguage: navigator.language,
|
246
|
-
browserScreenHeight: screen.height,
|
247
|
-
browserScreenWidth: screen.width,
|
248
|
-
browserTZ: currentData.getTimezoneOffset(),
|
249
|
-
browserUserAgent: navigator.userAgent,
|
250
|
-
purchaseDate: "20220420165834",
|
251
|
-
billAddrCity: paymentInfo.billingAddress.billAddrCity,
|
252
|
-
billAddrCountry: paymentInfo.billingAddress.billAddrCountry,
|
253
|
-
billAddrLine1: paymentInfo.billingAddress.billAddrLine1,
|
254
|
-
billAddrPostCode: paymentInfo.billingAddress.billAddrPostCode,
|
255
|
-
billAddrState: paymentInfo.billingAddress.billAddrState,
|
256
|
-
threeDSCompInd: isPre ? "" : threeDSCompInd,
|
257
|
-
threeDSServerTransID: isPre ? "" : threeDSServerTransID,
|
258
|
-
threeDSRequestorAuthenticationInd: "01",
|
259
|
-
threeDSRequestorURL: window.location.href,
|
260
|
-
notifyURL
|
222
|
+
try {
|
223
|
+
const { pay_number, order_id, pay_info, amount, notifyURL } = step2;
|
224
|
+
const { threeDSServerTransID, threeDSCompInd } = step3;
|
225
|
+
var currentData = /* @__PURE__ */ new Date();
|
226
|
+
let isPre = false;
|
227
|
+
if (REACT_APP_API_ENV === "pre" && pay_info.check_tds_auth.card_name === "aa bb") {
|
228
|
+
isPre = true;
|
261
229
|
}
|
262
|
-
|
263
|
-
|
264
|
-
|
230
|
+
let { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/tds_auth_pay", {
|
231
|
+
order_id,
|
232
|
+
pay_number,
|
233
|
+
mw_data: {
|
234
|
+
accessToken: pay_info.check_tds_auth.access_token,
|
235
|
+
method: "checkTDSAuth",
|
236
|
+
cardID: pay_info.check_tds_auth.card_id,
|
237
|
+
// paymentCardNumber: cardInfo.paymentCardNumber,
|
238
|
+
paymentCardExpiry: pay_info.check_tds_auth.card_expiry,
|
239
|
+
paymentCardName: pay_info.check_tds_auth.card_name,
|
240
|
+
// paymentCardCSC: cardInfo.paymentCardCSC,
|
241
|
+
customerName: pay_info.check_tds_auth.card_name,
|
242
|
+
transactionAmount: amount,
|
243
|
+
transactionCurrency: paymentInfo.transactionInfo.transactionCurrency,
|
244
|
+
transactionProduct: pay_info.check_tds_auth.product_name,
|
245
|
+
browserAcceptHeader: "*/*",
|
246
|
+
browserColorDepth: screen.colorDepth,
|
247
|
+
browserJavaEnabled: navigator.javaEnabled(),
|
248
|
+
browserJavascriptEnabled: true,
|
249
|
+
browserLanguage: navigator.language,
|
250
|
+
browserScreenHeight: screen.height,
|
251
|
+
browserScreenWidth: screen.width,
|
252
|
+
browserTZ: currentData.getTimezoneOffset(),
|
253
|
+
browserUserAgent: navigator.userAgent,
|
254
|
+
purchaseDate: "20220420165834",
|
255
|
+
billAddrCity: paymentInfo.billingAddress.billAddrCity,
|
256
|
+
billAddrCountry: paymentInfo.billingAddress.billAddrCountry,
|
257
|
+
billAddrLine1: paymentInfo.billingAddress.billAddrLine1,
|
258
|
+
billAddrPostCode: paymentInfo.billingAddress.billAddrPostCode,
|
259
|
+
billAddrState: paymentInfo.billingAddress.billAddrState,
|
260
|
+
threeDSCompInd: isPre ? "" : threeDSCompInd,
|
261
|
+
threeDSServerTransID: isPre ? "" : threeDSServerTransID,
|
262
|
+
threeDSRequestorAuthenticationInd: "01",
|
263
|
+
threeDSRequestorURL: window.location.href,
|
264
|
+
notifyURL
|
265
|
+
}
|
266
|
+
});
|
267
|
+
if (!data) {
|
268
|
+
return null;
|
269
|
+
}
|
270
|
+
return data;
|
271
|
+
} catch (err) {
|
272
|
+
log({
|
273
|
+
msg: err,
|
274
|
+
data: paymentData
|
275
|
+
});
|
276
|
+
(0, import_materials.PisellToast)({
|
277
|
+
content: (err == null ? void 0 : err.message) || "",
|
278
|
+
duration: 1e3 * 200,
|
279
|
+
onClose() {
|
280
|
+
callback({ key: "hideModal" });
|
281
|
+
closeIframe();
|
282
|
+
}
|
283
|
+
});
|
284
|
+
return 0;
|
265
285
|
}
|
266
|
-
return data;
|
267
286
|
};
|
268
287
|
var createChallengeIframe = (challengeData, callback) => {
|
269
288
|
const displayBox = document.getElementById("threeds-container");
|
@@ -37,14 +37,17 @@ var import_materials = require("@pisell/materials");
|
|
37
37
|
var import_utils = require("@pisell/utils");
|
38
38
|
var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoading"));
|
39
39
|
var import_serve = require("./serve");
|
40
|
+
var import_model = require("../../model");
|
40
41
|
var import_payGroup = require("../../payGroup");
|
41
42
|
var import_index = require("./index.less");
|
42
43
|
var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
|
43
44
|
var import_utils2 = require("../../utils");
|
44
45
|
var SuperPayAliPayH5 = (props, ref) => {
|
45
46
|
var _a;
|
47
|
+
const { state } = (0, import_react.useContext)(import_model.Context);
|
46
48
|
const { onChange } = props;
|
47
49
|
const [open, setOpen] = (0, import_react.useState)(false);
|
50
|
+
const [showSuccessBackButton, setShowSuccessBackButton] = (0, import_react.useState)(false);
|
48
51
|
const context = (0, import_useEngineContext.default)();
|
49
52
|
const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
|
50
53
|
const init = async ({ payGroup }) => {
|
@@ -62,6 +65,7 @@ var SuperPayAliPayH5 = (props, ref) => {
|
|
62
65
|
const data = await (0, import_serve.getAliPayUrl)(payGroup.order_id, values);
|
63
66
|
if (data == null ? void 0 : data.pay_url) {
|
64
67
|
(0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
|
68
|
+
setShowSuccessBackButton(true);
|
65
69
|
window.location.href = data == null ? void 0 : data.pay_url;
|
66
70
|
} else {
|
67
71
|
setOpen(false);
|
@@ -76,6 +80,12 @@ var SuperPayAliPayH5 = (props, ref) => {
|
|
76
80
|
init
|
77
81
|
})
|
78
82
|
);
|
83
|
+
const handleSuccessBack = () => {
|
84
|
+
var _a2;
|
85
|
+
(_a2 = state.payCallback) == null ? void 0 : _a2.call(state, {
|
86
|
+
key: "success"
|
87
|
+
});
|
88
|
+
};
|
79
89
|
return /* @__PURE__ */ import_react.default.createElement(
|
80
90
|
import_materials.PisellModal,
|
81
91
|
{
|
@@ -89,7 +99,9 @@ var SuperPayAliPayH5 = (props, ref) => {
|
|
89
99
|
/* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
|
90
100
|
import_ThreedsLoading.default,
|
91
101
|
{
|
92
|
-
title: import_utils.locales.getText("tocPay.text.redirectingToAlipay")
|
102
|
+
title: import_utils.locales.getText("tocPay.text.redirectingToAlipay"),
|
103
|
+
onSuccessBack: handleSuccessBack,
|
104
|
+
showSuccessBackButton
|
93
105
|
}
|
94
106
|
))
|
95
107
|
);
|
@@ -35,6 +35,7 @@ declare const _default: {
|
|
35
35
|
'tocPay.text.done': string;
|
36
36
|
'tocPay.text.manageCard': string;
|
37
37
|
'tocPay.text.waitingForBankVerification': string;
|
38
|
+
'tocPay.text.successBack': string;
|
38
39
|
'tocPay.text.redirectingToAlipay': string;
|
39
40
|
'tocPay.text.redirectingToPaypal': string;
|
40
41
|
'tocPay.text.redirectingToWeChatPay': string;
|
@@ -130,6 +131,7 @@ declare const _default: {
|
|
130
131
|
'tocPay.text.done': string;
|
131
132
|
'tocPay.text.manageCard': string;
|
132
133
|
'tocPay.text.waitingForBankVerification': string;
|
134
|
+
'tocPay.text.successBack': string;
|
133
135
|
'tocPay.text.redirectingToAlipay': string;
|
134
136
|
'tocPay.text.redirectingToPaypal': string;
|
135
137
|
'tocPay.text.redirectingToWeChatPay': string;
|
@@ -224,6 +226,7 @@ declare const _default: {
|
|
224
226
|
'tocPay.text.done': string;
|
225
227
|
'tocPay.text.manageCard': string;
|
226
228
|
'tocPay.text.waitingForBankVerification': string;
|
229
|
+
'tocPay.text.successBack': string;
|
227
230
|
'tocPay.text.redirectingToAlipay': string;
|
228
231
|
'tocPay.text.redirectingToPaypal': string;
|
229
232
|
'tocPay.text.redirectingToWeChatPay': string;
|
@@ -59,6 +59,7 @@ var locales_default = {
|
|
59
59
|
"tocPay.text.done": "Done",
|
60
60
|
"tocPay.text.manageCard": "Manage card",
|
61
61
|
"tocPay.text.waitingForBankVerification": "Waiting for bank verification, please wait for 5-10 seconds. You may be redirected to the card issuing bank’s verification page to authorize this payment.",
|
62
|
+
"tocPay.text.successBack": "Payment completed, return to order",
|
62
63
|
"tocPay.text.redirectingToAlipay": "Redirecting to Alipay, please wait...",
|
63
64
|
"tocPay.text.redirectingToPaypal": "Redirecting to Paypal, please wait...",
|
64
65
|
"tocPay.text.redirectingToWeChatPay": "Redirecting to WeChat Pay, please wait...",
|
@@ -154,6 +155,7 @@ var locales_default = {
|
|
154
155
|
"tocPay.text.done": "完成",
|
155
156
|
"tocPay.text.manageCard": "管理卡片",
|
156
157
|
"tocPay.text.waitingForBankVerification": "正在等待银行校验,请静候5-10秒左右。您可能被转入开卡行的持卡人校验页面来授权本次支付。",
|
158
|
+
"tocPay.text.successBack": "已支付完成返回查看订单",
|
157
159
|
"tocPay.text.redirectingToAlipay": "正在转入支付宝支付,请稍候...",
|
158
160
|
"tocPay.text.redirectingToPaypal": "正在转入Paypal支付,请稍候...",
|
159
161
|
"tocPay.text.redirectingToWeChatPay": "正在转入微信支付,请稍候...",
|
@@ -248,6 +250,7 @@ var locales_default = {
|
|
248
250
|
"tocPay.text.done": "完成",
|
249
251
|
"tocPay.text.manageCard": "管理卡片",
|
250
252
|
"tocPay.text.waitingForBankVerification": "正在等待銀行校驗,請靜候5-10秒左右。您可能被轉入開卡行的持卡人校驗頁面來授權本次支付。",
|
253
|
+
"tocPay.text.successBack": "已支付完成返回查看訂單",
|
251
254
|
"tocPay.text.redirectingToAlipay": "正在轉入支付寶支付,請稍候...",
|
252
255
|
"tocPay.text.redirectingToPaypal": "正在轉入Paypal支付,請稍候...",
|
253
256
|
"tocPay.text.redirectingToWeChatPay": "正在轉入微信支付,請稍候...",
|