diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue index 107a081441e..03033fd8e72 100644 --- a/src/pages/Customer/CustomerFilter.vue +++ b/src/pages/Customer/CustomerFilter.vue @@ -72,6 +72,7 @@ const exprBuilder = (param, value) => { option-value="id" option-label="name" url="Departments" + no-one="true" /> @@ -154,6 +155,7 @@ en: city: City phone: Phone email: Email + departmentFk: Department isToBeMailed: Mailed isEqualizated: Equailized departmentFk: Department @@ -171,6 +173,7 @@ es: search: Contiene fi: NIF isActive: Activo + departmentFk: Departamento isToBeMailed: A enviar isEqualizated: Recargo de equivalencia businessTypeFk: Tipo de negocio diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue index b30ed6f76ce..cbbd6d20571 100644 --- a/src/pages/Customer/Notifications/CustomerNotifications.vue +++ b/src/pages/Customer/Notifications/CustomerNotifications.vue @@ -127,6 +127,7 @@ es: Identifier: Identificador Social name: Razón social Phone: Teléfono + Postcode: Código postal City: Población Email: Email Campaign consumption: Consumo campaña diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue index f852c160ac2..bc76f59859a 100644 --- a/src/pages/Customer/components/CustomerAddressEdit.vue +++ b/src/pages/Customer/components/CustomerAddressEdit.vue @@ -93,10 +93,26 @@ const updateAddressTicket = async () => { }; const updateObservations = async (payload) => { - await axios.post('AddressObservations/crud', payload); + await axios.post('AddressObservations/crud', cleanPayload(payload)); notes.value = []; deletes.value = []; }; + +function cleanPayload(payload) { + ['creates', 'deletes', 'updates'].forEach((prop) => { + if (prop === 'creates' || prop === 'updates') { + payload[prop] = payload[prop].filter( + (item) => item.description !== '' && item.observationTypeFk !== '', + ); + } else { + payload[prop] = payload[prop].filter( + (item) => item !== null && item !== undefined, + ); + } + }); + return payload; +} + async function updateAll({ data, payload }) { await updateObservations(payload); await updateAddress(data); diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue index 09c7e714c57..feb13706583 100644 --- a/src/pages/Customer/components/CustomerSummaryTable.vue +++ b/src/pages/Customer/components/CustomerSummaryTable.vue @@ -191,7 +191,7 @@ const getItemPackagingType = (ticketSales) => { :without-header="true" auto-load :row-click="rowClick" - order="shipped DESC, id" + order="shipped DESC, id DESC" :disable-option="{ card: true, table: true }" class="full-width" :disable-infinite-scroll="true" diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue index c5f7d58561b..a613f905ac2 100644 --- a/src/pages/Ticket/Card/TicketSale.vue +++ b/src/pages/Ticket/Card/TicketSale.vue @@ -1,5 +1,5 @@