diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue index 084feb377..be4d475b6 100644 --- a/src/components/ItemsFilterPanel.vue +++ b/src/components/ItemsFilterPanel.vue @@ -349,4 +349,11 @@ es: floramondo: Floramondo salesPersonFk: Comprador categoryFk: Categoría + Plant: Planta natural + Flower: Flor fresca + Handmade: Hecho a mano + Artificial: Artificial + Green: Verdes frescos + Accessories: Complementos florales + Fruit: Fruta diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue index 1a0bb0019..78f08a479 100644 --- a/src/components/common/VnInput.vue +++ b/src/components/common/VnInput.vue @@ -175,7 +175,11 @@ const handleUppercase = () => { v-if="!$attrs.disabled && !($attrs.readonly) && $props.uppercase" @click="handleUppercase" class="uppercase-icon" - /> + > + + {{ t('Convert to uppercase') }} + + @@ -188,13 +192,26 @@ const handleUppercase = () => { + 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} + Convert to uppercase: Convertir a mayúsculas \ No newline at end of file diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index 655f37059..7bb81591f 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -170,7 +170,7 @@ function emitStoreData() { async function paginate() { const { page, rowsPerPage, sortBy, descending } = pagination.value; - if (!props.url) return; + if (!arrayData.store.url) return; isLoading.value = true; await arrayData.loadMore(); diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue index c1ba506fd..bb6f4442b 100644 --- a/src/pages/Customer/components/CustomerSummaryTable.vue +++ b/src/pages/Customer/components/CustomerSummaryTable.vue @@ -114,7 +114,7 @@ const columns = computed(() => [ action: ({ id }) => window.open( router.resolve({ params: { id }, name: 'TicketSale' }).href, - '_blank' + '_blank', ), isPrimary: true, }, @@ -122,7 +122,7 @@ const columns = computed(() => [ title: t('components.smartCard.viewSummary'), icon: 'preview', isPrimary: true, - action: (row) => viewSummary(row.id, TicketSummary), + action: (row) => viewSummary(row.id, TicketSummary, 'lg-width'), }, ], }, diff --git a/src/pages/Entry/Card/EntryDescriptorMenu.vue b/src/pages/Entry/Card/EntryDescriptorMenu.vue index 1893a04f5..03cd53358 100644 --- a/src/pages/Entry/Card/EntryDescriptorMenu.vue +++ b/src/pages/Entry/Card/EntryDescriptorMenu.vue @@ -44,7 +44,7 @@ const transferEntry = async () => { diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml index 96bdd9b6d..bc73abb12 100644 --- a/src/pages/Item/locale/en.yml +++ b/src/pages/Item/locale/en.yml @@ -76,13 +76,6 @@ itemTags: searchbar: label: Search item info: Search by item id -itemType: - shared: - code: Code - name: Name - worker: Worker - category: Category - temperature: Temperature item: params: daysOnward: Days onward diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml index c65062a2b..dd5074f5f 100644 --- a/src/pages/Item/locale/es.yml +++ b/src/pages/Item/locale/es.yml @@ -80,6 +80,9 @@ itemType: worker: Trabajador category: Reino temperature: Temperatura +searchbar: + label: Buscar artículo + info: Buscar por id de artículo params: state: asfsdf item: @@ -216,6 +219,6 @@ item: item: 'Artículo' achieved: 'Conseguido' concept: 'Concepto' - state: 'Estado' + state: 'Estado' search: 'Buscar artículo' - searchInfo: 'Puedes buscar por id' \ No newline at end of file + searchInfo: 'Puedes buscar por id' diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue index cf009a6ca..16d42f104 100644 --- a/src/pages/Travel/Card/TravelSummary.vue +++ b/src/pages/Travel/Card/TravelSummary.vue @@ -185,33 +185,31 @@ const entriesTableRows = computed(() => { return entries.value; }); -const entriesTotalHb = computed(() => - entriesTableRows.value.reduce((acc, { hb }) => acc + hb, 0) -); +const entriesTotals = computed(() => { + const totals = { + hb: 0, + freightValue: 0, + packageValue: 0, + cc: 0, + pallet: 0, + m3: 0, + }; -const entriesTotalFreight = computed(() => - toCurrency( - entriesTableRows.value.reduce((acc, { freightValue }) => acc + freightValue, 0) - ) -); + entriesTableRows.value.forEach((row) => { + for (const key in totals) { + totals[key] += row[key] || 0; + } + }); -const entriesTotalPackageValue = computed(() => - toCurrency( - entriesTableRows.value.reduce((acc, { packageValue }) => acc + packageValue, 0) - ) -); - -const entriesTotalCc = computed(() => - entriesTableRows.value.reduce((acc, { cc }) => acc + cc, 0) -); - -const entriesTotalPallet = computed(() => - entriesTableRows.value.reduce((acc, { pallet }) => acc + pallet, 0) -); - -const entriesTotalM3 = computed(() => - entriesTableRows.value.reduce((acc, { m3 }) => acc + m3, 0) -); + return { + hb: totals.hb.toFixed(2), + freight: toCurrency(totals.freightValue), + packageValue: toCurrency(totals.packageValue), + cc: totals.cc.toFixed(2), + pallet: totals.pallet.toFixed(2), + m3: totals.m3.toFixed(2), + }; +}); const getTravelEntries = async (id) => { const { data } = await axios.get(`Travels/${id}/getEntries`); @@ -382,12 +380,12 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`; - {{ entriesTotalHb }} - {{ entriesTotalFreight }} - {{ entriesTotalPackageValue }} - {{ entriesTotalCc }} - {{ entriesTotalPallet }} - {{ entriesTotalM3 }} + {{ entriesTotals.hb }} + {{ entriesTotals.freight }} + {{ entriesTotals.packageValue }} + {{ entriesTotals.cc }} + {{ entriesTotals.pallet }} + {{ entriesTotals.m3 }} diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue index 0e11588f1..b520166d3 100644 --- a/src/pages/Travel/Card/TravelThermographs.vue +++ b/src/pages/Travel/Card/TravelThermographs.vue @@ -132,7 +132,7 @@ const redirectToThermographForm = (action, id) => { }; if (action === 'edit' && id) { - routeDetails.query = { travelThermographFk: id }; + routeDetails.query = { id }; } else if (action === 'create') { routeDetails.query = { agencyModeFk: travel.value?.agencyModeFk }; } diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue index 5955ac9f9..7aec32972 100644 --- a/src/pages/Travel/Card/TravelThermographsForm.vue +++ b/src/pages/Travel/Card/TravelThermographsForm.vue @@ -83,7 +83,7 @@ const setEditDefaultParams = async () => { const filterObj = { include: { relation: 'dms' } }; const filter = encodeURIComponent(JSON.stringify(filterObj)); const { data } = await axios.get( - `TravelThermographs/${route.query.travelThermographFk}?filter=${filter}` + `TravelThermographs/${route.query.id}?filter=${filter}`, ); if (data) { @@ -170,7 +170,6 @@ const onThermographCreated = async (data) => { { }" sort-by="thermographFk ASC" option-label="thermographFk" - option-filter-value="thermographFk" + option-filter-value="id" :disable="viewAction === 'edit'" :tooltip="t('New thermograph')" :roles-allowed-to-create="['logistic']" + data-key="travelThermographSelect" >