diff --git a/src/pages/Ecomerce/ConfirmView.vue b/src/pages/Ecomerce/ConfirmView.vue index edc6c49f..0d0352e6 100644 --- a/src/pages/Ecomerce/ConfirmView.vue +++ b/src/pages/Ecomerce/ConfirmView.vue @@ -10,6 +10,7 @@ import useNotify from 'src/composables/useNotify.js'; import { currency } from 'src/lib/filters.js'; import { tpvStore } from 'stores/tpv'; import { useQuasar } from 'quasar'; +import { onUserId } from 'src/utils/onUserId'; const $q = useQuasar(); const jApi = inject('jApi'); @@ -76,9 +77,56 @@ const paymentOptionsArray = computed(() => { ); }); -const getOrder = async () => { +const getOrder = async (clientFk) => { try { - debugger; + const { data: orderTaxes } = await api.get(`Orders/${orderId.value}/getTaxes`); + console.log('orderTaxes', orderTaxes); + + // [ + // { + // "orderFk": 84, + // "taxableBase": 70, + // "code": "R", + // "tax": 7 + // } + // ] + + const filter = { + where: { + clientFk, + isConfirmed: false, + source_app: 'WEB', + }, + include: [ + { + relation: 'address', + scope: { + fields: ['nickname', 'city'], + } + }, + { + relation: 'agencyMode', + scope: { + fields: ['description'], + } + }, + ], + fields: [ + 'id', + 'landed', + 'delivery_method_id', + 'taxableBase', + 'addressFk', + 'agencyModeFk' + ] + }; + + const { data: salixOrders } = await api.get(`Orders/${orderId.value}`, { + params: { + filter: JSON.stringify(filter) + } + }); + const { results } = await jApi.execQuery( `CALL myOrder_getTax(#id); @@ -170,10 +218,11 @@ const getTransferAccounts = async () => { }; const fetchData = async () => { - await getOrder(); await getTransferAccounts(); }; +onUserId(getOrder); + const modifyOrder = () => { router.push({ name: 'basket', params: { id: orderId.value } }); };