Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-hotfix-addValidations

src/components/ui/CatalogItem.vue

@@ -67,7 +67,7 @@ const dialog = ref(null);
                             <QTooltip>{{ t('globals.add') }}</QTooltip>
                             <QPopupProxy ref="dialog">
                                 <OrderCatalogItemDialog
-                                    :prices="item.prices"
+                                    :item="item"
                                     @added="() => dialog.hide()"
                                 />
                             </QPopupProxy>

src/pages/Item/Card/ItemDiary.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, computed, onUnmounted, reactive, ref, nextTick, watch } from 'vue';
+import { onMounted, computed, reactive, ref, nextTick, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
@@ -12,20 +12,18 @@ import FetchData from 'components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 
-import { useStateStore } from 'stores/useStateStore';
 import { toDateFormat } from 'src/filters/date.js';
 import { dashIfEmpty } from 'src/filters';
 import { date } from 'quasar';
 import { useState } from 'src/composables/useState';
 import { useArrayData } from 'src/composables/useArrayData';
 import axios from 'axios';
+import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
-const stateStore = useStateStore();
 const state = useState();
-
 const user = state.getUser();
 const today = ref(Date.vnNew());
 const warehousesOptions = ref([]);
@@ -145,8 +143,6 @@ onMounted(async () => {
     await updateWarehouse(warehouseFk.value);
 });
 
-onUnmounted(() => (stateStore.rightDrawer = false));
-
 watch(
     () => router.currentRoute.value.params.id,
     (newId) => {
@@ -205,8 +201,8 @@ async function updateWarehouse(warehouseFk) {
         auto-load
         @on-fetch="(data) => (warehousesOptions = data)"
     />
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSubToolbar class="q-mb-md">
-        <Teleport to="#st-data">
+        <template #st-data>
             <div class="row">
                 <VnSelect
                     :label="t('itemDiary.warehouse')"
@@ -235,9 +231,8 @@ async function updateWarehouse(warehouseFk) {
                     @update:model-value="fetchItemBalances"
                 />
             </div>
-        </Teleport>
-        <Teleport to="#st-actions"> </Teleport>
         </template>
+    </VnSubToolbar>
     <QPage class="column items-center q-pa-md">
         <QTable
             :rows="itemBalances"

src/pages/Order/Card/OrderCatalog.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onMounted, onUnmounted, ref, computed, watch } from 'vue';
+import { onMounted, onUnmounted, ref, computed, watch, provide, nextTick } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
@@ -18,6 +18,7 @@ const dataKey = 'OrderCatalogList';
 const arrayData = useArrayData(dataKey);
 const store = arrayData.store;
 const tags = ref([]);
+const itemRefs = ref({});
 
 let catalogParams = {
     orderFk: route.params.id,
@@ -76,6 +77,19 @@ watch(
     },
     { immediate: true }
 );
+const onItemSaved = (updatedItem) => {
+    requestAnimationFrame(() => {
+        scrollToItem(updatedItem.items[0].itemFk);
+    });
+};
+
+const scrollToItem = async (id) => {
+    const element = itemRefs.value[id]?.$el;
+    if (element) {
+        element.scrollIntoView({ behavior: 'smooth', block: 'center' });
+    }
+};
+provide('onItemSaved', onItemSaved);
 </script>
 
 <template>
@@ -115,6 +129,7 @@ watch(
                         <CatalogItem
                             v-for="row in rows"
                             :key="row.id"
+                            :ref="(el) => (itemRefs[row.id] = el)"
                             :item="row"
                             is-catalog
                             class="fill-icon"

src/pages/Order/Card/OrderCatalogItemDialog.vue

@@ -1,41 +1,53 @@
 <script setup>
-import toCurrency from '../../../filters/toCurrency';
+import toCurrency from 'src/filters/toCurrency';
-import { ref } from 'vue';
+import { inject, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useRoute } from 'vue-router';
 import useNotify from 'composables/useNotify';
 import { useArrayData } from 'composables/useArrayData';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t } = useI18n();
 const { notify } = useNotify();
 const emit = defineEmits(['added']);
 const route = useRoute();
 const props = defineProps({
-    prices: {
+    item: {
         type: Array,
         required: true,
     },
 });
-
+const onItemSaved = inject('onItemSaved');
-const fields = ref((props.prices || []).map((item) => ({ ...item, quantity: 0 })));
+const prices = ref((props.item.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const descriptorData = useArrayData('orderData');
 const isLoading = ref(false);
 const addToOrder = async () => {
     if (isLoading.value) return;
     isLoading.value = true;
-    const items = (fields.value || []).filter((item) => Number(item.quantity) > 0);
+    const items = (prices.value || []).filter((item) => Number(item.quantity) > 0);
     await axios.post('/OrderRows/addToOrder', {
         items,
         orderFk: Number(route.params.id),
     });
     notify(t('globals.dataSaved'), 'positive');
-    emit('added');
+    await descriptorData.fetch({});
-    descriptorData.fetch({});
+    onItemSaved({ ...props, items, saved: true });
+    emit('added', items);
     isLoading.value = false;
 };
 const canAddToOrder = () => {
-    return (fields.value || []).some((item) => Number(item.quantity) > 0);
+    let canAddToOrder = (prices.value || []).some((price) => Number(price.quantity) > 0);
+    if (canAddToOrder) {
+        const excedQuantity = prices.value.reduce(
+            (acc, { quantity }) => acc + quantity,
+            0
+        );
+        if (excedQuantity > props.item.available) {
+            canAddToOrder = false;
+        }
+    }
+    return canAddToOrder;
 };
 </script>
 
@@ -44,30 +56,33 @@ const canAddToOrder = () => {
         <QForm @submit="addToOrder">
             <QMarkupTable class="shadow-0">
                 <tbody>
-                    <tr v-for="item in fields" :key="item.warehouse">
+                    <tr v-for="price in prices" :key="price.warehouse">
                         <td class="text-bold q-pr-md td" style="width: 35%">
-                            {{ item.warehouse }}
+                            {{ price.warehouse }}
                         </td>
                         <td class="text-right" style="width: 35%">
                             <span
                                 class="link"
-                                @click="
+                                @click.shift="
                                     () => {
-                                        item.quantity += item.grouping;
+                                        price.quantity -= price.grouping;
+                                    }
+                                "
+                                @click.exact="
+                                    () => {
+                                        price.quantity += price.grouping;
                                     }
                                 "
                             >
-                                {{ item.grouping }}
+                                {{ price.grouping }}
                             </span>
-                            x {{ toCurrency(item.price) }}
+                            x {{ toCurrency(price.price) }}
                         </td>
                         <td class="text-right">
-                            <QInput
+                            <VnInputNumber
-                                v-model.number="item.quantity"
+                                v-model.number="price.quantity"
-                                type="number"
+                                :step="price.grouping"
-                                :step="item.grouping"
                                 min="0"
-                                dense
                             />
                         </td>
                     </tr>

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -206,6 +206,8 @@ const handlePhotoUpdated = (evt = false) => {
 
 <i18n>
 es:
+    Go to client: Ir a cliente
+    Go to user: Ir al usuario
     Click to allow the user to be disabled: Marcar para deshabilitar
     Click to exclude the user from getting disabled: Marcar para no deshabilitar
 </i18n>