diff --git a/CHANGELOG.md b/CHANGELOG.md index e34523545..fd8a900b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- (Worker) => Se crea la sección Taquilla + ### Fixed - (General) => Se vuelven a mostrar los parámetros en la url al aplicar un filtro diff --git a/quasar.config.js b/quasar.config.js index dd7a91002..b59c62eeb 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) { // app boot file (/src/boot) // --> boot files are part of "main.js" // https://v2.quasar.dev/quasar-cli/boot-files - boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar.defaults'], + boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'], // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css css: ['app.scss'], diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue index fd8570176..064ad1631 100644 --- a/src/components/CreateNewPostcodeForm.vue +++ b/src/components/CreateNewPostcodeForm.vue @@ -127,9 +127,10 @@ const onProvinceCreated = async ({ name }, formData) => { - - - + { async function fetch() { try { - const { data } = await axios.get($props.url, { + let { data } = await axios.get($props.url, { params: { filter: JSON.stringify($props.filter) }, }); + + if (Array.isArray(data)) data = data[0] ?? {}; + state.set($props.model, data); originalData.value = data && JSON.parse(JSON.stringify(data)); diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue index 6d0badffb..a062e4d80 100644 --- a/src/components/common/VnCard.vue +++ b/src/components/common/VnCard.vue @@ -1,5 +1,5 @@ + + diff --git a/src/pages/Monitor/MonitorMain.vue b/src/pages/Monitor/MonitorMain.vue new file mode 100644 index 000000000..c1f2a31db --- /dev/null +++ b/src/pages/Monitor/MonitorMain.vue @@ -0,0 +1,18 @@ + + + diff --git a/src/pages/Monitor/SalesClientsTable.vue b/src/pages/Monitor/SalesClientsTable.vue new file mode 100644 index 000000000..3f2389471 --- /dev/null +++ b/src/pages/Monitor/SalesClientsTable.vue @@ -0,0 +1,219 @@ + + + diff --git a/src/pages/Monitor/SalesOrdersTable.vue b/src/pages/Monitor/SalesOrdersTable.vue new file mode 100644 index 000000000..d8e28f6b7 --- /dev/null +++ b/src/pages/Monitor/SalesOrdersTable.vue @@ -0,0 +1,203 @@ + + + + diff --git a/src/pages/Monitor/SalesTicketsTable.vue b/src/pages/Monitor/SalesTicketsTable.vue new file mode 100644 index 000000000..f451123e9 --- /dev/null +++ b/src/pages/Monitor/SalesTicketsTable.vue @@ -0,0 +1,636 @@ + + + diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml new file mode 100644 index 000000000..f58db7854 --- /dev/null +++ b/src/pages/Monitor/locale/en.yml @@ -0,0 +1,45 @@ +salesMonitor: + clientsOnWebsite: Clients on website + recentOrderActions: Recent order actions + ticketsMonitor: Tickets monitor +salesClientsTable: + from: From + to: To + date: Date + hour: Hour + salesPerson: Salesperson + client: Client +salesOrdersTable: + delete: Delete + date: Date + client: Client + salesPerson: Salesperson + deleteConfirmTitle: Delete selected elements + deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue? +salesTicketsTable: + autoRefresh: Auto-refresh + problems: Problems + noVerifiedData: No verified data + notVisible: Not visible + purchaseRequest: Purchase request + clientFrozen: Client frozen + risk: Risk + componentLack: Component lack + tooLittle: Ticket too little + identifier: Identifier + client: Client + salesPerson: Salesperson + date: Date + theoretical: Theoretical + practical: Practical + province: Province + state: State + isFragile: Is fragile + zone: Zone + goToLines: Go to lines + preview: Preview + total: Total + preparation: Preparation +searchBar: + label: Search tickets + info: Search tickets by id or alias diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml new file mode 100644 index 000000000..918b51813 --- /dev/null +++ b/src/pages/Monitor/locale/es.yml @@ -0,0 +1,45 @@ +salesMonitor: + clientsOnWebsite: Clientes activos en la web + recentOrderActions: Acciones recientes en pedidos + ticketsMonitor: Monitor de tickets +salesClientsTable: + from: Desde + to: Hasta + date: Fecha + hour: Hora + salesPerson: Comercial + client: Cliente +salesOrdersTable: + delete: Eliminar + date: Fecha + client: Cliente + salesPerson: Comercial + deleteConfirmTitle: Eliminar los elementos seleccionados + deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar? +salesTicketsTable: + autoRefresh: Auto-refresco + problems: Problemas + noVerifiedData: Sin datos comprobados + notVisible: No visible + purchaseRequest: Petición de compra + clientFrozen: Cliente congelado + risk: Riesgo + componentLack: Faltan componentes + tooLittle: Ticket demasiado pequeño + identifier: Identificador + client: Cliente + salesPerson: Comercial + date: Fecha + theoretical: Teórica + practical: Práctica + province: Provincia + state: Estado + isFragile: Es frágil + zone: Zona + goToLines: Ir a líneas + preview: Vista previa + total: Total + preparation: Preparación +searchBar: + label: Buscar tickets + info: Buscar tickets por identificador o alias diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue new file mode 100644 index 000000000..02cccaff2 --- /dev/null +++ b/src/pages/Ticket/Card/TicketSale.vue @@ -0,0 +1 @@ + diff --git a/src/pages/Worker/Card/WorkerLocker.vue b/src/pages/Worker/Card/WorkerLocker.vue new file mode 100644 index 000000000..171074b20 --- /dev/null +++ b/src/pages/Worker/Card/WorkerLocker.vue @@ -0,0 +1,64 @@ + + diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml index 86dd9d0d9..a960dffe6 100644 --- a/src/pages/Worker/locale/es.yml +++ b/src/pages/Worker/locale/es.yml @@ -1,2 +1,3 @@ Search worker: Buscar trabajador You can search by worker id or name: Puedes buscar por id o nombre del trabajador +Locker: Taquilla diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue index 5d57b920e..7a2c505fa 100644 --- a/src/pages/Zone/Card/ZoneBasicData.vue +++ b/src/pages/Zone/Card/ZoneBasicData.vue @@ -1,34 +1,24 @@ - +