diff --git a/src/boot/axios.js b/src/boot/axios.js index 9b32275bdc..99a163cca7 100644 --- a/src/boot/axios.js +++ b/src/boot/axios.js @@ -5,8 +5,10 @@ import useNotify from 'src/composables/useNotify.js'; const session = useSession(); const { notify } = useNotify(); +const baseUrl = '/api/'; -axios.defaults.baseURL = '/api/'; +axios.defaults.baseURL = baseUrl; +const axiosNoError = axios.create({ baseURL: baseUrl }); const onRequest = (config) => { const token = session.getToken(); @@ -79,5 +81,7 @@ const onResponseError = (error) => { axios.interceptors.request.use(onRequest, onRequestError); axios.interceptors.response.use(onResponse, onResponseError); +axiosNoError.interceptors.request.use(onRequest); +axiosNoError.interceptors.response.use(onResponse); -export { onRequest, onResponseError }; +export { onRequest, onResponseError, axiosNoError }; diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 940c29a5c0..f99244d423 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -285,6 +285,14 @@ globals: createInvoiceIn: Create invoice in myAccount: My account noOne: No one + params: + clientFk: Client id + salesPersonFk: Sales person + warehouseFk: Warehouse + provinceFk: Province + from: From + To: To + stateFk: State errors: statusUnauthorized: Access denied statusInternalServerError: An internal server error has ocurred diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 75bc0513ad..360627fda7 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -289,6 +289,14 @@ globals: createInvoiceIn: Crear factura recibida myAccount: Mi cuenta noOne: Nadie + params: + clientFk: Id cliente + salesPersonFk: Comercial + warehouseFk: Almacén + provinceFk: Provincia + from: Desde + To: Hasta + stateFk: Estado errors: statusUnauthorized: Acceso denegado statusInternalServerError: Ha ocurrido un error interno del servidor diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue index 9a76770aa9..0f9be62986 100644 --- a/src/pages/Entry/EntryBuysTableDialog.vue +++ b/src/pages/Entry/EntryBuysTableDialog.vue @@ -116,7 +116,7 @@ const entriesTableColumns = computed(() => [ {{ col.value }} - {{ t('printLabel') }} + {{ t('viewLabel') }} diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml index f0965b097b..a9faa814bd 100644 --- a/src/pages/Entry/locale/en.yml +++ b/src/pages/Entry/locale/en.yml @@ -11,4 +11,4 @@ shipped: Shipped fromShipped: Shipped(from) toShipped: Shipped(to) printLabels: Print stickers -printLabel: Print sticker +viewLabel: View sticker diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml index aba04571e9..eb1e3f88ad 100644 --- a/src/pages/Entry/locale/es.yml +++ b/src/pages/Entry/locale/es.yml @@ -15,4 +15,4 @@ shipped: F. salida fromShipped: F. salida(desde) toShipped: F. salida(hasta) printLabels: Imprimir etiquetas -printLabel: Imprimir etiqueta +viewLabel: Ver etiqueta diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue index 167a104656..3c95f5cdd6 100644 --- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue +++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue @@ -40,7 +40,7 @@ const handleScopeDays = (params, days, callback) => { @@ -64,7 +64,7 @@ const handleScopeDays = (params, days, callback) => { @@ -105,7 +105,7 @@ const handleScopeDays = (params, days, callback) => { outlined dense rounded - :label="t('params.salesPersonFk')" + :label="t('globals.params.salesPersonFk')" v-model="params.salesPersonFk" url="Workers/search" :params="{ departmentCodes: ['VT'] }" @@ -158,7 +158,7 @@ const handleScopeDays = (params, days, callback) => { outlined dense rounded - :label="t('params.stateFk')" + :label="t('globals.params.stateFk')" v-model="params.stateFk" url="States" is-outlined @@ -184,7 +184,7 @@ const handleScopeDays = (params, days, callback) => { outlined dense rounded - :label="t('params.warehouseFk')" + :label="t('globals.params.warehouseFk')" v-model="params.warehouseFk" :options="warehouses" /> @@ -196,7 +196,7 @@ const handleScopeDays = (params, days, callback) => { outlined dense rounded - :label="t('params.provinceFk')" + :label="t('globals.params.provinceFk')" v-model="params.provinceFk" url="Provinces" /> @@ -235,22 +235,15 @@ const handleScopeDays = (params, days, callback) => { en: params: - clientFk: Client id orderFk: Order id scopeDays: Days onward nickname: Nickname - salesPersonFk: Sales person refFk: Invoice agencyModeFk: Agency - stateFk: State groupedStates: Grouped State - warehouseFk: Warehouse - provinceFk: Province myTeam: My team problems: With problems pending: Pending - from: From - to: To alertLevel: Grouped State FREE: Free DELIVERED: Delivered @@ -261,22 +254,15 @@ en: es: params: - clientFk: Id cliente orderFk: Id cesta scopeDays: Días en adelante nickname: Nombre mostrado - salesPersonFk: Comercial refFk: Factura agencyModeFk: Agencia - stateFk: Estado groupedStates: Estado agrupado - warehouseFk: Almacén - provinceFk: Provincia myTeam: Mi equipo problems: Con problemas pending: Pendiente - from: Desde - To: Hasta alertLevel: Estado agrupado FREE: Libre DELIVERED: Servido diff --git a/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue b/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue index 4950ab3813..f1c3475881 100644 --- a/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue +++ b/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue @@ -3,7 +3,7 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';