diff --git a/app/components/pos/composables/usePlaceOrder.js b/app/components/pos/composables/usePlaceOrder.js
index 9255249..13ec14c 100644
--- a/app/components/pos/composables/usePlaceOrder.js
+++ b/app/components/pos/composables/usePlaceOrder.js
@@ -6,7 +6,9 @@ export default function usePlaceOrder({ onSuccess }) {
 
   const store = useStore();
   const pendingInvoiceStatus = store.Invoice_Status.find(({ code }) => code === "DRAFT");
+  const confirmedInvoiceStatus = store.Invoice_Status.find(({ code }) => code === "CONFIRMED");
   const pendingPaymentStatus = store.Payment_Status.find(({ code }) => code === "PENDING");
+  const paidPaymentStatus = store.Payment_Status.find(({ code }) => code === "PAID");
   const pendingDeliveryStatus = store.Delivery_Status.find(({ code }) => code === "PENDING");
 
   const posStore = usePosStore();
@@ -15,8 +17,6 @@ export default function usePlaceOrder({ onSuccess }) {
   const { fullAddress, total } = useOrderInfo();
 
   const isPending = ref(false);
-  const confirmedInvoiceStatus = ref();
-  const paidPaymentStatus = ref();
   const invoice = ref();
   const invoice_details = ref();
   const payment_record = ref();
@@ -124,8 +124,8 @@ export default function usePlaceOrder({ onSuccess }) {
     await $patchapi("Invoice", {
       data: {
         id: invoiceId,
-        invoice_status: confirmedInvoiceStatus.value.id,
-        payment_status: paidPaymentStatus.value.id,
+        invoice_status: confirmedInvoiceStatus.id,
+        payment_status: paidPaymentStatus.id,
       },
     });
     await onOrderSuccess();
@@ -288,21 +288,5 @@ export default function usePlaceOrder({ onSuccess }) {
     );
   }
 
-  onMounted(async () => {
-    const [confirmedInvoiceStatusData, paidPaymentStatusData] = [
-      $getdata("Invoice_Status", {
-        filter: { code: "CONFIRMED" },
-        first: true,
-      }),
-      $getdata("Payment_Status", {
-        filter: { code: "PAID" },
-        first: true,
-      }),
-    ];
-
-    confirmedInvoiceStatus.value = confirmedInvoiceStatusData;
-    paidPaymentStatus.value = paidPaymentStatusData;
-  });
-
   return { isPending, placeOrder, testReturnPage, showVietQRModal };
 }
diff --git a/app/pages/vnpay-return.vue b/app/pages/vnpay-return.vue
index 600ac3d..455edb8 100644
--- a/app/pages/vnpay-return.vue
+++ b/app/pages/vnpay-return.vue
@@ -13,7 +13,8 @@ onMounted(async () => {
   } else {
     postMsgToMain(verifyResult.isSuccess && verifyResult.isVerified ? "success" : "error", verifyResult.message);
   }
-  // window.close();
+
+  window.close();
 });
 </script>