Compare commits
9 Commits
Author | SHA1 | Date |
---|---|---|
|
728e6e921a | |
|
f316349ac2 | |
|
0f0504e590 | |
|
6118154ef9 | |
|
5a1c826f15 | |
|
16bb716abd | |
|
c8abd7b2a1 | |
|
2e04a38c66 | |
|
02f51a244d |
|
@ -257,5 +257,6 @@
|
||||||
"Ticket has been delivered out of order": "The ticket {{ticket}} of route {{{fullUrl}}} has been delivered out of order.",
|
"Ticket has been delivered out of order": "The ticket {{ticket}} of route {{{fullUrl}}} has been delivered out of order.",
|
||||||
"clonedFromTicketWeekly": ", that is a cloned sale from ticket {{ ticketWeekly }}",
|
"clonedFromTicketWeekly": ", that is a cloned sale from ticket {{ ticketWeekly }}",
|
||||||
"negativeReplaced": "Replaced item [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} with [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} from ticket [{{ticketId}}]({{{ticketUrl}}})",
|
"negativeReplaced": "Replaced item [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} with [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} from ticket [{{ticketId}}]({{{ticketUrl}}})",
|
||||||
"The tag and priority can't be repeated": "The tag and priority can't be repeated"
|
"The tag and priority can't be repeated": "The tag and priority can't be repeated",
|
||||||
|
"duplicateWarehouse": "The introduced warehouse already exists"
|
||||||
}
|
}
|
||||||
|
|
|
@ -398,5 +398,6 @@
|
||||||
"Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sido entregado en su orden.",
|
"Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sido entregado en su orden.",
|
||||||
"Price cannot be blank": "El precio no puede estar en blanco",
|
"Price cannot be blank": "El precio no puede estar en blanco",
|
||||||
"clonedFromTicketWeekly": ", que es una linea clonada del ticket {{ticketWeekly}}",
|
"clonedFromTicketWeekly": ", que es una linea clonada del ticket {{ticketWeekly}}",
|
||||||
"negativeReplaced": "Sustituido el articulo [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} por [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} del ticket [{{ticketId}}]({{{ticketUrl}}})"
|
"negativeReplaced": "Sustituido el articulo [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} por [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} del ticket [{{ticketId}}]({{{ticketUrl}}})",
|
||||||
|
"duplicateWarehouse": "El almacén seleccionado ya existe en la zona"
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,6 +67,11 @@ module.exports = Self => {
|
||||||
type: 'number',
|
type: 'number',
|
||||||
description: 'The freighter supplier id'
|
description: 'The freighter supplier id'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
arg: 'entrySupplierFk',
|
||||||
|
type: 'number',
|
||||||
|
description: 'The supplier of the entry(not freighter) id'
|
||||||
|
},
|
||||||
],
|
],
|
||||||
returns: {
|
returns: {
|
||||||
type: ['Object'],
|
type: ['Object'],
|
||||||
|
@ -94,6 +99,8 @@ module.exports = Self => {
|
||||||
return {'t.landed': {lte: value}};
|
return {'t.landed': {lte: value}};
|
||||||
case 'continent':
|
case 'continent':
|
||||||
return {'cnt.code': value};
|
return {'cnt.code': value};
|
||||||
|
case 'entrySupplierFk':
|
||||||
|
return {'e.supplierFk': value};
|
||||||
case 'id':
|
case 'id':
|
||||||
case 'agencyModeFk':
|
case 'agencyModeFk':
|
||||||
case 'warehouseOutFk':
|
case 'warehouseOutFk':
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
let UserError = require('vn-loopback/util/user-error');
|
||||||
|
|
||||||
|
module.exports = Self => {
|
||||||
|
Self.rewriteDbError(function(err) {
|
||||||
|
if (err.code === 'ER_DUP_ENTRY')
|
||||||
|
return new UserError(`duplicateWarehouse`);
|
||||||
|
return err;
|
||||||
|
});
|
||||||
|
};
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "salix-back",
|
"name": "salix-back",
|
||||||
"version": "25.08.0",
|
"version": "25.10.0",
|
||||||
"author": "Verdnatura Levante SL",
|
"author": "Verdnatura Levante SL",
|
||||||
"description": "Salix backend",
|
"description": "Salix backend",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
|
|
Loading…
Reference in New Issue