From f2ef6c1c4eb04c444dad30d4182760e76335c2c5 Mon Sep 17 00:00:00 2001 From: jtubau Date: Mon, 3 Feb 2025 11:33:51 +0100 Subject: [PATCH] refactor: refs #7322 update API functions to accept filters for enhanced data retrieval --- src/i18n/locale/en.yml | 44 +------------------ .../Customer/composables/getAddresses.js | 3 +- src/pages/Customer/composables/getClient.js | 3 +- .../Route/Agency/composables/getAgencies.js | 7 ++- 4 files changed, 11 insertions(+), 46 deletions(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 3cce2a853..ad0165e2d 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -377,7 +377,7 @@ login: loginError: Invalid username or password fieldRequired: This field is required twoFactorRequired: Two-factor verification required -twoFactorRequired: +twoFactor: validate: Validate insert: Enter the verification code explanation: >- @@ -456,48 +456,6 @@ ticket: consigneeStreet: Street create: address: Address -invoiceOut: - card: - issued: Issued - customerCard: Customer card - ticketList: Ticket List - summary: - issued: Issued - dued: Due - booked: Booked - taxBreakdown: Tax breakdown - taxableBase: Taxable base - rate: Rate - fee: Fee - tickets: Tickets - totalWithVat: Amount - globalInvoices: - errors: - chooseValidClient: Choose a valid client - chooseValidCompany: Choose a valid company - chooseValidPrinter: Choose a valid printer - chooseValidSerialType: Choose a serial type - fillDates: Invoice date and the max date should be filled - invoiceDateLessThanMaxDate: Invoice date can not be less than max date - invoiceWithFutureDate: Exists an invoice with a future date - noTicketsToInvoice: There are not tickets to invoice - criticalInvoiceError: 'Critical invoicing error, process stopped' - invalidSerialTypeForAll: The serial type must be global when invoicing all clients - table: - addressId: Address id - streetAddress: Street - statusCard: - percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}' - pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs' - negativeBases: - clientId: Client Id - base: Base - active: Active - hasToInvoice: Has to Invoice - verifiedData: Verified Data - comercial: Comercial - errors: - downloadCsvFailed: CSV download failed department: chat: Chat bossDepartment: Boss Department diff --git a/src/pages/Customer/composables/getAddresses.js b/src/pages/Customer/composables/getAddresses.js index eecc0150b..e65e64455 100644 --- a/src/pages/Customer/composables/getAddresses.js +++ b/src/pages/Customer/composables/getAddresses.js @@ -1,8 +1,9 @@ import axios from 'axios'; -export async function getAddresses(clientId) { +export async function getAddresses(clientId, _filter = {}) { if (!clientId) return; const filter = { + ..._filter, fields: ['nickname', 'street', 'city', 'id'], where: { isActive: true }, order: 'nickname ASC', diff --git a/src/pages/Customer/composables/getClient.js b/src/pages/Customer/composables/getClient.js index ecacc67c0..3b9e811de 100644 --- a/src/pages/Customer/composables/getClient.js +++ b/src/pages/Customer/composables/getClient.js @@ -1,7 +1,8 @@ import axios from 'axios'; -export async function getClient(clientId) { +export async function getClient(clientId, _filter = {}) { const filter = { + ..._filter, include: { relation: 'defaultAddress', scope: { diff --git a/src/pages/Route/Agency/composables/getAgencies.js b/src/pages/Route/Agency/composables/getAgencies.js index dd1370a55..850f87456 100644 --- a/src/pages/Route/Agency/composables/getAgencies.js +++ b/src/pages/Route/Agency/composables/getAgencies.js @@ -1,11 +1,16 @@ import axios from 'axios'; import agency from 'src/router/modules/agency'; -export async function getAgencies(formData, client) { +export async function getAgencies(formData, client, _filter = {}) { if (!formData.warehouseId || !formData.addressId || !formData.landed) return; + const filter = { + ..._filter + }; + let defaultAgency = null; let params = { + filter: JSON.stringify(filter), warehouseFk: formData.warehouseId, addressFk: formData.addressId, landed: formData.landed,