From 23d97a5f633a93b08b5f029ce1f7c797c578e419 Mon Sep 17 00:00:00 2001 From: taro Date: Tue, 8 Apr 2025 01:44:10 -0300 Subject: [PATCH] refactor(CheckoutView): use Salix for getOrder --- src/pages/Ecomerce/CheckoutView.vue | 37 ++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/src/pages/Ecomerce/CheckoutView.vue b/src/pages/Ecomerce/CheckoutView.vue index 3d7f3075..67ce9710 100644 --- a/src/pages/Ecomerce/CheckoutView.vue +++ b/src/pages/Ecomerce/CheckoutView.vue @@ -198,6 +198,31 @@ const getAddresses = async (clientFk) => { } }; +const getOrder = async (orderId) => { + const { data } = await api.get(`Orders/${orderId}`, { + params: { + filter: JSON.stringify({ + include: [ + { + relation: 'deliveryMethod', + scope: { + fields: ['code'], + }, + }, + ], + fields: [ + 'id', + 'delivery_method_id', + 'landed', + 'agencyModeFk', + 'addressFk', + ] + }) + } + }); + return data; +}; + const getAgencies = async () => { try { const agenciesInZone = await api.get('Agencies/landsThatDay', { @@ -373,17 +398,11 @@ onMounted(async () => { if (route.params.id) { notify(t('rememberReconfiguringImpact'), 'warning'); - const [order] = await jApi.query( - `SELECT m.code deliveryMethod, o.sent, o.agencyModeFk, o.addressFk - FROM myOrder o - JOIN vn.deliveryMethod m ON m.id = o.deliveryMethodFk - WHERE o.id = #id`, - { id: route.params.id } - ); + const order = await getOrder(route.params.id); if (order) { - orderForm.value.method = order.deliveryMethod; - orderForm.value.date = formatDate(order.sent, 'YYYY/MM/DD'); + orderForm.value.method = order.deliveryMethod.code; + orderForm.value.date = formatDate(order.landed, 'YYYY/MM/DD'); orderForm.value.agency = order.agencyModeFk; orderForm.value.address = order.addressFk; }