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

Correcciones varias

This commit is contained in:
Juan Ferrer Toribio 2017-11-16 12:35:07 +01:00
parent 82e4fdab68
commit 67829f5694
10 changed files with 39 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/auth/server/server.js
View File

@ -3,4 +3,4 @@ var vnLoopback = require('../../loopback/server/server.js');
var app = module.exports = vnLoopback.loopback();
app.set('applications', require('./application.json'));
vnLoopback.boot(app, __dirname);
vnLoopback.boot(app, __dirname, module);

17
services/client/common/models/client-observation.js
View File

@ -1,7 +1,6 @@
module.exports = function(Self) {
let loopBackContext = require('loopback-context');
Self.validate('text', isEnabled, {message: 'Se debe rellenar el campo de texto'});
function isEnabled(err) {
if (!this.text) err();
@ -9,15 +8,15 @@ module.exports = function(Self) {
Self.observe('before save', function(ctx, next) {
ctx.instance.created = Date();
let currentUser = loopBackContext.getCurrentContext();
let userId = currentUser.get('currentUser');
let app = require('../../server/server');
let Employee = app.models.Employee;
Employee.findOne({where: {userFk: userId}}, function (err, user){
if (user){
let cctx = loopBackContext.getCurrentContext();
let userId = cctx.get('currentUser');
let app = require('../../server/server');
let Employee = app.models.Employee;
Employee.findOne({where: {userFk: userId}}, function (err, user){
if (user) {
ctx.instance.employeeFk = user.id;
next();
}
});
});
});
};

38
services/client/common/models/client.js
View File

@ -15,7 +15,7 @@ module.exports = function(Self) {
require('../methods/client/roles.js')(Self);
require('../methods/client/salesperson.js')(Self);
require('../methods/client/addressesPropagateRe.js')(Self);
// Validations
Self.validatesUniquenessOf('name', {
@ -40,7 +40,7 @@ module.exports = function(Self) {
message: 'Correo electrónico inválido',
allowNull: true,
allowBlank: true,
with: /^[\w|\.|\-]+@\w[\w|\.|\-]*\w(,[\w|\.|\-]+@\w[\w|\.|\-]*\w)*$/
with: /^[\w|.|-]+@\w[\w|.|-]*\w(,[\w|.|-]+@\w[\w|.|-]*\w)*$/
});
Self.validatesLengthOf('postcode', {
allowNull: true,
@ -49,15 +49,15 @@ module.exports = function(Self) {
});
var validateIban = require('../validations/validateIban');
Self.validateBinded('iban',validateIban,{
message:'El iban no tiene el formato correcto'
Self.validateBinded('iban', validateIban, {
message: 'El iban no tiene el formato correcto'
});
Self.validate('payMethod', hasSalesMan, {
message: 'No se puede cambiar la forma de pago si no hay comercial asignado'
});
function hasSalesMan(err) {
if(this.payMethod && !this.salesPerson)
if (this.payMethod && !this.salesPerson)
err();
}
Self.validateAsync('payMethodFk', hasIban, {
@ -76,10 +76,9 @@ module.exports = function(Self) {
});
function validateCredit(err, done) {
let ctx = loopBackContext.getCurrentContext();
let accessToken = ctx && ctx.get('accessToken');
let userId = accessToken.userId;
let userId = ctx && ctx.get('currentUser');
let self = this;
// Comprueba si el rol del usuario puede asignar esa cantidad
// para ello mira que roles pueden asignar la cantidad que el usuario ha indicado
let filter = {
@ -94,7 +93,7 @@ module.exports = function(Self) {
function limitCb(_, instances) {
let requiredRoles = [];
for (instance of instances)
requiredRoles.push (instance.roleFk);
requiredRoles.push(instance.roleFk);
let where = {
roleId: {inq: requiredRoles},
@ -105,24 +104,24 @@ module.exports = function(Self) {
(_, res) => roleCb(_, res));
}
function roleCb(_, count) {
//si el usuario no tiene alguno de los roles no continua
// Si el usuario no tiene alguno de los roles no continua
if (!(count > 0)) {
err();
done();
} else
validate(); //si tiene el rol hay que validar que el último movimiento no fuese crédito 0 insertado por gerencia
validate(); // Si tiene el rol hay que validar que el último movimiento no fuese crédito 0 insertado por gerencia
}
// Si se puso a 0 por gerencia, solo gerencia puede aumentarlo
function validate() {
let query = 'SELECT * FROM ClientCredit WHERE clientFk = ? ORDER BY created DESC LIMIT 1';
Self.dataSource.connector.execute (query, [self.id],
Self.dataSource.connector.execute(query, [self.id],
(_, res) => maxCb(_, res));
}
function maxCb(_, instances) {
//console.log('maxCb', instances);
if(!instances){
// console.log('maxCb', instances);
if (!instances) {
err();
return;
}
@ -131,8 +130,8 @@ module.exports = function(Self) {
done();
return;
}
//el ultimo registro tiene valor 0, hay que comprobar que no fue editado por un gerente
// El ultimo registro tiene valor 0, hay que comprobar que no fue editado por un gerente
let sql = `SELECT count(distinct r.id) as hasManagerRole
FROM ClientCredit cc
JOIN Employee em ON (em.id = cc.employeeFk)
@ -146,11 +145,10 @@ module.exports = function(Self) {
Self.dataSource.connector.execute(sql, [], (_, res) => clientCreditCb(_, res));
}
function clientCreditCb(_, instance) {
if (!instance || (instance.length && instance[0].hasManagerRole > 0 ))
function clientCreditCb(_, instance) {
if (!instance || (instance.length && instance[0].hasManagerRole > 0))
err();
done();
}
}
};
};

3
services/client/package.json
View File

@ -11,8 +11,5 @@
"repository": {
"type": "git",
"url": "https://git.verdnatura.es/salix"
},
"dependencies": {
"loopback-context": "^3.3.0"
}
}

2
services/client/server/server.js
View File

@ -2,4 +2,4 @@
var vnLoopback = require('../../loopback/server/server.js');
var app = module.exports = vnLoopback.loopback();
vnLoopback.boot(app, __dirname);
vnLoopback.boot(app, __dirname, module);

8
services/loopback/server/middleware/cors.js
View File

@ -1,13 +1,5 @@
var cors = require('cors');
var whitelist = ['http://localhost:8080'];
var corsOptions = {
origin: function(origin, callback) {
var originIsWhitelisted = whitelist.indexOf(origin) !== -1;
callback(originIsWhitelisted ? null : 'Bad Request', originIsWhitelisted);
}
};
module.exports = function() {
return cors({origin: true});
};

19
services/loopback/server/server.js
View File

@ -10,7 +10,7 @@ module.exports = {
boot: vnBoot
};
function vnBoot(app, rootDir, cb) {
function vnBoot(app, rootDir, rootModule) {
// Internationalization
let i18nDir = rootDir + '/i18n';
@ -22,7 +22,7 @@ function vnBoot(app, rootDir, cb) {
});
app.get('/prueba', function(req, res) {
i18n.setLocale(req.get('Accept-Language').substring(0,2));
i18n.setLocale(req.get('Accept-Language').substring(0, 2));
res.send(i18n.__('Hello'));
});
}
@ -63,31 +63,28 @@ function vnBoot(app, rootDir, cb) {
modelSources: [
"loopback/common/models",
"loopback/server/models",
__dirname + "/../common/models",
__dirname + "/models",
path.join(__dirname, "../common/models"),
path.join(__dirname, "models"),
rootDir + "/../common/models",
rootDir + "/models"
],
mixinDirs: [
"loopback/common/mixins",
"loopback/server/mixins",
__dirname + "/../common/mixins",
__dirname + "/mixins",
path.join(__dirname, "../common/mixins"),
path.join(__dirname, "mixins"),
rootDir + "/../common/mixins",
rootDir + "/mixins"
],
bootDirs: [
__dirname + "/boot",
path.join(__dirname, "boot"),
rootDir + "/boot"
]
};
boot(app, bootOptions, function(err) {
if (err) throw err;
if (require.main === module)
if (require.main === rootModule)
app.start();
if (cb)
cb(app);
});
}

2
services/production/server/server.js
View File

@ -2,4 +2,4 @@
var vnLoopback = require('../../loopback/server/server.js');
var app = module.exports = vnLoopback.loopback();
vnLoopback.boot(app, __dirname);
vnLoopback.boot(app, __dirname, module);

2
services/route/server/server.js
View File

@ -2,4 +2,4 @@
var vnLoopback = require('../../loopback/server/server.js');
var app = module.exports = vnLoopback.loopback();
vnLoopback.boot(app, __dirname);
vnLoopback.boot(app, __dirname, module);

2
services/salix/server/server.js
View File

@ -10,4 +10,4 @@ app.set('url auth', '/auth');
app.use(cookieParser());
vnLoopback.boot(app, __dirname);
vnLoopback.boot(app, __dirname, module);