diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fffb1b53..436ef4eb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- Added... +- (Clientes) => Añadida nueva sección "Pagos Web" para gestionar los pagos de todos los clientes +- (Tickets) => Añadida opción en el menú desplegable del ticket para enviar SMS al cliente +- (Reclamaciones) => Añadida nueva sección "Registros de auditoría" +- (Trabajadores) => Añádido módulo de trabajadores +- (General) => Añadida barra de búsqueda general en los listados principales ### Changed diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue index e61b4b6c4..d361838e1 100644 --- a/src/components/ui/VnFilterPanel.vue +++ b/src/components/ui/VnFilterPanel.vue @@ -141,8 +141,11 @@ function formatValue(value) { -
- {{ t(`You didn't enter any filter`) }} +
+ {{ t(`No filters applied`) }}
es: - You didn't enter any filter: No has introducido ningún filtro + No filters applied: No se han aplicado filtros Applied filters: Filtros aplicados Remove filters: Eliminar filtros Refresh: Refrescar diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue index 7585f09b3..115530713 100644 --- a/src/components/ui/VnSearchbar.vue +++ b/src/components/ui/VnSearchbar.vue @@ -51,18 +51,27 @@ const props = defineProps({ const router = useRouter(); const route = useRoute(); -const arrayData = useArrayData(props.dataKey, { - url: props.url, - filter: props.filter, - where: props.where, - limit: props.limit, - order: props.order, - userParams: props.userParams, -}); -const store = arrayData.store; +let arrayData = null; +let store = null; const searchText = ref(''); onMounted(() => { + const options = {}; + if (props.url) { + options.url = props.url; + } + if (props.filter) { + options.filter = props.filter; + } + + // url: props.url, + // filter: props.filter, + // where: props.where, + // limit: props.limit, + // order: props.order, + // userParams: props.userParams, + arrayData = useArrayData(props.dataKey, options); + store = arrayData.store; const params = store.userParams; if (params && params.search) { searchText.value = params.search; diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index be4603ea8..87c427c74 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -61,6 +61,7 @@ export default { customers: 'Customers', list: 'List', createCustomer: 'Create customer', + webPayments: 'Web Payments', summary: 'Summary', basicData: 'Basic Data', }, diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index b3336ca7a..44dc595c2 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -61,8 +61,9 @@ export default { customers: 'Clientes', list: 'Listado', createCustomer: 'Crear cliente', - summary: 'Resumen', basicData: 'Datos básicos', + summary: 'Resumen', + webPayments: 'Web Payments' }, list: { phone: 'Teléfono', diff --git a/src/pages/Customer/CustomerPayments.vue b/src/pages/Customer/CustomerPayments.vue new file mode 100644 index 000000000..73398288c --- /dev/null +++ b/src/pages/Customer/CustomerPayments.vue @@ -0,0 +1,245 @@ + + + + + + + +es: + Confirm transaction: Confirmar transacción + Transaction ID: ID transacción + Customer ID: ID cliente + Customer Name: Nombre cliente + State: Estado + Dated: Fecha + Amount: Importe + Actions: Acciones + Confirmed: Confirmada + Unconfirmed: Sin confirmar + diff --git a/src/pages/Customer/CustomerPaymentsFilter.vue b/src/pages/Customer/CustomerPaymentsFilter.vue new file mode 100644 index 000000000..1d26b2d6a --- /dev/null +++ b/src/pages/Customer/CustomerPaymentsFilter.vue @@ -0,0 +1,78 @@ + + + + + +en: + params: + orderFk: Order + clientFk: Customer + amount: Amount +es: + params: + orderFk: Pedido + clientFk: Cliente + amount: Importe + Order ID: ID pedido + Customer ID: ID cliente + Amount: Importe + diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js index 7b48413f2..c7e978eec 100644 --- a/src/router/modules/customer.js +++ b/src/router/modules/customer.js @@ -10,7 +10,7 @@ export default { component: RouterView, redirect: { name: 'CustomerMain' }, menus: { - main: ['CustomerList', 'CustomerCreate'], + main: ['CustomerList', 'CustomerPayments', 'CustomerCreate'], card: ['CustomerBasicData'], }, children: [ @@ -29,6 +29,15 @@ export default { }, component: () => import('src/pages/Customer/CustomerList.vue') }, + { + path: 'payments', + name: 'CustomerPayments', + meta: { + title: 'webPayments', + icon: 'vn:onlinepayment', + }, + component: () => import('src/pages/Customer/CustomerPayments.vue') + }, { path: 'create', name: 'CustomerCreate',