Merge branch 'master' into 7524-hotfix-removeFetchData

src/composables/useCau.js

@@ -11,6 +11,7 @@ export async function useCau(res, message) {
     const { config, headers, request, status, statusText, data } = res || {};
     const { params, url, method, signal, headers: confHeaders } = config || {};
     const { message: resMessage, code, name } = data?.error || {};
+    delete confHeaders.Authorization;
 
     const additionalData = {
         path: location.hash,
@@ -40,7 +41,7 @@ export async function useCau(res, message) {
                 handler: async () => {
                     const locale = i18n.global.t;
                     const reason = ref(
-                        code == 'ACCESS_DENIED' ? locale('cau.askPrivileges') : ''
+                        code == 'ACCESS_DENIED' ? locale('cau.askPrivileges') : '',
                     );
                     openConfirmationModal(
                         locale('cau.title'),
@@ -59,10 +60,9 @@ export async function useCau(res, message) {
                                 'onUpdate:modelValue': (val) => (reason.value = val),
                                 label: locale('cau.inputLabel'),
                                 class: 'full-width',
-                                required: true,
                                 autofocus: true,
                             },
-                        }
+                        },
                     );
                 },
             },

src/pages/Account/Card/AccountDescriptorMenu.vue

@@ -34,6 +34,12 @@ account.value.hasAccount = hasAccount.value;
 const entityId = computed(() => +route.params.id);
 const hasitManagementAccess = ref();
 const hasSysadminAccess = ref();
