Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6992-addQueryParamsUrl

src/components/FormModel.vue

@@ -132,12 +132,12 @@ const formUrl = computed(() => $props.url);
 const defaultButtons = computed(() => ({
     save: {
         color: 'primary',
-        icon: 'restart_alt',
+        icon: 'save',
         label: 'globals.save',
     },
     reset: {
         color: 'primary',
-        icon: 'save',
+        icon: 'restart_alt',
         label: 'globals.reset',
     },
     ...$props.defaultButtons,

src/components/common/VnLog.vue

@@ -1030,7 +1030,7 @@ en:
         ticketCreated: Created
         created: Created
         isChargedToMana: Charged to mana
-        hasToPickUp: Has to pick Up
+        pickup: Type of pickup
         dmsFk: Document ID
         text: Description
         claimStateFk: Claim State
@@ -1069,7 +1069,7 @@ es:
         ticketCreated: Creado
         created: Creado
         isChargedToMana: Cargado a maná
-        hasToPickUp: Se debe recoger
+        pickup: Se debe recoger
         dmsFk: ID documento
         text: Descripción
         claimStateFk: Estado de la reclamación

src/i18n/en/index.js

@@ -544,6 +544,7 @@ export default {
             assignedTo: 'Assigned',
             attendedBy: 'Attended by',
             created: 'Created',
+            pickup: 'Pickup',
             state: 'State',
             details: 'Details',
             item: 'Item',
@@ -565,13 +566,19 @@ export default {
             responsible: 'Responsible',
             worker: 'Worker',
             redelivery: 'Redelivery',
+            null: 'No',
+            agency: 'Agency',
+            delivery: 'Delivery',
         },
         basicData: {
             customer: 'Customer',
             assignedTo: 'Assigned',
             created: 'Created',
             state: 'State',
-            picked: 'Picked',
+            pickup: 'Pickup',
+            null: 'No',
+            agency: 'Agency',
+            delivery: 'Delivery',
         },
         photo: {
             fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}',

src/i18n/es/index.js

@@ -543,6 +543,7 @@ export default {
             assignedTo: 'Asignada a',
             attendedBy: 'Atendida por',
             created: 'Creada',
+            pickup: 'Recogida',
             state: 'Estado',
             details: 'Detalles',
             item: 'Artículo',
@@ -564,13 +565,19 @@ export default {
             responsible: 'Responsable',
             worker: 'Trabajador',
             redelivery: 'Devolución',
+            null: 'No',
+            agency: 'Agencia',
+            delivery: 'Reparto',
         },
         basicData: {
             customer: 'Cliente',
             assignedTo: 'Asignada a',
             created: 'Creada',
             state: 'Estado',
-            picked: 'Recogida',
+            pickup: 'Recogida',
+            null: 'No',
+            agency: 'Agencia',
+            delivery: 'Reparto',
         },
         photo: {
             fileDescription:

src/pages/Claim/Card/ClaimBasicData.vue

@@ -9,6 +9,7 @@ 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 { useSession } from 'src/composables/useSession';
 
 const route = useRoute();
@@ -24,7 +25,7 @@ const claimFilter = {
         'workerFk',
         'claimStateFk',
         'packages',
-        'hasToPickUp',
+        'pickup',
     ],
     include: [
         {
@@ -50,6 +51,20 @@ function setClaimStates(data) {
     claimStates.value = data;
     claimStatesCopy.value = data;
 }
+let optionsList;
+async function getEnumValues() {
+    optionsList = [{ id: null, description: t('claim.basicData.null') }];
+    const { data } = await axios.get(`Applications/get-enum-values`, {
+        params: {
+            schema: 'vn',
+            table: 'claim',
+            column: 'pickup',
+        },
+    });
+    for (let value of data)
+        optionsList.push({ id: value, description: t(`claim.basicData.${value}`) });
+}
+getEnumValues();
 
 const workerFilter = {
     options: workers,
@@ -168,13 +183,19 @@ const statesFilter = {
                         type="number"
                     />
                 </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QCheckbox
+                    <QSelect
-                        v-model="data.hasToPickUp"
+                        v-model="data.pickup"
-                        :label="t('claim.basicData.picked')"
+                        :options="optionsList"
-                    />
+                        option-value="id"
+                        option-label="description"
+                        emit-value
+                        :label="t('claim.basicData.pickup')"
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    >
+                    </QSelect>
                 </div>
             </VnRow>
         </template>

src/pages/Claim/Card/ClaimSummary.vue

@@ -220,10 +220,9 @@ function openDialog(dmsId) {
                         />
                     </template>
                 </VnLv>
-                <QCheckbox
+                <VnLv
-                    :label="t('claim.basicData.picked')"
+                    :label="t('claim.summary.pickup')"
-                    v-model="claim.hasToPickUp"
+                    :value="t(`claim.summary.${claim.pickup}`)"
-                    :disable="true"
                 />
             </QCard>
             <QCard class="vn-three">

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

@@ -38,10 +38,10 @@ describe('VnLog', () => {
             action: 'update',
             changedModel: 'Claim',
             oldInstance: {
-                hasToPickUp: false,
+                pickup: null,
             },
             newInstance: {
-                hasToPickUp: true,
+                pickup: 'agency',
             },
             creationDate: '2023-09-18T12:25:34.000Z',
             changedModelId: '1',