Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

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
 </i18n>

src/components/common/VnInput.vue

@@ -175,7 +175,11 @@ const handleUppercase = () => {
                     v-if="!$attrs.disabled && !($attrs.readonly) && $props.uppercase"
                     @click="handleUppercase"
                     class="uppercase-icon"
-                />
+                >
+                    <QTooltip>
+                        {{ t('Convert to uppercase') }}
+                    </QTooltip>
+                </QIcon>
                 
                 <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon v-if="info" name="info">
@@ -188,13 +192,26 @@ const handleUppercase = () => {
     </div>
 </template>
 
+<style>
+.uppercase-icon {
+  transition: color 0.3s, transform 0.2s;
+  cursor: pointer;
+}
+
+.uppercase-icon:hover {
+  color: #ed9937;
+  transform: scale(1.2);
+}
+</style>
 <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}
+        Convert to uppercase: Convertir a mayúsculas
 </i18n>

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();

src/pages/Entry/Card/EntryDescriptorMenu.vue

@@ -44,7 +44,7 @@ const transferEntry = async () => {
 
 <template>
     <QItem v-ripple clickable @click="showEntryReport">
-        <QItemSection>{{ $t('entryList.list.showEntryReport') }}</QItemSection>
+        <QItemSection>{{ $t('entry.descriptorMenu.showEntryReport') }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable @click="openDialog">
         <QItemSection>{{ t('transferEntry') }}</QItemSection>

src/pages/Entry/locale/en.yml

@@ -76,6 +76,8 @@ entry:
         warehouseInFk: Warehouse in
     search: Search entries
     searchInfo: You can search by entry reference
+    descriptorMenu:
+        showEntryReport: Show entry report
 entryFilter:
     params:
         invoiceNumber: Invoice number

src/pages/Entry/locale/es.yml

@@ -75,6 +75,8 @@ entry:
         warehouseInFk: Alm. entrada
         daysOnward: Días adelante
         daysAgo: Días atras
+    descriptorMenu:
+        showEntryReport: Ver informe del pedido
     search: Buscar entradas
     searchInfo: Puedes buscar por referencia de entrada
 entryFilter:

src/pages/Item/ItemType/Card/ItemTypeBasicData.vue

@@ -48,14 +48,14 @@ const itemPackingTypesOptions = ref([]);
     >
         <template #form="{ data }">
             <VnRow>
-                <VnInput v-model="data.code" :label="t('shared.code')" />
+                <VnInput v-model="data.code" :label="t('itemType.shared.code')" />
-                <VnInput v-model="data.name" :label="t('shared.name')" />
+                <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
             </VnRow>
             <VnRow>
                 <VnSelect
                     url="Workers/search"
                     v-model="data.workerFk"
-                    :label="t('shared.worker')"
+                    :label="t('itemType.shared.worker')"
                     sort-by="nickname ASC"
                     :fields="['id', 'nickname']"
                     option-label="nickname"
@@ -83,7 +83,7 @@ const itemPackingTypesOptions = ref([]);
                 >
                 <VnSelect
                     v-model="data.categoryFk"
-                    :label="t('shared.category')"
+                    :label="t('itemType.shared.category')"
                     :options="categoriesOptions"
                     option-value="id"
                     option-label="name"
@@ -93,27 +93,30 @@ const itemPackingTypesOptions = ref([]);
             <VnRow>
                 <VnSelect
                     v-model="data.temperatureFk"
-                    :label="t('shared.temperature')"
+                    :label="t('itemType.shared.temperature')"
                     :options="temperaturesOptions"
                     option-value="code"
                     option-label="name"
                     hide-selected
                 />
-                <VnInput v-model="data.life" :label="t('shared.life')" />
+                <VnInput v-model="data.life" :label="t('itemType.summary.life')" />
             </VnRow>
             <VnRow>
                 <VnSelect
                     v-model="data.itemPackingTypeFk"
-                    :label="t('shared.itemPackingType')"
+                    :label="t('itemType.shared.itemPackingType')"
                     :options="itemPackingTypesOptions"
                     option-value="code"
                     option-label="description"
                     hide-selected
                 />
-                <VnInput v-model="data.maxRefs" :label="t('shared.maxRefs')" />
+                <VnInput v-model="data.maxRefs" :label="t('itemType.shared.maxRefs')" />
             </VnRow>
             <VnRow>
-                <QCheckbox v-model="data.isFragile" :label="t('shared.fragile')" />
+                <QCheckbox
+                    v-model="data.isFragile"
+                    :label="t('itemType.shared.fragile')"
+                />
             </VnRow>
         </template>
     </FormModel>

src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue

@@ -50,15 +50,15 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         @on-fetch="setData"
     >
         <template #body="{ entity }">
-            <VnLv :label="t('shared.code')" :value="entity.code" />
+            <VnLv :label="t('itemType.shared.code')" :value="entity.code" />
-            <VnLv :label="t('shared.name')" :value="entity.name" />
+            <VnLv :label="t('itemType.shared.name')" :value="entity.name" />
-            <VnLv :label="t('shared.worker')">
+            <VnLv :label="t('itemType.shared.worker')">
                 <template #value>
                     <span class="link">{{ entity.worker?.firstName }}</span>
                     <WorkerDescriptorProxy :id="entity.worker?.id" />
                 </template>
             </VnLv>
-            <VnLv :label="t('shared.category')" :value="entity.category?.name" />
+            <VnLv :label="t('itemType.shared.category')" :value="entity.category?.name" />
         </template>
     </CardDescriptor>
 </template>

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

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'
+    searchInfo: 'Puedes buscar por id'

src/pages/Travel/Card/TravelSummary.vue

@@ -185,33 +185,31 @@ const entriesTableRows = computed(() => {
     return entries.value;
 });
 
-const entriesTotalHb = computed(() =>
+const entriesTotals = computed(() => {
-    entriesTableRows.value.reduce((acc, { hb }) => acc + hb, 0)
+    const totals = {
-);
+        hb: 0,
+        freightValue: 0,
+        packageValue: 0,
+        cc: 0,
+        pallet: 0,
+        m3: 0,
+    };
 
-const entriesTotalFreight = computed(() =>
+    entriesTableRows.value.forEach((row) => {
-    toCurrency(
+        for (const key in totals) {
-        entriesTableRows.value.reduce((acc, { freightValue }) => acc + freightValue, 0)
+            totals[key] += row[key] || 0;
-    )
+        }
-);
+    });
 
-const entriesTotalPackageValue = computed(() =>
+    return {
-    toCurrency(
+        hb: totals.hb.toFixed(2),
-        entriesTableRows.value.reduce((acc, { packageValue }) => acc + packageValue, 0)
+        freight: toCurrency(totals.freightValue),
-    )
+        packageValue: toCurrency(totals.packageValue),
-);
+        cc: totals.cc.toFixed(2),
-
+        pallet: totals.pallet.toFixed(2),
-const entriesTotalCc = computed(() =>
+        m3: totals.m3.toFixed(2),
-    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)
-);
 
 const getTravelEntries = async (id) => {
     const { data } = await axios.get(`Travels/${id}/getEntries`);
@@ -382,12 +380,12 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                         <QTd></QTd>
                         <QTd></QTd>
                         <QTd></QTd>
-                        <QTd class="text-bold">{{ entriesTotalHb }}</QTd>
+                        <QTd class="text-bold">{{ entriesTotals.hb }}</QTd>
-                        <QTd class="text-bold">{{ entriesTotalFreight }}</QTd>
+                        <QTd class="text-bold">{{ entriesTotals.freight }}</QTd>
-                        <QTd class="text-bold">{{ entriesTotalPackageValue }}</QTd>
+                        <QTd class="text-bold">{{ entriesTotals.packageValue }}</QTd>
-                        <QTd class="text-bold">{{ entriesTotalCc }}</QTd>
+                        <QTd class="text-bold">{{ entriesTotals.cc }}</QTd>
-                        <QTd class="text-bold">{{ entriesTotalPallet }}</QTd>
+                        <QTd class="text-bold">{{ entriesTotals.pallet }}</QTd>
-                        <QTd class="text-bold">{{ entriesTotalM3 }}</QTd>
+                        <QTd class="text-bold">{{ entriesTotals.m3 }}</QTd>
                     </template>
                 </QTable>
             </QCard>