+const isHimself = computed(() => user.value.id === account.value.id);
+const url = computed(() =>
+    isHimself.value
+        ? 'Accounts/change-password'
+        : `Accounts/${entityId.value}/setPassword`
+);
 
 async function updateStatusAccount(active) {
     if (active) {
@@ -106,11 +112,8 @@ onMounted(() => {
         :ask-old-pass="askOldPass"
         :submit-fn="
             async (newPassword, oldPassword) => {
-                await axios.patch(`Accounts/change-password`, {
-                    userId: entityId,
-                    newPassword,
-                    oldPassword,
-                });
+                const body = isHimself ? { userId: entityId, oldPassword } : {};
+                await axios.patch(url, { ...body, newPassword });
             }
         "
     />
@@ -158,16 +161,10 @@ onMounted(() => {
     >
         <QItemSection>{{ t('globals.delete') }}</QItemSection>
     </QItem>
-    <QItem
-        v-if="hasSysadminAccess"
-        v-ripple
-        clickable
-        @click="user.id === account.id ? onChangePass(true) : onChangePass(false)"
-    >
-        <QItemSection v-if="user.id === account.id">
-            {{ t('globals.changePass') }}
+    <QItem v-if="hasSysadminAccess || isHimself" v-ripple clickable>
+        <QItemSection @click="onChangePass(isHimself)">
+            {{ isHimself ? t('globals.changePass') : t('globals.setPass') }}
         </QItemSection>
-        <QItemSection v-else>{{ t('globals.setPass') }}</QItemSection>
     </QItem>
     <QItem
         v-if="!account.hasAccount && hasSysadminAccess"

src/pages/Claim/Card/ClaimLines.vue

@@ -57,7 +57,6 @@ function onFetch(rows, newRows) {
         const price = row.quantity * sale.price;
         const discount = (sale.discount * price) / 100;
         amountClaimed.value = amountClaimed.value + (price - discount);
-
     }
 }
 
@@ -191,7 +190,7 @@ async function saveWhenHasChanges() {
             ref="claimLinesForm"
             :url="`Claims/${route.params.id}/lines`"
             save-url="ClaimBeginnings/crud"
-            :filter="linesFilter"
+            :user-filter="linesFilter"
             @on-fetch="onFetch"
             v-model:selected="selected"
             :default-save="false"
@@ -208,7 +207,6 @@ async function saveWhenHasChanges() {
                     selection="multiple"
                     v-model:selected="selected"
                     :grid="$q.screen.lt.md"
-                    
                 >
                     <template #body-cell-claimed="{ row }">
                         <QTd auto-width align="right" class="text-primary shrink">
@@ -330,9 +328,10 @@ async function saveWhenHasChanges() {
     width: 100%;
 }
 .grid-style-transition {
-    transition: transform 0.28s, background-color 0.28s;
+    transition:
+        transform 0.28s,
+        background-color 0.28s;
 }
-
 </style>
 
 <i18n>

src/pages/Customer/Card/CustomerAddress.vue

@@ -117,7 +117,7 @@ const toCustomerAddressEdit = (addressId) => {
         data-key="CustomerAddresses"
         order="id DESC"
         ref="vnPaginateRef"
-        :user-filter="addressFilter"
+        :filter="addressFilter"
         :url="`Clients/${route.params.id}/addresses`"
     />
     <div class="full-width flex justify-center">
@@ -189,11 +189,11 @@ const toCustomerAddressEdit = (addressId) => {
 
                     <QSeparator
                         class="q-mx-lg"
-                        v-if="item.observations.length"
+                        v-if="item?.observations?.length"
                         vertical
                     />
 
-                    <div v-if="item.observations.length">
+                    <div v-if="item?.observations?.length">
                         <div
                             :key="obIndex"
                             class="flex q-mb-sm"

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -9,6 +9,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 VnLocation from 'src/components/common/VnLocation.vue';
+import { getDifferences, getUpdatedValues } from 'src/filters';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -23,6 +24,12 @@ function handleLocation(data, location) {
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
+function onBeforeSave(formData, originalData) {
+    return getUpdatedValues(
+        Object.keys(getDifferences(formData, originalData)),
+        formData,
+    );
+}
 </script>
 
 <template>
@@ -36,6 +43,7 @@ function handleLocation(data, location) {
         :url-update="`Clients/${route.params.id}/updateFiscalData`"
         auto-load
         model="customer"
+        :mapper="onBeforeSave"
     >
         <template #form="{ data, validate }">
             <VnRow>

src/pages/Department/Card/DepartmentSummary.vue

@@ -31,20 +31,18 @@ onMounted(async () => {
         ref="summary"
         :url="`Departments/${entityId}`"
         class="full-width"
-        style="max-width: 900px"
-        module-name="Department"
     >
         <template #header="{ entity }">
             <div>{{ entity.name }}</div>
         </template>
         <template #body="{ entity: department }">
-            <QCard class="column">
+            <QCard class="vn-one">
                 <VnTitle
                     :url="`#/worker/department/${entityId}/basic-data`"
                     :text="t('Basic data')"
                 />
                 <div class="full-width row wrap justify-between content-between">
-                    <div class="column" style="min-width: 50%">
+                    <div class="column">
                         <VnLv :label="t('globals.name')" :value="department.name" dash />
                         <VnLv :label="t('globals.code')" :value="department.code" dash />
                         <VnLv

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -96,12 +96,19 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'companyCode',
+        name: 'companyFk',
         label: t('globals.company'),
         cardVisible: true,
         component: 'select',
-        attrs: { url: 'Companies', optionLabel: 'code', optionValue: 'id' },
-        columnField: { component: null },
+        attrs: {
+            url: 'Companies',
+            optionLabel: 'code',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.companyCode),
     },
     {
         align: 'left',

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -61,6 +61,7 @@ function exprBuilder(param, value) {
         case 'nickname':
             return { [`t.nickname`]: { like: `%${value}%` } };
         case 'zoneFk':
+            return { 't.zoneFk': value };
         case 'department':
             return { 'd.name': value };
         case 'totalWithVat':

src/pages/Order/Card/OrderCatalogItemDialog.vue

@@ -43,10 +43,9 @@ const addToOrder = async () => {
     );
 
     state.set('orderTotal', orderTotal);
-    const rows = orderData.value.rows.push(...items) || [];
     state.set('orderData', {
         ...orderData.value,
-        rows,
+        items,
     });
     notify(t('globals.dataSaved'), 'positive');
     emit('added', -totalQuantity(items));