#6276 createNewWarehouse methods migrated from silex to salix #1850

Merged
jorgep merged 158 commits from 6276-createNewWarehouse into dev 2024-03-06 11:32:11 +00:00
2 changed files with 18 additions and 12 deletions
Showing only changes of commit 2fbea6f9dd - Show all commits

View File

@ -1,3 +1,4 @@
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => { module.exports = Self => {
Self.remoteMethodCtx('updateInTime', { Self.remoteMethodCtx('updateInTime', {
description: 'Updates the corresponding registry if the worker has been registered in the last few hours', description: 'Updates the corresponding registry if the worker has been registered in the last few hours',
@ -34,25 +35,29 @@ module.exports = Self => {
fields: ['id', 'plate'], fields: ['id', 'plate'],
where: {plate} where: {plate}
}, myOptions); }, myOptions);
if (!machine) throw new Error(`plate ${plate} does not exist`); if (!machine) throw new Error(`plate ${plate} does not exist`);
const {maxHours} = await models.MachineWorkerConfig.findOne({fields: ['maxHours']}, myOptions); const {maxHours} = await models.MachineWorkerConfig.findOne({fields: ['maxHours']}, myOptions);
const machineWorker = await Self.findOne({
const machineWorker = await models.MachineWorker.findOne({
where: { where: {
workerFk: userId,
inTime: {gte: Date.vnNew() - (maxHours * 60 * 60 * 1000)},
outTimed: null,
machineFk: machine.id, machineFk: machine.id,
outTime: null,
} }
}, myOptions);
});
if (machineWorker) { if (machineWorker) {
const hoursDifference = (Date.vnNew() - machineWorker.inTime) / (60 * 60 * 1000);
const isHimSelf = userId == machineWorker.workerFk;
if (maxHours > hoursDifference && !isHimSelf) throw new UserError('Esta máquina ya está en uso.');
jorgep marked this conversation as resolved Outdated

isHimself

isHimself
await machineWorker.updateAttributes({ await machineWorker.updateAttributes({
outTime: Date.now() outTime: Date.vnNew()
}, myOptions); }, myOptions);
}
if (!isHimSelf) await models.MachineWorker.create({machineFk: machine.id, workerFk: userId}, myOptions);
} else
await models.MachineWorker.create({machineFk: machine.id, workerFk: userId}, myOptions);
if (tx) await tx.commit(); if (tx) await tx.commit();
} catch (e) { } catch (e) {

View File

@ -72,7 +72,7 @@
"The secret can't be blank": "La contraseña no puede estar en blanco", "The secret can't be blank": "La contraseña no puede estar en blanco",
"We weren't able to send this SMS": "No hemos podido enviar el SMS", "We weren't able to send this SMS": "No hemos podido enviar el SMS",
"This client can't be invoiced": "Este cliente no puede ser facturado", "This client can't be invoiced": "Este cliente no puede ser facturado",
"You must provide the correction information to generate a corrective invoice": "Debes informar la información de corrección para generar una factura rectificativa", "You must provide the correction information to generate a corrective invoice": "Debes informar la información de corrección para generar una factura rectificativa",
"This ticket can't be invoiced": "Este ticket no puede ser facturado", "This ticket can't be invoiced": "Este ticket no puede ser facturado",
"You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado", "You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado",
"This ticket can not be modified": "Este ticket no puede ser modificado", "This ticket can not be modified": "Este ticket no puede ser modificado",
@ -339,5 +339,6 @@
"The alias cant be modified": "Este alias de correo no puede ser modificado", "The alias cant be modified": "Este alias de correo no puede ser modificado",
"No tickets to invoice": "No hay tickets para facturar", "No tickets to invoice": "No hay tickets para facturar",
jorgep marked this conversation as resolved Outdated

no puede estar en castellano

no puede estar en castellano
"No hay tickets para sacar": "No hay tickets para sacar", "No hay tickets para sacar": "No hay tickets para sacar",
"There is no zone for these parameters 999999": "There is no zone for these parameters 999999" "There is no zone for these parameters 999999": "There is no zone for these parameters 999999",
} "Esta máquina ya está en uso.": "Esta máquina ya está en uso."
}