Compare commits

...

49 Commits

Author SHA1 Message Date
Javier Segarra 0f8edae458 Merge pull request 'perf: remove warning default value' (!1241) from warning_defaultValue_firstParam into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1241
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-20 17:30:10 +00:00
Javier Segarra c0144e78c4 Merge branch 'dev' into warning_defaultValue_firstParam
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 17:29:21 +00:00
Jorge Penadés 91f10bba79 Merge pull request 'feat: skip tests' (!1235) from skipTests into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1235
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-20 13:16:57 +00:00
Jorge Penadés 7d57b1ebe7 test: skip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 13:13:09 +01:00
Jorge Penadés 1d3feef1e7 chore: add task comment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 11:39:59 +01:00
Jorge Penadés 18d4661bc3 chore: add task comment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 11:37:28 +01:00
Jorge Penadés 3abd06db02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into skipTests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 11:00:55 +01:00
Jorge Penadés 2f40b77f0b Merge pull request '#8198 keep section filter' (!1210) from 8198-keepSectionFilter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1210
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-20 09:42:31 +00:00
Jorge Penadés 7795fd1524 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 10:30:33 +01:00
Jorge Penadés e636a37c33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into skipTests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 10:18:05 +01:00
Javier Segarra 7b42fac56c Merge branch 'dev' into warning_defaultValue_firstParam
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 07:05:01 +00:00
PAU ROVIRA ROSALENY c43a8d0a38 Merge pull request 'feat: #8258 added uppercase option to VnInput' (!1184) from 8258-uppercaseInputs into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1184
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-20 06:01:32 +00:00
PAU ROVIRA ROSALENY c4cf372333 Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 13:54:22 +00:00
Javier Segarra 238817285d perf: remove warning default value
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 12:35:14 +00:00
Jon Elias 9d35dc08dd Merge pull request 'Fix: Redirect when confirming lines' (!1236) from Fix-RedirectOrderToTicketSale into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1236
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-17 12:21:32 +00:00
PAU ROVIRA ROSALENY 6d4405c1fe Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 12:19:46 +00:00
PAU ROVIRA ROSALENY 32909a96bd feat: refs #8258 added uppercase validation on supplier create
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 13:19:12 +01:00
Jon Elias 63f433a6d3 Merge branch 'dev' into Fix-RedirectOrderToTicketSale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 12:09:37 +00:00
Jon Elias e1a395b015 refactor: redirect using params
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 13:07:30 +01:00
Jose Antonio Tubau dac99dc132 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1144) from 8316-entryCardWithVnCardBeta into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1144
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-17 11:49:15 +00:00
Jose Antonio Tubau 872cf63b5f Merge branch 'dev' into 8316-entryCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 08:21:17 +00:00
Jose Antonio Tubau c2cbcb3309 refactor: refs #8316 add new localization keys and update existing ones for entry components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 08:58:25 +01:00
PAU ROVIRA ROSALENY 11e05433b8 Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 07:40:49 +00:00
Jon Elias 972b377e13 fix: redirect when confirming lines
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 07:35:23 +01:00
Jorge Penadés fb530d8408 chore: refs #8198 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 16:29:28 +01:00
Jorge Penadés b5ae3a1901 chore: refs #8198 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 16:27:18 +01:00
Jorge Penadés 21bcfdc997 feat: skip tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 16:20:02 +01:00
Jorge Penadés 31795ae40b test: refs #8198 skip tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 12:51:35 +01:00
Jorge Penadés 39adfb3693 fix: refs #8198 update query param
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 10:43:40 +01:00
Jorge Penadés 64c4729edb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 10:40:50 +01:00
Jose Antonio Tubau 80413eef3e refactor: refs #8316 moved localizations to local locale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 15:19:47 +01:00
PAU ROVIRA ROSALENY 0ee3aa12a3 Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 13:42:01 +00:00
Alex Moreno a95f6f56bd fix: refs #8316 userFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 12:17:06 +01:00
Alex Moreno 3f3e8cfe42 Merge branch 'dev' into 8316-entryCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 11:11:49 +00:00
Jorge Penadés 24b20605d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter 2025-01-14 17:24:03 +01:00
Jorge Penadés df9e5f8059 refactor: refs #8198 simplify state management and data fetching in ItemDiary component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 17:13:59 +01:00
PAU ROVIRA ROSALENY 5ce78ba473 Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 12:45:18 +00:00
Jorge Penadés 3cc5595e14 refactor: refs #8198 simplify data fetching and filtering logic
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 13:08:52 +01:00
Jose Antonio Tubau 702ae17d94 refactor: refs #8316 update EntryCard to use user-filter prop and remove exprBuilder from EntryList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 08:25:10 +01:00
PAU ROVIRA ROSALENY 2a8c2a1079 Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 11:54:12 +00:00
Jose Antonio Tubau bd66d3aee5 Merge branch 'dev' into 8316-entryCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 06:45:26 +00:00
Jose Antonio Tubau 7be5f9633b feat: refs #8316 add entryFilter prop to VnTable component in EntryList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 15:24:40 +01:00
Jose Antonio Tubau c896b66a50 feat: refs #8316 add entryFilter to VnTableEntryList component 2025-01-10 15:24:09 +01:00
PAU ROVIRA ROSALENY 47168cdeb8 Merge branch 'dev' into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 10:53:10 +00:00
PAU ROVIRA ROSALENY f834f3b754 feat: refs #8258 added button to pass to uppercase
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 07:52:22 +01:00
PAU ROVIRA ROSALENY 3148461dc1 Merge branch 'dev' of https: refs #8258//gitea.verdnatura.es/verdnatura/salix-front into 8258-uppercaseInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 07:44:02 +01:00
PAU ROVIRA ROSALENY dfd7ba9379 feat: refs #8258 added uppercase option to VnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 08:14:37 +01:00
Jose Antonio Tubau 7f1684ddfc refactor: refs #8316 added entryFilter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-08 08:14:05 +01:00
Jose Antonio Tubau a9a09ad0a3 refactor: refs #8316 used VnSection and VnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 13:58:35 +01:00
33 changed files with 576 additions and 522 deletions

View File

