erp/web
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Viet An
2026-07-04 15:06:07 +07:00
parent 7e4a12f3d0
commit 24bd08e719
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/components/pos/composables/usePlaceOrder.js
View File

@@ -6,7 +6,9 @@ export default function usePlaceOrder({ onSuccess }) {
const store = useStore(); const store = useStore();
const pendingInvoiceStatus = store.Invoice_Status.find(({ code }) => code === "DRAFT"); 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 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 pendingDeliveryStatus = store.Delivery_Status.find(({ code }) => code === "PENDING");
const posStore = usePosStore(); const posStore = usePosStore();
@@ -15,8 +17,6 @@ export default function usePlaceOrder({ onSuccess }) {
const { fullAddress, total } = useOrderInfo(); const { fullAddress, total } = useOrderInfo();
const isPending = ref(false); const isPending = ref(false);
const confirmedInvoiceStatus = ref();
const paidPaymentStatus = ref();
const invoice = ref(); const invoice = ref();
const invoice_details = ref(); const invoice_details = ref();
const payment_record = ref(); const payment_record = ref();
@@ -124,8 +124,8 @@ export default function usePlaceOrder({ onSuccess }) {
await $patchapi("Invoice", { await $patchapi("Invoice", {
data: { data: {
id: invoiceId, id: invoiceId,
invoice_status: confirmedInvoiceStatus.value.id, invoice_status: confirmedInvoiceStatus.id,
payment_status: paidPaymentStatus.value.id, payment_status: paidPaymentStatus.id,
}, },
}); });
await onOrderSuccess(); 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 }; return { isPending, placeOrder, testReturnPage, showVietQRModal };
} }

3
app/pages/vnpay-return.vue
View File

@@ -13,7 +13,8 @@ onMounted(async () => {
} else { } else {
postMsgToMain(verifyResult.isSuccess && verifyResult.isVerified ? "success" : "error", verifyResult.message); postMsgToMain(verifyResult.isSuccess && verifyResult.isVerified ? "success" : "error", verifyResult.message);
} }
// window.close();
window.close();
}); });
</script> </script>