From 1d8c765c147a2d1b662f312c49af2328bb51b2f2 Mon Sep 17 00:00:00 2001
From: "web@ppanel" <web@ppanel.dev>
Date: Tue, 28 Jan 2025 13:45:55 +0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(payment):=20Replace=20window?=
 =?UTF-8?q?.open=20with=20window.location.href=20for=20checkout=20links?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/user/app/(main)/(user)/payment/page.tsx     | 12 +++---------
 apps/user/components/subscribe/purchase.tsx      | 10 +---------
 apps/user/components/subscribe/recharge.tsx      | 10 +---------
 apps/user/components/subscribe/renewal.tsx       | 10 +---------
 apps/user/components/subscribe/reset-traffic.tsx | 10 +---------
 5 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/apps/user/app/(main)/(user)/payment/page.tsx b/apps/user/app/(main)/(user)/payment/page.tsx
index 5238aaa..4453ba9 100644
--- a/apps/user/app/(main)/(user)/payment/page.tsx
+++ b/apps/user/app/(main)/(user)/payment/page.tsx
@@ -175,15 +175,9 @@ export default function Page() {
               <div className='flex gap-4'>
                 <Button
                   onClick={() => {
-                    const width = 600;
-                    const height = 800;
-                    const left = (screen.width - width) / 2;
-                    const top = (screen.height - height) / 2;
-                    window.open(
-                      payment?.checkout_url,
-                      'newWindow',
-                      `width=${width},height=${height},top=${top},left=${left},menubar=0,scrollbars=1,resizable=1,status=1,titlebar=0,toolbar=0,location=1`,
-                    );
+                    if (payment?.checkout_url) {
+                      window.location.href = payment?.checkout_url;
+                    }
                   }}
                 >
                   {t('goToPayment')}
diff --git a/apps/user/components/subscribe/purchase.tsx b/apps/user/components/subscribe/purchase.tsx
index 2bee590..535bf6e 100644
--- a/apps/user/components/subscribe/purchase.tsx
+++ b/apps/user/components/subscribe/purchase.tsx
@@ -75,15 +75,7 @@ export default function Purchase({ subscribe, setSubscribe }: Readonly<PurchaseP
           const type = data.data?.type;
           const checkout_url = data.data?.checkout_url;
           if (type === 'link') {
-            const width = 600;
-            const height = 800;
-            const left = (screen.width - width) / 2;
-            const top = (screen.height - height) / 2;
-            window.open(
-              checkout_url,
-              'newWindow',
-              `width=${width},height=${height},top=${top},left=${left},menubar=0,scrollbars=1,resizable=1,status=1,titlebar=0,toolbar=0,location=1`,
-            );
+            window.location.href = checkout_url!;
           }
           getUserInfo();
           router.push(`/payment?order_no=${orderNo}`);
diff --git a/apps/user/components/subscribe/recharge.tsx b/apps/user/components/subscribe/recharge.tsx
index 0d13ee6..4652411 100644
--- a/apps/user/components/subscribe/recharge.tsx
+++ b/apps/user/components/subscribe/recharge.tsx
@@ -139,15 +139,7 @@ export default function Recharge(props: Readonly<ButtonProps>) {
                     const type = data.data?.type;
                     const checkout_url = data.data?.checkout_url;
                     if (type === 'link') {
-                      const width = 600;
-                      const height = 800;
-                      const left = (screen.width - width) / 2;
-                      const top = (screen.height - height) / 2;
-                      window.open(
-                        checkout_url,
-                        'newWindow',
-                        `width=${width},height=${height},top=${top},left=${left},menubar=0,scrollbars=1,resizable=1,status=1,titlebar=0,toolbar=0,location=1`,
-                      );
+                      window.location.href = checkout_url!;
                     }
                     router.push(`/payment?order_no=${orderNo}`);
                     setOpen(false);
diff --git a/apps/user/components/subscribe/renewal.tsx b/apps/user/components/subscribe/renewal.tsx
index d94fc2c..d9827dd 100644
--- a/apps/user/components/subscribe/renewal.tsx
+++ b/apps/user/components/subscribe/renewal.tsx
@@ -83,15 +83,7 @@ export default function Renewal({ id, subscribe }: Readonly<RenewalProps>) {
           const type = data.data?.type;
           const checkout_url = data.data?.checkout_url;
           if (type === 'link') {
-            const width = 600;
-            const height = 800;
-            const left = (screen.width - width) / 2;
-            const top = (screen.height - height) / 2;
-            window.open(
-              checkout_url,
-              'newWindow',
-              `width=${width},height=${height},top=${top},left=${left},menubar=0,scrollbars=1,resizable=1,status=1,titlebar=0,toolbar=0,location=1`,
-            );
+            window.location.href = checkout_url!;
           }
           getUserInfo();
           router.push(`/payment?order_no=${orderNo}`);
diff --git a/apps/user/components/subscribe/reset-traffic.tsx b/apps/user/components/subscribe/reset-traffic.tsx
index 7eb2c4c..07144b9 100644
--- a/apps/user/components/subscribe/reset-traffic.tsx
+++ b/apps/user/components/subscribe/reset-traffic.tsx
@@ -90,15 +90,7 @@ export default function ResetTraffic({ id, replacement }: Readonly<ResetTrafficP
                     const type = data.data?.type;
                     const checkout_url = data.data?.checkout_url;
                     if (type === 'link') {
-                      const width = 600;
-                      const height = 800;
-                      const left = (screen.width - width) / 2;
-                      const top = (screen.height - height) / 2;
-                      window.open(
-                        checkout_url,
-                        'newWindow',
-                        `width=${width},height=${height},top=${top},left=${left},menubar=0,scrollbars=1,resizable=1,status=1,titlebar=0,toolbar=0,location=1`,
-                      );
+                      window.location.href = checkout_url!;
                     }
                     getUserInfo();
                     router.push(`/payment?order_no=${orderNo}`);