verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 59 Releases Wiki Activity

refactor: refs #7132 delete duplicate translations' keys
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jon Elias 2024-10-18 08:04:52 +02:00
parent 3069ac27d0
commit 58e88f605c
55 changed files with 189 additions and 454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
View File

@ -355,10 +355,10 @@ const createInvoiceInCorrection = async () => {
</QItem>
</template>
<template #body="{ entity }">
<VnLv :label="t('invoiceIn.card.issued')" :value="toDate(entity.issued)" />
<VnLv :label="t('invoiceIn.list.issued')" :value="toDate(entity.issued)" />
<VnLv :label="t('invoiceIn.summary.booked')" :value="toDate(entity.booked)" />
<VnLv :label="t('invoiceIn.card.amount')" :value="toCurrency(totalAmount)" />
<VnLv :label="t('invoiceIn.summary.supplier')">
<VnLv :label="t('invoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
<VnLv :label="t('invoiceIn.list.supplier')">
<template #value>
<span class="link">
{{ entity?.supplier?.nickname }}

10
src/pages/InvoiceIn/Card/InvoiceInSummary.vue
View File

@ -95,7 +95,7 @@ const dueDayColumns = ref([
},
{
name: 'amount',
label: 'invoiceIn.summary.amount',
label: 'invoiceIn.list.amount',
field: (row) => row.amount,
format: (value) => toCurrency(value),
sortable: true,
@ -123,7 +123,7 @@ const intrastatColumns = ref([
},
{
name: 'amount',
label: 'invoiceIn.summary.amount',
label: 'invoiceIn.list.amount',
field: (row) => toCurrency(row.amount),
sortable: true,
align: 'left',
@ -210,7 +210,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
/>
</QCardSection>
<VnLv
:label="t('invoiceIn.summary.supplier')"
:label="t('invoiceIn.list.supplier')"
:value="entity.supplier?.name"
>
<template #value>
@ -221,7 +221,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
</template>
</VnLv>
<VnLv
:label="t('invoiceIn.summary.supplierRef')"
:label="t('invoiceIn.list.supplierRef')"
:value="entity.supplierRef"
/>
<VnLv
@ -271,7 +271,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
:value="entity.expenseDeductible?.name"
/>
<VnLv
:label="t('invoiceIn.summary.company')"
:label="t('invoiceIn.card.company')"
:value="entity.company?.code"
/>
<VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />

2
src/pages/InvoiceIn/InvoiceInCreate.vue
View File

@ -83,7 +83,7 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
</template>
</VnSelect>
<VnInput
:label="t('invoiceIn.summary.supplierRef')"
:label="t('invoiceIn.list.supplierRef')"
v-model="data.supplierRef"
/>
</VnRow>

4
src/pages/InvoiceIn/InvoiceInList.vue
View File

@ -50,7 +50,7 @@ const cols = computed(() => [
{
align: 'left',
name: 'serial',
label: t('invoiceIn.list.serial'),
label: t('invoiceIn.serial'),
},
{
align: 'left',
@ -151,7 +151,7 @@ const cols = computed(() => [
</template>
</VnSelect>
<VnInput
:label="t('invoiceIn.summary.supplierRef')"
:label="t('invoiceIn.list.supplierRef')"
v-model="data.supplierRef"
/>
<VnSelect

7
src/pages/InvoiceIn/locale/en.yml
View File

@ -5,14 +5,11 @@ invoiceIn:
ref: Reference
supplier: Supplier
supplierRef: Supplier ref.
serial: Serial
file: File
issued: Issued
awb: AWB
amount: Amount
card:
issued: Issued
amount: Amount
client: Client
company: Company
customerCard: Customer card
@ -21,8 +18,6 @@ invoiceIn:
dueDay: Due day
intrastat: Intrastat
summary:
supplier: Supplier
supplierRef: Supplier ref.
currency: Currency
issued: Expedition date
operated: Operation date
@ -30,7 +25,6 @@ invoiceIn:
bookedDate: Booked date
sage: Sage withholding
vat: Undeductible VAT
company: Company
expense: Expense
taxableBase: Taxable base
rate: Rate
@ -38,7 +32,6 @@ invoiceIn:
sageTransaction: Sage transaction
dueDay: Date
bank: Bank
amount: Amount
foreignValue: Foreign value
dueTotal: Due day
noMatch: Do not match

6
src/pages/InvoiceIn/locale/es.yml
View File

@ -11,8 +11,6 @@ invoiceIn:
awb: AWB
amount: Importe
card:
issued: Fecha emisión
amount: Importe
client: Cliente
company: Empresa
customerCard: Ficha del cliente
@ -20,8 +18,6 @@ invoiceIn:
vat: Iva
dueDay: Fecha de vencimiento
summary:
supplier: Proveedor
supplierRef: Ref. proveedor
currency: Divisa
docNumber: Número documento
issued: Fecha de expedición
@ -30,14 +26,12 @@ invoiceIn:
bookedDate: Fecha contable
sage: Retención sage
vat: Iva no deducible
company: Empresa
expense: Gasto
taxableBase: Base imp.
rate: Tasa
sageTransaction: Sage transación
dueDay: Fecha
bank: Caja
amount: Importe
foreignValue: Divisa
dueTotal: Vencimiento
code: Código

21
src/pages/InvoiceOut/locale/es.yml
View File

@ -9,9 +9,6 @@ invoiceOutList:
id: ID
ref: Referencia
issued: Fecha emisión
customer: Cliente
company: Empresa
amount: Importe
created: F. creación
dueDate: F. máxima
invoiceOutSerial: Serial
@ -20,12 +17,12 @@ invoiceOutList:
DownloadPdf: Descargar PDF
InvoiceOutSummary: Resumen
negativeBases:
country: País
clientId: ID del cliente
client: Cliente
base: Base
ticketId: Ticket
active: Activo
hasToInvoice: Debe facturar
verifiedData: Datos verificados
commercial: Comercial
country: País
clientId: ID del cliente
client: Cliente
base: Base
ticketId: Ticket
active: Activo
hasToInvoice: Debe facturar
verifiedData: Datos verificados
commercial: Comercial

2
src/pages/Item/Card/CreateIntrastatForm.vue
View File

@ -42,7 +42,7 @@ onMounted(async () => {
:required="true"
/>
<VnInput
:label="t('createIntrastatForm.description')"
:label="t('itemBasicData.description')"
v-model="data.description"
:required="true"
/>

2
src/pages/Item/Card/ItemDiary.vue
View File

@ -62,7 +62,7 @@ const columns = computed(() => [
format: (val) => dashIfEmpty(val),
},
{
label: t('itemDiary.reference'),
label: t('itemBasicData.reference'),
field: 'reference',
name: 'reference',
align: 'left',

8
src/pages/Item/Card/ItemLastEntries.vue
View File

@ -59,7 +59,7 @@ const columns = computed(() => [
align: 'center',
},
{
label: t('lastEntries.warehouse'),
label: t('itemDiary.warehouse'),
name: 'warehouse',
field: 'warehouse',
align: 'left',
@ -94,7 +94,7 @@ const columns = computed(() => [
format: (val) => dashIfEmpty(val),
},
{
label: t('lastEntries.packing'),
label: t('shelvings.packing'),
name: 'packing',
align: 'center',
},
@ -104,7 +104,7 @@ const columns = computed(() => [
align: 'center',
},
{
label: t('lastEntries.stems'),
label: t('itemBasicData.stems'),
name: 'stems',
field: 'stems',
align: 'center',
@ -188,7 +188,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<VnSubToolbar>
<template #st-data>
<VnInputDate
:label="t('lastEntries.since')"
:label="t('itemDiary.since')"
dense
v-model="from"
class="q-mr-lg"

2
src/pages/Item/Card/ItemTags.vue
View File

@ -147,7 +147,7 @@ const insertTag = (rows) => {
:is-clearable="false"
/>
<VnInput
:label="t('itemTags.relevancy')"
:label="t('itemBasicData.relevancy')"
type="number"
v-model="row.priority"
:required="true"

7
src/pages/Item/locale/en.yml
View File

@ -16,7 +16,6 @@ itemDiary:
date: Date
origin: Origin
state: State
reference: Reference
entity: Entity
in: In
out: Out
@ -48,22 +47,17 @@ itemBasicData:
createIntrastatForm:
title: New intrastat
identifier: Identifier
description: Description
tax:
country: Country
class: Class
lastEntries:
since: Since
to: To
ig: Ig
warehouse: Warehouse
landed: Landed
entry: Entry
pvp: PVP
label: Label
packing: Packing
grouping: Grouping
stems: Stems
quantity: Quantity
cost: Cost
kg: Kg.
@ -77,7 +71,6 @@ itemTags:
addTag: Add tag
tag: Tag
value: Value
relevancy: Relevancy
searchbar:
label: Search item
info: Search by item id

7
src/pages/Item/locale/es.yml
View File

@ -16,7 +16,6 @@ itemDiary:
date: Fecha
origin: Origen
state: Estado
reference: Referencia
entity: Entidad
in: Entrada
out: Salida
@ -48,22 +47,17 @@ itemBasicData:
createIntrastatForm:
title: Nuevo intrastat
identifier: Identificador
description: Descripción
tax:
country: País
class: Clase
lastEntries:
since: Desde
to: Hasta
ig: Ig
warehouse: Almacén
landed: F. Entrega
entry: Entrada
pvp: PVP
label: Etiquetas
packing: Packing
grouping: Grouping
stems: Tallos
quantity: Cantidad
cost: Coste
kg: Kg.
@ -77,7 +71,6 @@ itemTags:
addTag: Añadir etiqueta
tag: Etiqueta
value: Valor
relevancy: Relevancia
searchbar:
label: Buscar artículo
info: Buscar por id de artículo

5
src/pages/ItemType/locale/es.yml
View File

@ -6,11 +6,6 @@ shared:
temperature: Temperatura
summary:
id: id
code: Código
name: Nombre
worker: Trabajador
category: Reino
temperature: Temperatura
life: Vida
promo: Promoción
itemPackingType: Tipo de embalaje

4
src/pages/Monitor/MonitorOrders.vue
View File

@ -44,7 +44,7 @@ const columns = computed(() => [
format: (row) => toDateTimeFormat(row.date_make),
},
{
label: t('salesOrdersTable.client'),
label: t('salesClientsTable.client'),
name: 'clientFk',
align: 'left',
columnFilter: {
@ -63,7 +63,7 @@ const columns = computed(() => [
columnFilter: false,
},
{
label: t('salesOrdersTable.salesPerson'),
label: t('salesClientsTable.salesPerson'),
name: 'salesPersonFk',
align: 'left',
optionFilter: 'firstName',

6
src/pages/Monitor/Ticket/MonitorTickets.vue
View File

@ -77,7 +77,7 @@ const columns = computed(() => [
},
},
{
label: t('salesTicketsTable.client'),
label: t('salesClientsTable.client'),
name: 'clientFk',
align: 'left',
field: 'nickname',
@ -91,7 +91,7 @@ const columns = computed(() => [
},
},
{
label: t('salesTicketsTable.salesPerson'),
label: t('salesClientsTable.salesPerson'),
name: 'salesPersonFk',
field: 'userName',
align: 'left',
@ -108,7 +108,7 @@ const columns = computed(() => [
},
},
{
label: t('salesTicketsTable.date'),
label: t('salesClientsTable.date'),
name: 'shippedDate',
align: 'left',
columnFilter: {

5
src/pages/Monitor/locale/en.yml
View File

@ -13,8 +13,6 @@ salesOrdersTable:
delete: Delete
dateSend: Send date
dateMake: Make date
client: Client
salesPerson: Salesperson
deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
agency: Agency
import: Import
@ -29,9 +27,6 @@ salesTicketsTable:
componentLack: Component lack
tooLittle: Ticket too little
identifier: Identifier
client: Client
salesPerson: Salesperson
date: Date
theoretical: Theoretical
practical: Practical
province: Province

5
src/pages/Monitor/locale/es.yml
View File

@ -13,8 +13,6 @@ salesOrdersTable:
delete: Eliminar
dateSend: Fecha de envío
dateMake: Fecha de realización
client: Cliente
salesPerson: Comercial
deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
agency: Agencia
import: Importe
@ -29,9 +27,6 @@ salesTicketsTable:
componentLack: Faltan componentes
tooLittle: Ticket demasiado pequeño
identifier: Identificador
client: Cliente
salesPerson: Comercial
date: Fecha
theoretical: Teórica
practical: Práctica
province: Provincia

18
src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
View File

@ -297,7 +297,7 @@ onMounted(() => onFormModelInit());
<QForm>
<VnRow>
<VnSelect
:label="t('basicData.client')"
:label="t('ticketList.client')"
v-model="clientId"
option-value="id"
option-label="name"
@ -320,7 +320,7 @@ onMounted(() => onFormModelInit());
</template>
</VnSelect>
<VnSelect
:label="t('basicData.warehouse')"
:label="t('ticketList.warehouse')"
v-model="warehouseId"
option-value="id"
option-label="name"
@ -328,7 +328,7 @@ onMounted(() => onFormModelInit());
hide-selected
map-options
:required="true"
:rules="validate('basicData.warehouse')"
:rules="validate('ticketList.warehouse')"
/>
</VnRow>
<VnRow>
@ -394,7 +394,7 @@ onMounted(() => onFormModelInit());
</VnRow>
<VnRow class="row q-gutter-md q-mb-md no-wrap">
<VnSelect
:label="t('basicData.company')"
:label="t('ticketList.company')"
v-model="formData.companyFk"
option-value="id"
option-label="code"
@ -402,7 +402,7 @@ onMounted(() => onFormModelInit());
hide-selected
map-options
:required="true"
:rules="validate('basicData.company')"
:rules="validate('ticketList.company')"
/>
<VnSelect
:label="t('basicData.agency')"
@ -416,7 +416,7 @@ onMounted(() => onFormModelInit());
:rules="validate('basicData.agency')"
/>
<VnSelect
:label="t('basicData.zone')"
:label="t('ticketList.zone')"
v-model="zoneId"
option-value="id"
option-label="name"
@ -428,7 +428,7 @@ onMounted(() => onFormModelInit());
map-options
:required="true"
@focus="zonesFetchRef.fetch()"
:rules="validate('basicData.zone')"
:rules="validate('ticketList.zone')"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
@ -445,10 +445,10 @@ onMounted(() => onFormModelInit());
</VnRow>
<VnRow>
<VnInputDate
:label="t('basicData.shipped')"
:label="t('ticketList.shipped')"
v-model="formData.shipped"
:required="true"
:rules="validate('basicData.shipped')"
:rules="validate('ticketList.shipped')"
/>
<VnInputTime
:label="t('basicData.shippedHour')"

2
src/pages/Ticket/Card/ExpeditionNewTicket.vue
View File

@ -66,7 +66,7 @@ const createTicket = async () => {
<template #form-inputs="{ data }">
<VnRow>
<VnInputDate
:label="t('expedition.landed')"
:label="t('basicData.landed')"
v-model="data.landed"
:model-value="date"
/>

24
src/pages/Ticket/Card/TicketComponents.vue
View File

@ -72,7 +72,7 @@ const salesFilter = computed(() => ({
const columns = computed(() => [
{
label: t('ticketComponents.item'),
label: t('basicData.item'),
name: 'item',
align: 'left',
},
@ -92,13 +92,13 @@ const columns = computed(() => [
columnFilter: false,
},
{
label: t('ticketComponents.description'),
label: t('basicData.description'),
name: 'description',
align: 'left',
columnClass: 'expand',
},
{
label: t('ticketComponents.quantity'),
label: t('basicData.quantity'),
name: 'quantity',
field: 'quantity',
align: 'left',
@ -116,12 +116,12 @@ const columns = computed(() => [
align: 'left',
},
{
label: t('ticketComponents.import'),
label: t('advanceTickets.import'),
name: 'import',
align: 'left',
},
{
label: t('ticketComponents.total'),
label: t('basicData.total'),
name: 'total',
align: 'left',
},
@ -196,7 +196,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
<QCardSection horizontal>
<span class="text-weight-bold text-subtitle1 text-center full-width">
{{ t('ticketComponents.total') }}
{{ t('basicData.total') }}
</span>
</QCardSection>
<QCardSection horizontal>
@ -238,9 +238,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
</span>
</QCardSection>
<QCardSection horizontal>
<span class="q-mr-xs color-vn-label">
{{ t('ticketComponents.price') }}:
</span>
<span class="q-mr-xs color-vn-label"> {{ t('basicData.price') }}: </span>
<span>{{ toCurrency(ticketData?.zonePrice, 'EUR', 2) }}</span>
</QCardSection>
<QCardSection horizontal>
@ -250,18 +248,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<span>{{ toCurrency(ticketData?.zoneBonus, 'EUR', 2) }}</span>
</QCardSection>
<QCardSection horizontal>
<span class="q-mr-xs color-vn-label">
{{ t('ticketComponents.zone') }}:
</span>
<span class="q-mr-xs color-vn-label"> {{ t('ticketList.zone') }}: </span>
<span class="link">
{{ dashIfEmpty(ticketData?.zone?.name) }}
<ZoneDescriptorProxy :id="ticketData?.zone?.id" />
</span>
</QCardSection>
<QCardSection v-if="ticketData?.zone?.isVolumetric" horizontal>
<span class="q-mr-xs color-vn-label">
{{ t('ticketComponents.volume') }}:
</span>
<span class="q-mr-xs color-vn-label"> {{ t('volume.volume') }}: </span>
<span>{{ ticketVolume }}</span>
</QCardSection>
<QCardSection horizontal>

9
src/pages/Ticket/Card/TicketCreateRequest.vue
View File

@ -32,10 +32,7 @@ const attendersOptions = ref([]);
>
<template #form-inputs="{ data }">
<VnRow>
<VnInput
v-model="data.description"
:label="t('purchaseRequest.description')"
/>
<VnInput v-model="data.description" :label="t('basicData.description')" />
<VnSelect
:label="t('purchaseRequest.atender')"
v-model="data.attenderFk"
@ -48,13 +45,13 @@ const attendersOptions = ref([]);
<VnRow>
<VnInput
v-model="data.quantity"
:label="t('purchaseRequest.quantity')"
:label="t('basicData.quantity')"
type="number"
min="1"
/>
<VnInput
v-model="data.price"
:label="t('purchaseRequest.price')"
:label="t('basicData.price')"
type="number"
min="0"
/>

2
src/pages/Ticket/Card/TicketCreateServiceType.vue
View File

@ -34,7 +34,7 @@ onMounted(async () => {
<VnRow>
<VnInput
ref="nameInputRef"
:label="t('service.description')"
:label="t('basicData.description')"
v-model="data.name"
:required="true"
/>

4
src/pages/Ticket/Card/TicketCreateTracking.vue
View File

@ -39,7 +39,7 @@ const onStateFkChange = (formData) => (formData.userFk = user.value.id);
<VnRow>
<VnSelect
v-model="data.stateFk"
:label="t('tracking.state')"
:label="t('ticketList.state')"
:options="statesOptions"
@update:model-value="onStateFkChange(data)"
hide-selected
@ -47,7 +47,7 @@ const onStateFkChange = (formData) => (formData.userFk = user.value.id);
option-value="id"
/>
<VnSelect
:label="t('tracking.worker')"
:label="t('expedition.worker')"
v-model="data.userFk"
url="Workers/search"
fields=" ['id', 'name']"

6
src/pages/Ticket/Card/TicketExpedition.vue
View File

@ -81,7 +81,7 @@ const columns = computed(() => [
},
},
{
label: t('expedition.item'),
label: t('basicData.item'),
name: 'packagingItemFk',
align: 'left',
cardVisible: true,
@ -131,7 +131,7 @@ const columns = computed(() => [
format: (row) => toDateTimeFormat(row.created),
},
{
label: t('expedition.state'),
label: t('ticketList.state'),
name: 'state',
align: 'left',
cardVisible: true,
@ -153,7 +153,7 @@ const columns = computed(() => [
const logTableColumns = computed(() => [
{
label: t('expedition.state'),
label: t('ticketList.state'),
name: 'state',
field: 'state',
align: 'center',

2
src/pages/Ticket/Card/TicketNotes.vue
View File

@ -88,7 +88,7 @@ async function handleSave() {
:disable="!!row.id"
/>
<VnInput
:label="t('ticketNotes.description')"
:label="t('basicData.description')"
v-model="row.description"
class="col"
@keyup.enter="handleSave"

2
src/pages/Ticket/Card/TicketPackage.vue
View File

@ -93,7 +93,7 @@ watch(
</template>
</VnSelect>
<VnInput
:label="t('package.quantity')"
:label="t('basicData.quantity')"
v-model.number="row.quantity"
class="col"
type="number"

21
src/pages/Ticket/Card/TicketPurchaseRequest.vue
View File

@ -81,7 +81,7 @@ const crudModelFilter = reactive({
const columns = computed(() => [
{
align: 'left',
label: t('purchaseRequest.id'),
label: t('ticketList.id'),
name: 'id',
chip: {
condition: () => true,
@ -90,13 +90,13 @@ const columns = computed(() => [
},
{
align: 'left',
label: t('purchaseRequest.description'),
label: t('basicData.description'),
name: 'description',
columnClass: 'expand',
},
{
align: 'left',
label: t('purchaseRequest.created'),
label: t('expedition.created'),
name: 'created',
format: (row) => toDateFormat(row.created),
cardVisible: true,
@ -117,12 +117,12 @@ const columns = computed(() => [
},
{
align: 'left',
label: t('purchaseRequest.quantity'),
label: t('basicData.quantity'),
name: 'quantity',
},
{
align: 'left',
label: t('purchaseRequest.price'),
label: t('basicData.price'),
name: 'price',
},
{
@ -133,7 +133,7 @@ const columns = computed(() => [
},
{
align: 'left',
label: t('purchaseRequest.state'),
label: t('ticketList.state'),
name: 'isOk',
cardVisible: true,
},
@ -248,10 +248,7 @@ onMounted(() => (stateStore.rightDrawer = false));
</template>
<template #more-create-dialog="{ data }">
<VnInput
v-model="data.description"
:label="t('purchaseRequest.description')"
/>
<VnInput v-model="data.description" :label="t('basicData.description')" />
<VnSelect
:label="t('purchaseRequest.atender')"
v-model="data.attenderFk"
@ -262,13 +259,13 @@ onMounted(() => (stateStore.rightDrawer = false));
/>
<VnInput
v-model="data.quantity"
:label="t('purchaseRequest.quantity')"
:label="t('basicData.quantity')"
type="number"
min="1"
/>
<VnInput
v-model="data.price"
:label="t('purchaseRequest.price')"
:label="t('basicData.price')"
type="number"
min="0"
/>

16
src/pages/Ticket/Card/TicketSale.vue
View File

@ -90,25 +90,25 @@ const columns = computed(() => [
},
{
align: 'left',
label: t('ticketSale.id'),
label: t('ticketList.id'),
name: 'itemFk',
},
{
align: 'left',
label: t('ticketSale.quantity'),
label: t('basicData.quantity'),
name: 'quantity',
format: (row) => toCurrency(row.quantity),
},
{
align: 'left',
label: t('ticketSale.item'),
label: t('basicData.item'),
name: 'item',
format: (row) => row?.item?.name,
columnClass: 'expand',
},
{
align: 'left',
label: t('ticketSale.price'),
label: t('basicData.price'),
name: 'price',
format: (row) => toCurrency(row.price),
},
@ -120,7 +120,7 @@ const columns = computed(() => [
},
{
align: 'left',
label: t('ticketSale.amount'),
label: t('ticketList.amount'),
name: 'amount',
format: (row) => parseInt(row.amount * row.quantity),
},
@ -516,7 +516,7 @@ watch(
<QBtnDropdown
ref="stateBtnDropdownRef"
color="primary"
:label="t('ticketSale.state')"
:label="t('ticketList.state')"
:disable="!isTicketEditable"
>
<VnSelect
@ -587,7 +587,7 @@ watch(
}}</span>
</QCardSection>
<QCardSection class="justify-end text-weight-bold text-subtitle1" horizontal>
<span class="q-mr-xs color-vn-label"> {{ t('ticketSale.total') }}: </span>
<span class="q-mr-xs color-vn-label"> {{ t('basicData.total') }}: </span>
<span>{{ toCurrency(store.data?.totalWithVat) }}</span>
</QCardSection>
</div></QDrawer
@ -753,7 +753,7 @@ watch(
>
<VnInput
v-model.number="edit.price"
:label="t('ticketSale.price')"
:label="t('basicData.price')"
type="number"
/>
</TicketEditManaProxy>

20
src/pages/Ticket/Card/TicketSaleTracking.vue
View File

@ -42,19 +42,19 @@ const columns = computed(() => [
sortable: true,
},
{
label: t('ticketSaleTracking.item'),
label: t('basicData.item'),
name: 'item',
align: 'left',
sortable: true,
},
{
label: t('ticketSaleTracking.description'),
label: t('basicData.description'),
name: 'description',
align: 'left',
sortable: true,
},
{
label: t('ticketSaleTracking.quantity'),
label: t('basicData.quantity'),
name: 'quantity',
field: 'quantity',
align: 'left',
@ -78,7 +78,7 @@ const columns = computed(() => [
const logTableColumns = computed(() => [
{
label: t('ticketSaleTracking.quantity'),
label: t('basicData.quantity'),
name: 'quantity',
field: 'quantity',
align: 'left',
@ -92,20 +92,20 @@ const logTableColumns = computed(() => [
sortable: true,
},
{
label: t('ticketSaleTracking.worker'),
label: t('expedition.worker'),
name: 'worker',
align: 'left',
sortable: true,
},
{
label: t('ticketSaleTracking.state'),
label: t('ticketList.state'),
name: 'state',
field: 'state',
align: 'left',
sortable: true,
},
{
label: t('ticketSaleTracking.created'),
label: t('expedition.created'),
name: 'created',
field: 'created',
align: 'left',
@ -116,13 +116,13 @@ const logTableColumns = computed(() => [
const shelvingsTableColumns = computed(() => [
{
label: t('ticketSaleTracking.quantity'),
label: t('basicData.quantity'),
name: 'quantity',
align: 'left',
sortable: true,
},
{
label: t('ticketSaleTracking.worker'),
label: t('expedition.worker'),
name: 'worker',
align: 'left',
sortable: true,
@ -140,7 +140,7 @@ const shelvingsTableColumns = computed(() => [
sortable: true,
},
{
label: t('ticketSaleTracking.created'),
label: t('expedition.created'),
name: 'created',
field: 'created',
align: 'left',

6
src/pages/Ticket/Card/TicketService.vue
View File

@ -85,21 +85,21 @@ const getDefaultTaxClass = async () => {
const columns = computed(() => [
{
name: 'description',
label: t('service.description'),
label: t('basicData.description'),
field: (row) => row.ticketServiceTypeFk,
sortable: true,
align: 'left',
},
{
name: 'quantity',
label: t('service.quantity'),
label: t('basicData.quantity'),
field: (row) => row.quantity,
sortable: true,
align: 'left',
},
{
name: 'price',
label: t('service.price'),
label: t('basicData.price'),
field: (row) => row.price,
sortable: true,
align: 'left',

6
src/pages/Ticket/Card/TicketTracking.vue
View File

@ -52,19 +52,19 @@ const paginateFilter = reactive({
const columns = computed(() => [
{
label: t('tracking.state'),
label: t('ticketList.state'),
name: 'state',
field: 'state',
align: 'left',
format: (val) => val.name,
},
{
label: t('tracking.worker'),
label: t('expedition.worker'),
name: 'worker',
align: 'left',
},
{
label: t('tracking.created'),
label: t('expedition.created'),
name: 'created',
field: 'created',
align: 'left',

14
src/pages/Ticket/Card/TicketTransfer.vue
View File

@ -33,19 +33,19 @@ const _transfer = ref();
const transferLinesColumns = computed(() => [
{
label: t('ticketSale.id'),
label: t('ticketList.id'),
name: 'itemFk',
field: 'itemFk',
align: 'left',
},
{
label: t('ticketSale.item'),
label: t('basicData.item'),
name: 'item',
field: 'concept',
align: 'left',
},
{
label: t('ticketSale.quantity'),
label: t('basicData.quantity'),
name: 'quantity',
field: 'quantity',
align: 'left',
@ -54,26 +54,26 @@ const transferLinesColumns = computed(() => [
const destinationTicketColumns = computed(() => [
{
label: t('ticketSale.id'),
label: t('ticketList.id'),
name: 'id',
field: 'id',
align: 'left',
},
{
label: t('ticketSale.shipped'),
label: t('ticketList.shipped'),
name: 'item',
field: 'shipped',
align: 'left',
format: (val) => toDateFormat(val),
},
{
label: t('ticketSale.agency'),
label: t('basicData.agency'),
name: 'agency',
field: 'agencyName',
align: 'left',
},
{
label: t('ticketSale.address'),
label: t('basicData.address'),
name: 'address',
field: 'address',
align: 'left',

6
src/pages/Ticket/Card/TicketVolume.vue
View File

@ -39,7 +39,7 @@ const packingTypeVolume = ref([]);
const columns = computed(() => [
{
align: 'left',
label: t('volume.item'),
label: t('basicData.item'),
name: 'itemFk',
chip: {
condition: () => true,
@ -48,7 +48,7 @@ const columns = computed(() => [
},
{
align: 'left',
label: t('volume.description'),
label: t('basicData.description'),
name: 'concept',
columnClass: 'expand',
cardVisible: true,
@ -62,7 +62,7 @@ const columns = computed(() => [
},
{
align: 'left',
label: t('volume.quantity'),
label: t('basicData.quantity'),
name: 'quantity',
cardVisible: true,
},

2
src/pages/Ticket/TicketAdvance.vue
View File

@ -127,7 +127,7 @@ const ticketColumns = computed(() => [
format: (val) => dashIfEmpty(val),
},
{
label: t('advanceTickets.state'),
label: t('ticketList.state'),
name: 'state',
align: 'left',
sortable: true,

24
src/pages/Ticket/TicketFuture.vue
View File

@ -95,7 +95,7 @@ const ticketColumns = computed(() => [
columnFilter: null,
},
{
label: t('futureTickets.ticketId'),
label: t('advanceTickets.ticketId'),
name: 'ticketId',
align: 'center',
sortable: true,
@ -118,7 +118,7 @@ const ticketColumns = computed(() => [
columnFilter: null,
},
{
label: t('futureTickets.ipt'),
label: t('advanceTickets.ipt'),
name: 'ipt',
field: 'ipt',
align: 'left',
@ -139,14 +139,14 @@ const ticketColumns = computed(() => [
format: (val) => dashIfEmpty(val),
},
{
label: t('futureTickets.state'),
label: t('ticketList.state'),
name: 'state',
align: 'left',
sortable: true,
columnFilter: null,
},
{
label: t('futureTickets.liters'),
label: t('advanceTickets.liters'),
name: 'liters',
field: 'liters',
align: 'left',
@ -162,7 +162,7 @@ const ticketColumns = computed(() => [
},
},
{
label: t('futureTickets.import'),
label: t('advanceTickets.import'),
field: 'import',
name: 'import',
align: 'left',
@ -186,7 +186,7 @@ const ticketColumns = computed(() => [
format: (val) => dashIfEmpty(val),
},
{
label: t('futureTickets.futureId'),
label: t('advanceTickets.futureId'),
name: 'futureId',
align: 'left',
sortable: true,
@ -211,7 +211,7 @@ const ticketColumns = computed(() => [
},
{
label: t('futureTickets.futureIpt'),
label: t('advanceTickets.futureIpt'),
name: 'futureIpt',
field: 'futureIpt',
align: 'left',
@ -232,7 +232,7 @@ const ticketColumns = computed(() => [
format: (val) => dashIfEmpty(val),
},
{
label: t('futureTickets.futureState'),
label: t('advanceTickets.futureState'),
name: 'futureState',
align: 'right',
sortable: true,
@ -259,7 +259,7 @@ const moveTicketsFuture = async () => {
let params = { tickets: ticketsToMove };
await axios.post('Tickets/merge', params);
notify(t('futureTickets.moveTicketSuccess'), 'positive');
notify(t('advanceTickets.moveTicketSuccess'), 'positive');
selectedTickets.value = [];
arrayData.fetch({ append: false });
} catch (error) {
@ -333,14 +333,14 @@ onMounted(async () => {
colspan="8"
translate
>
{{ t('futureTickets.origin') }}
{{ t('advanceTickets.origin') }}
</QTh>
<QTh
class="horizontal-separator text-uppercase color-vn-label"
colspan="4"
translate
>
{{ t('futureTickets.destination') }}
{{ t('advanceTickets.destination') }}
</QTh>
</QTr>
<QTr>
@ -409,7 +409,7 @@ onMounted(async () => {
size="xs"
>
<QTooltip>
{{ t('futureTickets.noVisible') }}
{{ t('ticketSale.noVisible') }}
</QTooltip>
</QIcon>
<QIcon

6
src/pages/Ticket/TicketWeekly.vue
View File

@ -47,7 +47,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'clientFk',
label: t('weeklyTickets.client'),
label: t('ticketList.client'),
isTitle: true,
cardVisible: true,
component: 'select',
@ -79,7 +79,7 @@ const columns = computed(() => [
},
{
align: 'left',
label: t('weeklyTickets.agency'),
label: t('basicData.agency'),
name: 'agencyModeFk',
cardVisible: true,
columnFilter: {
@ -95,7 +95,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'warehouseFk',
label: t('weeklyTickets.warehouse'),
label: t('ticketList.warehouse'),
cardVisible: true,
columnFilter: {
component: 'select',

65
src/pages/Ticket/locale/en.yml
View File

@ -2,16 +2,12 @@ card:
search: Search tickets
searchInfo: You can search by ticket id or alias
volume:
item: Item
description: Description
packingType: Packing Type
quantity: Quantity
volumeQuantity: m³ per quantity
type: Type
volume: Volume
ticketNotes:
observationType: Observation type
description: Description
removeNote: Remove note
addNote: Add note
observationTypes:
@ -25,29 +21,18 @@ ticketNotes:
DropOff: Drop Off
Sustitución: Sustitution
ticketSale:
id: Id
visible: Visible
available: Available
quantity: Quantity
item: Item
price: Price
discount: Disc
amount: Amount
packaging: Packaging
subtotal: Subtotal
tax: VAT
total: Total
history: History
claim: Claim
reserved: Reserved
noVisible: Not visible
hasComponentLack: Component lack
ok: Ok
state: State
more: More
shipped: Shipped
agency: Agency
address: Address
advanceTickets:
preparation: Preparation
origin: Origin
@ -56,7 +41,6 @@ advanceTickets:
destinationAgency: 'Destination agency: {agency}'
ticketId: ID
ipt: IPT
state: State
liters: Liters
lines: Lines
import: Import
@ -81,17 +65,9 @@ advanceTickets:
searchInfo: Search advance tickets by ID or client ID
futureTickets:
problems: Problems
ticketId: ID
shipped: Date
ipt: IPT
state: State
liters: Liters
import: Import
availableLines: Available lines
futureId: ID
futureShipped: Date
futureIpt: IPT
futureState: State
noVerified: No verified data
noVisible: Not visible
purchaseRequest: Purchase request
@ -99,11 +75,8 @@ futureTickets:
componentLack: Component lack
rounding: Rounding
risk: Risk
origin: Origin
destination: Destination
moveTicketTitle: Move tickets
moveTicketDialogSubtitle: 'Do you want to move {selectedTickets} tickets to the future?'
moveTicketSuccess: Tickets moved successfully!
searchInfo: Search future tickets by date
futureTicket: Future tickets
FREE: Free
@ -113,17 +86,14 @@ futureTickets:
DELIVERED: Delivered
expedition:
id: Expedition
item: Item
name: Name
packageType: Package type
counter: Counter
externalId: external Id
created: Created
state: State
historyAction: Status log
newTicketWithRoute: New ticket with route
newTicketWithoutRoute: New ticket without route
landed: Landed
routeId: Route id
deleteExpedition: Delete expedition
expeditionRemoved: Expedition removed
@ -138,17 +108,12 @@ basicData:
next: Next
back: Back
finalize: Finalize
client: Client
warehouse: Warehouse
address: Address
inactive: (Inactive)
noDeliveryZoneAvailable: No delivery zone available for this landing date
editAddress: Edit address
alias: Alias
company: Company
agency: Agency
zone: Zone
shipped: Shipped
landed: Landed
shippedHour: Shipped hour
priceDifference: Price difference
@ -171,37 +136,22 @@ basicData:
chooseAnOption: Choose an option
unroutedTicket: The ticket has been unrouted
purchaseRequest:
id: Id
description: Description
created: Created
requester: Requester
atender: Atender
quantity: Quantity
price: Price
saleFk: Item id
state: State
newRequest: New request
weeklyTickets:
id: Ticket ID
client: Client
shipment: Shipment
agency: Agency
warehouse: Warehouse
salesperson: Salesperson
search: Search weekly tickets
searchInfo: Search weekly tickets by id or client id
ticketSaleTracking:
isChecked: Is checked
item: Item
description: Description
quantity: Quantity
parking: Parking
historyAction: Log states
shelvingAction: Shelvings sale
original: Original
worker: Worker
state: State
created: Created
shelving: Shelving
saleGroupDetail: sale group detail
previousSelected: previous selected
@ -210,40 +160,25 @@ ticketSaleTracking:
checked: checked
service:
pay: Pay
description: Description
quantity: Quantity
price: Price
removeService: Remove service
newService: New service type
addService: Add service
quantityInfo: To create services with negative amounts mark the service on the source ticket and press the pay button.
createRefundSuccess: 'The following refund ticket have been created: { ticketId }'
ticketComponents:
item: Item
description: Description
quantity: Quantity
serie: Serie
components: Components
import: Import
total: Total
baseToCommission: Base to commission
totalWithoutVat: Total without VAT
zoneBreakdown: Zone breakdown
price: Price
bonus: Bonus
zone: Zone
volume: Volume
theoricalCost: Theorical cost
totalPrice: Total price
packages: Packages
tracking:
state: State
worker: Worker
created: Created
addState: Add state
package:
package: Package
quantity: Quantity
added: Added
addPackage: Add package
removePackage: Remove package

64
src/pages/Ticket/locale/es.yml
View File

@ -1,32 +1,22 @@
service:
pay: Abonar
description: Descripción
quantity: Cantidad
price: Precio
removeService: Quitar servicio
newService: Nuevo tipo de servicio
addService: Añadir servicio
quantityInfo: Para crear sevicios con cantidades negativas marcar servicio en el ticket origen y apretar el boton abonar.
createRefundSuccess: 'Se ha creado siguiente ticket de abono: { ticketId }'
tracking:
state: Estado
worker: Trabajador
created: Fecha creación
addState: Añadir estado
card:
search: Buscar tickets
searchInfo: Buscar tickets por identificador o alias
volume:
item: Artículo
description: Descripción
packingType: Encajado
quantity: Cantidad
volumeQuantity: m³ por cantidad
type: Tipo
volume: Volumen
ticketNotes:
observationType: Tipo de observación
description: Descripción
removeNote: Quitar nota
addNote: Añadir nota
observationTypes:
@ -42,31 +32,20 @@ ticketNotes:
Accepted: Aceptado
Denied: Denegado
purchaseRequest:
Id: Id
description: Descripción
created: Fecha creación
requester: Solicitante
atender: Comprador
quantity: Cantidad
price: Precio
saleFk: Id artículo
state: Estado
newRequest: Crear petición
basicData:
next: Siguiente
back: Anterior
finalize: Finalizar
client: Cliente
warehouse: Almacén
address: Consignatario
inactive: (Inactivo)
noDeliveryZoneAvailable: No hay una zona de reparto disponible para la fecha de envío seleccionada
editAddress: Editar dirección
alias: Alias
company: Empresa
agency: Agencia
zone: Zona
shipped: F. Envío
landed: F. Entrega
shippedHour: Hora de envío
priceDifference: Diferencia de precio
@ -90,10 +69,7 @@ basicData:
unroutedTicket: El ticket ha sido desenrutado
weeklyTickets:
id: ID Ticket
client: Cliente
shipment: Salida
agency: Agencia
warehouse: Almacén
salesperson: Comercial
search: Buscar por tickets programados
searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
@ -105,7 +81,6 @@ advanceTickets:
destinationAgency: 'Agencia destino: {agency}'
ticketId: ID
ipt: IPT
state: Estado
liters: Litros
lines: Líneas
import: Importe
@ -130,29 +105,17 @@ advanceTickets:
searchInfo: Buscar tickets adelantados por el identificador o el identificador del cliente
futureTickets:
problems: Problemas
ticketId: ID
shipped: Fecha
ipt: IPT
state: Estado
liters: Litros
import: Importe
availableLines: Líneas disponibles
futureId: ID
futureShipped: Fecha
futureIpt: IPT
futureState: Estado
noVerified: Sin datos comprobados
noVisible: No visible
purchaseRequest: Petición de compra
clientFrozen: Cliente congelado
risk: Riesgo
componentLack: Faltan componentes
rounding: Redondeo
origin: Origen
destination: Destino
moveTicketTitle: Mover tickets
moveTicketDialogSubtitle: '¿Desea mover {selectedTickets} tickets hacia el futuro?'
moveTicketSuccess: Tickets movidos correctamente
searchInfo: Buscar tickets por fecha
futureTicket: Tickets a futuro
FREE: Libre
@ -161,60 +124,40 @@ futureTickets:
PACKED: Encajado
DELIVERED: Servido
ticketSale:
id: Id
visible: Visible
available: Disponible
quantity: Cantidad
item: Artículo
price: Precio
discount: Dto
amount: Importe
packaging: Encajado
subtotal: Subtotal
tax: IVA
total: Total
history: Historial
claim: Reclamación
reserved: Reservado
noVisible: No visible
hasComponentLack: Faltan componentes
ok: Ok
state: Estado
more: Más
shipped: F. Envío
agency: Agencia
address: Consignatario
ticketComponents:
item: Artículo
description: Descripción
quantity: Cantidad
serie: Serie
components: Componentes
import: Importe
total: Total
baseToCommission: Base comisionable
totalWithoutVat: Total sin IVA
zoneBreakdown: Desglose zona
price: Precio
bonus: Bonificación
zone: Zona
volume: Volúmen
theoricalCost: Porte teórico
totalPrice: Precio total
packages: Bultos
expedition:
id: Expedición
item: Artículo
name: Nombre
packageType: Embalaje
counter: Contador
externalId: ID externo
created: Fecha creación
state: Estado
historyAction: Historial de estados
newTicketWithRoute: Nuevo ticket con ruta
newTicketWithoutRoute: Nuevo ticket sin ruta
landed: F. entrega
routeId: Id ruta
deleteExpedition: Eliminar expedición
expeditionRemoved: Expedición eliminada
@ -227,22 +170,15 @@ expedition:
removeExpedition: Eliminar expedición
package:
package: Embalaje
quantity: Cantidad
added: Añadido
addPackage: Añadir embalaje
removePackage: Quitar embalaje
ticketSaleTracking:
isChecked: Comprobado
item: Artículo
description: Descripción
quantity: Cantidad
parking: Parking
historyAction: Historial estados
shelvingAction: Carros línea
original: Original
worker: Trabajador
state: Estado
created: Fecha creación
shelving: Matrícula
saleGroupDetail: detalle grupo líneas
previousSelected: previa seleccionado

2
src/pages/Zone/Card/ZoneCreateWarehouse.vue
View File

@ -32,7 +32,7 @@ const warehousesOptions = ref([]);
<VnRow>
<div class="col">
<VnSelect
:label="t('warehouses.warehouse')"
:label="t('list.warehouse')"
v-model="ZoneWarehouseFormData.warehouseFk"
:options="warehousesOptions"
option-value="id"

10
src/pages/Zone/Card/ZoneDescriptor.vue
View File

@ -57,11 +57,11 @@ const setData = (entity) => {
<ZoneDescriptorMenuItems :zone="entity" />
</template>
<template #body="{ entity }">
<VnLv :label="t('summary.agency')" :value="entity.agencyMode.name" />
<VnLv :label="t('summary.closeHour')" :value="toTimeFormat(entity.hour)" />
<VnLv :label="t('summary.travelingDays')" :value="entity.travelingDays" />
<VnLv :label="t('summary.price')" :value="toCurrency(entity.price)" />
<VnLv :label="t('summary.bonus')" :value="toCurrency(entity.bonus)" />
<VnLv :label="t('list.agency')" :value="entity.agencyMode.name" />
<VnLv :label="t('zone.closing')" :value="toTimeFormat(entity.hour)" />
<VnLv :label="t('zone.travelingDays')" :value="entity.travelingDays" />
<VnLv :label="t('list.price')" :value="toCurrency(entity.price)" />
<VnLv :label="t('zone.bonus')" :value="toCurrency(entity.bonus)" />
</template>
</CardDescriptor>
</template>

4
src/pages/Zone/Card/ZoneEventExclusionForm.vue
View File

@ -186,8 +186,8 @@ onMounted(() => {
class="q-mr-sm"
@click="
openConfirmationModal(
t('eventsPanel.deleteTitle'),
t('eventsPanel.deleteSubtitle'),
t('zone.deleteTitle'),
t('zone.deleteSubtitle'),
() => deleteEvent()
)
"

16
src/pages/Zone/Card/ZoneEventInclusionForm.vue
View File

@ -153,7 +153,7 @@ onMounted(() => {
<div class="col flex justify-center">
<VnInputDate
v-if="inclusionType === 'day'"
:label="t('eventsInclusionForm.day')"
:label="t('eventsExclusionForm.day')"
v-model="eventInclusionFormData.dated"
class="full-width"
/>
@ -176,11 +176,11 @@ onMounted(() => {
<VnRow>
<VnInputTime
v-model="eventInclusionFormData.hour"
:label="t('eventsInclusionForm.closing')"
:label="t('zone.closing')"
/>
<VnInput
v-model="eventInclusionFormData.travelingDays"
:label="t('eventsInclusionForm.travelingDays')"
:label="t('zone.travelingDays')"
type="number"
min="0"
/>
@ -188,13 +188,13 @@ onMounted(() => {
<VnRow>
<VnInput
v-model="eventInclusionFormData.price"
:label="t('eventsInclusionForm.price')"
:label="t('list.price')"
type="number"
min="0"
/>
<VnInput
v-model="eventInclusionFormData.bonus"
:label="t('eventsInclusionForm.bonus')"
:label="t('zone.bonus')"
type="number"
min="0"
/>
@ -202,7 +202,7 @@ onMounted(() => {
<VnRow>
<VnInput
v-model="eventInclusionFormData.m3Max"
:label="t('eventsInclusionForm.m3Max')"
:label="t('zone.m3Max')"
type="number"
min="0"
/>
@ -224,8 +224,8 @@ onMounted(() => {
class="q-mr-sm"
@click="
openConfirmationModal(
t('eventsPanel.deleteTitle'),
t('eventsPanel.deleteSubtitle'),
t('zone.deleteTitle'),
t('zone.deleteSubtitle'),
() => deleteEvent()
)
"

14
src/pages/Zone/Card/ZoneEventsPanel.vue
View File

@ -150,31 +150,31 @@ onMounted(async () => {
</span>
</div>
<span class="color-vn-label">
{{ t('eventsPanel.closing') }}:
{{ t('zone.closing') }}:
<span class="color-vn-text q-ml-xs">
{{ dashIfEmpty(toTimeFormat(event.hour)) }}
</span>
</span>
<span class="color-vn-label">
{{ t('eventsPanel.travelingDays') }}:
{{ t('zone.travelingDays') }}:
<span class="color-vn-text">
{{ dashIfEmpty(event.travelingDays) }}
</span>
</span>
<span class="color-vn-label">
{{ t('eventsPanel.price') }}:
{{ t('list.price') }}:
<span class="color-vn-text">
{{ dashOrCurrency(event.price)() }}</span
>
</span>
<span class="color-vn-label">
{{ t('eventsPanel.bonus') }}:
{{ t('zone.bonus') }}:
<span class="color-vn-text">
{{ dashOrCurrency(event.bonus)() }}</span
>
</span>
<span class="color-vn-label">
{{ t('eventsPanel.m3Max') }}:
{{ t('zone.m3Max') }}:
<span class="color-vn-text"> {{ dashIfEmpty(event.m3Max) }}</span>
</span>
</QItemSection>
@ -187,8 +187,8 @@ onMounted(async () => {
color="primary"
@click.stop="
openConfirmationModal(
t('eventsPanel.deleteTitle'),
t('eventsPanel.deleteSubtitle'),
t('zone.deleteTitle'),
t('zone.deleteSubtitle'),
() => deleteEvent(event.id)
)
"

2
src/pages/Zone/Card/ZoneLocations.vue
View File

@ -23,7 +23,7 @@ const onSelected = async (val, node) => {
<template>
<QPage class="column items-center q-pa-md">
<QCard class="full-width q-pa-md" style="max-width: 800px">
<ZoneLocationsTree :root-label="t('zoneLocations.locations')">
<ZoneLocationsTree :root-label="t('zone.pageTitles.locations')">
<template #content="{ node }">
<span v-if="!node.id">{{ node.name }}</span>
<QCheckbox

14
src/pages/Zone/Card/ZoneSummary.vue
View File

@ -40,7 +40,7 @@ const filter = computed(() => {
const columns = computed(() => [
{
label: t('summary.name'),
label: t('list.name'),
name: 'name',
field: 'warehouse',
align: 'left',
@ -82,22 +82,22 @@ onMounted(async () => {
<template #body="{ entity: zone }">
<QCard class="vn-one">
<VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
<VnLv :label="t('summary.agency')" :value="zone.agencyMode?.name" />
<VnLv :label="t('summary.price')" :value="toCurrency(zone.price)" />
<VnLv :label="t('summary.bonus')" :value="toCurrency(zone.bonus)" />
<VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
<VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
<VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
</QCard>
<QCard class="vn-one">
<VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
<VnLv :label="t('summary.closeHour')" :value="toTimeFormat(zone.hour)" />
<VnLv :label="t('summary.travelingDays')" :value="zone.travelingDays" />
<VnLv :label="t('zone.travelingDays')" :value="zone.travelingDays" />
<QCheckbox
:label="t('summary.volumetric')"
:label="t('zone.volumetric')"
v-model="zone.isVolumetric"
:disable="true"
/>
</QCard>
<QCard class="full-width">
<VnTitle :url="zoneUrl + `warehouses`" :text="t('summary.warehouse')" />
<VnTitle :url="zoneUrl + `warehouses`" :text="t('list.warehouse')" />
<QTable
:columns="columns"
:rows="warehouses"

6
src/pages/Zone/Card/ZoneWarehouses.vue
View File

@ -90,14 +90,14 @@ const openCreateWarehouseForm = () => createWarehouseDialogRef.value.show();
color="primary"
@click="
openConfirmationModal(
t('warehouses.deleteTitle'),
t('warehouses.deleteSubtitle'),
t('zone.deleteTitle'),
t('zone.deleteSubtitle'),
() => deleteWarehouse(row, rows, rowIndex)
)
"
>
<QTooltip>
{{ t('warehouses.delete') }}
{{ t('eventsPanel.delete') }}
</QTooltip>
</QIcon>
</QTd>

12
src/pages/Zone/ZoneClosingTable.vue
View File

@ -23,28 +23,28 @@ defineProps({
const columns = computed(() => [
{
label: t('zoneClosingTable.id'),
label: t('list.id'),
name: 'id',
field: 'id',
sortable: true,
align: 'left',
},
{
label: t('zoneClosingTable.name'),
label: t('list.name'),
name: 'name',
field: 'name',
sortable: true,
align: 'left',
},
{
label: t('zoneClosingTable.agency'),
label: t('list.agency'),
name: 'agency',
field: 'agencyModeName',
sortable: true,
align: 'left',
},
{
label: t('zoneClosingTable.closing'),
label: t('zone.closing'),
name: 'close',
field: 'hour',
sortable: true,
@ -52,7 +52,7 @@ const columns = computed(() => [
format: (val) => toTimeFormat(val),
},
{
label: t('zoneClosingTable.price'),
label: t('list.price'),
name: 'price',
field: 'price',
sortable: true,
@ -73,7 +73,7 @@ const redirectToZoneSummary = (id) => {
<template>
<div>
<div class="header">
<span>{{ t('zoneClosingTable.zones') }}</span>
<span>{{ t('zone.pageTitles.zones') }}</span>
</div>
<QTable
:rows="rows"

14
src/pages/Zone/ZoneCreate.vue
View File

@ -54,13 +54,13 @@ const redirectToZoneLocations = (_, { id }) => {
<VnRow>
<VnInput
v-model="data.name"
:label="t('create.name')"
:label="t('list.name')"
:required="true"
/>
</VnRow>
<VnRow>
<VnSelect
:label="t('create.warehouse')"
:label="t('list.warehouse')"
:options="warehousesOptions"
hide-selected
option-label="name"
@ -68,7 +68,7 @@ const redirectToZoneLocations = (_, { id }) => {
v-model="data.warehouseFk"
/>
<VnSelect
:label="t('create.agency')"
:label="t('list.agency')"
:options="agencyOptions"
hide-selected
option-label="name"
@ -80,7 +80,7 @@ const redirectToZoneLocations = (_, { id }) => {
<VnRow>
<VnInput
v-model="data.travelingDays"
:label="t('create.travelingDays')"
:label="t('zone.travelingDays')"
type="number"
min="0"
/>
@ -90,20 +90,20 @@ const redirectToZoneLocations = (_, { id }) => {
<VnRow>
<VnInput
v-model="data.price"
:label="t('create.price')"
:label="t('list.price')"
type="number"
min="0"
/>
<VnInput
v-model="data.bonus"
:label="t('create.bonus')"
:label="t('zone.bonus')"
type="number"
min="0"
/>
</VnRow>
<VnRow>
<QCheckbox
:label="t('create.volumetric')"
:label="t('zone.volumetric')"
v-model="data.isVolumetric"
:toggle-indeterminate="false"
/>

4
src/pages/Zone/ZoneDeliveryPanel.vue
View File

@ -117,7 +117,7 @@ watch(
<VnSelect
data-key="delivery"
v-if="deliveryMethodFk == 'delivery'"
:label="t('deliveryPanel.agency')"
:label="t('list.agency')"
v-model="formData.agencyModeFk"
url="AgencyModes/isActive"
:fields="['id', 'name']"
@ -132,7 +132,7 @@ watch(
/>
<VnSelect
v-else
:label="t('deliveryPanel.warehouse')"
:label="t('list.warehouse')"
v-model="formData.agencyModeFk"
url="AgencyModes/isActive"
:fields="['id', 'name']"

6
src/pages/Zone/ZoneFilterPanel.vue
View File

@ -38,11 +38,7 @@ const agencies = ref([]);
<template #body="{ params, searchFn }">
<QItem>
<QItemSection>
<VnInput
:label="t('filterPanel.name')"
v-model="params.name"
is-outlined
/>
<VnInput :label="t('list.name')" v-model="params.name" is-outlined />
</QItemSection>
</QItem>
<QItem>

4
src/pages/Zone/ZoneList.vue
View File

@ -174,13 +174,13 @@ onMounted(() => (stateStore.rightDrawer = true));
/>
<VnInput
v-model="data.bonus"
:label="t('list.bonus')"
:label="t('zone.bonus')"
min="0"
type="number"
/>
<VnInput
v-model="data.travelingDays"
:label="t('list.travelingDays')"
:label="t('zone.travelingDays')"
type="number"
min="0"
/>

4
src/pages/Zone/ZoneUpcoming.vue
View File

@ -22,13 +22,13 @@ const columns = computed(() => [
align: 'left',
},
{
label: t('upcomingDeliveries.closing'),
label: t('zone.closing'),
name: 'closing',
field: 'hour',
align: 'left',
},
{
label: t('upcomingDeliveries.id'),
label: t('list.id'),
name: 'id',
field: 'zoneFk',
align: 'left',

50
src/pages/Zone/locale/en.yml
View File

@ -8,6 +8,13 @@ zone:
upcomingDeliveries: Upcoming deliveries
warehouses: Warehouses
calendar: Calendar
m3Max: Max m³
deleteTitle: This item will be deleted
deleteSubtitle: Are you sure you want to continue?
volumetric: Volumetric
bonus: Bonus
closing: Closing
travelingDays: Traveling days
list:
clone: Clone
id: Id
@ -22,74 +29,38 @@ list:
searchInfo: Search zone by id or name
confirmCloneTitle: All it's properties will be copied
confirmCloneSubtitle: Do you want to clone this zone?
travelingDays: Traveling days
warehouse: Warehouse
bonus: Bonus
isVolumetric: Volumetric
createZone: Create zone
zoneSummary: Summary
create:
name: Name
warehouse: Warehouse
agency: Agency
travelingDays: Traveling days
closingHour: Closing hour
price: Price
bonus: Bonus
volumetric: Volumetric
itemMaxSize: Max m³
inflation: Inflation
summary:
agency: Agency
price: Price
basicData: Basic data
bonus: Bonus
closeHour: Close hour
travelingDays: Traveling days
volumetric: Volumetric
warehouse: Warehouse
name: Name
filterPanel:
name: Name
agencyModeFk: Agency
zoneLocations:
locations: Locations
deliveryPanel:
pickup: Pick up
delivery: Delivery
postcode: Postcode
agency: Agency
warehouse: Warehouse
query: Query
noEventsWarning: No service for the specified zone
zoneClosingTable:
id: Id
name: Name
agency: Agency
closing: Closing
price: Price
preview: Preview
zones: Zones
warehouses:
delete: Delete
deleteTitle: This item will be deleted
deleteSubtitle: Are you sure you want to continue?
warehouse: Warehouse
add: Add
eventsPanel:
editMode: Edit mode
include: Include
exclude: Exclude
events: Events
closing: Closing
travelingDays: Traveling days
price: Price
bonus: Bonus
m3Max: Max m³
everyday: Everyday
delete: Delete
deleteTitle: This item will be deleted
deleteSubtitle: Are you sure you want to continue?
eventsExclusionForm:
addExclusion: Add exclusion
editExclusion: Edit exclusion
@ -103,15 +74,8 @@ eventsInclusionForm:
oneDay: One day
indefinitely: Indefinitely
rangeOfDates: Range of dates
day: Day
closing: Closing
travelingDays: Traveling days
price: Price
bonus: Bonus
m3Max: Max m³
from: From
to: To
upcomingDeliveries:
province: Province
closing: Closing
id: Id

53
src/pages/Zone/locale/es.yml
View File

@ -8,6 +8,13 @@ zone:
upcomingDeliveries: Próximos repartos
warehouses: Almacenes
calendar: Calendario
m3Max: Medida máxima
deleteTitle: Este elemento será eliminado
deleteSubtitle: ¿Seguro que quieres continuar?
volumetric: Volumétrico
bonus: Bonificación
closing: Cierre
travelingDays: Días de viaje
list:
clone: Clonar
id: Id
@ -22,76 +29,38 @@ list:
searchInfo: Buscar zonas por identificador o nombre
confirmCloneTitle: Todas sus propiedades serán copiadas
confirmCloneSubtitle: ¿Seguro que quieres clonar esta zona?
travelingDays: Días de viaje
warehouse: Almacén
bonus: Bonus
isVolumetric: Volumétrico
createZone: Crear zona
zoneSummary: Resumen
create:
name: Nombre
warehouse: Almacén
agency: Agencia
travelingDays: Días de viaje
closingHour: Hora de cierre
price: Precio
bonus: Bonificación
volumetric: Volumétrico
itemMaxSize: Medida máxima
inflation: Inflación
summary:
agency: Agencia
price: Precio
basicData: Datos básicos
bonus: Bonificación
closeHour: Hora de cierre
travelingDays: Días de viaje
volumetric: Volumétrico
warehouse: Almacén
name: Nombre
filterPanel:
name: Nombre
agencyModeFk: Agencia
zoneLocations:
locations: Localizaciones
deliveryPanel:
pickup: Recogida
delivery: Entrega
postcode: Código postal
agency: Agencia
warehouse: Almacén
query: Consultar
noEventsWarning: No hay servicio para la zona especificada
zoneClosingTable:
id: Id
name: Nombre
agency: Agencia
closing: Cierre
preview: Vista previa
price: Precio
zones: Zonas
Search zones: Buscar zonas
You can search by zone reference: Puedes buscar por referencia de la zona
warehouses:
delete: Eliminar
deleteTitle: Este elemento será eliminado
deleteSubtitle: ¿Seguro que quieres continuar?
warehouse: Almacén
add: Añadir
eventsPanel:
editMode: Modo edición
include: Incluir
exclude: Excluir
events: Eventos
closing: Cierre
travelingDays: Días de viaje
price: Precio
bonus: Bonificación
m3Max: Medida máxima
everyday: Todos los días
delete: Eliminar
deleteTitle: Este elemento será eliminado
deleteSubtitle: ¿Seguro que quieres continuar?
eventsExclusionForm:
addExclusion: Añadir exclusión
editExclusion: Editar exclusión
@ -105,15 +74,7 @@ eventsInclusionForm:
oneDay: Un día
indefinitely: Indefinido
rangeOfDates: Rango de fechas
day: Día
closing: Cierre
travelingDays: Días de viaje
price: Precio
bonus: Bonificación
m3Max: Medida máxima
from: Desde
to: Hasta
upcomingDeliveries:
province: Provincia
closing: Cierre
id: Id