Merge branch 'test' of https: refs #7155//gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.38.0",
+    "version": "24.40.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

src/boot/axios.js

@@ -5,8 +5,10 @@ import useNotify from 'src/composables/useNotify.js';
 
 const session = useSession();
 const { notify } = useNotify();
+const baseUrl = '/api/';
 
-axios.defaults.baseURL = '/api/';
+axios.defaults.baseURL = baseUrl;
+const axiosNoError = axios.create({ baseURL: baseUrl });
 
 const onRequest = (config) => {
     const token = session.getToken();
@@ -79,5 +81,7 @@ const onResponseError = (error) => {
 
 axios.interceptors.request.use(onRequest, onRequestError);
 axios.interceptors.response.use(onResponse, onResponseError);
+axiosNoError.interceptors.request.use(onRequest);
+axiosNoError.interceptors.response.use(onResponse);
 
-export { onRequest, onResponseError };
+export { onRequest, onResponseError, axiosNoError };

src/boot/quasar.js

@@ -2,9 +2,15 @@ import { boot } from 'quasar/wrappers';
 import qFormMixin from './qformMixin';
 import mainShortcutMixin from './mainShortcutMixin';
 import keyShortcut from './keyShortcut';
+import useNotify from 'src/composables/useNotify.js';
+const { notify } = useNotify();
 
 export default boot(({ app }) => {
     app.mixin(qFormMixin);
     app.mixin(mainShortcutMixin);
     app.directive('shortcut', keyShortcut);
+    app.config.errorHandler = function (err) {
+        console.error(err);
+        notify('globals.error', 'negative', 'error');
+    };
 });

src/components/CreateBankEntityForm.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref, onMounted, nextTick } from 'vue';
+import { reactive, ref, onMounted, nextTick, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 
@@ -7,16 +7,21 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
+import { useState } from 'src/composables/useState';
 
 defineProps({ showEntityField: { type: Boolean, default: true } });
 
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
 const bicInputRef = ref(null);
+const state = useState();
+
+const customer = computed(() => state.get('customer'));
+
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
-    countryFk: null,
+    countryFk: customer.value.countryFk,
     id: null,
 });
 

src/components/CreateNewPostcodeForm.vue

