diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index f24eb3457..6e95963a8 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -421,6 +421,10 @@ export default { addressId: 'Address id', streetAddress: 'Street', }, + statusCard: { + percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}', + pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs', + }, }, negativeBases: { from: 'From', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 5e1b999ac..800e3ea89 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -423,6 +423,10 @@ export default { addressId: 'Id dirección', streetAddress: 'Dirección fiscal', }, + statusCard: { + percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}', + pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs', + }, }, negativeBases: { from: 'Desde', @@ -604,7 +608,7 @@ export default { notes: 'Notas', verified: 'Verificado', isActive: 'Está activo', - billingData: 'Billing data', + billingData: 'Forma de pago', payMethod: 'Método de pago', payDeadline: 'Plazo de pago', payDay: 'Día de pago', diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index ab818704b..bd46d1ad7 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -125,7 +125,7 @@ const statesFilter = {
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue index ac8f4f0db..8d1117f15 100644 --- a/src/pages/Claim/ClaimFilter.vue +++ b/src/pages/Claim/ClaimFilter.vue @@ -167,7 +167,7 @@ const states = ref();
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue index 5ab66b574..7284ca04e 100644 --- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue +++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue @@ -105,11 +105,20 @@ onUnmounted(() => { - {{ t(`status.${status}`) }} + {{ t(`status.${status}`) }} {{ - `${getPercentage}% (${getAddressNumber} ${t('of')} ${getNAddresses})` + t('invoiceOut.globalInvoices.statusCard.percentageText', { + getPercentage: getPercentage, + getAddressNumber: getAddressNumber, + getNAddresses: getNAddresses, + }) + }} + {{ + t('invoiceOut.globalInvoices.statusCard.pdfsNumberText', { + nPdfs: nPdfs, + totalPdfs: totalPdfs, + }) }} - {{ `${nPdfs} ${t('of')} ${totalPdfs} PDFs` }} @@ -149,7 +158,7 @@ onUnmounted(() => { display: flex; justify-content: center; width: 100%; - background-color: #292929; + background-color: var(--vn-dark); padding: 16px; .card-section { @@ -158,14 +167,9 @@ onUnmounted(() => { padding: 0px; } - .status-text { - font-size: 14px; - color: white; - } - .text { font-size: 14px; - color: #aaaaaa; + color: var(--vn-text); } } @@ -176,24 +180,19 @@ onUnmounted(() => { - { - "en": { - "status": { - "packageInvoicing": "Build packaging tickets", - "invoicing": "Invoicing client", - "stopping": "Stopping process", - "done": "Ended process" - }, - "of": "of" - }, - "es": { - "status":{ - "packageInvoicing": "Generación de tickets de empaque", - "invoicing": "Facturando a cliente", - "stopping": "Deteniendo proceso", - "done": "Proceso detenido", - }, - "of": "de" - } - } +en: + status: + packageInvoicing: Build packaging tickets + invoicing: Invoicing client + stopping: Stopping process + done: Ended process + of: of + +es: + status: + packageInvoicing: Generación de tickets de empaque + invoicing: Facturando a cliente + stopping: Deteniendo proceso + done: Proceso detenido + of: de diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue index 05b642f1f..05c55bfe2 100644 --- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue +++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue @@ -130,7 +130,7 @@ onMounted(async () => {
@@ -159,7 +159,7 @@ onMounted(async () => {
@@ -223,28 +223,25 @@ onMounted(async () => { - { - "en": { - "invoiceDate": "Invoice date", - "maxShipped": "Max date", - "allClients": "All clients", - "oneClient": "One client", - "company": "Company", - "printer": "Printer", - "invoiceOut": "Invoice out", - "client": "Client", - "stop": "Stop" - }, - "es": { - "invoiceDate": "Fecha de factura", - "maxShipped": "Fecha límite", - "allClients": "Todos los clientes", - "oneClient": "Un solo cliente", - "company": "Empresa", - "printer": "Impresora", - "invoiceOut": "Facturar", - "client": "Cliente", - "stop": "Parar" - } - } +en: + invoiceDate: Invoice date + maxShipped: Max date + allClients: All clients + oneClient: One client + company: Company + printer: Printer + invoiceOut: Invoice out + client: Client + stop: Stop + +es: + invoiceDate: Fecha de factura + maxShipped: Fecha límite + allClients: Todos los clientes + oneClient: Un solo cliente + company: Empresa + printer: Impresora + invoiceOut: Facturar + client: Cliente + stop: Parar diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue index 6ea20288d..e0d2ddce8 100644 --- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue +++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue @@ -262,7 +262,7 @@ onMounted(async () => {
@@ -293,7 +293,7 @@ onMounted(async () => {
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue index 12c6df20c..cf94c9e8d 100644 --- a/src/pages/Supplier/Card/SupplierCard.vue +++ b/src/pages/Supplier/Card/SupplierCard.vue @@ -61,6 +61,3 @@ const { t } = useI18n(); } } - - - diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue index ced38c765..e9fbffe96 100644 --- a/src/pages/Supplier/Card/SupplierSummary.vue +++ b/src/pages/Supplier/Card/SupplierSummary.vue @@ -86,7 +86,7 @@ const isAdministrative = computed(() => { - + - +