Merge branch 'master' into hotfix_itemFixedPrice

src/components/common/VnSelect.vue

@@ -8,7 +8,14 @@ import dataByOrder from 'src/utils/dataByOrder';
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 const $attrs = useAttrs();
 const { t } = useI18n();
-const { isRequired, requiredFieldRule } = useRequired($attrs);
+
+const isRequired = computed(() => {
+    return useRequired($attrs).isRequired;
+});
+const requiredFieldRule = computed(() => {
+    return useRequired($attrs).requiredFieldRule;
+});
+
 const $props = defineProps({
     modelValue: {
         type: [String, Number, Object],

src/components/ui/VnLinkPhone.vue

@@ -1,23 +1,28 @@
 <script setup>
-import { reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
+import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
 import axios from 'axios';
 import { parsePhone } from 'src/filters';
+import useOpenURL from 'src/composables/useOpenURL';
+
 const props = defineProps({
     phoneNumber: { type: [String, Number], default: null },
     channel: { type: Number, default: null },
+    country: { type: String, default: null },
 });
 
+const phone = ref(props.phoneNumber);
 const config = reactive({
     sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
     'say-simple': {
         icon: 'vn:saysimple',
-        href: null,
+        url: null,
         channel: props.channel,
     },
 });
 const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
 
 onBeforeMount(async () => {
+    if (!phone.value) return;
     let { channel } = config[type];
 
     if (type === 'say-simple') {
@@ -25,23 +30,28 @@ onBeforeMount(async () => {
             .data;
         if (!channel) channel = defaultChannel;
 
-        config[type].href = `${url}?customerIdentity=%2B${parsePhone(
-            props.phoneNumber
-        )}&channelId=${channel}`;
+        phone.value = await parsePhone(props.phoneNumber, props.country.toLowerCase());
+        config[
+            type
+        ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
     }
 });
+
+function handleClick() {
+    if (config[type].url) useOpenURL(config[type].url);
+    else if (config[type].href) window.location.href = config[type].href;
+}
 </script>
 <template>
     <QBtn
-        v-if="phoneNumber"
+        v-if="phone"
         flat
         round
         :icon="config[type].icon"
         size="sm"
         color="primary"
         padding="none"
-        :href="config[type].href"
-        @click.stop
+        @click.stop="handleClick"
     >
         <QTooltip>
             {{ capitalize(type).replace('-', '') }}

src/composables/useRequired.js

@@ -2,8 +2,14 @@ import { useValidator } from 'src/composables/useValidator';
 
 export function useRequired($attrs) {
     const { validations } = useValidator();
-
-    const isRequired = Object.keys($attrs).includes('required');
+    const hasRequired = Object.keys($attrs).includes('required');
+    let isRequired = false;
+    if (hasRequired) {
+        const required = $attrs['required'];
+        if (typeof required === 'boolean') {
+            isRequired = required;
+        }
+    }
     const requiredFieldRule = (val) => validations().required(isRequired, val);
 
     return {

src/filters/parsePhone.js

@@ -1,12 +1,18 @@
-export default function (phone, prefix = 34) {
-    if (phone.startsWith('+')) {
-        return `${phone.slice(1)}`;
-    }
-    if (phone.startsWith('00')) {
-        return `${phone.slice(2)}`;
-    }
-    if (phone.startsWith(prefix) && phone.length === prefix.length + 9) {
-        return `${prefix}${phone.slice(prefix.length)}`;
+import axios from 'axios';
+
+export default async function parsePhone(phone, country) {
+    if (!phone) return;
+    if (phone.startsWith('+')) return `${phone.slice(1)}`;
+    if (phone.startsWith('00')) return `${phone.slice(2)}`;
+
+    let prefix;
+    try {
+        prefix = (await axios.get(`Prefixes/${country.toLowerCase()}`)).data?.prefix;
+    } catch (e) {
+        prefix = (await axios.get('PbxConfigs/findOne')).data?.defaultPrefix;
     }
+    prefix = prefix.replace(/^0+/, '');
+
+    if (phone.startsWith(prefix)) return phone;
     return `${prefix}${phone}`;
 }

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -67,6 +67,7 @@ function handleLocation(data, location) {
                     option-label="vat"
                     option-value="id"
                     v-model="data.sageTaxTypeFk"
+                    data-cy="sageTaxTypeFk"
                     :required="data.isTaxDataChecked"
                 />
                 <VnSelect
@@ -75,6 +76,7 @@ function handleLocation(data, location) {
                     hide-selected
                     option-label="transaction"
                     option-value="id"
+                    data-cy="sageTransactionTypeFk"
                     v-model="data.sageTransactionTypeFk"
                     :required="data.isTaxDataChecked"
                 >

src/pages/Customer/Card/CustomerSummary.vue

@@ -94,6 +94,7 @@ const sumRisk = ({ clientRisks }) => {
                             :phone-number="entity.mobile"
                             :channel="entity.country?.saySimpleCountry?.channel"
                             class="q-ml-xs"
+                            :country="entity.country?.code"
                         />
                     </template>
                 </VnLv>

src/pages/Item/Card/ItemTags.vue

@@ -138,6 +138,7 @@ const insertTag = (rows) => {
                                 :required="false"
                                 :rules="validate('itemTag.tagFk')"
                                 :use-like="false"
+                                sort-by="value"
                             />
                             <VnInput
                                 v-else-if="

src/pages/Travel/Card/TravelCard.vue

@@ -7,13 +7,13 @@ import filter from './TravelFilter.js';
     <VnCard
         data-key="Travel"
         base-url="Travels"
-        search-data-key="TravelList"
-        :filter="filter"
         :descriptor="TravelDescriptor"
+        :filter="filter"
+        search-data-key="TravelList"
         :searchbar-props="{
-            url: 'Travels',
+            url: 'Travels/filter',
+            searchUrl: 'table',
             label: 'Search travel',
-            info: 'You can search by travel id or name',
         }"
     />
 </template>

src/pages/Travel/TravelList.vue

@@ -208,6 +208,7 @@ const columns = computed(() => [
         ref="tableRef"
         data-key="TravelList"
         url="Travels/filter"
+        redirect="travel"
         :create="{
             urlCreate: 'Travels',
             title: t('Create Travels'),
@@ -221,9 +222,7 @@ const columns = computed(() => [
         order="landed DESC"
         :columns="columns"
         auto-load
-        redirect="travel"
         :is-editable="false"
-        :use-model="true"
     >
         <template #column-status="{ row }">
             <div class="row">

src/utils/dataByOrder.js

@@ -1,6 +1,7 @@
 function orderData(data, order) {
     if (typeof order === 'function') return data.sort(data);
     if (typeof order === 'string') order = [order];
+    if (!Array.isArray(data)) return [];
     if (Array.isArray(order)) {
         let orderComp = [];
 

test/cypress/integration/client/clientFiscalData.spec.js

@@ -3,11 +3,16 @@ describe('Client fiscal data', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
-        cy.visit('#/customer/1110/fiscal-data', {
+        cy.visit('#/customer/1107/fiscal-data', {
             timeout: 5000,
         });
     });
-    it('Should load layout', () => {
+    it('Should change required value when change customer', () => {
         cy.get('.q-card').should('be.visible');
+        cy.dataCy('sageTaxTypeFk').filter('input').should('not.have.attr', 'required');
+        cy.get('#searchbar input').clear();
+        cy.get('#searchbar input').type('1{enter}');
+        cy.get('.q-item > .q-item__label').should('have.text', ' #1');
+        cy.dataCy('sageTaxTypeFk').filter('input').should('have.attr', 'required');
     });
 });

test/vitest/__tests__/components/common/VnLinkPhone.spec.js

@@ -1,29 +1,50 @@
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, beforeAll, vi } from 'vitest';
+import { axios } from 'app/test/vitest/helper';
 import parsePhone from 'src/filters/parsePhone';
 
 describe('parsePhone filter', () => {
-    it("adds prefix +34 if it doesn't have one", () => {
-        const resultado = parsePhone('123456789', '34');
-        expect(resultado).toBe('34123456789');
+    beforeAll(async () => {
+        vi.spyOn(axios, 'get').mockReturnValue({ data: { prefix: '34' } });
     });
 
-    it('maintains prefix +34 if it is already correct', () => {
-        const resultado = parsePhone('+34123456789', '34');
-        expect(resultado).toBe('34123456789');
+    it('no phone', async () => {
+        const phone = await parsePhone(null, '34');
+        expect(phone).toBe(undefined);
     });
 
-    it('converts prefix 0034 to +34', () => {
-        const resultado = parsePhone('0034123456789', '34');
-        expect(resultado).toBe('34123456789');
+    it("adds prefix +34 if it doesn't have one", async () => {
+        const phone = await parsePhone('123456789', '34');
+        expect(phone).toBe('34123456789');
     });
 
-    it('converts prefix 34 without symbol to +34', () => {
-        const resultado = parsePhone('34123456789', '34');
-        expect(resultado).toBe('34123456789');
+    it('maintains prefix +34 if it is already correct', async () => {
+        const phone = await parsePhone('+34123456789', '34');
+        expect(phone).toBe('34123456789');
     });
 
-    it('replaces incorrect prefix with the correct one', () => {
-        const resultado = parsePhone('+44123456789', '34');
-        expect(resultado).toBe('44123456789');
+    it('converts prefix 0034 to +34', async () => {
+        const phone = await parsePhone('0034123456789', '34');
+        expect(phone).toBe('34123456789');
+    });
+
+    it('converts prefix 34 without symbol to +34', async () => {
+        const phone = await parsePhone('34123456789', '34');
+        expect(phone).toBe('34123456789');
+    });
+
+    it('replaces incorrect prefix with the correct one', async () => {
+        const phone = await parsePhone('+44123456789', '34');
+        expect(phone).toBe('44123456789');
+    });
+
+    it('adds default prefix on error', async () => {
+        vi.spyOn(axios, 'get').mockImplementation((url) => {
+            if (url.includes('Prefixes'))
+                return Promise.reject(new Error('Network error'));
+            else if (url.includes('PbxConfigs'))
+                return Promise.resolve({ data: { defaultPrefix: '39' } });
+        });
+        const phone = await parsePhone('123456789', '34');
+        expect(phone).toBe('39123456789');
     });
 });