Merge pull request 'fix: fix translations' (!1124) from warmFix-translationsMonitorItem into dev
gitea/salix-front/pipeline/head This commit looks good Details

Reviewed-on: #1124
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
This commit is contained in:
Carlos Satorres 2024-12-23 09:48:46 +00:00
commit 638ccf0c63
4 changed files with 31 additions and 7 deletions

View File

@ -861,6 +861,7 @@ components:
ended: To ended: To
mine: For me mine: For me
hasMinPrice: Minimum price hasMinPrice: Minimum price
warehouseFk: Warehouse
# LatestBuysFilter # LatestBuysFilter
salesPersonFk: Buyer salesPersonFk: Buyer
from: From from: From

View File

@ -853,6 +853,7 @@ components:
ended: Hasta ended: Hasta
mine: Para mi mine: Para mi
hasMinPrice: Precio mínimo hasMinPrice: Precio mínimo
wareHouseFk: Almacén
# LatestBuysFilter # LatestBuysFilter
salesPersonFk: Comprador salesPersonFk: Comprador
active: Activo active: Activo

View File

@ -32,7 +32,7 @@ const itemTypeWorkersOptions = ref([]);
<QItem class="q-my-md"> <QItem class="q-my-md">
<QItemSection> <QItemSection>
<VnSelect <VnSelect
:label="t('components.itemsFilterPanel.buyerFk')" :label="t('params.buyerFk')"
v-model="params.buyerFk" v-model="params.buyerFk"
:options="itemTypeWorkersOptions" :options="itemTypeWorkersOptions"
option-value="id" option-value="id"
@ -51,7 +51,7 @@ const itemTypeWorkersOptions = ref([]);
url="Warehouses" url="Warehouses"
auto-load auto-load
:filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }" :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
:label="t('globals.warehouse')" :label="t('params.warehouseFk')"
v-model="params.warehouseFk" v-model="params.warehouseFk"
option-label="name" option-label="name"
option-value="id" option-value="id"
@ -66,7 +66,7 @@ const itemTypeWorkersOptions = ref([]);
<QItem class="q-my-md"> <QItem class="q-my-md">
<QItemSection> <QItemSection>
<VnInputDate <VnInputDate
:label="t('components.itemsFilterPanel.started')" :label="t('params.started')"
v-model="params.started" v-model="params.started"
is-outlined is-outlined
@update:model-value="searchFn()" @update:model-value="searchFn()"
@ -76,7 +76,7 @@ const itemTypeWorkersOptions = ref([]);
<QItem class="q-my-md"> <QItem class="q-my-md">
<QItemSection> <QItemSection>
<VnInputDate <VnInputDate
:label="t('components.itemsFilterPanel.ended')" :label="t('params.ended')"
v-model="params.ended" v-model="params.ended"
is-outlined is-outlined
@update:model-value="searchFn()" @update:model-value="searchFn()"
@ -86,7 +86,7 @@ const itemTypeWorkersOptions = ref([]);
<QItem> <QItem>
<QItemSection> <QItemSection>
<QCheckbox <QCheckbox
:label="t('components.itemsFilterPanel.mine')" :label="t('params.mine')"
v-model="params.mine" v-model="params.mine"
toggle-indeterminate toggle-indeterminate
@update:model-value="searchFn()" @update:model-value="searchFn()"
@ -94,14 +94,14 @@ const itemTypeWorkersOptions = ref([]);
<QCheckbox <QCheckbox
v-model="params.showBadDates" v-model="params.showBadDates"
:label="t(`components.itemsFilterPanel.showBadDates`)" :label="t(`params.showBadDates`)"
toggle-indeterminate toggle-indeterminate
@update:model-value="searchFn()" @update:model-value="searchFn()"
> >
</QCheckbox> </QCheckbox>
<QCheckbox <QCheckbox
:label="t('components.itemsFilterPanel.hasMinPrice')" :label="t('params.hasMinPrice')"
v-model="params.hasMinPrice" v-model="params.hasMinPrice"
toggle-indeterminate toggle-indeterminate
@update:model-value="searchFn()" @update:model-value="searchFn()"
@ -111,3 +111,23 @@ const itemTypeWorkersOptions = ref([]);
</template> </template>
</ItemsFilterPanel> </ItemsFilterPanel>
</template> </template>
<i18n>
en:
params:
buyerFk: Buyer
warehouseFk: Warehouse
started: Started
ended: Ended
mine: Mine
showBadDates: Show future items
hasMinPrice: Has Min Price
es:
params:
buyerFk: Comprador
warehouseFk: Almacén
started: Desde
ended: Hasta
mine: Para mi
showBadDates: Ver items a futuro
hasMinPrice: Precio mínimo
</i18n>

View File

@ -281,6 +281,7 @@ en:
problems: With problems problems: With problems
pending: Pending pending: Pending
alertLevel: Grouped State alertLevel: Grouped State
department: Department
FREE: Free FREE: Free
DELIVERED: Delivered DELIVERED: Delivered
ON_PREPARATION: On preparation ON_PREPARATION: On preparation
@ -300,6 +301,7 @@ es:
problems: Con problemas problems: Con problemas
pending: Pendiente pending: Pendiente
alertLevel: Estado agrupado alertLevel: Estado agrupado
department: Departamento
FREE: Libre FREE: Libre
DELIVERED: Servido DELIVERED: Servido
ON_PREPARATION: En preparación ON_PREPARATION: En preparación