diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue index 2eac97c65..1721adfec 100644 --- a/src/components/LeftMenu.vue +++ b/src/components/LeftMenu.vue @@ -206,6 +206,17 @@ async function togglePinned(item, event) { diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 3ce317a33..fee7e923c 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -135,6 +135,8 @@ export default { log: 'Log', sms: 'Sms', creditManagement: 'Credit management', + creditContracts: 'Credit contracts', + creditOpinion: 'Credit opinion', others: 'Others', }, list: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index d91b5fc8d..49a23faf6 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -135,6 +135,8 @@ export default { log: 'Historial', sms: 'Sms', creditManagement: 'Gestión de crédito', + creditContracts: 'Contratos de crédito', + creditOpinion: 'Opinión de crédito', others: 'Otros', }, list: { diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue index 9e44f67f5..184667d6e 100644 --- a/src/pages/Customer/Card/CustomerBalance.vue +++ b/src/pages/Customer/Card/CustomerBalance.vue @@ -1,3 +1,282 @@ + + + + +es: + Company: Empresa + Total by company: Total por empresa + New payment: Añadir pago + Date: Fecha + Creation date: Fecha de creación + Employee: Empleado + Reference: Referencia + Bank: Caja + Debit: Debe + Havings: Haber + Balance: Balance + Conciliated: Conciliado + diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue index 4ddf1dea1..ad666ff32 100644 --- a/src/pages/Customer/Card/CustomerConsignees.vue +++ b/src/pages/Customer/Card/CustomerConsignees.vue @@ -137,21 +137,15 @@ const toCustomerConsigneeEdit = (consigneeId) => { - - - - - {{ t('New consignee') }} - - + + + + {{ t('New consignee') }} + + + + +es: + Total: Total + Date: Fecha + Created by: Creado por + Comment: Comentario + Type: Tipo + Amount: Importe + New greuge: Nuevo greuge + diff --git a/src/pages/Customer/Card/CustomerLog.vue b/src/pages/Customer/Card/CustomerLog.vue index fe59bf2dc..36d79959d 100644 --- a/src/pages/Customer/Card/CustomerLog.vue +++ b/src/pages/Customer/Card/CustomerLog.vue @@ -1,3 +1,262 @@ + + + + +es: + Search: Buscar + Search by id or concept: xxx + Entity: Entidad + All: Todo + User: Usuario + System: Sistema + Changes: Cambios + Search by changes: xxx + Creates: Crea + Edits: Modifica + Deletes: Elimina + Accesses: Accede + Date: Fecha + To: Hasta + Quit filter: Quitar filtro + diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue index 09f5c0ce6..781c57e50 100644 --- a/src/pages/Customer/Card/CustomerNotes.vue +++ b/src/pages/Customer/Card/CustomerNotes.vue @@ -62,7 +62,7 @@ const toCustomerNoteCreate = () => { +import { ref, computed, onBeforeMount } from 'vue'; +import { useI18n } from 'vue-i18n'; +import { useRoute, useRouter } from 'vue-router'; + +import { date, QBtn } from 'quasar'; + +import { useArrayData } from 'composables/useArrayData'; +import { useStateStore } from 'stores/useStateStore'; +import { toCurrency } from 'src/filters'; + +import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; + +const { t } = useI18n(); +const route = useRoute(); +const router = useRouter(); +const stateStore = useStateStore(); + +const arrayData = ref(null); +const workerId = ref(0); +const rows = computed(() => arrayData.value.store.data); + +onBeforeMount(async () => { + const filter = { + where: { clientFk: `${route.params.id}` }, + order: ['started DESC'], + limit: 20, + }; + + arrayData.value = useArrayData('CustomerRecoveriesCard', { + url: 'Recoveries', + filter, + }); + await arrayData.value.fetch({ append: false }); + stateStore.rightDrawer = true; +}); + +const tableColumnComponents = { + since: { + component: 'span', + props: () => {}, + event: () => {}, + }, + to: { + component: 'span', + props: () => {}, + event: () => {}, + }, + amount: { + component: 'span', + props: () => {}, + event: () => {}, + }, + period: { + component: 'span', + props: () => {}, + event: () => {}, + }, +}; + +const columns = computed(() => [ + { + align: 'left', + field: 'started', + label: t('Since'), + name: 'since', + format: (value) => date.formatDate(value, 'DD/MM/YYYY'), + }, + { + align: 'left', + field: 'finished', + label: t('To'), + name: 'to', + format: (value) => date.formatDate(value, 'DD/MM/YYYY'), + }, + { + align: 'left', + field: 'amount', + label: t('Amount'), + name: 'amount', + format: (value) => toCurrency(value), + }, + { + align: 'left', + field: 'period', + label: t('Period'), + name: 'period', + }, +]); + +const toCustomerRecoverieCreate = () => { + router.push({ name: 'CustomerRecoverieCreate' }); +}; + + + + + + +es: + Since: Desde + To: Hasta + Amount: Importe + Period: Periodo + New recoverie: Nuevo recobro + diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue index 95ec77c3d..d3be7bec8 100644 --- a/src/pages/Customer/Card/CustomerWebAccess.vue +++ b/src/pages/Customer/Card/CustomerWebAccess.vue @@ -1,3 +1,69 @@ + + + + +es: + Enable web access: Habilitar acceso web + User: Usuario + Recovery email: Correo de recuperacion + This email is used for user to regain access their account: Este correo electrónico se usa para que el usuario recupere el acceso a su cuenta + diff --git a/src/pages/Customer/components/CustomerConsigneeCreate.vue b/src/pages/Customer/components/CustomerConsigneeCreate.vue index 7bc6c2e88..ef01879c2 100644 --- a/src/pages/Customer/components/CustomerConsigneeCreate.vue +++ b/src/pages/Customer/components/CustomerConsigneeCreate.vue @@ -12,7 +12,7 @@ import VnInput from 'src/components/common/VnInput.vue'; import VnSelectFilter from 'src/components/common/VnSelectFilter.vue'; import VnSelectDialog from 'src/components/common/VnSelectDialog.vue'; import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue'; -import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue'; +import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue'; const { t } = useI18n(); const route = useRoute(); @@ -232,7 +232,7 @@ const toCustomerConsignees = () => { v-model="data.customsAgentFk" > diff --git a/src/pages/Customer/components/CustomerGreugeCreate.vue b/src/pages/Customer/components/CustomerGreugeCreate.vue new file mode 100644 index 000000000..1ff467d97 --- /dev/null +++ b/src/pages/Customer/components/CustomerGreugeCreate.vue @@ -0,0 +1,93 @@ + + + + + + + +es: + Amount: Importe + Date: Fecha + Comment: Comentario + Type: Tipo + diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue new file mode 100644 index 000000000..fc0c52b0f --- /dev/null +++ b/src/pages/Customer/components/CustomerNewPayment.vue @@ -0,0 +1,286 @@ + + + + + +es: + New payment: Añadir pago + Date: Fecha + Company: Empresa + Bank: Caja + Amount: Importe + Reference: Referencia + Cash: Efectivo + Delivered amount: Cantidad entregada + Amount to return: Cantidad a devolver + View recipt: Ver recibido + Send email: Enviar correo + Compensation: Compensación + Compensation account: Cuenta para compensar + diff --git a/src/pages/Customer/components/CustomerNoteCreate.vue b/src/pages/Customer/components/CustomerNoteCreate.vue index cea90f975..640f6f3a0 100644 --- a/src/pages/Customer/components/CustomerNoteCreate.vue +++ b/src/pages/Customer/components/CustomerNoteCreate.vue @@ -32,8 +32,8 @@ const toCustomerNotes = () => { -{ - "en": { - "deleteShelving": "Delete Shelving" - }, - "es": { - "deleteShelving": "Eliminar carro" - } -} +es: + Confirm deletion: Confirmar eliminación + Are you sure you want to delete this shelving?: ¿Seguro que quieres eliminar este carro? + Delete Shelving: Eliminar carro diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue index 6767f6d97..abc91373b 100644 --- a/src/pages/Shelving/Card/ShelvingFilter.vue +++ b/src/pages/Shelving/Card/ShelvingFilter.vue @@ -114,9 +114,11 @@ en: parkingFk: Parking userFk: Worker isRecyclable: Recyclable + search: Search es: params: parkingFk: Parking userFk: Trabajador isRecyclable: Reciclable + search: Contiene diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue index e9e5e68c3..238879bd4 100644 --- a/src/pages/Shelving/Card/ShelvingForm.vue +++ b/src/pages/Shelving/Card/ShelvingForm.vue @@ -1,7 +1,7 @@