@ -42,10 +42,13 @@ const $props = defineProps({
type: Number, type: Number,
default: null, default: null,
}, },
uppercase: {
type: Boolean,
default: false,
},
}); });
const vnInputRef = ref(null); const vnInputRef = ref(null);
const showPassword = ref(false);
const value = computed({ const value = computed({
get() { get() {
return $props.modelValue; return $props.modelValue;
@ -117,6 +120,10 @@ const handleInsertMode = (e) => {
input.setSelectionRange(cursorPos + 1, cursorPos + 1); input.setSelectionRange(cursorPos + 1, cursorPos + 1);
}); });
}; };
const handleUppercase = () => {
value.value = value.value?.toUpperCase() || '';
};
</script> </script>
<template> <template>
@ -159,7 +166,16 @@ const handleInsertMode = (e) => {
emit('remove'); emit('remove');
} }
" "
></QIcon>
<QIcon
name="match_case"
size="xs"
v-if="!$attrs.disabled && !($attrs.readonly) && $props.uppercase"
@click="handleUppercase"
class="uppercase-icon"
/> />
<slot name="append" v-if="$slots.append && !$attrs.disabled" /> <slot name="append" v-if="$slots.append && !$attrs.disabled" />
<QIcon v-if="info" name="info"> <QIcon v-if="info" name="info">
<QTooltip max-width="350px"> <QTooltip max-width="350px">
@ -170,3 +186,14 @@ const handleInsertMode = (e) => {
</QInput> </QInput>
</div> </div>
</template> </template>
<i18n>
en:
inputMin: Must be more than {value}
maxLength: The value exceeds {value} characters
inputMax: Must be less than {value}
es:
inputMin: Debe ser mayor a {value}
maxLength: El valor excede los {value} carácteres
inputMax: Debe ser menor a {value}
</i18n>

View File

@ -7,7 +7,9 @@ import { isDialogOpened } from 'src/filters';
const arrayDataStore = useArrayDataStore(); const arrayDataStore = useArrayDataStore();
export function useArrayData(key = useRoute().meta.moduleName, userOptions) { export function useArrayData(key, userOptions) {
key ??= useRoute().meta.moduleName;
if (!key) throw new Error('ArrayData: A key is required to use this composable'); if (!key) throw new Error('ArrayData: A key is required to use this composable');
if (!arrayDataStore.get(key)) arrayDataStore.set(key); if (!arrayDataStore.get(key)) arrayDataStore.set(key);

View File

@ -389,80 +389,6 @@ cau:
subtitle: By sending this ticket, all the data related to the error, the section, the user, etc., are already sent. subtitle: By sending this ticket, all the data related to the error, the section, the user, etc., are already sent.
inputLabel: Explain why this error should not appear inputLabel: Explain why this error should not appear
askPrivileges: Ask for privileges askPrivileges: Ask for privileges
entry:
list:
newEntry: New entry
tableVisibleColumns:
created: Creation
supplierFk: Supplier
isBooked: Booked
isConfirmed: Confirmed
isOrdered: Ordered
companyFk: Company
travelFk: Travel
isExcludedFromAvailable: Inventory
invoiceAmount: Import
summary:
commission: Commission
currency: Currency
invoiceNumber: Invoice number
ordered: Ordered
booked: Booked
excludedFromAvailable: Inventory
travelReference: Reference
travelAgency: Agency
travelShipped: Shipped
travelDelivered: Delivered
travelLanded: Landed
travelReceived: Received
buys: Buys
stickers: Stickers
package: Package
packing: Pack.
grouping: Group.
buyingValue: Buying value
import: Import
pvp: PVP
basicData:
travel: Travel
currency: Currency
commission: Commission
observation: Observation
booked: Booked
excludedFromAvailable: Inventory
buys:
observations: Observations
packagingFk: Box
color: Color
printedStickers: Printed stickers
notes:
observationType: Observation type
latestBuys:
tableVisibleColumns:
image: Picture
itemFk: Item ID
weightByPiece: Weight/Piece
isActive: Active
family: Family
entryFk: Entry
freightValue: Freight value
comissionValue: Commission value
packageValue: Package value
isIgnored: Is ignored
price2: Grouping
price3: Packing
minPrice: Min
ektFk: Ekt
packingOut: Package out
landing: Landing
isExcludedFromAvailable: Es inventory
params:
toShipped: To
fromShipped: From
warehouseiNFk: Warehouse
daysOnward: Days onward
daysAgo: Days ago
warehouseInFk: Warehouse in
ticket: ticket:
params: params:
ticketFk: Ticket ID ticketFk: Ticket ID
@ -869,7 +795,10 @@ components:
hasMinPrice: Minimum price hasMinPrice: Minimum price
# LatestBuysFilter # LatestBuysFilter
salesPersonFk: Buyer salesPersonFk: Buyer
supplierFk: Supplier
from: From from: From
to: To
visible: Is visible
active: Is active active: Is active
floramondo: Is floramondo floramondo: Is floramondo
showBadDates: Show future items showBadDates: Show future items

View File

@ -389,80 +389,6 @@ cau:
subtitle: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc subtitle: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc
inputLabel: Explique el motivo por el que no deberia aparecer este fallo inputLabel: Explique el motivo por el que no deberia aparecer este fallo
askPrivileges: Solicitar permisos askPrivileges: Solicitar permisos
entry:
list:
newEntry: Nueva entrada
tableVisibleColumns:
created: Creación
supplierFk: Proveedor
isBooked: Asentado
isConfirmed: Confirmado
isOrdered: Pedida
companyFk: Empresa
travelFk: Envio
isExcludedFromAvailable: Inventario
invoiceAmount: Importe
summary:
commission: Comisión
currency: Moneda
invoiceNumber: Núm. factura
ordered: Pedida
booked: Contabilizada
excludedFromAvailable: Inventario
travelReference: Referencia
travelAgency: Agencia
travelShipped: F. envio
travelWarehouseOut: Alm. salida
travelDelivered: Enviada
travelLanded: F. entrega
travelReceived: Recibida
buys: Compras
stickers: Etiquetas
package: Embalaje
packing: Pack.
grouping: Group.
buyingValue: Coste
import: Importe
pvp: PVP
basicData:
travel: Envío
currency: Moneda
observation: Observación
commission: Comisión
booked: Asentado
excludedFromAvailable: Inventario
buys:
observations: Observaciónes
packagingFk: Embalaje
color: Color
printedStickers: Etiquetas impresas
notes:
observationType: Tipo de observación
latestBuys:
tableVisibleColumns:
image: Foto
itemFk: Id Artículo
weightByPiece: Peso (gramos)/tallo
isActive: Activo
family: Familia
entryFk: Entrada
freightValue: Porte
comissionValue: Comisión
packageValue: Embalaje
isIgnored: Ignorado
price2: Grouping
price3: Packing
minPrice: Min
ektFk: Ekt
packingOut: Embalaje envíos
landing: Llegada
isExcludedFromAvailable: Es inventario
params:
toShipped: Hasta
fromShipped: Desde
warehouseInFk: Alm. entrada
daysOnward: Días adelante
daysAgo: Días atras
ticket: ticket:
params: params:
ticketFk: ID de ticket ticketFk: ID de ticket
@ -866,7 +792,11 @@ components:
wareHouseFk: Almacén wareHouseFk: Almacén
# LatestBuysFilter # LatestBuysFilter
salesPersonFk: Comprador salesPersonFk: Comprador
supplierFk: Proveedor
visible: Visible
active: Activo active: Activo
from: Desde
to: Hasta
floramondo: Floramondo floramondo: Floramondo
showBadDates: Ver items a futuro showBadDates: Ver items a futuro
userPanel: userPanel:

View File

@ -44,6 +44,7 @@ function handleLocation(data, location) {
:required="true" :required="true"
:rules="validate('client.socialName')" :rules="validate('client.socialName')"
clearable clearable
uppercase="true"
v-model="data.socialName" v-model="data.socialName"
> >
<template #append> <template #append>

View File

@ -50,6 +50,14 @@ const columns = computed(() => [
isTitle: true, isTitle: true,
create: true, create: true,
columnClass: 'expand', columnClass: 'expand',
attrs: {
uppercase: true,
},
columnFilter: {
attrs: {
uppercase: false,
},
},
}, },
{ {
align: 'left', align: 'left',

View File

@ -106,7 +106,7 @@ const { openConfirmationModal } = useVnConfirm();
:to="{ :to="{
name: 'WorkerList', name: 'WorkerList',
query: { query: {
params: JSON.stringify({ departmentFk: entityId }), table: JSON.stringify({ departmentFk: entityId }),
}, },
}" }"
> >

View File

@ -1,21 +1,13 @@
<script setup> <script setup>
import VnCard from 'components/common/VnCard.vue'; import VnCardBeta from 'components/common/VnCardBeta.vue';
import EntryDescriptor from './EntryDescriptor.vue'; import EntryDescriptor from './EntryDescriptor.vue';
import EntryFilter from '../EntryFilter.vue'; import filter from './EntryFilter.js'
import filter from './EntryFilter.js';
</script> </script>
<template> <template>
<VnCard <VnCardBeta
data-key="Entry" data-key="Entry"
base-url="Entries" base-url="Entries"
:filter="filter"
:descriptor="EntryDescriptor" :descriptor="EntryDescriptor"
:filter-panel="EntryFilter" :user-filter="filter"
search-data-key="EntryList"
:searchbar-props="{
url: 'Entries/filter',
label: 'Search entries',
info: 'You can search by entry reference',
}"
/> />
</template> </template>

View File

@ -40,7 +40,7 @@ const companiesOptions = ref([]);
<VnFilterPanel :data-key="props.dataKey" :search-button="true"> <VnFilterPanel :data-key="props.dataKey" :search-button="true">
<template #tags="{ tag, formatFn }"> <template #tags="{ tag, formatFn }">
<div class="q-gutter-x-xs"> <div class="q-gutter-x-xs">
<strong>{{ t(`params.${tag.label}`) }}: </strong> <strong>{{ t(`entryFilter.params.${tag.label}`) }}: </strong>
<span>{{ formatFn(tag.value) }}</span> <span>{{ formatFn(tag.value) }}</span>
</div> </div>
</template> </template>
@ -49,7 +49,7 @@ const companiesOptions = ref([]);
<QItemSection> <QItemSection>
<VnInput <VnInput
v-model="params.search" v-model="params.search"
:label="t('entryFilter.filter.search')" :label="t('entryFilter.params.search')"
is-outlined is-outlined
/> />
</QItemSection> </QItemSection>
@ -58,7 +58,7 @@ const companiesOptions = ref([]);
<QItemSection> <QItemSection>
<VnInput <VnInput
v-model="params.reference" v-model="params.reference"
:label="t('entryFilter.filter.reference')" :label="t('entryFilter.params.reference')"
is-outlined is-outlined
/> />
</QItemSection> </QItemSection>
@ -67,7 +67,7 @@ const companiesOptions = ref([]);
<QItemSection> <QItemSection>
<VnInput <VnInput
v-model="params.invoiceNumber" v-model="params.invoiceNumber"
:label="t('params.invoiceNumber')" :label="t('entryFilter.params.invoiceNumber')"
is-outlined is-outlined
/> />
</QItemSection> </QItemSection>
@ -76,7 +76,7 @@ const companiesOptions = ref([]);
<QItemSection> <QItemSection>
<VnInput <VnInput
v-model="params.travelFk" v-model="params.travelFk"
:label="t('params.travelFk')" :label="t('entryFilter.params.travelFk')"
is-outlined is-outlined
/> />
</QItemSection> </QItemSection>
@ -84,7 +84,7 @@ const companiesOptions = ref([]);
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnSelect <VnSelect
:label="t('params.companyFk')" :label="t('entryFilter.params.companyFk')"
v-model="params.companyFk" v-model="params.companyFk"
@update:model-value="searchFn()" @update:model-value="searchFn()"
:options="companiesOptions" :options="companiesOptions"
@ -100,7 +100,7 @@ const companiesOptions = ref([]);
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnSelect <VnSelect
:label="t('params.currencyFk')" :label="t('entryFilter.params.currencyFk')"
v-model="params.currencyFk" v-model="params.currencyFk"
@update:model-value="searchFn()" @update:model-value="searchFn()"
:options="currenciesOptions" :options="currenciesOptions"
@ -116,7 +116,7 @@ const companiesOptions = ref([]);
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnSelect <VnSelect
:label="t('params.supplierFk')" :label="t('entryFilter.params.supplierFk')"
v-model="params.supplierFk" v-model="params.supplierFk"
@update:model-value="searchFn()" @update:model-value="searchFn()"
url="Suppliers" url="Suppliers"
@ -148,7 +148,7 @@ const companiesOptions = ref([]);
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnInputDate <VnInputDate
:label="t('params.created')" :label="t('entryFilter.params.created')"
v-model="params.created" v-model="params.created"
@update:model-value="searchFn()" @update:model-value="searchFn()"
is-outlined is-outlined
@ -158,7 +158,7 @@ const companiesOptions = ref([]);
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnInputDate <VnInputDate
:label="t('params.from')" :label="t('entryFilter.params.from')"
v-model="params.from" v-model="params.from"
@update:model-value="searchFn()" @update:model-value="searchFn()"
is-outlined is-outlined
@ -168,7 +168,7 @@ const companiesOptions = ref([]);
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnInputDate <VnInputDate
:label="t('params.to')" :label="t('entryFilter.params.to')"
v-model="params.to" v-model="params.to"
@update:model-value="searchFn()" @update:model-value="searchFn()"
is-outlined is-outlined
@ -178,14 +178,14 @@ const companiesOptions = ref([]);
<QItem> <QItem>
<QItemSection> <QItemSection>
<QCheckbox <QCheckbox
:label="t('params.isBooked')" :label="t('entryFilter.params.isBooked')"
v-model="params.isBooked" v-model="params.isBooked"
toggle-indeterminate toggle-indeterminate
/> />
</QItemSection> </QItemSection>
<QItemSection> <QItemSection>
<QCheckbox <QCheckbox
:label="t('params.isConfirmed')" :label="t('entryFilter.params.isConfirmed')"
v-model="params.isConfirmed" v-model="params.isConfirmed"
toggle-indeterminate toggle-indeterminate
/> />
@ -194,7 +194,7 @@ const companiesOptions = ref([]);
<QItem> <QItem>
<QItemSection> <QItemSection>
<QCheckbox <QCheckbox
:label="t('params.isOrdered')" :label="t('entryFilter.params.isOrdered')"
v-model="params.isOrdered" v-model="params.isOrdered"
toggle-indeterminate toggle-indeterminate
/> />
@ -203,34 +203,3 @@ const companiesOptions = ref([]);
</template> </template>
</VnFilterPanel> </VnFilterPanel>
</template> </template>
<i18n>
en:
params:
invoiceNumber: Invoice number
travelFk: Travel
companyFk: Company
currencyFk: Currency
supplierFk: Supplier
from: From
to: To
created: Created
isBooked: Booked
isConfirmed: Confirmed
isOrdered: Ordered
es:
params:
invoiceNumber: Núm. factura
travelFk: Envío
companyFk: Empresa
currencyFk: Moneda
supplierFk: Proveedor
from: Desde
to: Hasta
created: Fecha creación
isBooked: Asentado
isConfirmed: Confirmado
isOrdered: Pedida
</i18n>

View File

@ -102,7 +102,7 @@ const columns = [
}, },
{ {
align: 'left', align: 'left',
label: t('globals.weightByPiece'), label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
name: 'weightByPiece', name: 'weightByPiece',
columnFilter: { columnFilter: {
component: 'number', component: 'number',
@ -157,7 +157,7 @@ const columns = [
}, },
{ {
align: 'left', align: 'left',
label: t('entry.buys.packageValue'), label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
name: 'packageValue', name: 'packageValue',
columnFilter: { columnFilter: {
component: 'number', component: 'number',
@ -262,8 +262,3 @@ onUnmounted(() => (stateStore.rightDrawer = false));
:right-search="false" :right-search="false"
/> />
</template> </template>
<i18n>
es:
Edit buy(s): Editar compra(s)
</i18n>

View File

@ -2,17 +2,17 @@
import { ref, computed } from 'vue'; import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import EntryFilter from './EntryFilter.vue'; import EntryFilter from './EntryFilter.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import VnTable from 'components/VnTable/VnTable.vue'; import VnTable from 'components/VnTable/VnTable.vue';
import RightMenu from 'src/components/common/RightMenu.vue';
import { toDate } from 'src/filters'; import { toDate } from 'src/filters';
import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import EntrySummary from './Card/EntrySummary.vue'; import EntrySummary from './Card/EntrySummary.vue';
import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue'; import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue'; import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
import VnSection from 'src/components/common/VnSection.vue';
const { t } = useI18n(); const { t } = useI18n();
const tableRef = ref(); const tableRef = ref();
const dataKey = 'EntryList';
const { viewSummary } = useSummaryDialog(); const { viewSummary } = useSummaryDialog();
const entryFilter = { const entryFilter = {
@ -178,30 +178,32 @@ const columns = computed(() => [
}, },
]); ]);
</script> </script>
<template> <template>
<VnSearchbar <VnSection
data-key="EntryList" :data-key="dataKey"
:columns="columns"
prefix="entry"
url="Entries/filter" url="Entries/filter"
:label="t('Search entries')" :array-data-props="{
:info="t('You can search by entry reference')" url: 'Entries/filter',
/> order: 'id DESC',
<RightMenu> userFilter: 'entryFilter',
<template #right-panel> }"
>
<template #rightMenu>
<EntryFilter data-key="EntryList" /> <EntryFilter data-key="EntryList" />
</template> </template>
</RightMenu> <template #body>
<VnTable <VnTable
ref="tableRef" ref="tableRef"
data-key="EntryList" :data-key="dataKey"
url="Entries/filter"
:filter="entryFilter"
:create="{ :create="{
urlCreate: 'Entries', urlCreate: 'Entries',
title: t('Create entry'), title: t('entry.list.newEntry'),
onDataSaved: ({ id }) => tableRef.redirect(id), onDataSaved: ({ id }) => tableRef.redirect(id),
formInitialData: {}, formInitialData: {},
}" }"
order="id DESC"
:columns="columns" :columns="columns"
redirect="entry" redirect="entry"
:right-search="false" :right-search="false"
@ -214,13 +216,17 @@ const columns = computed(() => [
color="primary" color="primary"
> >
<QTooltip>{{ <QTooltip>{{
t('entry.list.tableVisibleColumns.isExcludedFromAvailable') t(
'entry.list.tableVisibleColumns.isExcludedFromAvailable'
)
}}</QTooltip> }}</QTooltip>
</QIcon> </QIcon>
<QIcon v-if="!!row.isRaid" name="vn:net" color="primary"> <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
<QTooltip> <QTooltip>
{{ {{
t('globals.raid', { daysInForward: row.daysInForward }) t('globals.raid', {
daysInForward: row.daysInForward,
})
}}</QTooltip }}</QTooltip
> >
</QIcon> </QIcon>
@ -239,12 +245,6 @@ const columns = computed(() => [
</span> </span>
</template> </template>
</VnTable> </VnTable>
</template>
</VnSection>
</template> </template>
<i18n>
es:
Virtual entry: Es una redada
Search entries: Buscar entradas
You can search by entry reference: Puedes buscar por referencia de la entrada
Create entry: Crear entrada
</i18n>

View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref } from 'vue'; import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useState } from 'src/composables/useState'; import { useState } from 'src/composables/useState';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
@ -19,7 +19,7 @@ const { t } = useI18n();
const quasar = useQuasar(); const quasar = useQuasar();
const state = useState(); const state = useState();
const user = state.getUser(); const user = state.getUser();
const columns = [ const columns = computed(() => [
{ {
align: 'left', align: 'left',
label: 'Id', label: 'Id',
@ -31,7 +31,7 @@ const columns = [
{ {
align: 'left', align: 'left',
name: 'workerFk', name: 'workerFk',
label: t('Buyer'), label: t('entryStockBought.buyer'),
isTitle: true, isTitle: true,
component: 'select', component: 'select',
cardVisible: true, cardVisible: true,
@ -49,7 +49,7 @@ const columns = [
}, },
{ {
align: 'center', align: 'center',
label: t('Reserve'), label: t('entryStockBought.reserve'),
name: 'reserve', name: 'reserve',
columnFilter: false, columnFilter: false,
create: true, create: true,
@ -58,7 +58,7 @@ const columns = [
}, },
{ {
align: 'center', align: 'center',
label: t('Bought'), label: t('entryStockBought.bought'),
name: 'bought', name: 'bought',
summation: true, summation: true,
cardVisible: true, cardVisible: true,
@ -66,7 +66,7 @@ const columns = [
}, },
{ {
align: 'left', align: 'left',
label: t('Date'), label: t('entryStockBought.date'),
name: 'dated', name: 'dated',
component: 'date', component: 'date',
visible: false, visible: false,
@ -77,7 +77,7 @@ const columns = [
name: 'tableActions', name: 'tableActions',
actions: [ actions: [
{ {
title: t('View more details'), title: t('entryStockBought.viewMoreDetails'),
icon: 'search', icon: 'search',
isPrimary: true, isPrimary: true,
action: (row) => { action: (row) => {
@ -92,7 +92,7 @@ const columns = [
}, },
], ],
}, },
]; ]);
const fetchDataRef = ref(); const fetchDataRef = ref();
const travelDialogRef = ref(false); const travelDialogRef = ref(false);
@ -166,7 +166,7 @@ function round(value) {
<VnRow class="travel"> <VnRow class="travel">
<div v-if="travel"> <div v-if="travel">
<span style="color: var(--vn-label-color)"> <span style="color: var(--vn-label-color)">
{{ t('Purchase Spaces') }}: {{ t('entryStockBought.purchaseSpaces') }}:
</span> </span>
<span> <span>
{{ travel?.m3 }} {{ travel?.m3 }}
@ -177,7 +177,7 @@ function round(value) {
flat flat
icon="edit" icon="edit"
@click="openDialog()" @click="openDialog()"
:title="t('Edit travel')" :title="t('entryStockBought.editTravel')"
color="primary" color="primary"
/> />
</div> </div>
@ -226,7 +226,7 @@ function round(value) {
@on-fetch="(data) => setFooter(data)" @on-fetch="(data) => setFooter(data)"
:create="{ :create="{
urlCreate: 'StockBoughts', urlCreate: 'StockBoughts',
title: t('Reserve some space'), title: t('entryStockBought.reserveSomeSpace'),
onDataSaved: () => tableRef.reload(), onDataSaved: () => tableRef.reload(),
formInitialData: { formInitialData: {
workerFk: user.id, workerFk: user.id,
@ -288,16 +288,3 @@ function round(value) {
color: $negative !important; color: $negative !important;
} }
</style> </style>
<i18n>
es:
Edit travel: Editar envío
Travel: Envíos
Purchase Spaces: Espacios de compra
Buyer: Comprador
Reserve: Reservado
Bought: Comprado
Date: Fecha
View more details: Ver más detalles
Reserve some space: Reservar espacio
This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
</i18n>

View File

@ -123,8 +123,8 @@ const printBuys = (rowId) => {
<VnSearchbar <VnSearchbar
data-key="myEntriesList" data-key="myEntriesList"
url="Entries/filter" url="Entries/filter"
:label="t('Search entries')" :label="t('myEntries.search')"
:info="t('You can search by entry reference')" :info="t('myEntries.searchInfo')"
/> />
<VnTable <VnTable
data-key="myEntriesList" data-key="myEntriesList"
@ -137,7 +137,3 @@ const printBuys = (rowId) => {
chip-locale="myEntries" chip-locale="myEntries"
/> />
</template> </template>
<i18n>
You can search by entry reference: Puedes buscar por referencia de la entrada
</i18n>

View File

@ -1,9 +1,92 @@
entryList: entry:
list: list:
newEntry: New entry
tableVisibleColumns:
created: Creation
supplierFk: Supplier
isBooked: Booked
isConfirmed: Confirmed
isOrdered: Ordered
companyFk: Company
travelFk: Travel
isExcludedFromAvailable: Inventory
invoiceAmount: Import
inventoryEntry: Inventory entry inventoryEntry: Inventory entry
showEntryReport: Show entry report summary:
commission: Commission
currency: Currency
invoiceNumber: Invoice number
ordered: Ordered
booked: Booked
excludedFromAvailable: Inventory
travelReference: Reference
travelAgency: Agency
travelShipped: Shipped
travelDelivered: Delivered
travelLanded: Landed
travelReceived: Received
buys: Buys
stickers: Stickers
package: Package
packing: Pack.
grouping: Group.
buyingValue: Buying value
import: Import
pvp: PVP
basicData:
travel: Travel
currency: Currency
commission: Commission
observation: Observation
booked: Booked
excludedFromAvailable: Inventory
buys:
observations: Observations
packagingFk: Box
color: Color
printedStickers: Printed stickers
notes:
observationType: Observation type
latestBuys:
tableVisibleColumns:
image: Picture
itemFk: Item ID
weightByPiece: Weight/Piece
isActive: Active
family: Family
entryFk: Entry
freightValue: Freight value
comissionValue: Commission value
packageValue: Package value
isIgnored: Is ignored
price2: Grouping
price3: Packing
minPrice: Min
ektFk: Ekt
packingOut: Package out
landing: Landing
isExcludedFromAvailable: Es inventory
params:
toShipped: To
fromShipped: From
daysOnward: Days onward
daysAgo: Days ago
warehouseInFk: Warehouse in
search: Search entries
searchInfo: You can search by entry reference
entryFilter: entryFilter:
filter: params:
invoiceNumber: Invoice number
travelFk: Travel
companyFk: Company
currencyFk: Currency
supplierFk: Supplier
from: From
to: To
created: Created
isBooked: Booked
isConfirmed: Confirmed
isOrdered: Ordered
search: General search search: General search
reference: Reference reference: Reference
myEntries: myEntries:
@ -19,5 +102,18 @@ myEntries:
daysOnward: Days onward daysOnward: Days onward
daysAgo: Days ago daysAgo: Days ago
downloadCsv: Download CSV downloadCsv: Download CSV
search: Search entries
searchInfo: You can search by entry reference
entryStockBought:
travel: Travel
editTravel: Edit travel
purchaseSpaces: Purchase spaces
buyer: Buyer
reserve: Reserve
bought: Bought
date: Date
viewMoreDetails: View more details
reserveSomeSpace: Reserve some space
thisBuyerHasReservationThisDate: This buyer has already made a reservation for this date
wasteRecalc: wasteRecalc:
recalcOk: The wastes were successfully recalculated recalcOk: The wastes were successfully recalculated

View File

@ -1,12 +1,93 @@
Search entries: Buscar entradas entry:
You can search by entry reference: Puedes buscar por referencia de la entrada
entryList:
list: list:
newEntry: Nueva entrada
tableVisibleColumns:
created: Creación
supplierFk: Proveedor
isBooked: Asentado
isConfirmed: Confirmado
isOrdered: Pedida
companyFk: Empresa
travelFk: Envio
isExcludedFromAvailable: Inventario
invoiceAmount: Importe
inventoryEntry: Es inventario inventoryEntry: Es inventario
showEntryReport: Ver informe del pedido summary:
commission: Comisión
currency: Moneda
invoiceNumber: Núm. factura
ordered: Pedida
booked: Contabilizada
excludedFromAvailable: Inventario
travelReference: Referencia
travelAgency: Agencia
travelShipped: F. envio
travelWarehouseOut: Alm. salida
travelDelivered: Enviada
travelLanded: F. entrega
travelReceived: Recibida
buys: Compras
stickers: Etiquetas
package: Embalaje
packing: Pack.
grouping: Group.
buyingValue: Coste
import: Importe
pvp: PVP
basicData:
travel: Envío
currency: Moneda
observation: Observación
commission: Comisión
booked: Asentado
excludedFromAvailable: Inventario
buys:
observations: Observaciónes
packagingFk: Embalaje
color: Color
printedStickers: Etiquetas impresas
notes:
observationType: Tipo de observación
latestBuys:
tableVisibleColumns:
image: Foto
itemFk: Id Artículo
weightByPiece: Peso (gramos)/tallo
isActive: Activo
family: Familia
entryFk: Entrada
freightValue: Porte
comissionValue: Comisión
packageValue: Embalaje
isIgnored: Ignorado
price2: Grouping
price3: Packing
minPrice: Min
ektFk: Ekt
packingOut: Embalaje envíos
landing: Llegada
isExcludedFromAvailable: Es inventario
params:
toShipped: Hasta
fromShipped: Desde
warehouseInFk: Alm. entrada
daysOnward: Días adelante
daysAgo: Días atras
search: Buscar entradas
searchInfo: Puedes buscar por referencia de entrada
entryFilter: entryFilter:
filter: params:
invoiceNumber: Núm. factura
travelFk: Envío
companyFk: Empresa
currencyFk: Moneda
supplierFk: Proveedor
from: Desde
to: Hasta
created: Fecha creación
isBooked: Asentado
isConfirmed: Confirmado
isOrdered: Pedida
search: Búsqueda general search: Búsqueda general
reference: Referencia reference: Referencia
myEntries: myEntries:
@ -22,5 +103,18 @@ myEntries:
daysOnward: Días adelante daysOnward: Días adelante
daysAgo: Días atras daysAgo: Días atras
downloadCsv: Descargar CSV downloadCsv: Descargar CSV
search: Buscar entradas
searchInfo: Puedes buscar por referencia de la entrada
entryStockBought:
travel: Envío
editTravel: Editar envío
purchaseSpaces: Espacios de compra
buyer: Comprador
reserve: Reservado
bought: Comprado
date: Fecha
viewMoreDetails: Ver más detalles
reserveSomeSpace: Reservar espacio
thisBuyerHasReservationThisDate: Este comprador ya ha hecho una reserva para esta fecha
wasteRecalc: wasteRecalc:
recalcOk: Se han recalculado las mermas correctamente recalcOk: Se han recalculado las mermas correctamente

View File

@ -1,7 +1,7 @@
<script setup> <script setup>
import { onMounted, computed, reactive, ref, nextTick, watch } from 'vue'; import { onMounted, computed, ref, nextTick } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRoute, useRouter } from 'vue-router'; import { useRoute } from 'vue-router';
import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue'; import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue'; import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
@ -22,19 +22,16 @@ import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
const { t } = useI18n(); const { t } = useI18n();
const route = useRoute(); const route = useRoute();
const router = useRouter();
const state = useState(); const state = useState();
const user = state.getUser(); const user = state.getUser();
const today = ref(Date.vnNew()); const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
const warehousesOptions = ref([]); const warehousesOptions = ref([]);
const itemBalancesRef = ref(null); const itemBalances = computed(() => arrayDataItemBalances.store.data);
const itemsBalanceFilter = reactive({ const where = computed(() => arrayDataItemBalances.store.filter.where || {});
where: { itemFk: route.params.id, warehouseFk: null, date: null }, const showWhatsBeforeInventory = ref(false);
});
const itemBalances = ref([]);
const warehouseFk = ref(null);
const _showWhatsBeforeInventory = ref(false);
const inventoriedDate = ref(null); const inventoriedDate = ref(null);
let arrayDataItemBalances = useArrayData('ItemBalances');
const originTypeMap = { const originTypeMap = {
entry: { entry: {
@ -122,36 +119,28 @@ const columns = computed(() => [
}, },
]); ]);
const showWhatsBeforeInventory = computed({
get: () => _showWhatsBeforeInventory.value,
set: (val) => {
_showWhatsBeforeInventory.value = val;
if (!val) itemsBalanceFilter.where.date = null;
else itemsBalanceFilter.where.date = inventoriedDate.value ?? new Date();
},
});
onMounted(async () => { onMounted(async () => {
today.value.setHours(0, 0, 0, 0); const ref = where.value;
if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk; const query = route.query;
else if (user.value) warehouseFk.value = user.value.warehouseFk; inventoriedDate.value =
itemsBalanceFilter.where.warehouseFk = warehouseFk.value; (await axios.get('Configs/findOne')).data?.inventoried || today;
const { data } = await axios.get('Configs/findOne');
inventoriedDate.value = data.inventoried; if (query.warehouseFk) ref.warehouseFk = query.warehouseFk;
else if (!ref.warehouseFk && user.value) ref.warehouseFk = user.value.warehouseFk;
if (ref.date) showWhatsBeforeInventory.value = true;
ref.itemFk = route.params.id;
arrayDataItemBalances = useArrayData('ItemBalances', {
url: 'Items/getBalance',
filter: { where: ref },
});
await fetchItemBalances(); await fetchItemBalances();
await scrollToToday(); await scrollToToday();
await updateWarehouse(warehouseFk.value); await updateWarehouse(ref.warehouseFk);
}); });
watch( const fetchItemBalances = async () => await arrayDataItemBalances.fetch({});
() => router.currentRoute.value.params.id,
(newId) => {
itemsBalanceFilter.where.itemFk = newId;
itemBalancesRef.value.fetch();
}
);
const fetchItemBalances = async () => await itemBalancesRef.value.fetch();
const getBadgeAttrs = (_date) => { const getBadgeAttrs = (_date) => {
const isSameDate = date.isSameDate(today.value, _date); const isSameDate = date.isSameDate(today.value, _date);
@ -178,23 +167,13 @@ const formatDateForAttribute = (dateValue) => {
}; };
async function updateWarehouse(warehouseFk) { async function updateWarehouse(warehouseFk) {
const stock = useArrayData('descriptorStock', { const stock = useArrayData('descriptorStock', { userParams: { warehouseFk } });
userParams: {
warehouseFk,
},
});
await stock.fetch({}); await stock.fetch({});
stock.store.data.itemFk = route.params.id; stock.store.data.itemFk = route.params.id;
} }
</script> </script>
<template> <template>
<FetchData
ref="itemBalancesRef"
url="Items/getBalance"
:filter="itemsBalanceFilter"
@on-fetch="(data) => (itemBalances = data)"
/>
<FetchData <FetchData
url="Warehouses" url="Warehouses"
:filter="{ fields: ['id', 'name'], order: 'name ASC' }" :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
@ -207,27 +186,30 @@ async function updateWarehouse(warehouseFk) {
<VnSelect <VnSelect
:label="t('itemDiary.warehouse')" :label="t('itemDiary.warehouse')"
:options="warehousesOptions" :options="warehousesOptions"
hide-selected v-model="where.warehouseFk"
option-label="name"
option-value="id"
dense
v-model="itemsBalanceFilter.where.warehouseFk"
@update:model-value=" @update:model-value="
(value) => fetchItemBalances() && updateWarehouse(value) (val) => fetchItemBalances() && updateWarehouse(val)
" "
class="q-mr-lg" class="q-mr-lg"
:is-clearable="false"
/> />
<QCheckbox <QCheckbox
:label="t('itemDiary.showBefore')" :label="t('itemDiary.showBefore')"
v-model="showWhatsBeforeInventory" v-model="showWhatsBeforeInventory"
@update:model-value="fetchItemBalances" @update:model-value="
async (val) => {
if (!val) where.date = null;
else where.date = inventoriedDate;
await fetchItemBalances();
}
"
class="q-mr-lg" class="q-mr-lg"
/> />
<VnInputDate <VnInputDate
v-if="showWhatsBeforeInventory" v-if="showWhatsBeforeInventory"
:label="t('itemDiary.since')" :label="t('itemDiary.since')"
dense dense
v-model="itemsBalanceFilter.where.date" v-model="where.date"
@update:model-value="fetchItemBalances" @update:model-value="fetchItemBalances"
/> />
</div> </div>

View File

@ -36,18 +36,7 @@ const exprBuilder = (param, value) => {
} }
}; };
const where = { let arrayData = useArrayData('ItemLastEntries');
itemFk: route.params.id,
};
const arrayData = useArrayData('ItemLastEntries', {
url: 'Items/lastEntriesFilter',
order: ['landed DESC', 'buyFk DESC'],
exprBuilder: exprBuilder,
userFilter: {
where: where,
},
});
const itemLastEntries = ref([]); const itemLastEntries = ref([]);
const columns = computed(() => [ const columns = computed(() => [
@ -161,25 +150,51 @@ const getDate = (date, type) => {
}; };
const updateFilter = async () => { const updateFilter = async () => {
let filter; let landed;
if (!from.value && to.value) filter = { lte: to.value }; if (!from.value && to.value) landed = { lte: to.value };
else if (from.value && !to.value) filter = { gte: from.value }; else if (from.value && !to.value) landed = { gte: from.value };
else if (from.value && to.value) filter = { between: [from.value, to.value] }; else if (from.value && to.value) landed = { between: [from.value, to.value] };
const userFilter = arrayData.store.userFilter.where;
userFilter.landed = filter;
arrayData.store.filter.where.landed = landed;
await fetchItemLastEntries(); await fetchItemLastEntries();
}; };
onMounted(async () => { onMounted(async () => {
const landed = arrayData.store.filter.where?.landed;
arrayData = useArrayData('ItemLastEntries', {
url: 'Items/lastEntriesFilter',
order: ['landed DESC', 'buyFk DESC'],
exprBuilder: exprBuilder,
filter: {
where: {
itemFk: route.params.id,
landed,
},
},
});
if (landed) {
const key = Object.keys(landed)[0];
switch (key) {
case 'gte':
from.value = landed.gte;
break;
case 'lte':
to.value = landed.lte;
break;
case 'between':
from.value = landed.between[0];
to.value = landed.between[1];
break;
}
} else {
const _from = Date.vnNew(); const _from = Date.vnNew();
_from.setDate(_from.getDate() - 75); _from.setDate(_from.getDate() - 75);
from.value = getDate(_from, 'from'); from.value = getDate(_from, 'from');
const _to = Date.vnNew(); const _to = Date.vnNew();
_to.setDate(_to.getDate() + 10); _to.setDate(_to.getDate() + 10);
to.value = getDate(_to, 'to'); to.value = getDate(_to, 'to');
}
updateFilter(); updateFilter();

View File

@ -228,9 +228,8 @@ async function handleConfirm() {
}); });
router.push({ router.push({
name: 'TicketSale', name: 'TicketSale',
query: { params: { id: ticket.data[0].ticketFk },
table: JSON.stringify({ id: ticket.data[0].ticketFk }), query: { table: JSON.stringify({ filter: { limit: 20, skip: 0 } }) },
},
}); });
} }
} }

View File

@ -92,6 +92,7 @@ function handleLocation(data, location) {
<VnInput <VnInput
v-model="data.name" v-model="data.name"
:label="t('supplier.fiscalData.name')" :label="t('supplier.fiscalData.name')"
uppercase="true"
clearable clearable
/> />
<VnInput <VnInput

View File

@ -5,6 +5,7 @@ import VnTable from 'components/VnTable/VnTable.vue';
import VnSearchbar from 'components/ui/VnSearchbar.vue'; import VnSearchbar from 'components/ui/VnSearchbar.vue';
import RightMenu from 'src/components/common/RightMenu.vue'; import RightMenu from 'src/components/common/RightMenu.vue';
import SupplierListFilter from './SupplierListFilter.vue'; import SupplierListFilter from './SupplierListFilter.vue';
import VnInput from 'src/components/common/VnInput.vue';
const { t } = useI18n(); const { t } = useI18n();
const tableRef = ref(); const tableRef = ref();
@ -23,9 +24,14 @@ const columns = computed(() => [
align: 'left', align: 'left',
label: t('globals.name'), label: t('globals.name'),
name: 'socialName', name: 'socialName',
create: true, attrs: {
uppercase: true,
},
columnFilter: { columnFilter: {
name: 'search', name: 'search',
attrs: {
uppercase: false,
},
}, },
isTitle: true, isTitle: true,
}, },
@ -118,14 +124,18 @@ const columns = computed(() => [
formInitialData: {}, formInitialData: {},
mapper: (data) => { mapper: (data) => {
data.name = data.socialName; data.name = data.socialName;
delete data.socialName;
return data; return data;
}, },
}" }"
:right-search="false" :right-search="false"
order="id ASC" order="id ASC"
:columns="columns" :columns="columns"
/> >
<template #more-create-dialog="{ data }">
<VnInput :label="t('globals.name')" v-model="data.socialName" :uppercase="true" />
</template>
</VnTable>
</template> </template>
<i18n> <i18n>

View File

@ -138,7 +138,11 @@ function uppercaseStreetModel(data) {
return { return {
get: () => (data.street ? data.street.toUpperCase() : ''), get: () => (data.street ? data.street.toUpperCase() : ''),
set: (value) => { set: (value) => {
if (value) {
data.street = value.toUpperCase(); data.street = value.toUpperCase();
} else {
data.street = null;
}
}, },
}; };
} }

View File

@ -1,98 +1,23 @@
import { RouterView } from 'vue-router'; import { RouterView } from 'vue-router';
export default { const entryCard = {
path: '/entry',
name: 'Entry',
meta: {
title: 'entries',
icon: 'vn:entry',
moduleName: 'Entry',
keyBinding: 'e',
},
component: RouterView,
redirect: { name: 'EntryMain' },
menus: {
main: [
'EntryList',
'MyEntries',
'EntryLatestBuys',
'EntryStockBought',
'EntryWasteRecalc',
],
card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
},
children: [
{
path: '',
name: 'EntryMain',
component: () => import('src/components/common/VnModule.vue'),
redirect: { name: 'EntryList' },
children: [
{
path: 'list',
name: 'EntryList',
meta: {
title: 'list',
icon: 'view_list',
},
component: () => import('src/pages/Entry/EntryList.vue'),
},
{
path: 'my',
name: 'MyEntries',
meta: {
title: 'labeler',
icon: 'sell',
},
component: () => import('src/pages/Entry/MyEntries.vue'),
},
{
path: 'create',
name: 'EntryCreate',
meta: {
title: 'entryCreate',
icon: 'add',
},
component: () => import('src/pages/Entry/EntryCreate.vue'),
},
{
path: 'latest-buys',
name: 'EntryLatestBuys',
meta: {
title: 'latestBuys',
icon: 'contact_support',
},
component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
},
{
path: 'stock-Bought',
name: 'EntryStockBought',
meta: {
title: 'reserves',
icon: 'deployed_code_history',
},
component: () => import('src/pages/Entry/EntryStockBought.vue'),
},
{
path: 'waste-recalc',
name: 'EntryWasteRecalc',
meta: {
title: 'wasteRecalc',
icon: 'compost',
},
component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
},
],
},
{
name: 'EntryCard', name: 'EntryCard',
path: ':id', path: ':id',
component: () => import('src/pages/Entry/Card/EntryCard.vue'), component: () => import('src/pages/Entry/Card/EntryCard.vue'),
redirect: { name: 'EntrySummary' }, redirect: { name: 'EntrySummary' },
meta: {
menu: [
'EntryBasicData',
'EntryBuys',
'EntryNotes',
'EntryDms',
'EntryLog',
],
},
children: [ children: [
{ {
name: 'EntrySummary',
path: 'summary', path: 'summary',
name: 'EntrySummary',
meta: { meta: {
title: 'summary', title: 'summary',
icon: 'launch', icon: 'launch',
@ -150,6 +75,96 @@ export default {
component: () => import('src/pages/Entry/Card/EntryLog.vue'), component: () => import('src/pages/Entry/Card/EntryLog.vue'),
}, },
], ],
};
export default {
name: 'Entry',
path: '/entry',
meta: {
title: 'entries',
icon: 'vn:entry',
moduleName: 'Entry',
keyBinding: 'e',
menu: [
'EntryList',
'MyEntries',
'EntryLatestBuys',
'EntryStockBought',
'EntryWasteRecalc',
]
},
component: RouterView,
redirect: { name: 'EntryMain' },
children: [
{
name: 'EntryMain',
path: '',
component: () => import('src/components/common/VnModule.vue'),
redirect: { name: 'EntryIndexMain' },
children: [
{
path:'',
name: 'EntryIndexMain',
redirect: { name: 'EntryList' },
component: () => import('src/pages/Entry/EntryList.vue'),
children: [
{
name: 'EntryList',
path: 'list',
meta: {
title: 'list',
icon: 'view_list',
},
},
entryCard,
],
},
{
path: 'create',
name: 'EntryCreate',
meta: {
title: 'entryCreate',
icon: 'add',
},
component: () => import('src/pages/Entry/EntryCreate.vue'),
},
{
path: 'my',
name: 'MyEntries',
meta: {
title: 'labeler',
icon: 'sell',
},
component: () => import('src/pages/Entry/MyEntries.vue'),
},
{
path: 'latest-buys',
name: 'EntryLatestBuys',
meta: {
title: 'latestBuys',
icon: 'contact_support',
},
component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
},
{
path: 'stock-Bought',
name: 'EntryStockBought',
meta: {
title: 'reserves',
icon: 'deployed_code_history',
},
component: () => import('src/pages/Entry/EntryStockBought.vue'),
},
{
path: 'waste-recalc',
name: 'EntryWasteRecalc',
meta: {
title: 'wasteRecalc',
icon: 'compost',
},
component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
},
],
}, },
], ],
}; };

View File

@ -1,5 +1,6 @@
/// <reference types="cypress" /> /// <reference types="cypress" />
describe('ClaimPhoto', () => { // redmine.verdnatura.es/issues/8417
describe.skip('ClaimPhoto', () => {
beforeEach(() => { beforeEach(() => {
const claimId = 1; const claimId = 1;
cy.login('developer'); cy.login('developer');

View File

@ -8,8 +8,8 @@ describe('EntryMy when is supplier', () => {
}, },
}); });
}); });
// https://redmine.verdnatura.es/issues/8418
it('should open buyLabel when is supplier', () => { it.skip('should open buyLabel when is supplier', () => {
cy.get( cy.get(
'[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon' '[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
).click(); ).click();

View File

@ -1,6 +1,6 @@
/// <reference types="cypress" /> /// <reference types="cypress" />
// https://redmine.verdnatura.es/issues/8419
describe('InvoiceInCorrective', () => { describe.skip('InvoiceInCorrective', () => {
const createCorrective = '.q-menu > .q-list > :nth-child(6) > .q-item__section'; const createCorrective = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
const rectificativeSection = '.q-drawer-container .q-list > a:nth-child(6)'; const rectificativeSection = '.q-drawer-container .q-list > a:nth-child(6)';
const saveDialog = '.q-card > .q-card__actions > .q-btn--standard '; const saveDialog = '.q-card > .q-card__actions > .q-btn--standard ';

View File

@ -21,8 +21,8 @@ describe('InvoiceInList', () => {
cy.url().should('include', `/invoice-in/${id}/summary`); cy.url().should('include', `/invoice-in/${id}/summary`);
}); });
}); });
// https://redmine.verdnatura.es/issues/8420
it('should open the details', () => { it.skip('should open the details', () => {
cy.get(firstDetailBtn).click(); cy.get(firstDetailBtn).click();
cy.get(summaryHeaders).eq(1).contains('Basic data'); cy.get(summaryHeaders).eq(1).contains('Basic data');
cy.get(summaryHeaders).eq(4).contains('Vat'); cy.get(summaryHeaders).eq(4).contains('Vat');

View File

@ -35,8 +35,8 @@ describe('InvoiceOut summary', () => {
cy.dataCy('VnConfirm_confirm').click(); cy.dataCy('VnConfirm_confirm').click();
cy.checkNotification('InvoiceOut deleted'); cy.checkNotification('InvoiceOut deleted');
}); });
// https://redmine.verdnatura.es/issues/8415
it('should transfer the invoice ', () => { it.skip('should transfer the invoice ', () => {
cy.typeSearchbar('T1111111{enter}'); cy.typeSearchbar('T1111111{enter}');
cy.dataCy('descriptor-more-opts').click(); cy.dataCy('descriptor-more-opts').click();
cy.get('.q-menu > .q-list > :nth-child(1)').click(); cy.get('.q-menu > .q-list > :nth-child(1)').click();

View File

@ -15,8 +15,8 @@ describe('Item list', () => {
cy.get('.q-menu .q-item').contains('Anthurium').click(); cy.get('.q-menu .q-item').contains('Anthurium').click();
cy.get('.q-virtual-scroll__content > :nth-child(4) > :nth-child(4)').click(); cy.get('.q-virtual-scroll__content > :nth-child(4) > :nth-child(4)').click();
}); });
// https://redmine.verdnatura.es/issues/8421
it('should create an item', () => { it.skip('should create an item', () => {
const data = { const data = {
Description: { val: `Test item` }, Description: { val: `Test item` },
Type: { val: `Crisantemo`, type: 'select' }, Type: { val: `Crisantemo`, type: 'select' },

View File

@ -18,8 +18,8 @@ describe('Item tag', () => {
+cy.dataCy('crudModelDefaultSaveBtn').click(); +cy.dataCy('crudModelDefaultSaveBtn').click();
cy.checkNotification("The tag or priority can't be repeated for an item"); cy.checkNotification("The tag or priority can't be repeated for an item");
}); });
// https://redmine.verdnatura.es/issues/8422
it('should add a new tag', () => { it.skip('should add a new tag', () => {
cy.get('.q-page').should('be.visible'); cy.get('.q-page').should('be.visible');
cy.get('.q-page-sticky > div').click(); cy.get('.q-page-sticky > div').click();
cy.get('.q-page-sticky > div').click(); cy.get('.q-page-sticky > div').click();

View File

@ -1,6 +1,6 @@
/// <reference types="cypress" /> /// <reference types="cypress" />
// https://redmine.verdnatura.es/issues/8423
describe('Ticket expedtion', () => { describe.skip('Ticket expedtion', () => {
const tableContent = '.q-table .q-virtual-scroll__content'; const tableContent = '.q-table .q-virtual-scroll__content';
const stateTd = 'td:nth-child(9)'; const stateTd = 'td:nth-child(9)';

View File

@ -30,8 +30,8 @@ describe('TicketList', () => {
cy.get(firstRow).find('.q-btn:first').click(); cy.get(firstRow).find('.q-btn:first').click();
cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/); cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
}); });
// https://redmine.verdnatura.es/issues/8424
it('should open ticket summary', () => { it.skip('should open ticket summary', () => {
searchResults(); searchResults();
cy.get(firstRow).find('.q-btn:last').click(); cy.get(firstRow).find('.q-btn:last').click();
cy.dataCy('ticketSummary').should('exist'); cy.dataCy('ticketSummary').should('exist');

View File

@ -53,7 +53,8 @@ describe('VnLocation', () => {
cy.waitForElement('.q-card'); cy.waitForElement('.q-card');
cy.get(inputLocation).click(); cy.get(inputLocation).click();
}); });
it('Show all options', function () { // https://redmine.verdnatura.es/issues/8436
it.skip('Show all options', function () {
cy.get(locationOptions).should('have.length.at.least', 5); cy.get(locationOptions).should('have.length.at.least', 5);
}); });
it('input filter location as "al"', function () { it('input filter location as "al"', function () {

View File

@ -18,8 +18,8 @@ describe('ZoneWarehouse', () => {
cy.get(saveBtn).click(); cy.get(saveBtn).click();
cy.checkNotification(dataError); cy.checkNotification(dataError);
}); });
// https://redmine.verdnatura.es/issues/8425
it('should create & remove a warehouse', () => { it.skip('should create & remove a warehouse', () => {
cy.addBtnClick(); cy.addBtnClick();
cy.fillInForm(data); cy.fillInForm(data);
cy.get(saveBtn).click(); cy.get(saveBtn).click();