From 31b9898dc631e200fff3fc39e7cf6c1a75c1e173 Mon Sep 17 00:00:00 2001 From: taro Date: Fri, 28 Feb 2025 04:05:54 -0300 Subject: [PATCH] ... --- src/pages/Ecomerce/PendingOrders.vue | 44 +++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/src/pages/Ecomerce/PendingOrders.vue b/src/pages/Ecomerce/PendingOrders.vue index c9257cb2..b7ad27b1 100644 --- a/src/pages/Ecomerce/PendingOrders.vue +++ b/src/pages/Ecomerce/PendingOrders.vue @@ -13,6 +13,7 @@ import { useAppStore } from 'stores/app'; import { storeToRefs } from 'pinia'; const jApi = inject('jApi'); +const api = inject('api'); const { t } = useI18n(); const { openConfirmationModal } = useVnConfirm(); const { notify } = useNotify(); @@ -26,15 +27,44 @@ const orders = ref([]); const getOrders = async () => { try { loading.value = true; - orders.value = await jApi.query( + const ordersResponse = await jApi.query( `SELECT o.id, o.sent, o.deliveryMethodFk, o.taxableBase, - a.nickname, am.description agency - FROM myOrder o - JOIN myAddress a ON a.id = o.addressFk - JOIN vn.agencyMode am ON am.id = o.agencyModeFk - WHERE NOT o.isConfirmed - ORDER BY o.sent DESC` + a.nickname, am.description agency + FROM myOrder o + JOIN myAddress a ON a.id = o.addressFk + JOIN vn.agencyMode am ON am.id = o.agencyModeFk + WHERE NOT o.isConfirmed + ORDER BY o.sent DESC` ); + console.log('ordersResponse', ordersResponse); + orders.value = ordersResponse; + + const queryParams = new URLSearchParams([ + ['filter[include]', 'address'], + ['filter[include]', 'agencyMode'], + ['filter[where][isConfirmed]', 0], + ]); + const salixUrl = `Orders?${queryParams}`; + + console.log('salixUrl', salixUrl); + + const salixOrders = await api.get(salixUrl); + + console.log('salixOrders', salixOrders); + + const salixOrdersMapped = salixOrders.data.map(order => ({ + id: order.id, + sent: order.landed, // the other API converts it to a js Date automagically! + deliveryMethodFk: order.delivery_method_id, + taxableBase: order.taxableBase, // currently missing from the salix mapping + nickname: order.address.nickname, + agency: order.agencyMode.description, + })) + + console.log('salixOrdersMapped', salixOrdersMapped); + // console.log('hola mundo orders.value', orders.value); + // console.log('hola mundo orders.value[0]', orders.value[0]); + // console.log('hola mundo orders.value[..]', [...orders.value]); loading.value = false; } catch (error) { console.error('Error getting orders:', error);