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
commit 8c69e5c937
2 changed files with 19 additions and 21 deletions

View File

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

View File

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