From 2b80496637f9184119bdbd552860f3bc79bd09bc Mon Sep 17 00:00:00 2001
From: "web@ppanel" <web@ppanel.dev>
Date: Sat, 1 Mar 2025 19:35:32 +0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(subscribe):=20Update=20payme?=
 =?UTF-8?q?nt=20return=20URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/user/components/subscribe/purchase.tsx      | 2 +-
 apps/user/components/subscribe/recharge.tsx      | 2 +-
 apps/user/components/subscribe/renewal.tsx       | 2 +-
 apps/user/components/subscribe/reset-traffic.tsx | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/user/components/subscribe/purchase.tsx b/apps/user/components/subscribe/purchase.tsx
index e827ebd..88e1ce7 100644
--- a/apps/user/components/subscribe/purchase.tsx
+++ b/apps/user/components/subscribe/purchase.tsx
@@ -71,7 +71,7 @@ export default function Purchase({ subscribe, setSubscribe }: Readonly<PurchaseP
         if (orderNo) {
           const { data } = await checkoutOrder({
             orderNo,
-            returnUrl: window.location.href,
+            returnUrl: `${window.location.origin}/payment?order_no=${orderNo}`,
           });
           const type = data.data?.type;
           const checkout_url = data.data?.checkout_url;
diff --git a/apps/user/components/subscribe/recharge.tsx b/apps/user/components/subscribe/recharge.tsx
index ab0c19e..2128fa5 100644
--- a/apps/user/components/subscribe/recharge.tsx
+++ b/apps/user/components/subscribe/recharge.tsx
@@ -135,7 +135,7 @@ export default function Recharge(props: Readonly<ButtonProps>) {
                   if (orderNo) {
                     const { data } = await checkoutOrder({
                       orderNo,
-                      returnUrl: window.location.href,
+                      returnUrl: `${window.location.origin}/payment?order_no=${orderNo}`,
                     });
                     const type = data.data?.type;
                     const checkout_url = data.data?.checkout_url;
diff --git a/apps/user/components/subscribe/renewal.tsx b/apps/user/components/subscribe/renewal.tsx
index 232c2a3..f5ebcf8 100644
--- a/apps/user/components/subscribe/renewal.tsx
+++ b/apps/user/components/subscribe/renewal.tsx
@@ -79,7 +79,7 @@ export default function Renewal({ id, subscribe }: Readonly<RenewalProps>) {
         if (orderNo) {
           const { data } = await checkoutOrder({
             orderNo,
-            returnUrl: window.location.href,
+            returnUrl: `${window.location.origin}/payment?order_no=${orderNo}`,
           });
           const type = data.data?.type;
           const checkout_url = data.data?.checkout_url;
diff --git a/apps/user/components/subscribe/reset-traffic.tsx b/apps/user/components/subscribe/reset-traffic.tsx
index cb02b45..42d8413 100644
--- a/apps/user/components/subscribe/reset-traffic.tsx
+++ b/apps/user/components/subscribe/reset-traffic.tsx
@@ -86,7 +86,7 @@ export default function ResetTraffic({ id, replacement }: Readonly<ResetTrafficP
                   if (orderNo) {
                     const { data } = await checkoutOrder({
                       orderNo,
-                      returnUrl: window.location.href,
+                      returnUrl: `${window.location.origin}/payment?order_no=${orderNo}`,
                     });
                     const type = data.data?.type;
                     const checkout_url = data.data?.checkout_url;