Merge branch 'master' into hotfix_remove_moreOptions

src/components/ui/VnLinkPhone.vue

@@ -1,6 +1,7 @@
 <script setup>
 import { reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
 import axios from 'axios';
+import { parsePhone } from 'src/filters';
 const props = defineProps({
     phoneNumber: { type: [String, Number], default: null },
     channel: { type: Number, default: null },
@@ -24,9 +25,9 @@ onBeforeMount(async () => {
             .data;
         if (!channel) channel = defaultChannel;
 
-        config[
-            type
-        ].href = `${url}?customerIdentity=%2B${props.phoneNumber}&channelId=${channel}`;
+        config[type].href = `${url}?customerIdentity=%2B${parsePhone(
+            props.phoneNumber
+        )}&channelId=${channel}`;
     }
 });
 </script>

src/filters/index.js

@@ -12,10 +12,12 @@ import dateRange from './dateRange';
 import toHour from './toHour';
 import dashOrCurrency from './dashOrCurrency';
 import getParamWhere from './getParamWhere';
+import parsePhone from './parsePhone';
 import isDialogOpened from './isDialogOpened';
 
 export {
     isDialogOpened,
+    parsePhone,
     toLowerCase,
     toLowerCamel,
     toDate,

src/filters/parsePhone.js

@@ -0,0 +1,12 @@
+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)}`;
+    }
+    return `${prefix}${phone}`;
+}

src/pages/Order/OrderList.vue

@@ -15,6 +15,7 @@ import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vu
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
 import { useRoute } from 'vue-router';
+import dataByOrder from 'src/utils/dataByOrder';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -167,7 +168,7 @@ async function fetchAgencies({ landed, addressId }) {
     const { data } = await axios.get('Agencies/landsThatDay', {
         params: { addressFk: addressId, landed },
     });
-    agencyList.value = data;
+    agencyList.value = dataByOrder(data, 'agencyMode ASC');
 }
 
 const getDateColor = (date) => {

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

@@ -0,0 +1,29 @@
+import { describe, it, expect } from 'vitest';
+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');
+    });
+
+    it('maintains prefix +34 if it is already correct', () => {
+        const resultado = parsePhone('+34123456789', '34');
+        expect(resultado).toBe('34123456789');
+    });
+
+    it('converts prefix 0034 to +34', () => {
+        const resultado = parsePhone('0034123456789', '34');
+        expect(resultado).toBe('34123456789');
+    });
+
+    it('converts prefix 34 without symbol to +34', () => {
+        const resultado = parsePhone('34123456789', '34');
+        expect(resultado).toBe('34123456789');
+    });
+
+    it('replaces incorrect prefix with the correct one', () => {
+        const resultado = parsePhone('+44123456789', '34');
+        expect(resultado).toBe('44123456789');
+    });
+});