verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

fix: refs #7906 remake method #3109

Merged
carlossa merged 8 commits from 7906-notDeleteZone into dev 2024-10-18 08:33:04 +00:00
Conversation 0 Commits 8 Files Changed 4 +8 -4
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 46e657675b - Show all commits

3
loopback/locale/en.json
View File

@ -240,5 +240,6 @@
"There is already a tray with the same height": "There is already a tray with the same height", "There is already a tray with the same height": "There is already a tray with the same height",
"The height must be greater than 50cm": "The height must be greater than 50cm", "The height must be greater than 50cm": "The height must be greater than 50cm",
"The maximum height of the wagon is 200cm": "The maximum height of the wagon is 200cm", "The maximum height of the wagon is 200cm": "The maximum height of the wagon is 200cm",
"The quantity claimed cannot be greater than the quantity of the line": "The quantity claimed cannot be greater than the quantity of the line" "The quantity claimed cannot be greater than the quantity of the line": "The quantity claimed cannot be greater than the quantity of the line",
"There are tickets for this area, delete them first": "There are tickets for this area, delete them first"
} }

3
loopback/locale/es.json
View File

@ -382,5 +382,6 @@
"This buyer has already made a reservation for this date": "Este comprador ya ha hecho una reserva para esta fecha", "This buyer has already made a reservation for this date": "Este comprador ya ha hecho una reserva para esta fecha",
"No valid travel thermograph found": "No se encontró un termógrafo válido", "No valid travel thermograph found": "No se encontró un termógrafo válido",
"The quantity claimed cannot be greater than the quantity of the line": "La cantidad reclamada no puede ser mayor que la cantidad de la línea", "The quantity claimed cannot be greater than the quantity of the line": "La cantidad reclamada no puede ser mayor que la cantidad de la línea",
"type cannot be blank": "Se debe rellenar el tipo" "type cannot be blank": "Se debe rellenar el tipo",
"There are tickets for this area, delete them first": "Hay tickets para esta sección, borralos primero"
} }

4
modules/zone/back/methods/zone/deleteZone.js
View File

@ -1,3 +1,4 @@
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => { module.exports = Self => {
Self.remoteMethodCtx('deleteZone', { Self.remoteMethodCtx('deleteZone', {
description: 'Delete a zone', description: 'Delete a zone',
@ -57,7 +58,8 @@ module.exports = Self => {
where: {id: userId} where: {id: userId}
}, myOptions); }, myOptions);
carlossa marked this conversation as resolved Outdated
alexm commented 2024-10-16 11:30:03 +00:00
Outdated
Review
Copy Link

Quitar

Quitar
await models.Ticket.rawSql('UPDATE ticket SET zoneFk = NULL WHERE zoneFk = ?', [id], myOptions); if (ticketList.length > 0)
throw new UserError('There are tickets for this area, delete them first');
for (ticket of ticketList) { for (ticket of ticketList) {
carlossa marked this conversation as resolved Outdated
alexm commented 2024-10-16 08:48:45 +00:00
Outdated
Review
Copy Link

Pero si no se vol que se puga si te tickets, ja no cal mirar els tickets no?

Pero si no se vol que se puga si te tickets, ja no cal mirar els tickets no?
if (ticket.ticketState().alertLevel == 0) { if (ticket.ticketState().alertLevel == 0) {