diff --git a/app/components/pos/composables/usePlaceOrder.js b/app/components/pos/composables/usePlaceOrder.js index 2b06d36..9255249 100644 --- a/app/components/pos/composables/usePlaceOrder.js +++ b/app/components/pos/composables/usePlaceOrder.js @@ -15,6 +15,7 @@ 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(); @@ -119,10 +120,11 @@ export default function usePlaceOrder({ onSuccess }) { await createDeliveryInfo(invoiceId); } - // update invoice.payment_status from PENDING to PAID + // update invoice's statuses await $patchapi("Invoice", { data: { id: invoiceId, + invoice_status: confirmedInvoiceStatus.value.id, payment_status: paidPaymentStatus.value.id, }, }); @@ -287,10 +289,19 @@ export default function usePlaceOrder({ onSuccess }) { } onMounted(async () => { - paidPaymentStatus.value = await $getdata("Payment_Status", { - filter: { code: "PAID" }, - first: true, - }); + 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 };