diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index a7567866b..65e8c4cf2 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -113,6 +113,7 @@ export default { webPayments: 'Web Payments', extendedList: 'Extended list', notifications: 'Notifications', + defaulter: 'Defaulter', createCustomer: 'Create customer', summary: 'Summary', basicData: 'Basic Data', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index c4820e70e..ed658c87c 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -113,6 +113,7 @@ export default { webPayments: 'Pagos Web', extendedList: 'Listado extendido', notifications: 'Notificaciones', + defaulter: 'Morosos', createCustomer: 'Crear cliente', basicData: 'Datos básicos', summary: 'Resumen', diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue new file mode 100644 index 000000000..b35980416 --- /dev/null +++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue @@ -0,0 +1,253 @@ + + + + + + + +es: + Client: Cliente + Is worker: Es trabajador + Salesperson: Comercial + Country: País + P. Method: F. Pago + Balance D.: Saldo V. + Author: Autor + Last observation: Última observación + L. O. Date: Fecha Ú. O. + Credit I.: Crédito A. + From: Desde + diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue new file mode 100644 index 000000000..43ceb1bac --- /dev/null +++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue @@ -0,0 +1,238 @@ + + + + + + + +en: + params: + clientFk: Client + salesPersonFk: Salesperson + countryFk: Country + paymentMethod: P. Method + balance: Balance D. + workerFk: Author + date: L. O. Date + credit: Credit I. + defaulterSinced: From +es: + params: + clientFk: Cliente + salesPersonFk: Comercial + countryFk: País + paymentMethod: F. Pago + balance: Saldo V. + workerFk: Autor + date: Fecha Ú. O. + credit: Crédito A. + defaulterSinced: Desde + Client: Cliente + Salesperson: Comercial + Country: País + P. Method: F. Pago + Balance D.: Saldo V. + Author: Autor + L. O. Date: Fecha Ú. O. + Credit I.: Crédito A. + From: Desde + diff --git a/src/pages/Customer/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue similarity index 100% rename from src/pages/Customer/CustomerExtendedList.vue rename to src/pages/Customer/ExtendedList/CustomerExtendedList.vue diff --git a/src/pages/Customer/CustomerExtendedListActions.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListActions.vue similarity index 95% rename from src/pages/Customer/CustomerExtendedListActions.vue rename to src/pages/Customer/ExtendedList/CustomerExtendedListActions.vue index 882a71936..a7c51d714 100644 --- a/src/pages/Customer/CustomerExtendedListActions.vue +++ b/src/pages/Customer/ExtendedList/CustomerExtendedListActions.vue @@ -4,7 +4,7 @@ import { useRouter } from 'vue-router'; import { useQuasar } from 'quasar'; -import CustomerSummaryDialog from './Card/CustomerSummaryDialog.vue'; +import CustomerSummaryDialog from '../Card/CustomerSummaryDialog.vue'; const { t } = useI18n(); const quasar = useQuasar(); diff --git a/src/pages/Customer/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue similarity index 99% rename from src/pages/Customer/CustomerExtendedListFilter.vue rename to src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue index 0cf614fca..a4d26a78a 100644 --- a/src/pages/Customer/CustomerExtendedListFilter.vue +++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue @@ -565,7 +565,12 @@ const shouldRenderColumn = (colName) => { +<<<<<<< HEAD:src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue +es: + Identifier: Identificador +======= es: +>>>>>>> dev:src/pages/Customer/CustomerExtendedListFilter.vue Social name: Razón social diff --git a/src/pages/Customer/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue similarity index 98% rename from src/pages/Customer/CustomerNotifications.vue rename to src/pages/Customer/Notifications/CustomerNotifications.vue index 91d137763..f9ff66a7b 100644 --- a/src/pages/Customer/CustomerNotifications.vue +++ b/src/pages/Customer/Notifications/CustomerNotifications.vue @@ -8,7 +8,7 @@ import { useArrayData } from 'composables/useArrayData'; import { useStateStore } from 'stores/useStateStore'; import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue'; -import CustomerDescriptorProxy from './Card/CustomerDescriptorProxy.vue'; +import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue'; const { t } = useI18n(); const stateStore = useStateStore(); diff --git a/src/pages/Customer/CustomerNotificationsFilter.vue b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue similarity index 94% rename from src/pages/Customer/CustomerNotificationsFilter.vue rename to src/pages/Customer/Notifications/CustomerNotificationsFilter.vue index 1c4c8f3e2..650158278 100644 --- a/src/pages/Customer/CustomerNotificationsFilter.vue +++ b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue @@ -4,8 +4,8 @@ import { useI18n } from 'vue-i18n'; import FetchData from 'components/FetchData.vue'; import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue'; -import VnSelectFilter from 'components/common/VnSelectFilter.vue'; import VnInput from 'src/components/common/VnInput.vue'; +import VnSelectFilter from 'components/common/VnSelectFilter.vue'; const { t } = useI18n(); const props = defineProps({ @@ -15,18 +15,18 @@ const props = defineProps({ }, }); -const clients = ref(); const cities = ref(); +const clients = ref();