@@ -105,7 +105,7 @@ async function setProvince(id, data) {
                     option-label="name"
                     option-value="id"
                     :rules="validate('postcode.city')"
-                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
                     clearable
                 >

src/components/FetchData.vue

@@ -44,7 +44,7 @@ onMounted(async () => {
 
 async function fetch(fetchFilter = {}) {
     try {
-        const filter = Object.assign(fetchFilter, $props.filter); // eslint-disable-line vue/no-dupe-keys
+        const filter = { ...fetchFilter, ...$props.filter }; // eslint-disable-line vue/no-dupe-keys
         if ($props.where && !fetchFilter.where) filter.where = $props.where;
         if ($props.sortBy) filter.order = $props.sortBy;
         if ($props.limit) filter.limit = $props.limit;

src/components/ItemsFilterPanel.vue

@@ -297,11 +297,12 @@ const removeTag = (index, params, search) => {
                 />
             </QItem>
             <QItem class="q-mt-lg">
-                <QIcon
-                    name="add_circle"
+                <QBtn
+                    icon="add_circle"
+                    shortcut="+"
+                    flat
                     class="fill-icon-on-hover q-px-xs"
                     color="primary"
-                    size="sm"
                     @click="tagValues.push({})"
                 />
             </QItem>

src/components/VnSelectProvince.vue

@@ -38,7 +38,7 @@ async function onProvinceCreated(_, data) {
         hide-selected
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
-        :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
+        :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
     >
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">

src/components/VnTable/VnOrder.vue

@@ -4,7 +4,7 @@ import { useArrayData } from 'composables/useArrayData';
 const model = defineModel({ type: Object });
 const $props = defineProps({
     name: {
-        type: String,
+        type: [String, Boolean],
         default: '',
     },
     label: {

src/components/VnTable/VnTable.vue

@@ -69,9 +69,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+
     hasSubToolbar: {
         type: Boolean,
-        default: true,
+        default: null,
     },
     disableOption: {
         type: Object,
@@ -101,6 +102,10 @@ const $props = defineProps({
         type: String,
         default: null,
     },
+    footer: {
+        type: Boolean,
+        default: false,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -147,7 +152,7 @@ onMounted(() => {
         quasar.platform.is.mobile && !$props.disableOption?.card
             ? CARD_MODE
             : $props.defaultMode;
-    stateStore.rightDrawer = true;
+    stateStore.rightDrawer = quasar.screen.gt.xs;
     columnsVisibilitySkipped.value = [
         ...splittedColumns.value.columns
             .filter((c) => c.visible == false)
@@ -302,9 +307,10 @@ defineExpose({
     redirect: redirectFn,
     selected,
     CrudModelRef,
+    params,
 });
 
-function handleOnDataSaved(_, res) {
+function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved(this);
     else $props.create.onDataSaved(_);
 }
@@ -375,17 +381,16 @@ function handleOnDataSaved(_, res) {
             </VnFilterPanel>
         </QScrollArea>
     </QDrawer>
-
     <CrudModel
         v-bind="$attrs"
         :class="$attrs['class'] ?? 'q-px-md'"
-        :limit="20"
+        :limit="$attrs['limit'] ?? 20"
         ref="CrudModelRef"
         @on-fetch="(...args) => emit('onFetch', ...args)"
         :search-url="searchUrl"
         :disable-infinite-scroll="isTableMode"
         @save-changes="reload"
-        :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
+        :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
         :auto-load="hasParams || $attrs['auto-load']"
     >
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
@@ -403,7 +408,7 @@ function handleOnDataSaved(_, res) {
                 card-container-class="grid-three"
                 flat
                 :style="isTableMode && `max-height: ${tableHeight}`"
-                virtual-scroll
+                :virtual-scroll="isTableMode"
                 @virtual-scroll="
                     (event) =>
                         event.index > rows.length - 2 &&
@@ -649,6 +654,20 @@ function handleOnDataSaved(_, res) {
                         </QCard>
                     </component>
                 </template>
+                <template #bottom-row="{ cols }" v-if="footer">
+                    <QTr v-if="rows.length" class="bg-header" style="height: 30px">
+                        <QTh
+                            v-for="col of cols.filter((cols) => cols.visible ?? true)"
+                            :key="col?.id"
+                            class="text-center"
+                        >
+                            <slot
+                                :name="`column-footer-${col.name}`"
+                                :class="getColAlign(col)"
+                            />
+                        </QTh>
+                    </QTr>
+                </template>
             </QTable>
         </template>
     </CrudModel>
@@ -716,7 +735,7 @@ es:
 }
 
 .bg-header {
-    background-color: var(--vn-header-color);
+    background-color: var(--vn-accent-color);
     color: var(--vn-text-color);
 }
 
@@ -726,16 +745,10 @@ es:
 
 .q-table--dark .q-table__bottom,
 .q-table--dark thead,
-.q-table--dark tr,
-.q-table--dark th,
-.q-table--dark td {
+.q-table--dark tr {
     border-color: var(--vn-section-color);
 }
 
-.q-table__container > div:first-child {
-    background-color: var(--vn-page-color);
-}
-
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
@@ -782,6 +795,10 @@ es:
     thead tr:first-child th {
         top: 0;
     }
+    .q-table__top {
+        top: 0;
+        padding: 12px 0;
+    }
     tbody {
         .q-checkbox {
             display: flex;

src/components/common/VnComponent.vue

@@ -17,17 +17,15 @@ const $props = defineProps({
     },
 });
 
-let mixed;
 const componentArray = computed(() => {
     if (typeof $props.prop === 'object') return [$props.prop];
     return $props.prop;
 });
 
 function mix(toComponent) {
-    if (mixed) return mixed;
     const { component, attrs, event } = toComponent;
     const customComponent = $props.components[component];
-    mixed = {
+    return {
         component: customComponent?.component ?? component,
         attrs: {
             ...toValueAttrs(attrs),
@@ -37,7 +35,6 @@ function mix(toComponent) {
         },
         event: { ...customComponent?.event, ...event },
     };
-    return mixed;
 }
 
 function toValueAttrs(attrs) {

src/components/common/VnDmsList.vue

@@ -5,12 +5,14 @@ import { useRoute } from 'vue-router';
 import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
 import axios from 'axios';
 
+import VnUserLink from '../ui/VnUserLink.vue';
+import { downloadFile } from 'src/composables/downloadFile';
+import VnImg from 'components/ui/VnImg.vue';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnDms from 'src/components/common/VnDms.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import VnUserLink from '../ui/VnUserLink.vue';
-import { downloadFile } from 'src/composables/downloadFile';
+import { useSession } from 'src/composables/useSession';
 
 const route = useRoute();
 const quasar = useQuasar();
@@ -18,6 +20,7 @@ const { t } = useI18n();
 const rows = ref();
 const dmsRef = ref();
 const formDialog = ref({});
+const token = useSession().getTokenMultimedia();
 
 const $props = defineProps({
     model: {
@@ -89,6 +92,23 @@ const dmsFilter = {
 };
 
 const columns = computed(() => [
+    {
+        label: '',
+        name: 'file',
+        align: 'left',
+        component: VnImg,
+        props: (prop) => {
+            return {
+                storage: 'dms',
+                collection: null,
+                resolution: null,
+                id: prop.row.file.split('.')[0],
+                token: token,
+                class: 'rounded',
+                ratio: 1,
+            };
+        },
+    },
     {
         align: 'left',
         field: 'id',
@@ -142,13 +162,6 @@ const columns = computed(() => [
             'model-value': Boolean(prop.value),
         }),
     },
-    {
-        align: 'left',
-        field: 'file',
-        label: t('globals.file'),
-        name: 'file',
-        component: 'span',
-    },
     {
         align: 'left',
         field: 'worker',
@@ -387,7 +400,14 @@ defineExpose({
         />
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="showFormDialog()" class="fill-icon">
+        <QBtn
+            fab
+            color="primary"
+            icon="add"
+            shortcut="+"
+            @click="showFormDialog()"
+            class="fill-icon"
+        >
             <QTooltip>
                 {{ t('Upload file') }}
             </QTooltip>
@@ -395,10 +415,6 @@ defineExpose({
     </QPageSticky>
 </template>
 <style scoped>
-.q-gutter-y-ms {
-    display: grid;
-    row-gap: 20px;
-}
 .labelColor {
     color: var(--vn-label-color);
 }

src/components/common/VnInput.vue

@@ -67,9 +67,13 @@ const mixinRules = [
     requiredFieldRule,
     ...($attrs.rules ?? []),
     (val) => {
-        const { min } = vnInputRef.value.$attrs;
+        const { min, max } = vnInputRef.value.$attrs;
         if (!min) return null;
         if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
+        if (!max) return null;
+        if (max > 0) {
+            if (Math.floor(val) > max) return t('inputMax', { value: max });
+        }
     },
 ];
 </script>
@@ -116,8 +120,10 @@ const mixinRules = [
 <i18n>
     en:
         inputMin: Must be more than {value}
+        inputMax: Must be less than {value}
     es:
         inputMin: Debe ser mayor a {value}
+        inputMax: Debe ser menor a {value}
 </i18n>
 <style lang="scss">
 .q-field__append {

src/components/common/VnInputDate.vue

@@ -2,6 +2,7 @@
 import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { useAttrs } from 'vue';
 
 const model = defineModel({ type: [String, Date] });
 const $props = defineProps({
@@ -14,29 +15,19 @@ const $props = defineProps({
         default: true,
     },
 });
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
 
 const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
 const hover = ref();
 const mask = ref();
+const $attrs = useAttrs();
 
-onMounted(() => {
-    // fix quasar bug
-    mask.value = '##/##/####';
-});
-
-const styleAttrs = computed(() => {
-    return $props.isOutlined
-        ? {
-              dense: true,
-              outlined: true,
-              rounded: true,
-          }
-        : {};
-});
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 
 const formattedDate = computed({
     get() {
@@ -48,15 +39,12 @@ const formattedDate = computed({
         let newDate;
         if (value) {
             // parse input
-            if (value.includes('/')) {
-                if (value.length == 6) value = value + new Date().getFullYear();
-                if (value.length >= 10) {
-                    if (value.at(2) == '/') value = value.split('/').reverse().join('/');
-                    value = date.formatDate(
-                        new Date(value).toISOString(),
-                        'YYYY-MM-DDTHH:mm:ss.SSSZ'
-                    );
-                }
+            if (value.includes('/') && value.length >= 10) {
+                if (value.at(2) == '/') value = value.split('/').reverse().join('/');
+                value = date.formatDate(
+                    new Date(value).toISOString(),
+                    'YYYY-MM-DDTHH:mm:ss.SSSZ'
+                );
             }
             const [year, month, day] = value.split('-').map((e) => parseInt(e));
             newDate = new Date(year, month - 1, day);
@@ -79,12 +67,25 @@ const formattedDate = computed({
 const popupDate = computed(() =>
     model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value
 );
-
+onMounted(() => {
+    // fix quasar bug
+    mask.value = '##/##/####';
+});
 watch(
     () => model.value,
     (val) => (formattedDate.value = val),
     { immediate: true }
 );
+
+const styleAttrs = computed(() => {
+    return $props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
 </script>
 
 <template>
@@ -96,9 +97,10 @@ watch(
             placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: $attrs.required }"
-            :rules="$attrs.required ? [requiredFieldRule] : null"
+            :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = true"
+            hide-bottom-space
         >
             <template #append>
                 <QIcon

src/components/common/VnInputTime.vue

@@ -1,8 +1,10 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
-
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
+const $attrs = useAttrs();
 const model = defineModel({ type: String });
 const props = defineProps({
     timeOnly: {
@@ -16,8 +18,8 @@ const props = defineProps({
 });
 const initialDate = ref(model.value ?? Date.vnNew());
 const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
-
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 const dateFormat = 'HH:mm';
 const isPopupOpen = ref();
 const hover = ref();
@@ -74,9 +76,10 @@ function dateToTime(newDate) {
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: $attrs.required }"
             style="min-width: 100px"
-            :rules="$attrs.required ? [requiredFieldRule] : null"
+            :rules="mixinRules"
             @click="isPopupOpen = false"
             type="time"
+            hide-bottom-space
         >
             <template #append>
                 <QIcon

src/components/common/VnLocation.vue

@@ -2,21 +2,37 @@
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import { useI18n } from 'vue-i18n';
-
+import { ref } from 'vue';
 const { t } = useI18n();
-const value = defineModel({ type: [String, Number, Object] });
+const emit = defineEmits(['update:model-value', 'update:options']);
 
+const props = defineProps({
+    location: {
+        type: Object,
+        default: null,
+    },
+});
+const modelValue = ref(
+    props.location
+        ? `${props.location?.postcode}, ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
+        : null
+);
 function showLabel(data) {
-    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    return `${data.code}, ${data.town}(${data.province}), ${data.country}`;
 }
+const handleModelValue = (data) => {
+    emit('update:model-value', data);
+};
 </script>
 <template>
     <VnSelectDialog
-        v-model="value"
-        option-value="code"
+        v-model="modelValue"
         option-filter-value="search"
-        :option-label="(opt) => showLabel(opt)"
+        :option-label="
+            (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
+        "
         url="Postcodes/filter"
+        @update:model-value="handleModelValue"
         :use-like="false"
         :label="t('Location')"
         :placeholder="t('search_by_postalcode')"
@@ -27,7 +43,14 @@ function showLabel(data) {
         :emit-value="false"
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="(newValue) => (value = newValue)" />
+            <CreateNewPostcode
+                @on-data-saved="
+                    (newValue) => {
+                        modelValue = newValue;
+                        emit('update:model-value', newValue);
+                    }
+                "
+            />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">

src/components/common/VnSectionMain.vue

@@ -2,6 +2,7 @@
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'components/LeftMenu.vue';
 import { onMounted } from 'vue';
+import { useQuasar } from 'quasar';
 
 const stateStore = useStateStore();
 const $props = defineProps({
@@ -10,7 +11,9 @@ const $props = defineProps({
         default: true,
     },
 });
-onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
+onMounted(
+    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
+);
 </script>
 
 <template>

src/components/common/VnSelect.vue

@@ -1,7 +1,8 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted } from 'vue';
+import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'src/components/FetchData.vue';
+import { useValidator } from 'src/composables/useValidator';
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 
 const $props = defineProps({
@@ -37,6 +38,10 @@ const $props = defineProps({
         type: [Array],
         default: () => [],
     },
+    exprBuilder: {
+        type: Function,
+        default: null,
+    },
     isClearable: {
         type: Boolean,
         default: true,
@@ -82,10 +87,11 @@ const $props = defineProps({
         default: false,
     },
 });
-
+const { validations } = useValidator();
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const $attrs = useAttrs();
 const { t } = useI18n();
-const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
-
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
     toRefs($props);
 const myOptions = ref([]);
@@ -177,6 +183,7 @@ async function fetchFilter(val) {
         }, {});
     } else defaultWhere = { [key]: getVal(val) };
     const where = { ...(val ? defaultWhere : {}), ...$props.where };
+    $props.exprBuilder && Object.assign(where, $props.exprBuilder(key, val));
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;
@@ -248,8 +255,9 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
         ref="vnSelectRef"
         lazy-rules
         :class="{ required: $attrs.required }"
-        :rules="$attrs.required ? [requiredFieldRule] : null"
+        :rules="mixinRules"
         virtual-scroll-slice-size="options.length"
+        hide-bottom-space
     >
         <template v-if="isClearable" #append>
             <QIcon

src/components/common/VnSelectDialog.vue

@@ -1,6 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 
 import VnSelect from 'src/components/common/VnSelect.vue';
 const emit = defineEmits(['update:modelValue']);
@@ -11,6 +12,10 @@ const $props = defineProps({
         type: Array,
         default: () => ['developer'],
     },
+    acls: {
+        type: Array,
+        default: () => [],
+    },
     actionIcon: {
         type: String,
         default: 'add',
@@ -22,15 +27,12 @@ const $props = defineProps({
 });
 
 const role = useRole();
-const showForm = ref(false);
+const acl = useAcl();
 
 const isAllowedToCreate = computed(() => {
+    if ($props.acls.length) return acl.hasAny($props.acls);
     return role.hasAny($props.rolesAllowedToCreate);
 });
-
-const toggleForm = () => {
-    showForm.value = !showForm.value;
-};
 </script>
 
 <template>
@@ -41,7 +43,7 @@ const toggleForm = () => {
     >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
-                @click.stop.prevent="toggleForm()"
+                @click.stop.prevent="$refs.dialog.show()"
                 :name="actionIcon"
                 :size="actionIcon === 'add' ? 'xs' : 'sm'"
                 :class="['default-icon', { '--add-icon': actionIcon === 'add' }]"
@@ -51,7 +53,7 @@ const toggleForm = () => {
             >
                 <QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
             </QIcon>
-            <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
+            <QDialog ref="dialog" transition-show="scale" transition-hide="scale">
                 <slot name="form" />
             </QDialog>
         </template>

src/components/common/VnSelectEnum.vue

@@ -0,0 +1,52 @@
+<script setup>
+import { onBeforeMount, ref, useAttrs } from 'vue';
+import axios from 'axios';
+import VnSelect from 'components/common/VnSelect.vue';
+
+const { schema, table, column, translation, defaultOptions } = defineProps({
+    schema: {
+        type: String,
+        default: 'vn',
+    },
+    table: {
+        type: String,
+        required: true,
+    },
+    column: {
+        type: String,
+        required: true,
+    },
+    translation: {
+        type: Function,
+        default: null,
+    },
+    defaultOptions: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const $attrs = useAttrs();
+const options = ref([]);
+onBeforeMount(async () => {
+    options.value = [].concat(defaultOptions);
+    const { data } = await axios.get(`Applications/get-enum-values`, {
+        params: { schema, table, column },
+    });
+
+    for (const value of data)
+        options.value.push({
+            [$attrs['option-value'] ?? 'id']: value,
+            [$attrs['option-label'] ?? 'name']: translation ? translation(value) : value,
+        });
+});
+</script>
+
+<template>
+    <VnSelect
+        v-bind="$attrs"
+        :options="options"
+        :key="options.length"
+        :input-debounce="0"
+    />
+</template>

src/components/ui/CatalogItem.vue

@@ -127,11 +127,6 @@ const dialog = ref(null);
     flex-direction: column;
     gap: 4px;
 
-    .subName {
-        color: var(--vn-label-color);
-        text-transform: uppercase;
-    }
-
     p {
         margin-bottom: 0;
     }

src/components/ui/VnConfirm.vue

@@ -31,6 +31,7 @@ const props = defineProps({
 });
 
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.hide() });
 
 const { dialogRef, onDialogOK } = useDialogPluginComponent();
 
@@ -68,8 +69,10 @@ async function confirm() {
                 <QSpace />
                 <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
             </QCardSection>
-            <QCardSection class="row items-center">
+            <QCardSection class="q-pb-none">
                 <span v-if="message !== false" v-html="message" />
+            </QCardSection>
+            <QCardSection class="row items-center q-pt-none">
                 <slot name="customHTML"></slot>
             </QCardSection>
             <QCardActions align="right">

src/components/ui/VnFilterPanel.vue

@@ -3,6 +3,7 @@ import { onMounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
+import { date } from 'quasar';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
@@ -58,6 +59,7 @@ const $props = defineProps({
 });
 
 defineExpose({ search, sanitizer });
+
 const emit = defineEmits([
     'update:modelValue',
     'refresh',
@@ -185,6 +187,7 @@ async function remove(key) {
 }
 
 function formatValue(value) {
+    if (value instanceof Date) return date.formatDate(value, 'DD/MM/YYYY');
     if (typeof value === 'boolean') return value ? t('Yes') : t('No');
     if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);
 

src/components/ui/VnImg.vue

@@ -39,6 +39,8 @@ const getUrl = (zoom = false) => {
     const curResolution = zoom
         ? $props.zoomResolution || $props.resolution
         : $props.resolution;
+    if ($props.storage === 'dms')
+        return `/api/${$props.storage}/${$props.id}/downloadFile?access_token=${token}`;
     return isEmployee
         ? `/api/${$props.storage}/${$props.collection}/${curResolution}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
         : noImage;
@@ -52,6 +54,7 @@ defineExpose({
 </script>
 <template>
     <QImg
+        :draggable="true"
         :class="{ zoomIn: zoom }"
         :src="getUrl()"
         v-bind="$attrs"
@@ -60,10 +63,12 @@ defineExpose({
     />
     <QDialog v-if="$props.zoom" v-model="show">
         <QImg
+            :draggable="true"
             :src="getUrl(true)"
             v-bind="$attrs"
             spinner-color="primary"
             class="img_zoom"
+            :ratio="0"
         />
     </QDialog>
 </template>

src/components/ui/VnPaginate.vue

@@ -119,8 +119,8 @@ watch(
 );
 
 watch(
-    () => [props.url, props.filter],
-    ([url, filter]) => mounted.value && fetch({ url, filter })
+    () => [props.url, props.filter, props.userParams],
+    ([url, filter, userParams]) => mounted.value && fetch({ url, filter, userParams })
 );
 
 const addFilter = async (filter, params) => {
@@ -131,9 +131,8 @@ async function fetch(params) {
     useArrayData(props.dataKey, params);
     arrayData.reset(['filter.skip', 'skip']);
     await arrayData.fetch({ append: false });
-    if (!store.hasMoreData) {
-        isLoading.value = false;
-    }
+    if (!store.hasMoreData) isLoading.value = false;
+
     emit('onFetch', store.data);
     return store.data;
 }
@@ -224,13 +223,20 @@ defineExpose({ fetch, addFilter, paginate });
         v-bind="$attrs"
     >
         <slot name="body" :rows="store.data"></slot>
-        <div v-if="isLoading" class="info-row q-pa-md text-center">
+        <div v-if="isLoading" class="spinner info-row q-pa-md text-center">
             <QSpinner color="primary" size="md" />
         </div>
     </QInfiniteScroll>
 </template>
 
 <style lang="scss" scoped>
+.spinner {
+    z-index: 1;
+    align-content: end;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+}
 .info-row {
     width: 100%;
 

src/components/ui/VnUserLink.vue

@@ -1,20 +1,18 @@
 <script setup>
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import { useI18n } from 'vue-i18n';
 
-const $props = defineProps({
+defineProps({
     name: { type: String, default: null },
+    tag: { type: String, default: null },
     workerId: { type: Number, default: null },
     defaultName: { type: Boolean, default: false },
 });
-
-const { t } = useI18n();
 </script>
 <template>
     <slot name="link">
-        <span :class="{ link: $props.workerId }">
-            {{ $props.defaultName ? $props.name ?? t('globals.system') : $props.name }}
+        <span :class="{ link: workerId }">
+            {{ defaultName ? name ?? $t('globals.system') : name }}
         </span>
     </slot>
-    <WorkerDescriptorProxy v-if="$props.workerId" :id="$props.workerId" />
+    <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
 </template>

src/composables/useAcl.js

@@ -16,13 +16,18 @@ export function useAcl() {
         state.setAcls(acls);
     }
 
-    function hasAny(model, prop, accessType) {
-        const acls = state.getAcls().value[model];
-        if (acls) 
-            return ['*', prop].some((key) => {
-                const acl = acls[key];
-                return acl && (acl['*'] || acl[accessType]);
-            });
+    function hasAny(acls) {
+        for (const acl of acls) {
+            let { model, props, accessType } = acl;
+            const modelAcls = state.getAcls().value[model];
+            Array.isArray(props) || (props = [props]);
+            if (modelAcls)
+                return ['*', ...props].some((key) => {
+                    const acl = modelAcls[key];
+                    return acl && (acl['*'] || acl[accessType]);
+                });
+        }
+        return false;
     }
 
     return {

src/composables/usePrintService.js

@@ -1,22 +1,26 @@
 import { useSession } from './useSession';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
 
 export function usePrintService() {
     const quasar = useQuasar();
+    const { t } = useI18n();
+
     const { getTokenMultimedia } = useSession();
 
     function sendEmail(path, params) {
         return axios.post(path, params).then(() =>
             quasar.notify({
-                message: 'Notification sent',
+                message: t('globals.notificationSent'),
                 type: 'positive',
                 icon: 'check',
             })
         );
     }
 
-    function openReport(path, params) {
+    function openReport(path, params, isNewTab = '_self') {
+        if (typeof params === 'string') params = JSON.parse(params);
         params = Object.assign(
             {
                 access_token: getTokenMultimedia(),
@@ -25,8 +29,7 @@ export function usePrintService() {
         );
 
         const query = new URLSearchParams(params).toString();
-
-        window.open(`api/${path}?${query}`);
+        window.open(`api/${path}?${query}`, isNewTab);
     }
 
     return {

src/css/app.scss

@@ -37,6 +37,10 @@ a {
 .link {
     color: $color-link;
     cursor: pointer;
+
+    &--white {
+        color: white;
+    }
 }
 
 .tx-color-link {
@@ -264,6 +268,7 @@ input::-webkit-inner-spin-button {
         max-width: 400px;
     }
 }
+
 .edit-photo-btn {
     position: absolute;
     right: 12px;
@@ -271,3 +276,15 @@ input::-webkit-inner-spin-button {
     z-index: 1;
     cursor: pointer;
 }
+
+.subName {
+    color: var(--vn-label-color);
+    text-transform: uppercase;
+}
+
+.q-date {
+    &__today {
+        border: 2px solid $info;
+        color: $info;
+    }
+}

src/css/quasar.variables.scss

@@ -36,7 +36,6 @@ $color-font-secondary: #777;
 .bg-success {
     background-color: $positive;
 }
-
 .bg-notice {
     background-color: $info;
 }

src/i18n/locale/en.yml

@@ -2,6 +2,7 @@ globals:
     lang:
         es: Spanish
         en: English
+    quantity: Quantity
     language: Language
     entity: Entity
     user: User
@@ -98,8 +99,14 @@ globals:
     to: To
     notes: Notes
     refresh: Refresh
+    item: Item
+    ticket: Ticket
+    campaign: Campaign
+    weight: Weight
+    error: Ups! Something went wrong
     pageTitles:
         logIn: Login
+        addressEdit: Update address
         summary: Summary
         basicData: Basic data
         log: Logs
@@ -124,9 +131,11 @@ globals:
         notifications: Notifications
         defaulter: Defaulter
         customerCreate: New customer
+        createOrder: New order
         fiscalData: Fiscal data
         billingData: Billing data
         consignees: Consignees
+        'address-create': New address
         notes: Notes
         credits: Credits
         greuges: Greuges
@@ -150,6 +159,7 @@ globals:
         dms: File management
         entryCreate: New entry
         latestBuys: Latest buys
+        reserves: Reserves
         tickets: Tickets
         ticketCreate: New Tickets
         boxing: Boxing
@@ -322,135 +332,6 @@ resetPassword:
     repeatPassword: Repeat password
     passwordNotMatch: Passwords don't match
     passwordChanged: Password changed
-customer:
-    list:
-        phone: Phone
-        email: Email
-        customerOrders: Display customer orders
-        moreOptions: More options
-    card:
-        customerList: Customer list
-        customerId: Claim ID
-        salesPerson: Sales person
-        credit: Credit
-        risk: Risk
-        securedCredit: Secured credit
-        payMethod: Pay method
-        debt: Debt
-        isFrozen: Customer frozen
-        hasDebt: Customer has debt
-        isDisabled: Customer inactive
-        notChecked: Customer no checked
-        webAccountInactive: Web account inactive
-        noWebAccess: Web access is disabled
-        businessType: Business type
-        passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
-        businessTypeFk: Business type
-    summary:
-        basicData: Basic data
-        fiscalAddress: Fiscal address
-        fiscalData: Fiscal data
-        billingData: Billing data
-        consignee: Default consignee
-        businessData: Business data
-        financialData: Financial data
-        customerId: Customer ID
-        name: Name
-        contact: Contact
-        phone: Phone
-        mobile: Mobile
-        email: Email
-        salesPerson: Sales person
-        contactChannel: Contact channel
-        socialName: Social name
-        fiscalId: Fiscal ID
-        postcode: Postcode
-        province: Province
-        country: Country
-        street: Address
-        isEqualizated: Is equalizated
-        isActive: Is active
-        invoiceByAddress: Invoice by address
-        verifiedData: Verified data
-        hasToInvoice: Has to invoice
-        notifyByEmail: Notify by email
-        vies: VIES
-        payMethod: Pay method
-        bankAccount: Bank account
-        dueDay: Due day
-        hasLcr: Has LCR
-        hasCoreVnl: Has core VNL
-        hasB2BVnl: Has B2B VNL
-        addressName: Address name
-        addressCity: City
-        addressStreet: Street
-        username: Username
-        webAccess: Web access
-        totalGreuge: Total greuge
-        mana: Mana
-        priceIncreasingRate: Price increasing rate
-        averageInvoiced: Average invoiced
-        claimRate: Claming rate
-        risk: Risk
-        riskInfo: Invoices minus payments plus orders not yet invoiced
-        credit: Credit
-        creditInfo: Company's maximum risk
-        securedCredit: Secured credit
-        securedCreditInfo: Solunion's maximum risk
-        balance: Balance
-        balanceInfo: Invoices minus payments
-        balanceDue: Balance due
-        balanceDueInfo: Deviated invoices minus payments
-        recoverySince: Recovery since
-        businessType: Business Type
-        city: City
-        descriptorInfo: Invoices minus payments plus orders not yet
-        rating: Rating
-        recommendCredit: Recommended credit
-    basicData:
-        socialName: Fiscal name
-        businessType: Business type
-        contact: Contact
-        youCanSaveMultipleEmails: You can save multiple emails
-        email: Email
-        phone: Phone
-        mobile: Mobile
-        salesPerson: Sales person
-        contactChannel: Contact channel
-        previousClient: Previous client
-    extendedList:
-        tableVisibleColumns:
-            id: Identifier
-            name: Name
-            socialName: Social name
-            fi: Tax number
-            salesPersonFk: Salesperson
-            credit: Credit
-            creditInsurance: Credit insurance
-            phone: Phone
-            mobile: Mobile
-            street: Street
-            countryFk: Country
-            provinceFk: Province
-            city: City
-            postcode: Postcode
-            email: Email
-            created: Created
-            businessTypeFk: Business type
-            payMethodFk: Billing data
-            sageTaxTypeFk: Sage tax type
-            sageTransactionTypeFk: Sage tr. type
-            isActive: Active
-            isVies: Vies
-            isTaxDataChecked: Verified data
-            isEqualizated: Is equalizated
-            isFreezed: Freezed
-            hasToInvoice: Invoice
-            hasToInvoiceByAddress: Invoice by address
-            isToBeMailed: Mailing
-            hasLcr: Received LCR
-            hasCoreVnl: VNL core received
-            hasSepaVnl: VNL B2B received
 entry:
     list:
         newEntry: New entry
@@ -939,6 +820,16 @@ worker:
             credit: Have
             concept: Concept
 wagon:
+    pageTitles:
+        wagons: Wagons
+        wagonsList: Wagons List
+        wagonCreate: Create wagon
+        wagonEdit: Edit wagon
+        typesList: Types List
+        typeCreate: Create type
+        typeEdit: Edit type
+        wagonCounter: Trolley counter
+        wagonTray: Tray List
     type:
         name: Name
         submit: Submit

src/i18n/locale/es.yml

@@ -3,6 +3,7 @@ globals:
         es: Español
         en: Inglés
     language: Idioma
+    quantity: Cantidad
     entity: Entidad
     user: Usuario
     details: Detalles
@@ -100,8 +101,14 @@ globals:
     to: Hasta
     notes: Notas
     refresh: Actualizar
+    item: Artículo
+    ticket: Ticket
+    campaign: Campaña
+    weight: Peso
+    error: ¡Ups! Algo salió mal
     pageTitles:
         logIn: Inicio de sesión
+        addressEdit: Modificar consignatario
         summary: Resumen
         basicData: Datos básicos
         log: Historial
@@ -121,6 +128,7 @@ globals:
         inheritedRoles: Roles heredados
         customers: Clientes
         customerCreate: Nuevo cliente
+        createOrder: Nuevo pedido
         list: Listado
         webPayments: Pagos Web
         extendedList: Listado extendido
@@ -130,6 +138,7 @@ globals:
         fiscalData: Datos fiscales
         billingData: Forma de pago
         consignees: Consignatarios
+        'address-create': Nuevo consignatario
         notes: Notas
         credits: Créditos
         greuges: Greuges
@@ -153,6 +162,7 @@ globals:
         dms: Gestión documental
         entryCreate: Nueva entrada
         latestBuys: Últimas compras
+        reserves: Reservas
         tickets: Tickets
         ticketCreate: Nuevo ticket
         boxing: Encajado
@@ -324,134 +334,6 @@ resetPassword:
     repeatPassword: Repetir contraseña
     passwordNotMatch: Las contraseñas no coinciden
     passwordChanged: Contraseña cambiada
-customer:
-    list:
-        phone: Teléfono
-        email: Email
-        customerOrders: Mostrar órdenes del cliente
-        moreOptions: Más opciones
-    card:
-        customerId: ID cliente
-        salesPerson: Comercial
-        credit: Crédito
-        risk: Riesgo
-        securedCredit: Crédito asegurado
-        payMethod: Método de pago
-        debt: Riesgo
-        isFrozen: Cliente congelado
-        hasDebt: Cliente con riesgo
-        isDisabled: Cliente inactivo
-        notChecked: Cliente no comprobado
-        webAccountInactive: Sin acceso web
-        noWebAccess: El acceso web está desactivado
-        businessType: Tipo de negocio
-        passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
-        businessTypeFk: Tipo de negocio
-    summary:
-        basicData: Datos básicos
-        fiscalAddress: Dirección fiscal
-        fiscalData: Datos fiscales
-        billingData: Datos de facturación
-        consignee: Consignatario pred.
-        businessData: Datos comerciales
-        financialData: Datos financieros
-        customerId: ID cliente
-        name: Nombre
-        contact: Contacto
-        phone: Teléfono
-        mobile: Móvil
-        email: Email
-        salesPerson: Comercial
-        contactChannel: Canal de contacto
-        socialName: Razón social
-        fiscalId: NIF/CIF
-        postcode: Código postal
-        province: Provincia
-        country: País
-        street: Calle
-        isEqualizated: Recargo de equivalencia
-        isActive: Activo
-        invoiceByAddress: Facturar por consignatario
-        verifiedData: Datos verificados
-        hasToInvoice: Facturar
-        notifyByEmail: Notificar por email
-        vies: VIES
-        payMethod: Método de pago
-        bankAccount: Cuenta bancaria
-        dueDay: Día de pago
-        hasLcr: Recibido LCR
-        hasCoreVnl: Recibido core VNL
-        hasB2BVnl: Recibido B2B VNL
-        addressName: Nombre de la dirección
-        addressCity: Ciudad
-        addressStreet: Calle
-        username: Usuario
-        webAccess: Acceso web
-        totalGreuge: Greuge total
-        mana: Maná
-        priceIncreasingRate: Ratio de incremento de precio
-        averageInvoiced: Facturación media
-        claimRate: Ratio de reclamaciones
-        risk: Riesgo
-        riskInfo: Facturas menos recibos mas pedidos sin facturar
-        credit: Crédito
-        creditInfo: Riesgo máximo asumido por la empresa
-        securedCredit: Crédito asegurado
-        securedCreditInfo: Riesgo máximo asumido por Solunion
-        balance: Balance
-        balanceInfo: Facturas menos recibos
-        balanceDue: Saldo vencido
-        balanceDueInfo: Facturas fuera de plazo menos recibos
-        recoverySince: Recobro desde
-        businessType: Tipo de negocio
-        city: Población
-        descriptorInfo: Facturas menos recibos mas pedidos sin facturar
-        rating: Clasificación
-        recommendCredit: Crédito recomendado
-    basicData:
-        socialName: Nombre fiscal
-        businessType: Tipo de negocio
-        contact: Contacto
-        youCanSaveMultipleEmails: Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios{','} ejemplo{':'} user{'@'}dominio{'.'}com, user2{'@'}dominio{'.'}com siendo el primer correo electrónico el principal
-        email: Email
-        phone: Teléfono
-        mobile: Móvil
-        salesPerson: Comercial
-        contactChannel: Canal de contacto
-        previousClient: Cliente anterior
-    extendedList:
-        tableVisibleColumns:
-            id: Identificador
-            name: Nombre
-            socialName: Razón social
-            fi: NIF / CIF
-            salesPersonFk: Comercial
-            credit: Crédito
-            creditInsurance: Crédito asegurado
-            phone: Teléfono
-            mobile: Móvil
-            street: Dirección fiscal
-            countryFk: País
-            provinceFk: Provincia
-            city: Población
-            postcode: Código postal
-            email: Email
-            created: Fecha creación
-            businessTypeFk: Tipo de negocio
-            payMethodFk: Forma de pago
-            sageTaxTypeFk: Tipo de impuesto Sage
-            sageTransactionTypeFk: Tipo tr. sage
-            isActive: Activo
-            isVies: Vies
-            isTaxDataChecked: Datos comprobados
-            isEqualizated: Recargo de equivalencias
-            isFreezed: Congelado
-            hasToInvoice: Factura
-            hasToInvoiceByAddress: Factura por consigna
-            isToBeMailed: Env. emails
-            hasLcr: Recibido LCR
-            hasCoreVnl: Recibido core VNL
-            hasSepaVnl: Recibido B2B VNL
 entry:
     list:
         newEntry: Nueva entrada
@@ -936,6 +818,16 @@ worker:
             credit: Haber
             concept: Concepto
 wagon:
+    pageTitles:
+        wagons: Vagones
+        wagonsList: Listado vagones
+        wagonCreate: Crear tipo
+        wagonEdit: Editar tipo
+        typesList: Listado tipos
+        typeCreate: Crear tipo
+        typeEdit: Editar tipo
+        wagonCounter: Contador de carros
+        wagonTray: Listado bandejas
     type:
         name: Nombre
         submit: Guardar

src/pages/Account/Card/AccountBasicData.vue

@@ -2,6 +2,7 @@
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { ref, watch } from 'vue';
@@ -24,7 +25,7 @@ watch(
 <template>
     <FormModel
         ref="formModelRef"
-        :url="`VnUsers/preview`"
+        url="VnUsers/preview"
         :url-update="`VnUsers/${route.params.id}/update-user`"
         :filter="accountFilter"
         model="Accounts"
@@ -43,6 +44,15 @@ watch(
                     option-value="code"
                     option-label="code"
                 />
+                <VnSelectEnum
+                    schema="account"
+                    table="user"
+                    column="twoFactor"
+                    v-model="data.twoFactor"
+                    :label="t('account.card.twoFactor')"
+                    option-value="code"
+                    option-label="code"
+                />
             </div>
         </template>
     </FormModel>

src/pages/Account/Role/Card/SubRoles.vue

@@ -142,7 +142,13 @@ const redirectToRoleSummary = (id) =>
             <SubRoleCreateForm @on-submit-create-subrole="createSubRole" />
         </QDialog>
         <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn fab icon="add" color="primary" @click="openCreateSubRoleForm()">
+            <QBtn
+                fab
+                icon="add"
+                shortcut="+"
+                color="primary"
+                @click="openCreateSubRoleForm()"
+            >
                 <QTooltip>{{ t('warehouses.add') }}</QTooltip>
             </QBtn>
         </QPageSticky>

src/pages/Account/locale/en.yml

@@ -35,6 +35,7 @@ account:
         willDeactivated: User will be deactivated
         activated: User activated!
         deactivated: User deactivated!
+        twoFactor: Two factor
         actions:
             setPassword: Set password
             disableAccount:

src/pages/Account/locale/es.yml

@@ -32,6 +32,7 @@ account:
         activated: ¡Usuario activado!
         deactivated: ¡Usuario desactivado!
         newUser: Nuevo usuario
+        twoFactor: Doble factor
         privileges:
             delegate: Puede delegar privilegios
         actions:

src/pages/Claim/Card/ClaimBasicData.vue

@@ -3,58 +3,18 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
-import axios from 'axios';
 import VnAvatar from 'src/components/ui/VnAvatar.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-
-const claimStates = ref([]);
-const claimStatesCopy = ref([]);
-const optionsList = ref([]);
-
 const workersOptions = ref([]);
-
-function setClaimStates(data) {
-    claimStates.value = data;
-    claimStatesCopy.value = data;
-}
-
-async function getEnumValues() {
-    optionsList.value = [{ id: null, description: t('claim.null') }];
-    const { data } = await axios.get(`Applications/get-enum-values`, {
-        params: {
-            schema: 'vn',
-            table: 'claim',
-            column: 'pickup',
-        },
-    });
-    for (let value of data)
-        optionsList.value.push({ id: value, description: t(`claim.${value}`) });
-}
-
-getEnumValues();
-
-const statesFilter = {
-    options: claimStates,
-    filterFn: (options, value) => {
-        const search = value.toLowerCase();
-
-        if (value === '') return claimStatesCopy.value;
-
-        return options.value.filter((row) => {
-            const description = row.description.toLowerCase();
-
-            return description.indexOf(search) > -1;
-        });
-    },
-};
 </script>
 <template>
     <FetchData
@@ -70,7 +30,7 @@ const statesFilter = {
         auto-load
         :reload="true"
     >
-        <template #form="{ data, validate, filter }">
+        <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
                     v-model="data.client.name"
@@ -101,20 +61,14 @@ const statesFilter = {
                         />
                     </template>
                 </VnSelect>
-                <QSelect
+                <VnSelect
                     v-model="data.claimStateFk"
-                    :options="claimStates"
-                    option-value="id"
-                    option-label="description"
-                    emit-value
+                    url="ClaimStates"
                     :label="t('claim.state')"
-                    map-options
-                    use-input
-                    @filter="(value, update) => filter(value, update, statesFilter)"
+                    option-label="description"
                     :rules="validate('claim.claimStateFk')"
                     :input-debounce="0"
-                >
-                </QSelect>
+                />
             </VnRow>
             <VnRow>
                 <QInput
@@ -123,16 +77,14 @@ const statesFilter = {
                     :rules="validate('claim.packages')"
                     type="number"
                 />
-                <QSelect
+                <VnSelectEnum
                     v-model="data.pickup"
-                    :options="optionsList"
-                    option-value="id"
-                    option-label="description"
-                    emit-value
                     :label="t('claim.pickup')"
-                    map-options
-                    use-input
-                    :input-debounce="0"
+                    table="claim"
+                    column="pickup"
+                    option-label="description"
+                    :translation="(value) => t(`claim.${value}`)"
+                    :default-options="[{ id: null, description: t('claim.null') }]"
                 />
             </VnRow>
         </template>

src/pages/Claim/Card/ClaimLines.vue

@@ -317,7 +317,7 @@ async function saveWhenHasChanges() {
     </div>
 
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="showImportDialog()" />
+        <QBtn fab color="primary" shortcut="+" icon="add" @click="showImportDialog()" />
     </QPageSticky>
 </template>
 

src/pages/Claim/Card/ClaimPhoto.vue

@@ -246,7 +246,13 @@ function onDrag() {
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <label for="fileInput">
-            <QBtn fab @click="inputFile.nativeEl.click()" icon="add" color="primary">
+            <QBtn
+                fab
+                @click="inputFile.nativeEl.click()"
+                shortcut="+"
+                icon="add"
+                color="primary"
+            >
                 <QInput
                     ref="inputFile"
                     type="file"

src/pages/Customer/Card/CustomerAddress.vue

@@ -5,15 +5,12 @@ import { useRoute, useRouter } from 'vue-router';
 
 import axios from 'axios';
 
-import FetchData from 'components/FetchData.vue';
-
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
 const addresses = ref([]);
 const client = ref(null);
-const provincesLocation = ref([]);
 
 const addressFilter = {
     fields: [
@@ -41,7 +38,13 @@ const addressFilter = {
         {
             relation: 'province',
             scope: {
-                fields: ['id', 'name'],
+                fields: ['id', 'name', 'countryFk'],
+                include: [
+                    {
+                        relation: 'country',
+                        scope: { fields: ['id', 'name'] },
+                    },
+                ],
             },
         },
     ],
@@ -83,13 +86,6 @@ const getClientData = async (id) => {
     }
 };
 
-const setProvince = (provinceFk) => {
-    const result = provincesLocation.value.filter(
-        (province) => province.id === provinceFk
-    );
-    return result[0]?.name || '';
-};
-
 const isDefaultAddress = (address) => {
     return client?.value?.defaultAddressFk === address.id ? 1 : 0;
 };
@@ -128,12 +124,6 @@ const toCustomerAddressEdit = (addressId) => {
 </script>
 
 <template>
-    <FetchData
-        @on-fetch="(data) => (provincesLocation = data)"
-        auto-load
-        url="Provinces/location"
-    />
-
     <div class="full-width flex justify-center">
         <QCard class="card-width q-pa-lg" v-if="addresses.length">
             <QCardSection>
@@ -177,7 +167,14 @@ const toCustomerAddressEdit = (addressId) => {
                         <div>{{ item.street }}</div>
                         <div>
                             {{ item.postalCode }} - {{ item.city }},
-                            {{ setProvince(item.provinceFk) }}
+                            {{ item.province.name }}
+                        </div>
+                        <div>
+                            {{ item.phone }}
+                            <span v-if="item.mobile"
+                                >,
+                                {{ item.mobile }}
+                            </span>
                         </div>
                         <div class="flex">
                             <QCheckbox

src/pages/Customer/Card/CustomerBalance.vue

@@ -2,32 +2,30 @@
 import { computed, onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
+import FetchData from 'components/FetchData.vue';
 
 import { toCurrency, toDate, toDateHourMin } from 'src/filters';
 import { useState } from 'composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import { usePrintService } from 'composables/usePrintService';
-import { useSession } from 'composables/useSession';
 import { useVnConfirm } from 'composables/useVnConfirm';
 
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
-import VnFilter from 'components/VnTable/VnFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 
 const { openConfirmationModal } = useVnConfirm();
-const { sendEmail } = usePrintService();
+const { sendEmail, openReport } = usePrintService();
 const { t } = useI18n();
-const { hasAny } = useRole();
-
-const session = useSession();
-const tokenMultimedia = session.getTokenMultimedia();
+const { hasAny } = useAcl();
+const currentBalance = ref({});
 const quasar = useQuasar();
 const route = useRoute();
 const state = useState();
@@ -35,9 +33,9 @@ const stateStore = useStateStore();
 const user = state.getUser();
 
 const clientRisk = ref([]);
+const companies = ref([]);
 const tableRef = ref();
-const companyId = ref();
-const companyLastId = ref(user.value.companyFk);
+const companyId = ref(user.value.companyFk);
 const balances = ref([]);
 const vnFilterRef = ref({});
 const filter = computed(() => {
@@ -47,43 +45,16 @@ const filter = computed(() => {
     };
 });
 
-const companyFilterColumn = {
-    align: 'left',
-    name: 'companyId',
-    label: t('Company'),
-    component: 'select',
-    attrs: {
-        url: 'Companies',
-        optionLabel: 'code',
-        sortBy: 'code',
-        limit: 0,
-    },
-    columnFilter: {
-        event: {
-            remove: () => (companyId.value = null),
-            'update:modelValue': (newCompanyFk) => {
-                if (!newCompanyFk) return;
-                vnFilterRef.value.addFilter(newCompanyFk);
-                companyLastId.value = newCompanyFk;
-            },
-            blur: () =>
-                !companyId.value &&
-                (companyId.value = companyLastId.value ?? user.value.companyFk),
-        },
-    },
-    visible: false,
-};
-
 const columns = computed(() => [
     {
-        align: 'left',
+        align: 'right',
         name: 'payed',
         label: t('Date'),
         format: ({ payed }) => toDate(payed),
         cardVisible: true,
     },
     {
-        align: 'left',
+        align: 'right',
         name: 'created',
         label: t('Creation date'),
         format: ({ created }) => toDateHourMin(created),
@@ -91,16 +62,10 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'workerFk',
         label: t('Employee'),
         columnField: {
             component: 'userLink',
-            attrs: ({ row }) => {
-                return {
-                    workerId: row.workerFk,
-                    name: row.userName,
-                };
-            },
+            attrs: ({ row }) => ({ workerId: row.workerFk, name: row.userName }),
         },
         cardVisible: true,
     },
@@ -125,14 +90,14 @@ const columns = computed(() => [
         isId: true,
     },
     {
-        align: 'right',
+        align: 'left',
         name: 'credit',
         label: t('Havings'),
         format: ({ credit }) => credit && toCurrency(credit),
         cardVisible: true,
     },
     {
-        align: 'right',
+        align: 'left',
         name: 'balance',
         label: t('Balance'),
         format: ({ balance }) => toCurrency(balance),
@@ -171,41 +136,20 @@ const columns = computed(() => [
 
 onBeforeMount(() => {
     stateStore.rightDrawer = true;
-    companyId.value = user.value.companyFk;
 });
 
-async function getClientRisk() {
-    const { data } = await axios.get(`clientRisks`, {
-        params: {
-            filter: JSON.stringify({
-                include: { relation: 'company', scope: { fields: ['code'] } },
-                where: { clientFk: route.params.id, companyFk: user.value.companyFk },
-            }),
-        },
-    });
-    clientRisk.value = data;
-    return clientRisk.value;
-}
+async function getCurrentBalance(data) {
+    currentBalance.value[companyId.value] = {
+        amount: 0,
+        code: companies.value.find((c) => c.id === companyId.value)?.code,
+    };
 
-async function getCurrentBalance() {
-    const currentBalance = (await getClientRisk()).find((balance) => {
-        return balance.companyFk === companyId.value;
-    });
-    return currentBalance && currentBalance.amount;
-}
-
-async function onFetch(data) {
-    balances.value = [];
-    for (const [index, balance] of data.entries()) {
-        if (index === 0) {
-            balance.balance = await getCurrentBalance();
-            continue;
-        }
-        const previousBalance = data[index - 1];
-        balance.balance =
-            previousBalance?.balance - (previousBalance?.debit - previousBalance?.credit);
+    for (const balance of data) {
+        currentBalance.value[balance.companyFk] = {
+            code: balance.company.code,
+            amount: balance.amount,
+        };
     }
-    balances.value = data;
 }
 
 const showNewPaymentDialog = () => {
@@ -220,31 +164,48 @@ const showNewPaymentDialog = () => {
 };
 
 const showBalancePdf = ({ id }) => {
-    const url = `api/InvoiceOuts/${id}/download?access_token=${tokenMultimedia}`;
-    window.open(url, '_blank');
+    openReport(`InvoiceOuts/${id}/download`, {}, '_blank');
 };
 </script>
 
 <template>
+    <FetchData
+        url="Companies"
+        auto-load
+        @on-fetch="(data) => (companies = data)"
+    ></FetchData>
+    <FetchData
+        v-if="companies.length > 0"
+        url="clientRisks"
+        :filter="{
+            include: { relation: 'company', scope: { fields: ['code'] } },
+            where: { clientFk: route.params.id },
+        }"
+        auto-load
+        @on-fetch="getCurrentBalance"
+    ></FetchData>
+
     <VnSubToolbar class="q-mb-md">
         <template #st-data>
             <div class="column justify-center q-px-md q-py-sm">
                 <span class="text-bold">{{ t('Total by company') }}</span>
-                <div class="row justify-center" v-if="clientRisk?.length">
-                    {{ clientRisk[0].company.code }}:
-                    {{ toCurrency(clientRisk[0].amount) }}
+                <div class="row justify-center">
+                    {{ currentBalance[companyId]?.code }}:
+                    {{ toCurrency(currentBalance[companyId]?.amount) }}
                 </div>
             </div>
         </template>
         <template #st-actions>
             <div>
-                <VnFilter
+                <VnSelect
+                    :label="t('Company')"
                     ref="vnFilterRef"
                     v-model="companyId"
                     data-key="CustomerBalance"
-                    :column="companyFilterColumn"
-                    search-url="balance"
-                />
+                    :options="companies"
+                    option-label="code"
+                    option-value="id"
+                ></VnSelect>
             </div>
         </template>
     </VnSubToolbar>
@@ -258,7 +219,7 @@ const showBalancePdf = ({ id }) => {
         :right-search="false"
         :is-editable="false"
         :column-search="false"
-        @on-fetch="onFetch"
+        :disable-option="{ card: true }"
         auto-load
     >
         <template #column-balance="{ rowIndex }">
@@ -266,7 +227,7 @@ const showBalancePdf = ({ id }) => {
         </template>
         <template #column-description="{ row }">
             <div class="link" v-if="row.isInvoice">
-                {{ row.description }}
+                {{ t('bill', { ref: row.description }) }}
                 <InvoiceOutDescriptorProxy :id="row.description" />
             </div>
             <span v-else class="q-pa-xs dotted rounded-borders" :title="row.description">
@@ -284,7 +245,9 @@ const showBalancePdf = ({ id }) => {
             >
                 <VnInput
                     v-model="scope.value"
-                    :disable="!hasAny(['administrative'])"
+                    :disable="
+                        !hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
+                    "
                     @keypress.enter="scope.set"
                     autofocus
                 />

src/pages/Customer/Card/CustomerBasicData.vue

@@ -16,6 +16,19 @@ const { t } = useI18n();
 const businessTypes = ref([]);
 const contactChannels = ref([]);
 const title = ref();
+const handleSalesModelValue = (val) => ({
+    or: [
+        { name: val },
+        { nickname: { like: '%' + val + '%' } },
+        { code: { like: `${val}%` } },
+    ],
+});
+
+const exprBuilder = (param, value) => {
+    return {
+        and: [{ active: { neq: false } }, handleSalesModelValue(value)],
+    };
+};
 </script>
 <template>
     <FetchData
@@ -25,6 +38,7 @@ const title = ref();
     />
     <FetchData
         url="BusinessTypes"
+        :filter="{ fields: ['code', 'description'], order: 'description ASC ' }"
         @on-fetch="(data) => (businessTypes = data)"
         auto-load
     />
@@ -33,12 +47,12 @@ const title = ref();
             <VnRow>
                 <VnInput
                     :label="t('globals.name')"
-                    :rules="validate('client.socialName')"
+                    :rules="validate('client.name')"
                     autofocus
                     clearable
                     v-model="data.name"
                 />
-                <QSelect
+                <VnSelect
                     :input-debounce="0"
                     :label="t('customer.basicData.businessType')"
                     :options="businessTypes"
@@ -89,20 +103,20 @@ const title = ref();
             </VnRow>
             <VnRow>
                 <VnSelect
-                    url="Workers/activeWithInheritedRole"
-                    :filter="{ where: { role: 'salesPerson' } }"
-                    option-filter="firstName"
+                    url="Workers/search"
                     v-model="data.salesPersonFk"
                     :label="t('customer.basicData.salesPerson')"
+                    :params="{
+                        departmentCodes: ['VT', 'shopping'],
+                    }"
+                    :fields="['id', 'nickname']"
+                    sort-by="nickname ASC"
+                    option-label="nickname"
+                    option-value="id"
                     :rules="validate('client.salesPersonFk')"
-                    :use-like="false"
-                    :emit-value="false"
-                    @update:model-value="
-                        (val) => {
-                            title = val?.nickname;
-                            data.salesPersonFk = val?.id;
-                        }
-                    "
+                    :expr-builder="exprBuilder"
+                    emit-value
+                    auto-load
                 >
                     <template #prepend>
                         <VnAvatar
@@ -111,8 +125,19 @@ const title = ref();
                             :title="title"
                         />
                     </template>
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                <QItemLabel caption
+                                    >{{ scope.opt?.nickname }},
+                                    {{ scope.opt?.code }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
                 </VnSelect>
-                <QSelect
+                <VnSelect
                     v-model="data.contactChannelFk"
                     :options="contactChannels"
                     option-value="id"
@@ -125,7 +150,8 @@ const title = ref();
                 />
             </VnRow>
             <VnRow>
-                <QSelect
+                <VnSelect
+                    url="Clients"
                     :input-debounce="0"
                     :label="t('customer.basicData.previousClient')"
                     :options="clients"
@@ -134,7 +160,9 @@ const title = ref();
                     map-options
                     option-label="name"
                     option-value="id"
+                    sort-by="name ASC"
                     v-model="data.transferorFk"
+                    :fields="['id', 'name']"
                 >
                     <template #append>
                         <QIcon name="info" class="cursor-pointer">
@@ -145,7 +173,7 @@ const title = ref();
                             }}</QTooltip>
                         </QIcon>
                     </template>
-                </QSelect>
+                </VnSelect>
             </VnRow>
         </template>
     </FormModel>

src/pages/Customer/Card/CustomerBillingData.vue

@@ -3,7 +3,6 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -14,8 +13,6 @@ import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 const { t } = useI18n();
 const route = useRoute();
 
-const payMethods = ref([]);
-const bankEntitiesOptions = ref([]);
 const bankEntitiesRef = ref(null);
 
 const filter = {
@@ -31,15 +28,6 @@ const getBankEntities = (data, formData) => {
 </script>
 
 <template>
-    <fetch-data @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
-    <fetch-data
-        ref="bankEntitiesRef"
-        @on-fetch="(data) => (bankEntitiesOptions = data)"
-        :filter="filter"
-        auto-load
-        url="BankEntities"
-    />
-
     <FormModel
         :url-update="`Clients/${route.params.id}`"
         :url="`Clients/${route.params.id}/getCard`"
@@ -49,8 +37,9 @@ const getBankEntities = (data, formData) => {
         <template #form="{ data, validate }">
             <VnRow>
                 <VnSelect
+                    auto-load
+                    url="PayMethods"
                     :label="t('Billing data')"
-                    :options="payMethods"
                     hide-selected
                     option-label="name"
                     option-value="id"
@@ -69,8 +58,11 @@ const getBankEntities = (data, formData) => {
                 </VnInput>
                 <VnSelectDialog
                     :label="t('Swift / BIC')"
-                    :options="bankEntitiesOptions"
-                    :roles-allowed-to-create="['salesAssistant', 'hr']"
+                    ref="bankEntitiesRef"
+                    :filter="filter"
+                    auto-load
+                    url="BankEntities"
+                    :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
                     :rules="validate('Worker.bankEntity')"
                     hide-selected
                     option-label="name"
@@ -85,9 +77,8 @@ const getBankEntities = (data, formData) => {
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
                             <QItemSection v-if="scope.opt">
-                                <QItemLabel
-                                    >{{ scope.opt.bic }} {{ scope.opt.name }}</QItemLabel
-                                >
+                                <QItemLabel>{{ scope.opt.bic }} </QItemLabel>
+                                <QItemLabel caption> {{ scope.opt.name }}</QItemLabel>
                             </QItemSection>
                         </QItem>
                     </template>

src/pages/Customer/Card/CustomerCard.vue

@@ -1,17 +1,23 @@
 <script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+
 import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
 import CustomerFilter from '../CustomerFilter.vue';
+const route = useRoute();
+
+const routeName = computed(() => route.name);
 </script>
 <template>
     <VnCard
         data-key="Client"
         base-url="Clients"
         :descriptor="CustomerDescriptor"
-        :filter-panel="CustomerFilter"
+        :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
         search-data-key="CustomerList"
         :searchbar-props="{
-            url: 'Clients/extendedListFilter',
+            url: 'Clients/filter',
             label: 'Search customer',
             info: 'You can search by customer id or name',
         }"

src/pages/Customer/Card/CustomerConsumption.vue

@@ -1,15 +1,241 @@
 <script setup>
-import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
-import { useStateStore } from 'src/stores/useStateStore';
+import { ref, computed, onBeforeMount } from 'vue';
+import axios from 'axios';
+import { useI18n } from 'vue-i18n';
+import { toDate } from 'src/filters/index';
+import { useRoute } from 'vue-router';
+
+import VnTable from 'components/VnTable/VnTable.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+import { usePrintService } from 'src/composables/usePrintService';
+import { useVnConfirm } from 'src/composables/useVnConfirm';
+
+const { openConfirmationModal } = useVnConfirm();
+const { openReport, sendEmail } = usePrintService();
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
+const arrayData = useArrayData('Client');
+const { t } = useI18n();
+const route = useRoute();
+const campaignList = ref();
+const showActionBtns = computed(() => handleQueryParams());
+function handleQueryParams() {
+    const query = getQueryParams();
+    return query.from && query.to;
+}
+const columns = computed(() => [
+    {
+        name: 'search',
+        align: 'left',
+        label: t('globals.search'),
+        visible: false,
+    },
+    {
+        name: 'itemFk',
+        align: 'left',
+        label: t('globals.item'),
+        columnClass: 'shrink',
+        cardVisible: true,
+        columnFilter: {
+            name: 'itemId',
+        },
+    },
+    {
+        name: 'ticketFk',
+        align: 'left',
+        label: t('globals.ticket'),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        name: 'shipped',
+        align: 'left',
+        label: t('globals.shipped'),
+        format: ({ shipped }) => toDate(shipped),
+        columnFilter: false,
+        cardVisible: true,
+    },
+    {
+        name: 'description',
+        align: 'left',
+        label: t('globals.description'),
+        columnClass: 'expand',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        name: 'quantity',
+        label: t('globals.quantity'),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        name: 'grouped',
+        label: t('Group by items'),
+        component: 'checkbox',
+        visible: false,
+        orderBy: false,
+    },
+]);
+
+onBeforeMount(async () => {
+    campaignList.value = (await axios('Campaigns/latest')).data;
+});
+
+function getQueryParams() {
+    return JSON.parse(route.query.consumption ?? '{}');
+}
+function getParams() {
+    const query = getQueryParams();
+    return {
+        from: query.from,
+        to: query.to,
+        recipient: arrayData.store.data.email,
+        recipientId: arrayData.store.data.id,
+    };
+}
+const userParams = computed(() => {
+    const minDate = Date.vnNew();
+    minDate.setHours(0, 0, 0, 0);
+    minDate.setMonth(minDate.getMonth() - 2);
+
+    const maxDate = Date.vnNew();
+    maxDate.setHours(23, 59, 59, 59);
+
+    return {
+        campaign: campaignList.value[0]?.id,
+        from: minDate,
+        to: maxDate,
+    };
+});
+const openReportPdf = () => {
+    openReport(`Clients/${route.params.id}/campaign-metrics-pdf`, getParams());
+};
+
+const openSendEmailDialog = async () => {
+    openConfirmationModal(
+        t('The consumption report will be sent'),
+        t('Please, confirm'),
+        () => sendCampaignMetricsEmail({ address: arrayData.store.data.email })
+    );
+};
+const sendCampaignMetricsEmail = ({ address }) => {
+    sendEmail(`Clients/${route.params.id}/campaign-metrics-email`, {
+        recipient: address,
+        ...getParams(),
+    });
+};
 </script>
 
 <template>
-    <Teleport to="#right-panel" v-if="useStateStore().isHeaderMounted()">
-        <CustomerConsumptionFilter data-key="CustomerConsumption" />
-    </Teleport>
+    <VnTable
+        v-if="campaignList"
+        data-key="CustomerConsumption"
+        url="Clients/consumption"
+        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
+        :columns="columns"
+        search-url="consumption"
+        :filter="filter"
+        :user-params="userParams"
+        :default-remove="false"
+        :default-reset="false"
+        :default-save="false"
+        :has-sub-toolbar="true"
+        auto-load
+    >
+        <template #moreBeforeActions>
+            <QBtn
+                color="primary"
+                flat
+                icon-right="picture_as_pdf"
+                @click="openReportPdf()"
+                :disabled="!showActionBtns"
+            >
+                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                color="primary"
+                flat
+                icon-right="email"
+                @click="openSendEmailDialog()"
+                :disabled="!showActionBtns"
+            >
+                <QTooltip>{{ t('Send to email') }}</QTooltip>
+            </QBtn>
+        </template>
+        <template #column-itemFk="{ row }">
+            <span class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+        <template #column-description="{ row }">
+            <div>{{ row.concept }}</div>
+            <div v-if="row.subName" class="subName">
+                {{ row.subName }}
+            </div>
+            <FetchedTags :item="row" :max-length="3" />
+        </template>
+        <template #moreFilterPanel="{ params }">
+            <div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
+                <VnSelect
+                    v-model="params.campaign"
+                    :options="campaignList"
+                    :label="t('globals.campaign')"
+                    :filled="true"
+                    class="q-px-sm q-pt-none fit"
+                    dense
+                    option-label="code"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ scope.opt?.code }}
+                                    {{
+                                        new Date(scope.opt?.dated).getFullYear()
+                                    }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnInputDate
+                    v-model="params.from"
+                    :label="t('globals.from')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+                <VnInputDate
+                    v-model="params.to"
+                    :label="t('globals.to')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+            </div>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
 es:
     Enter a new search: Introduce una nueva búsqueda
+    Group by items: Agrupar por artículos
 </i18n>

src/pages/Customer/Card/CustomerConsumptionFilter.vue

@@ -1,91 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import { QItem } from 'quasar';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import { QItemSection } from 'quasar';
-
-const { t } = useI18n();
-defineProps({ dataKey: { type: String, required: true } });
-</script>
-<template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true">
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params }">
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('params.item')"
-                        v-model="params.itemId"
-                        is-outlined
-                        lazy-rules
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.buyerId"
-                        url="TicketRequests/getItemTypeWorker"
-                        :label="t('params.buyer')"
-                        option-value="id"
-                        option-label="nickname"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <!--It's required to include the relation category !! There's 413 records in production-->
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.typeId"
-                        url="ItemTypes"
-                        :label="t('params.type')"
-                        option-label="name"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    >
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        url="ItemCategories"
-                        :label="t('params.category')"
-                        option-label="name"
-                        option-value="id"
-                        v-model="params.categoryId"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-en:
-    params:
-        item: Item id
-        buyer: Buyer
-        type: Type
-        category: Category
-es:
-    params:
-        item: Id artículo
-        buyer: Comprador
-        type: Tipo
-        category: Categoría
-</i18n>

src/pages/Customer/Card/CustomerContacts.vue

@@ -56,17 +56,18 @@ const customerContactsRef = ref(null);
                             </div>
                         </VnRow>
                         <VnRow>
-                            <QIcon
+                            <QBtn
                                 @click="customerContactsRef.insert()"
                                 class="cursor-pointer"
                                 color="primary"
-                                name="add"
-                                size="sm"
+                                flat
+                                icon="add"
+                                shortcut="+"
                             >
                                 <QTooltip>
                                     {{ t('Add contact') }}
                                 </QTooltip>
-                            </QIcon>
+                            </QBtn>
                         </VnRow>
                     </QCard>
                 </template>

src/pages/Customer/Card/CustomerCreditContracts.vue

@@ -53,6 +53,8 @@ const openDialog = (item) => {
             promise: updateData,
         },
     });
+    updateData();
+    showQPageSticky.value = true;
 };
 
 const openViewCredit = (credit) => {

src/pages/Customer/Card/CustomerCreditOpinion.vue

@@ -1,23 +1,17 @@
 <script setup>
-import { computed, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import { QBtn } from 'quasar';
-
 import { toCurrency, toDateHourMin } from 'src/filters';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 
-const clientInformasRef = ref(null);
-const rows = ref([]);
+const tableRef = ref();
 
 const filter = {
     include: [
@@ -37,10 +31,9 @@ const filter = {
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'created',
-        format: (value) => toDateHourMin(value),
+        format: ({ created }) => toDateHourMin(created),
         label: t('Since'),
-        name: 'since',
+        name: 'created',
     },
     {
         align: 'left',
@@ -51,66 +44,56 @@ const columns = computed(() => [
     {
         align: 'right',
         field: 'rating',
-        label: t('Rating'),
+        label: t('customer.summary.rating'),
         name: 'rating',
+        create: true,
+        columnCreate: {
+            component: 'number',
+            autofocus: true,
+        },
     },
     {
         align: 'right',
         field: 'recommendedCredit',
-        format: (value) => toCurrency(value),
-        label: t('Recommended credit'),
+        format: ({ recommendedCredit }) => toCurrency(recommendedCredit),
+        label: t('customer.summary.recommendCredit'),
         name: 'recommendedCredit',
+        create: true,
+        columnCreate: {
+            component: 'number',
+            autofocus: true,
+        },
     },
 ]);
-
-watch(
-    () => route.params.id,
-    (newValue) => {
-        if (!newValue) return;
-        filter.where.clientFk = newValue;
-        clientInformasRef.value?.fetch();
-    }
-);
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
-        ref="clientInformasRef"
+    <VnTable
+        ref="tableRef"
+        data-key="ClientInformas"
         url="ClientInformas"
-    />
-
-    <FormModel
-        :form-initial-data="{}"
-        :observe-form-changes="false"
-        :url-create="`Clients/${route.params.id}/setRating`"
+        :filter="filter"
+        :order="['created DESC']"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        :disable-option="{ card: true }"
+        auto-load
+        :create="{
+            urlCreate: `Clients/${route.params.id}/setRating`,
+            title: 'Create rating',
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: {},
+        }"
     >
-        <template #form="{ data }">
-            <VnRow>
-                <div class="col">
-                    <VnInput
-                        :label="t('Rating')"
-                        clearable
-                        type="number"
-                        v-model.number="data.rating"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('Recommended credit')"
-                        clearable
-                        type="number"
-                        v-model.number="data.recommendedCredit"
-                    />
-                </div>
-            </VnRow>
+        <template #column-employee="{ row }">
+            <span class="link">{{ row.worker.user.nickname }}</span>
+            <WorkerDescriptorProxy :id="row.worker.id" />
         </template>
-    </FormModel>
-
-    <div class="full-width flex justify-center" v-if="rows.length">
-        <QTable
+    </VnTable>
+    <!-- <QTable
             :columns="columns"
             :pagination="{ rowsPerPage: 0 }"
             :rows="rows"
@@ -120,22 +103,16 @@ watch(
             class="card-width q-px-lg"
         >
             <template #body-cell-employee="{ row }">
-                <QTd auto-width @click.stop>
-                    <QBtn color="blue" flat no-caps>{{ row.worker.user.nickname }}</QBtn>
+                <QTd @click.stop>
+                    <span class="link">{{ row.worker.user.nickname }}</span>
                     <WorkerDescriptorProxy :id="row.clientFk" />
                 </QTd>
             </template>
-        </QTable>
-    </div>
-
-    <h5 class="flex justify-center color-vn-label" v-else>
-        {{ t('globals.noResults') }}
-    </h5>
+        </QTable> -->
 </template>
 
 <i18n>
 es:
-    Rating: Clasificación
     Recommended credit: Crédito recomendado
     Since: Desde
     Employee: Empleado

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import { toCurrency, toDate } from 'src/filters';
+import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 
 import useCardDescription from 'src/composables/useCardDescription';
 
@@ -11,6 +11,10 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
+import { useState } from 'src/composables/useState';
+const state = useState();
+
+const customer = computed(() => state.get('customer'));
 
 const $props = defineProps({
     id: {
@@ -43,7 +47,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
         :subtitle="data.subtitle"
         @on-fetch="setData"
         :summary="$props.summary"
-        data-key="customerData"
+        data-key="customer"
     >
         <template #menu="{ entity }">
             <CustomerDescriptorMenu :customer="entity" />
@@ -57,35 +61,46 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 :value="toCurrency(entity.creditInsurance)"
             />
 
-            <VnLv :label="t('customer.card.debt')" :value="toCurrency(entity.debt)" />
-            <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
+            <VnLv
+                :label="t('customer.card.debt')"
+                :value="toCurrency(entity.debt)"
+                :info="t('customer.summary.riskInfo')"
+            />
+            <VnLv :label="t('customer.card.salesPerson')">
                 <template #value>
                     <VnUserLink
-                        :name="entity.salesPersonUser?.name"
+                        v-if="entity.salesPersonUser"
+                        :name="entity.salesPersonUser.name"
                         :worker-id="entity.salesPersonFk"
                     />
+                    <span v-else>{{ dashIfEmpty(entity.salesPersonUser) }}</span>
                 </template>
             </VnLv>
             <VnLv
                 :label="t('customer.card.businessTypeFk')"
-                :value="entity.businessTypeFk"
+                :value="entity.businessType.description"
             />
         </template>
-        <template #icons="{ entity }">
-            <QCardActions class="q-gutter-x-md">
+        <template #icons>
+            <QCardActions v-if="customer" class="q-gutter-x-md">
                 <QIcon
-                    v-if="!entity.isActive"
+                    v-if="!customer.isActive"
                     name="vn:disabled"
                     size="xs"
                     color="primary"
                 >
                     <QTooltip>{{ t('customer.card.isDisabled') }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="entity.isFreezed" name="vn:frozen" size="xs" color="primary">
+                <QIcon
+                    v-if="customer.isFreezed"
+                    name="vn:frozen"
+                    size="xs"
+                    color="primary"
+                >
                     <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!entity.account.active"
+                    v-if="!customer.account?.active"
                     color="primary"
                     name="vn:noweb"
                     size="xs"
@@ -93,7 +108,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.webAccountInactive') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="entity.debt > entity.credit"
+                    v-if="customer.debt > customer.credit"
                     name="vn:risk"
                     size="xs"
                     color="primary"
@@ -101,7 +116,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!entity.isTaxDataChecked"
+                    v-if="!customer.isTaxDataChecked"
                     name="vn:no036"
                     size="xs"
                     color="primary"
@@ -109,7 +124,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
                 <QBtn
-                    v-if="entity.unpaid"
+                    v-if="customer.unpaid"
                     flat
                     size="sm"
                     icon="vn:Client_unpaid"
@@ -121,13 +136,13 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                         <br />
                         {{
                             t('unpaidDated', {
-                                dated: toDate(entity.unpaid.dated),
+                                dated: toDate(customer.unpaid.dated),
                             })
                         }}
                         <br />
                         {{
                             t('unpaidAmount', {
-                                amount: toCurrency(entity.unpaid.amount),
+                                amount: toCurrency(customer.unpaid.amount),
                             })
                         }}
                     </QTooltip>
@@ -139,7 +154,13 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 <QBtn
                     :to="{
                         name: 'TicketList',
-                        query: { table: JSON.stringify({ clientFk: entity.id }) },
+                        query: {
+                            from: undefined,
+                            to: undefined,
+                            table: JSON.stringify({
+                                clientFk: entity.id,
+                            }),
+                        },
                     }"
                     size="md"
                     icon="vn:ticket"
@@ -160,23 +181,8 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 </QBtn>
                 <QBtn
                     :to="{
-                        name: 'OrderCreate',
-                        query: { clientId: entity.id },
-                    }"
-                    size="md"
-                    icon="vn:basketadd"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('New order') }}</QTooltip>
-                </QBtn>
-                <QBtn
-                    :to="{
-                        name: 'AccountList',
-                        query: {
-                            table: JSON.stringify({
-                                filter: { where: { id: entity.id } },
-                            }),
-                        },
+                        name: 'AccountSummary',
+                        params: { id: entity.id },
                     }"
                     size="md"
                     icon="face"
@@ -184,6 +190,18 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Go to user') }}</QTooltip>
                 </QBtn>
+                <QBtn
+                    v-if="entity.supplier"
+                    :to="{
+                        name: 'SupplierSummary',
+                        params: { id: entity.supplier.id },
+                    }"
+                    size="md"
+                    icon="vn:supplier"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Go to supplier') }}</QTooltip>
+                </QBtn>
             </QCardActions>
         </template>
     </CardDescriptor>
@@ -197,8 +215,8 @@ es:
     Go to module index: Ir al índice del módulo
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
-    New order: Nuevo pedido
     Go to user: Ir al usuario
+    Go to supplier: Ir al proveedor
     Customer unpaid: Cliente impago
     Unpaid: Impagado
     unpaidDated: 'Fecha {dated}'

src/pages/Customer/Card/CustomerDescriptorMenu.vue

@@ -8,6 +8,9 @@ import { useQuasar } from 'quasar';
 import useNotify from 'src/composables/useNotify';
 
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
+import TicketCreateDialog from 'src/pages/Ticket/TicketCreateDialog.vue';
+import OrderCreateDialog from 'src/pages/Order/Card/OrderCreateDialog.vue';
+import { ref } from 'vue';
 
 const $props = defineProps({
     customer: {
@@ -40,20 +43,32 @@ const sendSms = async (payload) => {
         notify(error.message, 'positive');
     }
 };
+
+const ticketCreateFormDialog = ref(null);
+const openTicketCreateForm = () => {
+    ticketCreateFormDialog.value.show();
+};
+const orderCreateFormDialog = ref(null);
+const openOrderCreateForm = () => {
+    orderCreateFormDialog.value.show();
+};
 </script>
 
 <template>
-    <QItem v-ripple clickable>
+    <QItem v-ripple clickable @click="openTicketCreateForm()">
         <QItemSection>
-            <RouterLink
-                :to="{
-                    name: 'TicketCreate',
-                    query: { clientFk: customer.id },
-                }"
-                class="color-vn-text"
-            >
-                {{ t('Simple ticket') }}
-            </RouterLink>
+            {{ t('globals.pageTitles.createTicket') }}
+            <QDialog ref="ticketCreateFormDialog">
+                <TicketCreateDialog />
+            </QDialog>
+        </QItemSection>
+    </QItem>
+    <QItem v-ripple clickable @click="openOrderCreateForm()">
+        <QItemSection>
+            {{ t('globals.pageTitles.createOrder') }}
+            <QDialog ref="orderCreateFormDialog">
+                <OrderCreateDialog :client-fk="customer.id" />
+            </QDialog>
         </QItemSection>
     </QItem>
     <QItem v-ripple clickable>

src/pages/Customer/Card/CustomerFileManagement.vue

@@ -236,6 +236,7 @@ const toCustomerFileManagementCreate = () => {
             @click.stop="toCustomerFileManagementCreate()"
             color="primary"
             fab
+            shortcut="+"
             icon="add"
         />
         <QTooltip>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -93,8 +93,8 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
-                    v-model="data.postcode"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
+                    :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
                 />
             </VnRow>
@@ -134,15 +134,17 @@ function handleLocation(data, location) {
                         </QTooltip>
                     </QIcon>
                 </div>
-                <QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
+                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
             </VnRow>
 
             <VnRow>
                 <QCheckbox
                     :label="t('Electronic invoice')"
                     v-model="data.hasElectronicInvoice"
+                /><QCheckbox
+                    :label="t('Verified data')"
+                    v-model="data.isTaxDataChecked"
                 />
-                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
             </VnRow>
         </template>
     </FormModel>

src/pages/Customer/Card/CustomerGreuges.vue

@@ -5,10 +5,10 @@ import { useRoute } from 'vue-router';
 import { toCurrency } from 'src/filters';
 import { toDateTimeFormat } from 'src/filters/date';
 import VnTable from 'components/VnTable/VnTable.vue';
-
+import FetchData from 'components/FetchData.vue';
+const entityId = computed(() => route.params.id);
 const { t } = useI18n();
 const route = useRoute();
-const rows = ref([]);
 const totalAmount = ref();
 const tableRef = ref();
 const filter = computed(() => {
@@ -28,7 +28,7 @@ const filter = computed(() => {
             },
         ],
         where: {
-            clientFk: route.params.id,
+            clientFk: entityId,
         },
     };
 });
@@ -47,7 +47,6 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'userFk',
         label: t('Created by'),
         component: 'userLink',
         attrs: ({ row }) => {
@@ -73,6 +72,7 @@ const columns = computed(() => [
         columnCreate: {
             component: 'select',
             url: 'greugeTypes',
+            sortBy: 'name ASC ',
             limit: 0,
         },
     },
@@ -84,14 +84,14 @@ const columns = computed(() => [
         create: true,
     },
 ]);
-
-const setRows = (data) => {
-    rows.value = data;
-    totalAmount.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
-};
 </script>
 
 <template>
+    <FetchData
+        :url="`Greuges/${entityId}/sumAmount`"
+        auto-load
+        @on-fetch="({ sumAmount }) => (totalAmount = sumAmount)"
+    ></FetchData>
     <VnTable
         ref="tableRef"
         data-key="Greuges"
@@ -104,10 +104,10 @@ const setRows = (data) => {
         :is-editable="false"
         :use-model="true"
         :column-search="false"
-        @on-fetch="(data) => setRows(data)"
+        :disable-option="{ card: true }"
         :create="{
             urlCreate: `Greuges`,
-            title: t('New credit'),
+            title: t('New greuge'),
             onDataSaved: () => tableRef.reload(),
             formInitialData: { shipped: new Date(), clientFk: route.params.id },
         }"

src/pages/Customer/Card/CustomerMandates.vue

@@ -1,20 +1,19 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import { toDateTimeFormat } from 'src/filters/date';
 
-import FetchData from 'components/FetchData.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import { dashIfEmpty } from 'src/filters';
 
 const { t } = useI18n();
 const route = useRoute();
 
-const rows = ref([]);
-
 const filter = {
     include: [
-        { relation: 'mandateType', scope: { fields: ['id', 'name'] } },
+        { relation: 'mandateType', scope: { fields: ['id', 'code'] } },
         { relation: 'company', scope: { fields: ['id', 'code'] } },
     ],
     where: { clientFk: route.params.id },
@@ -22,114 +21,61 @@ const filter = {
     limit: 20,
 };
 
-const tableColumnComponents = {
-    id: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    company: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    type: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    registerDate: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    endDate: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'id',
-        label: t('Id'),
         name: 'id',
+        label: t('globals.id'),
+        field: 'id',
+        isId: true,
     },
     {
         align: 'left',
-        field: (row) => row.company.code,
-        label: t('Company'),
+        cardVisible: true,
+        format: ({ company }) => company.code,
+        label: t('globals.company'),
         name: 'company',
     },
     {
         align: 'left',
-        field: (row) => row.mandateType.name,
-        label: t('Type'),
+        cardVisible: true,
+        format: ({ mandateType }) => mandateType.code,
+        label: t('globals.type'),
         name: 'type',
     },
     {
         align: 'left',
-        field: 'created',
+        cardVisible: true,
         label: t('Register date'),
-        name: 'registerDate',
-        format: (value) => toDateTimeFormat(value),
+        name: 'created',
+        format: ({ created }) => toDateTimeFormat(created),
     },
     {
-        align: 'left',
-        field: 'finished',
+        align: 'right',
+        cardVisible: true,
+        name: 'finished',
         label: t('End date'),
-        name: 'endDate',
-        format: (value) => (value ? toDateTimeFormat(value) : '-'),
+        format: ({ finished }) => dashIfEmpty(toDateTimeFormat(finished)),
     },
 ]);
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
-        url="Mandates"
-    />
-
     <QPage class="column items-center q-pa-md">
-        <QTable
+        <VnTable
+            :filter="filter"
+            auto-load
+            url="Mandates"
             :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
-            :rows="rows"
             class="full-width q-mt-md"
-            row-key="id"
-            v-if="rows?.length"
-        >
-            <template #body-cell="props">
-                <QTd :props="props">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                            class="rounded-borders q-pa-sm"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                        >
-                            {{ props.value }}
-                        </component>
-                    </QTr>
-                </QTd>
-            </template>
-        </QTable>
-
-        <h5 class="flex justify-center color-vn-label" v-else>
-            {{ t('globals.noResults') }}
-        </h5>
+            :right-search="false"
+            :row-click="false"
+        />
     </QPage>
 </template>
 
 <i18n>
 es:
-    Id: Id
-    Company: Empresa
-    Type: Tipo
     Register date: Fecha alta
     End date: Fecha baja
 </i18n>

src/pages/Customer/Card/CustomerRecoveries.vue

@@ -89,9 +89,10 @@ function setFinished(id) {
         :columns="columns"
         :use-model="true"
         :right-search="false"
+        :disable-option="{ card: true }"
         :create="{
             urlCreate: 'Recoveries',
-            title: 'New recovery',
+            title: t('New recovery'),
             onDataSaved: () => tableRef.reload(),
             formInitialData: { clientFk: route.params.id, started: Date.vnNew() },
         }"

src/pages/Customer/Card/CustomerSamples.vue

@@ -1,19 +1,18 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 
-import { QBtn } from 'quasar';
+import { QBtn, useQuasar } from 'quasar';
 
-import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import { dashIfEmpty } from 'src/filters';
+import CustomerSamplesCreate from '../components/CustomerSamplesCreate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const router = useRouter();
-
-const rows = ref([]);
 
 const filter = {
     include: [
@@ -26,108 +25,87 @@ const filter = {
     limit: 20,
 };
 
-const tableColumnComponents = {
-    sent: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    description: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    worker: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
-        event: () => {},
-    },
-    company: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'created',
+        name: 'created',
         label: t('Sent'),
-        name: 'sent',
-        format: (value) => toDateTimeFormat(value),
+        format: ({ created }) => toDateTimeFormat(created),
     },
     {
         align: 'left',
-        field: (value) => value.type.description,
+        format: (row) => row.type.description,
         label: t('Description'),
         name: 'description',
     },
     {
         align: 'left',
-        field: (value) => value.user.name,
         label: t('Worker'),
-        name: 'worker',
+        columnField: {
+            component: 'userLink',
+            attrs: ({ row }) => {
+                return {
+                    defaultName: true,
+                    workerId: row?.user?.id,
+                    name: row?.user?.name,
+                };
+            },
+        },
     },
     {
         align: 'left',
-        field: (value) => value.company?.code,
+        format: ({ company }) => company?.code ?? dashIfEmpty(company),
         label: t('Company'),
         name: 'company',
     },
 ]);
+const quasar = useQuasar();
 
 const toCustomerSamplesCreate = () => {
-    router.push({ name: 'CustomerSamplesCreate' });
+    quasar
+        .dialog({
+            component: CustomerSamplesCreate,
+        })
+        .onOk(() => tableRef.value.reload());
 };
+const tableRef = ref();
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
+    <VnTable
+        ref="tableRef"
+        data-key="ClientSamples"
         auto-load
+        :filter="filter"
         url="ClientSamples"
-    />
-
-    <div class="full-width flex justify-center">
-        <QPage class="card-width q-pa-lg">
-            <QTable
-                :columns="columns"
-                :pagination="{ rowsPerPage: 12 }"
-                :rows="rows"
-                class="full-width q-mt-md"
-                row-key="id"
-                :no-data-label="t('globals.noResults')"
-            >
-                <template #body-cell="props">
-                    <QTd :props="props">
-                        <QTr :props="props" class="cursor-pointer">
-                            <component
-                                :is="tableColumnComponents[props.col.name].component"
-                                class="col-content"
-                                v-bind="
-                                    tableColumnComponents[props.col.name].props(props)
-                                "
-                                @click="
-                                    tableColumnComponents[props.col.name].event(props)
-                                "
-                            >
-                                {{ props.value }}
-                                <WorkerDescriptorProxy
-                                    :id="props.row.userFk"
-                                    v-if="props.col.name === 'worker'"
-                                />
-                            </component>
-                        </QTr>
-                    </QTd>
-                </template>
-            </QTable>
-        </QPage>
-    </div>
+        :columns="columns"
+        :pagination="{ rowsPerPage: 12 }"
+        :disable-option="{ card: true }"
+        :right-search="false"
+        :rows="rows"
+        :order="['created DESC']"
+        class="full-width q-mt-md"
+        row-key="id"
+        :create="false"
+        :no-data-label="t('globals.noResults')"
+    >
+        <template #column-worker="{ row }">
+            <div v-if="row.user">
+                <span class="link">{{ row.user?.name }}</span
+                ><WorkerDescriptorProxy :id="row.userFk" />
+            </div>
+            <span v-else>{{ dashIfEmpty(row.user) }}</span>
+        </template>
+    </VnTable>
 
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="toCustomerSamplesCreate()" color="primary" fab icon="add" />
+        <QBtn
+            @click.stop="toCustomerSamplesCreate()"
+            color="primary"
+            fab
+            icon="add"
+            shortcut="+"
+        />
         <QTooltip>
             {{ t('Send sample') }}
         </QTooltip>

src/pages/Customer/Card/CustomerSummary.vue

@@ -1,10 +1,11 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
+
 import { toCurrency, toPercentage, toDate } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
-import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
@@ -23,11 +24,6 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 const customer = computed(() => summary.value.entity);
 const summary = ref();
-const clientUrl = ref();
-
-onMounted(async () => {
-    clientUrl.value = (await getUrl('client/')) + entityId.value + '/';
-});
 
 const balanceDue = computed(() => {
     return (
@@ -40,11 +36,11 @@ const balanceDue = computed(() => {
 const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : ''));
 
 const claimRate = computed(() => {
-    return customer.value.claimsRatio.claimingRate;
+    return customer.value.claimsRatio?.claimingRate ?? 0;
 });
 
 const priceIncreasingRate = computed(() => {
-    return customer.value.claimsRatio.priceIncreasing / 100;
+    return customer.value.claimsRatio?.priceIncreasing ?? 0 / 100;
 });
 
 const debtWarning = computed(() => {
@@ -58,6 +54,11 @@ const creditWarning = computed(() => {
 
     return tooMuchInsurance || noCreditInsurance ? 'negative' : '';
 });
+const sumRisk = ({ clientRisks }) => {
+    let total = clientRisks.reduce((acc, { amount }) => acc + amount, 0);
+
+    return total;
+};
 </script>
 
 <template>
@@ -91,7 +92,13 @@ const creditWarning = computed(() => {
                 <VnLv
                     :label="t('customer.summary.salesPerson')"
                     :value="entity?.salesPersonUser?.name"
-                />
+                >
+                    <template #value>
+                        <VnUserLink
+                            :name="entity.salesPersonUser?.name"
+                            :worker-id="entity.salesPersonFk"
+                        /> </template
+                ></VnLv>
                 <VnLv
                     :label="t('customer.summary.contactChannel')"
                     :value="entity?.contactChannel?.name"
@@ -131,7 +138,7 @@ const creditWarning = computed(() => {
                     :url="`#/customer/${entityId}/fiscal-data`"
                     :text="t('customer.summary.fiscalData')"
                 />
-                <VnRow>
+                <VnRow class="block">
                     <VnLv
                         :label="t('customer.summary.isEqualizated')"
                         :value="entity.isEqualizated"
@@ -140,8 +147,6 @@ const creditWarning = computed(() => {
                         :label="t('customer.summary.isActive')"
                         :value="entity.isActive"
                     />
-                </VnRow>
-                <VnRow>
                     <VnLv
                         :label="t('customer.summary.verifiedData')"
                         :value="entity.isTaxDataChecked"
@@ -150,8 +155,6 @@ const creditWarning = computed(() => {
                         :label="t('customer.summary.hasToInvoice')"
                         :value="entity.hasToInvoice"
                     />
-                </VnRow>
-                <VnRow>
                     <VnLv
                         :label="t('customer.summary.notifyByEmail')"
                         :value="entity.isToBeMailed"
@@ -162,7 +165,7 @@ const creditWarning = computed(() => {
             <QCard class="vn-one">
                 <VnTitle
                     :url="`#/customer/${entityId}/billing-data`"
-                    :text="t('customer.summary.billingData')"
+                    :text="t('customer.summary.payMethodFk')"
                 />
                 <VnLv
                     :label="t('customer.summary.payMethod')"
@@ -170,7 +173,7 @@ const creditWarning = computed(() => {
                 />
                 <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
                 <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
-                <VnRow class="q-mt-sm" wrap>
+                <VnRow class="q-mt-sm block">
                     <VnLv :label="t('customer.summary.hasLcr')" :value="entity.hasLcr" />
                     <VnLv
                         :label="t('customer.summary.hasCoreVnl')"
@@ -185,7 +188,7 @@ const creditWarning = computed(() => {
             </QCard>
             <QCard class="vn-one" v-if="entity.defaultAddress">
                 <VnTitle
-                    :url="`#/customer/${entityId}/consignees`"
+                    :url="`#/customer/${entityId}/address`"
                     :text="t('customer.summary.consignee')"
                 />
                 <VnLv
@@ -218,7 +221,7 @@ const creditWarning = computed(() => {
             </QCard>
             <QCard class="vn-one" v-if="entity.account">
                 <VnTitle
-                    :url="`https://grafana.verdnatura.es/d/adjlxzv5yjt34d/analisis-de-clientes-7c-crm?orgId=1&var-clientFk=${entityId}`"
+                    :url="`${grafanaUrl}/d/adjlxzv5yjt34d/analisis-de-clientes-7c-crm?orgId=1&var-clientFk=${entityId}`"
                     :text="t('customer.summary.businessData')"
                     icon="vn:grafana"
                 />
@@ -231,7 +234,6 @@ const creditWarning = computed(() => {
                     :value="toCurrency(entity?.mana?.mana)"
                 />
                 <VnLv
-                    v-if="entity.claimsRatio"
                     :label="t('customer.summary.priceIncreasingRate')"
                     :value="toPercentage(priceIncreasingRate)"
                 />
@@ -240,15 +242,14 @@ const creditWarning = computed(() => {
                     :value="toCurrency(entity?.averageInvoiced?.invoiced)"
                 />
                 <VnLv
-                    v-if="entity.claimsRatio"
                     :label="t('customer.summary.claimRate')"
                     :value="toPercentage(claimRate)"
                 />
             </QCard>
             <QCard class="vn-one" v-if="entity.account">
                 <VnTitle
-                    :url="`https://grafana.verdnatura.es/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
-                    :text="t('customer.summary.financialData')"
+                    :url="`${grafanaUrl}/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
+                    :text="t('customer.summary.payMethodFk')"
                     icon="vn:grafana"
                 />
                 <VnLv
@@ -266,15 +267,13 @@ const creditWarning = computed(() => {
                 />
 
                 <VnLv
-                    v-if="entity.creditInsurance"
                     :label="t('customer.summary.securedCredit')"
                     :value="toCurrency(entity.creditInsurance)"
                     :info="t('customer.summary.securedCreditInfo')"
                 />
-
                 <VnLv
                     :label="t('customer.summary.balance')"
-                    :value="toCurrency(entity.sumRisk) || toCurrency(0)"
+                    :value="toCurrency(sumRisk(entity)) || toCurrency(0)"
                     :info="t('customer.summary.balanceInfo')"
                 />
 
@@ -301,7 +300,7 @@ const creditWarning = computed(() => {
                     :value="entity.recommendedCredit"
                 />
             </QCard>
-            <QCard class="vn-one">
+            <QCard>
                 <VnTitle :text="t('Latest tickets')" />
                 <CustomerSummaryTable />
             </QCard>

src/pages/Customer/Card/CustomerUnpaid.vue

@@ -151,7 +151,10 @@ watch(
                             clearable
                             type="number"
                             v-model="amount"
-                        />
+                            autofocus
+                        >
+                            <template #append>€</template></VnInput
+                        >
                     </div>
                 </VnRow>
             </QForm>

src/pages/Customer/Card/CustomerWebPayment.vue

@@ -5,7 +5,7 @@ import { useRoute } from 'vue-router';
 
 import axios from 'axios';
 
-import { toCurrency, toDateHourMinSec } from 'src/filters';
+import { toCurrency, toDateHourMin } from 'src/filters';
 
 import CustomerCloseIconTooltip from '../components/CustomerCloseIconTooltip.vue';
 import CustomerCheckIconTooltip from '../components/CustomerCheckIconTooltip.vue';
@@ -74,7 +74,7 @@ const columns = computed(() => [
         field: 'created',
         label: t('Date'),
         name: 'date',
-        format: (value) => toDateHourMinSec(value),
+        format: (value) => toDateHourMin(value),
     },
     {
         align: 'left',

src/pages/Customer/CustomerCreate.vue

@@ -86,7 +86,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                     >

src/pages/Customer/CustomerFilter.vue

@@ -1,35 +1,20 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
-const props = defineProps({
+defineProps({
     dataKey: {
         type: String,
         required: true,
     },
 });
-
-const provinces = ref();
-const workers = ref();
-const zones = ref();
 </script>
 
 <template>
-    <FetchData url="Provinces" @on-fetch="(data) => (provinces = data)" auto-load />
-    <FetchData url="Zones" @on-fetch="(data) => (zones = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" search-url="table">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -65,15 +50,14 @@ const zones = ref();
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
+                <QItemSection>
                     <VnSelect
+                        url="Workers/activeWithInheritedRole"
+                        :filter="{ where: { role: 'salesPerson' } }"
+                        auto-load
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
-                        :options="workers"
                         option-value="id"
                         option-label="name"
                         emit-value
@@ -88,15 +72,12 @@ const zones = ref();
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
-                <QItemSection v-if="!provinces">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="provinces">
-                    <VnSelect
+                <QItemSection
+                    ><VnSelect
+                        url="Provinces"
                         :label="t('Province')"
                         v-model="params.provinceFk"
                         @update:model-value="searchFn()"
-                        :options="provinces"
                         option-value="id"
                         option-label="name"
                         emit-value
@@ -105,6 +86,7 @@ const zones = ref();
                         dense
                         outlined
                         rounded
+                        auto-load
                         :input-debounce="0"
                     />
                 </QItemSection>
@@ -135,25 +117,21 @@ const zones = ref();
                     </QItemSection>
                 </QItem>
                 <QItem>
-                    <QItemSection v-if="!zones">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="zones">
-                        <VnSelect
-                            :label="t('Zone')"
-                            v-model="params.zoneFk"
-                            @update:model-value="searchFn()"
-                            :options="zones"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
+                    <VnSelect
+                        url="Zones"
+                        :label="t('Zone')"
+                        v-model="params.zoneFk"
+                        @update:model-value="searchFn()"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        auto-load
+                    />
                 </QItem>
                 <QItem>
                     <QItemSection>

src/pages/Customer/CustomerList.vue

@@ -2,15 +2,16 @@
 import { ref, computed, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import CustomerSummary from './Card/CustomerSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
+import RightMenu from 'src/components/common/RightMenu.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-
 import { toDate } from 'src/filters';
+import CustomerFilter from './CustomerFilter.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -69,7 +70,7 @@ const columns = computed(() => [
             optionFilter: 'firstName',
             useLike: false,
         },
-        create: true,
+        create: false,
         columnField: {
             component: null,
         },
@@ -195,6 +196,8 @@ const columns = computed(() => [
         component: 'select',
         attrs: {
             url: 'BusinessTypes',
+            fields: ['code', 'description'],
+            sortBy: 'description ASC ',
             optionLabel: 'description',
             optionValue: 'code',
         },
@@ -353,12 +356,13 @@ const columns = computed(() => [
             {
                 title: t('Client ticket list'),
                 icon: 'vn:ticket',
-                action: redirectToCreateView,
+                action: redirectToTicketsList,
                 isPrimary: true,
             },
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row) => viewSummary(row.id, CustomerSummary),
             },
         ],
@@ -366,11 +370,12 @@ const columns = computed(() => [
 ]);
 
 const { viewSummary } = useSummaryDialog();
-const redirectToCreateView = (row) => {
+const redirectToTicketsList = (row) => {
     router.push({
         name: 'TicketList',
+
         query: {
-            params: JSON.stringify({
+            table: JSON.stringify({
                 clientFk: row.id,
             }),
         },
@@ -392,13 +397,18 @@ function handleLocation(data, location) {
         :label="t('Search customer')"
         data-key="Customer"
     />
+    <RightMenu>
+        <template #right-panel>
+            <CustomerFilter data-key="Customer" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="Customer"
-        url="Clients/extendedListFilter"
+        url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
-            title: 'Create client',
+            title: t('globals.pageTitles.customerCreate'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {
                 active: true,
@@ -408,11 +418,46 @@ function handleLocation(data, location) {
         order="id DESC"
         :columns="columns"
         redirect="customer"
+        :right-search="false"
         auto-load
     >
         <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="Workers/search"
+                v-model="data.salesPersonFk"
+                :label="t('customer.basicData.salesPerson')"
+                :params="{
+                    departmentCodes: ['VT', 'shopping'],
+                }"
+                option-label="nickname"
+                option-value="id"
+                :fields="['id', 'nickname']"
+                sort-by="nickname ASC"
+                emit-value
+                auto-load
+            >
+                <template #prepend>
+                    <VnAvatar
+                        :worker-id="data.salesPersonFk"
+                        color="primary"
+                        :title="title"
+                    />
+                </template>
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption
+                                >{{ scope.opt?.nickname }},
+                                {{ scope.opt?.code }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+
             <VnLocation
-                :roles-allowed-to-create="['deliveryAssistant']"
+                :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />

src/pages/Customer/components/CustomerAddressCreate.vue

@@ -57,12 +57,12 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
         url="AgencyModes/isActive"
     />
-    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <FetchData @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
 
     <FormModel
         :form-initial-data="formInitialData"
@@ -92,7 +92,7 @@ function handleLocation(data, location) {
 
             <VnLocation
                 :rules="validate('Worker.postcode')"
-                :roles-allowed-to-create="['deliveryAssistant']"
+                :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
@@ -134,6 +134,7 @@ function handleLocation(data, location) {
                     option-label="fiscalName"
                     option-value="id"
                     v-model="data.customsAgentFk"
+                    :tooltip="t('Create a new expense')"
                 >
                     <template #form>
                         <CustomerNewCustomsAgent @on-data-saved="refreshData()" />

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -11,7 +11,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
+import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -113,18 +113,18 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
         url="AgencyModes/isActive"
     />
-    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
-    <fetch-data
+    <FetchData @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <FetchData
         @on-fetch="(data) => (customsAgents = data)"
         auto-load
         url="CustomsAgents"
     />
-    <fetch-data @on-fetch="getData" auto-load url="ObservationTypes" />
+    <FetchData @on-fetch="getData" auto-load url="ObservationTypes" />
 
     <FormModel
         :observe-form-changes="false"
@@ -176,8 +176,13 @@ function handleLocation(data, location) {
                 <div class="col">
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.postalCode"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
+                        :location="{
+                            postcode: data.postalCode,
+                            city: data.city,
+                            province: data.province,
+                            country: data.province.country,
+                        }"
                         @update:model-value="(location) => handleLocation(data, location)"
                     ></VnLocation>
                 </div>
@@ -221,9 +226,10 @@ function handleLocation(data, location) {
                         option-label="fiscalName"
                         option-value="id"
                         v-model="data.customsAgentFk"
+                        :tooltip="t('New customs agent')"
                     >
                         <template #form>
-                            <CustomsNewCustomsAgent />
+                            <CustomerNewCustomsAgent />
                         </template>
                     </VnSelectDialog>
                 </div>
@@ -267,16 +273,17 @@ function handleLocation(data, location) {
                 </div>
             </VnRow>
 
-            <QIcon
+            <QBtn
                 @click.stop="addNote()"
                 class="cursor-pointer add-icon q-mt-md"
-                name="add"
-                size="sm"
+                flat
+                icon="add"
+                shortcut="+"
             >
                 <QTooltip>
                     {{ t('Add note') }}
                 </QTooltip>
-            </QIcon>
+            </QBtn>
         </template>
     </FormModel>
 </template>
@@ -303,6 +310,7 @@ es:
     Mobile: Movíl
     Incoterms: Incoterms
     Customs agent: Agente de aduanas
+    New customs agent: Nuevo agente de aduanas
     Notes: Notas
     Observation type: Tipo de observación
     Description: Descripción

src/pages/Customer/components/CustomerChangePassword.vue

@@ -46,7 +46,6 @@ const onSubmit = async () => {
     };
     try {
         await axios.patch(`Clients/${$props.id}/setPassword`, payload);
-        await $props.promise();
     } catch (error) {
         notify('errors.create', 'negative');
     } finally {

src/pages/Customer/components/CustomerCreditContractsCreate.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { reactive } from 'vue';
+import { reactive, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
@@ -10,10 +10,12 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
+const routeId = computed(() => route.params.id);
 const router = useRouter();
 
 const initialData = reactive({
-    clientFK: Number(route.params.id),
+    started: Date.vnNew(),
+    clientFk: routeId.value,
 });
 
 const toCustomerCreditContracts = () => {

src/pages/Customer/components/CustomerCreditContractsInsurance.vue

@@ -1,47 +1,26 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import { toCurrency, toDateHourMinSec } from 'src/filters';
+import { toCurrency, toDate } from 'src/filters';
 
-import FetchData from 'components/FetchData.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 
-const rows = ref([]);
-
 const filter = {
     where: {
         creditClassificationFk: `${route.params.creditId}`,
     },
     limit: 20,
 };
-
-const tableColumnComponents = {
-    created: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    grade: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    credit: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
         field: 'created',
-        format: (value) => toDateHourMinSec(value),
+        format: ({ created }) => toDate(created),
         label: t('Created'),
         name: 'created',
     },
@@ -53,8 +32,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: 'credit',
-        format: (value) => toCurrency(value),
+        format: ({ credit }) => toCurrency(credit),
         label: t('Credit'),
         name: 'credit',
     },
@@ -62,41 +40,19 @@ const columns = computed(() => [
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
+    <VnTable
         url="CreditInsurances"
-    />
-
-    <QPage class="column items-center q-pa-md" v-if="rows.length">
-        <QTable
-            :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="id"
-        >
-            <template #body-cell="props">
-                <QTd :props="props">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            class="col-content"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                        >
-                            {{ props.value }}
-                        </component>
-                    </QTr>
-                </QTd>
-            </template>
-        </QTable>
-    </QPage>
-
-    <h5 class="flex justify-center color-vn-label" v-else>
-        {{ t('globals.noResults') }}
-    </h5>
+        ref="tableRef"
+        data-key="creditInsurances"
+        :filter="filter"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        :disable-option="{ card: true }"
+        auto-load
+    ></VnTable>
 </template>
 
 <i18n>

src/pages/Customer/components/CustomerFileManagementCreate.vue

@@ -83,35 +83,35 @@ const toCustomerFileManagement = () => {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (client = data)"
         auto-load
         :url="`Clients/${route.params.id}/getCard`"
     />
-    <fetch-data
+    <FetchData
         :filter="filterFindOne"
         @on-fetch="(data) => (findOne = data)"
         auto-load
         url="DmsTypes/findOne"
     />
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (allowedContentTypes = data)"
         auto-load
         url="DmsContainers/allowedContentTypes"
     />
-    <fetch-data
+    <FetchData
         :filter="filterCompanies"
         @on-fetch="(data) => (optionsCompanies = data)"
         auto-load
         url="Companies"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsWarehouses = data)"
         auto-load
         url="Warehouses"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsDmsTypes = data)"
         auto-load

src/pages/Customer/components/CustomerFileManagementEdit.vue

@@ -69,25 +69,25 @@ const toCustomerFileManagement = () => {
 </script>
 
 <template>
-    <fetch-data :url="`Dms/${route.params.dmsId}`" @on-fetch="setCurrentDms" auto-load />
-    <fetch-data
+    <FetchData :url="`Dms/${route.params.dmsId}`" @on-fetch="setCurrentDms" auto-load />
+    <FetchData
         @on-fetch="(data) => (allowedContentTypes = data)"
         auto-load
         url="DmsContainers/allowedContentTypes"
     />
-    <fetch-data
+    <FetchData
         :filter="filterCompanies"
         @on-fetch="(data) => (optionsCompanies = data)"
         auto-load
         url="Companies"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsWarehouses = data)"
         auto-load
         url="Warehouses"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsDmsTypes = data)"
         auto-load

src/pages/Customer/components/CustomerSamplesCreate.vue

@@ -1,11 +1,11 @@
 <script setup>
-import { onBeforeMount, reactive, ref } from 'vue';
+import { computed, onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
 import axios from 'axios';
 import { usePrintService } from 'composables/usePrintService';
-import { useQuasar } from 'quasar';
+import { useDialogPluginComponent, useQuasar } from 'quasar';
 
 import { useState } from 'src/composables/useState';
 import { useValidator } from 'src/composables/useValidator';
@@ -17,7 +17,9 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import CustomerSamplesPreview from 'src/pages/Customer/components/CustomerSamplesPreview.vue';
-import { useStateStore } from 'stores/useStateStore';
+import FormPopup from 'src/components/FormPopup.vue';
+
+const { dialogRef, onDialogOK } = useDialogPluginComponent();
 
 const { notify } = useNotify();
 const { t } = useI18n();
@@ -27,17 +29,17 @@ const route = useRoute();
 const router = useRouter();
 const state = useState();
 const user = state.getUser();
-const stateStore = useStateStore();
 const { sendEmail } = usePrintService();
-const client = ref({});
 const hasChanged = ref(false);
 const isLoading = ref(false);
-const optionsClientsAddressess = ref([]);
-const optionsCompanies = ref([]);
+const addressess = ref([]);
+const companies = ref([]);
 const optionsEmailUsers = ref([]);
 const optionsSamplesVisible = ref([]);
 const sampleType = ref({ hasPreview: false });
-
+const initialData = reactive({});
+const entityId = computed(() => route.params.id);
+const customer = computed(() => state.get('customer'));
 const filterEmailUsers = { where: { userFk: user.value.id } };
 const filterClientsAddresses = {
     include: [
@@ -59,14 +61,13 @@ const filterSamplesVisible = {
     ],
     order: ['description'],
 };
-const initialData = reactive({});
+
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 
 onBeforeMount(async () => {
-    const { data } = await axios.get(`Clients/1/getCard`);
-    client.value = data;
-    initialData.clientFk = route.params?.id;
-    initialData.recipient = data.email;
-    initialData.recipientId = data.id;
+    initialData.clientFk = customer.value.id;
+    initialData.recipient = customer.value.email;
+    initialData.recipientId = customer.value.id;
 });
 
 const setEmailUser = (data) => {
@@ -76,7 +77,7 @@ const setEmailUser = (data) => {
 
 const setClientsAddresses = (data) => {
     initialData.addressId = data[0].id;
-    optionsClientsAddressess.value = data;
+    addressess.value = data;
 };
 
 const setSampleType = (sampleId) => {
@@ -89,20 +90,6 @@ const setSampleType = (sampleId) => {
     initialData.companyId = companyFk;
 };
 
-const setInitialData = () => {
-    hasChanged.value = false;
-
-    initialData.addressId = optionsClientsAddressess.value[0].id;
-    initialData.companyFk = null;
-    initialData.from = null;
-    initialData.recipient = client.value.email;
-    initialData.recipientId = client.value.id;
-    initialData.replyTo = optionsEmailUsers.value[0]?.email;
-    initialData.typeFk = '';
-
-    sampleType.value = {};
-};
-
 const validateMessage = () => {
     if (!initialData.recipient) return 'Email cannot be blank';
     if (!sampleType.value) return 'Choose a sample';
@@ -121,14 +108,14 @@ const setParams = (params) => {
 const getPreview = async () => {
     try {
         const params = {
-            recipientId: route.params.id,
+            recipientId: entityId,
         };
         const validationMessage = validateMessage();
         if (validationMessage) return notify(t(validationMessage), 'negative');
 
         setParams(params);
 
-        const path = `${sampleType.value.model}/${route.params.id}/${sampleType.value.code}-html`;
+        const path = `${sampleType.value.model}/${entityId.value}/${sampleType.value.code}-html`;
         const { data } = await axios.get(path, { params });
 
         if (!data) return;
@@ -169,7 +156,6 @@ const getSamples = async () => {
     }
 };
 
-getSamples();
 const onDataSaved = async () => {
     try {
         const params = {
@@ -179,8 +165,9 @@ const onDataSaved = async () => {
         };
         setParams(params);
         const samplesData = await getSamples();
-        const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
+        const path = `${samplesData.model}/${entityId.value}/${samplesData.code}-email`;
         await sendEmail(path, params);
+        onDialogOK(params);
     } catch (error) {
         notify('errors.create', 'negative');
     }
@@ -197,73 +184,54 @@ const toCustomerSamples = () => {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         :filter="filterEmailUsers"
         @on-fetch="setEmailUser"
         auto-load
         url="EmailUsers"
     />
-    <fetch-data
+    <FetchData
         :filter="filterClientsAddresses"
-        :url="`Clients/${route.params.id}/addresses`"
+        :url="`Clients/${entityId}/addresses`"
         @on-fetch="setClientsAddresses"
         auto-load
     />
-    <fetch-data
+    <FetchData
         :filter="filterCompanies"
-        @on-fetch="(data) => (optionsCompanies = data)"
+        @on-fetch="(data) => (companies = data)"
         auto-load
         url="Companies"
     />
-    <fetch-data
+    <FetchData
         :filter="filterSamplesVisible"
         @on-fetch="(data) => (optionsSamplesVisible = data)"
         auto-load
         url="Samples/visible"
     />
 
-    <Teleport v-if="stateStore?.isSubToolbarShown()" to="#st-actions">
-        <QBtnGroup push class="q-gutter-x-sm">
-            <QBtn
-                :label="t('globals.cancel')"
-                @click="toCustomerSamples"
-                color="primary"
-                flat
-                icon="close"
-            />
-            <QBtn
-                :disabled="isLoading || !sampleType?.hasPreview"
-                :label="t('Preview')"
-                :loading="isLoading"
-                @click.stop="getPreview()"
-                color="primary"
-                flat
-                icon="preview"
-            />
-            <QBtn
-                :disabled="!hasChanged"
-                :label="t('globals.reset')"
-                :loading="isLoading"
-                @click="setInitialData"
-                color="primary"
-                flat
-                icon="restart_alt"
-                type="reset"
-            />
-            <QBtn
-                :disabled="!hasChanged"
-                :label="t('globals.save')"
-                :loading="isLoading"
-                @click="onSubmit"
-                color="primary"
-                icon="save"
-            />
-        </QBtnGroup>
-    </Teleport>
-
-    <div class="full-width flex justify-center">
-        <QCard class="card-width q-pa-lg">
-            <QForm>
+    <QDialog ref="dialogRef">
+        <FormPopup
+            :default-cancel-button="false"
+            :default-submit-button="false"
+            @on-submit="onSubmit()"
+        >
+            <template #custom-buttons>
+                <QBtn
+                    :disabled="isLoading || !sampleType?.hasPreview"
+                    :label="t('Preview')"
+                    :loading="isLoading"
+                    @click.stop="getPreview()"
+                    color="primary"
+                    flat
+                    icon="preview" /><QBtn
+                    :disabled="!hasChanged"
+                    :label="t('globals.save')"
+                    :loading="isLoading"
+                    @click="onSubmit"
+                    color="primary"
+                    icon="save"
+            /></template>
+            <template #form-inputs>
                 <div class="col">
                     <VnSelect
                         :label="t('Sample')"
@@ -320,7 +288,7 @@ const toCustomerSamples = () => {
                     <div class="col">
                         <VnSelect
                             :label="t('Company')"
-                            :options="optionsCompanies"
+                            :options="companies"
                             :rules="validate('entry.companyFk')"
                             hide-selected
                             option-label="code"
@@ -333,7 +301,7 @@ const toCustomerSamples = () => {
                     <div class="col">
                         <VnSelect
                             :label="t('Address')"
-                            :options="optionsClientsAddressess"
+                            :options="addressess"
                             hide-selected
                             option-label="nickname"
                             option-value="id"
@@ -371,15 +339,15 @@ const toCustomerSamples = () => {
                             required="true"
                             v-model="initialData.from"
                         />
-                    </div>
-                </VnRow>
-            </QForm>
-        </QCard>
-    </div>
+                    </div> </VnRow
+            ></template>
+        </FormPopup>
+    </QDialog>
 </template>
 
 <i18n>
 es:
+    New sample: Crear plantilla
     Sample: Plantilla
     Recipient: Destinatario
     Reply to: Responder a

src/pages/Customer/components/CustomerSummaryTable.vue

@@ -1,22 +1,25 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import { QBtn, date } from 'quasar';
+import { date } from 'quasar';
+import { toDateFormat } from 'src/filters/date.js';
 
 import { toCurrency } from 'src/filters';
 
-import FetchData from 'components/FetchData.vue';
-import CustomerSummaryTableActions from './CustomerSummaryTableActions.vue';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
+
+import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
-
-const rows = ref([]);
+const { viewSummary } = useSummaryDialog();
 
 const filter = {
     include: [
@@ -32,57 +35,7 @@ const filter = {
     ],
     where: { clientFk: route.params.id },
     order: ['shipped DESC', 'id'],
-    limit: 10,
-};
-
-const tableColumnComponents = {
-    id: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    nickname: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
-        event: () => {},
-    },
-    agency: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    route: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue' }),
-        event: () => {},
-    },
-    packages: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    date: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    state: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    total: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    actions: {
-        component: CustomerSummaryTableActions,
-        props: (prop) => ({
-            id: prop.row.id,
-        }),
-        event: () => {},
-    },
+    limit: 30,
 };
 
 const columns = computed(() => [
@@ -94,37 +47,37 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: 'nickname',
         label: t('Nickname'),
         name: 'nickname',
+        columnClass: 'expand',
     },
     {
         align: 'left',
-        field: (row) => row?.agencyMode?.name,
+        format: (row) => row.agencyMode.name,
+        columnClass: 'expand',
         label: t('Agency'),
-        name: 'agency',
     },
     {
         align: 'left',
-        field: 'routeFk',
+        name: 'routeFk',
+        columnClass: 'shrink',
         label: t('Route'),
-        name: 'route',
     },
     {
         align: 'left',
         field: 'packages',
         label: t('Packages'),
         name: 'packages',
+        columnClass: 'shrink',
     },
     {
         align: 'left',
-        field: (row) => date.formatDate(row?.shipped, 'DD/MM/YYYY'),
+        format: ({ shipped }) => date.formatDate(shipped, 'DD/MM/YYYY'),
         label: t('Date'),
-        name: 'date',
+        name: 'shipped',
     },
     {
         align: 'left',
-        field: (row) => row?.ticketState?.state?.name,
         label: t('State'),
         name: 'state',
     },
@@ -134,11 +87,25 @@ const columns = computed(() => [
         label: t('Total'),
         name: 'total',
     },
+
     {
-        align: 'left',
-        field: 'totalWithVat',
+        align: 'right',
         label: '',
-        name: 'actions',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('customer.summary.goToLines'),
+                icon: 'vn:lines',
+                action: ({ id }) => router.push({ params: { id }, name: 'TicketSale' }),
+                isPrimary: true,
+            },
+            {
+                title: t('components.smartCard.viewSummary'),
+                icon: 'preview',
+                isPrimary: true,
+                action: (row) => viewSummary(row.id, TicketSummary),
+            },
+        ],
     },
 ]);
 
@@ -156,84 +123,89 @@ const setTotalPriceColor = (ticket) => {
     if (total > 0 && total < 50) return 'warning';
 };
 
-const navigateToticketSummary = (id) => {
-    router.push({
-        name: 'TicketSummary',
-        params: { id },
-    });
+const setShippedColor = (date) => {
+    const today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+
+    const ticketShipped = new Date(date);
+    ticketShipped.setHours(0, 0, 0, 0);
+
+    const difference = today - ticketShipped;
+
+    if (difference == 0) return 'warning';
+    if (difference < 0) return 'success';
 };
-const commonColumns = (col) => ['date', 'state', 'total'].includes(col);
 </script>
 
 <template>
-    <FetchData
+    <VnTable
+        data-key="CustomerTickets"
         :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
+        :right-search="false"
+        :column-search="false"
         url="Tickets"
-    />
-    <QCard class="vn-one q-py-sm flex justify-between">
-        <QTable
-            :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
-            :rows="rows"
-            class="full-width"
-            row-key="id"
-        >
-            <template #body-cell="props">
-                <QTd :props="props" @click="navigateToticketSummary(props.row.id)">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                            class="rounded-borders"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                        >
-                            <template v-if="!commonColumns(props.col.name)">
-                                <span
-                                    :class="{
-                                        link:
-                                            props.col.name === 'route' ||
-                                            props.col.name === 'nickname',
-                                    }"
-                                >
-                                    {{ props.value }}
-                                </span>
-                            </template>
-                            <template v-if="props.col.name === 'date'">
-                                <QBadge class="q-pa-sm" color="warning">
-                                    {{ props.value }}
-                                </QBadge>
-                            </template>
-                            <template v-if="props.col.name === 'state'">
-                                <QBadge :color="setStateColor(props.row)" class="q-pa-sm">
-                                    {{ props.value }}
-                                </QBadge>
-                            </template>
-                            <template v-if="props.col.name === 'total'">
-                                <QBadge
-                                    :color="setTotalPriceColor(props.row)"
-                                    class="q-pa-sm"
-                                    v-if="setTotalPriceColor(props.row)"
-                                >
-                                    {{ toCurrency(props.value) }}
-                                </QBadge>
-                                <div v-else>{{ toCurrency(props.value) }}</div>
-                            </template>
-                            <CustomerDescriptorProxy
-                                :id="props.row.clientFk"
-                                v-if="props.col.name === 'nickname'"
-                            />
-                            <RouteDescriptorProxy
-                                :id="props.row.routeFk"
-                                v-if="props.col.name === 'route'"
-                            />
-                        </component>
-                    </QTr>
-                </QTd>
-            </template>
-        </QTable>
-    </QCard>
+        :columns="columns"
+        search-url="tickets"
+        :without-header="true"
+        auto-load
+        order="shipped DESC, id"
+        :disable-option="{ card: true, table: true }"
+        class="full-width"
+        :disable-infinite-scroll="true"
+    >
+        <template #column-nickname="{ row }">
+            <span class="link">
+                {{ row.nickname }}
+                <CustomerDescriptorProxy :id="row.clientFk" />
+            </span>
+        </template>
+
+        <template #column-routeFk="{ row }">
+            <span class="link">
+                {{ row.routeFk }}
+                <RouteDescriptorProxy :id="row.routeFk" />
+            </span>
+        </template>
+        <template #column-total="{ row }">
+            <QBadge
+                class="q-pa-sm"
+                v-if="setTotalPriceColor(row)"
+                :color="setTotalPriceColor(row)"
+                text-color="black"
+            >
+                {{ toCurrency(row.totalWithVat) }}
+            </QBadge>
+            <span v-else> {{ toCurrency(row.totalWithVat) }}</span>
+        </template>
+        <template #column-state="{ row }">
+            <span v-if="row.invoiceOut">
+                <span :class="{ link: row.invoiceOut.ref }">
+                    {{ row.invoiceOut.ref }}
+                    <InvoiceOutDescriptorProxy :id="row.invoiceOut.id" />
+                </span>
+            </span>
+            <QBadge
+                class="q-pa-sm"
+                :color="setStateColor(row)"
+                text-color="black"
+                v-else-if="setStateColor(row)"
+            >
+                {{ row?.ticketState?.state.name }}
+            </QBadge>
+            <span v-else> {{ row?.ticketState?.state.name }}</span>
+        </template>
+        <template #column-shipped="{ row }">
+            <QBadge
+                class="q-pa-sm"
+                :color="setShippedColor(row.shipped)"
+                text-color="black"
+                v-if="setShippedColor(row.shipped)"
+            >
+                {{ toDateFormat(row.shipped) }}
+            </QBadge>
+            <span v-else> {{ toDateFormat(row.shipped) }}</span>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>

src/pages/Customer/components/CustomerSummaryTableActions.vue

@@ -1,44 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
-
-const { t } = useI18n();
-
-defineProps({
-    id: {
-        type: Number,
-        required: true,
-    },
-});
-
-const { viewSummary } = useSummaryDialog();
-</script>
-
-<template>
-    <div>
-        <QIcon color="primary" name="vn:lines" size="sm">
-            <QTooltip>
-                {{ t('Go to lines') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            @click.stop="viewSummary(id, TicketSummary)"
-            class="q-ml-md"
-            color="primary"
-            name="preview"
-            size="sm"
-        >
-            <QTooltip>
-                {{ t('Preview') }}
-            </QTooltip>
-        </QIcon>
-    </div>
-</template>
-
-<i18n>
-es:
-    Go to lines: Ir a lineas
-    Preview: Vista previa
-</i18n>

src/pages/Customer/locale/en.yml

@@ -2,3 +2,135 @@ customerFilter:
     filter:
         name: Name
         socialName: Social name
+customer:
+    list:
+        phone: Phone
+        email: Email
+        customerOrders: Display customer orders
+        moreOptions: More options
+    card:
+        customerList: Customer list
+        customerId: Claim ID
+        salesPerson: Sales person
+        credit: Credit
+        risk: Risk
+        securedCredit: Secured credit
+        payMethod: Pay method
+        debt: Debt
+        isFrozen: Customer frozen
+        hasDebt: Customer has debt
+        isDisabled: Customer inactive
+        notChecked: Customer no checked
+        webAccountInactive: Web account inactive
+        noWebAccess: Web access is disabled
+        businessType: Business type
+        passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
+        businessTypeFk: Business type
+    summary:
+        basicData: Basic data
+        fiscalAddress: Fiscal address
+        fiscalData: Fiscal data
+        billingData: Billing data
+        consignee: Default consignee
+        businessData: Business data
+        financialData: Financial data
+        customerId: Customer ID
+        name: Name
+        contact: Contact
+        phone: Phone
+        mobile: Mobile
+        email: Email
+        salesPerson: Sales person
+        contactChannel: Contact channel
+        socialName: Social name
+        fiscalId: Fiscal ID
+        postcode: Postcode
+        province: Province
+        country: Country
+        street: Address
+        isEqualizated: Is equalizated
+        isActive: Is active
+        invoiceByAddress: Invoice by address
+        verifiedData: Verified data
+        hasToInvoice: Has to invoice
+        notifyByEmail: Notify by email
+        vies: VIES
+        payMethod: Pay method
+        bankAccount: Bank account
+        dueDay: Due day
+        hasLcr: Has LCR
+        hasCoreVnl: Has core VNL
+        hasB2BVnl: Has B2B VNL
+        addressName: Address name
+        addressCity: City
+        addressStreet: Street
+        username: Username
+        webAccess: Web access
+        totalGreuge: Total greuge
+        mana: Mana
+        priceIncreasingRate: Price increasing rate
+        averageInvoiced: Average invoiced
+        claimRate: Claming rate
+        payMethodFk: Billing data
+        risk: Risk
+        maximumRisk: Solunion's maximum risk
+        riskInfo: Invoices minus payments plus orders not yet invoiced
+        credit: Credit
+        creditInfo: Company's maximum risk
+        securedCredit: Secured credit
+        securedCreditInfo: Solunion's maximum risk
+        balance: Balance
+        balanceInfo: Invoices minus payments
+        balanceDue: Balance due
+        balanceDueInfo: Deviated invoices minus payments
+        recoverySince: Recovery since
+        businessType: Business Type
+        city: City
+        descriptorInfo: Invoices minus payments plus orders not yet
+        rating: Rating
+        recommendCredit: Recommended credit
+        goToLines: Go to lines
+    basicData:
+        socialName: Fiscal name
+        businessType: Business type
+        contact: Contact
+        youCanSaveMultipleEmails: You can save multiple emails
+        email: Email
+        phone: Phone
+        mobile: Mobile
+        salesPerson: Sales person
+        contactChannel: Contact channel
+        previousClient: Previous client
+    extendedList:
+        tableVisibleColumns:
+            id: Identifier
+            name: Name
+            socialName: Social name
+            fi: Tax number
+            salesPersonFk: Salesperson
+            credit: Credit
+            creditInsurance: Credit insurance
+            phone: Phone
+            mobile: Mobile
+            street: Street
+            countryFk: Country
+            provinceFk: Province
+            city: City
+            postcode: Postcode
+            email: Email
+            created: Created
+            businessTypeFk: Business type
+            payMethodFk: Billing data
+            sageTaxTypeFk: Sage tax type
+            sageTransactionTypeFk: Sage tr. type
+            isActive: Active
+            isVies: Vies
+            isTaxDataChecked: Verified data
+            isEqualizated: Is equalizated
+            isFreezed: Freezed
+            hasToInvoice: Invoice
+            hasToInvoiceByAddress: Invoice by address
+            isToBeMailed: Mailing
+            hasLcr: Received LCR
+            hasCoreVnl: VNL core received
+            hasSepaVnl: VNL B2B received

src/pages/Customer/locale/es.yml

@@ -4,3 +4,134 @@ customerFilter:
     filter:
         name: Nombre
         socialName: Razón Social
+customer:
+    list:
+        phone: Teléfono
+        email: Email
+        customerOrders: Mostrar órdenes del cliente
+        moreOptions: Más opciones
+    card:
+        customerId: ID cliente
+        salesPerson: Comercial
+        credit: Crédito
+        risk: Riesgo
+        securedCredit: Crédito asegurado
+        payMethod: Método de pago
+        debt: Riesgo
+        isFrozen: Cliente congelado
+        hasDebt: Cliente con riesgo
+        isDisabled: Cliente inactivo
+        notChecked: Cliente no comprobado
+        webAccountInactive: Sin acceso web
+        noWebAccess: El acceso web está desactivado
+        businessType: Tipo de negocio
+        passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
+        businessTypeFk: Tipo de negocio
+    summary:
+        basicData: Datos básicos
+        fiscalAddress: Dirección fiscal
+        fiscalData: Datos fiscales
+        billingData: Datos de facturación
+        consignee: Consignatario pred.
+        businessData: Datos comerciales
+        financialData: Datos financieros
+        customerId: ID cliente
+        name: Nombre
+        contact: Contacto
+        phone: Teléfono
+        mobile: Móvil
+        email: Email
+        salesPerson: Comercial
+        contactChannel: Canal de contacto
+        socialName: Razón social
+        fiscalId: NIF/CIF
+        postcode: Código postal
+        province: Provincia
+        country: País
+        street: Calle
+        isEqualizated: Recargo de equivalencia
+        isActive: Activo
+        invoiceByAddress: Facturar por consignatario
+        verifiedData: Datos verificados
+        hasToInvoice: Facturar
+        notifyByEmail: Notificar por email
+        vies: VIES
+        payMethod: Método de pago
+        bankAccount: Cuenta bancaria
+        dueDay: Vencimiento
+        hasLcr: Recibido LCR
+        hasCoreVnl: Recibido core VNL
+        hasB2BVnl: Recibido B2B VNL
+        addressName: Nombre de la dirección
+        addressCity: Ciudad
+        addressStreet: Calle
+        username: Usuario
+        webAccess: Acceso web
+        totalGreuge: Greuge total
+        mana: Maná
+        priceIncreasingRate: Ratio de incremento de precio
+        averageInvoiced: Facturación media
+        claimRate: Ratio de reclamaciones
+        maximumRisk: Riesgo máximo asumido por Solunion
+        payMethodFk: Forma de pago
+        risk: Riesgo
+        riskInfo: Facturas menos recibos mas pedidos sin facturar
+        credit: Crédito
+        creditInfo: Riesgo máximo asumido por la empresa
+        securedCredit: Crédito asegurado
+        securedCreditInfo: Riesgo máximo asumido por Solunion
+        balance: Balance
+        balanceInfo: Facturas menos recibos
+        balanceDue: Saldo vencido
+        balanceDueInfo: Facturas fuera de plazo menos recibos
+        recoverySince: Recobro desde
+        businessType: Tipo de negocio
+        city: Población
+        descriptorInfo: Facturas menos recibos mas pedidos sin facturar
+        rating: Clasificación
+        recommendCredit: Crédito recomendado
+        goToLines: Ir a líneas
+    basicData:
+        socialName: Nombre fiscal
+        businessType: Tipo de negocio
+        contact: Contacto
+        youCanSaveMultipleEmails: Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios{','} ejemplo{':'} user{'@'}dominio{'.'}com, user2{'@'}dominio{'.'}com siendo el primer correo electrónico el principal
+        email: Email
+        phone: Teléfono
+        mobile: Móvil
+        salesPerson: Comercial
+        contactChannel: Canal de contacto
+        previousClient: Cliente anterior
+    extendedList:
+        tableVisibleColumns:
+            id: Identificador
+            name: Nombre
+            socialName: Razón social
+            fi: NIF / CIF
+            salesPersonFk: Comercial
+            credit: Crédito
+            creditInsurance: Crédito asegurado
+            phone: Teléfono
+            mobile: Móvil
+            street: Dirección fiscal
+            countryFk: País
+            provinceFk: Provincia
+            city: Población
+            postcode: Código postal
+            email: Email
+            created: Fecha creación
+            businessTypeFk: Tipo de negocio
+            payMethodFk: Forma de pago
+            sageTaxTypeFk: Tipo de impuesto Sage
+            sageTransactionTypeFk: Tipo tr. sage
+            isActive: Activo
+            isVies: Vies
+            isTaxDataChecked: Datos comprobados
+            isEqualizated: Recargo de equivalencias
+            isFreezed: Congelado
+            hasToInvoice: Factura
+            hasToInvoiceByAddress: Factura por consigna
+            isToBeMailed: Env. emails
+            hasLcr: Recibido LCR
+            hasCoreVnl: Recibido core VNL
+            hasSepaVnl: Recibido B2B VNL

src/pages/Dashboard/DashboardMain.vue

@@ -60,7 +60,7 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
                                             <QTooltip>
                                                 {{
                                                     'Ctrl + Alt + ' +
-                                                    item.keyBinding.toUpperCase()
+                                                    item?.keyBinding?.toUpperCase()
                                                 }}
                                             </QTooltip>
                                         </div>

src/pages/Department/Card/DepartmentBasicData.vue

@@ -16,12 +16,12 @@ const workersOptions = ref([]);
 const clientsOptions = ref([]);
 </script>
 <template>
-    <fetch-data
+    <FetchData
         url="Workers/search"
         @on-fetch="(data) => (workersOptions = data)"
         auto-load
     />
-    <fetch-data url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
+    <FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
     <FormModel
         :url="`Departments/${route.params.id}`"
         model="department"

src/pages/Entry/Card/EntryNotes.vue

@@ -138,7 +138,13 @@ const columns = computed(() => [
         </template>
     </CrudModel>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="entryObservationsRef.insert()" />
+        <QBtn
+            fab
+            color="primary"
+            icon="add"
+            shortcut="+"
+            @click="entryObservationsRef.insert()"
+        />
     </QPageSticky>
 </template>
 <i18n>

src/pages/Entry/Card/EntrySummary.vue

@@ -10,6 +10,7 @@ import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.v
 import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
+import FetchedTags from 'src/components/ui/FetchedTags.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -163,7 +164,7 @@ const fetchEntryBuys = async () => {
     >
         <template #header-left>
             <router-link
-                v-if="route.name !== 'EntrySummary'"
+                v-if="route?.name !== 'EntrySummary'"
                 :to="{ name: 'EntrySummary', params: { id: entityId } }"
                 class="header link"
                 :href="entryUrl"
@@ -184,7 +185,10 @@ const fetchEntryBuys = async () => {
                     <QIcon name="open_in_new" />
                 </router-link>
                 <VnLv :label="t('entry.summary.commission')" :value="entry.commission" />
-                <VnLv :label="t('entry.summary.currency')" :value="entry.currency.name" />
+                <VnLv
+                    :label="t('entry.summary.currency')"
+                    :value="entry.currency?.name"
+                />
                 <VnLv :label="t('entry.summary.company')" :value="entry.company.code" />
                 <VnLv :label="t('entry.summary.reference')" :value="entry.reference" />
                 <VnLv
@@ -210,12 +214,12 @@ const fetchEntryBuys = async () => {
                 </VnLv>
                 <VnLv
                     :label="t('entry.summary.travelAgency')"
-                    :value="entry.travel.agency.name"
+                    :value="entry.travel.agency?.name"
                 />
                 <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
                 <VnLv
                     :label="t('entry.summary.travelWarehouseOut')"
-                    :value="entry.travel.warehouseOut.name"
+                    :value="entry.travel.warehouseOut?.name"
                 />
                 <QCheckbox
                     :label="t('entry.summary.travelDelivered')"
@@ -225,7 +229,7 @@ const fetchEntryBuys = async () => {
                 <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
                 <VnLv
                     :label="t('entry.summary.travelWarehouseIn')"
-                    :value="entry.travel.warehouseIn.name"
+                    :value="entry.travel.warehouseIn?.name"
                 />
                 <QCheckbox
                     :label="t('entry.summary.travelReceived')"
@@ -281,17 +285,17 @@ const fetchEntryBuys = async () => {
                 >
                     <template #body="{ cols, row, rowIndex }">
                         <QTr no-hover>
-                            <QTd v-for="col in cols" :key="col.name">
+                            <QTd v-for="col in cols" :key="col?.name">
                                 <component
-                                    :is="tableColumnComponents[col.name].component(props)"
-                                    v-bind="tableColumnComponents[col.name].props(props)"
-                                    @click="tableColumnComponents[col.name].event(props)"
+                                    :is="tableColumnComponents[col?.name].component()"
+                                    v-bind="tableColumnComponents[col?.name].props()"
+                                    @click="tableColumnComponents[col?.name].event()"
                                     class="col-content"
                                 >
                                     <template
                                         v-if="
-                                            col.name !== 'observation' &&
-                                            col.name !== 'isConfirmed'
+                                            col?.name !== 'observation' &&
+                                            col?.name !== 'isConfirmed'
                                         "
                                         >{{ col.value }}</template
                                     >

src/pages/Entry/EntryLatestBuys.vue

@@ -1,16 +1,17 @@
 <script setup>
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 import { useStateStore } from 'stores/useStateStore';
+import { toDate } from 'src/filters';
+
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
+
 const stateStore = useStateStore();
 const { t } = useI18n();
-import { toDate } from 'src/filters';
-import VnImg from 'src/components/ui/VnImg.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
 const columns = [
     {
         align: 'center',

src/pages/Entry/EntryLatestBuysFilter.vue

@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
@@ -18,6 +19,7 @@ defineProps({
 
 const itemTypeWorkersOptions = ref([]);
 const suppliersOptions = ref([]);
+const tagValues = ref([]);
 </script>
 
 <template>

src/pages/Entry/EntryStockBought.vue

@@ -0,0 +1,293 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useState } from 'src/composables/useState';
+import { useQuasar } from 'quasar';
+
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import FetchData from 'components/FetchData.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import EntryStockBoughtFilter from './EntryStockBoughtFilter.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
+
+const { t } = useI18n();
+const quasar = useQuasar();
+const state = useState();
+const user = state.getUser();
+const columns = [
+    {
+        align: 'left',
+        label: 'Id',
+        name: 'id',
+        isId: true,
+        columnFilter: false,
+        visible: false,
+    },
+    {
+        align: 'left',
+        name: 'workerFk',
+        label: t('Buyer'),
+        isTitle: true,
+        component: 'select',
+        cardVisible: true,
+        create: true,
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'buyer' },
+            optionFilter: 'firstName',
+            optionLabel: 'name',
+            optionValue: 'id',
+            useLike: false,
+        },
+    },
+    {
+        align: 'left',
+        label: t('Reserve'),
+        name: 'reserve',
+        columnFilter: false,
+        create: true,
+        component: 'number',
+        summation: true,
+    },
+    {
+        align: 'center',
+        label: t('Bought'),
+        name: 'bought',
+        summation: true,
+        cardVisible: true,
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Date'),
+        name: 'dated',
+        component: 'date',
+        visible: false,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('More'),
+                icon: 'search',
+                isPrimary: true,
+                action: (row) => {
+                    quasar.dialog({
+                        component: EntryStockBoughtDetail,
+                        componentProps: {
+                            workerFk: row.workerFk,
+                            dated: userParams.value.dated,
+                        },
+                    });
+                },
+            },
+        ],
+    },
+];
+
+const fetchDataRef = ref();
+const travelDialogRef = ref(false);
+const tableRef = ref();
+const travel = ref(null);
+const userParams = ref({
+    dated: Date.vnNew(),
+});
+
+const filter = ref({
+    fields: ['id', 'm3', 'warehouseInFk'],
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                fields: ['code'],
+            },
+        },
+    ],
+    where: {
+        shipped: (userParams.value.dated
+            ? new Date(userParams.value.dated)
+            : Date.vnNew()
+        ).setHours(0, 0, 0, 0),
+        m3: { neq: null },
+    },
+});
+
+const setUserParams = async ({ dated }) => {
+    const shipped = (dated ? new Date(dated) : Date.vnNew()).setHours(0, 0, 0, 0);
+    filter.value.where.shipped = shipped;
+    fetchDataRef.value?.fetch();
+};
+
+function openDialog() {
+    travelDialogRef.value = true;
+}
+
+function setFooter(data) {
+    const footer = {
+        bought: 0,
+        reserve: 0,
+    };
+    data.forEach((row) => {
+        footer.bought += row?.bought;
+        footer.reserve += row?.reserve;
+    });
+    tableRef.value.footer = footer;
+}
+</script>
+<template>
+    <VnSubToolbar>
+        <template #st-data>
+            <FetchData
+                ref="fetchDataRef"
+                url="Travels"
+                auto-load
+                :filter="filter"
+                @on-fetch="
+                    (data) => {
+                        travel = data.find((data) => data.warehouseIn.code === 'VNH');
+                    }
+                "
+            />
+            <VnRow class="travel">
+                <div v-if="travel">
+                    <span style="color: var(--vn-label-color)">
+                        {{ t('Booked trucks') }}:
+                    </span>
+                    <span>
+                        {{ travel?.m3 }}
+                    </span>
+                    <QBtn
+                        v-if="travel?.m3"
+                        style="max-width: 20%"
+                        flat
+                        icon="edit"
+                        @click="openDialog()"
+                        :title="t('Edit travel')"
+                        color="primary"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </VnSubToolbar>
+    <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
+        <FormModelPopup
+            :url-update="`Travels/${travel?.id}`"
+            model="travel"
+            :title="t('Travel m3')"
+            :form-initial-data="{ id: travel?.id, m3: travel?.m3 }"
+            @on-data-saved="fetchDataRef.fetch()"
+        >
+            <template #form-inputs="{ data }">
+                <VnInput
+                    v-model="data.id"
+                    :label="t('id')"
+                    type="number"
+                    disable
+                    readonly
+                />
+                <VnInput v-model="data.m3" :label="t('m3')" type="number" />
+            </template>
+        </FormModelPopup>
+    </QDialog>
+    <RightMenu>
+        <template #right-panel>
+            <EntryStockBoughtFilter
+                data-key="StockBoughts"
+                @set-user-params="setUserParams"
+            />
+        </template>
+    </RightMenu>
+    <div class="table-container">
+        <QPage class="column items-center q-pa-md">
+            <VnTable
+                ref="tableRef"
+                data-key="StockBoughts"
+                url="StockBoughts/getStockBought"
+                save-url="StockBoughts/crud"
+                order="reserve DESC"
+                :right-search="false"
+                :is-editable="true"
+                @on-fetch="(data) => setFooter(data)"
+                :create="{
+                    urlCreate: 'StockBoughts',
+                    title: t('Reserve some space'),
+                    onDataSaved: () => tableRef.reload(),
+                    formInitialData: {
+                        workerFk: user.id,
+                        dated: Date.vnNow(),
+                    },
+                }"
+                :columns="columns"
+                :user-params="userParams"
+                :footer="true"
+                auto-load
+            >
+                <template #column-workerFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.worker?.user?.name }}
+                        <WorkerDescriptorProxy :id="row?.workerFk" />
+                    </span>
+                </template>
+                <template #column-bought="{ row }">
+                    <span :class="{ 'text-negative': row.reserve < row.bought }">
+                        {{ row?.bought }}
+                    </span>
+                </template>
+                <template #column-footer-reserve>
+                    <span>
+                        {{ tableRef.footer.reserve }}
+                    </span>
+                </template>
+                <template #column-footer-bought>
+                    <span
+                        :class="{
+                            'text-negative':
+                                tableRef.footer.reserve < tableRef.footer.bought,
+                        }"
+                    >
+                        {{ tableRef.footer.bought }}
+                    </span>
+                </template>
+            </VnTable>
+        </QPage>
+    </div>
+</template>
+<style lang="scss" scoped>
+.travel {
+    margin-bottom: 0px;
+}
+.table-container {
+    display: flex;
+    justify-content: center;
+}
+.column {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 40%;
+}
+.text-negative {
+    color: $negative !important;
+}
+</style>
+<i18n>
+    es:
+        Edit travel: Editar envío
+        Travel: Envíos
+        Booked trucks: Camiones reservados
+        Buyer: Comprador
+        Reserve: Reservado
+        Bought: Comprado
+        More: Más
+        Date: Fecha
+        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>

src/pages/Entry/EntryStockBoughtDetail.vue

@@ -0,0 +1,129 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnTable from 'components/VnTable/VnTable.vue';
+import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+
+const { t } = useI18n();
+const tableRef = ref();
+const $props = defineProps({
+    workerFk: {
+        type: Number,
+        required: true,
+    },
+    dated: {
+        type: Date,
+        required: true,
+    },
+});
+const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
+const columns = [
+    {
+        align: 'left',
+        label: t('Entry'),
+        name: 'entryFk',
+        isTitle: true,
+        isId: true,
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'itemFk',
+        label: t('Item'),
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Name'),
+        name: 'itemName',
+        create: true,
+        columnClass: 'expand',
+        columnFilter: false,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'volume',
+        label: t('Volume'),
+        columnFilter: false,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('Packaging'),
+        name: 'packagingFk',
+        columnFilter: false,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: 'Packing',
+        name: 'packing',
+        columnFilter: false,
+        cardVisible: true,
+    },
+];
+</script>
+<template>
+    <QDialog>
+        <div class="container">
+            <VnTable
+                ref="tableRef"
+                data-key="StockBoughtsDetail"
+                :url="customUrl"
+                order="itemName DESC"
+                :columns="columns"
+                :right-search="false"
+                :disable-infinite-scroll="true"
+                :limit="0"
+                auto-load
+            >
+                <template #top-left>
+                    <QBtn
+                        flat
+                        icon="Close"
+                        color="primary"
+                        class="bg-vn-section-color q-pa-xs"
+                        v-close-popup
+                    />
+                </template>
+                <template #column-entryFk="{ row }">
+                    <span class="link">
+                        {{ row?.entryFk }}
+                        <EntryDescriptorProxy :id="row.entryFk" />
+                    </span>
+                </template>
+                <template #column-itemName="{ row }">
+                    <span class="link">
+                        {{ row?.itemName }}
+                        <ItemDescriptorProxy :id="row.itemFk" />
+                    </span>
+                </template>
+            </VnTable>
+        </div>
+    </QDialog>
+</template>
+<style lang="css" scoped>
+.container {
+    max-width: 50vw;
+    overflow: auto;
+    justify-content: center;
+    align-items: center;
+    margin: auto;
+}
+</style>
+<i18n>
+    es:
+        Buyer: Comprador
+        Reserve: Reservado
+        Bought: Comprado
+        More: Más
+        Date: Fecha
+        Entry: Entrada
+        Item: Artículo
+        Name: Nombre
+        Volume: Volumen
+        Packaging: Embalage 
+</i18n>

src/pages/Entry/EntryStockBoughtFilter.vue

@@ -0,0 +1,63 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { onMounted } from 'vue';
+import { useStateStore } from 'stores/useStateStore';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+const stateStore = useStateStore();
+const emit = defineEmits(['set-user-params']);
+const setUserParams = (params) => {
+    emit('set-user-params', params);
+};
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+</script>
+
+<template>
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        search-url="table"
+        @set-user-params="setUserParams"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate
+                        id="date"
+                        v-model="params.dated"
+                        :label="t('Date')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+<i18n>
+    en:
+        params:
+            dated: Date
+            workerFk: Worker
+    es:
+        Date: Fecha
+        params:
+            dated: Date
+            workerFk: Trabajador
+</i18n>

src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

@@ -281,6 +281,7 @@ async function onSubmit() {
                             v-else
                             icon="add_circle"
                             round
+                            shortcut="+"
                             padding="xs"
                             @click="setCreateDms()"
                         >

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
@@ -24,7 +24,7 @@ const $props = defineProps({ id: { type: Number, default: null } });
 const { push, currentRoute } = useRouter();
 
 const quasar = useQuasar();
-const { hasAny } = useRole();
+const { hasAny } = useAcl();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const arrayData = useArrayData();
@@ -195,7 +195,8 @@ async function cloneInvoice() {
     push({ path: `/invoice-in/${data.id}/summary` });
 }
 
-const isAdministrative = () => hasAny(['administrative']);
+const canEditProp = (props) =>
+    hasAny([{ model: 'InvoiceIn', props, accessType: 'WRITE' }]);
 
 const isAgricultural = () => {
     if (!config.value) return false;
@@ -283,7 +284,7 @@ const createInvoiceInCorrection = async () => {
             <InvoiceInToBook>
                 <template #content="{ book }">
                     <QItem
-                        v-if="!entity?.isBooked && isAdministrative()"
+                        v-if="!entity?.isBooked && canEditProp('toBook')"
                         v-ripple
                         clickable
                         @click="book(entityId)"
@@ -293,7 +294,7 @@ const createInvoiceInCorrection = async () => {
                 </template>
             </InvoiceInToBook>
             <QItem
-                v-if="entity?.isBooked && isAdministrative()"
+                v-if="entity?.isBooked && canEditProp('toUnbook')"
                 v-ripple
                 clickable
                 @click="triggerMenu('unbook')"
@@ -303,7 +304,7 @@ const createInvoiceInCorrection = async () => {
                 </QItemSection>
             </QItem>
             <QItem
-                v-if="isAdministrative()"
+                v-if="canEditProp('deleteById')"
                 v-ripple
                 clickable
                 @click="triggerMenu('delete')"
@@ -311,7 +312,7 @@ const createInvoiceInCorrection = async () => {
                 <QItemSection>{{ t('Delete invoice') }}</QItemSection>
             </QItem>
             <QItem
-                v-if="isAdministrative()"
+                v-if="canEditProp('clone')"
                 v-ripple
                 clickable
                 @click="triggerMenu('clone')"

src/pages/InvoiceIn/Card/InvoiceInDueDay.vue

@@ -230,7 +230,7 @@ async function insert() {
         </template>
     </CrudModel>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn color="primary" icon="add" size="lg" round @click="insert" />
+        <QBtn color="primary" icon="add" shortcut="+" size="lg" round @click="insert" />
     </QPageSticky>
 </template>
 <style lang="scss" scoped>

src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue

@@ -224,6 +224,7 @@ const formatOpt = (row, { model, options }, prop) => {
         <QBtn
             color="primary"
             icon="add"
+            shortcut="+"
             size="lg"
             round
             @click="invoiceInFormRef.insert()"

src/pages/InvoiceIn/Card/InvoiceInVat.vue

@@ -405,6 +405,7 @@ const formatOpt = (row, { model, options }, prop) => {
             color="primary"
             icon="add"
             size="lg"
+            shortcut="+"
             round
             @click="invoiceInFormRef.insert()"
         >

src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue

@@ -41,8 +41,7 @@ const invoiceFormType = ref('pdf');
 const defaultEmailAddress = ref($props.invoiceOutData.client?.email);
 
 const showInvoicePdf = () => {
-    const url = `api/InvoiceOuts/${$props.invoiceOutData.id}/download?access_token=${token}`;
-    window.open(url, '_blank');
+    openReport(`InvoiceOuts/${$props.invoiceOutData.id}/download`, {}, '_blank');
 };
 
 const showInvoiceCsv = () => {

src/pages/Item/Card/ItemBarcode.vue

@@ -65,17 +65,18 @@ const focusLastInput = () => {
                                 </QTooltip>
                             </QIcon>
                         </div>
-                        <QIcon
+                        <QBtn
                             @click="insertRow()"
                             class="cursor-pointer fill-icon-on-hover"
                             color="primary"
-                            name="add_circle"
-                            size="sm"
+                            icon="add_circle"
+                            shortcut="+"
+                            flat
                         >
                             <QTooltip>
                                 {{ t('Add barcode') }}
                             </QTooltip>
-                        </QIcon>
+                        </QBtn>
                     </QCard>
                 </template>
             </CrudModel>

src/pages/Item/Card/ItemSummary.vue

@@ -7,8 +7,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
-
-import { useRole } from 'src/composables/useRole';
+import VnTitle from 'src/components/common/VnTitle.vue';
 
 const $props = defineProps({
     id: {
@@ -19,23 +18,10 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const roleState = useRole();
 
 const entityId = computed(() => $props.id || route.params.id);
-
-const isBuyer = computed(() => {
-    return roleState.hasAny(['buyer']);
-});
-
-const isReplenisher = computed(() => {
-    return roleState.hasAny(['replenisher']);
-});
-
-const isAdministrative = computed(() => {
-    return roleState.hasAny(['administrative']);
-});
+const getUrl = (id, param) => `#/Item/${id}/${param}`;
 </script>
-
 <template>
     <CardSummary
         ref="summary"
@@ -44,13 +30,15 @@ const isAdministrative = computed(() => {
         data-key="ItemSummary"
     >
         <template #header-left>
-            <router-link
-                v-if="route.name !== 'ItemSummary'"
+            <QBtn
+                v-if="$route.name !== 'ItemSummary'"
                 :to="{ name: 'ItemSummary', params: { id: entityId } }"
-                class="header link"
-            >
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </router-link>
+                class="header link--white"
+                icon="open_in_new"
+                flat
+                dense
+                round
+            />
         </template>
         <template #header="{ entity: { item } }">
             {{ item.id }} - {{ item.name }}
@@ -65,15 +53,10 @@ const isAdministrative = computed(() => {
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="isBuyer ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': isBuyer }"
-                >
-                    {{ t('item.summary.basicData') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="getUrl(entityId, 'basic-data')"
+                    :text="t('item.summary.basicData')"
+                />
                 <VnLv :label="t('item.summary.name')" :value="item.name" />
                 <VnLv :label="t('item.summary.completeName')" :value="item.longName" />
                 <VnLv :label="t('item.summary.family')" :value="item.itemType.name" />
@@ -104,15 +87,10 @@ const isAdministrative = computed(() => {
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="isBuyer ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': isBuyer }"
-                >
-                    {{ t('item.summary.otherData') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="getUrl(entityId, 'basic-data')"
+                    :text="t('item.summary.otherData')"
+                />
                 <VnLv
                     :label="t('item.summary.intrastatCode')"
                     :value="item.intrastat.id"
@@ -137,15 +115,7 @@ const isAdministrative = computed(() => {
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="isBuyer || isReplenisher ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemTags', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': isBuyer || isReplenisher }"
-                >
-                    {{ t('item.summary.tags') }}
-                    <QIcon v-if="isBuyer || isReplenisher" name="open_in_new" />
-                </component>
+                <VnTitle :url="getUrl(entityId, 'tags')" :text="t('item.summary.tags')" />
                 <VnLv
                     v-for="(tag, index) in tags"
                     :key="index"
@@ -154,29 +124,14 @@ const isAdministrative = computed(() => {
                 />
             </QCard>
             <QCard class="vn-one" v-if="item.description">
-                <component
-                    :is="isBuyer ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': isBuyer }"
-                >
-                    {{ t('item.summary.description') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
-                </component>
-                <p>
-                    {{ item.description }}
-                </p>
+                <VnTitle
+                    :url="getUrl(entityId, 'basic-data')"
+                    :text="t('item.summary.description')"
+                />
+                <p v-text="item.description" />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="isBuyer || isAdministrative ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemTax', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': isBuyer || isAdministrative }"
-                >
-                    {{ t('item.summary.tax') }}
-                    <QIcon v-if="isBuyer || isAdministrative" name="open_in_new" />
-                </component>
+                <VnTitle :url="getUrl(entityId, 'tax')" :text="t('item.summary.tax')" />
                 <VnLv
                     v-for="(tax, index) in item.taxes"
                     :key="index"
@@ -185,15 +140,10 @@ const isAdministrative = computed(() => {
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="isBuyer ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBotanical', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': isBuyer }"
-                >
-                    {{ t('item.summary.botanical') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="getUrl(entityId, 'botanical')"
+                    :text="t('item.summary.botanical')"
+                />
                 <VnLv :label="t('item.summary.genus')" :value="botanical?.genus?.name" />
                 <VnLv
                     :label="t('item.summary.specie')"
@@ -201,23 +151,19 @@ const isAdministrative = computed(() => {
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="isBuyer || isReplenisher ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBarcode', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': isBuyer || isReplenisher }"
-                >
-                    {{ t('item.summary.barcode') }}
-                    <QIcon v-if="isBuyer || isReplenisher" name="open_in_new" />
-                </component>
-                <p v-for="(barcode, index) in item.itemBarcode" :key="index">
-                    {{ barcode.code }}
-                </p>
+                <VnTitle
+                    :url="getUrl(entityId, 'barcode')"
+                    :text="t('item.summary.barcode')"
+                />
+                <p
+                    v-for="(barcode, index) in item.itemBarcode"
+                    :key="index"
+                    v-text="barcode.code"
+                />
             </QCard>
         </template>
     </CardSummary>
 </template>
-
 <i18n>
 en:
     Este artículo necesita una foto: Este artículo necesita una foto

src/pages/Item/Card/ItemTags.vue

@@ -168,19 +168,20 @@ const insertTag = (rows) => {
                             </div>
                         </VnRow>
                         <VnRow class="justify-center items-center">
-                            <QIcon
+                            <QBtn
                                 @click="insertTag(rows)"
                                 class="cursor-pointer"
                                 :disable="!validRow"
                                 color="primary"
-                                name="add"
-                                size="sm"
+                                flat
+                                icon="add"
+                                shortcut="+"
                                 style="flex: 0"
                             >
                                 <QTooltip>
                                     {{ t('itemTags.addTag') }}
                                 </QTooltip>
-                            </QIcon>
+                            </QBtn>
                         </VnRow>
                     </QCard>
                 </template>

src/pages/Item/ItemFixedPrice.vue

@@ -76,16 +76,8 @@ const columns = computed(() => [
         name: 'rate2',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
     {
         label: t('item.fixedPrice.packingPrice'),
@@ -93,35 +85,18 @@ const columns = computed(() => [
         name: 'rate3',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
 
     {
         label: t('item.fixedPrice.minPrice'),
         field: 'minPrice',
-        columnClass: 'shrink',
         name: 'minPrice',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
     {
         label: t('item.fixedPrice.started'),
@@ -162,16 +137,9 @@ const columns = computed(() => [
         name: 'warehouseFk',
         ...defaultColumnAttrs,
         columnClass: 'shrink',
-        columnFilter: {
-            component: 'select',
-        },
-        columnField: {
-            component: 'select',
-            class: 'expand',
-        },
-        attrs: {
-            options: warehousesOptions,
-        },
+        component: 'select',
+
+        options: warehousesOptions,
     },
     {
         align: 'right',
@@ -518,29 +486,35 @@ function handleOnDataSave({ CrudModelRef }) {
                 </span>
                 <span class="subName">{{ row.subName }}</span>
                 <ItemDescriptorProxy :id="row.itemFk" />
-                <FetchedTags style="width: max-content; max-width: 220px" :item="row" />
+                <FetchedTags :item="row" />
             </template>
             <template #column-rate2="props">
-                <VnInput
-                    mask="###.##"
-                    v-model.number="props.row.rate2"
-                    v-on="getRowUpdateInputEvents(props)"
-                >
-                    <template #append>€</template>
-                </VnInput>
+                <QTd class="col">
+                    <VnInput
+                        type="currency"
+                        style="width: 75px"
+                        v-model.number="props.row.rate2"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
             </template>
             <template #column-rate3="props">
-                <VnInput
-                    mask="###.##"
-                    v-model.number="props.row.rate3"
-                    v-on="getRowUpdateInputEvents(props)"
-                >
-                    <template #append>€</template>
-                </VnInput>
+                <QTd class="col">
+                    <VnInput
+                        style="width: 75px"
+                        type="currency"
+                        v-model.number="props.row.rate3"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
             </template>
             <template #column-minPrice="props">
                 <QTd class="col">
-                    <div class="row" style="width: 115px">
+                    <div class="row">
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
@@ -549,6 +523,8 @@ function handleOnDataSave({ CrudModelRef }) {
                         />
                         <VnInput
                             class="col"
+                            type="currency"
+                            mask="###.##"
                             :disable="props.row.hasMinPrice === 1"
                             v-model.number="props.row.minPrice"
                             v-on="getRowUpdateInputEvents(props)"
@@ -577,15 +553,17 @@ function handleOnDataSave({ CrudModelRef }) {
                 />
             </template>
             <template #column-warehouseFk="props">
-                <VnSelect
-                    style="max-width: 150px"
-                    :options="warehousesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="props.row.warehouseFk"
-                    v-on="getRowUpdateInputEvents(props, false, 'select')"
-                />
+                <QTd class="col">
+                    <VnSelect
+                        style="max-width: 150px"
+                        :options="warehousesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="props.row.warehouseFk"
+                        v-on="getRowUpdateInputEvents(props, false, 'select')"
+                    />
+                </QTd>
             </template>
             <template #column-deleteAction="{ row, rowIndex }">
                 <QIcon

src/pages/Item/ItemRequestFilter.vue

@@ -212,6 +212,7 @@ const decrement = (paramsObj, key) => {
                                     flat
                                     dense
                                     size="12px"
+                                    shortcut="+"
                                     @click="add(params, 'scopeDays')"
                                 />
                                 <QBtn

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -374,8 +374,10 @@ function addOrder(value, field, params) {
                 />
             </QItem>
             <QItem class="q-mt-lg">
-                <QIcon
-                    name="add_circle"
+                <QBtn
+                    icon="add_circle"
+                    shortcut="+"
+                    flat
                     class="filter-icon"
                     @click="tagValues.push({})"
                 />

src/pages/Order/Card/OrderCreateDialog.vue

@@ -0,0 +1,220 @@
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import { onMounted, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import { useState } from 'composables/useState';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import { useDialogPluginComponent } from 'quasar';
+import { reactive } from 'vue';
+import FetchData from 'components/FetchData.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const state = useState();
+const ORDER_MODEL = 'order';
+
+const router = useRouter();
+const clientList = ref([]);
+const agencyList = ref([]);
+const addressList = ref([]);
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+
+const fetchAddressList = async (addressId) => {
+    try {
+        const { data } = await axios.get('addresses', {
+            params: {
+                filter: JSON.stringify({
+                    fields: ['id', 'nickname', 'street', 'city'],
+                    where: { id: addressId },
+                }),
+            },
+        });
+        addressList.value = data;
+        if (addressList.value?.length === 1) {
+            state.get(ORDER_MODEL).addressId = addressList.value[0].id;
+        }
+    } catch (err) {
+        console.error(`Error fetching addresses`, err);
+        return err.response;
+    }
+};
+
+const fetchAgencyList = async (landed, addressFk) => {
+    if (!landed || !addressFk) {
+        return;
+    }
+    try {
+        const { data } = await axios.get('Agencies/landsThatDay', {
+            params: {
+                addressFk,
+                landed: new Date(landed).toISOString(),
+            },
+        });
+        agencyList.value = data;
+    } catch (err) {
+        console.error(`Error fetching agencies`, err);
+        return err.response;
+    }
+};
+
+// const fetchOrderDetails = (order) => {
+//     fetchAddressList(order?.addressFk);
+//     fetchAgencyList(order?.landed, order?.addressFk);
+// };
+const $props = defineProps({
+    clientFk: {
+        type: Number,
+        default: null,
+    },
+});
+const initialFormState = reactive({
+    active: true,
+    addressId: null,
+    clientFk: $props.clientFk,
+});
+// const orderMapper = (order) => {
+//     return {
+//         addressId: order.addressFk,
+//         agencyModeId: order.agencyModeFk,
+//         landed: new Date(order.landed).toISOString(),
+//     };
+// };
+// const orderFilter = {
+//     include: [
+//         { relation: 'agencyMode', scope: { fields: ['name'] } },
+//         {
+//             relation: 'address',
+//             scope: { fields: ['nickname'] },
+//         },
+//         { relation: 'rows', scope: { fields: ['id'] } },
+//         {
+//             relation: 'client',
+//             scope: {
+//                 fields: [
+//                     'salesPersonFk',
+//                     'name',
+//                     'isActive',
+//                     'isFreezed',
+//                     'isTaxDataChecked',
+//                 ],
+//                 include: {
+//                     relation: 'salesPersonUser',
+//                     scope: { fields: ['id', 'name'] },
+//                 },
+//             },
+//         },
+//     ],
+// };
+
+const onClientChange = async (clientId = $props.clientFk) => {
+    try {
+        const { data } = await axios.get(`Clients/${clientId}`);
+        await fetchAddressList(data.defaultAddressFk);
+    } catch (error) {
+        console.error('Error al cambiar el cliente:', error);
+    }
+};
+
+async function onDataSaved(_, id) {
+    await router.push({ path: `/order/${id}/catalog` });
+}
+onMounted(async () => {
+    await onClientChange();
+});
+</script>
+
+<template>
+    <FetchData
+        url="addresses"
+        @on-fetch="(data) => (clientOptions = data)"
+        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
+        auto-load
+    />
+    <FormModelPopup
+        url-create="Orders/new"
+        :title="t('Create Order')"
+        @on-data-saved="onDataSaved"
+        :model="ORDER_MODEL"
+        :filter="orderFilter"
+        :form-initial-data="initialFormState"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    url="Clients"
+                    :label="t('order.form.clientFk')"
+                    v-model="data.clientFk"
+                    option-value="id"
+                    option-label="name"
+                    :filter="{
+                        fields: ['id', 'name', 'defaultAddressFk'],
+                    }"
+                    hide-selected
+                    @update:model-value="onClientChange"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelect
+                    :label="t('order.form.addressFk')"
+                    v-model="data.addressId"
+                    :options="addressList"
+                    option-value="id"
+                    option-label="street"
+                    hide-selected
+                    :disable="!addressList?.length"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{
+                                        `${scope.opt.nickname}: ${scope.opt.street},${scope.opt.city}`
+                                    }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInputDate
+                    placeholder="dd-mm-aaa"
+                    :label="t('order.form.landed')"
+                    v-model="data.landed"
+                    @update:model-value="
+                        () => fetchAgencyList(data.landed, data.addressId)
+                    "
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    :label="t('order.form.agencyModeFk')"
+                    v-model="data.agencyModeId"
+                    :options="agencyList"
+                    option-value="agencyModeFk"
+                    option-label="agencyMode"
+                    hide-selected
+                    :disable="!agencyList?.length"
+                >
+                </VnSelect>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+    es:
+        No default address found for the client: No hay ninguna dirección asociada a este cliente.
+</i18n>

src/pages/Route/Agency/Card/AgencyWorkcenter.vue

@@ -88,7 +88,7 @@ async function deleteWorCenter(id) {
         </VnPaginate>
     </div>
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="dialog.show()" color="primary" fab icon="add">
+        <QBtn @click.stop="dialog.show()" color="primary" fab shortcut="+" icon="add">
             <QDialog ref="dialog">
                 <FormModelPopup
                     :title="t('Add work center')"

src/pages/Route/Card/RouteSearchbar.vue

@@ -3,7 +3,6 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { useI18n } from 'vue-i18n';
 const { t } = useI18n();
 </script>
-
 <template>
     <VnSearchbar
         data-key="RouteList"

src/pages/Route/Roadmap/RoadmapBasicData.vue

@@ -103,8 +103,8 @@ es:
     Roadmap: Troncal
     ETD date: Fecha ETD
     ETD hour: Hora ETD
-    Tractor plate: Matrícula tractor
-    Trailer plate: Matrícula trailer
+    Tractor plate: Matrícula tractora
+    Trailer plate: Matrícula remolque
     Carrier: Transportista
     Price: Precio
     Driver name: Nombre del conductor