@intercartx/booster-core 0.0.1-beta.3 → 0.0.1-beta.31

package/dist/models/business/OrderSummary.js

@@ -1,20 +1,28 @@
 import { CheckoutEvents } from "../../types";
-import { divide100, minus, plus } from "../../utils";
+import { divide100, plus } from "../../utils";
 import { globalState } from "../GlobalState";
 import { BusinessModel } from "./Business";
 export class OrderSummaryModel extends BusinessModel {
     constructor() {
+        var _a, _b, _c;
         super();
         this.displayProductList = [];
+        this.isSubscription = false;
         this.isOpen = false;
         this.fees = {};
         this.reactiveKeys = ['isOpen', 'isLoading', 'fees', 'total'];
         const { processorData } = globalState.getConfig();
-        const { productInfo } = processorData;
-        if (!productInfo || !productInfo.display.length)
+        // const { productInfo } = processorData
+        const productInfo = processorData.productInfo;
+        if (!productInfo ||
+            ('display' in productInfo && !productInfo.display.length) ||
+            ('displays' in productInfo && !((_b = (_a = productInfo.displays[0]) === null || _a === void 0 ? void 0 : _a.display) === null || _b === void 0 ? void 0 : _b.length))) {
             return;
+        }
+        this.isSubscription = 'subscription' in productInfo;
+        const display = 'display' in productInfo ? productInfo.display : (_c = productInfo.displays[0]) === null || _c === void 0 ? void 0 : _c.display;
         // 价格单位转成元显示
-        this.displayProductList = productInfo.display.map(product => ({
+        this.displayProductList = display.map(product => ({
             ...product,
             price: divide100(product.price),
             originPrice: divide100(product.originPrice),
@@ -29,13 +37,13 @@ export class OrderSummaryModel extends BusinessModel {
     }
     get totalSavings() {
         const res = this.displayProductList.reduce((acc, product) => {
-            return plus(acc, minus(product.originPrice, product.price));
+            return plus(acc, divide100(product.discount * product.quantity));
         }, '0');
         return res;
     }
     get subtotal() {
         const res = this.displayProductList.reduce((acc, product) => {
-            return plus(acc, product.price);
+            return plus(acc, Number(product.price) * product.quantity);
         }, '0');
         return res;
     }
@@ -53,4 +61,57 @@ export class OrderSummaryModel extends BusinessModel {
     toggleOpen() {
         this.isOpen = !this.isOpen;
     }
+    getSubscriptionPlanTexts() {
+        var _a, _b, _c, _d;
+        if (!this.isSubscription)
+            return [];
+        const productInfo = (_b = (_a = globalState.getConfig()) === null || _a === void 0 ? void 0 : _a.processorData) === null || _b === void 0 ? void 0 : _b.productInfo;
+        if (!productInfo || !((_c = productInfo === null || productInfo === void 0 ? void 0 : productInfo.displays) === null || _c === void 0 ? void 0 : _c.length))
+            return [];
+        const texts = [];
+        const { displays, subscription } = productInfo;
+        const currency = ((_d = globalState.getConfig()) === null || _d === void 0 ? void 0 : _d.currency) || 'USD';
+        displays.forEach((displayItem, index) => {
+            var _a;
+            // Calculate total price for this interval
+            const totalPrice = displayItem.display.reduce((sum, item) => {
+                return plus(sum, divide100(Number(item.price) * item.quantity));
+            }, '0');
+            // Get recurring type from pricePlan
+            const recurring = ((_a = subscription.pricePlan[index]) === null || _a === void 0 ? void 0 : _a.recurring) || 'month';
+            const interval = displayItem.interval;
+            // Format price with currency
+            const priceText = `${currency} ${totalPrice}`;
+            if (interval === -1) {
+                // Recurring forever
+                if (index === 0) {
+                    // First and only plan, recurring forever
+                    texts.push(`${priceText} per ${recurring}`);
+                }
+                else {
+                    // After previous plans, recurring forever
+                    texts.push(`Then ${priceText} per ${recurring}`);
+                }
+            }
+            else if (index === 0) {
+                // First interval with specific count
+                if (interval === 1) {
+                    texts.push(`First ${recurring} at ${priceText}`);
+                }
+                else {
+                    texts.push(`First ${interval} ${recurring}s at ${priceText}`);
+                }
+            }
+            else {
+                // Subsequent intervals with specific count
+                if (interval === 1) {
+                    texts.push(`Then ${recurring} at ${priceText}`);
+                }
+                else {
+                    texts.push(`Then ${interval} ${recurring}s at ${priceText}`);
+                }
+            }
+        });
+        return texts;
+    }
 }

package/dist/models/business/PaypalModal.d.ts

@@ -4,6 +4,7 @@ interface PaypalModalProps {
     onVisibleChange?: (visible: boolean) => void;
 }
 export declare class PaypalModalModel extends BusinessModel {
+    #private;
     visible: boolean;
     onVisibleChange: (visible: boolean) => void;
     countDown: number;

package/dist/models/business/PaypalModal.js

@@ -1,5 +1,20 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _PaypalModalModel_PPPaymentHandler;
 import { BusinessModel } from "./Business";
 import { globalState } from "../GlobalState";
+import { PPPaymentHandler } from "./pay-button/PPPaymentHandler";
+import { CheckoutEvents } from "../../types";
+import { HTTPError } from "../../api";
 const COUNT_DOWN = 5;
 export class PaypalModalModel extends BusinessModel {
     constructor(props) {
@@ -7,6 +22,7 @@ export class PaypalModalModel extends BusinessModel {
         this.visible = false;
         this.onVisibleChange = () => { };
         this.countDown = COUNT_DOWN;
+        _PaypalModalModel_PPPaymentHandler.set(this, null);
         this.reactiveKeys = ['visible', 'countDown'];
         this.timer = null;
         this.startCountDown = () => {
@@ -30,12 +46,18 @@ export class PaypalModalModel extends BusinessModel {
             if (!this.visible) {
                 return;
             }
+            if (!__classPrivateFieldGet(this, _PaypalModalModel_PPPaymentHandler, "f")) {
+                __classPrivateFieldSet(this, _PaypalModalModel_PPPaymentHandler, new PPPaymentHandler(), "f");
+            }
             try {
-                // const { paypal_url } = await solidGetPaypalURL(EPaymentAction.ONFAIL, i18n.locale)
-                // window.location.replace(paypal_url)
-                // console.log('Redirecting to PayPal...')
+                this.handleClose();
+                await __classPrivateFieldGet(this, _PaypalModalModel_PPPaymentHandler, "f").handlePayment();
             }
             catch (error) {
+                if (error instanceof HTTPError) {
+                    const errJson = error.json;
+                    globalState.emit(CheckoutEvents.ERROR_TIP_SHOW, errJson.message);
+                }
                 console.error('PayPal redirect failed:', error);
             }
         };
@@ -46,6 +68,14 @@ export class PaypalModalModel extends BusinessModel {
             this.onVisibleChange = props.onVisibleChange;
         }
         props.visible && this.openModal();
+        globalState.on(CheckoutEvents.CREDIT_CARD_FAILED, (bool) => {
+            var _a, _b;
+            const config = globalState.getConfig();
+            const isPPVisible = ((_a = config.paymentMethods) === null || _a === void 0 ? void 0 : _a.PP) && ((_b = config.paymentMethods) === null || _b === void 0 ? void 0 : _b.PP.visible);
+            if (isPPVisible) {
+                this.setVisible(bool);
+            }
+        });
         globalState.registerModel('paypalModal', this);
     }
     openModal() {
@@ -62,3 +92,4 @@ export class PaypalModalModel extends BusinessModel {
         }
     }
 }
+_PaypalModalModel_PPPaymentHandler = new WeakMap();

package/dist/models/business/address/Address.js

@@ -23,6 +23,8 @@ export class AddressModel extends BusinessModel {
                 province: addressData.province,
                 zip: addressData.zip,
             });
+            // 关闭multiRegions的验证
+            this.multiRegions.clearErrorValues();
         };
         this.address1 = new AddressSuggestModel({
             label: 'Address',

package/dist/models/business/address/AddressSuggestion.js

@@ -85,7 +85,7 @@ export class AddressSuggestModel extends BusinessModel {
             __classPrivateFieldSet(this, _AddressSuggestModel_sessionToken, result.sessionToken, "f");
             if (result.suggestions && result.suggestions.length > 0) {
                 this.suggestions = result.suggestions;
-                this.dropdown.handleOpen();
+                // this.dropdown.handleOpen()
             }
             else {
                 this.clearSuggestions();
@@ -116,7 +116,7 @@ export class AddressSuggestModel extends BusinessModel {
     }
     clearSuggestions() {
         this.suggestions = [];
-        this.dropdown.handleClose();
+        // this.dropdown.handleClose()
     }
 }
 _AddressSuggestModel_onChange = new WeakMap(), _AddressSuggestModel_onAddressSelect = new WeakMap(), _AddressSuggestModel_googleApiKey = new WeakMap(), _AddressSuggestModel_sessionToken = new WeakMap();

package/dist/models/business/address/MultiRegions.d.ts

@@ -50,6 +50,7 @@ export declare class MultiRegionsModel extends BusinessModel<MultiRegionsData> i
     getFieldModel(fieldName: string): InputModel<import("../../types").FieldProps> | SelectModel<import("../../types").FieldProps> | undefined;
     getValue(): MultiRegionsData;
     setValue(value: MultiRegionsData): void;
+    clearErrorValues(): void;
     validate(): boolean;
     clearAllFields(): void;
 }

package/dist/models/business/address/MultiRegions.js

@@ -70,6 +70,11 @@ export class MultiRegionsModel extends BusinessModel {
         this.province.setValue(value.province);
         this.zip.setValue(value.zip);
     }
+    clearErrorValues() {
+        this.city.setError('');
+        this.province.setError('');
+        this.zip.setError('');
+    }
     validate() {
         return [
             this.city.validate(),

package/dist/models/business/fees/ShippingMethods.js

@@ -10,6 +10,8 @@ export class ShippingMethodsModel extends BusinessModel {
         this.selectedMethod = null;
         this.reactiveKeys = ['methodsList', 'selectedMethod'];
         this.selectMethod = (methodId) => {
+            if (!methodId)
+                return;
             const method = this.methodsList.find(method => method.shippingNo === methodId);
             if (method) {
                 this.selectedMethod = method;

package/dist/models/business/fees/Tips.d.ts

@@ -20,6 +20,7 @@ export declare class TipsModel extends BusinessModel<{
     constructor();
     get tip(): number;
     handleChooseTip: (index: number) => void;
+    handleShowStatusChange: () => void;
     handleTipMinus: () => void;
     handleTipPlus: () => void;
     handleTipUpdate: () => Promise<void>;

package/dist/models/business/fees/Tips.js

@@ -29,6 +29,9 @@ export class TipsModel extends BusinessModel {
             this.customTip = '';
             globalState.emit(CheckoutEvents.TIP_CHANGE, this.tip);
         };
+        this.handleShowStatusChange = () => {
+            globalState.emit(CheckoutEvents.TIP_CHANGE, this.tip);
+        };
         this.handleTipMinus = () => {
             if (Number(this.customTip) > 1) {
                 this.customTip = (Number(this.customTip) - 1).toString();
@@ -64,7 +67,7 @@ export class TipsModel extends BusinessModel {
                 this.updateButtonStatus = EBtnStatus.Inactive;
             }
         };
-        this.showTip = (_c = (_b = (_a = globalState.getConfig()) === null || _a === void 0 ? void 0 : _a.feeSetting) === null || _b === void 0 ? void 0 : _b.tip) !== null && _c !== void 0 ? _c : true;
+        this.showTip = (_c = (_b = (_a = globalState.getConfig()) === null || _a === void 0 ? void 0 : _a.feeSettings) === null || _b === void 0 ? void 0 : _b.tip) !== null && _c !== void 0 ? _c : true;
         globalState.on(CheckoutEvents.SUBTOTAL_CHANGE, (subtotal) => {
             this.fixedOptions = FIXED_OPTIONS_PERCENTS.map(percent => ({
                 label: percent ? `${percent * 100}%` : 'None',
@@ -76,6 +79,9 @@ export class TipsModel extends BusinessModel {
     }
     get tip() {
         var _a, _b;
+        if (!this.showTip) {
+            return 0;
+        }
         const tip = Number(this.customTip);
         if (tip > 0) {
             return Number(tip);

package/dist/models/business/index.d.ts

@@ -9,3 +9,4 @@ export * from './OrderSummary';
 export * from './PaypalModal';
 export * from './fees';
 export * from './FullScreeenLoading';
+export * from './ErrorTip';

package/dist/models/business/index.js

@@ -9,3 +9,4 @@ export * from './OrderSummary';
 export * from './PaypalModal';
 export * from './fees';
 export * from './FullScreeenLoading';
+export * from './ErrorTip';

package/dist/models/business/pay-button/ACHPaymentHandler.js

@@ -14,7 +14,7 @@ import { HTTPError } from "../../../api/helper";
 import { apiCreateACHSubscriptionOrder } from "../../../api/order/ach";
 import { apiConfirmSubscriptionOrderWithRetry } from "../../../api/order/order-confirm";
 import { apiCreatePreOrder } from "../../../api/order/pre-order";
-import { SubmissionAction } from "../../../api/order/types";
+import { ResponseErrorCode, SubmissionAction } from "../../../api/order/types";
 import { CheckoutEvents } from "../../../types";
 import { getBrowserInfo } from "../../../utils/browserInfo";
 import { globalState } from "../../GlobalState";
@@ -76,8 +76,9 @@ export class ACHPaymentHandler {
     async handlePayment() {
         try {
             const isAllValid = await this.validatePayment();
-            if (!isAllValid)
-                return;
+            if (!isAllValid) {
+                throw new Error('Invalid payment');
+            }
             showLoading("Processing payment...");
             const reqData = await this.preparePaymentData();
             const { token } = globalState.getConfig();
@@ -104,7 +105,7 @@ export class ACHPaymentHandler {
             console.error(error);
             if (error instanceof HTTPError) {
                 const errJson = error.json;
-                if (errJson.code === 4004 && __classPrivateFieldGet(this, _ACHPaymentHandler_orderResult, "f")) {
+                if (errJson.code === ResponseErrorCode.ORDER_ALREADY_HAS_TRADE && __classPrivateFieldGet(this, _ACHPaymentHandler_orderResult, "f")) {
                     await this.handleApiACHOSubscriptionOrdered();
                     return;
                 }

package/dist/models/business/pay-button/PPPaymentHandler.js

@@ -62,8 +62,10 @@ export class PPPaymentHandler {
         var _a;
         try {
             const isAllValid = await this.validatePayment();
-            if (!isAllValid)
-                return;
+            if (!isAllValid) {
+                throw new Error('Invalid payment');
+            }
+            ;
             showLoading('Processing payment...');
             const reqData = await this.preparePaymentData();
             const { token } = globalState.getConfig();
@@ -122,6 +124,9 @@ export class PPPaymentHandler {
         }
         catch (error) {
             console.error(error);
+            throw error;
+        }
+        finally {
             hideLoading();
         }
     }

package/dist/models/business/pay-button/PayButton.d.ts

@@ -16,5 +16,6 @@ export declare class PayButtonModel extends BusinessModel {
     validatePayment(): Promise<boolean>;
     preparePaymentData(): any;
     handlePayment(): Promise<void>;
+    invalidHandler(): Promise<void>;
 }
 export {};

package/dist/models/business/pay-button/PayButton.js

@@ -10,12 +10,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PayButtonModel_instances, _PayButtonModel_paymentConfig, _PayButtonModel_createPaymentHandler;
+import { HTTPError, ResponseErrorCode } from "../../../api";
 import { CheckoutEvents } from "../../../types";
 import { globalState } from "../../GlobalState";
 import { BusinessModel } from "../Business";
 import { ACHPaymentHandler } from "./ACHPaymentHandler";
 import { CCPaymentHandler } from "./CCPaymentHandler";
 import { PPPaymentHandler } from "./PPPaymentHandler";
+import { reportEvent } from "../../../report-event";
 var PaymentMethod;
 (function (PaymentMethod) {
     PaymentMethod["PP"] = "PP";
@@ -48,7 +50,59 @@ export class PayButtonModel extends BusinessModel {
         return this.paymentHandler.preparePaymentData();
     }
     async handlePayment() {
-        return this.paymentHandler.handlePayment();
+        var _a, _b, _c;
+        try {
+            globalState.emit(CheckoutEvents.ERROR_TIP_SHOW, '');
+            await this.paymentHandler.handlePayment();
+            const productInfo = (_c = (_b = (_a = globalState.getConfig()) === null || _a === void 0 ? void 0 : _a.processorData) === null || _b === void 0 ? void 0 : _b.productInfo) !== null && _c !== void 0 ? _c : [];
+            reportEvent("PlaceAnOrder", productInfo);
+            // const config = globalState.getConfig().processorData.productInfo?.display || []
+            // const contents: TracksityContent[] = config.map((item) => ({
+            //   content_id: item.productId || '',
+            //   content_name: item.title || '',
+            //   price: Number(item.price),
+            //   quantity: Number(item.quantity),
+            // }))
+            // tracksityTracker.event("PlaceAnOrder", TracksityTracker.buildEcommerceData(contents))
+        }
+        catch (error) {
+            if (error instanceof HTTPError) {
+                const errJson = error.json;
+                globalState.emit(CheckoutEvents.ERROR_TIP_SHOW, errJson.message);
+                if (errJson.code === ResponseErrorCode.CREDIT_CARD_FAILED) {
+                    globalState.emit(CheckoutEvents.CREDIT_CARD_FAILED, true);
+                    return;
+                }
+            }
+            this.invalidHandler();
+        }
+        return;
+    }
+    async invalidHandler() {
+        const invalidEl = window.document.querySelector('.itx-invalid');
+        if (invalidEl) {
+            const invalidInput = invalidEl;
+            if (invalidInput.focus)
+                invalidInput.focus();
+            invalidEl.scrollIntoView();
+            // 获取错误信息
+            // const feedBackEl =
+            //   invalidEl.nextElementSibling?.nextElementSibling?.children[0]
+            // if (feedBackEl) {
+            //   setErrorMessage((feedBackEl as HTMLElement).innerText)
+            // }
+            return;
+        }
+        const { stripeElements, stripeElId } = globalState.getAllValues();
+        if (stripeElements && stripeElId) {
+            const { error: submitError } = await stripeElements.submit();
+            if (submitError) {
+                const el = document.getElementById(stripeElId);
+                if (el) {
+                    el.scrollIntoView();
+                }
+            }
+        }
     }
 }
 _PayButtonModel_paymentConfig = new WeakMap(), _PayButtonModel_instances = new WeakSet(), _PayButtonModel_createPaymentHandler = function _PayButtonModel_createPaymentHandler(paymentMethod) {

package/dist/models/business/pay-button/cc-handler/DefaultCCPaymentHandler.d.ts

@@ -1,6 +1,7 @@
 import { OneTimeOrderProduct } from "../../../../api/types";
 import { BaseCCPaymentHandler } from "./BaseCCPaymentHandler";
 export declare class DefaultCCPaymentHandler extends BaseCCPaymentHandler {
+    #private;
     validatePayment(): Promise<boolean>;
     preparePaymentData(): Promise<{
         products: OneTimeOrderProduct;

package/dist/models/business/pay-button/cc-handler/DefaultCCPaymentHandler.js

@@ -1,13 +1,30 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _DefaultCCPaymentHandler_orderResult;
 import { CheckoutEvents, hideLoading, showLoading } from "../../../../index";
 import { apiCCOneTimeOrder } from "../../../../api/order/cc";
 import { apiConfirmOneTimeOrderWithRetry } from "../../../../api/order/order-confirm";
 import { apiCreatePreOrder } from "../../../../api/order/pre-order";
-import { SubmissionAction } from "../../../../api/order/types";
+import { ResponseErrorCode, SubmissionAction } from "../../../../api/order/types";
 import { getBrowserInfo } from "../../../../utils/browserInfo";
 import { encryptCreditCard } from "../../../../utils/encrypt";
 import { globalState } from "../../../GlobalState";
 import { BaseCCPaymentHandler } from "./BaseCCPaymentHandler";
+import { HTTPError } from "../../../../api/helper";
 export class DefaultCCPaymentHandler extends BaseCCPaymentHandler {
+    constructor() {
+        super(...arguments);
+        _DefaultCCPaymentHandler_orderResult.set(this, null);
+    }
     async validatePayment() {
         return await globalState.validateAll();
     }
@@ -58,11 +75,12 @@ export class DefaultCCPaymentHandler extends BaseCCPaymentHandler {
         };
     }
     async handlePayment() {
-        var _a;
+        var _a, _b, _c, _d;
         try {
             const isAllValid = await this.validatePayment();
-            if (!isAllValid)
-                return;
+            if (!isAllValid) {
+                throw new Error('Invalid payment');
+            }
             showLoading('Processing payment...');
             const reqData = await this.preparePaymentData();
             const { paymentData, browser, confirmUrl, ...rest } = reqData;
@@ -71,6 +89,7 @@ export class DefaultCCPaymentHandler extends BaseCCPaymentHandler {
             await apiCreatePreOrder(token, SubmissionAction.ONETIME, rest);
             // 尝试支付
             const res = await apiCCOneTimeOrder(token, reqData);
+            __classPrivateFieldSet(this, _DefaultCCPaymentHandler_orderResult, res, "f");
             // 若需要 3DS 或外部跳转，在新窗口中打开，检测重定向后确认订单
             if ((_a = res.action) === null || _a === void 0 ? void 0 : _a.url) {
                 const threeDSWindow = window.open(res.action.url, '_blank', 'width=800,height=600');
@@ -118,7 +137,62 @@ export class DefaultCCPaymentHandler extends BaseCCPaymentHandler {
         }
         catch (error) {
             console.error(error);
+            if (error instanceof HTTPError) {
+                const errJson = error.json;
+                if (errJson.code === ResponseErrorCode.ORDER_ALREADY_HAS_TRADE && __classPrivateFieldGet(this, _DefaultCCPaymentHandler_orderResult, "f")) {
+                    const { token } = globalState.getConfig();
+                    if ((_b = __classPrivateFieldGet(this, _DefaultCCPaymentHandler_orderResult, "f").action) === null || _b === void 0 ? void 0 : _b.url) {
+                        const threeDSWindow = window.open(__classPrivateFieldGet(this, _DefaultCCPaymentHandler_orderResult, "f").action.url, '_blank', 'width=800,height=600');
+                        if (!threeDSWindow) {
+                            console.error('Cannot open threeDS secure window, please check your browser settings');
+                            return;
+                        }
+                        const currentOrigin = window.location.origin;
+                        const checkWindowRedirect = setInterval(() => {
+                            var _a, _b;
+                            try {
+                                if (threeDSWindow.closed) {
+                                    clearInterval(checkWindowRedirect);
+                                    return;
+                                }
+                                const windowUrl = threeDSWindow.location.href;
+                                if (windowUrl.startsWith(currentOrigin)) {
+                                    const url = new URL(windowUrl);
+                                    if (url.searchParams.has('token') || url.searchParams.has('tradeId')) {
+                                        clearInterval(checkWindowRedirect);
+                                        threeDSWindow.close();
+                                        showLoading('Confirming order...');
+                                        apiConfirmOneTimeOrderWithRetry(token, { tradeId: (_b = (_a = __classPrivateFieldGet(this, _DefaultCCPaymentHandler_orderResult, "f")) === null || _a === void 0 ? void 0 : _a.tradeId) !== null && _b !== void 0 ? _b : '' })
+                                            .then((paid) => paid ? globalState.emit(CheckoutEvents.ORDER_COMPLETED, token) : null)
+                                            .catch((error) => console.error('Order confirmation failed:', error))
+                                            .finally(() => hideLoading());
+                                        return;
+                                    }
+                                }
+                            }
+                            catch (e) {
+                                // 跨域无法读取 URL，继续检查（等待重定向到我们的域名后就能读取了）
+                            }
+                        }, 500);
+                        setTimeout(() => {
+                            clearInterval(checkWindowRedirect);
+                        }, 5 * 60 * 1000);
+                        return;
+                    }
+                    // 确认订单（带重试）
+                    const paid = await apiConfirmOneTimeOrderWithRetry(token, { tradeId: (_d = (_c = __classPrivateFieldGet(this, _DefaultCCPaymentHandler_orderResult, "f")) === null || _c === void 0 ? void 0 : _c.tradeId) !== null && _d !== void 0 ? _d : '' });
+                    if (paid) {
+                        globalState.emit(CheckoutEvents.ORDER_COMPLETED, token);
+                    }
+                    hideLoading();
+                    return;
+                }
+            }
+            throw error;
+        }
+        finally {
             hideLoading();
         }
     }
 }
+_DefaultCCPaymentHandler_orderResult = new WeakMap();

package/dist/models/business/pay-button/cc-handler/FxpCCPaymentHandler.js

@@ -15,7 +15,7 @@ import { HTTPError } from "../../../../api/helper";
 import { apiConfirmOneTimeOrderWithRetry } from "../../../../api/order";
 import { apiCCOneTimeOrder } from "../../../../api/order/cc";
 import { apiCreatePreOrder } from "../../../../api/order/pre-order";
-import { SubmissionAction } from "../../../../api/order/types";
+import { ResponseErrorCode, SubmissionAction } from "../../../../api/order/types";
 import { getBrowserInfo } from "../../../../utils/browserInfo";
 import { divide100 } from "../../../../utils/currency";
 import { globalState } from "../../../GlobalState";
@@ -132,7 +132,7 @@ export class FxpCCPaymentHandler extends BaseCCPaymentHandler {
             console.error(error);
             if (error instanceof HTTPError) {
                 const errJson = error.json;
-                if (errJson.code === 4004 && __classPrivateFieldGet(this, _FxpCCPaymentHandler_orderResult, "f")) {
+                if (errJson.code === ResponseErrorCode.ORDER_ALREADY_HAS_TRADE && __classPrivateFieldGet(this, _FxpCCPaymentHandler_orderResult, "f")) {
                     await this.handleApiCCOneTimeOrdered();
                     return;
                 }
@@ -167,7 +167,7 @@ export class FxpCCPaymentHandler extends BaseCCPaymentHandler {
             if (prev.length >= 0) {
                 prev += `#;#`;
             }
-            return prev + `${(_a = curr.title) !== null && _a !== void 0 ? _a : '0'}#,#${(_b = curr.sku) !== null && _b !== void 0 ? _b : '0'}#,#${orderAmount}#,#${(_c = curr.quantity) !== null && _c !== void 0 ? _c : '0'}`;
+            return prev + `${(_a = curr.title) !== null && _a !== void 0 ? _a : '0'}#,#${(_b = curr.productId) !== null && _b !== void 0 ? _b : '0'}#,#${orderAmount}#,#${(_c = curr.quantity) !== null && _c !== void 0 ? _c : '0'}`;
         }, '');
         const fxpReqData = [
             { name: "merNo", value: rest.merNo },

package/dist/models/business/pay-button/cc-handler/StripeCCPaymentHandler.d.ts

@@ -2,6 +2,7 @@ import { Stripe } from "@stripe/stripe-js";
 import { CCSubmissionRequest } from "../../../../api/order/cc";
 import { BaseCCPaymentHandler } from "./BaseCCPaymentHandler";
 export declare class StripeCCPaymentHandler extends BaseCCPaymentHandler {
+    #private;
     isSubscription(): boolean;
     getButtonText(): "Subscription Payment" | "One-Time Payment";
     validatePayment(): Promise<boolean>;
@@ -9,4 +10,5 @@ export declare class StripeCCPaymentHandler extends BaseCCPaymentHandler {
         stripe: Stripe;
     }>;
     handlePayment(): Promise<void>;
+    handleStripeOrdered(): Promise<void>;
 }