verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 99 Releases Wiki Activity

Merge pull request 'HOTFIX: shipped columnFilter' (!1463) from hotfix_ticket_shipped into master
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #1463
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
This commit is contained in:
Javier Segarra 2025-02-21 11:02:43 +00:00
parent 98660c4e50 26009d809e
commit 8c69e5c937
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/Ticket/TicketFilter.vue
View File

@ -293,6 +293,7 @@ en:
clientFk: Customer clientFk: Customer
orderFk: Order orderFk: Order
from: From from: From
shipped: Shipped
to: To to: To
salesPersonFk: Salesperson salesPersonFk: Salesperson
stateFk: State stateFk: State
@ -320,6 +321,7 @@ es:
clientFk: Cliente clientFk: Cliente
orderFk: Pedido orderFk: Pedido
from: Desde from: Desde
shipped: F. envío
to: Hasta to: Hasta
salesPersonFk: Comercial salesPersonFk: Comercial
stateFk: Estado stateFk: Estado

30
src/pages/Ticket/TicketList.vue
View File

@ -108,13 +108,11 @@ const columns = computed(() => [
}, },
{ {
align: 'left', align: 'left',
name: 'shippedDate', name: 'shipped',
cardVisible: true, cardVisible: true,
label: t('ticketList.shipped'), label: t('ticketList.shipped'),
columnFilter: { columnFilter: {
component: 'date', component: 'date',
alias: 't',
inWhere: true,
}, },
format: ({ shippedDate }) => toDate(shippedDate), format: ({ shippedDate }) => toDate(shippedDate),
}, },
@ -251,11 +249,9 @@ const fetchAvailableAgencies = async (formData) => {
const response = await getAgencies(formData, selectedClient.value); const response = await getAgencies(formData, selectedClient.value);
if (!response) return; if (!response) return;
const { options, agency } = response const { options, agency } = response;
if(options) if (options) agenciesOptions.value = options;
agenciesOptions.value = options; if (agency) formData.agencyModeId = agency;
if(agency)
formData.agencyModeId = agency;
}; };
const fetchClient = async (formData) => { const fetchClient = async (formData) => {
@ -330,7 +326,7 @@ function openBalanceDialog(ticket) {
const description = ref([]); const description = ref([]);
const firstTicketClientId = checkedTickets[0].clientFk; const firstTicketClientId = checkedTickets[0].clientFk;
const isSameClient = checkedTickets.every( const isSameClient = checkedTickets.every(
(ticket) => ticket.clientFk === firstTicketClientId (ticket) => ticket.clientFk === firstTicketClientId,
); );
if (!isSameClient) { if (!isSameClient) {
@ -369,7 +365,7 @@ async function onSubmit() {
description: dialogData.value.value.description, description: dialogData.value.value.description,
clientFk: dialogData.value.value.clientFk, clientFk: dialogData.value.value.clientFk,
email: email[0].email, email: email[0].email,
} },
); );
if (data) notify('globals.dataSaved', 'positive'); if (data) notify('globals.dataSaved', 'positive');
@ -388,32 +384,32 @@ function setReference(data) {
switch (data) { switch (data) {
case 1: case 1:
newDescription = `${t( newDescription = `${t(
'ticketList.creditCard' 'ticketList.creditCard',
)}, ${dialogData.value.value.description.replace( )}, ${dialogData.value.value.description.replace(
/^(Credit Card, |Cash, |Transfers, )/, /^(Credit Card, |Cash, |Transfers, )/,
'' '',
)}`; )}`;
break; break;
case 2: case 2:
newDescription = `${t( newDescription = `${t(
'ticketList.cash' 'ticketList.cash',
)}, ${dialogData.value.value.description.replace( )}, ${dialogData.value.value.description.replace(
/^(Credit Card, |Cash, |Transfers, )/, /^(Credit Card, |Cash, |Transfers, )/,
'' '',
)}`; )}`;
break; break;
case 3: case 3:
newDescription = `${newDescription.replace( newDescription = `${newDescription.replace(
/^(Credit Card, |Cash, |Transfers, )/, /^(Credit Card, |Cash, |Transfers, )/,
'' '',
)}`; )}`;
break; break;
case 4: case 4:
newDescription = `${t( newDescription = `${t(
'ticketList.transfers' 'ticketList.transfers',
)}, ${dialogData.value.value.description.replace( )}, ${dialogData.value.value.description.replace(
/^(Credit Card, |Cash, |Transfers, )/, /^(Credit Card, |Cash, |Transfers, )/,
'' '',
)}`; )}`;
break; break;
case 3317: case 3317: