diff --git a/README.md b/README.md
index 59f5dbcf7..b420bc44f 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Salix is also the scientific name of a beautifull tree! :)
Required applications.
-* Node.js >= 16.x LTS
+* Node.js
* Docker
* Git
@@ -17,20 +17,7 @@ You will need to install globally the following items.
$ sudo npm install -g jest gulp-cli
```
-For the usage of jest --watch on macOs.
-```
-$ brew install watchman
-```
-* [watchman](https://facebook.github.io/watchman/)
-
-## Linux Only Prerequisites
-
-Your user must be on the docker group to use it so you will need to run this command:
-```
-$ sudo usermod -a -G docker yourusername
-```
-
-## Getting Started // Installing
+## Installing dependencies and launching
Pull from repository.
@@ -76,29 +63,6 @@ In Visual Studio Code we use the ESLint extension.
ext install dbaeumer.vscode-eslint
```
-Gitlens for visualization of code authorship
-```
-ext install eamodio.gitlens
-```
-
-Spanish language pack
-```
-ext install ms-ceintl.vscode-language-pack-es
-```
-
-### Recommended extensions
-
-Material icon Theme
-```
-ext install pkief.material-icon-theme
-```
-
-Material UI Themes
-```
-ext install equinusocio.vsc-material-theme
-```
-
-
## Built With
* [angularjs](https://angularjs.org/)
diff --git a/back/methods/vn-user/sign-in.js b/back/methods/vn-user/sign-in.js
index b9e0d2f70..25f708b8e 100644
--- a/back/methods/vn-user/sign-in.js
+++ b/back/methods/vn-user/sign-in.js
@@ -49,8 +49,13 @@ module.exports = Self => {
if (vnUser.twoFactor)
throw new ForbiddenError(null, 'REQUIRES_2FA');
}
-
- return Self.validateLogin(user, password);
+ const validateLogin = await Self.validateLogin(user, password);
+ await Self.app.models.SignInLog.create({
+ id: validateLogin.token,
+ userFk: vnUser.id,
+ ip: ctx.req.ip
+ });
+ return validateLogin;
};
Self.passExpired = async vnUser => {
diff --git a/back/models/vn-user.js b/back/models/vn-user.js
index de5bf7b63..5845c2192 100644
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@@ -2,6 +2,7 @@ const vnModel = require('vn-loopback/common/models/vn-model');
const {Email} = require('vn-print');
const ForbiddenError = require('vn-loopback/util/forbiddenError');
const LoopBackContext = require('loopback-context');
+const UserError = require('vn-loopback/util/user-error');
module.exports = function(Self) {
vnModel(Self);
@@ -92,7 +93,11 @@ module.exports = function(Self) {
};
Self.on('resetPasswordRequest', async function(info) {
- const url = await Self.app.models.Url.getUrl();
+ const loopBackContext = LoopBackContext.getCurrentContext();
+ const httpCtx = {req: loopBackContext.active};
+ const httpRequest = httpCtx.req.http.req;
+ const headers = httpRequest.headers;
+ const origin = headers.origin;
const defaultHash = '/reset-password?access_token=$token$';
const recoverHashes = {
@@ -108,7 +113,7 @@ module.exports = function(Self) {
const params = {
recipient: info.email,
lang: user.lang,
- url: url.slice(0, -1) + recoverHash
+ url: origin + '/#!' + recoverHash
};
const options = Object.assign({}, info.options);
@@ -121,10 +126,16 @@ module.exports = function(Self) {
});
Self.validateLogin = async function(user, password) {
- let loginInfo = Object.assign({password}, Self.userUses(user));
- token = await Self.login(loginInfo, 'user');
+ const loginInfo = Object.assign({password}, Self.userUses(user));
+ const token = await Self.login(loginInfo, 'user');
const userToken = await token.user.get();
+
+ if (userToken.username.toLowerCase() !== user.toLowerCase()) {
+ console.error('ERROR!!! - Signin with other user', userToken, user);
+ throw new UserError('Try again');
+ }
+
try {
await Self.app.models.Account.sync(userToken.name, password);
} catch (err) {
@@ -220,8 +231,11 @@ module.exports = function(Self) {
class Mailer {
async send(verifyOptions, cb) {
+ const url = new URL(verifyOptions.verifyHref);
+ if (process.env.NODE_ENV) url.port = '';
+
const params = {
- url: verifyOptions.verifyHref,
+ url: url.href,
recipient: verifyOptions.to
};
diff --git a/db/changes/234603/00-createSignInLogTable.sql b/db/changes/234603/00-createSignInLogTable.sql
new file mode 100644
index 000000000..977de4646
--- /dev/null
+++ b/db/changes/234603/00-createSignInLogTable.sql
@@ -0,0 +1,19 @@
+
+
+--
+-- Table structure for table `signInLog`
+--
+
+DROP TABLE IF EXISTS `account`.`signInLog`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `account`.`signInLog` (
+ `id` varchar(10) NOT NULL ,
+ `userFk` int(10) unsigned DEFAULT NULL,
+ `creationDate` timestamp NULL DEFAULT current_timestamp(),
+ `ip` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `userFk` (`userFk`),
+ CONSTRAINT `signInLog_ibfk_1` FOREIGN KEY (`userFk`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+);
+
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 26650175d..9f9961f57 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -196,6 +196,6 @@
"Negative basis of tickets: 23": "Negative basis of tickets: 23",
"Booking completed": "Booking complete",
"The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation",
- "You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets"
-}
-
+ "You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets",
+ "Try again": "Try again"
+}
\ No newline at end of file
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 7655a46c8..5b536bde2 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -323,8 +323,9 @@
"The response is not a PDF": "La respuesta no es un PDF",
"Booking completed": "Reserva completada",
"The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
- "The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mímina",
- "quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mímina",
"Incoterms data for consignee is missing": "Faltan los datos de los Incoterms para el consignatario",
- "The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada"
+ "The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
+ "User disabled": "Usuario desactivado",
+ "The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
+ "quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima"
}
diff --git a/modules/account/back/model-config.json b/modules/account/back/model-config.json
index a4eb9fa57..b4bd6dbaf 100644
--- a/modules/account/back/model-config.json
+++ b/modules/account/back/model-config.json
@@ -35,6 +35,9 @@
"SambaConfig": {
"dataSource": "vn"
},
+ "SignInLog": {
+ "dataSource": "vn"
+ },
"Sip": {
"dataSource": "vn"
},
diff --git a/modules/account/back/models/sign_in-log.json b/modules/account/back/models/sign_in-log.json
new file mode 100644
index 000000000..44575b013
--- /dev/null
+++ b/modules/account/back/models/sign_in-log.json
@@ -0,0 +1,34 @@
+{
+ "name": "SignInLog",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "account.signInLog"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "string"
+ },
+ "creationDate": {
+ "type": "date"
+ },
+ "userFk": {
+ "type": "number"
+ },
+ "ip": {
+ "type": "string"
+ }
+ },
+ "relations": {
+ "user": {
+ "type": "belongsTo",
+ "model": "VnUser",
+ "foreignKey": "userFk"
+ }
+ },
+ "scope": {
+ "order": ["creationDate DESC", "id DESC"]
+ }
+}
diff --git a/modules/item/back/methods/item/setVisibleDiscard.js b/modules/item/back/methods/item/setVisibleDiscard.js
index 08cc507c3..16cef6baf 100644
--- a/modules/item/back/methods/item/setVisibleDiscard.js
+++ b/modules/item/back/methods/item/setVisibleDiscard.js
@@ -20,8 +20,7 @@ module.exports = Self => {
},
{
arg: 'addressFk',
- type: 'Number',
- required: true,
+ type: 'Any',
description: 'The address id'
}],
http: {
diff --git a/modules/item/back/models/item-shelving.json b/modules/item/back/models/item-shelving.json
index 61d05539e..bb1a141c4 100644
--- a/modules/item/back/models/item-shelving.json
+++ b/modules/item/back/models/item-shelving.json
@@ -1,6 +1,6 @@
{
"name": "ItemShelving",
- "base": "VnModel",
+ "base": "Loggable",
"options": {
"mysql": {
"table": "itemShelving"
diff --git a/modules/ticket/back/methods/sale/updateQuantity.js b/modules/ticket/back/methods/sale/updateQuantity.js
index 1a497da24..610826283 100644
--- a/modules/ticket/back/methods/sale/updateQuantity.js
+++ b/modules/ticket/back/methods/sale/updateQuantity.js
@@ -64,7 +64,10 @@ module.exports = Self => {
const sale = await models.Sale.findById(id, filter, myOptions);
const oldQuantity = sale.quantity;
- const result = await sale.updateAttributes({quantity: newQuantity}, myOptions);
+ const result = await sale.updateAttributes({
+ quantity: newQuantity,
+ originalQuantity: newQuantity
+ }, myOptions);
const salesPerson = sale.ticket().client().salesPersonUser();
if (salesPerson) {
diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index 660c16893..46c45aa92 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -32,31 +32,30 @@ module.exports = Self => {
throw new UserError('You cannot close tickets for today');
const tickets = await Self.rawSql(`
- SELECT
- t.id,
- t.clientFk,
- t.companyFk,
- c.name clientName,
- c.email recipient,
- c.salesPersonFk,
- c.isToBeMailed,
- c.hasToInvoice,
- co.hasDailyInvoice,
- eu.email salesPersonEmail
- FROM ticket t
- JOIN agencyMode am ON am.id = t.agencyModeFk
- JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
- JOIN ticketState ts ON ts.ticketFk = t.id
- JOIN alertLevel al ON al.id = ts.alertLevel
- JOIN client c ON c.id = t.clientFk
- JOIN province p ON p.id = c.provinceFk
- JOIN country co ON co.id = p.countryFk
- LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
- WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
- AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
- AND util.dayEnd(?)
- AND t.refFk IS NULL
- GROUP BY t.id
+ SELECT t.id,
+ t.clientFk,
+ t.companyFk,
+ c.name clientName,
+ c.email recipient,
+ c.salesPersonFk,
+ c.isToBeMailed,
+ c.hasToInvoice,
+ co.hasDailyInvoice,
+ eu.email salesPersonEmail,
+ t.addressFk
+ FROM ticket t
+ JOIN agencyMode am ON am.id = t.agencyModeFk
+ JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
+ JOIN ticketState ts ON ts.ticketFk = t.id
+ JOIN alertLevel al ON al.id = ts.alertLevel
+ JOIN client c ON c.id = t.clientFk
+ JOIN province p ON p.id = c.provinceFk
+ JOIN country co ON co.id = p.countryFk
+ LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
+ WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
+ AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY) AND util.dayEnd(?)
+ AND t.refFk IS NULL
+ GROUP BY t.id
`, [toDate, toDate]);
await closure(ctx, Self, tickets);
diff --git a/modules/ticket/back/methods/ticket/closure.js b/modules/ticket/back/methods/ticket/closure.js
index 7a2825a4d..1d04679d3 100644
--- a/modules/ticket/back/methods/ticket/closure.js
+++ b/modules/ticket/back/methods/ticket/closure.js
@@ -14,12 +14,12 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id], {userId});
const [invoiceOut] = await Self.rawSql(`
- SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
- FROM ticket t
- JOIN invoiceOut io ON io.ref = t.refFk
- JOIN company cny ON cny.id = io.companyFk
- WHERE t.id = ?
- `, [ticket.id]);
+ SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
+ FROM ticket t
+ JOIN invoiceOut io ON io.ref = t.refFk
+ JOIN company cny ON cny.id = io.companyFk
+ WHERE t.id = ?
+ `, [ticket.id]);
const mailOptions = {
overrideAttachments: true,
@@ -91,13 +91,13 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
// Incoterms authorization
const [{firstOrder}] = await Self.rawSql(`
- SELECT COUNT(*) as firstOrder
- FROM ticket t
- JOIN client c ON c.id = t.clientFk
- WHERE t.clientFk = ?
- AND NOT t.isDeleted
- AND c.isVies
- `, [ticket.clientFk]);
+ SELECT COUNT(*) as firstOrder
+ FROM ticket t
+ JOIN client c ON c.id = t.clientFk
+ WHERE t.clientFk = ?
+ AND NOT t.isDeleted
+ AND c.isVies
+ `, [ticket.clientFk]);
if (firstOrder == 1) {
const args = {
@@ -105,7 +105,8 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
companyId: ticket.companyFk,
recipientId: ticket.clientFk,
recipient: ticket.recipient,
- replyTo: ticket.salesPersonEmail
+ replyTo: ticket.salesPersonEmail,
+ addressId: ticket.addressFk
};
const email = new Email('incoterms-authorization', args);
@@ -113,13 +114,13 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
const [sample] = await Self.rawSql(
`SELECT id
- FROM sample
- WHERE code = 'incoterms-authorization'
- `);
+ FROM sample
+ WHERE code = 'incoterms-authorization'
+ `);
await Self.rawSql(`
- INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
- `, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
+ INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
+ `, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
}
} catch (error) {
// Domain not found
@@ -140,7 +141,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
for (const ticket of failedtickets) {
body += `Ticket: ${ticket.id}
-
${ticket.stacktrace}
`;
+
${ticket.stacktrace}
`;
}
smtp.send({
@@ -158,19 +159,19 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
const oldInstance = `{"email": "${ticket.recipient}"}`;
const newInstance = `{"email": ""}`;
await Self.rawSql(`
- INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
- VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`, [
+ INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
+ VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`, [
ticket.clientFk,
oldInstance,
newInstance
], {userId});
const body = `No se ha podido enviar el albarán ${ticket.id}
- al cliente ${ticket.clientFk} - ${ticket.clientName}
- porque la dirección de email "${ticket.recipient}" no es correcta
- o no está disponible.
- Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente.
- Actualiza la dirección de email con una correcta.`;
+ al cliente ${ticket.clientFk} - ${ticket.clientName}
+ porque la dirección de email "${ticket.recipient}" no es correcta
+ o no está disponible.
+ Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente.
+ Actualiza la dirección de email con una correcta.`;
smtp.send({
to: ticket.salesPersonEmail,
diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html
index aa6b80300..8290e2a15 100644
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@@ -38,7 +38,7 @@
+ >
@@ -61,8 +61,6 @@
@@ -75,13 +73,13 @@
-
-