Recover password
-
-
-
-
diff --git a/front/salix/components/upload-photo/index.js b/front/salix/components/upload-photo/index.js
index fb115992f..da1fda923 100644
--- a/front/salix/components/upload-photo/index.js
+++ b/front/salix/components/upload-photo/index.js
@@ -64,8 +64,7 @@ export default class UploadPhoto extends Component {
this.editor = null;
this.newPhoto = {
id: id,
- collection: collection,
- fileName: id
+ collection: collection
};
this.$.dialog.show();
}
diff --git a/front/salix/locale/es.yml b/front/salix/locale/es.yml
index d92c32b33..bed41c63b 100644
--- a/front/salix/locale/es.yml
+++ b/front/salix/locale/es.yml
@@ -23,6 +23,7 @@ There is a new version, click here to reload: Hay una nueva versión, pulse aqu
Back: Volver
Save: Guardar
+Assign: Asignar
Create: Crear
Send: Enviar
Delete: Eliminar
diff --git a/loopback/common/methods/application/post.js b/loopback/common/methods/application/post.js
new file mode 100644
index 000000000..739f1341a
--- /dev/null
+++ b/loopback/common/methods/application/post.js
@@ -0,0 +1,18 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('post', {
+ description: 'Returns the sent parameters',
+ returns: {
+ type: 'object',
+ root: true
+ },
+ http: {
+ path: `/post`,
+ verb: 'POST'
+ }
+ });
+
+ Self.post = async ctx => {
+ console.log(ctx.req.body);
+ return ctx.req.body;
+ };
+};
diff --git a/loopback/common/methods/vn-model/printService.js b/loopback/common/methods/vn-model/printService.js
new file mode 100644
index 000000000..5cd571d4c
--- /dev/null
+++ b/loopback/common/methods/vn-model/printService.js
@@ -0,0 +1,57 @@
+const {Report, Email} = require('vn-print');
+
+module.exports = Self => {
+ Self.printReport = async function(ctx, id, reportName) {
+ const args = Object.assign({}, ctx.args);
+ const params = {lang: ctx.req.getLocale()};
+
+ delete args.ctx;
+ for (const param in args)
+ params[param] = args[param];
+
+ const report = new Report(reportName, params);
+ const stream = await report.toPdfStream();
+
+ let fileName = `${reportName}`;
+ if (id) fileName += `-${id}`;
+
+ return [stream, 'application/pdf', `filename="${fileName}.pdf"`];
+ };
+
+ Self.printEmail = async function(ctx, id, templateName) {
+ const {accessToken} = ctx.req;
+ const args = Object.assign({}, ctx.args);
+ const params = {lang: ctx.req.getLocale()};
+
+ delete args.ctx;
+ for (const param in args)
+ params[param] = args[param];
+
+ params.isPreview = true;
+ params.access_token = accessToken.id;
+
+ const report = new Email(templateName, params);
+ const html = await report.render();
+
+ let fileName = `${templateName}`;
+ if (id) fileName += `-${id}`;
+
+ return [html, 'text/html', `filename=${fileName}.pdf"`];
+ };
+
+ Self.sendTemplate = async function(ctx, templateName) {
+ const args = Object.assign({}, ctx.args);
+ const params = {
+ recipient: args.recipient,
+ lang: ctx.req.getLocale()
+ };
+
+ delete args.ctx;
+ for (const param in args)
+ params[param] = args[param];
+
+ const email = new Email(templateName, params);
+
+ return email.send();
+ };
+};
diff --git a/loopback/common/models/application.js b/loopback/common/models/application.js
index ff7599fac..5e767fdc1 100644
--- a/loopback/common/models/application.js
+++ b/loopback/common/models/application.js
@@ -1,4 +1,5 @@
module.exports = function(Self) {
require('../methods/application/status')(Self);
+ require('../methods/application/post')(Self);
};
diff --git a/loopback/common/models/application.json b/loopback/common/models/application.json
index 0bb489720..bc72df315 100644
--- a/loopback/common/models/application.json
+++ b/loopback/common/models/application.json
@@ -7,6 +7,12 @@
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
- }
+ },
+ {
+ "property": "post",
+ "principalType": "ROLE",
+ "principalId": "$everyone",
+ "permission": "ALLOW"
+ }
]
}
diff --git a/loopback/common/models/loggable.js b/loopback/common/models/loggable.js
index 28a6075d0..360c84566 100644
--- a/loopback/common/models/loggable.js
+++ b/loopback/common/models/loggable.js
@@ -1,4 +1,3 @@
-const pick = require('object.pick');
const LoopBackContext = require('loopback-context');
module.exports = function(Self) {
@@ -6,344 +5,11 @@ module.exports = function(Self) {
Self.super_.setup.call(this);
};
- Self.observe('after save', async function(ctx) {
- const loopBackContext = LoopBackContext.getCurrentContext();
- await logInModel(ctx, loopBackContext);
- });
-
Self.observe('before save', async function(ctx) {
- const appModels = ctx.Model.app.models;
- const definition = ctx.Model.definition;
- const options = {};
-
- // Check for transactions
- if (ctx.options && ctx.options.transaction)
- options.transaction = ctx.options.transaction;
-
- let oldInstance;
- let newInstance;
-
- if (ctx.data) {
- const changes = pick(ctx.currentInstance, Object.keys(ctx.data));
- newInstance = ctx.data;
- oldInstance = changes;
-
- if (ctx.where && !ctx.currentInstance) {
- const fields = Object.keys(ctx.data);
- const modelName = definition.name;
-
- ctx.oldInstances = await appModels[modelName].find({
- where: ctx.where,
- fields: fields
- }, options);
- }
- }
-
- // Get changes from created instance
- if (ctx.isNewInstance)
- newInstance = ctx.instance.__data;
-
- ctx.hookState.oldInstance = oldInstance;
- ctx.hookState.newInstance = newInstance;
+ ctx.options.httpCtx = LoopBackContext.getCurrentContext();
});
Self.observe('before delete', async function(ctx) {
- const appModels = ctx.Model.app.models;
- const definition = ctx.Model.definition;
- const relations = ctx.Model.relations;
-
- let options = {};
- if (ctx.options && ctx.options.transaction)
- options.transaction = ctx.options.transaction;
-
- if (ctx.where) {
- let affectedModel = definition.name;
- let deletedInstances = await appModels[affectedModel].find({
- where: ctx.where
- }, options);
-
- let relation = definition.settings.log.relation;
-
- if (relation) {
- let primaryKey = relations[relation].keyFrom;
-
- let arrangedDeletedInstances = [];
- for (let i = 0; i < deletedInstances.length; i++) {
- if (primaryKey)
- deletedInstances[i].originFk = deletedInstances[i][primaryKey];
- let arrangedInstance = await fkToValue(deletedInstances[i], ctx);
- arrangedDeletedInstances[i] = arrangedInstance;
- }
- ctx.hookState.oldInstance = arrangedDeletedInstances;
- }
- }
+ ctx.options.httpCtx = LoopBackContext.getCurrentContext();
});
-
- Self.observe('after delete', async function(ctx) {
- const loopBackContext = LoopBackContext.getCurrentContext();
- if (ctx.hookState.oldInstance)
- logDeletedInstances(ctx, loopBackContext);
- });
-
- async function logDeletedInstances(ctx, loopBackContext) {
- const appModels = ctx.Model.app.models;
- const definition = ctx.Model.definition;
- let options = {};
- if (ctx.options && ctx.options.transaction)
- options.transaction = ctx.options.transaction;
-
- ctx.hookState.oldInstance.forEach(async instance => {
- let userFk;
- if (loopBackContext)
- userFk = loopBackContext.active.accessToken.userId;
-
- let changedModelValue = definition.settings.log.changedModelValue;
- let logRecord = {
- originFk: instance.originFk,
- userFk: userFk,
- action: 'delete',
- changedModel: definition.name,
- changedModelId: instance.id,
- changedModelValue: instance[changedModelValue],
- oldInstance: instance,
- newInstance: {}
- };
-
- delete instance.originFk;
-
- let logModel = definition.settings.log.model;
- await appModels[logModel].create(logRecord, options);
- });
- }
-
- // Get log values from a foreign key
- async function fkToValue(instance, ctx) {
- const appModels = ctx.Model.app.models;
- const relations = ctx.Model.relations;
- let options = {};
-
- // Check for transactions
- if (ctx.options && ctx.options.transaction)
- options.transaction = ctx.options.transaction;
-
- const instanceCopy = JSON.parse(JSON.stringify(instance));
- const result = {};
- for (const key in instanceCopy) {
- let value = instanceCopy[key];
-
- if (value instanceof Object)
- continue;
-
- if (value === undefined) continue;
-
- if (value) {
- for (let relationName in relations) {
- const relation = relations[relationName];
- if (relation.keyFrom == key && key != 'id') {
- const model = relation.modelTo;
- const modelName = relation.modelTo.modelName;
- const properties = model && model.definition.properties;
- const settings = model && model.definition.settings;
-
- const recordSet = await appModels[modelName].findById(value, null, options);
-
- const hasShowField = settings.log && settings.log.showField;
- let showField = hasShowField && recordSet
- && recordSet[settings.log.showField];
-
- if (!showField) {
- const showFieldNames = [
- 'name',
- 'description',
- 'code',
- 'nickname'
- ];
- for (field of showFieldNames) {
- const propField = properties && properties[field];
- const recordField = recordSet && recordSet[field];
-
- if (propField && recordField) {
- showField = field;
- break;
- }
- }
- }
-
- if (showField && recordSet && recordSet[showField]) {
- value = recordSet[showField];
- break;
- }
-
- value = recordSet && recordSet.id || value;
- break;
- }
- }
- }
- result[key] = value;
- }
- return result;
- }
-
- async function logInModel(ctx, loopBackContext) {
- const appModels = ctx.Model.app.models;
- const definition = ctx.Model.definition;
- const defSettings = ctx.Model.definition.settings;
- const relations = ctx.Model.relations;
-
- const options = {};
- if (ctx.options && ctx.options.transaction)
- options.transaction = ctx.options.transaction;
-
- let primaryKey;
- for (let property in definition.properties) {
- if (definition.properties[property].id) {
- primaryKey = property;
- break;
- }
- }
-
- if (!primaryKey) throw new Error('Primary key not found');
- let originId;
-
- // RELATIONS LOG
- let changedModelId;
-
- if (ctx.instance && !defSettings.log.relation) {
- originId = ctx.instance.id;
- changedModelId = ctx.instance.id;
- } else if (defSettings.log.relation) {
- primaryKey = relations[defSettings.log.relation].keyFrom;
-
- if (ctx.where && ctx.where[primaryKey])
- originId = ctx.where[primaryKey];
- else if (ctx.instance) {
- originId = ctx.instance[primaryKey];
- changedModelId = ctx.instance.id;
- }
- } else {
- originId = ctx.currentInstance.id;
- changedModelId = ctx.currentInstance.id;
- }
-
- // Sets the changedModelValue to save and the instances changed in case its an updateAll
- let showField = defSettings.log.showField;
- let where;
- if (showField && (!ctx.instance || !ctx.instance[showField]) && ctx.where) {
- changedModelId = [];
- where = [];
- let changedInstances = await appModels[definition.name].find({
- where: ctx.where,
- fields: ['id', showField, primaryKey]
- }, options);
-
- changedInstances.forEach(element => {
- where.push(element[showField]);
- changedModelId.push(element.id);
- originId = element[primaryKey];
- });
- } else if (ctx.hookState.oldInstance)
- where = ctx.instance[showField];
-
- // Set oldInstance, newInstance, userFk and action
- let oldInstance = {};
- if (ctx.hookState.oldInstance)
- Object.assign(oldInstance, ctx.hookState.oldInstance);
-
- let newInstance = {};
- if (ctx.hookState.newInstance)
- Object.assign(newInstance, ctx.hookState.newInstance);
- let userFk;
- if (loopBackContext)
- userFk = loopBackContext.active.accessToken.userId;
-
- let action = setActionType(ctx);
-
- removeUnloggable(definition, oldInstance);
- removeUnloggable(definition, newInstance);
-
- oldInstance = await fkToValue(oldInstance, ctx);
- newInstance = await fkToValue(newInstance, ctx);
-
- // Prevent log with no new changes
- const hasNewChanges = Object.keys(newInstance).length;
- if (!hasNewChanges) return;
-
- let logRecord = {
- originFk: originId,
- userFk: userFk,
- action: action,
- changedModel: definition.name,
- changedModelId: changedModelId, // Model property with an different data type will throw a NaN error
- changedModelValue: where,
- oldInstance: oldInstance,
- newInstance: newInstance
- };
-
- let logsToSave = setLogsToSave(where, changedModelId, logRecord, ctx);
- let logModel = defSettings.log.model;
-
- await appModels[logModel].create(logsToSave, options);
- }
-
- /**
- * Removes unwanted properties
- * @param {*} definition Model definition
- * @param {*} properties Modified object properties
- */
- function removeUnloggable(definition, properties) {
- const objectCopy = Object.assign({}, properties);
- const propList = Object.keys(objectCopy);
- const propDefs = new Map();
-
- for (let property in definition.properties) {
- const propertyDef = definition.properties[property];
-
- propDefs.set(property, propertyDef);
- }
-
- for (let property of propList) {
- const propertyDef = propDefs.get(property);
- const firstChar = property.substring(0, 1);
- const isPrivate = firstChar == '$';
-
- if (isPrivate || !propertyDef)
- delete properties[property];
-
- if (!propertyDef) continue;
-
- if (propertyDef.log === false || isPrivate)
- delete properties[property];
- else if (propertyDef.logValue === false)
- properties[property] = null;
- }
- }
-
- // this function retuns all the instances changed in case this is an updateAll
- function setLogsToSave(changedInstances, changedInstancesIds, logRecord, ctx) {
- let promises = [];
- if (changedInstances && typeof changedInstances == 'object') {
- for (let i = 0; i < changedInstances.length; i++) {
- logRecord.changedModelId = changedInstancesIds[i];
- logRecord.changedModelValue = changedInstances[i];
- if (ctx.oldInstances)
- logRecord.oldInstance = ctx.oldInstances[i];
- promises.push(JSON.parse(JSON.stringify(logRecord)));
- }
- } else
- return logRecord;
-
- return promises;
- }
-
- function setActionType(ctx) {
- let oldInstance = ctx.hookState.oldInstance;
- let newInstance = ctx.hookState.newInstance;
-
- if (oldInstance && newInstance)
- return 'update';
- else if (!oldInstance && newInstance)
- return 'insert';
-
- return 'delete';
- }
};
diff --git a/loopback/common/models/vn-model.js b/loopback/common/models/vn-model.js
index cc3eede8e..cebd37eac 100644
--- a/loopback/common/models/vn-model.js
+++ b/loopback/common/models/vn-model.js
@@ -7,6 +7,7 @@ module.exports = function(Self) {
require('../methods/vn-model/getSetValues')(Self);
require('../methods/vn-model/getEnumValues')(Self);
+ require('../methods/vn-model/printService')(Self);
Object.assign(Self, {
setup() {
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index c810e5a69..e9fd67209 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -147,8 +147,12 @@
"Receipt's bank was not found": "Receipt's bank was not found",
"This receipt was not compensated": "This receipt was not compensated",
"Client's email was not found": "Client's email was not found",
+ "Tickets with associated refunds": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº {{id}}",
"It is not possible to modify tracked sales": "It is not possible to modify tracked sales",
"It is not possible to modify sales that their articles are from Floramondo": "It is not possible to modify sales that their articles are from Floramondo",
"It is not possible to modify cloned sales": "It is not possible to modify cloned sales",
- "Valid priorities: 1,2,3": "Valid priorities: 1,2,3"
+ "Valid priorities: 1,2,3": "Valid priorities: 1,2,3",
+ "Warehouse inventory not set": "Almacén inventario no está establecido",
+ "Component cost not set": "Componente coste no está estabecido",
+ "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2"
}
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index ad6d53d64..33741d395 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -251,6 +251,7 @@
"Receipt's bank was not found": "No se encontró el banco del recibo",
"This receipt was not compensated": "Este recibo no ha sido compensado",
"Client's email was not found": "No se encontró el email del cliente",
+ "Negative basis": "Base negativa",
"This worker code already exists": "Este codigo de trabajador ya existe",
"This personal mail already exists": "Este correo personal ya existe",
"This worker already exists": "Este trabajador ya existe",
@@ -259,10 +260,20 @@
"Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
"Failed to upload file": "Error al subir archivo",
"The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
- "It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
- "It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
- "It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
+ "It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
+ "It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
+ "It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
"A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
- "There is no assigned email for this client": "No hay correo asignado para este cliente"
+ "There is no assigned email for this client": "No hay correo asignado para este cliente",
+ "Exists an invoice with a previous date": "Existe una factura con fecha anterior",
+ "Invoice date can't be less than max date": "La fecha de factura no puede ser inferior a la fecha límite",
+ "Warehouse inventory not set": "El almacén inventario no está establecido",
+ "This locker has already been assigned": "Esta taquilla ya ha sido asignada",
+ "Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº {{id}}",
+ "Not exist this branch": "La rama no existe",
+ "This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
+ "Insert a date range": "Inserte un rango de fechas",
+ "Added observation": "{{user}} añadió esta observacion: {{text}}",
+ "Comment added to client": "Observación añadida al cliente {{clientFk}}",
+ "Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen"
}
-
diff --git a/loopback/server/boot/date.js b/loopback/server/boot/date.js
index 0875b6d5f..810745562 100644
--- a/loopback/server/boot/date.js
+++ b/loopback/server/boot/date.js
@@ -4,7 +4,7 @@ module.exports = () => {
if (!env || env === 'development')
return new Date(Date.UTC(2001, 0, 1, 11));
- return new Date(Date.UTC());
+ return new Date();
};
Date.vnNew = () => {
diff --git a/loopback/server/connectors/vn-mysql.js b/loopback/server/connectors/vn-mysql.js
index fde0ddcf6..a6fd3351a 100644
--- a/loopback/server/connectors/vn-mysql.js
+++ b/loopback/server/connectors/vn-mysql.js
@@ -1,9 +1,41 @@
const mysql = require('mysql');
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
const MySQL = require('loopback-connector-mysql').MySQL;
const EnumFactory = require('loopback-connector-mysql').EnumFactory;
+const { Transaction, SQLConnector, ParameterizedSQL } = require('loopback-connector');
const fs = require('fs');
+const limitSet = new Set([
+ 'save',
+ 'updateOrCreate',
+ 'replaceOrCreate',
+ 'replaceById',
+ 'update'
+]);
+
+const opOpts = {
+ update: [
+ 'update',
+ 'replaceById',
+ // |insert
+ 'save',
+ 'updateOrCreate',
+ 'replaceOrCreate'
+ ],
+ delete: [
+ 'destroy',
+ 'destroyAll'
+ ],
+ insert: [
+ 'create'
+ ]
+};
+
+const opMap = new Map();
+for (const op in opOpts) {
+ for (const met of opOpts[op])
+ opMap.set(met, op);
+}
+
class VnMySQL extends MySQL {
/**
* Promisified version of execute().
@@ -219,6 +251,279 @@ class VnMySQL extends MySQL {
this.makePagination(filter)
]);
}
+
+ create(model, data, opts, cb) {
+ const ctx = { data };
+ this.invokeMethod('create',
+ arguments, model, ctx, opts, cb);
+ }
+
+ createAll(model, data, opts, cb) {
+ const ctx = { data };
+ this.invokeMethod('createAll',
+ arguments, model, ctx, opts, cb);
+ }
+
+ save(model, data, opts, cb) {
+ const ctx = { data };
+ this.invokeMethod('save',
+ arguments, model, ctx, opts, cb);
+ }
+
+ updateOrCreate(model, data, opts, cb) {
+ const ctx = { data };
+ this.invokeMethod('updateOrCreate',
+ arguments, model, ctx, opts, cb);
+ }
+
+ replaceOrCreate(model, data, opts, cb) {
+ const ctx = { data };
+ this.invokeMethod('replaceOrCreate',
+ arguments, model, ctx, opts, cb);
+ }
+
+ destroyAll(model, where, opts, cb) {
+ const ctx = { where };
+ this.invokeMethod('destroyAll',
+ arguments, model, ctx, opts, cb);
+ }
+
+ update(model, where, data, opts, cb) {
+ const ctx = { where, data };
+ this.invokeMethod('update',
+ arguments, model, ctx, opts, cb);
+ }
+
+ replaceById(model, id, data, opts, cb) {
+ const ctx = { id, data };
+ this.invokeMethod('replaceById',
+ arguments, model, ctx, opts, cb);
+ }
+
+ isLoggable(model) {
+ const Model = this.getModelDefinition(model).model;
+ const settings = Model.definition.settings;
+ return settings.base && settings.base === 'Loggable';
+ }
+
+ invokeMethod(method, args, model, ctx, opts, cb) {
+ if (!this.isLoggable(model))
+ return super[method].apply(this, args);
+
+ this.invokeMethodP(method, [...args], model, ctx, opts)
+ .then(res => cb(...[null].concat(res)), cb);
+ }
+
+ async invokeMethodP(method, args, model, ctx, opts) {
+ const Model = this.getModelDefinition(model).model;
+ const settings = Model.definition.settings;
+ let tx;
+ if (!opts.transaction) {
+ tx = await Transaction.begin(this, {});
+ opts = Object.assign({ transaction: tx, httpCtx: opts.httpCtx }, opts);
+ }
+
+ try {
+ // Fetch old values (update|delete) or login
+ let where, id, data, idName, limit, op, oldInstances, newInstances;
+ const hasGrabUser = settings.log && settings.log.grabUser;
+ if (hasGrabUser) {
+ const userId = opts.httpCtx && opts.httpCtx.active.accessToken.userId;
+ const user = await Model.app.models.Account.findById(userId, { fields: ['name'] }, opts);
+ await this.executeP(`CALL account.myUser_loginWithName(?)`, [user.name], opts);
+ } else {
+ where = ctx.where;
+ id = ctx.id;
+ data = ctx.data;
+ idName = this.idName(model);
+
+ limit = limitSet.has(method);
+
+ op = opMap.get(method);
+
+ if (!where) {
+ if (id) where = { [idName]: id };
+ else where = { [idName]: data[idName] };
+ }
+
+ // Fetch old values
+ switch (op) {
+ case 'update':
+ case 'delete':
+ // Single entity operation
+ const stmt = this.buildSelectStmt(op, data, idName, model, where, limit);
+ stmt.merge(`FOR UPDATE`);
+ oldInstances = await this.executeStmt(stmt, opts);
+ }
+ }
+
+ const res = await new Promise((resolve, reject) => {
+ const fnArgs = args.slice(0, -2);
+ fnArgs.push(opts, (err, ...args) => {
+ if (err) return reject(err);
+ resolve(args);
+ });
+ super[method].apply(this, fnArgs);
+ });
+
+ if (hasGrabUser)
+ await this.executeP(`CALL account.myUser_logout()`, null, opts);
+ else {
+ // Fetch new values
+ const ids = [];
+
+ switch (op) {
+ case 'insert':
+ case 'update': {
+ switch (method) {
+ case 'createAll':
+ for (const row of res[0])
+ ids.push(row[idName]);
+ break;
+ case 'create':
+ ids.push(res[0]);
+ break;
+ case 'update':
+ if (data[idName] != null)
+ ids.push(data[idName]);
+ break;
+ }
+
+ const newWhere = ids.length ? {[idName]: {inq: ids}} : where;
+
+ const stmt = this.buildSelectStmt(op, data, idName, model, newWhere, limit);
+ newInstances = await this.executeStmt(stmt, opts);
+ }
+ }
+
+ await this.createLogRecord(oldInstances, newInstances, model, opts);
+ }
+ if (tx) await tx.commit();
+ return res;
+ } catch (err) {
+ if (tx) tx.rollback();
+ throw err;
+ }
+ }
+
+ buildSelectStmt(op, data, idName, model, where, limit) {
+ const Model = this.getModelDefinition(model).model;
+ const properties = Object.keys(Model.definition.properties);
+
+ const fields = data ? Object.keys(data) : [];
+ if (op == 'delete')
+ properties.forEach(property => fields.push(property));
+ else {
+ const log = Model.definition.settings.log;
+ fields.push(idName);
+ if (log.relation) fields.push(Model.relations[log.relation].keyFrom);
+ if (log.showField) fields.push(log.showField);
+ else {
+ const showFieldNames = ['name', 'description', 'code', 'nickname'];
+ for (const field of showFieldNames) {
+ if (properties.includes(field)) {
+ log.showField = field;
+ fields.push(field);
+ break;
+ }
+ }
+ }
+ }
+
+ const stmt = new ParameterizedSQL(
+ 'SELECT ' +
+ this.buildColumnNames(model, { fields }) +
+ ' FROM ' +
+ this.tableEscaped(model)
+ );
+ stmt.merge(this.buildWhere(model, where));
+ if (limit) stmt.merge(`LIMIT 1`);
+
+ return stmt;
+ }
+
+ async createLogRecord(oldInstances, newInstances, model, opts) {
+ function setActionType() {
+ if (oldInstances && newInstances)
+ return 'update';
+ else if (!oldInstances && newInstances)
+ return 'insert';
+ return 'delete';
+ }
+
+ const action = setActionType();
+ if (!newInstances && action != 'delete') return;
+
+ const Model = this.getModelDefinition(model).model;
+ const models = Model.app.models;
+ const definition = Model.definition;
+ const log = definition.settings.log;
+
+ const primaryKey = this.idName(model);
+ const originRelation = log.relation;
+ const originFkField = originRelation
+ ? Model.relations[originRelation].keyFrom
+ : primaryKey;
+
+ // Prevent adding logs when deleting a principal entity (Client, Zone...)
+ if (action == 'delete' && !originRelation) return;
+
+ function map(instances) {
+ const map = new Map();
+ if (!instances) return;
+ for (const instance of instances)
+ map.set(instance[primaryKey], instance);
+ return map;
+ }
+
+ const changedModel = definition.name;
+ const userFk = opts.httpCtx && opts.httpCtx.active.accessToken.userId;
+ const oldMap = map(oldInstances);
+ const newMap = map(newInstances);
+ const ids = (oldMap || newMap).keys();
+
+ const logEntries = [];
+
+ function insertValuesLogEntry(logEntry, instance) {
+ logEntry.originFk = instance[originFkField];
+ logEntry.changedModelId = instance[primaryKey];
+ if (log.showField) logEntry.changedModelValue = instance[log.showField];
+ }
+
+ for (const id of ids) {
+ const oldI = oldMap && oldMap.get(id);
+ const newI = newMap && newMap.get(id);
+
+ const logEntry = {
+ action,
+ userFk,
+ changedModel,
+ };
+
+ if (newI) {
+ insertValuesLogEntry(logEntry, newI);
+ // Delete unchanged properties
+ if (oldI) {
+ Object.keys(oldI).forEach(prop => {
+ const hasChanges = oldI[prop] instanceof Date ?
+ oldI[prop]?.getTime() != newI[prop]?.getTime() :
+ oldI[prop] != newI[prop];
+
+ if (!hasChanges) {
+ delete oldI[prop];
+ delete newI[prop];
+ }
+ });
+ }
+ } else
+ insertValuesLogEntry(logEntry, oldI);
+
+ logEntry.oldInstance = oldI;
+ logEntry.newInstance = newI;
+ logEntries.push(logEntry);
+ }
+ await models[log.model].create(logEntries, opts);
+ }
}
exports.VnMySQL = VnMySQL;
@@ -233,13 +538,13 @@ exports.initialize = function initialize(dataSource, callback) {
modelBuilder.defineValueType.bind(modelBuilder) :
modelBuilder.constructor.registerType.bind(modelBuilder.constructor);
- defineType(function Point() {});
+ defineType(function Point() { });
dataSource.EnumFactory = EnumFactory;
if (callback) {
if (dataSource.settings.lazyConnect) {
- process.nextTick(function() {
+ process.nextTick(function () {
callback();
});
} else
@@ -247,13 +552,13 @@ exports.initialize = function initialize(dataSource, callback) {
}
};
-MySQL.prototype.connect = function(callback) {
+MySQL.prototype.connect = function (callback) {
const self = this;
const options = generateOptions(this.settings);
if (this.client) {
if (callback) {
- process.nextTick(function() {
+ process.nextTick(function () {
callback(null, self.client);
});
}
@@ -262,7 +567,7 @@ MySQL.prototype.connect = function(callback) {
function connectionHandler(options, callback) {
const client = mysql.createPool(options);
- client.getConnection(function(err, connection) {
+ client.getConnection(function (err, connection) {
const conn = connection;
if (!err) {
if (self.debug)
@@ -341,3 +646,31 @@ function generateOptions(settings) {
}
return options;
}
+
+
+SQLConnector.prototype.all = function find(model, filter, options, cb) {
+ const self = this;
+ // Order by id if no order is specified
+ filter = filter || {};
+ const stmt = this.buildSelect(model, filter, options);
+ this.execute(stmt.sql, stmt.params, options, function (err, data) {
+ if (err) {
+ return cb(err, []);
+ }
+
+ try {
+ const objs = data.map(function (obj) {
+ return self.fromRow(model, obj);
+ });
+ if (filter && filter.include) {
+ self.getModelDefinition(model).model.include(
+ objs, filter.include, options, cb,
+ );
+ } else {
+ cb(null, objs);
+ }
+ } catch (error) {
+ cb(error, [])
+ }
+ });
+};
diff --git a/loopback/util/log.js b/loopback/util/log.js
index e26022c35..76e87781d 100644
--- a/loopback/util/log.js
+++ b/loopback/util/log.js
@@ -91,7 +91,11 @@ exports.getChanges = (original, changes) => {
const isPrivate = firstChar == '$';
if (isPrivate) return;
- if (changes[property] != original[property]) {
+ const hasChanges = original[property] instanceof Date ?
+ changes[property]?.getTime() != original[property]?.getTime() :
+ changes[property] != original[property];
+
+ if (hasChanges) {
newChanges[property] = changes[property];
if (original[property] != undefined)
diff --git a/modules/claim/back/methods/claim/isEditable.js b/modules/claim/back/methods/claim-state/isEditable.js
similarity index 54%
rename from modules/claim/back/methods/claim/isEditable.js
rename to modules/claim/back/methods/claim-state/isEditable.js
index cd14d70c7..ad51d543a 100644
--- a/modules/claim/back/methods/claim/isEditable.js
+++ b/modules/claim/back/methods/claim-state/isEditable.js
@@ -1,12 +1,12 @@
module.exports = Self => {
Self.remoteMethodCtx('isEditable', {
- description: 'Check if a claim is editable',
+ description: 'Check if an state is editable',
accessType: 'READ',
accepts: [{
arg: 'id',
type: 'number',
required: true,
- description: 'the claim id',
+ description: 'the state id',
http: {source: 'path'}
}],
returns: {
@@ -21,25 +21,18 @@ module.exports = Self => {
Self.isEditable = async(ctx, id, options) => {
const userId = ctx.req.accessToken.userId;
+ const models = Self.app.models;
const myOptions = {};
if (typeof options == 'object')
Object.assign(myOptions, options);
- const isClaimManager = await Self.app.models.Account.hasRole(userId, 'claimManager', myOptions);
-
- const claim = await Self.app.models.Claim.findById(id, {
- fields: ['claimStateFk'],
- include: [{
- relation: 'claimState'
- }]
+ const state = await models.ClaimState.findById(id, {
+ include: {
+ relation: 'writeRole'
+ }
}, myOptions);
-
- const isClaimResolved = claim && claim.claimState().code == 'resolved';
-
- if (!claim || (isClaimResolved && !isClaimManager))
- return false;
-
- return true;
+ const roleWithGrants = state && state.writeRole().name;
+ return await models.Account.hasRole(userId, roleWithGrants, myOptions);
};
};
diff --git a/modules/claim/back/methods/claim/specs/isEditable.spec.js b/modules/claim/back/methods/claim-state/specs/isEditable.spec.js
similarity index 74%
rename from modules/claim/back/methods/claim/specs/isEditable.spec.js
rename to modules/claim/back/methods/claim-state/specs/isEditable.spec.js
index 3afea7843..1fb8e1536 100644
--- a/modules/claim/back/methods/claim/specs/isEditable.spec.js
+++ b/modules/claim/back/methods/claim-state/specs/isEditable.spec.js
@@ -1,16 +1,16 @@
const app = require('vn-loopback/server/server');
-describe('claim isEditable()', () => {
- const salesPerdonId = 18;
+describe('claimstate isEditable()', () => {
+ const salesPersonId = 18;
const claimManagerId = 72;
- it('should return false if the given claim does not exist', async() => {
+ it('should return false if the given state does not exist', async() => {
const tx = await app.models.Claim.beginTransaction({});
try {
const options = {transaction: tx};
const ctx = {req: {accessToken: {userId: claimManagerId}}};
- const result = await app.models.Claim.isEditable(ctx, 99999, options);
+ const result = await app.models.ClaimState.isEditable(ctx, 9999, options);
expect(result).toEqual(false);
@@ -27,8 +27,8 @@ describe('claim isEditable()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: salesPerdonId}}};
- const result = await app.models.Claim.isEditable(ctx, 4, options);
+ const ctx = {req: {accessToken: {userId: salesPersonId}}};
+ const result = await app.models.ClaimState.isEditable(ctx, 3, options);
expect(result).toEqual(false);
@@ -46,7 +46,7 @@ describe('claim isEditable()', () => {
const options = {transaction: tx};
const ctx = {req: {accessToken: {userId: claimManagerId}}};
- const result = await app.models.Claim.isEditable(ctx, 4, options);
+ const result = await app.models.ClaimState.isEditable(ctx, 3, options);
expect(result).toEqual(true);
@@ -63,8 +63,8 @@ describe('claim isEditable()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: salesPerdonId}}};
- const result = await app.models.Claim.isEditable(ctx, 1, options);
+ const ctx = {req: {accessToken: {userId: claimManagerId}}};
+ const result = await app.models.ClaimState.isEditable(ctx, 7, options);
expect(result).toEqual(true);
diff --git a/modules/claim/back/methods/claim/claimPickupPdf.js b/modules/claim/back/methods/claim/claimPickupPdf.js
index 0e3abe908..4927efa0f 100644
--- a/modules/claim/back/methods/claim/claimPickupPdf.js
+++ b/modules/claim/back/methods/claim/claimPickupPdf.js
@@ -1,5 +1,3 @@
-const { Report } = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('claimPickupPdf', {
description: 'Returns the claim pickup order pdf',
@@ -39,17 +37,5 @@ module.exports = Self => {
}
});
- Self.claimPickupPdf = async(ctx, id) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const report = new Report('claim-pickup-order', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.claimPickupPdf = (ctx, id) => Self.printReport(ctx, id, 'claim-pickup-order');
};
diff --git a/modules/claim/back/methods/claim/filter.js b/modules/claim/back/methods/claim/filter.js
index d653229e5..2daee6413 100644
--- a/modules/claim/back/methods/claim/filter.js
+++ b/modules/claim/back/methods/claim/filter.js
@@ -166,7 +166,8 @@ module.exports = Self => {
c.name AS clientName,
cl.workerFk,
u.name AS workerName,
- cs.description,
+ cs.code stateCode,
+ cs.description stateDescription,
cl.created
FROM claim cl
LEFT JOIN client c ON c.id = cl.clientFk
diff --git a/modules/claim/back/methods/claim/getSummary.js b/modules/claim/back/methods/claim/getSummary.js
index ca376f853..d384f7ebb 100644
--- a/modules/claim/back/methods/claim/getSummary.js
+++ b/modules/claim/back/methods/claim/getSummary.js
@@ -65,7 +65,8 @@ module.exports = Self => {
]
};
- promises.push(Self.app.models.Claim.find(filter, myOptions));
+ const models = Self.app.models;
+ promises.push(models.Claim.find(filter, myOptions));
// Claim detail
filter = {
@@ -82,7 +83,7 @@ module.exports = Self => {
}
]
};
- promises.push(Self.app.models.ClaimBeginning.find(filter, myOptions));
+ promises.push(models.ClaimBeginning.find(filter, myOptions));
// Claim observations
filter = {
@@ -96,7 +97,7 @@ module.exports = Self => {
}
]
};
- promises.push(Self.app.models.ClaimObservation.find(filter, myOptions));
+ promises.push(models.ClaimObservation.find(filter, myOptions));
// Claim developments
filter = {
@@ -128,7 +129,7 @@ module.exports = Self => {
}
]
};
- promises.push(Self.app.models.ClaimDevelopment.find(filter, myOptions));
+ promises.push(models.ClaimDevelopment.find(filter, myOptions));
// Claim action
filter = {
@@ -145,11 +146,11 @@ module.exports = Self => {
{relation: 'claimBeggining'}
]
};
- promises.push(Self.app.models.ClaimEnd.find(filter, myOptions));
+ promises.push(models.ClaimEnd.find(filter, myOptions));
const res = await Promise.all(promises);
- summary.isEditable = await Self.isEditable(ctx, id, myOptions);
+ summary.isEditable = await models.ClaimState.isEditable(ctx, res[0][0].claimStateFk, myOptions);
[summary.claim] = res[0];
summary.salesClaimed = res[1];
summary.observations = res[2];
diff --git a/modules/claim/back/methods/claim/logs.js b/modules/claim/back/methods/claim/logs.js
new file mode 100644
index 000000000..f47513e9e
--- /dev/null
+++ b/modules/claim/back/methods/claim/logs.js
@@ -0,0 +1,134 @@
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const buildFilter = require('vn-loopback/util/filter').buildFilter;
+const { mergeFilters, mergeWhere } = require('vn-loopback/util/filter');
+
+module.exports = Self => {
+ Self.remoteMethodCtx('logs', {
+ description: 'Find all claim logs of the claim entity matched by a filter',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'id',
+ type: 'Number',
+ description: 'The claim id',
+ http: { source: 'path' }
+ },
+ {
+ arg: 'filter',
+ type: 'object',
+ http: { source: 'query' }
+ },
+ {
+ arg: 'search',
+ type: 'string',
+ http: { source: 'query' }
+ },
+ {
+ arg: 'userFk',
+ type: 'number',
+ http: { source: 'query' }
+ },
+ {
+ arg: 'created',
+ type: 'date',
+ http: { source: 'query' }
+ },
+ ],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/:id/logs`,
+ verb: 'GET'
+ }
+ });
+
+ Self.logs = async (ctx, id, filter, options) => {
+ const conn = Self.dataSource.connector;
+ const args = ctx.args;
+ const myOptions = {};
+ let to;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ let where = buildFilter(args, (param, value) => {
+ switch (param) {
+ case 'search':
+ return {
+ or: [
+ { changedModel: { like: `%${value}%` } },
+ { oldInstance: { like: `%${value}%` } }
+ ]
+ };
+ case 'userFk':
+ return { 'cl.userFk': value };
+ case 'created':
+ value.setHours(0, 0, 0, 0);
+ to = new Date(value);
+ to.setHours(23, 59, 59, 999);
+
+ return { creationDate: { between: [value, to] } };
+ }
+ });
+ where = mergeWhere(where, { ['cl.originFk']: id });
+ filter = mergeFilters(args.filter, { where });
+
+ const stmts = [];
+
+ const stmt = new ParameterizedSQL(
+ `SELECT
+ cl.id,
+ cl.userFk,
+ u.name AS userName,
+ cl.oldInstance,
+ cl.newInstance,
+ cl.changedModel,
+ cl.action,
+ cl.creationDate AS created
+ FROM claimLog cl
+ JOIN account.user u ON u.id = cl.userFk
+ `
+ );
+
+ stmt.merge(conn.makeSuffix(filter));
+ stmts.push(stmt);
+
+ const sql = ParameterizedSQL.join(stmts, ';');
+ const result = await conn.executeStmt(sql, myOptions);
+
+ const logs = [];
+ for (const row of result) {
+ const changes = [];
+ const oldInstance = JSON.parse(row.oldInstance) || {};
+ const newInstance = JSON.parse(row.newInstance) || {};
+ const mergedProperties = [...Object.keys(oldInstance), ...Object.keys(newInstance)];
+ const properties = new Set(mergedProperties);
+ for (const property of properties) {
+ let oldValue = oldInstance[property];
+ let newValue = newInstance[property];
+
+ const change = {
+ property: property,
+ before: oldValue,
+ after: newValue,
+ };
+
+ changes.push(change);
+ }
+
+ logs.push({
+ model: row.changedModel,
+ action: row.action,
+ created: row.created,
+ userFk: row.userFk,
+ userName: row.userName,
+ changes: changes,
+ });
+ }
+
+ return logs;
+ };
+};
diff --git a/modules/claim/back/methods/claim/specs/createFromSales.spec.js b/modules/claim/back/methods/claim/specs/createFromSales.spec.js
index 7cf663caf..fe009c1c3 100644
--- a/modules/claim/back/methods/claim/specs/createFromSales.spec.js
+++ b/modules/claim/back/methods/claim/specs/createFromSales.spec.js
@@ -2,9 +2,9 @@ const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('Claim createFromSales()', () => {
- const ticketId = 16;
+ const ticketId = 23;
const newSale = [{
- id: 3,
+ id: 31,
instance: 0,
quantity: 10
}];
diff --git a/modules/claim/back/methods/claim/specs/log.spec.js b/modules/claim/back/methods/claim/specs/log.spec.js
new file mode 100644
index 000000000..0ae534f1e
--- /dev/null
+++ b/modules/claim/back/methods/claim/specs/log.spec.js
@@ -0,0 +1,23 @@
+const app = require('vn-loopback/server/server');
+
+describe('claim log()', () => {
+ const claimId = 1;
+ const salesPersonId = 18;
+
+ it('should return results filtering by user id', async() => {
+ const result = await app.models.Claim.logs({args: {userFk: salesPersonId}}, claimId);
+
+ const expectedObject = {
+ model: 'Claim',
+ action: 'update',
+ changes: [
+ {property: 'hasToPickUp', before: false, after: true}
+ ]
+ };
+
+ const firstRow = result[0];
+
+ expect(result.length).toBeGreaterThan(0);
+ expect(firstRow).toEqual(jasmine.objectContaining(expectedObject));
+ });
+});
diff --git a/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js b/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js
index bf26d2255..276843c32 100644
--- a/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js
+++ b/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js
@@ -1,4 +1,5 @@
const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
describe('claim regularizeClaim()', () => {
const userId = 18;
@@ -39,6 +40,20 @@ describe('claim regularizeClaim()', () => {
return await models.ClaimEnd.create(claimEnds, options);
}
+ beforeAll(async() => {
+ const activeCtx = {
+ accessToken: {userId: 9},
+ http: {
+ req: {
+ headers: {origin: 'http://localhost'}
+ }
+ }
+ };
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+ });
+
it('should send a chat message with value "Trash" and then change claim state to resolved', async() => {
const tx = await models.Claim.beginTransaction({});
diff --git a/modules/claim/back/methods/claim/updateClaim.js b/modules/claim/back/methods/claim/updateClaim.js
index cc9937c19..5271136d6 100644
--- a/modules/claim/back/methods/claim/updateClaim.js
+++ b/modules/claim/back/methods/claim/updateClaim.js
@@ -2,6 +2,7 @@ const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethod('updateClaim', {
description: 'Update a claim with privileges',
+ accessType: 'WRITE',
accepts: [{
arg: 'ctx',
type: 'object',
@@ -78,11 +79,11 @@ module.exports = Self => {
// Validate when claimState has been changed
if (args.claimStateFk) {
- const canUpdate = await canChangeState(ctx, claim.claimStateFk, myOptions);
- const hasRights = await canChangeState(ctx, args.claimStateFk, myOptions);
+ const canEditOldState = await models.ClaimState.isEditable(ctx, claim.claimStateFk, myOptions);
+ const canEditNewState = await models.ClaimState.isEditable(ctx, args.claimStateFk, myOptions);
const isClaimManager = await models.Account.hasRole(userId, 'claimManager', myOptions);
- if (!canUpdate || !hasRights || changedHasToPickUp && !isClaimManager)
+ if (!canEditOldState || !canEditNewState || changedHasToPickUp && !isClaimManager)
throw new UserError(`You don't have enough privileges to change that field`);
}
@@ -113,21 +114,6 @@ module.exports = Self => {
}
};
- async function canChangeState(ctx, id, options) {
- let models = Self.app.models;
- let userId = ctx.req.accessToken.userId;
-
- let state = await models.ClaimState.findById(id, {
- include: {
- relation: 'writeRole'
- }
- }, options);
- let stateRole = state.writeRole().name;
- let canUpdate = await models.Account.hasRole(userId, stateRole, options);
-
- return canUpdate;
- }
-
async function notifyStateChange(ctx, workerId, claim, state) {
const models = Self.app.models;
const origin = ctx.req.headers.origin;
diff --git a/modules/claim/back/models/claim-beginning.js b/modules/claim/back/models/claim-beginning.js
index 681aaebc7..4b870e5ea 100644
--- a/modules/claim/back/models/claim-beginning.js
+++ b/modules/claim/back/models/claim-beginning.js
@@ -10,8 +10,16 @@ module.exports = Self => {
});
Self.observe('before save', async ctx => {
- if (ctx.isNewInstance) return;
- await claimIsEditable(ctx);
+ if (ctx.isNewInstance) {
+ const models = Self.app.models;
+ const options = ctx.options;
+ const instance = ctx.instance;
+ const ticket = await models.Sale.findById(instance.saleFk, {fields: ['ticketFk']}, options);
+ const claim = await models.Claim.findById(instance.claimFk, {fields: ['ticketFk']}, options);
+ if (ticket.ticketFk != claim.ticketFk)
+ throw new UserError(`Cannot create a new claimBeginning from a different ticket`);
+ }
+ // await claimIsEditable(ctx);
});
Self.observe('before delete', async ctx => {
@@ -22,8 +30,28 @@ module.exports = Self => {
async function claimIsEditable(ctx) {
const loopBackContext = LoopBackContext.getCurrentContext();
const httpCtx = {req: loopBackContext.active};
+ const models = Self.app.models;
+ const myOptions = {};
+
+ if (ctx.options && ctx.options.transaction)
+ myOptions.transaction = ctx.options.transaction;
+
const claimBeginning = await Self.findById(ctx.where.id);
- const isEditable = await Self.app.models.Claim.isEditable(httpCtx, claimBeginning.claimFk);
+
+ const filter = {
+ where: {id: claimBeginning.claimFk},
+ include: [
+ {
+ relation: 'claimState',
+ scope: {
+ fields: ['id', 'code', 'description']
+ }
+ }
+ ]
+ };
+
+ const [claim] = await models.Claim.find(filter, myOptions);
+ const isEditable = await models.ClaimState.isEditable(httpCtx, claim.claimState().id);
if (!isEditable)
throw new UserError(`The current claim can't be modified`);
diff --git a/modules/claim/back/models/claim-state.js b/modules/claim/back/models/claim-state.js
new file mode 100644
index 000000000..e0df5ac4d
--- /dev/null
+++ b/modules/claim/back/models/claim-state.js
@@ -0,0 +1,3 @@
+module.exports = Self => {
+ require('../methods/claim-state/isEditable')(Self);
+};
diff --git a/modules/claim/back/models/claim.js b/modules/claim/back/models/claim.js
index c9d7ee7d4..8e652f9fb 100644
--- a/modules/claim/back/models/claim.js
+++ b/modules/claim/back/models/claim.js
@@ -6,9 +6,9 @@ module.exports = Self => {
require('../methods/claim/regularizeClaim')(Self);
require('../methods/claim/uploadFile')(Self);
require('../methods/claim/updateClaimAction')(Self);
- require('../methods/claim/isEditable')(Self);
require('../methods/claim/updateClaimDestination')(Self);
require('../methods/claim/downloadFile')(Self);
require('../methods/claim/claimPickupPdf')(Self);
require('../methods/claim/claimPickupEmail')(Self);
+ require('../methods/claim/logs')(Self);
};
diff --git a/modules/claim/back/models/claim.json b/modules/claim/back/models/claim.json
index 14c4f3452..4b26720e5 100644
--- a/modules/claim/back/models/claim.json
+++ b/modules/claim/back/models/claim.json
@@ -77,6 +77,16 @@
"type": "belongsTo",
"model": "Ticket",
"foreignKey": "ticketFk"
- }
+ },
+ "claimDms": {
+ "type": "hasMany",
+ "model": "ClaimDms",
+ "foreignKey": "claimFk"
+ },
+ "lines": {
+ "type": "hasMany",
+ "model": "ClaimBeginning",
+ "foreignKey": "claimFk"
+ }
}
}
diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html
index 35e788290..81b14d3a7 100644
--- a/modules/claim/front/action/index.html
+++ b/modules/claim/front/action/index.html
@@ -101,7 +101,7 @@
- {{::saleClaimed.itemFk | zeroFill:6}}
+ {{::saleClaimed.itemFk}}
diff --git a/modules/claim/front/descriptor/index.html b/modules/claim/front/descriptor/index.html
index f346ecf17..5fd198440 100644
--- a/modules/claim/front/descriptor/index.html
+++ b/modules/claim/front/descriptor/index.html
@@ -86,7 +86,20 @@
icon="icon-ticket">
-
+
-
- {{::claim.description}}
+
+ {{::claim.stateDescription}}
diff --git a/modules/claim/front/index/index.js b/modules/claim/front/index/index.js
index 084618e16..e3fdabf79 100644
--- a/modules/claim/front/index/index.js
+++ b/modules/claim/front/index/index.js
@@ -55,13 +55,13 @@ class Controller extends Section {
}
}
- stateColor(claim) {
- switch (claim.description) {
- case 'Pendiente':
+ stateColor(code) {
+ switch (code) {
+ case 'pending':
return 'warning';
- case 'Gestionado':
+ case 'managed':
return 'notice';
- case 'Resuelto':
+ case 'resolved':
return 'success';
}
}
diff --git a/modules/claim/front/locale/es.yml b/modules/claim/front/locale/es.yml
index 5abdc1535..419e62f56 100644
--- a/modules/claim/front/locale/es.yml
+++ b/modules/claim/front/locale/es.yml
@@ -18,3 +18,5 @@ Claim deleted!: Reclamación eliminada!
claim: reclamación
Photos: Fotos
Go to the claim: Ir a la reclamación
+Sale tracking: Líneas preparadas
+Ticket tracking: Estados del ticket
diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html
index 6adbfd684..3115cb451 100644
--- a/modules/claim/front/summary/index.html
+++ b/modules/claim/front/summary/index.html
@@ -115,7 +115,7 @@
- {{::saleClaimed.sale.itemFk | zeroFill:6}}
+ {{::saleClaimed.sale.itemFk}}
{{::saleClaimed.sale.ticket.landed | date: 'dd/MM/yyyy'}}
@@ -241,7 +241,7 @@
- {{::action.sale.itemFk | zeroFill:6}}
+ {{::action.sale.itemFk}}
diff --git a/modules/client/back/methods/client/campaignMetricsEmail.js b/modules/client/back/methods/client/campaignMetricsEmail.js
index bb57f90a0..3a1bac5e6 100644
--- a/modules/client/back/methods/client/campaignMetricsEmail.js
+++ b/modules/client/back/methods/client/campaignMetricsEmail.js
@@ -51,19 +51,5 @@ module.exports = Self => {
}
});
- Self.campaignMetricsEmail = async ctx => {
- const args = Object.assign({}, ctx.args);
- const params = {
- recipient: args.recipient,
- lang: ctx.req.getLocale()
- };
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const email = new Email('campaign-metrics', params);
-
- return email.send();
- };
+ Self.campaignMetricsEmail = ctx => Self.sendTemplate(ctx, 'campaign-metrics');
};
diff --git a/modules/client/back/methods/client/campaignMetricsPdf.js b/modules/client/back/methods/client/campaignMetricsPdf.js
index 14194d62b..e163b0619 100644
--- a/modules/client/back/methods/client/campaignMetricsPdf.js
+++ b/modules/client/back/methods/client/campaignMetricsPdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('campaignMetricsPdf', {
description: 'Returns the campaign metrics pdf',
@@ -50,17 +48,5 @@ module.exports = Self => {
}
});
- Self.campaignMetricsPdf = async(ctx, id) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const report = new Report('campaign-metrics', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'campaign-metrics');
};
diff --git a/modules/client/back/methods/client/checkDuplicated.js b/modules/client/back/methods/client/checkDuplicated.js
deleted file mode 100644
index 522cd088f..000000000
--- a/modules/client/back/methods/client/checkDuplicated.js
+++ /dev/null
@@ -1,63 +0,0 @@
-module.exports = Self => {
- Self.remoteMethod('checkDuplicatedData', {
- description: 'Checks if a client has same email, mobile or phone than other client and send an email',
- accepts: [{
- arg: 'id',
- type: 'number',
- required: true,
- description: 'The client id'
- }],
- returns: {
- type: 'object',
- root: true
- },
- http: {
- verb: 'GET',
- path: '/:id/checkDuplicatedData'
- }
- });
-
- Self.checkDuplicatedData = async function(id, options) {
- const myOptions = {};
-
- if (typeof options == 'object')
- Object.assign(myOptions, options);
-
- const client = await Self.app.models.Client.findById(id, myOptions);
-
- const findParams = [];
- if (client.email) {
- const emails = client.email.split(',');
- for (let email of emails)
- findParams.push({email: email});
- }
-
- if (client.phone)
- findParams.push({phone: client.phone});
-
- if (client.mobile)
- findParams.push({mobile: client.mobile});
-
- const filterObj = {
- where: {
- and: [
- {or: findParams},
- {id: {neq: client.id}}
- ]
- }
- };
-
- const clientSameData = await Self.findOne(filterObj, myOptions);
-
- if (clientSameData) {
- await Self.app.models.Mail.create({
- receiver: 'direccioncomercial@verdnatura.es',
- subject: `Cliente con email/teléfono/móvil duplicados`,
- body: 'El cliente ' + client.id + ' comparte alguno de estos datos con el cliente ' + clientSameData.id +
- '\n- Email: ' + client.email +
- '\n- Teléfono: ' + client.phone +
- '\n- Móvil: ' + client.mobile
- }, myOptions);
- }
- };
-};
diff --git a/modules/client/back/methods/client/clientDebtStatementEmail.js b/modules/client/back/methods/client/clientDebtStatementEmail.js
index 8bcdc900f..1b3ab13d8 100644
--- a/modules/client/back/methods/client/clientDebtStatementEmail.js
+++ b/modules/client/back/methods/client/clientDebtStatementEmail.js
@@ -46,19 +46,5 @@ module.exports = Self => {
}
});
- Self.clientDebtStatementEmail = async ctx => {
- const args = Object.assign({}, ctx.args);
- const params = {
- recipient: args.recipient,
- lang: ctx.req.getLocale()
- };
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const email = new Email('client-debt-statement', params);
-
- return email.send();
- };
+ Self.clientDebtStatementEmail = ctx => Self.sendTemplate(ctx, 'client-debt-statement');
};
diff --git a/modules/client/back/methods/client/clientDebtStatementHtml.js b/modules/client/back/methods/client/clientDebtStatementHtml.js
index bfed696bc..8752b48d2 100644
--- a/modules/client/back/methods/client/clientDebtStatementHtml.js
+++ b/modules/client/back/methods/client/clientDebtStatementHtml.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('clientDebtStatementHtml', {
description: 'Returns the client debt statement email preview',
@@ -45,21 +43,5 @@ module.exports = Self => {
}
});
- Self.clientDebtStatementHtml = async(ctx, id) => {
- const {accessToken} = ctx.req;
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- params.isPreview = true;
- params.access_token = accessToken.id;
-
- const report = new Email('client-debt-statement', params);
- const html = await report.render();
-
- return [html, 'text/html', `filename="mail-${id}.pdf"`];
- };
+ Self.clientDebtStatementHtml = (ctx, id) => Self.printEmail(ctx, id, 'client-debt-statement');
};
diff --git a/modules/client/back/methods/client/clientDebtStatementPdf.js b/modules/client/back/methods/client/clientDebtStatementPdf.js
index 8e2dca314..845527ace 100644
--- a/modules/client/back/methods/client/clientDebtStatementPdf.js
+++ b/modules/client/back/methods/client/clientDebtStatementPdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('clientDebtStatementPdf', {
description: 'Returns the client debt statement pdf',
@@ -45,17 +43,5 @@ module.exports = Self => {
}
});
- Self.clientDebtStatementPdf = async(ctx, id) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const report = new Report('client-debt-statement', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.clientDebtStatementPdf = (ctx, id) => Self.printReport(ctx, id, 'client-debt-statement');
};
diff --git a/modules/client/back/methods/client/clientWelcomeEmail.js b/modules/client/back/methods/client/clientWelcomeEmail.js
index 318ee18e6..accf12bb8 100644
--- a/modules/client/back/methods/client/clientWelcomeEmail.js
+++ b/modules/client/back/methods/client/clientWelcomeEmail.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('clientWelcomeEmail', {
description: 'Sends the client welcome email with an attached PDF',
@@ -41,19 +39,5 @@ module.exports = Self => {
}
});
- Self.clientWelcomeEmail = async ctx => {
- const args = Object.assign({}, ctx.args);
- const params = {
- recipient: args.recipient,
- lang: ctx.req.getLocale()
- };
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const email = new Email('client-welcome', params);
-
- return email.send();
- };
+ Self.clientWelcomeEmail = ctx => Self.sendTemplate(ctx, 'client-welcome');
};
diff --git a/modules/client/back/methods/client/clientWelcomeHtml.js b/modules/client/back/methods/client/clientWelcomeHtml.js
index dfb560326..093a06d8e 100644
--- a/modules/client/back/methods/client/clientWelcomeHtml.js
+++ b/modules/client/back/methods/client/clientWelcomeHtml.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('clientWelcomeHtml', {
description: 'Returns the client welcome email preview',
@@ -40,19 +38,5 @@ module.exports = Self => {
}
});
- Self.clientWelcomeHtml = async(ctx, id) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- params.isPreview = true;
-
- const report = new Email('client-welcome', params);
- const html = await report.render();
-
- return [html, 'text/html', `filename="mail-${id}.pdf"`];
- };
+ Self.clientWelcomeHtml = (ctx, id) => Self.printEmail(ctx, id, 'client-welcome');
};
diff --git a/modules/client/back/methods/client/createReceipt.js b/modules/client/back/methods/client/createReceipt.js
index 74fe2211e..cb032270a 100644
--- a/modules/client/back/methods/client/createReceipt.js
+++ b/modules/client/back/methods/client/createReceipt.js
@@ -67,7 +67,7 @@ module.exports = function(Self) {
try {
delete args.ctx; // Remove unwanted properties
- const newReceipt = await models.Receipt.create(args, myOptions);
+
const originalClient = await models.Client.findById(args.clientFk, null, myOptions);
const bank = await models.Bank.findById(args.bankFk, null, myOptions);
const accountingType = await models.AccountingType.findById(bank.accountingTypeFk, null, myOptions);
@@ -76,23 +76,8 @@ module.exports = function(Self) {
if (!args.compensationAccount)
throw new UserError('Compensation account is empty');
- const supplierCompensation = await models.Supplier.findOne({
- where: {
- account: args.compensationAccount
- }
- }, myOptions);
-
- let clientCompensation = {};
-
- if (!supplierCompensation) {
- clientCompensation = await models.Client.findOne({
- where: {
- accountingAccount: args.compensationAccount
- }
- }, myOptions);
- }
- if (!supplierCompensation && !clientCompensation)
- throw new UserError('Invalid account');
+ // Check compensation account exists
+ await models.Client.getClientOrSupplierReference(args.compensationAccount, myOptions);
await Self.rawSql(
`CALL vn.ledger_doCompensation(?, ?, ?, ?, ?, ?, ?)`,
@@ -151,7 +136,7 @@ module.exports = function(Self) {
myOptions
);
}
-
+ const newReceipt = await models.Receipt.create(args, myOptions);
if (tx) await tx.commit();
return newReceipt;
diff --git a/modules/client/back/methods/client/creditRequestEmail.js b/modules/client/back/methods/client/creditRequestEmail.js
index b6a60e971..0255949e0 100644
--- a/modules/client/back/methods/client/creditRequestEmail.js
+++ b/modules/client/back/methods/client/creditRequestEmail.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('clientCreditEmail', {
description: 'Sends the credit request email with an attached PDF',
@@ -10,7 +8,7 @@ module.exports = Self => {
type: 'number',
required: true,
description: 'The client id',
- http: {source: 'path'}
+ http: {source: 'path'},
},
{
arg: 'recipient',
@@ -22,38 +20,25 @@ module.exports = Self => {
arg: 'replyTo',
type: 'string',
description: 'The sender email to reply to',
- required: false
+ required: false,
},
{
arg: 'recipientId',
type: 'number',
- description: 'The recipient id to send to the recipient preferred language',
- required: false
- }
+ description:
+ 'The recipient id to send to the recipient preferred language',
+ required: false,
+ },
],
returns: {
type: ['object'],
- root: true
+ root: true,
},
http: {
path: '/:id/credit-request-email',
- verb: 'POST'
- }
+ verb: 'POST',
+ },
});
- Self.clientCreditEmail = async ctx => {
- const args = Object.assign({}, ctx.args);
- const params = {
- recipient: args.recipient,
- lang: ctx.req.getLocale()
- };
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const email = new Email('credit-request', params);
-
- return email.send();
- };
+ Self.clientCreditEmail = ctx => Self.sendTemplate(ctx, 'credit-request');
};
diff --git a/modules/client/back/methods/client/creditRequestHtml.js b/modules/client/back/methods/client/creditRequestHtml.js
index 6b2d7fe4e..fbd6cacb9 100644
--- a/modules/client/back/methods/client/creditRequestHtml.js
+++ b/modules/client/back/methods/client/creditRequestHtml.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('creditRequestHtml', {
description: 'Returns the credit request email preview',
@@ -40,21 +38,5 @@ module.exports = Self => {
}
});
- Self.creditRequestHtml = async(ctx, id) => {
- const {accessToken} = ctx.req;
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- params.isPreview = true;
- params.access_token = accessToken.id;
-
- const report = new Email('credit-request', params);
- const html = await report.render();
-
- return [html, 'text/html', `filename="mail-${id}.pdf"`];
- };
+ Self.creditRequestHtml = (ctx, id) => Self.printEmail(ctx, id, 'credit-request');
};
diff --git a/modules/client/back/methods/client/creditRequestPdf.js b/modules/client/back/methods/client/creditRequestPdf.js
index 2e3dc0619..a4f4ed128 100644
--- a/modules/client/back/methods/client/creditRequestPdf.js
+++ b/modules/client/back/methods/client/creditRequestPdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('creditRequestPdf', {
description: 'Returns the credit request pdf',
@@ -40,17 +38,5 @@ module.exports = Self => {
}
});
- Self.creditRequestPdf = async(ctx, id) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const report = new Report('credit-request', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.creditRequestPdf = (ctx, id) => Self.printReport(ctx, id, 'credit-request');
};
diff --git a/modules/client/back/methods/client/extendedListFilter.js b/modules/client/back/methods/client/extendedListFilter.js
index 8e02cd413..27bbe2a35 100644
--- a/modules/client/back/methods/client/extendedListFilter.js
+++ b/modules/client/back/methods/client/extendedListFilter.js
@@ -97,7 +97,7 @@ module.exports = Self => {
const stmts = [];
const stmt = new ParameterizedSQL(
- `SELECT
+ `SELECT
c.id,
c.name,
c.socialName,
diff --git a/modules/client/back/methods/client/getCard.js b/modules/client/back/methods/client/getCard.js
index afbe36e49..a2365ee25 100644
--- a/modules/client/back/methods/client/getCard.js
+++ b/modules/client/back/methods/client/getCard.js
@@ -80,6 +80,7 @@ module.exports = function(Self) {
const data = await Self.rawSql(query, [id, date], myOptions);
client.debt = data[0].debt;
+ client.unpaid = await Self.app.models.ClientUnpaid.findById(id, null, myOptions);
return client;
};
diff --git a/modules/client/back/methods/client/getClientOrSupplierReference.js b/modules/client/back/methods/client/getClientOrSupplierReference.js
new file mode 100644
index 000000000..4c7201ee3
--- /dev/null
+++ b/modules/client/back/methods/client/getClientOrSupplierReference.js
@@ -0,0 +1,57 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.remoteMethod('getClientOrSupplierReference', {
+ description: 'Returns the reference of a compensation providing a bank account',
+ accessType: 'READ',
+ accepts: {
+ arg: 'bankAccount',
+ type: 'number',
+ required: true,
+ description: 'The bank account of a client or a supplier'
+ },
+ returns: {
+ type: 'string',
+ root: true
+ },
+ http: {
+ path: `/getClientOrSupplierReference`,
+ verb: 'GET'
+ }
+ });
+
+ Self.getClientOrSupplierReference = async(bankAccount, options) => {
+ const models = Self.app.models;
+ const myOptions = {};
+ let reference = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const supplierCompensation = await models.Supplier.findOne({
+ where: {
+ account: bankAccount
+ }
+ }, myOptions);
+
+ reference.supplierId = supplierCompensation?.id;
+ reference.supplierName = supplierCompensation?.name;
+
+ let clientCompensation = {};
+
+ if (!supplierCompensation) {
+ clientCompensation = await models.Client.findOne({
+ where: {
+ accountingAccount: bankAccount
+ }
+ }, myOptions);
+ reference.clientId = clientCompensation?.id;
+ reference.clientName = clientCompensation?.name;
+ }
+
+ if (!supplierCompensation && !clientCompensation)
+ throw new UserError('Invalid account');
+
+ return reference;
+ };
+};
diff --git a/modules/client/back/methods/client/getTransactions.js b/modules/client/back/methods/client/getTransactions.js
deleted file mode 100644
index 45183bbdc..000000000
--- a/modules/client/back/methods/client/getTransactions.js
+++ /dev/null
@@ -1,49 +0,0 @@
-
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
-
-module.exports = Self => {
- Self.remoteMethod('getTransactions', {
- description: 'Returns last entries',
- accessType: 'READ',
- accepts: [{
- arg: 'filter',
- type: 'object',
- description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
- http: {source: 'query'}
- }],
- returns: {
- type: ['object'],
- root: true
- },
- http: {
- path: `/getTransactions`,
- verb: 'GET'
- }
- });
-
- Self.getTransactions = async(filter, options) => {
- const myOptions = {};
-
- if (typeof options == 'object')
- Object.assign(myOptions, options);
-
- const conn = Self.dataSource.connector;
- const stmt = new ParameterizedSQL(`
- SELECT
- t.id,
- t.clientFk,
- t.created,
- t.amount / 100 amount,
- t.receiptFk IS NOT NULL AS isConfirmed,
- tt.message responseMessage,
- te.message errorMessage
- FROM hedera.tpvTransaction t
- JOIN hedera.tpvMerchant m ON m.id = t.merchantFk
- LEFT JOIN hedera.tpvResponse tt ON tt.id = t.response
- LEFT JOIN hedera.tpvError te ON te.code = errorCode`);
-
- stmt.merge(conn.makeSuffix(filter, 't'));
-
- return Self.rawStmt(stmt, myOptions);
- };
-};
diff --git a/modules/client/back/methods/client/incotermsAuthorizationEmail.js b/modules/client/back/methods/client/incotermsAuthorizationEmail.js
index 2a4fe593a..4a21f20b0 100644
--- a/modules/client/back/methods/client/incotermsAuthorizationEmail.js
+++ b/modules/client/back/methods/client/incotermsAuthorizationEmail.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('incotermsAuthorizationEmail', {
description: 'Sends the incoterms authorization email with an attached PDF',
@@ -47,19 +45,5 @@ module.exports = Self => {
}
});
- Self.incotermsAuthorizationEmail = async ctx => {
- const args = Object.assign({}, ctx.args);
- const params = {
- recipient: args.recipient,
- lang: ctx.req.getLocale()
- };
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const email = new Email('incoterms-authorization', params);
-
- return email.send();
- };
+ Self.incotermsAuthorizationEmail = ctx => Self.sendTemplate(ctx, 'incoterms-authorization');
};
diff --git a/modules/client/back/methods/client/incotermsAuthorizationHtml.js b/modules/client/back/methods/client/incotermsAuthorizationHtml.js
index 875495d93..0a6bba0a8 100644
--- a/modules/client/back/methods/client/incotermsAuthorizationHtml.js
+++ b/modules/client/back/methods/client/incotermsAuthorizationHtml.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('incotermsAuthorizationHtml', {
description: 'Returns the incoterms authorization email preview',
@@ -46,21 +44,5 @@ module.exports = Self => {
}
});
- Self.incotermsAuthorizationHtml = async(ctx, id) => {
- const {accessToken} = ctx.req;
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- params.isPreview = true;
- params.access_token = accessToken.id;
-
- const report = new Email('incoterms-authorization', params);
- const html = await report.render();
-
- return [html, 'text/html', `filename="mail-${id}.pdf"`];
- };
+ Self.incotermsAuthorizationHtml = (ctx, id) => Self.printEmail(ctx, id, 'incoterms-authorization');
};
diff --git a/modules/client/back/methods/client/incotermsAuthorizationPdf.js b/modules/client/back/methods/client/incotermsAuthorizationPdf.js
index 9a8a8d296..d37e473f1 100644
--- a/modules/client/back/methods/client/incotermsAuthorizationPdf.js
+++ b/modules/client/back/methods/client/incotermsAuthorizationPdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('incotermsAuthorizationPdf', {
description: 'Returns the incoterms authorization pdf',
@@ -46,17 +44,5 @@ module.exports = Self => {
}
});
- Self.incotermsAuthorizationPdf = async(ctx, id) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const report = new Report('incoterms-authorization', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.incotermsAuthorizationPdf = (ctx, id) => Self.printReport(ctx, id, 'incoterms-authorization');
};
diff --git a/modules/client/back/methods/client/letterDebtorNdEmail.js b/modules/client/back/methods/client/letterDebtorNdEmail.js
index e188c6e0a..396acdb97 100644
--- a/modules/client/back/methods/client/letterDebtorNdEmail.js
+++ b/modules/client/back/methods/client/letterDebtorNdEmail.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('letterDebtorNdEmail', {
description: 'Sends the second debtor letter email with an attached PDF',
@@ -47,19 +45,5 @@ module.exports = Self => {
}
});
- Self.letterDebtorNdEmail = async ctx => {
- const args = Object.assign({}, ctx.args);
- const params = {
- recipient: args.recipient,
- lang: ctx.req.getLocale()
- };
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const email = new Email('letter-debtor-nd', params);
-
- return email.send();
- };
+ Self.letterDebtorNdEmail = ctx => Self.sendTemplate(ctx, 'letter-debtor-nd');
};
diff --git a/modules/client/back/methods/client/letterDebtorNdHtml.js b/modules/client/back/methods/client/letterDebtorNdHtml.js
index 320fbaef3..f14f96dea 100644
--- a/modules/client/back/methods/client/letterDebtorNdHtml.js
+++ b/modules/client/back/methods/client/letterDebtorNdHtml.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('letterDebtorNdHtml', {
description: 'Returns the second letter debtor email preview',
@@ -46,21 +44,5 @@ module.exports = Self => {
}
});
- Self.letterDebtorNdHtml = async(ctx, id) => {
- const {accessToken} = ctx.req;
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- params.isPreview = true;
- params.access_token = accessToken.id;
-
- const report = new Email('letter-debtor-nd', params);
- const html = await report.render();
-
- return [html, 'text/html', `filename="mail-${id}.pdf"`];
- };
+ Self.letterDebtorNdHtml = (ctx, id) => Self.printEmail(ctx, id, 'letter-debtor-nd');
};
diff --git a/modules/client/back/methods/client/letterDebtorPdf.js b/modules/client/back/methods/client/letterDebtorPdf.js
index 421d531e6..943869143 100644
--- a/modules/client/back/methods/client/letterDebtorPdf.js
+++ b/modules/client/back/methods/client/letterDebtorPdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('letterDebtorPdf', {
description: 'Returns the letter debtor pdf',
@@ -46,17 +44,5 @@ module.exports = Self => {
}
});
- Self.letterDebtorPdf = async(ctx, id) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const report = new Report('letter-debtor', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.letterDebtorPdf = (ctx, id) => Self.printReport(ctx, id, 'letter-debtor');
};
diff --git a/modules/client/back/methods/client/letterDebtorStEmail.js b/modules/client/back/methods/client/letterDebtorStEmail.js
index ee39a101b..c76204fbc 100644
--- a/modules/client/back/methods/client/letterDebtorStEmail.js
+++ b/modules/client/back/methods/client/letterDebtorStEmail.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('letterDebtorStEmail', {
description: 'Sends the printer setup email with an attached PDF',
@@ -47,19 +45,5 @@ module.exports = Self => {
}
});
- Self.letterDebtorStEmail = async ctx => {
- const args = Object.assign({}, ctx.args);
- const params = {
- recipient: args.recipient,
- lang: ctx.req.getLocale()
- };
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const email = new Email('letter-debtor-st', params);
-
- return email.send();
- };
+ Self.letterDebtorStEmail = ctx => Self.sendTemplate(ctx, 'letter-debtor-st');
};
diff --git a/modules/client/back/methods/client/letterDebtorStHtml.js b/modules/client/back/methods/client/letterDebtorStHtml.js
index acf75272b..a1dcf00d7 100644
--- a/modules/client/back/methods/client/letterDebtorStHtml.js
+++ b/modules/client/back/methods/client/letterDebtorStHtml.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('letterDebtorStHtml', {
description: 'Returns the letter debtor email preview',
@@ -46,21 +44,5 @@ module.exports = Self => {
}
});
- Self.letterDebtorStHtml = async(ctx, id) => {
- const {accessToken} = ctx.req;
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- params.isPreview = true;
- params.access_token = accessToken.id;
-
- const report = new Email('letter-debtor-st', params);
- const html = await report.render();
-
- return [html, 'text/html', `filename="mail-${id}.pdf"`];
- };
+ Self.letterDebtorStHtml = (ctx, id) => Self.printEmail(ctx, id, 'letter-debtor-st');
};
diff --git a/modules/client/back/methods/client/printerSetupEmail.js b/modules/client/back/methods/client/printerSetupEmail.js
index 254948659..2a0903e90 100644
--- a/modules/client/back/methods/client/printerSetupEmail.js
+++ b/modules/client/back/methods/client/printerSetupEmail.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('printerSetupEmail', {
description: 'Sends the printer setup email with an attached PDF',
@@ -41,19 +39,5 @@ module.exports = Self => {
}
});
- Self.printerSetupEmail = async ctx => {
- const args = Object.assign({}, ctx.args);
- const params = {
- recipient: args.recipient,
- lang: ctx.req.getLocale()
- };
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const email = new Email('printer-setup', params);
-
- return email.send();
- };
+ Self.printerSetupEmail = ctx => Self.sendTemplate(ctx, 'printer-setup');
};
diff --git a/modules/client/back/methods/client/printerSetupHtml.js b/modules/client/back/methods/client/printerSetupHtml.js
index 1ef1843e0..c9d94d1c2 100644
--- a/modules/client/back/methods/client/printerSetupHtml.js
+++ b/modules/client/back/methods/client/printerSetupHtml.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('printerSetupHtml', {
description: 'Returns the printer setup email preview',
@@ -40,19 +38,5 @@ module.exports = Self => {
}
});
- Self.printerSetupHtml = async(ctx, id) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- params.isPreview = true;
-
- const report = new Email('printer-setup', params);
- const html = await report.render();
-
- return [html, 'text/html', `filename="mail-${id}.pdf"`];
- };
+ Self.printerSetupHtml = (ctx, id) => Self.printEmail(ctx, id, 'printer-setup');
};
diff --git a/modules/client/back/methods/client/sepaCoreEmail.js b/modules/client/back/methods/client/sepaCoreEmail.js
index 93c9d4302..20931eb03 100644
--- a/modules/client/back/methods/client/sepaCoreEmail.js
+++ b/modules/client/back/methods/client/sepaCoreEmail.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('sepaCoreEmail', {
description: 'Sends the campaign metrics email with an attached PDF',
@@ -47,19 +45,5 @@ module.exports = Self => {
}
});
- Self.sepaCoreEmail = async ctx => {
- const args = Object.assign({}, ctx.args);
- const params = {
- recipient: args.recipient,
- lang: ctx.req.getLocale()
- };
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const email = new Email('sepa-core', params);
-
- return email.send();
- };
+ Self.sepaCoreEmail = ctx => Self.sendTemplate(ctx, 'sepa-core');
};
diff --git a/modules/client/back/methods/client/specs/checkDuplicated.spec.js b/modules/client/back/methods/client/specs/checkDuplicated.spec.js
deleted file mode 100644
index 1b682ca35..000000000
--- a/modules/client/back/methods/client/specs/checkDuplicated.spec.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const models = require('vn-loopback/server/server').models;
-
-describe('client checkDuplicated()', () => {
- it('should send an mail if mobile/phone/email is duplicated', async() => {
- const tx = await models.Client.beginTransaction({});
-
- try {
- const options = {transaction: tx};
-
- const id = 1110;
- const mailModel = models.Mail;
- spyOn(mailModel, 'create');
-
- await models.Client.checkDuplicatedData(id, options);
-
- expect(mailModel.create).toHaveBeenCalled();
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
- });
-});
diff --git a/modules/client/back/methods/client/specs/createWithUser.spec.js b/modules/client/back/methods/client/specs/createWithUser.spec.js
index 7d4261aee..4cc51c93c 100644
--- a/modules/client/back/methods/client/specs/createWithUser.spec.js
+++ b/modules/client/back/methods/client/specs/createWithUser.spec.js
@@ -10,7 +10,8 @@ describe('Client Create', () => {
socialName: 'Deadpool Marvel',
street: 'Wall Street',
city: 'New York',
- businessTypeFk: 'florist'
+ businessTypeFk: 'florist',
+ provinceFk: 1
};
beforeAll(async() => {
diff --git a/modules/client/back/methods/client/specs/getTransactions.spec.js b/modules/client/back/methods/client/specs/getTransactions.spec.js
deleted file mode 100644
index 0387eb59a..000000000
--- a/modules/client/back/methods/client/specs/getTransactions.spec.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const models = require('vn-loopback/server/server').models;
-
-describe('Client getTransations', () => {
- it('should call getTransations() method to receive a list of Web Payments from Bruce Wayne', async() => {
- const tx = await models.Client.beginTransaction({});
-
- try {
- const options = {transaction: tx};
-
- const filter = {where: {clientFk: 1101}};
- const result = await models.Client.getTransactions(filter, options);
-
- expect(result[1].id).toBeTruthy();
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
- });
-});
diff --git a/modules/client/back/methods/client/specs/transactions.spec.js b/modules/client/back/methods/client/specs/transactions.spec.js
new file mode 100644
index 000000000..b4af40195
--- /dev/null
+++ b/modules/client/back/methods/client/specs/transactions.spec.js
@@ -0,0 +1,66 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('Client transactions', () => {
+ it('should call transactions() method to receive a list of Web Payments from Bruce Wayne', async() => {
+ const tx = await models.Client.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {};
+ const filter = {where: {clientFk: 1101}};
+ const result = await models.Client.transactions(ctx, filter, options);
+
+ expect(result[1].id).toBeTruthy();
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should call transactions() method filtering by orderFk', async() => {
+ const tx = await models.Client.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {args: {orderFk: 6}};
+ const filter = {};
+ const result = await models.Client.transactions(ctx, filter, options);
+
+ const firstRow = result[0];
+
+ expect(result.length).toEqual(1);
+ expect(firstRow.id).toEqual(6);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should call transactions() method filtering by amount', async() => {
+ const tx = await models.Client.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {args: {amount: 40}};
+ const filter = {};
+ const result = await models.Client.transactions(ctx, filter, options);
+
+ const randomIndex = Math.floor(Math.random() * result.length);
+ const transaction = result[randomIndex];
+
+ expect(transaction.amount).toEqual(40);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/client/back/methods/client/transactions.js b/modules/client/back/methods/client/transactions.js
new file mode 100644
index 000000000..691910721
--- /dev/null
+++ b/modules/client/back/methods/client/transactions.js
@@ -0,0 +1,84 @@
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const buildFilter = require('vn-loopback/util/filter').buildFilter;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+
+module.exports = Self => {
+ Self.remoteMethodCtx('transactions', {
+ description: 'Returns customer transactions',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'filter',
+ type: 'object',
+ description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
+ http: {source: 'query'}
+ },
+ {
+ arg: 'orderFk',
+ type: 'number',
+ http: {source: 'query'}
+ },
+ {
+ arg: 'clientFk',
+ type: 'number',
+ http: {source: 'query'}
+ },
+ {
+ arg: 'amount',
+ type: 'number',
+ http: {source: 'query'}
+ }
+ ],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/transactions`,
+ verb: 'GET'
+ }
+ });
+
+ Self.transactions = async(ctx, filter, options) => {
+ const args = ctx.args;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const where = buildFilter(args, (param, value) => {
+ switch (param) {
+ case 'orderFk':
+ return {'t.id': value};
+ case 'clientFk':
+ return {'t.clientFk': value};
+ case 'amount':
+ return {'t.amount': (value * 100)};
+ }
+ });
+
+ filter = mergeFilters(filter, {where});
+
+ const conn = Self.dataSource.connector;
+ const stmt = new ParameterizedSQL(`
+ SELECT
+ t.id,
+ t.clientFk,
+ c.name AS customerName,
+ t.created,
+ t.amount / 100 amount,
+ t.receiptFk IS NOT NULL AS isConfirmed,
+ tt.message responseMessage,
+ te.message errorMessage
+ FROM hedera.tpvTransaction t
+ JOIN client c ON c.id = t.clientFk
+ JOIN hedera.tpvMerchant m ON m.id = t.merchantFk
+ LEFT JOIN hedera.tpvResponse tt ON tt.id = t.response
+ LEFT JOIN hedera.tpvError te ON te.code = errorCode`);
+
+ stmt.merge(conn.makeSuffix(filter, 't'));
+
+ return Self.rawStmt(stmt, myOptions);
+ };
+};
diff --git a/modules/client/back/methods/defaulter/observationEmail.js b/modules/client/back/methods/defaulter/observationEmail.js
new file mode 100644
index 000000000..c3c96010e
--- /dev/null
+++ b/modules/client/back/methods/defaulter/observationEmail.js
@@ -0,0 +1,52 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('observationEmail', {
+ description: 'Send an email with the observation',
+ accessType: 'WRITE',
+ accepts: [
+ {
+ arg: 'defaulters',
+ type: ['object'],
+ required: true,
+ description: 'The defaulters to send the email'
+ },
+ {
+ arg: 'observation',
+ type: 'string',
+ required: true,
+ description: 'The observation'
+ }],
+ returns: {
+ arg: 'observationEmail'
+ },
+ http: {
+ path: `/observationEmail`,
+ verb: 'POST'
+ }
+ });
+
+ Self.observationEmail = async(ctx, defaulters, observation, options) => {
+ const models = Self.app.models;
+ const $t = ctx.req.__; // $translate
+ const myOptions = {};
+ const userId = ctx.req.accessToken.userId;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ for (const defaulter of defaulters) {
+ const user = await models.Account.findById(userId, {fields: ['name']}, myOptions);
+
+ const body = $t('Added observation', {
+ user: user.name,
+ text: observation
+ });
+
+ await models.Mail.create({
+ subject: $t('Comment added to client', {clientFk: defaulter.clientFk}),
+ body: body,
+ receiver: `${defaulter.salesPersonName}@verdnatura.es`,
+ replyTo: `${user.name}@verdnatura.es`
+ }, myOptions);
+ }
+ };
+};
diff --git a/modules/client/back/methods/receipt/balanceCompensationPdf.js b/modules/client/back/methods/receipt/balanceCompensationPdf.js
index ff8713253..e790d54a1 100644
--- a/modules/client/back/methods/receipt/balanceCompensationPdf.js
+++ b/modules/client/back/methods/receipt/balanceCompensationPdf.js
@@ -1,5 +1,3 @@
-const { Report } = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('balanceCompensationPdf', {
description: 'Returns the the debit balances compensation pdf',
@@ -10,7 +8,7 @@ module.exports = Self => {
type: 'number',
required: true,
description: 'The receipt id',
- http: { source: 'path' }
+ http: {source: 'path'}
}
],
returns: [
@@ -34,17 +32,5 @@ module.exports = Self => {
}
});
- Self.balanceCompensationPdf = async(ctx, id) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const report = new Report('balance-compensation', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.balanceCompensationPdf = (ctx, id) => Self.printReport(ctx, id, 'balance-compensation');
};
diff --git a/modules/client/back/methods/receipt/receiptPdf.js b/modules/client/back/methods/receipt/receiptPdf.js
index f55e05040..433f386db 100644
--- a/modules/client/back/methods/receipt/receiptPdf.js
+++ b/modules/client/back/methods/receipt/receiptPdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('receiptPdf', {
description: 'Returns the receipt pdf',
@@ -39,17 +37,5 @@ module.exports = Self => {
}
});
- Self.receiptPdf = async(ctx, id) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const report = new Report('receipt', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.receiptPdf = (ctx, id) => Self.printReport(ctx, id, 'receipt');
};
diff --git a/modules/client/back/methods/tpv-transaction/confirm.js b/modules/client/back/methods/tpv-transaction/confirm.js
index a26e0bad6..41229a1fd 100644
--- a/modules/client/back/methods/tpv-transaction/confirm.js
+++ b/modules/client/back/methods/tpv-transaction/confirm.js
@@ -32,45 +32,66 @@ module.exports = Self => {
Self.confirm = async(signatureVersion, merchantParameters, signature) => {
const $ = Self.app.models;
+ let transaction;
- const decodedParams = JSON.parse(
- base64url.decode(merchantParameters, 'utf8'));
- const params = {};
+ try {
+ const decodedParams = JSON.parse(
+ base64url.decode(merchantParameters, 'utf8'));
+ const params = {};
- for (const param in decodedParams)
- params[param] = decodeURIComponent(decodedParams[param]);
+ for (const param in decodedParams)
+ params[param] = decodeURIComponent(decodedParams[param]);
- const orderId = params['Ds_Order'];
- const merchantId = parseInt(params['Ds_MerchantCode']);
+ const orderId = params['Ds_Order'];
+ if (!orderId)
+ throw new UserError('Order id not provided');
- if (!orderId)
- throw new UserError('Order id not found');
- if (!merchantId)
- throw new UserError('Mechant id not found');
+ transaction = await Self.findById(orderId, {fields: ['id']});
+ if (!transaction)
+ throw new UserError('Order not found');
- const merchant = await $.TpvMerchant.findById(merchantId, {
- fields: ['id', 'secretKey']
- });
+ await transaction.updateAttributes({
+ merchantParameters,
+ signature,
+ signatureVersion,
+ });
- const base64hmac = Self.createSignature(
- orderId,
- merchant.secretKey,
- merchantParameters
- );
+ const merchantId = parseInt(params['Ds_MerchantCode']);
+ if (!merchantId)
+ throw new UserError('Merchant id not provided');
- if (base64hmac !== base64url.toBase64(signature))
- throw new UserError('Invalid signature');
+ const merchant = await $.TpvMerchant.findById(merchantId, {
+ fields: ['id', 'secretKey']
+ });
+ if (!merchant)
+ throw new UserError('Merchant not found');
- await Self.rawSql(
- 'CALL hedera.tpvTransaction_confirm(?, ?, ?, ?, ?, ?)', [
- params['Ds_Amount'],
+ const base64hmac = Self.createSignature(
orderId,
- merchantId,
- params['Ds_Currency'],
- params['Ds_Response'],
- params['Ds_ErrorCode']
- ]);
+ merchant.secretKey,
+ merchantParameters
+ );
- return true;
+ if (base64hmac !== base64url.toBase64(signature))
+ throw new UserError('Invalid signature');
+
+ await Self.rawSql(
+ 'CALL hedera.tpvTransaction_confirm(?, ?, ?, ?, ?, ?)', [
+ params['Ds_Amount'],
+ orderId,
+ merchantId,
+ params['Ds_Currency'],
+ params['Ds_Response'],
+ params['Ds_ErrorCode']
+ ]);
+
+ return true;
+ } catch (err) {
+ if (transaction)
+ await transaction.updateAttribute('responseError', err.message);
+ else
+ console.error(err);
+ throw err;
+ }
};
};
diff --git a/modules/client/back/models/client-methods.js b/modules/client/back/models/client-methods.js
index 4b20a822c..3538dbeb8 100644
--- a/modules/client/back/models/client-methods.js
+++ b/modules/client/back/models/client-methods.js
@@ -2,7 +2,6 @@ module.exports = Self => {
require('../methods/client/addressesPropagateRe')(Self);
require('../methods/client/canBeInvoiced')(Self);
require('../methods/client/canCreateTicket')(Self);
- require('../methods/client/checkDuplicated')(Self);
require('../methods/client/confirmTransaction')(Self);
require('../methods/client/consumption')(Self);
require('../methods/client/createAddress')(Self);
@@ -13,7 +12,7 @@ module.exports = Self => {
require('../methods/client/getCard')(Self);
require('../methods/client/getDebt')(Self);
require('../methods/client/getMana')(Self);
- require('../methods/client/getTransactions')(Self);
+ require('../methods/client/transactions')(Self);
require('../methods/client/hasCustomerRole')(Self);
require('../methods/client/isValidClient')(Self);
require('../methods/client/lastActiveTickets')(Self);
@@ -47,4 +46,5 @@ module.exports = Self => {
require('../methods/client/incotermsAuthorizationEmail')(Self);
require('../methods/client/consumptionSendQueued')(Self);
require('../methods/client/filter')(Self);
+ require('../methods/client/getClientOrSupplierReference')(Self);
};
diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index 2d8e7bd27..c41085b79 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -279,6 +279,18 @@ module.exports = Self => {
// Credit changes
if (changes.credit !== undefined)
await Self.changeCredit(ctx, finalState, changes);
+
+ const oldInstance = {};
+ if (!ctx.isNewInstance) {
+ const newProps = Object.keys(changes);
+ Object.keys(orgData.__data).forEach(prop => {
+ if (newProps.includes(prop))
+ oldInstance[prop] = orgData[prop];
+ });
+ }
+
+ ctx.hookState.oldInstance = oldInstance;
+ ctx.hookState.newInstance = changes;
});
Self.observe('after save', async ctx => {
diff --git a/modules/client/back/models/client.json b/modules/client/back/models/client.json
index c66072f4d..21db28eaf 100644
--- a/modules/client/back/models/client.json
+++ b/modules/client/back/models/client.json
@@ -154,6 +154,11 @@
"model": "Account",
"foreignKey": "id"
},
+ "user": {
+ "type": "belongsTo",
+ "model": "Account",
+ "foreignKey": "id"
+ },
"payMethod": {
"type": "belongsTo",
"model": "PayMethod",
diff --git a/modules/client/back/models/defaulter.js b/modules/client/back/models/defaulter.js
index 13bb1a614..868d6cd0a 100644
--- a/modules/client/back/models/defaulter.js
+++ b/modules/client/back/models/defaulter.js
@@ -1,3 +1,4 @@
module.exports = Self => {
require('../methods/defaulter/filter')(Self);
+ require('../methods/defaulter/observationEmail')(Self);
};
diff --git a/modules/client/back/models/receipt.json b/modules/client/back/models/receipt.json
index 19107f561..da7879df9 100644
--- a/modules/client/back/models/receipt.json
+++ b/modules/client/back/models/receipt.json
@@ -62,6 +62,11 @@
"type": "belongsTo",
"model": "Bank",
"foreignKey": "bankFk"
+ },
+ "supplier": {
+ "type": "belongsTo",
+ "model": "Supplier",
+ "foreignKey": "companyFk"
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/client/back/models/tpv-transaction.json b/modules/client/back/models/tpv-transaction.json
index 2d926cc40..878b1f41a 100644
--- a/modules/client/back/models/tpv-transaction.json
+++ b/modules/client/back/models/tpv-transaction.json
@@ -35,6 +35,18 @@
},
"created": {
"type": "date"
+ },
+ "merchantParameters": {
+ "type": "string"
+ },
+ "signature": {
+ "type": "string"
+ },
+ "signatureVersion": {
+ "type": "string"
+ },
+ "responseError": {
+ "type": "string"
}
},
"relations": {
@@ -45,4 +57,3 @@
}
}
}
-
\ No newline at end of file
diff --git a/modules/client/front/balance/create/index.html b/modules/client/front/balance/create/index.html
index 56e505463..b76c09356 100644
--- a/modules/client/front/balance/create/index.html
+++ b/modules/client/front/balance/create/index.html
@@ -11,7 +11,7 @@
@@ -48,6 +48,14 @@
max="$ctrl.maxAmount">
+
+
+
+
-
-
-
-
-
@@ -89,4 +89,4 @@
-
\ No newline at end of file
+
diff --git a/modules/client/front/balance/create/index.js b/modules/client/front/balance/create/index.js
index 4d2b4c792..cc9e1ab5a 100644
--- a/modules/client/front/balance/create/index.js
+++ b/modules/client/front/balance/create/index.js
@@ -61,12 +61,15 @@ class Controller extends Dialog {
this.receipt.description = [];
this.viewReceipt = accountingType.code == 'cash';
- if (accountingType.receiptDescription != null && accountingType.receiptDescription != '')
- this.receipt.description.push(accountingType.receiptDescription);
- if (this.originalDescription)
- this.receipt.description.push(this.originalDescription);
- this.receipt.description.join(', ');
-
+ if (accountingType.code == 'compensation')
+ this.receipt.description = '';
+ else {
+ if (accountingType.receiptDescription != null && accountingType.receiptDescription != '')
+ this.receipt.description.push(accountingType.receiptDescription);
+ if (this.originalDescription)
+ this.receipt.description.push(this.originalDescription);
+ this.receipt.description = this.receipt.description.join(', ');
+ }
this.maxAmount = accountingType && accountingType.maxAmount;
this.receipt.payed = Date.vnNew();
@@ -112,7 +115,25 @@ class Controller extends Dialog {
}
accountShortToStandard(value) {
- this.receipt.compensationAccount = value.replace('.', '0'.repeat(11 - value.length));
+ if (value) {
+ this.receipt.compensationAccount = value.replace('.', '0'.repeat(11 - value.length));
+ const params = {bankAccount: this.receipt.compensationAccount};
+ this.$http.get(`Clients/getClientOrSupplierReference`, {params})
+ .then(res => {
+ if (res.data.clientId) {
+ this.receipt.description = this.$t('Client Compensation Reference', {
+ clientId: res.data.clientId,
+ clientName: res.data.clientName
+ });
+ } else {
+ this.receipt.description = this.$t('Supplier Compensation Reference', {
+ supplierId: res.data.supplierId,
+ supplierName: res.data.supplierName
+ });
+ }
+ });
+ } else
+ this.receipt.description = '';
}
getAmountPaid() {
diff --git a/modules/client/front/balance/create/index.spec.js b/modules/client/front/balance/create/index.spec.js
index 408e6b66a..fa6b48ea4 100644
--- a/modules/client/front/balance/create/index.spec.js
+++ b/modules/client/front/balance/create/index.spec.js
@@ -38,7 +38,7 @@ describe('Client', () => {
}
};
- expect(controller.receipt.description.join(',')).toEqual('Cash,Albaran: 1, 2');
+ expect(controller.receipt.description).toEqual('Cash, Albaran: 1, 2');
});
});
diff --git a/modules/client/front/balance/create/locale/es.yml b/modules/client/front/balance/create/locale/es.yml
index 056590966..8c407708a 100644
--- a/modules/client/front/balance/create/locale/es.yml
+++ b/modules/client/front/balance/create/locale/es.yml
@@ -1,2 +1,4 @@
View receipt: Ver recibo
-Amount exceeded: Según ley contra el fraude no se puede recibir cobros por importe igual o superior a {{maxAmount}}
\ No newline at end of file
+Amount exceeded: Según ley contra el fraude no se puede recibir cobros por importe igual o superior a {{maxAmount}}
+Client Compensation Reference: "({{clientId}}) Ntro Cliente: {{clientName}}"
+Supplier Compensation Reference: "({{supplierId}}) Ntro Proveedor: {{supplierName}}"
diff --git a/modules/client/front/basic-data/index.js b/modules/client/front/basic-data/index.js
index b08d642d1..ed34eefc4 100644
--- a/modules/client/front/basic-data/index.js
+++ b/modules/client/front/basic-data/index.js
@@ -9,9 +9,7 @@ export default class Controller extends Section {
}
onSubmit() {
- return this.$.watcher.submit().then(() => {
- this.$http.get(`Clients/${this.$params.id}/checkDuplicatedData`);
- });
+ return this.$.watcher.submit();
}
}
diff --git a/modules/client/front/create/index.js b/modules/client/front/create/index.js
index 9ca58ed10..631029802 100644
--- a/modules/client/front/create/index.js
+++ b/modules/client/front/create/index.js
@@ -12,7 +12,6 @@ export default class Controller extends Section {
onSubmit() {
return this.$.watcher.submit().then(json => {
this.$state.go('client.card.basicData', {id: json.data.id});
- this.$http.get(`Clients/${this.client.id}/checkDuplicatedData`);
});
}
diff --git a/modules/client/front/defaulter/index.html b/modules/client/front/defaulter/index.html
index 22b78594a..8f22629a9 100644
--- a/modules/client/front/defaulter/index.html
+++ b/modules/client/front/defaulter/index.html
@@ -5,6 +5,7 @@
limit="20"
order="amount DESC"
data="defaulters"
+ on-data-change="$ctrl.reCheck()"
auto-load="true">
@@ -17,22 +18,22 @@
-
+
+
+
+
+
+
+
diff --git a/modules/claim/front/detail/index.js b/modules/claim/front/detail/index.js
index 7c3c04f44..56f39e074 100644
--- a/modules/claim/front/detail/index.js
+++ b/modules/claim/front/detail/index.js
@@ -100,8 +100,8 @@ class Controller extends Section {
}
setClaimedQuantity(id, claimedQuantity) {
- let params = {id: id, quantity: claimedQuantity};
- let query = `ClaimBeginnings/`;
+ let params = {quantity: claimedQuantity};
+ let query = `ClaimBeginnings/${id}`;
this.$http.patch(query, params).then(() => {
this.vnApp.showSuccess(this.$t('Data saved!'));
this.calculateTotals();
@@ -151,7 +151,7 @@ class Controller extends Section {
isClaimEditable() {
if (!this.claim) return;
- this.$http.get(`Claims/${this.claim.id}/isEditable`).then(res => {
+ this.$http.get(`ClaimStates/${this.claim.claimStateFk}/isEditable`).then(res => {
this.isRewritable = res.data;
});
}
diff --git a/modules/claim/front/detail/index.spec.js b/modules/claim/front/detail/index.spec.js
index b36f3a172..1ef779fd7 100644
--- a/modules/claim/front/detail/index.spec.js
+++ b/modules/claim/front/detail/index.spec.js
@@ -17,12 +17,13 @@ describe('claim', () => {
$httpBackend = _$httpBackend_;
$httpBackend.whenGET('Claims/ClaimBeginnings').respond({});
$httpBackend.whenGET(`Tickets/1/isEditable`).respond(true);
- $httpBackend.whenGET(`Claims/2/isEditable`).respond(true);
+ $httpBackend.whenGET(`ClaimStates/2/isEditable`).respond(true);
const $element = angular.element('Compensation
+Compensation
-Total
-
-
-
@@ -56,25 +57,25 @@
Comercial
-
Balance D.
-
Author
Last observation
-
L. O. Date
-
@@ -88,8 +89,9 @@
-
@@ -150,7 +152,7 @@
-
+
@@ -160,7 +162,7 @@
id !== clientId) : [...this.checkedDefaulers, clientId];
+ }
+
+ reCheck() {
+ if (!this.$.model.data || !this.checkedDefaulers.length) return;
+
+ this.$.model.data.forEach(defaulter => {
+ defaulter.checked = this.checkedDefaulers.includes(defaulter.clientFk);
+ });
+ }
+
getBalanceDueTotal() {
this.$http.get('Defaulters/filter')
.then(res => {
@@ -109,11 +123,20 @@ export default class Controller extends Section {
}
this.$http.post(`ClientObservations`, params) .then(() => {
- this.vnApp.showMessage(this.$t('Observation saved!'));
+ this.vnApp.showSuccess(this.$t('Observation saved!'));
+ this.sendMail();
this.$state.reload();
});
}
+ sendMail() {
+ const params = {
+ defaulters: this.checked,
+ observation: this.defaulter.observation
+ };
+ this.$http.post(`Defaulters/observationEmail`, params);
+ }
+
exprBuilder(param, value) {
switch (param) {
case 'creditInsurance':
@@ -122,8 +145,25 @@ export default class Controller extends Section {
case 'workerFk':
case 'salesPersonFk':
return {[`d.${param}`]: value};
+ case 'created':
+ return {'d.created': {
+ between: this.dateRange(value)}
+ };
+ case 'defaulterSinced':
+ return {'d.defaulterSinced': {
+ between: this.dateRange(value)}
+ };
}
}
+
+ dateRange(value) {
+ const minHour = new Date(value);
+ minHour.setHours(0, 0, 0, 0);
+ const maxHour = new Date(value);
+ maxHour.setHours(23, 59, 59, 59);
+
+ return [minHour, maxHour];
+ }
}
ngModule.vnComponent('vnClientDefaulter', {
diff --git a/modules/client/front/defaulter/index.spec.js b/modules/client/front/defaulter/index.spec.js
index f92378d08..b4a9df184 100644
--- a/modules/client/front/defaulter/index.spec.js
+++ b/modules/client/front/defaulter/index.spec.js
@@ -81,14 +81,15 @@ describe('client defaulter', () => {
const params = [{text: controller.defaulter.observation, clientFk: data[1].clientFk}];
- jest.spyOn(controller.vnApp, 'showMessage');
+ jest.spyOn(controller.vnApp, 'showSuccess');
$httpBackend.expect('GET', `Defaulters/filter`).respond(200);
$httpBackend.expect('POST', `ClientObservations`, params).respond(200, params);
+ $httpBackend.expect('POST', `Defaulters/observationEmail`).respond(200);
controller.onResponse();
$httpBackend.flush();
- expect(controller.vnApp.showMessage).toHaveBeenCalledWith('Observation saved!');
+ expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Observation saved!');
});
});
@@ -117,5 +118,62 @@ describe('client defaulter', () => {
expect(controller.balanceDueTotal).toEqual(875);
});
});
+
+ describe('dateRange()', () => {
+ it('should return two dates with the hours at the start and end of the given date', () => {
+ const now = Date.vnNew();
+
+ const today = now.getDate();
+
+ const dateRange = controller.dateRange(now);
+ const start = dateRange[0].toString();
+ const end = dateRange[1].toString();
+
+ expect(start).toContain(today);
+ expect(start).toContain('00:00:00');
+
+ expect(end).toContain(today);
+ expect(end).toContain('23:59:59');
+ });
+ });
+
+ describe('reCheck()', () => {
+ it(`should recheck buys`, () => {
+ controller.$.model.data = [
+ {checked: false, clientFk: 1},
+ {checked: false, clientFk: 2},
+ {checked: false, clientFk: 3},
+ {checked: false, clientFk: 4},
+ ];
+ controller.checkedDefaulers = [1, 2];
+
+ controller.reCheck();
+
+ expect(controller.$.model.data[0].checked).toEqual(true);
+ expect(controller.$.model.data[1].checked).toEqual(true);
+ expect(controller.$.model.data[2].checked).toEqual(false);
+ expect(controller.$.model.data[3].checked).toEqual(false);
+ });
+ });
+
+ describe('saveChecked()', () => {
+ it(`should check buy`, () => {
+ const buyCheck = 3;
+ controller.checkedDefaulers = [1, 2];
+
+ controller.saveChecked(buyCheck);
+
+ expect(controller.checkedDefaulers[2]).toEqual(buyCheck);
+ });
+
+ it(`should uncheck buy`, () => {
+ const buyUncheck = 3;
+ controller.checkedDefaulers = [1, 2, 3];
+
+ controller.saveChecked(buyUncheck);
+
+ expect(controller.checkedDefaulers[2]).toEqual(undefined);
+ });
+ });
});
});
diff --git a/modules/client/front/defaulter/locale/es.yml b/modules/client/front/defaulter/locale/es.yml
index c3e1d4e19..fe06a15a1 100644
--- a/modules/client/front/defaulter/locale/es.yml
+++ b/modules/client/front/defaulter/locale/es.yml
@@ -6,4 +6,6 @@ Last observation: Última observación
L. O. Date: Fecha Ú. O.
Last observation date: Fecha última observación
Search client: Buscar clientes
-Worker who made the last observation: Trabajador que ha realizado la última observación
\ No newline at end of file
+Worker who made the last observation: Trabajador que ha realizado la última observación
+Email sended!: Email enviado!
+Observation saved!: Observación añadida!
diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html
index ef5c2997f..5aaecbdb0 100644
--- a/modules/client/front/descriptor/index.html
+++ b/modules/client/front/descriptor/index.html
@@ -18,26 +18,26 @@
+ info="Invoices minus payments plus orders not yet invoiced">
-
{{$ctrl.client.salesPersonUser.name}}
@@ -70,6 +70,12 @@
icon="icon-no036"
ng-if="$ctrl.client.isTaxDataChecked == false">
+
+
diff --git a/modules/client/front/unpaid/index.js b/modules/client/front/unpaid/index.js
index fcf620b54..1585b808d 100644
--- a/modules/client/front/unpaid/index.js
+++ b/modules/client/front/unpaid/index.js
@@ -6,9 +6,17 @@ export default class Controller extends Section {
if (hasData && !this.clientUnpaid.dated)
this.clientUnpaid.dated = Date.vnNew();
}
+
+ onSubmit() {
+ this.$.watcher.submit()
+ .then(() => this.card.reload());
+ }
}
ngModule.vnComponent('vnClientUnpaid', {
template: require('./index.html'),
- controller: Controller
+ controller: Controller,
+ require: {
+ card: '^vnClientCard'
+ }
});
diff --git a/modules/client/front/web-payment/index.html b/modules/client/front/web-payment/index.html
index 203d4bb60..2ecfc950b 100644
--- a/modules/client/front/web-payment/index.html
+++ b/modules/client/front/web-payment/index.html
@@ -1,55 +1,39 @@
-
+
-
+
-
-
-
- State
- Id
- Date
- Amount
-
-
-
-
-
-
-
-
-
-
- {{::transaction.id}}
- {{::transaction.created | date:'dd/MM/yyyy HH:mm'}}
- {{::transaction.amount | currency: 'EUR':2}}
-
-
-
-
-
-
-
+
+
+
+ State
+ Id
+ Date
+ Amount
+
+
+
+
+
+
+
+
+
+
+ {{::transaction.id}}
+ {{::transaction.created | date:'dd/MM/yyyy HH:mm'}}
+ {{::transaction.amount | currency: 'EUR':2}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/entry/back/methods/entry/entryOrderPdf.js b/modules/entry/back/methods/entry/entryOrderPdf.js
index e6d37fdb6..f77832162 100644
--- a/modules/entry/back/methods/entry/entryOrderPdf.js
+++ b/modules/entry/back/methods/entry/entryOrderPdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('entryOrderPdf', {
description: 'Returns the entry order pdf',
@@ -38,17 +36,5 @@ module.exports = Self => {
}
});
- Self.entryOrderPdf = async(ctx, id) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const report = new Report('entry-order', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.entryOrderPdf = (ctx, id) => Self.printReport(ctx, id, 'entry-order');
};
diff --git a/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js b/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js
index 86ed9dddc..99d2df67b 100644
--- a/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js
+++ b/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js
@@ -1,6 +1,22 @@
const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
describe('Buy editLatestsBuys()', () => {
+ beforeAll(async() => {
+ const activeCtx = {
+ accessToken: {userId: 9},
+ http: {
+ req: {
+ headers: {origin: 'http://localhost'}
+ }
+ }
+ };
+
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+ });
+
it('should change the value of a given column for the selected buys', async() => {
const tx = await models.Buy.beginTransaction({});
const options = {transaction: tx};
diff --git a/modules/entry/back/models/buy.json b/modules/entry/back/models/buy.json
index 8e36d0eef..de2ddffd6 100644
--- a/modules/entry/back/models/buy.json
+++ b/modules/entry/back/models/buy.json
@@ -3,7 +3,8 @@
"base": "Loggable",
"log": {
"model": "EntryLog",
- "relation": "entry"
+ "relation": "entry",
+ "grabUser": true
},
"options": {
"mysql": {
@@ -70,4 +71,4 @@
"foreignKey": "packageFk"
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/entry/back/models/entry.js b/modules/entry/back/models/entry.js
index 4854bc3d3..1980f964c 100644
--- a/modules/entry/back/models/entry.js
+++ b/modules/entry/back/models/entry.js
@@ -1,3 +1,4 @@
+const LoopBackContext = require('loopback-context');
module.exports = Self => {
require('../methods/entry/filter')(Self);
require('../methods/entry/getEntry')(Self);
@@ -7,4 +8,41 @@ module.exports = Self => {
require('../methods/entry/importBuysPreview')(Self);
require('../methods/entry/lastItemBuys')(Self);
require('../methods/entry/entryOrderPdf')(Self);
+
+ Self.observe('before save', async function(ctx, options) {
+ if (ctx.isNewInstance) return;
+
+ const changes = ctx.data || ctx.instance;
+ const orgData = ctx.currentInstance;
+
+ const observation = changes.observation || orgData.observation;
+ const hasChanges = orgData && changes;
+ const observationChanged = hasChanges
+ && orgData.observation != observation;
+
+ if (observationChanged) {
+ let tx;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ const loopbackContext = LoopBackContext.getCurrentContext();
+ const userId = loopbackContext.active.accessToken.userId;
+ const id = changes.id || orgData.id;
+ const entry = await Self.app.models.Entry.findById(id, null, myOptions);
+ await entry.updateAttribute('observationEditorFk', userId, myOptions);
+ if (tx) await tx.commit();
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ }
+ });
};
diff --git a/modules/entry/back/models/entry.json b/modules/entry/back/models/entry.json
index d9b7c52df..5aa175758 100644
--- a/modules/entry/back/models/entry.json
+++ b/modules/entry/back/models/entry.json
@@ -2,7 +2,8 @@
"name": "Entry",
"base": "Loggable",
"log": {
- "model":"EntryLog"
+ "model":"EntryLog",
+ "grabUser": true
},
"options": {
"mysql": {
@@ -77,6 +78,9 @@
"companyFk": {
"type": "number",
"required": true
+ },
+ "observationEditorFk": {
+ "type": "number"
}
},
"relations": {
@@ -99,6 +103,11 @@
"type": "belongsTo",
"model": "Currency",
"foreignKey": "currencyFk"
+ },
+ "observationEditor": {
+ "type": "belongsTo",
+ "model": "Account",
+ "foreignKey": "observationEditorFk"
}
}
}
diff --git a/modules/entry/front/buy/index/index.html b/modules/entry/front/buy/index/index.html
index ae67e208b..de784198c 100644
--- a/modules/entry/front/buy/index/index.html
+++ b/modules/entry/front/buy/index/index.html
@@ -60,7 +60,7 @@
ng-if="buy.id"
ng-click="itemDescriptor.show($event, buy.item.id)"
class="link">
- {{::buy.item.id | zeroFill:6}}
+ {{::buy.item.id}}
- {{::line.item.id | zeroFill:6}}
+ {{::line.item.id}}
diff --git a/modules/invoiceIn/back/methods/invoice-in/getSerial.js b/modules/invoiceIn/back/methods/invoice-in/getSerial.js
new file mode 100644
index 000000000..dcc1fbc3c
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/getSerial.js
@@ -0,0 +1,65 @@
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const buildFilter = require('vn-loopback/util/filter').buildFilter;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+
+module.exports = Self => {
+ Self.remoteMethodCtx('getSerial', {
+ description: 'Return invoiceIn serial',
+ accessType: 'READ',
+ accepts: [{
+ arg: 'filter',
+ type: 'object'
+ }, {
+ arg: 'daysAgo',
+ type: 'number',
+ required: true
+ }, {
+ arg: 'serial',
+ type: 'string'
+ }],
+ returns: {
+ type: 'object',
+ root: true
+ },
+ http: {
+ path: '/getSerial',
+ verb: 'GET'
+ }
+ });
+
+ Self.getSerial = async(ctx, options) => {
+ const conn = Self.dataSource.connector;
+ const args = ctx.args;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const issued = Date.vnNew();
+ const where = buildFilter(args, (param, value) => {
+ switch (param) {
+ case 'daysAgo':
+ issued.setDate(issued.getDate() - value);
+ return {'i.issued': {gte: issued}};
+ case 'serial':
+ return {'i.serial': {like: `%${value}%`}};
+ }
+ });
+
+ filter = mergeFilters(args.filter, {where});
+
+ const stmt = new ParameterizedSQL(
+ `SELECT i.serial, SUM(IF(i.isBooked, 0,1)) pending, COUNT(*) total
+ FROM vn.invoiceIn i`
+ );
+
+ stmt.merge(conn.makeWhere(filter.where));
+ stmt.merge(`GROUP BY i.serial`);
+ stmt.merge(conn.makeOrderBy(filter.order));
+ stmt.merge(conn.makeLimit(filter));
+
+ const result = await conn.executeStmt(stmt, myOptions);
+
+ return result;
+ };
+};
diff --git a/modules/invoiceIn/back/methods/invoice-in/invoiceInEmail.js b/modules/invoiceIn/back/methods/invoice-in/invoiceInEmail.js
index 0768541a8..a0af3da69 100644
--- a/modules/invoiceIn/back/methods/invoice-in/invoiceInEmail.js
+++ b/modules/invoiceIn/back/methods/invoice-in/invoiceInEmail.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('invoiceInEmail', {
description: 'Sends the invoice in email with an attached PDF',
@@ -35,19 +33,5 @@ module.exports = Self => {
}
});
- Self.invoiceInEmail = async ctx => {
- const args = Object.assign({}, ctx.args);
- const params = {
- recipient: args.recipient,
- lang: ctx.req.getLocale()
- };
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const email = new Email('invoiceIn', params);
-
- return email.send();
- };
+ Self.invoiceInEmail = ctx => Self.sendTemplate(ctx, 'invoiceIn');
};
diff --git a/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js b/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js
index e7962c93f..681a19fc6 100644
--- a/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js
+++ b/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('invoiceInPdf', {
description: 'Returns the invoiceIn pdf',
@@ -34,17 +32,5 @@ module.exports = Self => {
}
});
- Self.invoiceInPdf = async(ctx, id) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
- delete args.ctx;
-
- for (const param in args)
- params[param] = args[param];
-
- const report = new Report('invoiceIn', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.invoiceInPdf = (ctx, id) => Self.printReport(ctx, id, 'invoiceIn');
};
diff --git a/modules/invoiceIn/back/methods/invoice-in/negativeBases.js b/modules/invoiceIn/back/methods/invoice-in/negativeBases.js
new file mode 100644
index 000000000..4d5975fab
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/negativeBases.js
@@ -0,0 +1,112 @@
+const UserError = require('vn-loopback/util/user-error');
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+module.exports = Self => {
+ Self.remoteMethodCtx('negativeBases', {
+ description: 'Find all negative bases',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'from',
+ type: 'date',
+ description: 'From date'
+ },
+ {
+ arg: 'to',
+ type: 'date',
+ description: 'To date'
+ },
+ {
+ arg: 'filter',
+ type: 'object',
+ description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string'
+ },
+ ],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/negativeBases`,
+ verb: 'GET'
+ }
+ });
+
+ Self.negativeBases = async(ctx, options) => {
+ const conn = Self.dataSource.connector;
+ const args = ctx.args;
+
+ if (!args.from || !args.to)
+ throw new UserError(`Insert a date range`);
+
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const stmts = [];
+ let stmt;
+ stmts.push(`DROP TEMPORARY TABLE IF EXISTS tmp.ticket`);
+
+ stmts.push(new ParameterizedSQL(
+ `CREATE TEMPORARY TABLE tmp.ticket
+ (KEY (ticketFk))
+ ENGINE = MEMORY
+ SELECT id ticketFk
+ FROM ticket t
+ WHERE shipped BETWEEN ? AND ?
+ AND refFk IS NULL`, [args.from, args.to]));
+ stmts.push(`CALL vn.ticket_getTax(NULL)`);
+ stmts.push(`DROP TEMPORARY TABLE IF EXISTS tmp.filter`);
+ stmts.push(new ParameterizedSQL(
+ `CREATE TEMPORARY TABLE tmp.filter
+ ENGINE = MEMORY
+ SELECT
+ co.code company,
+ cou.country,
+ c.id clientId,
+ c.socialName clientSocialName,
+ SUM(s.quantity * s.price * ( 100 - s.discount ) / 100) amount,
+ negativeBase.taxableBase,
+ negativeBase.ticketFk,
+ c.isActive,
+ c.hasToInvoice,
+ c.isTaxDataChecked,
+ w.id comercialId,
+ CONCAT(w.firstName, ' ', w.lastName) comercialName
+ FROM vn.ticket t
+ JOIN vn.company co ON co.id = t.companyFk
+ JOIN vn.sale s ON s.ticketFk = t.id
+ JOIN vn.client c ON c.id = t.clientFk
+ JOIN vn.country cou ON cou.id = c.countryFk
+ LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
+ LEFT JOIN (
+ SELECT ticketFk, taxableBase
+ FROM tmp.ticketAmount
+ GROUP BY ticketFk
+ HAVING taxableBase < 0
+ ) negativeBase ON negativeBase.ticketFk = t.id
+ WHERE t.shipped BETWEEN ? AND ?
+ AND t.refFk IS NULL
+ AND c.typeFk IN ('normal','trust')
+ GROUP BY t.clientFk, negativeBase.taxableBase
+ HAVING amount <> 0`, [args.from, args.to]));
+
+ stmt = new ParameterizedSQL(`
+ SELECT f.*
+ FROM tmp.filter f`);
+
+ stmt.merge(conn.makeWhere(args.filter.where));
+ stmt.merge(conn.makeOrderBy(args.filter.order));
+
+ const negativeBasesIndex = stmts.push(stmt) - 1;
+
+ stmts.push(`DROP TEMPORARY TABLE tmp.filter, tmp.ticket, tmp.ticketTax, tmp.ticketAmount`);
+
+ const sql = ParameterizedSQL.join(stmts, ';');
+ const result = await conn.executeStmt(sql, myOptions);
+
+ return negativeBasesIndex === 0 ? result : result[negativeBasesIndex];
+ };
+};
+
diff --git a/modules/invoiceIn/back/methods/invoice-in/negativeBasesCsv.js b/modules/invoiceIn/back/methods/invoice-in/negativeBasesCsv.js
new file mode 100644
index 000000000..963151b7d
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/negativeBasesCsv.js
@@ -0,0 +1,53 @@
+const {toCSV} = require('vn-loopback/util/csv');
+
+module.exports = Self => {
+ Self.remoteMethodCtx('negativeBasesCsv', {
+ description: 'Returns the negative bases as .csv',
+ accessType: 'READ',
+ accepts: [{
+ arg: 'negativeBases',
+ type: ['object'],
+ required: true
+ },
+ {
+ arg: 'from',
+ type: 'date',
+ description: 'From date'
+ },
+ {
+ arg: 'to',
+ type: 'date',
+ description: 'To date'
+ }],
+ returns: [
+ {
+ arg: 'body',
+ type: 'file',
+ root: true
+ }, {
+ arg: 'Content-Type',
+ type: 'String',
+ http: {target: 'header'}
+ }, {
+ arg: 'Content-Disposition',
+ type: 'String',
+ http: {target: 'header'}
+ }
+ ],
+ http: {
+ path: '/negativeBasesCsv',
+ verb: 'GET'
+ }
+ });
+
+ Self.negativeBasesCsv = async ctx => {
+ const args = ctx.args;
+ const content = toCSV(args.negativeBases);
+
+ return [
+ content,
+ 'text/csv',
+ `attachment; filename="negative-bases-${new Date(args.from).toLocaleDateString()}-${new Date(args.to).toLocaleDateString()}.csv"`
+ ];
+ };
+};
diff --git a/modules/invoiceIn/back/methods/invoice-in/specs/getSerial.spec.js b/modules/invoiceIn/back/methods/invoice-in/specs/getSerial.spec.js
new file mode 100644
index 000000000..6224ce9ac
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/getSerial.spec.js
@@ -0,0 +1,24 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('invoiceIn getSerial()', () => {
+ it('should check that returns without serial param', async() => {
+ const ctx = {args: {daysAgo: 45}};
+ const result = await models.InvoiceIn.getSerial(ctx);
+
+ expect(result.length).toBeGreaterThan(0);
+ });
+
+ it('should check that returns with serial param', async() => {
+ const ctx = {args: {daysAgo: 45, serial: 'R'}};
+ const result = await models.InvoiceIn.getSerial(ctx);
+
+ expect(result.length).toBeGreaterThan(0);
+ });
+
+ it('should check that returns with non exist serial param', async() => {
+ const ctx = {args: {daysAgo: 45, serial: 'Mock serial'}};
+ const result = await models.InvoiceIn.getSerial(ctx);
+
+ expect(result.length).toEqual(0);
+ });
+});
diff --git a/modules/invoiceIn/back/methods/invoice-in/specs/negativeBases.spec.js b/modules/invoiceIn/back/methods/invoice-in/specs/negativeBases.spec.js
new file mode 100644
index 000000000..a5c6e3102
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/negativeBases.spec.js
@@ -0,0 +1,47 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('invoiceIn negativeBases()', () => {
+ it('should return all negative bases in a date range', async() => {
+ const tx = await models.InvoiceIn.beginTransaction({});
+ const options = {transaction: tx};
+ const ctx = {
+ args: {
+ from: new Date().setMonth(new Date().getMonth() - 12),
+ to: new Date(),
+ filter: {}
+ }
+ };
+
+ try {
+ const result = await models.InvoiceIn.negativeBases(ctx, options);
+
+ expect(result.length).toBeGreaterThan(0);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should throw an error if a date range is not in args', async() => {
+ let error;
+ const tx = await models.InvoiceIn.beginTransaction({});
+ const options = {transaction: tx};
+ const ctx = {
+ args: {
+ filter: {}
+ }
+ };
+
+ try {
+ await models.InvoiceIn.negativeBases(ctx, options);
+ await tx.rollback();
+ } catch (e) {
+ error = e;
+ await tx.rollback();
+ }
+
+ expect(error.message).toEqual(`Insert a date range`);
+ });
+});
diff --git a/modules/invoiceIn/back/models/invoice-in-config.json b/modules/invoiceIn/back/models/invoice-in-config.json
index 5cf0ed64c..c0236e654 100644
--- a/modules/invoiceIn/back/models/invoice-in-config.json
+++ b/modules/invoiceIn/back/models/invoice-in-config.json
@@ -17,6 +17,9 @@
},
"retentionName": {
"type": "string"
+ },
+ "daysAgo": {
+ "type": "number"
}
},
"relations": {
diff --git a/modules/invoiceIn/back/models/invoice-in.js b/modules/invoiceIn/back/models/invoice-in.js
index 95ccc7b20..167f2ac34 100644
--- a/modules/invoiceIn/back/models/invoice-in.js
+++ b/modules/invoiceIn/back/models/invoice-in.js
@@ -6,4 +6,7 @@ module.exports = Self => {
require('../methods/invoice-in/getTotals')(Self);
require('../methods/invoice-in/invoiceInPdf')(Self);
require('../methods/invoice-in/invoiceInEmail')(Self);
+ require('../methods/invoice-in/getSerial')(Self);
+ require('../methods/invoice-in/negativeBases')(Self);
+ require('../methods/invoice-in/negativeBasesCsv')(Self);
};
diff --git a/modules/invoiceIn/front/index.js b/modules/invoiceIn/front/index.js
index 7b6d6a77c..c0374e996 100644
--- a/modules/invoiceIn/front/index.js
+++ b/modules/invoiceIn/front/index.js
@@ -13,3 +13,6 @@ import './dueDay';
import './intrastat';
import './create';
import './log';
+import './serial';
+import './serial-search-panel';
+import './negative-bases';
diff --git a/modules/invoiceIn/front/intrastat/index.html b/modules/invoiceIn/front/intrastat/index.html
index cb447132d..fc0139303 100644
--- a/modules/invoiceIn/front/intrastat/index.html
+++ b/modules/invoiceIn/front/intrastat/index.html
@@ -47,7 +47,7 @@
show-field="description"
rule
vn-focus>
- {{id | zeroFill:8}}: {{description}}
+ {{id}}: {{description}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/invoiceIn/front/negative-bases/index.js b/modules/invoiceIn/front/negative-bases/index.js
new file mode 100644
index 000000000..0f6f04692
--- /dev/null
+++ b/modules/invoiceIn/front/negative-bases/index.js
@@ -0,0 +1,84 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+import './style.scss';
+
+export default class Controller extends Section {
+ constructor($element, $, vnReport) {
+ super($element, $);
+
+ this.vnReport = vnReport;
+ const now = new Date();
+ const firstDayOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
+ const lastDayOfMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+ this.params = {
+ from: firstDayOfMonth,
+ to: lastDayOfMonth
+ };
+ this.$checkAll = false;
+
+ this.smartTableOptions = {
+ activeButtons: {
+ search: true,
+ }, columns: [
+ {
+ field: 'isActive',
+ searchable: false
+ },
+ {
+ field: 'hasToInvoice',
+ searchable: false
+ },
+ {
+ field: 'isTaxDataChecked',
+ searchable: false
+ },
+ ]
+ };
+ }
+
+ exprBuilder(param, value) {
+ switch (param) {
+ case 'company':
+ return {'company': value};
+ case 'country':
+ return {'country': value};
+ case 'clientId':
+ return {'clientId': value};
+ case 'clientSocialName':
+ return {'clientSocialName': value};
+ case 'amount':
+ return {'amount': value};
+ case 'taxableBase':
+ return {'taxableBase': value};
+ case 'ticketFk':
+ return {'ticketFk': value};
+ case 'comercialName':
+ return {'comercialName': value};
+ }
+ }
+
+ downloadCSV() {
+ const data = [];
+ this.$.model._orgData.forEach(element => {
+ data.push(Object.keys(element).map(key => {
+ return {newName: this.$t(key), value: element[key]};
+ }).filter(item => item !== null)
+ .reduce((result, item) => {
+ result[item.newName] = item.value;
+ return result;
+ }, {}));
+ });
+ this.vnReport.show('InvoiceIns/negativeBasesCsv', {
+ negativeBases: data,
+ from: this.params.from,
+ to: this.params.to
+ });
+ }
+}
+
+Controller.$inject = ['$element', '$scope', 'vnReport'];
+
+ngModule.vnComponent('vnNegativeBases', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/invoiceIn/front/negative-bases/locale/es.yml b/modules/invoiceIn/front/negative-bases/locale/es.yml
new file mode 100644
index 000000000..9095eee22
--- /dev/null
+++ b/modules/invoiceIn/front/negative-bases/locale/es.yml
@@ -0,0 +1,14 @@
+Has To Invoice: Facturar
+Download as CSV: Descargar como CSV
+company: Compañía
+country: País
+clientId: Id Cliente
+clientSocialName: Cliente
+amount: Importe
+taxableBase: Base
+ticketFk: Id Ticket
+isActive: Activo
+hasToInvoice: Facturar
+isTaxDataChecked: Datos comprobados
+comercialId: Id Comercial
+comercialName: Comercial
diff --git a/modules/invoiceIn/front/negative-bases/style.scss b/modules/invoiceIn/front/negative-bases/style.scss
new file mode 100644
index 000000000..2d628cb94
--- /dev/null
+++ b/modules/invoiceIn/front/negative-bases/style.scss
@@ -0,0 +1,10 @@
+@import "./variables";
+
+vn-negative-bases {
+ vn-date-picker{
+ padding-right: 5%;
+ }
+ slot-actions{
+ align-items: center;
+ }
+}
diff --git a/modules/invoiceIn/front/routes.json b/modules/invoiceIn/front/routes.json
index 4867b7db9..40d061d1b 100644
--- a/modules/invoiceIn/front/routes.json
+++ b/modules/invoiceIn/front/routes.json
@@ -9,10 +9,9 @@
],
"menus": {
"main": [
- {
- "state": "invoiceIn.index",
- "icon": "icon-invoice-in"
- }
+ { "state": "invoiceIn.index", "icon": "icon-invoice-in"},
+ { "state": "invoiceIn.serial", "icon": "icon-invoice-in"},
+ { "state": "invoiceIn.negative-bases", "icon": "icon-ticket"}
],
"card": [
{
@@ -54,6 +53,24 @@
"administrative"
]
},
+ {
+ "url": "/negative-bases",
+ "state": "invoiceIn.negative-bases",
+ "component": "vn-negative-bases",
+ "description": "Negative bases",
+ "acl": [
+ "administrative"
+ ]
+ },
+ {
+ "url": "/serial",
+ "state": "invoiceIn.serial",
+ "component": "vn-invoice-in-serial",
+ "description": "InvoiceIn Serial",
+ "acl": [
+ "administrative"
+ ]
+ },
{
"url": "/:id",
"state": "invoiceIn.card",
@@ -133,4 +150,4 @@
]
}
]
-}
\ No newline at end of file
+}
diff --git a/modules/invoiceIn/front/serial-search-panel/index.html b/modules/invoiceIn/front/serial-search-panel/index.html
new file mode 100644
index 000000000..0dda54852
--- /dev/null
+++ b/modules/invoiceIn/front/serial-search-panel/index.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/invoiceIn/front/serial-search-panel/index.js b/modules/invoiceIn/front/serial-search-panel/index.js
new file mode 100644
index 000000000..b11911ee3
--- /dev/null
+++ b/modules/invoiceIn/front/serial-search-panel/index.js
@@ -0,0 +1,44 @@
+import ngModule from '../module';
+import SearchPanel from 'core/components/searchbar/search-panel';
+import './style.scss';
+
+class Controller extends SearchPanel {
+ constructor($element, $) {
+ super($element, $);
+ this.filter = {};
+ const filter = {
+ fields: ['daysAgo']
+ };
+ this.$http.get('InvoiceInConfigs', {filter}).then(res => {
+ if (res.data) {
+ this.invoiceInConfig = res.data[0];
+ this.addFilters();
+ }
+ });
+ }
+
+ removeItemFilter(param) {
+ this.filter[param] = null;
+ this.addFilters();
+ }
+
+ onKeyPress($event) {
+ if ($event.key === 'Enter')
+ this.addFilters();
+ }
+
+ addFilters() {
+ if (!this.filter.daysAgo)
+ this.filter.daysAgo = this.invoiceInConfig.daysAgo;
+
+ return this.model.addFilter({}, this.filter);
+ }
+}
+
+ngModule.component('vnInvoiceInSerialSearchPanel', {
+ template: require('./index.html'),
+ controller: Controller,
+ bindings: {
+ model: '<'
+ }
+});
diff --git a/modules/invoiceIn/front/serial-search-panel/index.spec.js b/modules/invoiceIn/front/serial-search-panel/index.spec.js
new file mode 100644
index 000000000..b5228e126
--- /dev/null
+++ b/modules/invoiceIn/front/serial-search-panel/index.spec.js
@@ -0,0 +1,43 @@
+import './index.js';
+
+describe('InvoiceIn', () => {
+ describe('Component serial-search-panel', () => {
+ let controller;
+ let $scope;
+
+ beforeEach(ngModule('invoiceIn'));
+
+ beforeEach(inject(($componentController, $rootScope) => {
+ $scope = $rootScope.$new();
+ const $element = angular.element('
+
+
+
+
+
+
+
+
+
+
+ Serial
+ Pending
+ Total
+
+
+
+
+ {{::invoiceIn.serial}}
+ {{::invoiceIn.pending}}
+ {{::invoiceIn.total}}
+
+
+
+
+
+
+
+
+
diff --git a/modules/invoiceIn/front/serial/index.js b/modules/invoiceIn/front/serial/index.js
new file mode 100644
index 000000000..193a57492
--- /dev/null
+++ b/modules/invoiceIn/front/serial/index.js
@@ -0,0 +1,22 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+ constructor($element, $) {
+ super($element, $);
+ }
+
+ goToIndex(daysAgo, serial) {
+ const issued = Date.vnNew();
+ issued.setDate(issued.getDate() - daysAgo);
+ this.$state.go('invoiceIn.index',
+ {q: `{"serial": "${serial}", "isBooked": false, "from": ${issued.getTime()}}`});
+ }
+}
+
+Controller.$inject = ['$element', '$scope'];
+
+ngModule.vnComponent('vnInvoiceInSerial', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/invoiceIn/front/serial/locale/es.yml b/modules/invoiceIn/front/serial/locale/es.yml
new file mode 100644
index 000000000..92a49cc82
--- /dev/null
+++ b/modules/invoiceIn/front/serial/locale/es.yml
@@ -0,0 +1,3 @@
+Serial: Serie
+Pending: Pendientes
+Go to InvoiceIn: Ir al listado de facturas recibidas
diff --git a/modules/invoiceIn/front/summary/index.html b/modules/invoiceIn/front/summary/index.html
index 3a826eeb7..f0baa33c8 100644
--- a/modules/invoiceIn/front/summary/index.html
+++ b/modules/invoiceIn/front/summary/index.html
@@ -141,7 +141,7 @@
- {{::intrastat.intrastatFk | zeroFill:8}}: {{::intrastat.intrastat.description}}
+ {{::intrastat.intrastatFk}}: {{::intrastat.intrastat.description}}
{{::intrastat.amount | currency: 'EUR':2}}
{{::intrastat.net}}
{{::intrastat.stems}}
diff --git a/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
index f3c7a5093..f18b0c682 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
@@ -4,47 +4,37 @@ module.exports = Self => {
accessType: 'WRITE',
accepts: [
{
+ arg: 'clientId',
+ type: 'number',
+ description: 'The client id'
+ }, {
arg: 'invoiceDate',
type: 'date',
- description: 'The invoice date'
- },
- {
+ description: 'The invoice date',
+ required: true
+ }, {
arg: 'maxShipped',
type: 'date',
- description: 'The maximum shipped date'
- },
- {
- arg: 'fromClientId',
- type: 'number',
- description: 'The minimum client id'
- },
- {
- arg: 'toClientId',
- type: 'number',
- description: 'The maximum client id'
- },
- {
+ description: 'The maximum shipped date',
+ required: true
+ }, {
arg: 'companyFk',
type: 'number',
- description: 'The company id to invoice'
- }
+ description: 'The company id to invoice',
+ required: true
+ },
],
- returns: [{
- arg: 'clientsAndAddresses',
- type: ['object']
+ returns: {
+ type: 'Object',
+ root: true
},
- {
- arg: 'invoice',
- type: 'object'
- }],
http: {
path: '/clientsToInvoice',
verb: 'POST'
}
});
- Self.clientsToInvoice = async(ctx, options) => {
- const args = ctx.args;
+ Self.clientsToInvoice = async(ctx, clientId, invoiceDate, maxShipped, companyFk, options) => {
let tx;
const myOptions = {};
@@ -56,134 +46,52 @@ module.exports = Self => {
myOptions.transaction = tx;
}
- let query;
try {
- query = `
- SELECT MAX(issued) issued
- FROM vn.invoiceOut io
- JOIN vn.time t ON t.dated = io.issued
- WHERE io.serial = 'A'
- AND t.year = YEAR(?)
- AND io.companyFk = ?`;
- const [maxIssued] = await Self.rawSql(query, [
- args.invoiceDate,
- args.companyFk
- ], myOptions);
-
- const maxSerialDate = maxIssued.issued || args.invoiceDate;
- if (args.invoiceDate < maxSerialDate)
- args.invoiceDate = maxSerialDate;
-
- if (args.invoiceDate < args.maxShipped)
- args.maxShipped = args.invoiceDate;
-
- const minShipped = Date.vnNew();
- minShipped.setFullYear(minShipped.getFullYear() - 1);
- minShipped.setMonth(1);
- minShipped.setDate(1);
- minShipped.setHours(0, 0, 0, 0);
-
// Packaging liquidation
const vIsAllInvoiceable = false;
- const clientsWithPackaging = await getClientsWithPackaging(ctx, myOptions);
- for (let client of clientsWithPackaging) {
- await Self.rawSql('CALL packageInvoicing(?, ?, ?, ?, @newTicket)', [
- client.id,
- args.invoiceDate,
- args.companyFk,
- vIsAllInvoiceable
- ], myOptions);
- }
+ await Self.rawSql('CALL ticketPackaging_add(?, ?, ?, ?)', [
+ clientId,
+ invoiceDate,
+ companyFk,
+ vIsAllInvoiceable
+ ], myOptions);
- const invoiceableClients = await getInvoiceableClients(ctx, myOptions);
+ const minShipped = Date.vnNew();
+ minShipped.setFullYear(maxShipped.getFullYear() - 1);
- if (!invoiceableClients) return;
+ const query = `
+ SELECT c.id clientId,
+ c.name clientName,
+ a.id,
+ a.nickname
+ FROM ticket t
+ JOIN address a ON a.id = t.addressFk
+ JOIN client c ON c.id = t.clientFk
+ WHERE t.refFk IS NULL
+ AND t.shipped BETWEEN ? AND util.dayEnd(?)
+ AND (t.clientFk = ? OR ? IS NULL )
+ AND t.companyFk = ?
+ AND c.hasToInvoice
+ AND c.isTaxDataChecked
+ AND c.isActive
+ AND NOT t.isDeleted
+ GROUP BY c.id, IF(c.hasToInvoiceByAddress, a.id, TRUE)
+ HAVING SUM(t.totalWithVat) > 0;`;
- const clientsAndAddresses = invoiceableClients.map(invoiceableClient => {
- return {
- clientId: invoiceableClient.id,
- addressId: invoiceableClient.addressFk
-
- };
- }
- );
+ const addresses = await Self.rawSql(query, [
+ minShipped,
+ maxShipped,
+ clientId,
+ clientId,
+ companyFk
+ ], myOptions);
if (tx) await tx.commit();
- return [
- clientsAndAddresses,
- {
- invoiceDate: args.invoiceDate,
- maxShipped: args.maxShipped,
- fromClientId: args.fromClientId,
- toClientId: args.toClientId,
- companyFk: args.companyFk,
- minShipped: minShipped
- }
- ];
+ return addresses;
} catch (e) {
if (tx) await tx.rollback();
throw e;
}
};
-
- async function getClientsWithPackaging(ctx, options) {
- const models = Self.app.models;
- const args = ctx.args;
- const query = `SELECT DISTINCT clientFk AS id
- FROM ticket t
- JOIN ticketPackaging tp ON t.id = tp.ticketFk
- JOIN client c ON c.id = t.clientFk
- WHERE t.shipped BETWEEN '2017-11-21' AND ?
- AND t.clientFk >= ?
- AND (t.clientFk <= ? OR ? IS NULL)
- AND c.isActive`;
- return models.InvoiceOut.rawSql(query, [
- args.maxShipped,
- args.fromClientId,
- args.toClientId,
- args.toClientId
- ], options);
- }
-
- async function getInvoiceableClients(ctx, options) {
- const models = Self.app.models;
- const args = ctx.args;
- const minShipped = Date.vnNew();
- minShipped.setFullYear(minShipped.getFullYear() - 1);
-
- const query = `SELECT
- c.id,
- SUM(IFNULL
- (
- s.quantity *
- s.price * (100-s.discount)/100,
- 0)
- + IFNULL(ts.quantity * ts.price,0)
- ) AS sumAmount,
- c.hasToInvoiceByAddress,
- c.email,
- c.isToBeMailed,
- a.id addressFk
- FROM ticket t
- LEFT JOIN sale s ON s.ticketFk = t.id
- LEFT JOIN ticketService ts ON ts.ticketFk = t.id
- JOIN address a ON a.id = t.addressFk
- JOIN client c ON c.id = t.clientFk
- WHERE ISNULL(t.refFk) AND c.id >= ?
- AND (t.clientFk <= ? OR ? IS NULL)
- AND t.shipped BETWEEN ? AND util.dayEnd(?)
- AND t.companyFk = ? AND c.hasToInvoice
- AND c.isTaxDataChecked AND c.isActive
- GROUP BY c.id, IF(c.hasToInvoiceByAddress,a.id,TRUE) HAVING sumAmount > 0`;
-
- return models.InvoiceOut.rawSql(query, [
- args.fromClientId,
- args.toClientId,
- args.toClientId,
- minShipped,
- args.maxShipped,
- args.companyFk
- ], options);
- }
};
diff --git a/modules/invoiceOut/back/methods/invoiceOut/createPdf.js b/modules/invoiceOut/back/methods/invoiceOut/createPdf.js
index e56516237..23b6c9e04 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/createPdf.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/createPdf.js
@@ -56,7 +56,7 @@ module.exports = Self => {
reference: invoiceOut.ref,
recipientId: invoiceOut.clientFk
});
- const stream = await invoiceReport.toPdfStream();
+ const buffer = await invoiceReport.toPdfStream();
const issued = invoiceOut.issued;
const year = issued.getFullYear().toString();
@@ -66,7 +66,7 @@ module.exports = Self => {
const fileName = `${year}${invoiceOut.ref}.pdf`;
// Store invoice
- print.storage.write(stream, {
+ await print.storage.write(buffer, {
type: 'invoice',
path: `${year}/${month}/${day}`,
fileName: fileName
diff --git a/modules/invoiceOut/back/methods/invoiceOut/download.js b/modules/invoiceOut/back/methods/invoiceOut/download.js
index 74f5c95fe..5c787428b 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/download.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/download.js
@@ -65,7 +65,7 @@ module.exports = Self => {
try {
await fs.access(file.path);
} catch (error) {
- await Self.createPdf(ctx, id);
+ await Self.createPdf(ctx, id, myOptions);
}
const stream = fs.createReadStream(file.path);
diff --git a/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js b/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js
index e947c5144..7a2526b35 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('exportationPdf', {
description: 'Returns the exportation pdf',
@@ -39,17 +37,5 @@ module.exports = Self => {
}
});
- Self.exportationPdf = async(ctx, reference) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const report = new Report('exportation', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${reference}.pdf"`];
- };
+ Self.exportationPdf = (ctx, reference) => Self.printReport(ctx, reference, 'exportation');
};
diff --git a/modules/invoiceOut/back/methods/invoiceOut/getInvoiceDate.js b/modules/invoiceOut/back/methods/invoiceOut/getInvoiceDate.js
new file mode 100644
index 000000000..dcc1fa6e8
--- /dev/null
+++ b/modules/invoiceOut/back/methods/invoiceOut/getInvoiceDate.js
@@ -0,0 +1,35 @@
+module.exports = Self => {
+ Self.remoteMethod('getInvoiceDate', {
+ description: 'Returns default Invoice Date',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'companyFk',
+ type: 'number',
+ required: true
+ }
+ ],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/getInvoiceDate`,
+ verb: 'GET'
+ }
+ });
+
+ Self.getInvoiceDate = async companyFk => {
+ const models = Self.app.models;
+ const [invoiceDate] = await models.InvoiceOut.rawSql(
+ `SELECT MAX(io.issued) issued
+ FROM invoiceOut io
+ JOIN invoiceOutSerial ios ON ios.code = io.serial
+ WHERE ios.type = 'global'
+ AND io.issued
+ AND io.companyFk = ?`,
+ [companyFk]
+ );
+ return invoiceDate;
+ };
+};
diff --git a/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js b/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
index 95c51a96d..c8f8a6778 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
@@ -1,43 +1,42 @@
+const UserError = require('vn-loopback/util/user-error');
+
module.exports = Self => {
Self.remoteMethodCtx('invoiceClient', {
description: 'Make a invoice of a client',
accessType: 'WRITE',
- accepts: [{
- arg: 'clientId',
- type: 'number',
- description: 'The client id to invoice',
- required: true
- },
- {
- arg: 'addressId',
- type: 'number',
- description: 'The address id to invoice',
- required: true
- },
- {
- arg: 'invoiceDate',
- type: 'date',
- description: 'The invoice date',
- required: true
- },
- {
- arg: 'maxShipped',
- type: 'date',
- description: 'The maximum shipped date',
- required: true
- },
- {
- arg: 'companyFk',
- type: 'number',
- description: 'The company id to invoice',
- required: true
- },
- {
- arg: 'minShipped',
- type: 'date',
- description: 'The minium shupped date',
- required: true
- }],
+ accepts: [
+ {
+ arg: 'clientId',
+ type: 'number',
+ description: 'The client id to invoice',
+ required: true
+ }, {
+ arg: 'addressId',
+ type: 'number',
+ description: 'The address id to invoice',
+ required: true
+ }, {
+ arg: 'invoiceDate',
+ type: 'date',
+ description: 'The invoice date',
+ required: true
+ }, {
+ arg: 'maxShipped',
+ type: 'date',
+ description: 'The maximum shipped date',
+ required: true
+ }, {
+ arg: 'companyFk',
+ type: 'number',
+ description: 'The company id to invoice',
+ required: true
+ }, {
+ arg: 'printerFk',
+ type: 'number',
+ description: 'The printer to print',
+ required: true
+ }
+ ],
returns: {
type: 'object',
root: true
@@ -62,69 +61,65 @@ module.exports = Self => {
myOptions.transaction = tx;
}
+ const minShipped = Date.vnNew();
+ minShipped.setFullYear(args.maxShipped.getFullYear() - 1);
+
let invoiceId;
let invoiceOut;
try {
const client = await models.Client.findById(args.clientId, {
fields: ['id', 'hasToInvoiceByAddress']
}, myOptions);
- try {
- if (client.hasToInvoiceByAddress) {
- await Self.rawSql('CALL ticketToInvoiceByAddress(?, ?, ?, ?)', [
- args.minShipped,
- args.maxShipped,
- args.addressId,
- args.companyFk
- ], myOptions);
- } else {
- await Self.rawSql('CALL invoiceFromClient(?, ?, ?)', [
- args.maxShipped,
- client.id,
- args.companyFk
- ], myOptions);
- }
- // Make invoice
- const isSpanishCompany = await getIsSpanishCompany(args.companyFk, myOptions);
-
- // Validates ticket nagative base
- const hasAnyNegativeBase = await getNegativeBase(myOptions);
- if (hasAnyNegativeBase && isSpanishCompany)
- return tx.rollback();
-
- query = `SELECT invoiceSerial(?, ?, ?) AS serial`;
- const [invoiceSerial] = await Self.rawSql(query, [
+ if (client.hasToInvoiceByAddress) {
+ await Self.rawSql('CALL ticketToInvoiceByAddress(?, ?, ?, ?)', [
+ minShipped,
+ args.maxShipped,
+ args.addressId,
+ args.companyFk
+ ], myOptions);
+ } else {
+ await Self.rawSql('CALL invoiceFromClient(?, ?, ?)', [
+ args.maxShipped,
client.id,
- args.companyFk,
- 'G'
+ args.companyFk
], myOptions);
- const serialLetter = invoiceSerial.serial;
-
- query = `CALL invoiceOut_new(?, ?, NULL, @invoiceId)`;
- await Self.rawSql(query, [
- serialLetter,
- args.invoiceDate
- ], myOptions);
-
- const [newInvoice] = await Self.rawSql(`SELECT @invoiceId id`, null, myOptions);
- if (newInvoice.id) {
- await Self.rawSql('CALL invoiceOutBooking(?)', [newInvoice.id], myOptions);
-
- invoiceId = newInvoice.id;
- }
- } catch (e) {
- const failedClient = {
- id: client.id,
- stacktrace: e
- };
- await notifyFailures(ctx, failedClient, myOptions);
}
- invoiceOut = await models.InvoiceOut.findById(invoiceId, {
- include: {
- relation: 'client'
- }
- }, myOptions);
+ // Make invoice
+ const isSpanishCompany = await getIsSpanishCompany(args.companyFk, myOptions);
+
+ // Validates ticket nagative base
+ const hasAnyNegativeBase = await getNegativeBase(myOptions);
+ if (hasAnyNegativeBase && isSpanishCompany)
+ throw new UserError('Negative basis');
+
+ query = `SELECT invoiceSerial(?, ?, ?) AS serial`;
+ const [invoiceSerial] = await Self.rawSql(query, [
+ client.id,
+ args.companyFk,
+ 'G'
+ ], myOptions);
+ const serialLetter = invoiceSerial.serial;
+
+ query = `CALL invoiceOut_new(?, ?, NULL, @invoiceId)`;
+ await Self.rawSql(query, [
+ serialLetter,
+ args.invoiceDate
+ ], myOptions);
+
+ const [newInvoice] = await Self.rawSql(`SELECT @invoiceId id`, null, myOptions);
+ if (newInvoice.id) {
+ await Self.rawSql('CALL invoiceOutBooking(?)', [newInvoice.id], myOptions);
+
+ invoiceOut = await models.InvoiceOut.findById(newInvoice.id, {
+ include: {
+ relation: 'client'
+ }
+ }, myOptions);
+
+ invoiceId = newInvoice.id;
+ }
if (tx) await tx.commit();
} catch (e) {
@@ -132,15 +127,26 @@ module.exports = Self => {
throw e;
}
- ctx.args = {
- reference: invoiceOut.ref,
- recipientId: invoiceOut.clientFk,
- recipient: invoiceOut.client().email
- };
- try {
- await models.InvoiceOut.invoiceEmail(ctx, invoiceOut.ref);
- } catch (err) {}
-
+ if (invoiceId) {
+ if (!invoiceOut.client().isToBeMailed) {
+ const query = `
+ CALL vn.report_print(
+ 'invoice',
+ ?,
+ account.myUser_getId(),
+ JSON_OBJECT('refFk', ?),
+ 'normal'
+ );`;
+ await models.InvoiceOut.rawSql(query, [args.printerFk, invoiceOut.ref]);
+ } else {
+ ctx.args = {
+ reference: invoiceOut.ref,
+ recipientId: invoiceOut.clientFk,
+ recipient: invoiceOut.client().email
+ };
+ await models.InvoiceOut.invoiceEmail(ctx, invoiceOut.ref);
+ }
+ }
return invoiceId;
};
@@ -148,13 +154,12 @@ module.exports = Self => {
const models = Self.app.models;
const query = 'SELECT hasAnyNegativeBase() AS base';
const [result] = await models.InvoiceOut.rawSql(query, null, options);
-
return result && result.base;
}
async function getIsSpanishCompany(companyId, options) {
const models = Self.app.models;
- const query = `SELECT COUNT(*) AS total
+ const query = `SELECT COUNT(*) isSpanishCompany
FROM supplier s
JOIN country c ON c.id = s.countryFk
AND c.code = 'ES'
@@ -163,28 +168,6 @@ module.exports = Self => {
companyId
], options);
- return supplierCompany && supplierCompany.total;
- }
-
- async function notifyFailures(ctx, failedClient, options) {
- const models = Self.app.models;
- const userId = ctx.req.accessToken.userId;
- const $t = ctx.req.__; // $translate
-
- const worker = await models.EmailUser.findById(userId, null, options);
- const subject = $t('Global invoicing failed');
- let body = $t(`Wasn't able to invoice the following clients`) + ':
'; - - body += `ID: ${failedClient.id} -
${failedClient.stacktrace}
`; - - await Self.rawSql(` - INSERT INTO vn.mail (sender, replyTo, sent, subject, body) - VALUES (?, ?, FALSE, ?, ?)`, [ - worker.email, - worker.email, - subject, - body - ], options); + return supplierCompany && supplierCompany.isSpanishCompany; } }; diff --git a/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js b/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js new file mode 100644 index 000000000..941d31596 --- /dev/null +++ b/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js @@ -0,0 +1,50 @@ +const {Report} = require('vn-print'); + +module.exports = Self => { + Self.remoteMethodCtx('invoiceOutPdf', { + description: 'Returns the invoice pdf', + accessType: 'READ', + accepts: [ + { + arg: 'reference', + type: 'string', + required: true, + description: 'The invoice reference', + http: {source: 'path'} + } + ], + returns: [ + { + arg: 'body', + type: 'file', + root: true + }, { + arg: 'Content-Type', + type: 'String', + http: {target: 'header'} + }, { + arg: 'Content-Disposition', + type: 'String', + http: {target: 'header'} + } + ], + http: { + path: '/:reference/invoice-out-pdf', + verb: 'GET' + } + }); + + Self.invoiceOutPdf = async(ctx, reference) => { + const args = Object.assign({}, ctx.args); + const params = {lang: ctx.req.getLocale()}; + + delete args.ctx; + for (const param in args) + params[param] = args[param]; + + const report = new Report('invoice', params); + const stream = await report.toPdfStream(); + + return [stream, 'application/pdf', `filename="doc-${reference}.pdf"`]; + }; +}; diff --git a/modules/invoiceOut/back/methods/invoiceOut/refund.js b/modules/invoiceOut/back/methods/invoiceOut/refund.js index 7ad6b03ec..ba1fdfedd 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/refund.js +++ b/modules/invoiceOut/back/methods/invoiceOut/refund.js @@ -35,8 +35,7 @@ module.exports = Self => { const tickets = await models.Ticket.find(filter, myOptions); const ticketsIds = tickets.map(ticket => ticket.id); - - const refundedTickets = await models.Ticket.refund(ticketsIds, myOptions); + const refundedTickets = await models.Ticket.refund(ticketsIds, true, myOptions); if (tx) await tx.commit(); diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js index 26eae45ac..803338ef3 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js @@ -11,7 +11,6 @@ describe('InvoiceOut createPdf()', () => { const ctx = {req: activeCtx}; it('should create a new PDF file and set true the hasPdf property', async() => { - pending('https://redmine.verdnatura.es/issues/5035'); const invoiceId = 1; spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ active: activeCtx diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/downloadZip.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/downloadZip.spec.js deleted file mode 100644 index 0f62a6876..000000000 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/downloadZip.spec.js +++ /dev/null @@ -1,55 +0,0 @@ -const models = require('vn-loopback/server/server').models; -const UserError = require('vn-loopback/util/user-error'); - -describe('InvoiceOut downloadZip()', () => { - const userId = 9; - const invoiceIds = '1,2'; - const ctx = { - req: { - - accessToken: {userId: userId}, - headers: {origin: 'http://localhost:5000'}, - } - }; - - it('should return part of link to dowloand the zip', async() => { - const tx = await models.InvoiceOut.beginTransaction({}); - - try { - const options = {transaction: tx}; - - const result = await models.InvoiceOut.downloadZip(ctx, invoiceIds, options); - - expect(result).toBeDefined(); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should return an error if the size of the files is too large', async() => { - pending('https://redmine.verdnatura.es/issues/5035'); - - const tx = await models.InvoiceOut.beginTransaction({}); - - let error; - try { - const options = {transaction: tx}; - const zipConfig = { - maxSize: 0 - }; - await models.ZipConfig.create(zipConfig, options); - - await models.InvoiceOut.downloadZip(ctx, invoiceIds, options); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - error = e; - } - - expect(error).toEqual(new UserError(`Files are too large`)); - }); -}); diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js index d3d789393..15e3e887e 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js @@ -66,7 +66,7 @@ describe('InvoiceOut filter()', () => { const result = await models.InvoiceOut.filter(ctx, {id: invoiceOut.id}, options); - expect(result.length).toBeGreaterThanOrEqual(1); + expect(result.length).toEqual(1); await tx.rollback(); } catch (e) { diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js index 628318d42..c5a1ac603 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js @@ -17,7 +17,7 @@ describe('InvoiceOut refund()', () => { try { const result = await models.InvoiceOut.refund('T1111111', options); - expect(result.length).toEqual(2); + expect(result.length).toEqual(1); await tx.rollback(); } catch (e) { diff --git a/modules/invoiceOut/back/model-config.json b/modules/invoiceOut/back/model-config.json index 04933c4f0..b190126ea 100644 --- a/modules/invoiceOut/back/model-config.json +++ b/modules/invoiceOut/back/model-config.json @@ -8,6 +8,9 @@ "InvoiceContainer": { "dataSource": "invoiceStorage" }, + "Printer": { + "dataSource": "vn" + }, "TaxArea": { "dataSource": "vn" }, diff --git a/modules/invoiceOut/back/models/invoice-out.js b/modules/invoiceOut/back/models/invoice-out.js index 88adae2ef..6205abe7b 100644 --- a/modules/invoiceOut/back/models/invoice-out.js +++ b/modules/invoiceOut/back/models/invoice-out.js @@ -15,4 +15,6 @@ module.exports = Self => { require('../methods/invoiceOut/exportationPdf')(Self); require('../methods/invoiceOut/invoiceCsv')(Self); require('../methods/invoiceOut/invoiceCsvEmail')(Self); + require('../methods/invoiceOut/invoiceOutPdf')(Self); + require('../methods/invoiceOut/getInvoiceDate')(Self); }; diff --git a/modules/invoiceOut/back/models/printer.json b/modules/invoiceOut/back/models/printer.json new file mode 100644 index 000000000..99003560d --- /dev/null +++ b/modules/invoiceOut/back/models/printer.json @@ -0,0 +1,28 @@ +{ + "name": "Printer", + "base": "VnModel", + "options": { + "mysql": { + "table": "printer" + } + }, + "properties": { + "id": { + "type": "number", + "id": true, + "description": "Identifier" + }, + "name": { + "type": "string" + }, + "isLabeler": { + "type": "boolean" + } + }, + "acls": [{ + "accessType": "READ", + "principalType": "ROLE", + "principalId": "$everyone", + "permission": "ALLOW" + }] +} diff --git a/modules/invoiceOut/front/descriptor/index.html b/modules/invoiceOut/front/descriptor/index.html index 92f0b9de5..e1dc579ab 100644 --- a/modules/invoiceOut/front/descriptor/index.html +++ b/modules/invoiceOut/front/descriptor/index.html @@ -3,7 +3,7 @@ description="$ctrl.invoiceOut.ref" summary="$ctrl.$.summary">
-
-
{{$ctrl.invoiceOut.client.name}}
@@ -53,4 +53,7 @@
\ No newline at end of file
+
+
+
diff --git a/modules/invoiceOut/front/global-invoicing/index.html b/modules/invoiceOut/front/global-invoicing/index.html
new file mode 100644
index 000000000..ebe46b84a
--- /dev/null
+++ b/modules/invoiceOut/front/global-invoicing/index.html
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+ Id
+ Client
+ Address id
+ Street
+ Error
+
+
+
+
+
+
+ {{::error.address.clientId}}
+
+
+
+ {{::error.address.clientName}}
+
+
+ {{::error.address.id}}
+
+
+ {{::error.address.nickname}}
+
+
+ {{::error.message}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/invoiceOut/front/global-invoicing/index.js b/modules/invoiceOut/front/global-invoicing/index.js
new file mode 100644
index 000000000..0aa6a4a24
--- /dev/null
+++ b/modules/invoiceOut/front/global-invoicing/index.js
@@ -0,0 +1,140 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+import UserError from 'core/lib/user-error';
+import './style.scss';
+
+class Controller extends Section {
+ $onInit() {
+ const date = Date.vnNew();
+ Object.assign(this, {
+ maxShipped: new Date(date.getFullYear(), date.getMonth(), 0),
+ clientsToInvoice: 'all',
+ });
+
+ this.$http.get('UserConfigs/getUserConfig')
+ .then(res => {
+ this.companyFk = res.data.companyFk;
+ const params = {
+ companyFk: this.companyFk
+ };
+ return this.$http.get('InvoiceOuts/getInvoiceDate', {params});
+ })
+ .then(res => {
+ this.minInvoicingDate = res.data.issued ? new Date(res.data.issued) : null;
+ this.invoiceDate = this.minInvoicingDate;
+ });
+ }
+
+ stopInvoicing() {
+ this.status = 'stopping';
+ }
+
+ makeInvoice() {
+ this.invoicing = true;
+ this.status = 'packageInvoicing';
+ this.errors = [];
+ this.addresses = null;
+
+ try {
+ if (this.clientsToInvoice == 'one' && !this.clientId)
+ throw new UserError('Choose a valid client');
+ if (!this.invoiceDate || !this.maxShipped)
+ throw new UserError('Invoice date and the max date should be filled');
+ if (this.invoiceDate < this.maxShipped)
+ throw new UserError('Invoice date can\'t be less than max date');
+ if (this.invoiceDate.getTime() < this.minInvoicingDate.getTime())
+ throw new UserError('Exists an invoice with a previous date');
+ if (!this.companyFk)
+ throw new UserError('Choose a valid company');
+ if (!this.printerFk)
+ throw new UserError('Choose a valid printer');
+
+ if (this.clientsToInvoice == 'all')
+ this.clientId = undefined;
+
+ const params = {
+ invoiceDate: this.invoiceDate,
+ maxShipped: this.maxShipped,
+ clientId: this.clientId,
+ companyFk: this.companyFk
+ };
+ this.$http.post(`InvoiceOuts/clientsToInvoice`, params)
+ .then(res => {
+ this.addresses = res.data;
+ if (!this.addresses.length)
+ throw new UserError(`There aren't tickets to invoice`);
+
+ this.addressIndex = 0;
+ return this.invoiceOut();
+ })
+ .catch(err => this.handleError(err));
+ } catch (err) {
+ this.handleError(err);
+ }
+ }
+
+ handleError(err) {
+ this.invoicing = false;
+ this.status = null;
+ throw err;
+ }
+
+ invoiceOut() {
+ if (this.addressIndex == this.addresses.length || this.status == 'stopping') {
+ this.invoicing = false;
+ this.status = 'done';
+ return;
+ }
+
+ this.status = 'invoicing';
+ const address = this.addresses[this.addressIndex];
+ this.currentAddress = address;
+
+ const params = {
+ clientId: address.clientId,
+ addressId: address.id,
+ invoiceDate: this.invoiceDate,
+ maxShipped: this.maxShipped,
+ companyFk: this.companyFk,
+ printerFk: this.printerFk,
+ };
+
+ this.$http.post(`InvoiceOuts/invoiceClient`, params)
+ .then(() => this.invoiceNext())
+ .catch(res => {
+ const message = res.data?.error?.message || res.message;
+ if (res.status >= 400 && res.status < 500) {
+ this.errors.unshift({address, message});
+ this.invoiceNext();
+ } else {
+ this.invoicing = false;
+ this.status = 'done';
+ throw new UserError(`Critical invoicing error, proccess stopped`);
+ }
+ })
+ }
+
+ invoiceNext() {
+ this.addressIndex++;
+ this.invoiceOut();
+ }
+
+ get nAddresses() {
+ if (!this.addresses) return 0;
+ return this.addresses.length;
+ }
+
+ get addressNumber() {
+ return Math.min(this.addressIndex + 1, this.nAddresses);
+ }
+
+ get percentage() {
+ const len = this.nAddresses;
+ return Math.min(this.addressIndex, len) / len;
+ }
+}
+
+ngModule.vnComponent('vnInvoiceOutGlobalInvoicing', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/invoiceOut/front/global-invoicing/index.spec.js b/modules/invoiceOut/front/global-invoicing/index.spec.js
new file mode 100644
index 000000000..056839b20
--- /dev/null
+++ b/modules/invoiceOut/front/global-invoicing/index.spec.js
@@ -0,0 +1,74 @@
+import './index';
+
+describe('InvoiceOut', () => {
+ describe('Component vnInvoiceOutGlobalInvoicing', () => {
+ let controller;
+ let $httpBackend;
+
+ beforeEach(ngModule('invoiceOut'));
+
+ beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
+ $httpBackend = _$httpBackend_;
+ const $scope = $rootScope.$new();
+ const $element = angular.element('
- Create global invoice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{::id}} - {{::name}}
-
-
- {{::id}} - {{::name}}
-
-
-
-
-
-
-
-
-
- {{$ctrl.isInvoicing}}
-
\ No newline at end of file
diff --git a/modules/invoiceOut/front/index/global-invoicing/index.js b/modules/invoiceOut/front/index/global-invoicing/index.js
deleted file mode 100644
index 0c5773adc..000000000
--- a/modules/invoiceOut/front/index/global-invoicing/index.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import ngModule from '../../module';
-import Dialog from 'core/components/dialog';
-import './style.scss';
-
-class Controller extends Dialog {
- constructor($element, $, $transclude) {
- super($element, $, $transclude);
- this.invoice = {
- maxShipped: Date.vnNew()
- };
- this.clientsNumber = 'allClients';
- }
-
- $onInit() {
- this.getMinClientId();
- this.getMaxClientId();
- }
-
- getMinClientId() {
- this.getClientId('min')
- .then(res => this.invoice.fromClientId = res.data.id);
- }
-
- getMaxClientId() {
- this.getClientId('max')
- .then(res => this.invoice.toClientId = res.data.id);
- }
-
- getClientId(func) {
- const order = func == 'min' ? 'ASC' : 'DESC';
- const params = {
- filter: {
- order: 'id ' + order,
- limit: 1
- }
- };
- return this.$http.get('Clients/findOne', {params});
- }
-
- get companyFk() {
- return this.invoice.companyFk;
- }
-
- set companyFk(value) {
- this.invoice.companyFk = value;
- }
-
- restartValues() {
- this.lastClientId = null;
- this.$.invoiceButton.disabled = false;
- }
-
- cancelRequest() {
- this.canceler = this.$q.defer();
- return {timeout: this.canceler.promise};
- }
-
- invoiceOut(invoice, clientsAndAddresses) {
- const [clientAndAddress] = clientsAndAddresses;
- if (!clientAndAddress) return;
- this.currentClientId = clientAndAddress.clientId;
- const params = {
- clientId: clientAndAddress.clientId,
- addressId: clientAndAddress.addressId,
- invoiceDate: invoice.invoiceDate,
- maxShipped: invoice.maxShipped,
- companyFk: invoice.companyFk,
- minShipped: invoice.minShipped,
-
- };
-
- const options = this.cancelRequest();
-
- return this.$http.post(`InvoiceOuts/invoiceClient`, params, options)
- .then(() => {
- clientsAndAddresses.shift();
- return this.invoiceOut(invoice, clientsAndAddresses);
- });
- }
-
- responseHandler(response) {
- try {
- if (response !== 'accept')
- return super.responseHandler(response);
-
- if (!this.invoice.invoiceDate || !this.invoice.maxShipped)
- throw new Error('Invoice date and the max date should be filled');
-
- if (!this.invoice.fromClientId || !this.invoice.toClientId)
- throw new Error('Choose a valid clients range');
-
- this.on('close', () => {
- if (this.canceler) this.canceler.resolve();
- this.vnApp.showSuccess(this.$t('Data saved!'));
- });
-
- this.$.invoiceButton.disabled = true;
- this.packageInvoicing = true;
- const options = this.cancelRequest();
-
- this.$http.post(`InvoiceOuts/clientsToInvoice`, this.invoice, options)
- .then(res => {
- this.packageInvoicing = false;
- const invoice = res.data.invoice;
- const clientsAndAddresses = res.data.clientsAndAddresses;
- if (!clientsAndAddresses.length) return super.responseHandler(response);
- this.lastClientId = clientsAndAddresses[clientsAndAddresses.length - 1].clientId;
- return this.invoiceOut(invoice, clientsAndAddresses);
- })
- .then(() => super.responseHandler(response))
- .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
- .finally(() => this.restartValues());
- } catch (e) {
- this.vnApp.showError(this.$t(e.message));
- this.restartValues();
- return false;
- }
- }
-}
-
-Controller.$inject = ['$element', '$scope', '$transclude'];
-
-ngModule.vnComponent('vnInvoiceOutGlobalInvoicing', {
- slotTemplate: require('./index.html'),
- controller: Controller,
- bindings: {
- companyFk: ' {
- describe('Component vnInvoiceOutGlobalInvoicing', () => {
- let controller;
- let $httpBackend;
- let $httpParamSerializer;
-
- beforeEach(ngModule('invoiceOut'));
-
- beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
- $httpBackend = _$httpBackend_;
- $httpParamSerializer = _$httpParamSerializer_;
- let $scope = $rootScope.$new();
- const $element = angular.element('
-
@@ -37,7 +37,7 @@
class="clickable vn-tr search-result"
ui-sref="invoiceOut.card.summary({id: {{::invoiceOut.id}}})">
-
@@ -68,29 +68,13 @@
-
-
\ No newline at end of file
diff --git a/modules/invoiceOut/front/index/manual/index.html b/modules/invoiceOut/front/index/manual/index.html
index 3148d3f94..37e6fa119 100644
--- a/modules/invoiceOut/front/index/manual/index.html
+++ b/modules/invoiceOut/front/index/manual/index.html
@@ -14,11 +14,11 @@
data="taxAreas"
order="code">
-
-
@@ -80,4 +80,4 @@
-
\ No newline at end of file
+
diff --git a/modules/invoiceOut/front/index/manual/style.scss b/modules/invoiceOut/front/index/manual/style.scss
index 18e6f3513..820c07756 100644
--- a/modules/invoiceOut/front/index/manual/style.scss
+++ b/modules/invoiceOut/front/index/manual/style.scss
@@ -14,4 +14,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/invoiceOut/front/routes.json b/modules/invoiceOut/front/routes.json
index 09d9f3d33..c396a5334 100644
--- a/modules/invoiceOut/front/routes.json
+++ b/modules/invoiceOut/front/routes.json
@@ -6,7 +6,9 @@
"dependencies": ["worker", "client", "ticket"],
"menus": {
"main": [
- {"state": "invoiceOut.index", "icon": "icon-invoice-out"}
+ {"state": "invoiceOut.index", "icon": "icon-invoice-out"},
+ {"state": "invoiceOut.global-invoicing", "icon": "contact_support"}
+
]
},
"routes": [
@@ -24,6 +26,12 @@
"component": "vn-invoice-out-index",
"description": "InvoiceOut"
},
+ {
+ "url": "/global-invoicing?q",
+ "state": "invoiceOut.global-invoicing",
+ "component": "vn-invoice-out-global-invoicing",
+ "description": "Global invoicing"
+ },
{
"url": "/summary",
"state": "invoiceOut.card.summary",
@@ -40,4 +48,4 @@
"component": "vn-invoice-out-card"
}
]
-}
\ No newline at end of file
+}
diff --git a/modules/item/back/methods/fixed-price/editFixedPrice.js b/modules/item/back/methods/fixed-price/editFixedPrice.js
new file mode 100644
index 000000000..13e0fc41b
--- /dev/null
+++ b/modules/item/back/methods/fixed-price/editFixedPrice.js
@@ -0,0 +1,96 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('editFixedPrice', {
+ description: 'Updates a column for one or more fixed price',
+ accessType: 'WRITE',
+ accepts: [{
+ arg: 'field',
+ type: 'string',
+ required: true,
+ description: `the column to edit`
+ },
+ {
+ arg: 'newValue',
+ type: 'any',
+ required: true,
+ description: `The new value to save`
+ },
+ {
+ arg: 'lines',
+ type: ['object'],
+ required: true,
+ description: `the buys which will be modified`
+ },
+ {
+ arg: 'filter',
+ type: 'object',
+ description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string'
+ }],
+ returns: {
+ type: 'object',
+ root: true
+ },
+ http: {
+ path: `/editFixedPrice`,
+ verb: 'POST'
+ }
+ });
+
+ Self.editFixedPrice = async(ctx, field, newValue, lines, filter, options) => {
+ let tx;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ let modelName;
+ let identifier;
+
+ switch (field) {
+ case 'hasMinPrice':
+ case 'minPrice':
+ modelName = 'Item';
+ identifier = 'itemFk';
+ break;
+ case 'rate2':
+ case 'rate3':
+ case 'started':
+ case 'ended':
+ case 'warehouseFk':
+ modelName = 'FixedPrice';
+ identifier = 'id';
+ }
+
+ const models = Self.app.models;
+ const model = models[modelName];
+ try {
+ const promises = [];
+ const value = {};
+ value[field] = newValue;
+
+ if (filter) {
+ filter = {where: filter};
+ lines = await models.FixedPrice.filter(ctx, filter, myOptions);
+ }
+
+ const targets = lines.map(line => {
+ return line[identifier];
+ });
+ for (let target of targets)
+ promises.push(model.upsertWithWhere({id: target}, value, myOptions));
+
+ const result = await Promise.all(promises);
+
+ if (tx) await tx.commit();
+
+ return result;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/item/back/methods/fixed-price/filter.js b/modules/item/back/methods/fixed-price/filter.js
index c15ae67f0..9c91886c1 100644
--- a/modules/item/back/methods/fixed-price/filter.js
+++ b/modules/item/back/methods/fixed-price/filter.js
@@ -184,8 +184,7 @@ module.exports = Self => {
}
}
- stmt.merge(conn.makeWhere(filter.where));
- stmt.merge(conn.makePagination(filter));
+ stmt.merge(conn.makeSuffix(filter));
const fixedPriceIndex = stmts.push(stmt) - 1;
const sql = ParameterizedSQL.join(stmts, ';');
diff --git a/modules/item/back/methods/fixed-price/specs/editFixedPrice.spec.js b/modules/item/back/methods/fixed-price/specs/editFixedPrice.spec.js
new file mode 100644
index 000000000..9c265f28a
--- /dev/null
+++ b/modules/item/back/methods/fixed-price/specs/editFixedPrice.spec.js
@@ -0,0 +1,63 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('Item editFixedPrice()', () => {
+ it('should change the value of a given column for the selected buys', async() => {
+ const tx = await models.FixedPrice.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ const ctx = {
+ args: {
+ search: '1'
+ },
+ req: {accessToken: {userId: 1}}
+ };
+
+ const [original] = await models.FixedPrice.filter(ctx, null, options);
+
+ const field = 'rate2';
+ const newValue = 99;
+ const lines = [{itemFk: original.itemFk, id: original.id}];
+
+ await models.FixedPrice.editFixedPrice(ctx, field, newValue, lines, null, options);
+
+ const [result] = await models.FixedPrice.filter(ctx, null, options);
+
+ expect(result[field]).toEqual(newValue);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should change the value of a given column for filter', async() => {
+ const tx = await models.FixedPrice.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ const filter = {'it.categoryFk': 1};
+ const ctx = {
+ args: {
+ filter: filter
+ },
+ req: {accessToken: {userId: 1}}
+ };
+
+ const field = 'rate2';
+ const newValue = 88;
+
+ await models.FixedPrice.editFixedPrice(ctx, field, newValue, null, filter, options);
+
+ const [result] = await models.FixedPrice.filter(ctx, filter, options);
+
+ expect(result[field]).toEqual(newValue);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js b/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js
index 5a47de6bf..823406500 100644
--- a/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js
+++ b/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js
@@ -1,4 +1,5 @@
const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
describe('upsertFixedPrice()', () => {
const now = Date.vnNew();
@@ -7,6 +8,17 @@ describe('upsertFixedPrice()', () => {
beforeAll(async() => {
originalFixedPrice = await models.FixedPrice.findById(fixedPriceId);
+ const activeCtx = {
+ accessToken: {userId: 9},
+ http: {
+ req: {
+ headers: {origin: 'http://localhost'}
+ }
+ }
+ };
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
});
it(`should toggle the hasMinPrice boolean if there's a minPrice and update the rest of the data`, async() => {
@@ -30,7 +42,7 @@ describe('upsertFixedPrice()', () => {
delete ctx.args.started;
delete ctx.args.ended;
- ctx.args.hasMinPrice = true;
+ ctx.args.hasMinPrice = false;
expect(result).toEqual(jasmine.objectContaining(ctx.args));
@@ -62,7 +74,7 @@ describe('upsertFixedPrice()', () => {
delete ctx.args.started;
delete ctx.args.ended;
- ctx.args.hasMinPrice = false;
+ ctx.args.hasMinPrice = true;
expect(result).toEqual(jasmine.objectContaining(ctx.args));
@@ -93,7 +105,7 @@ describe('upsertFixedPrice()', () => {
rate2: rate2,
rate3: firstRate3,
minPrice: 0,
- hasMinPrice: false
+ hasMinPrice: true
}};
// create new fixed price
diff --git a/modules/item/back/methods/fixed-price/upsertFixedPrice.js b/modules/item/back/methods/fixed-price/upsertFixedPrice.js
index eb3eec1bd..edbd23604 100644
--- a/modules/item/back/methods/fixed-price/upsertFixedPrice.js
+++ b/modules/item/back/methods/fixed-price/upsertFixedPrice.js
@@ -87,7 +87,7 @@ module.exports = Self => {
await targetItem.updateAttributes({
minPrice: args.minPrice,
- hasMinPrice: args.minPrice ? true : false
+ hasMinPrice: args.hasMinPrice
}, myOptions);
const itemFields = [
diff --git a/modules/item/back/methods/item-image-queue/download.js b/modules/item/back/methods/item-image-queue/download.js
new file mode 100644
index 000000000..5f1b460fc
--- /dev/null
+++ b/modules/item/back/methods/item-image-queue/download.js
@@ -0,0 +1,191 @@
+const axios = require('axios');
+const uuid = require('uuid');
+const fs = require('fs/promises');
+const {createWriteStream} = require('fs');
+const path = require('path');
+const gm = require('gm');
+
+module.exports = Self => {
+ Self.remoteMethod('download', {
+ description: 'Processes the image download queue',
+ accessType: 'WRITE',
+ http: {
+ path: `/download`,
+ verb: 'POST',
+ },
+ });
+
+ Self.download = async() => {
+ const models = Self.app.models;
+ const tempContainer = await models.TempContainer.container(
+ 'salix-image'
+ );
+ const tempPath = path.join(
+ tempContainer.client.root,
+ tempContainer.name
+ );
+ const maxAttempts = 3;
+ const collectionName = 'catalog';
+
+ const tx = await Self.beginTransaction({});
+
+ let tempFilePath;
+ let queueRow;
+ try {
+ const myOptions = {transaction: tx};
+
+ queueRow = await Self.findOne(
+ {
+ fields: ['id', 'itemFk', 'url', 'attempts'],
+ where: {
+ url: {neq: null},
+ attempts: {
+ lt: maxAttempts,
+ },
+ },
+ order: 'priority, attempts, updated',
+ },
+ myOptions
+ );
+
+ if (!queueRow) return;
+
+ const collection = await models.ImageCollection.findOne(
+ {
+ fields: [
+ 'id',
+ 'maxWidth',
+ 'maxHeight',
+ 'model',
+ 'property',
+ ],
+ where: {name: collectionName},
+ include: {
+ relation: 'sizes',
+ scope: {
+ fields: ['width', 'height', 'crop'],
+ },
+ },
+ },
+ myOptions
+ );
+
+ const fileName = `${uuid.v4()}.png`;
+ tempFilePath = path.join(tempPath, fileName);
+
+ // Insert image row
+ await models.Image.create(
+ {
+ name: fileName,
+ collectionFk: collectionName,
+ updated: Date.vnNow(),
+ },
+ myOptions
+ );
+
+ // Update item
+ const model = models[collection.model];
+ if (!model) throw new Error('No matching model found');
+
+ const item = await model.findById(queueRow.itemFk, null, myOptions);
+ if (item) {
+ await item.updateAttribute(
+ collection.property,
+ fileName,
+ myOptions
+ );
+ }
+
+ // Download remote image
+ const response = await axios.get(queueRow.url, {
+ responseType: 'stream',
+ });
+
+ const writeStream = createWriteStream(tempFilePath);
+ await new Promise((resolve, reject) => {
+ writeStream.on('open', () => response.data.pipe(writeStream));
+ writeStream.on('finish', () => resolve());
+ writeStream.on('error', error => reject(error));
+ });
+
+ // Resize
+ const container = await models.ImageContainer.container(
+ collectionName
+ );
+ const rootPath = container.client.root;
+ const collectionDir = path.join(rootPath, collectionName);
+
+ // To max size
+ const {maxWidth, maxHeight} = collection;
+ const fullSizePath = path.join(collectionDir, 'full');
+ const toFullSizePath = `${fullSizePath}/${fileName}`;
+
+ await fs.mkdir(fullSizePath, {recursive: true});
+ await new Promise((resolve, reject) => {
+ gm(tempFilePath)
+ .resize(maxWidth, maxHeight, '>')
+ .setFormat('png')
+ .write(toFullSizePath, function(err) {
+ if (err) reject(err);
+ if (!err) resolve();
+ });
+ });
+
+ // To collection sizes
+ for (const size of collection.sizes()) {
+ const {width, height} = size;
+
+ const sizePath = path.join(collectionDir, `${width}x${height}`);
+ const toSizePath = `${sizePath}/${fileName}`;
+
+ await fs.mkdir(sizePath, {recursive: true});
+ await new Promise((resolve, reject) => {
+ const gmInstance = gm(tempFilePath);
+
+ if (size.crop) {
+ gmInstance
+ .resize(width, height, '^')
+ .gravity('Center')
+ .crop(width, height);
+ }
+
+ if (!size.crop) gmInstance.resize(width, height, '>');
+
+ gmInstance
+ .setFormat('png')
+ .write(toSizePath, function(err) {
+ if (err) reject(err);
+ if (!err) resolve();
+ });
+ });
+ }
+
+ try {
+ await fs.unlink(tempFilePath);
+ } catch (error) { }
+
+ await queueRow.destroy(myOptions);
+
+ // Restart queue
+ Self.download();
+
+ await tx.commit();
+ } catch (error) {
+ await tx.rollback();
+
+ if (queueRow.attempts < maxAttempts) {
+ await queueRow.updateAttributes({
+ error: error,
+ attempts: queueRow.attempts + 1,
+ updated: Date.vnNew(),
+ });
+ }
+
+ try {
+ await fs.unlink(tempFilePath);
+ } catch (error) { }
+
+ Self.download();
+ }
+ };
+};
diff --git a/modules/item/back/methods/item-image-queue/downloadImages.js b/modules/item/back/methods/item-image-queue/downloadImages.js
deleted file mode 100644
index 0f57856c7..000000000
--- a/modules/item/back/methods/item-image-queue/downloadImages.js
+++ /dev/null
@@ -1,113 +0,0 @@
-const https = require('https');
-const fs = require('fs-extra');
-const path = require('path');
-
-module.exports = Self => {
- Self.remoteMethod('downloadImages', {
- description: 'Returns last entries',
- accessType: 'WRITE',
- returns: {
- type: ['Object'],
- root: true
- },
- http: {
- path: `/downloadImages`,
- verb: 'POST'
- }
- });
-
- Self.downloadImages = async() => {
- const models = Self.app.models;
- const container = await models.TempContainer.container('salix-image');
- const tempPath = path.join(container.client.root, container.name);
- const maxAttempts = 3;
-
- const images = await Self.find({
- where: {attempts: {eq: maxAttempts}}
- });
-
- for (let image of images) {
- const currentStamp = Date.vnNew().getTime();
- const updatedStamp = image.updated.getTime();
- const graceTime = Math.abs(currentStamp - updatedStamp);
- const maxTTL = 3600 * 48 * 1000; // 48 hours in ms;
-
- if (graceTime >= maxTTL)
- await Self.destroyById(image.itemFk);
- }
-
- download();
-
- async function download() {
- const image = await Self.findOne({
- where: {url: {neq: null}, attempts: {lt: maxAttempts}},
- order: 'priority, attempts, updated'
- });
-
- if (!image) return;
-
- const srcFile = image.url;
- const fileName = srcFile.replace(/\.|\/|:|\?|\\|=|%/g, '');
- const file = `${fileName}.png`;
- const filePath = path.join(tempPath, file);
- const imageUrl = image.url.replace('http://', 'https://');
-
- https.get(imageUrl, async response => {
- if (response.statusCode != 200) {
- const error = new Error(`Could not download the image. Status code ${response.statusCode}`);
-
- return await errorHandler(image.itemFk, error, filePath);
- }
-
- const writeStream = fs.createWriteStream(filePath);
- writeStream.on('open', () => {
- response.pipe(writeStream);
- });
-
- writeStream.on('error', async error => {
- await errorHandler(image.itemFk, error, filePath);
- });
-
- writeStream.on('finish', async function() {
- writeStream.end();
- });
-
- writeStream.on('close', async function() {
- try {
- await models.Image.registerImage('catalog', filePath, fileName, image.itemFk);
- await image.destroy();
-
- download();
- } catch (error) {
- await errorHandler(image.itemFk, error, filePath);
- }
- });
- }).on('error', async error => {
- await errorHandler(image.itemFk, error, filePath);
- });
- }
-
- async function errorHandler(rowId, error, filePath) {
- try {
- const row = await Self.findById(rowId);
-
- if (!row) return;
-
- if (row.attempts < maxAttempts) {
- await row.updateAttributes({
- error: error,
- attempts: row.attempts + 1,
- updated: Date.vnNew()
- });
- }
-
- if (filePath && fs.existsSync(filePath))
- await fs.unlink(filePath);
-
- download();
- } catch (err) {
- throw new Error(`Image download failed: ${err}`);
- }
- }
- };
-};
diff --git a/modules/item/back/methods/item/getSummary.js b/modules/item/back/methods/item/getSummary.js
index 738976e60..6cd9d9511 100644
--- a/modules/item/back/methods/item/getSummary.js
+++ b/modules/item/back/methods/item/getSummary.js
@@ -98,9 +98,8 @@ module.exports = Self => {
summary.tags = res[1];
[summary.botanical] = res[2];
- const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
-
- res = await models.Item.getVisibleAvailable(summary.item.id, userConfig.warehouseFk, null, myOptions);
+ const itemConfig = await models.ItemConfig.findOne(null, myOptions);
+ res = await models.Item.getVisibleAvailable(summary.item.id, itemConfig.warehouseFk, undefined, myOptions);
summary.available = res.available;
summary.visible = res.visible;
diff --git a/modules/item/back/methods/item/labelPdf.js b/modules/item/back/methods/item/labelPdf.js
index 747869b37..c2462353d 100644
--- a/modules/item/back/methods/item/labelPdf.js
+++ b/modules/item/back/methods/item/labelPdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('labelPdf', {
description: 'Returns the item label pdf',
@@ -56,17 +54,5 @@ module.exports = Self => {
}
});
- Self.labelPdf = async(ctx, id) => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const report = new Report('item-label', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="item-${id}.pdf"`];
- };
+ Self.labelPdf = (ctx, id) => Self.printReport(ctx, id, 'item-label');
};
diff --git a/modules/item/back/methods/item/new.js b/modules/item/back/methods/item/new.js
index 0057cb50f..d066f2c9f 100644
--- a/modules/item/back/methods/item/new.js
+++ b/modules/item/back/methods/item/new.js
@@ -57,6 +57,7 @@ module.exports = Self => {
const itemType = await models.ItemType.findById(params.typeFk, {fields: ['isLaid']}, myOptions);
params.isLaid = itemType.isLaid;
+ params.isPhotoRequested = true;
const item = await models.Item.create(params, myOptions);
diff --git a/modules/item/back/methods/item/specs/clone.spec.js b/modules/item/back/methods/item/specs/clone.spec.js
index 1f4a87ac1..01210677e 100644
--- a/modules/item/back/methods/item/specs/clone.spec.js
+++ b/modules/item/back/methods/item/specs/clone.spec.js
@@ -1,7 +1,21 @@
const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
describe('item clone()', () => {
let nextItemId;
+ beforeAll(async() => {
+ const activeCtx = {
+ accessToken: {userId: 9},
+ http: {
+ req: {
+ headers: {origin: 'http://localhost'}
+ }
+ }
+ };
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+ });
beforeEach(async() => {
let query = `SELECT i1.id + 1 as id FROM vn.item i1
diff --git a/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js b/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js
index 13b2417d7..61bf6b3e7 100644
--- a/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js
+++ b/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js
@@ -12,7 +12,7 @@ describe('item getVisibleAvailable()', () => {
const result = await models.Item.getVisibleAvailable(itemFk, warehouseFk, dated, options);
- expect(result.available).toEqual(187);
+ expect(result.available).toEqual(185);
expect(result.visible).toEqual(92);
await tx.rollback();
diff --git a/modules/item/back/methods/item/specs/new.spec.js b/modules/item/back/methods/item/specs/new.spec.js
index e34ab2cf5..a1c741649 100644
--- a/modules/item/back/methods/item/specs/new.spec.js
+++ b/modules/item/back/methods/item/specs/new.spec.js
@@ -1,6 +1,21 @@
const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
describe('item new()', () => {
+ beforeAll(async() => {
+ const activeCtx = {
+ accessToken: {userId: 9},
+ http: {
+ req: {
+ headers: {origin: 'http://localhost'}
+ }
+ }
+ };
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+ });
+
it('should create a new item, adding the name as a tag', async() => {
const tx = await models.Item.beginTransaction({});
const options = {transaction: tx};
diff --git a/modules/item/back/methods/item/specs/regularize.spec.js b/modules/item/back/methods/item/specs/regularize.spec.js
index ea0cdfa5a..e7df9a003 100644
--- a/modules/item/back/methods/item/specs/regularize.spec.js
+++ b/modules/item/back/methods/item/specs/regularize.spec.js
@@ -1,6 +1,21 @@
const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
describe('regularize()', () => {
+ beforeAll(async() => {
+ const activeCtx = {
+ accessToken: {userId: 18},
+ http: {
+ req: {
+ headers: {origin: 'http://localhost'}
+ }
+ }
+ };
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+ });
+
it('should create a new ticket and add a line', async() => {
const tx = await models.Item.beginTransaction({});
const options = {transaction: tx};
diff --git a/modules/item/back/models/fixed-price.js b/modules/item/back/models/fixed-price.js
index 91010805f..45f8d79ef 100644
--- a/modules/item/back/models/fixed-price.js
+++ b/modules/item/back/models/fixed-price.js
@@ -2,4 +2,5 @@ module.exports = Self => {
require('../methods/fixed-price/filter')(Self);
require('../methods/fixed-price/upsertFixedPrice')(Self);
require('../methods/fixed-price/getRate2')(Self);
+ require('../methods/fixed-price/editFixedPrice')(Self);
};
diff --git a/modules/item/back/models/item-config.json b/modules/item/back/models/item-config.json
index 36d25e0bb..7ad1d8785 100644
--- a/modules/item/back/models/item-config.json
+++ b/modules/item/back/models/item-config.json
@@ -21,10 +21,13 @@
"type": "array"
},
"defaultPriority": {
- "type": "int"
+ "type": "number"
},
"defaultTag": {
- "type": "int"
+ "type": "number"
+ },
+ "warehouseFk": {
+ "type": "number"
}
},
"relations": {
diff --git a/modules/item/back/models/item-image-queue.js b/modules/item/back/models/item-image-queue.js
index e2059ddac..35a467693 100644
--- a/modules/item/back/models/item-image-queue.js
+++ b/modules/item/back/models/item-image-queue.js
@@ -1,3 +1,3 @@
module.exports = Self => {
- require('../methods/item-image-queue/downloadImages')(Self);
+ require('../methods/item-image-queue/download')(Self);
};
diff --git a/modules/item/back/models/item-shelving.json b/modules/item/back/models/item-shelving.json
index 0890350da..339b9ab6e 100644
--- a/modules/item/back/models/item-shelving.json
+++ b/modules/item/back/models/item-shelving.json
@@ -20,6 +20,9 @@
},
"created": {
"type": "date"
+ },
+ "isChecked": {
+ "type": "boolean"
}
},
"relations": {
diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json
index 2f58c30a9..d6b3c27ad 100644
--- a/modules/item/back/models/item.json
+++ b/modules/item/back/models/item.json
@@ -3,7 +3,8 @@
"base": "Loggable",
"log": {
"model": "ItemLog",
- "showField": "id"
+ "showField": "id",
+ "grabUser": true
},
"options": {
"mysql": {
@@ -146,6 +147,12 @@
},
"isLaid": {
"type": "boolean"
+ },
+ "isPhotoRequested": {
+ "type": "boolean",
+ "mysql":{
+ "columnName": "doPhoto"
+ }
}
},
"relations": {
@@ -214,4 +221,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html
index fd21ab240..974aa37d8 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -182,6 +182,12 @@
ng-model="$ctrl.item.isFragile"
info="Is shown at website, app that this item cannot travel (wreath, palms, ...)">
+
+
diff --git a/modules/item/front/basic-data/locale/es.yml b/modules/item/front/basic-data/locale/es.yml
index d59752ebb..747dfe792 100644
--- a/modules/item/front/basic-data/locale/es.yml
+++ b/modules/item/front/basic-data/locale/es.yml
@@ -11,4 +11,6 @@ Identifier: Identificador
Fragile: Frágil
Is shown at website, app that this item cannot travel (wreath, palms, ...): Se muestra en la web, app que este artículo no puede viajar (coronas, palmas, ...)
Multiplier: Multiplicador
-Generic: Genérico
\ No newline at end of file
+Generic: Genérico
+This item does need a photo: Este artículo necesita una foto
+Do photo: Hacer foto
\ No newline at end of file
diff --git a/modules/item/front/card/index.html b/modules/item/front/card/index.html
index e92e1696d..330d274c0 100644
--- a/modules/item/front/card/index.html
+++ b/modules/item/front/card/index.html
@@ -1,6 +1,6 @@
-
![]()
Available
+
-
{{$ctrl.item.itemType.worker.user.name}}
@@ -50,22 +60,22 @@
@@ -112,7 +122,7 @@
question="Do you want to clone this item?"
message="All it's properties will be copied">
-
@@ -120,7 +130,7 @@
-
-
\ No newline at end of file
+
diff --git a/modules/item/front/descriptor/index.js b/modules/item/front/descriptor/index.js
index b88f24456..5f38d08dd 100644
--- a/modules/item/front/descriptor/index.js
+++ b/modules/item/front/descriptor/index.js
@@ -30,7 +30,10 @@ class Controller extends Descriptor {
set warehouseFk(value) {
this._warehouseFk = value;
- if (value) this.updateStock();
+ if (value) {
+ this.updateStock();
+ this.getWarehouseName(value);
+ }
}
loadData() {
@@ -88,6 +91,25 @@ class Controller extends Descriptor {
this.$.photo.setAttribute('src', newSrc);
this.$.photo.setAttribute('zoom-image', newZoomSrc);
+
+ if (this.item.isPhotoRequested)
+ this.$http.patch(`Items/${this.item.id}`, {isPhotoRequested: false});
+ }
+
+ getWarehouseName(warehouseFk) {
+ this.showIcon = false;
+
+ const filter = {
+ where: {id: warehouseFk}
+ };
+ this.$http.get('Warehouses/findOne', {filter})
+ .then(res => {
+ this.warehouseText = this.$t('WarehouseFk', {
+ warehouseName: res.data.name
+ });
+
+ this.showIcon = true;
+ });
}
}
@@ -100,6 +122,6 @@ ngModule.vnComponent('vnItemDescriptor', {
item: '<',
dated: '<',
cardReload: '&',
- warehouseFk: ' {
id: 1,
itemType: {
warehouseFk: 1
- }
+ },
+ isPhotoRequested: true
};
const stock = {
visible: 1,
@@ -43,4 +44,16 @@ describe('vnItemDescriptor', () => {
expect(controller.item).toEqual(item);
});
});
+
+ describe('onUploadResponse()', () => {
+ it(`should change isPhotoRequested when a new photo is uploaded`, () => {
+ controller.item = item;
+ controller.$rootScope = {imagePath: () => {}};
+ controller.$.photo = {setAttribute: () => {}};
+
+ $httpBackend.expectPATCH(`Items/${item.id}`).respond(200);
+ controller.onUploadResponse();
+ $httpBackend.flush();
+ });
+ });
});
diff --git a/modules/item/front/diary/index.js b/modules/item/front/diary/index.js
index 1e93f9f16..03134913f 100644
--- a/modules/item/front/diary/index.js
+++ b/modules/item/front/diary/index.js
@@ -37,6 +37,7 @@ class Controller extends Section {
set warehouseFk(value) {
if (value && value != this._warehouseFk) {
this._warehouseFk = value;
+ this.card.warehouseFk = value;
this.$state.go(this.$state.current.name, {
warehouseFk: value
@@ -67,6 +68,11 @@ class Controller extends Section {
this.$[descriptor].show(event.target, sale.origin);
}
+
+ $onDestroy() {
+ if (this.$state.getCurrentPath()[2].state.name === 'item')
+ this.card.reload();
+ }
}
Controller.$inject = ['$element', '$scope', '$anchorScroll', '$location'];
@@ -76,5 +82,8 @@ ngModule.vnComponent('vnItemDiary', {
controller: Controller,
bindings: {
item: '<'
+ },
+ require: {
+ card: '?^vnItemCard'
}
});
diff --git a/modules/item/front/diary/index.spec.js b/modules/item/front/diary/index.spec.js
index a80fbfc69..a6302346d 100644
--- a/modules/item/front/diary/index.spec.js
+++ b/modules/item/front/diary/index.spec.js
@@ -14,6 +14,7 @@ describe('Item', () => {
controller = $componentController('vnItemDiary', {$element, $scope});
controller.$.model = crudModel;
controller.$params = {id: 1};
+ controller.card = {};
}));
describe('set item()', () => {
diff --git a/modules/item/front/fixed-price/index.html b/modules/item/front/fixed-price/index.html
index ce7cefe7a..a82fd2742 100644
--- a/modules/item/front/fixed-price/index.html
+++ b/modules/item/front/fixed-price/index.html
@@ -1,6 +1,7 @@
@@ -31,15 +34,21 @@
diff --git a/modules/ticket/front/advance/index.js b/modules/ticket/front/advance/index.js
index 1b9272bcc..7b8008426 100644
--- a/modules/ticket/front/advance/index.js
+++ b/modules/ticket/front/advance/index.js
@@ -119,9 +119,15 @@ export default class Controller extends Section {
}
totalPriceColor(totalWithVat) {
- const total = parseInt(totalWithVat);
- if (total > 0 && total < 50)
- return 'warning';
+ return this.isLessThan50(totalWithVat) ? 'warning' : '';
+ }
+
+ totalPriceTitle(totalWithVat) {
+ return this.isLessThan50(totalWithVat) ? 'Less than 50€' : '';
+ }
+
+ isLessThan50(totalWithVat) {
+ return (parseInt(totalWithVat) > 0 && parseInt(totalWithVat) < 50);
}
get confirmationMessage() {
@@ -134,7 +140,7 @@ export default class Controller extends Section {
agencies(futureAgency, agency) {
return this.$t(`Origin agency`, {agency: futureAgency}) +
- '
' + this.$t(`Destination agency`, {agency: agency}); + '\n' + this.$t(`Destination agency`, {agency: agency}); } moveTicketsAdvance() { @@ -171,15 +177,25 @@ export default class Controller extends Section { case 'futureLines': return {'futureLines': value}; case 'ipt': - return {'ipt': value}; + return {or: + [ + {'ipt': {like: `%${value}%`}}, + {'ipt': null} + ] + }; case 'futureIpt': - return {'futureIpt': value}; + return {or: + [ + {'futureIpt': {like: `%${value}%`}}, + {'futureIpt': null} + ] + }; case 'totalWithVat': return {'totalWithVat': value}; case 'futureTotalWithVat': return {'futureTotalWithVat': value}; - case 'hasStock': - return {'hasStock': value}; + case 'notMovableLines': + return {'notMovableLines': value}; } } } diff --git a/modules/ticket/front/advance/locale/es.yml b/modules/ticket/front/advance/locale/es.yml index da22cd433..3111d9afd 100644 --- a/modules/ticket/front/advance/locale/es.yml +++ b/modules/ticket/front/advance/locale/es.yml @@ -7,3 +7,5 @@ Liters: Litros Item Packing Type: Encajado Origin agency: "Agencia origen: {{agency}}" Destination agency: "Agencia destino: {{agency}}" +Less than 50€: Menor a 50€ +Not Movable: No movibles diff --git a/modules/ticket/front/basic-data/step-two/index.html b/modules/ticket/front/basic-data/step-two/index.html index 6be455fc9..fc57a354a 100644 --- a/modules/ticket/front/basic-data/step-two/index.html +++ b/modules/ticket/front/basic-data/step-two/index.html @@ -23,7 +23,7 @@ title="{{::sale.item.name}}" vn-click-stop="itemDescriptor.show($event, sale.itemFk, sale.id)" class="link"> - {{::sale.itemFk | zeroFill:6}} + {{::sale.itemFk}}
@@ -40,7 +40,7 @@
-
{{::sale.movable}}
@@ -64,14 +64,14 @@
diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index ec6dc7ee2..447411f3a 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -55,7 +55,7 @@
ng-model="expedition.checked">
- {{expedition.id | zeroFill:6}}
+ {{expedition.id}}
{{::ticket.liters}}
{{::ticket.lines}}
-
+
diff --git a/modules/ticket/front/future/index.js b/modules/ticket/front/future/index.js
index b588f1e49..8cb7f16aa 100644
--- a/modules/ticket/front/future/index.js
+++ b/modules/ticket/front/future/index.js
@@ -149,9 +149,19 @@ export default class Controller extends Section {
case 'lines':
return {'lines': value};
case 'ipt':
- return {'ipt': value};
+ return {or:
+ [
+ {'ipt': {like: `%${value}%`}},
+ {'ipt': null}
+ ]
+ };
case 'futureIpt':
- return {'futureIpt': value};
+ return {or:
+ [
+ {'futureIpt': {like: `%${value}%`}},
+ {'futureIpt': null}
+ ]
+ };
}
}
}
diff --git a/modules/ticket/front/request/index/index.html b/modules/ticket/front/request/index/index.html
index 054f0c76a..510c09974 100644
--- a/modules/ticket/front/request/index/index.html
+++ b/modules/ticket/front/request/index/index.html
@@ -75,7 +75,7 @@
ng-show="::request.saleFk"
ng-click="itemDescriptor.show($event, request.sale.itemFk, request.sale.id)"
class="link">
- {{::request.saleFk | zeroFill:6}}
+ {{::request.saleFk}}
Item
Description
Quantity
+ Parking
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
{{::sale.quantity}}
+ {{::sale.saleGroupDetail.saleGroup.parking.code | dashIfEmpty}}
+ disabled="!$ctrl.hasSelectedSales()"
+ vn-tooltip="Select lines to see the options"
+ ng-click="moreOptions.show($event)">
+ ng-click="itemDescriptor.show($event, sale.itemFk, sale.id, $ctrl.ticket.shipped)">
{{sale.itemFk}}
+ ng-click="log.open()"
+ ng-show="sale.$hasLogs">
- {{::sale.itemFk | zeroFill:6}}
+ {{::sale.itemFk}}
{{::sale.concept}}
diff --git a/modules/ticket/front/sale/locale/es.yml b/modules/ticket/front/sale/locale/es.yml
index 2668b7811..41ba52d17 100644
--- a/modules/ticket/front/sale/locale/es.yml
+++ b/modules/ticket/front/sale/locale/es.yml
@@ -40,3 +40,4 @@ Refund: Abono
Promotion mana: Maná promoción
Claim mana: Maná reclamación
History: Historial
+Select lines to see the options: Seleccione lineas para ver las opciones
diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html
index af44ed67c..97055208b 100644
--- a/modules/ticket/front/summary/index.html
+++ b/modules/ticket/front/summary/index.html
@@ -105,7 +105,10 @@
@@ -174,7 +177,7 @@
- {{sale.itemFk | zeroFill:6}}
+ {{sale.itemFk}}
@@ -309,7 +312,7 @@
ng-show="::request.saleFk"
ng-click="itemDescriptor.show($event, request.sale.itemFk, request.sale.id)"
class="link">
- {{request.sale.itemFk | zeroFill:6}}
+ {{request.sale.itemFk}}
diff --git a/modules/ticket/front/volume/index.html b/modules/ticket/front/volume/index.html
index 8f17a9475..f5dd18033 100644
--- a/modules/ticket/front/volume/index.html
+++ b/modules/ticket/front/volume/index.html
@@ -35,7 +35,7 @@
- {{sale.itemFk | zeroFill:6}}
+ {{sale.itemFk}}
diff --git a/modules/travel/back/methods/travel/extraCommunityEmail.js b/modules/travel/back/methods/travel/extraCommunityEmail.js
index dd93ed905..f4b09b79d 100644
--- a/modules/travel/back/methods/travel/extraCommunityEmail.js
+++ b/modules/travel/back/methods/travel/extraCommunityEmail.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('extraCommunityEmail', {
description: 'Sends the extra community email with an attached PDF',
@@ -74,19 +72,5 @@ module.exports = Self => {
}
});
- Self.extraCommunityEmail = async ctx => {
- const args = Object.assign({}, ctx.args);
- const params = {
- recipient: args.recipient,
- lang: ctx.req.getLocale()
- };
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const email = new Email('extra-community', params);
-
- return email.send();
- };
+ Self.extraCommunityEmail = ctx => Self.sendTemplate(ctx, 'extra-community');
};
diff --git a/modules/travel/back/methods/travel/extraCommunityFilter.js b/modules/travel/back/methods/travel/extraCommunityFilter.js
index 027261c4b..5ee51de8e 100644
--- a/modules/travel/back/methods/travel/extraCommunityFilter.js
+++ b/modules/travel/back/methods/travel/extraCommunityFilter.js
@@ -130,6 +130,7 @@ module.exports = Self => {
SUM(b.stickers) AS stickers,
s.id AS cargoSupplierFk,
s.nickname AS cargoSupplierNickname,
+ s.name AS supplierName,
CAST(SUM(b.weight * b.stickers) as DECIMAL(10,0)) as loadedKg,
CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) as DECIMAL(10,0)) as volumeKg
FROM travel t
@@ -167,6 +168,7 @@ module.exports = Self => {
SUM(b.stickers) AS stickers,
e.evaNotes,
e.notes,
+ e.invoiceAmount,
CAST(SUM(b.weight * b.stickers) AS DECIMAL(10,0)) as loadedkg,
CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) AS DECIMAL(10,0)) as volumeKg
FROM tmp.travel tr
diff --git a/modules/travel/back/methods/travel/extraCommunityPdf.js b/modules/travel/back/methods/travel/extraCommunityPdf.js
index a68e5cd09..676b98be2 100644
--- a/modules/travel/back/methods/travel/extraCommunityPdf.js
+++ b/modules/travel/back/methods/travel/extraCommunityPdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('extraCommunityPdf', {
description: 'Returns the extra community pdf',
@@ -11,6 +9,16 @@ module.exports = Self => {
description: 'The recipient id',
required: false
},
+ {
+ arg: 'filter',
+ type: 'object',
+ description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string'
+ },
+ {
+ arg: 'search',
+ type: 'string',
+ description: 'Searchs the travel by id'
+ },
{
arg: 'landedTo',
type: 'date'
@@ -73,17 +81,5 @@ module.exports = Self => {
}
});
- Self.extraCommunityPdf = async ctx => {
- const args = Object.assign({}, ctx.args);
- const params = {lang: ctx.req.getLocale()};
-
- delete args.ctx;
- for (const param in args)
- params[param] = args[param];
-
- const report = new Report('extra-community', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="extra-community.pdf"`];
- };
+ Self.extraCommunityPdf = ctx => Self.printReport(ctx, null, 'extra-community');
};
diff --git a/modules/travel/back/models/travel.json b/modules/travel/back/models/travel.json
index c20b7b0bf..7dd9f5bba 100644
--- a/modules/travel/back/models/travel.json
+++ b/modules/travel/back/models/travel.json
@@ -3,7 +3,8 @@
"base": "Loggable",
"log": {
"model":"TravelLog",
- "showField": "ref"
+ "showField": "ref",
+ "grabUser": true
},
"options": {
"mysql": {
diff --git a/modules/travel/front/extra-community/index.html b/modules/travel/front/extra-community/index.html
index ee8dcdf98..c888f97da 100644
--- a/modules/travel/front/extra-community/index.html
+++ b/modules/travel/front/extra-community/index.html
@@ -1,9 +1,9 @@
@@ -48,6 +48,9 @@
Agency
+
+ Amount
+
Reference
@@ -107,6 +110,7 @@
{{::travel.cargoSupplierNickname}}
+ {{::travel.agencyModeName}}
@@ -157,22 +161,15 @@
{{::entry.supplierName}}
+ {{::entry.invoiceAmount | currency: 'EUR': 2}}
{{::entry.ref}}
+ {{::entry.invoiceNumber}}
{{::entry.stickers}}
{{::entry.loadedkg}}
{{::entry.volumeKg}}
-
-
- {{::entry.notes}}
-
-
-
-
- {{::entry.evaNotes}}
-
-
+
diff --git a/modules/travel/front/extra-community/index.js b/modules/travel/front/extra-community/index.js
index 920339469..2028c9c19 100644
--- a/modules/travel/front/extra-community/index.js
+++ b/modules/travel/front/extra-community/index.js
@@ -141,8 +141,11 @@ class Controller extends Section {
get reportParams() {
const userParams = this.$.model.userParams;
+ const currentFilter = this.$.model.currentFilter;
+
return Object.assign({
- authorization: this.vnToken.token
+ authorization: this.vnToken.token,
+ filter: currentFilter
}, userParams);
}
diff --git a/modules/travel/front/extra-community/locale/es.yml b/modules/travel/front/extra-community/locale/es.yml
index dc231226f..ed6179c91 100644
--- a/modules/travel/front/extra-community/locale/es.yml
+++ b/modules/travel/front/extra-community/locale/es.yml
@@ -6,6 +6,6 @@ Phy. KG: KG físico
Vol. KG: KG Vol.
Search by travel id or reference: Buscar por id de travel o referencia
Search by extra community travel: Buscar por envío extra comunitario
-Continent Out: Continente salida
+Continent Out: Cont. salida
W. Shipped: F. envío
-W. Landed: F. llegada
\ No newline at end of file
+W. Landed: F. llegada
diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html
index 27a700083..a768e4a29 100644
--- a/modules/travel/front/index/index.html
+++ b/modules/travel/front/index/index.html
@@ -2,6 +2,15 @@
+
+
+
+
@@ -9,23 +18,22 @@
- Id
Reference
Agency
Warehouse Out
Shipped
- Delivered
+ Warehouse In
Landed
- Received
+ Total entries
-
- {{::travel.id}}
{{::travel.ref}}
{{::travel.agencyModeName}}
{{::travel.warehouseOutName}}
@@ -34,14 +42,27 @@
{{::travel.shipped | date:'dd/MM/yyyy'}}
-
+
+
+
{{::travel.warehouseInName}}
{{::travel.landed | date:'dd/MM/yyyy'}}
-
+
+
+
+ {{::travel.totalEntries}}
-
@@ -78,38 +99,9 @@
fixed-bottom-right>
-
-
-
-
- Filter by selection
-
-
- Exclude selection
-
-
- Remove filter
-
-
- Remove all filters
-
-
- Copy value
-
-
-
\ No newline at end of file
diff --git a/modules/travel/front/index/index.js b/modules/travel/front/index/index.js
index 7701289b7..a570146fe 100644
--- a/modules/travel/front/index/index.js
+++ b/modules/travel/front/index/index.js
@@ -1,5 +1,6 @@
import ngModule from '../module';
import Section from 'salix/components/section';
+import './style.scss';
export default class Controller extends Section {
preview(travel) {
@@ -30,37 +31,6 @@ export default class Controller extends Section {
if (timeDifference == 0) return 'warning';
if (timeDifference < 0) return 'success';
}
-
- exprBuilder(param, value) {
- switch (param) {
- case 'search':
- return /^\d+$/.test(value)
- ? {'t.id': value}
- : {'t.ref': {like: `%${value}%`}};
- case 'ref':
- return {'t.ref': {like: `%${value}%`}};
- case 'shipped':
- return {'t.shipped': {between: this.dateRange(value)}};
- case 'landed':
- return {'t.landed': {between: this.dateRange(value)}};
- case 'id':
- case 'agencyModeFk':
- case 'warehouseOutFk':
- case 'warehouseInFk':
- case 'totalEntries':
- param = `t.${param}`;
- return {[param]: value};
- }
- }
-
- dateRange(value) {
- const minHour = new Date(value);
- minHour.setHours(0, 0, 0, 0);
- const maxHour = new Date(value);
- maxHour.setHours(23, 59, 59, 59);
-
- return [minHour, maxHour];
- }
}
ngModule.vnComponent('vnTravelIndex', {
diff --git a/modules/travel/front/index/style.scss b/modules/travel/front/index/style.scss
new file mode 100644
index 000000000..ca1cf538b
--- /dev/null
+++ b/modules/travel/front/index/style.scss
@@ -0,0 +1,11 @@
+@import "variables";
+
+vn-travel-index {
+ vn-icon {
+ color: $color-font-secondary
+ }
+
+ vn-icon.active {
+ color: $color-success
+ }
+}
diff --git a/modules/travel/front/locale/es.yml b/modules/travel/front/locale/es.yml
index 7231d37cd..043702b99 100644
--- a/modules/travel/front/locale/es.yml
+++ b/modules/travel/front/locale/es.yml
@@ -1,7 +1,7 @@
#Ordenar alfabeticamente
Reference: Referencia
-Warehouse Out: Almacén salida
-Warehouse In: Almacén llegada
+Warehouse Out: Alm salida
+Warehouse In: Alm llegada
Shipped from: Salida desde
Shipped to: Salida hasta
Landed from: Llegada desde
@@ -10,12 +10,12 @@ Shipped: F. salida
Landed: F. llegada
Delivered: Enviado
Received: Recibido
-Travel id: Id envío
-Search travels by id: Buscar envíos por identificador
+Travel id: Id
+Search travels by id: Buscar envíos por identificador o referencia
New travel: Nuevo envío
travel: envío
# Sections
Travels: Envíos
Log: Historial
-Thermographs: Termógrafos
\ No newline at end of file
+Thermographs: Termógrafos
diff --git a/modules/travel/front/main/index.html b/modules/travel/front/main/index.html
index feb1e8b01..131d9409e 100644
--- a/modules/travel/front/main/index.html
+++ b/modules/travel/front/main/index.html
@@ -1,20 +1,6 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/travel/front/search-panel/index.js b/modules/travel/front/search-panel/index.js
index 877d4f9d3..9cf417da1 100644
--- a/modules/travel/front/search-panel/index.js
+++ b/modules/travel/front/search-panel/index.js
@@ -1,43 +1,69 @@
import ngModule from '../module';
import SearchPanel from 'core/components/searchbar/search-panel';
+import './style.scss';
class Controller extends SearchPanel {
constructor($, $element) {
super($, $element);
- this.filter = this.$.filter;
+ this.initFilter();
+ this.fetchData();
}
- get shippedFrom() {
- return this._shippedFrom;
+ $onChanges() {
+ if (this.model)
+ this.applyFilters();
}
- set shippedFrom(value) {
- this._shippedFrom = value;
- this.filter.scopeDays = null;
+ fetchData() {
+ this.$http.get('AgencyModes').then(res => {
+ this.agencyModes = res.data;
+ });
+ this.$http.get('Warehouses').then(res => {
+ this.warehouses = res.data;
+ });
+ this.$http.get('Continents').then(res => {
+ this.continents = res.data;
+ });
}
- get shippedTo() {
- return this._shippedTo;
+ initFilter() {
+ this.filter = {};
+ if (this.$params.q) {
+ this.filter = JSON.parse(this.$params.q);
+ this.search = this.filter.search;
+ this.totalEntries = this.filter.totalEntries;
+ }
+ if (!this.filter.scopeDays) this.filter.scopeDays = 7;
}
- set shippedTo(value) {
- this._shippedTo = value;
- this.filter.scopeDays = null;
+ applyFilters(param) {
+ this.model.applyFilter({}, this.filter)
+ .then(() => {
+ if (param && this.model._orgData.length === 1)
+ this.$state.go('travel.card.summary', {id: this.model._orgData[0].id});
+ else
+ this.$state.go(this.$state.current.name, {q: JSON.stringify(this.filter)}, {location: 'replace'});
+ });
}
- get scopeDays() {
- return this._scopeDays;
+ removeParamFilter(param) {
+ if (this[param]) delete this[param];
+ delete this.filter[param];
+ this.applyFilters();
}
- set scopeDays(value) {
- this._scopeDays = value;
-
- this.filter.shippedFrom = null;
- this.filter.shippedTo = null;
+ onKeyPress($event, param) {
+ if ($event.key === 'Enter') {
+ this.filter[param] = this[param];
+ this.applyFilters(param === 'search');
+ }
}
}
ngModule.vnComponent('vnTravelSearchPanel', {
template: require('./index.html'),
- controller: Controller
+ controller: Controller,
+ bindings: {
+ model: '<'
+ }
});
diff --git a/modules/travel/front/search-panel/index.spec.js b/modules/travel/front/search-panel/index.spec.js
index 884f4fb17..488143e80 100644
--- a/modules/travel/front/search-panel/index.spec.js
+++ b/modules/travel/front/search-panel/index.spec.js
@@ -8,41 +8,31 @@ describe('Travel Component vnTravelSearchPanel', () => {
beforeEach(inject($componentController => {
controller = $componentController('vnTravelSearchPanel', {$element: null});
controller.$t = () => {};
- controller.filter = {};
}));
- describe('shippedFrom() setter', () => {
- it('should clear the scope days when setting the from property', () => {
- controller.filter.scopeDays = 1;
+ describe('applyFilters()', () => {
+ it('should apply filters', async() => {
+ controller.filter = {foo: 'bar'};
+ controller.model = {
+ applyFilter: jest.fn().mockResolvedValue(),
+ _orgData: [{id: 1}]
+ };
+ controller.$state = {
+ current: {
+ name: 'foo'
+ },
+ go: jest.fn()
+ };
- controller.shippedFrom = Date.vnNew();
+ await controller.applyFilters(true);
- expect(controller.filter.scopeDays).toBeNull();
- expect(controller.shippedFrom).toBeDefined();
- });
- });
+ expect(controller.model.applyFilter).toHaveBeenCalledWith({}, controller.filter);
+ expect(controller.$state.go).toHaveBeenCalledWith('travel.card.summary', {id: 1});
- describe('shippedTo() setter', () => {
- it('should clear the scope days when setting the to property', () => {
- controller.filter.scopeDays = 1;
+ await controller.applyFilters(false);
- controller.shippedTo = Date.vnNew();
-
- expect(controller.filter.scopeDays).toBeNull();
- expect(controller.shippedTo).toBeDefined();
- });
- });
-
- describe('scopeDays() setter', () => {
- it('should clear the date range when setting the scopeDays property', () => {
- controller.filter.shippedFrom = Date.vnNew();
- controller.filter.shippedTo = Date.vnNew();
-
- controller.scopeDays = 1;
-
- expect(controller.filter.shippedFrom).toBeNull();
- expect(controller.filter.shippedTo).toBeNull();
- expect(controller.scopeDays).toBeDefined();
+ expect(controller.$state.go).toHaveBeenCalledWith(controller.$state.current.name,
+ {q: JSON.stringify(controller.filter)}, {location: 'replace'});
});
});
});
diff --git a/modules/travel/front/search-panel/style.scss b/modules/travel/front/search-panel/style.scss
new file mode 100644
index 000000000..94fe7b239
--- /dev/null
+++ b/modules/travel/front/search-panel/style.scss
@@ -0,0 +1,37 @@
+@import "variables";
+
+vn-travel-search-panel vn-side-menu {
+ .menu {
+ min-width: $right-menu-width;
+ }
+ & > div {
+ .input {
+ padding-left: $spacing-md;
+ padding-right: $spacing-md;
+ border-color: $color-spacer;
+ border-bottom: $border-thin;
+ }
+ .horizontal {
+ padding-left: $spacing-md;
+ padding-right: $spacing-md;
+ grid-auto-flow: column;
+ grid-column-gap: $spacing-sm;
+ align-items: center;
+ }
+ .chips {
+ display: flex;
+ flex-wrap: wrap;
+ padding: $spacing-md;
+ overflow: hidden;
+ max-width: 100%;
+ border-color: $color-spacer;
+ }
+
+ .or {
+ align-self: center;
+ font-weight: bold;
+ font-size: 26px;
+ color: $color-font-secondary;
+ }
+ }
+}
diff --git a/modules/travel/front/summary/locale/es.yml b/modules/travel/front/summary/locale/es.yml
index aa002fad0..aa6adc938 100644
--- a/modules/travel/front/summary/locale/es.yml
+++ b/modules/travel/front/summary/locale/es.yml
@@ -1,9 +1,9 @@
Reference: Referencia
-Warehouse In: Almacén entrada
-Warehouse Out: Almacén salida
+Warehouse In: Alm. entrada
+Warehouse Out: Alm. salida
Shipped: F. envío
Landed: F. entrega
-Total entries: Entradas totales
+Total entries: Ent. totales
Delivered: Enviada
Received: Recibida
Agency: Agencia
diff --git a/modules/wagon/back/methods/wagonType/createWagonType.js b/modules/wagon/back/methods/wagonType/createWagonType.js
new file mode 100644
index 000000000..fed915b28
--- /dev/null
+++ b/modules/wagon/back/methods/wagonType/createWagonType.js
@@ -0,0 +1,57 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('createWagonType', {
+ description: 'Creates a new wagon type',
+ accessType: 'WRITE',
+ accepts: [
+ {
+ arg: 'name',
+ type: 'String',
+ required: true
+ },
+ {
+ arg: 'divisible',
+ type: 'boolean',
+ required: true
+ }, {
+ arg: 'trays',
+ type: 'any',
+ required: true
+ }
+ ],
+ http: {
+ path: `/createWagonType`,
+ verb: 'PATCH'
+ }
+ });
+
+ Self.createWagonType = async(ctx, options) => {
+ const args = ctx.args;
+ const models = Self.app.models;
+ const myOptions = {};
+ let tx;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ const newWagonType = await models.WagonType.create({name: args.name, divisible: args.divisible}, myOptions);
+ args.trays.forEach(async tray => {
+ await models.WagonTypeTray.create({
+ typeFk: newWagonType.id,
+ height: tray.position,
+ colorFk: tray.color.id
+ }, myOptions);
+ });
+
+ if (tx) await tx.commit();
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/wagon/back/methods/wagonType/deleteWagonType.js b/modules/wagon/back/methods/wagonType/deleteWagonType.js
new file mode 100644
index 000000000..46b65e32f
--- /dev/null
+++ b/modules/wagon/back/methods/wagonType/deleteWagonType.js
@@ -0,0 +1,43 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('deleteWagonType', {
+ description: 'Deletes a wagon type',
+ accessType: 'WRITE',
+ accepts: [
+ {
+ arg: 'id',
+ type: 'Number',
+ required: true
+ }
+ ],
+ http: {
+ path: `/deleteWagonType`,
+ verb: 'DELETE'
+ }
+ });
+
+ Self.deleteWagonType = async(ctx, options) => {
+ const args = ctx.args;
+ const models = Self.app.models;
+ const myOptions = {};
+ let tx;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ await models.Wagon.destroyAll({typeFk: args.id}, myOptions);
+ await models.WagonTypeTray.destroyAll({typeFk: args.id}, myOptions);
+ await models.WagonType.destroyAll({id: args.id}, myOptions);
+
+ if (tx) await tx.commit();
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/wagon/back/methods/wagonType/editWagonType.js b/modules/wagon/back/methods/wagonType/editWagonType.js
new file mode 100644
index 000000000..bd5ad1f16
--- /dev/null
+++ b/modules/wagon/back/methods/wagonType/editWagonType.js
@@ -0,0 +1,64 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('editWagonType', {
+ description: 'Edits a new wagon type',
+ accessType: 'WRITE',
+ accepts: [
+ {
+ arg: 'id',
+ type: 'String',
+ required: true
+ },
+ {
+ arg: 'name',
+ type: 'String',
+ required: true
+ },
+ {
+ arg: 'divisible',
+ type: 'boolean',
+ required: true
+ }, {
+ arg: 'trays',
+ type: 'any',
+ required: true
+ }
+ ],
+ http: {
+ path: `/editWagonType`,
+ verb: 'PATCH'
+ }
+ });
+
+ Self.editWagonType = async(ctx, options) => {
+ const args = ctx.args;
+ const models = Self.app.models;
+ const myOptions = {};
+ let tx;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ const wagonType = await models.WagonType.findById(args.id, null, myOptions);
+ wagonType.updateAttributes({name: args.name, divisible: args.divisible}, myOptions);
+ models.WagonTypeTray.destroyAll({typeFk: args.id}, myOptions);
+ args.trays.forEach(async tray => {
+ await models.WagonTypeTray.create({
+ typeFk: args.id,
+ height: tray.position,
+ colorFk: tray.color.id
+ }, myOptions);
+ });
+
+ if (tx) await tx.commit();
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/wagon/back/methods/wagonType/specs/crudWagonType.spec.js b/modules/wagon/back/methods/wagonType/specs/crudWagonType.spec.js
new file mode 100644
index 000000000..92ac61060
--- /dev/null
+++ b/modules/wagon/back/methods/wagonType/specs/crudWagonType.spec.js
@@ -0,0 +1,63 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('WagonType crudWagonType()', () => {
+ const ctx = {
+ args: {
+ name: 'Mock wagon type',
+ divisible: true,
+ trays: [{position: 0, color: {id: 1}},
+ {position: 50, color: {id: 2}},
+ {position: 100, color: {id: 3}}]
+ }
+ };
+
+ it(`should create, edit and delete a new wagon type and its trays`, async() => {
+ const tx = await models.WagonType.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ // create
+ await models.WagonType.createWagonType(ctx, options);
+
+ const newWagonType = await models.WagonType.findOne({where: {name: ctx.args.name}}, options);
+ const newWagonTrays = await models.WagonTypeTray.find({where: {typeFk: newWagonType.id}}, options);
+
+ expect(newWagonType).not.toEqual(null);
+ expect(newWagonType.name).toEqual(ctx.args.name);
+ expect(newWagonType.divisible).toEqual(ctx.args.divisible);
+ expect(newWagonTrays.length).toEqual(ctx.args.trays.length);
+
+ ctx.args = {
+ id: newWagonType.id,
+ name: 'Edited wagon type',
+ divisible: false,
+ trays: [{position: 0, color: {id: 1}}]
+ };
+
+ // edit
+ await models.WagonType.editWagonType(ctx, options);
+
+ const editedWagonType = await models.WagonType.findById(newWagonType.id, null, options);
+ const editedWagonTrays = await models.WagonTypeTray.find({where: {typeFk: newWagonType.id}}, options);
+
+ expect(editedWagonType.name).toEqual(ctx.args.name);
+ expect(editedWagonType.divisible).toEqual(ctx.args.divisible);
+ expect(editedWagonTrays.length).toEqual(ctx.args.trays.length);
+
+ // delete
+ await models.WagonType.deleteWagonType(ctx, options);
+
+ const deletedWagonType = await models.WagonType.findById(newWagonType.id, null, options);
+ const deletedWagonTrays = await models.WagonTypeTray.find({where: {typeFk: newWagonType.id}}, options);
+
+ expect(deletedWagonType).toEqual(null);
+ expect(deletedWagonTrays).toEqual([]);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/wagon/back/model-config.json b/modules/wagon/back/model-config.json
new file mode 100644
index 000000000..279d55e5c
--- /dev/null
+++ b/modules/wagon/back/model-config.json
@@ -0,0 +1,23 @@
+{
+ "Wagon": {
+ "dataSource": "vn"
+ },
+ "WagonType": {
+ "dataSource": "vn"
+ },
+ "WagonTypeColor": {
+ "dataSource": "vn"
+ },
+ "WagonTypeTray": {
+ "dataSource": "vn"
+ },
+ "WagonConfig": {
+ "dataSource": "vn"
+ },
+ "CollectionWagon": {
+ "dataSource": "vn"
+ },
+ "CollectionWagonTicket": {
+ "dataSource": "vn"
+ }
+}
diff --git a/modules/wagon/back/models/collection-wagon-ticket.json b/modules/wagon/back/models/collection-wagon-ticket.json
new file mode 100644
index 000000000..04527205c
--- /dev/null
+++ b/modules/wagon/back/models/collection-wagon-ticket.json
@@ -0,0 +1,43 @@
+{
+ "name": "CollectionWagonTicket",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "collectionWagonTicket"
+ }
+ },
+ "properties": {
+ "ticketFk": {
+ "id": true,
+ "type": "number"
+ },
+ "wagonFk": {
+ "type": "number",
+ "required": true
+ },
+ "trayFk": {
+ "type": "number",
+ "required": true
+ },
+ "side": {
+ "type": "string"
+ }
+ },
+ "relations": {
+ "ticket": {
+ "type": "belongsTo",
+ "model": "Ticket",
+ "foreignKey": "ticketFk"
+ },
+ "wagon": {
+ "type": "belongsTo",
+ "model": "Wagon",
+ "foreignKey": "wagonFk"
+ },
+ "tray": {
+ "type": "belongsTo",
+ "model": "WagonTypeTray",
+ "foreignKey": "trayFk"
+ }
+ }
+}
diff --git a/modules/wagon/back/models/collection-wagon.json b/modules/wagon/back/models/collection-wagon.json
new file mode 100644
index 000000000..f3f237428
--- /dev/null
+++ b/modules/wagon/back/models/collection-wagon.json
@@ -0,0 +1,34 @@
+{
+ "name": "CollectionWagon",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "collectionWagon"
+ }
+ },
+ "properties": {
+ "collectionFk": {
+ "id": true,
+ "type": "number"
+ },
+ "wagonFk": {
+ "type": "number",
+ "required": true
+ },
+ "position": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "collection": {
+ "type": "belongsTo",
+ "model": "Collection",
+ "foreignKey": "collectionFk"
+ },
+ "wagon": {
+ "type": "belongsTo",
+ "model": "Wagon",
+ "foreignKey": "wagonFk"
+ }
+ }
+}
diff --git a/modules/wagon/back/models/wagon-config.json b/modules/wagon/back/models/wagon-config.json
new file mode 100644
index 000000000..3d96e2864
--- /dev/null
+++ b/modules/wagon/back/models/wagon-config.json
@@ -0,0 +1,30 @@
+{
+ "name": "WagonConfig",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "wagonConfig"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number"
+ },
+ "width": {
+ "type": "number"
+ },
+ "height": {
+ "type": "string"
+ },
+ "maxWagonHeight": {
+ "type": "number"
+ },
+ "minHeightBetweenTrays": {
+ "type": "number"
+ },
+ "maxTrays": {
+ "type": "number"
+ }
+ }
+}
diff --git a/modules/wagon/back/models/wagon-type-color.json b/modules/wagon/back/models/wagon-type-color.json
new file mode 100644
index 000000000..573fd60f5
--- /dev/null
+++ b/modules/wagon/back/models/wagon-type-color.json
@@ -0,0 +1,21 @@
+{
+ "name": "WagonTypeColor",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "wagonTypeColor"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number"
+ },
+ "name": {
+ "type": "string"
+ },
+ "rgb": {
+ "type": "string"
+ }
+ }
+}
diff --git a/modules/wagon/back/models/wagon-type-tray.json b/modules/wagon/back/models/wagon-type-tray.json
new file mode 100644
index 000000000..b61510bcf
--- /dev/null
+++ b/modules/wagon/back/models/wagon-type-tray.json
@@ -0,0 +1,36 @@
+{
+ "name": "WagonTypeTray",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "wagonTypeTray"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number"
+ },
+ "typeFk": {
+ "type": "number"
+ },
+ "height": {
+ "type": "number"
+ },
+ "colorFk": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "type": {
+ "type": "belongsTo",
+ "model": "WagonType",
+ "foreignKey": "typeFk"
+ },
+ "color": {
+ "type": "belongsTo",
+ "model": "WagonTypeColor",
+ "foreignKey": "colorFk"
+ }
+ }
+}
diff --git a/modules/wagon/back/models/wagon-type.js b/modules/wagon/back/models/wagon-type.js
new file mode 100644
index 000000000..bebf7a9d9
--- /dev/null
+++ b/modules/wagon/back/models/wagon-type.js
@@ -0,0 +1,5 @@
+module.exports = Self => {
+ require('../methods/wagonType/createWagonType')(Self);
+ require('../methods/wagonType/editWagonType')(Self);
+ require('../methods/wagonType/deleteWagonType')(Self);
+};
diff --git a/modules/wagon/back/models/wagon-type.json b/modules/wagon/back/models/wagon-type.json
new file mode 100644
index 000000000..f57bf957d
--- /dev/null
+++ b/modules/wagon/back/models/wagon-type.json
@@ -0,0 +1,21 @@
+{
+ "name": "WagonType",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "wagonType"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number"
+ },
+ "name": {
+ "type": "string"
+ },
+ "divisible": {
+ "type": "boolean"
+ }
+ }
+}
diff --git a/modules/wagon/back/models/wagon.json b/modules/wagon/back/models/wagon.json
new file mode 100644
index 000000000..61ee61e61
--- /dev/null
+++ b/modules/wagon/back/models/wagon.json
@@ -0,0 +1,34 @@
+{
+ "name": "Wagon",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "wagon"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number"
+ },
+ "label": {
+ "type": "number"
+ },
+ "volume": {
+ "type": "number"
+ },
+ "plate": {
+ "type": "string"
+ },
+ "typeFk": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "type": {
+ "type": "belongsTo",
+ "model": "WagonType",
+ "foreignKey": "typeFk"
+ }
+ }
+}
diff --git a/modules/worker/back/methods/worker-time-control/addTimeEntry.js b/modules/worker/back/methods/worker-time-control/addTimeEntry.js
index fef3cf223..c8c08d9b1 100644
--- a/modules/worker/back/methods/worker-time-control/addTimeEntry.js
+++ b/modules/worker/back/methods/worker-time-control/addTimeEntry.js
@@ -51,6 +51,8 @@ module.exports = Self => {
if (response[0] && response[0].error)
throw new UserError(response[0].error);
+ await models.WorkerTimeControl.resendWeeklyHourEmail(ctx, workerId, args.timed, myOptions);
+
return response;
};
};
diff --git a/modules/worker/back/methods/worker-time-control/deleteTimeEntry.js b/modules/worker/back/methods/worker-time-control/deleteTimeEntry.js
index c80dcab81..e33d6b790 100644
--- a/modules/worker/back/methods/worker-time-control/deleteTimeEntry.js
+++ b/modules/worker/back/methods/worker-time-control/deleteTimeEntry.js
@@ -38,7 +38,11 @@ module.exports = Self => {
if (isSubordinate === false || (isSubordinate && isHimself && !isTeamBoss))
throw new UserError(`You don't have enough privileges`);
- return Self.rawSql('CALL vn.workerTimeControl_remove(?, ?)', [
+ const response = await Self.rawSql('CALL vn.workerTimeControl_remove(?, ?)', [
targetTimeEntry.userFk, targetTimeEntry.timed], myOptions);
+
+ await models.WorkerTimeControl.resendWeeklyHourEmail(ctx, targetTimeEntry.userFk, targetTimeEntry.timed, myOptions);
+
+ return response;
};
};
diff --git a/modules/worker/back/methods/worker-time-control/getMailStates.js b/modules/worker/back/methods/worker-time-control/getMailStates.js
new file mode 100644
index 000000000..855b5adc3
--- /dev/null
+++ b/modules/worker/back/methods/worker-time-control/getMailStates.js
@@ -0,0 +1,61 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('getMailStates', {
+ description: 'Get the states of a month about time control mail',
+ accessType: 'READ',
+ accepts: [{
+ arg: 'id',
+ type: 'number',
+ description: 'The worker id',
+ http: {source: 'path'}
+ },
+ {
+ arg: 'month',
+ type: 'number',
+ description: 'The number of the month'
+ },
+ {
+ arg: 'year',
+ type: 'number',
+ description: 'The number of the year'
+ }],
+ returns: [{
+ type: ['object'],
+ root: true
+ }],
+ http: {
+ path: `/:id/getMailStates`,
+ verb: 'GET'
+ }
+ });
+
+ Self.getMailStates = async(ctx, workerId, options) => {
+ const models = Self.app.models;
+ const args = ctx.args;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const times = await models.Time.find({
+ fields: ['week'],
+ where: {
+ month: args.month,
+ year: args.year
+ }
+ }, myOptions);
+
+ const weeks = times.map(time => time.week);
+ const weekNumbersSet = new Set(weeks);
+ const weekNumbers = Array.from(weekNumbersSet);
+
+ const workerTimeControlMails = await models.WorkerTimeControlMail.find({
+ where: {
+ workerFk: workerId,
+ year: args.year,
+ week: {inq: weekNumbers}
+ }
+ }, myOptions);
+
+ return workerTimeControlMails;
+ };
+};
diff --git a/modules/worker/back/methods/worker-time-control/resendWeeklyHourEmail.js b/modules/worker/back/methods/worker-time-control/resendWeeklyHourEmail.js
new file mode 100644
index 000000000..2452a29f9
--- /dev/null
+++ b/modules/worker/back/methods/worker-time-control/resendWeeklyHourEmail.js
@@ -0,0 +1,68 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('resendWeeklyHourEmail', {
+ description: 'Adds a new hour registry',
+ accessType: 'WRITE',
+ accepts: [{
+ arg: 'id',
+ type: 'number',
+ description: 'The worker id',
+ http: {source: 'path'}
+ },
+ {
+ arg: 'dated',
+ type: 'date',
+ required: true
+ }],
+ returns: [{
+ type: 'Object',
+ root: true
+ }],
+ http: {
+ path: `/:id/resendWeeklyHourEmail`,
+ verb: 'POST'
+ }
+ });
+
+ Self.resendWeeklyHourEmail = async(ctx, workerId, dated, options) => {
+ const models = Self.app.models;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const yearNumber = dated.getFullYear();
+ const weekNumber = getWeekNumber(dated);
+ const workerTimeControlMail = await models.WorkerTimeControlMail.findOne({
+ where: {
+ workerFk: workerId,
+ year: yearNumber,
+ week: weekNumber
+ }
+ }, myOptions);
+
+ if (workerTimeControlMail && workerTimeControlMail.state != 'SENDED') {
+ const worker = await models.EmailUser.findById(workerId, null, myOptions);
+ ctx.args = {
+ recipient: worker.email,
+ year: yearNumber,
+ week: weekNumber,
+ workerId: workerId,
+ state: 'SENDED'
+ };
+ return models.WorkerTimeControl.weeklyHourRecordEmail(ctx, myOptions);
+ }
+
+ return false;
+ };
+
+ function getWeekNumber(date) {
+ const tempDate = new Date(date);
+ let dayOfWeek = tempDate.getDay();
+ dayOfWeek = (dayOfWeek === 0) ? 7 : dayOfWeek;
+ const firstDayOfWeek = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate() - (dayOfWeek - 1));
+ const firstDayOfYear = new Date(tempDate.getFullYear(), 0, 1);
+ const differenceInMilliseconds = firstDayOfWeek.getTime() - firstDayOfYear.getTime();
+ const weekNumber = Math.floor(differenceInMilliseconds / (1000 * 60 * 60 * 24 * 7)) + 1;
+ return weekNumber;
+ }
+};
diff --git a/modules/worker/back/methods/worker-time-control/sendMail.js b/modules/worker/back/methods/worker-time-control/sendMail.js
index 579a83112..2c827e320 100644
--- a/modules/worker/back/methods/worker-time-control/sendMail.js
+++ b/modules/worker/back/methods/worker-time-control/sendMail.js
@@ -82,14 +82,9 @@ module.exports = Self => {
updated: Date.vnNew(), state: 'SENDED'
}, myOptions);
- stmt = new ParameterizedSQL(
- `CALL vn.timeControl_calculateByUser(?, ?, ?)
- `, [args.workerId, started, ended]);
+ stmt = new ParameterizedSQL('DROP TEMPORARY TABLE IF EXISTS tmp.`user`');
stmts.push(stmt);
-
- stmt = new ParameterizedSQL(
- `CALL vn.timeBusiness_calculateByUser(?, ?, ?)
- `, [args.workerId, started, ended]);
+ stmt = new ParameterizedSQL('CREATE TEMPORARY TABLE tmp.`user` SELECT id userFk FROM account.user WHERE id = ?', [args.workerId]);
stmts.push(stmt);
} else {
await models.WorkerTimeControl.destroyAll({
@@ -105,13 +100,38 @@ module.exports = Self => {
updated: Date.vnNew(), state: 'SENDED'
}, myOptions);
- stmt = new ParameterizedSQL(`CALL vn.timeControl_calculateAll(?, ?)`, [started, ended]);
+ stmt = new ParameterizedSQL('DROP TEMPORARY TABLE IF EXISTS tmp.`user`');
stmts.push(stmt);
-
- stmt = new ParameterizedSQL(`CALL vn.timeBusiness_calculateAll(?, ?)`, [started, ended]);
+ stmt = new ParameterizedSQL('CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user` SELECT userFk FROM vn.worker w JOIN account.`user` u ON u.id = w.userFk WHERE userFk IS NOT NULL');
stmts.push(stmt);
}
+ stmt = new ParameterizedSQL(
+ `CALL vn.timeControl_calculate(?, ?)
+ `, [started, ended]);
+ stmts.push(stmt);
+
+ stmt = new ParameterizedSQL(
+ `CALL vn.timeBusiness_calculate(?, ?)
+ `, [started, ended]);
+ stmts.push(stmt);
+
+ stmt = new ParameterizedSQL(
+ `CALL vn.timeControl_getError(?, ?)
+ `, [started, ended]);
+ stmts.push(stmt);
+
+ stmt = new ParameterizedSQL(`INSERT INTO mail (receiver, subject, body)
+ SELECT CONCAT(u.name, '@verdnatura.es'),
+ CONCAT('Error registro de horas semana ', ?, ' año ', ?) ,
+ CONCAT('No se ha podido enviar el registro de horas al empleado/s: ', GROUP_CONCAT(DISTINCT CONCAT('
', w.id, ' ', w.firstName, ' ', w.lastName))) + FROM tmp.timeControlError tce + JOIN vn.workerTimeControl wtc ON wtc.id = tce.id + JOIN worker w ON w.id = wtc.userFK + JOIN account.user u ON u.id = w.bossFk + GROUP BY w.bossFk`, [args.week, args.year]); + stmts.push(stmt); + stmt = new ParameterizedSQL(` SELECT CONCAT(u.name, '@verdnatura.es') receiver, u.id workerFk, @@ -131,20 +151,16 @@ module.exports = Self => { JOIN business b ON b.id = tb.businessFk LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = tb.userFk AND tc.dated = tb.dated LEFT JOIN worker w ON w.id = u.id - JOIN (SELECT tb.userFk, - SUM(IF(tb.type IS NULL, - IF(tc.timeWorkDecimal > 0, FALSE, IF(tb.timeWorkDecimal > 0, TRUE, FALSE)), - TRUE))isTeleworkingWeek - FROM tmp.timeBusinessCalculate tb - LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = tb.userFk - AND tc.dated = tb.dated - GROUP BY tb.userFk - HAVING isTeleworkingWeek > 0 - )sub ON sub.userFk = u.id - WHERE d.hasToRefill + LEFT JOIN ( + SELECT DISTINCT wtc.userFk + FROM tmp.timeControlError tce + JOIN vn.workerTimeControl wtc ON wtc.id = tce.id + )sub ON sub.userFk = tb.userFk + WHERE sub.userFK IS NULL AND IFNULL(?, u.id) = u.id AND b.companyCodeFk = 'VNL' AND w.businessFk + AND d.isTeleworking ORDER BY u.id, tb.dated `, [args.workerId]); const index = stmts.push(stmt) - 1; @@ -332,17 +348,18 @@ module.exports = Self => { const lastDay = days[index][days[index].length - 1]; if (day.workerFk != previousWorkerFk || day == lastDay) { - const salix = await models.Url.findOne({ - where: { - appName: 'salix', - environment: process.env.NODE_ENV || 'dev' - } - }, myOptions); + const query = `INSERT IGNORE INTO workerTimeControlMail (workerFk, year, week) + VALUES(?, ?, ?);`; + await Self.rawSql(query, [previousWorkerFk, args.year, args.week]); - const timestamp = started.getTime() / 1000; - const url = `${salix.url}worker/${previousWorkerFk}/time-control?timestamp=${timestamp}`; - - await models.WorkerTimeControl.weeklyHourRecordEmail(ctx, previousReceiver, args.week, args.year, url); + ctx.args = { + recipient: previousReceiver, + year: args.year, + week: args.week, + workerId: previousWorkerFk, + state: 'SENDED' + }; + await models.WorkerTimeControl.weeklyHourRecordEmail(ctx, myOptions); previousWorkerFk = day.workerFk; previousReceiver = day.receiver; diff --git a/modules/worker/back/methods/worker-time-control/specs/getMailStates.spec.js b/modules/worker/back/methods/worker-time-control/specs/getMailStates.spec.js new file mode 100644 index 000000000..cbad32323 --- /dev/null +++ b/modules/worker/back/methods/worker-time-control/specs/getMailStates.spec.js @@ -0,0 +1,29 @@ +const models = require('vn-loopback/server/server').models; + +describe('workerTimeControl getMailStates()', () => { + const workerId = 9; + const ctx = {args: { + month: 12, + year: 2000 + }}; + + it('should get the states of a month about time control mail', async() => { + const tx = await models.WorkerTimeControl.beginTransaction({}); + + try { + const options = {transaction: tx}; + + const response = await models.WorkerTimeControl.getMailStates(ctx, workerId, options); + + expect(response[0].state).toEqual('REVISE'); + expect(response[1].state).toEqual('SENDED'); + expect(response[2].state).toEqual('CONFIRMED'); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); +}); + diff --git a/modules/worker/back/methods/worker-time-control/specs/sendMail.spec.js b/modules/worker/back/methods/worker-time-control/specs/sendMail.spec.js deleted file mode 100644 index 24bfd6904..000000000 --- a/modules/worker/back/methods/worker-time-control/specs/sendMail.spec.js +++ /dev/null @@ -1,120 +0,0 @@ -const models = require('vn-loopback/server/server').models; - -describe('workerTimeControl sendMail()', () => { - const workerId = 18; - const activeCtx = { - getLocale: () => { - return 'en'; - } - }; - const ctx = {req: activeCtx, args: {}}; - - it('should fill time control of a worker without records in Journey and with rest', async() => { - const tx = await models.WorkerTimeControl.beginTransaction({}); - - try { - const options = {transaction: tx}; - - await models.WorkerTimeControl.sendMail(ctx, options); - - const workerTimeControl = await models.WorkerTimeControl.find({ - where: {userFk: workerId} - }, options); - - expect(workerTimeControl[0].timed.getHours()).toEqual(8); - expect(workerTimeControl[1].timed.getHours()).toEqual(9); - expect(`${workerTimeControl[2].timed.getHours()}:${workerTimeControl[2].timed.getMinutes()}`).toEqual('9:20'); - expect(workerTimeControl[3].timed.getHours()).toEqual(16); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should fill time control of a worker without records in Journey and without rest', async() => { - const workdayOf20Hours = 3; - const tx = await models.WorkerTimeControl.beginTransaction({}); - - try { - const options = {transaction: tx}; - query = `UPDATE business b - SET b.calendarTypeFk = ? - WHERE b.workerFk = ?; `; - await models.WorkerTimeControl.rawSql(query, [workdayOf20Hours, workerId], options); - - await models.WorkerTimeControl.sendMail(ctx, options); - - const workerTimeControl = await models.WorkerTimeControl.find({ - where: {userFk: workerId} - }, options); - - expect(workerTimeControl[0].timed.getHours()).toEqual(8); - expect(workerTimeControl[1].timed.getHours()).toEqual(12); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should fill time control of a worker with records in Journey and with rest', async() => { - const tx = await models.WorkerTimeControl.beginTransaction({}); - - try { - const options = {transaction: tx}; - query = `INSERT INTO postgresql.journey(journey_id, day_id, start, end, business_id) - VALUES - (1, 1, '09:00:00', '13:00:00', ?), - (2, 1, '14:00:00', '19:00:00', ?);`; - await models.WorkerTimeControl.rawSql(query, [workerId, workerId, workerId], options); - - await models.WorkerTimeControl.sendMail(ctx, options); - - const workerTimeControl = await models.WorkerTimeControl.find({ - where: {userFk: workerId} - }, options); - - expect(workerTimeControl[0].timed.getHours()).toEqual(9); - expect(workerTimeControl[2].timed.getHours()).toEqual(10); - expect(`${workerTimeControl[3].timed.getHours()}:${workerTimeControl[3].timed.getMinutes()}`).toEqual('10:20'); - expect(workerTimeControl[1].timed.getHours()).toEqual(13); - expect(workerTimeControl[4].timed.getHours()).toEqual(14); - expect(workerTimeControl[5].timed.getHours()).toEqual(19); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should fill time control of a worker with records in Journey and without rest', async() => { - const tx = await models.WorkerTimeControl.beginTransaction({}); - - try { - const options = {transaction: tx}; - query = `INSERT INTO postgresql.journey(journey_id, day_id, start, end, business_id) - VALUES - (1, 1, '12:30:00', '14:00:00', ?);`; - await models.WorkerTimeControl.rawSql(query, [workerId, workerId, workerId], options); - - await models.WorkerTimeControl.sendMail(ctx, options); - - const workerTimeControl = await models.WorkerTimeControl.find({ - where: {userFk: workerId} - }, options); - - expect(`${workerTimeControl[0].timed.getHours()}:${workerTimeControl[0].timed.getMinutes()}`).toEqual('12:30'); - expect(workerTimeControl[1].timed.getHours()).toEqual(14); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); -}); - diff --git a/modules/worker/back/methods/worker-time-control/updateTimeEntry.js b/modules/worker/back/methods/worker-time-control/updateTimeEntry.js index a99a61770..83349ea63 100644 --- a/modules/worker/back/methods/worker-time-control/updateTimeEntry.js +++ b/modules/worker/back/methods/worker-time-control/updateTimeEntry.js @@ -46,8 +46,12 @@ module.exports = Self => { if (notAllowed) throw new UserError(`You don't have enough privileges`); - return targetTimeEntry.updateAttributes({ + const timeEntryUpdated = await targetTimeEntry.updateAttributes({ direction: args.direction }, myOptions); + + await models.WorkerTimeControl.resendWeeklyHourEmail(ctx, targetTimeEntry.userFk, targetTimeEntry.timed, myOptions); + + return timeEntryUpdated; }; }; diff --git a/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js b/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js index a8dc14bb1..6f794511f 100644 --- a/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js +++ b/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js @@ -60,13 +60,17 @@ module.exports = Self => { const oldState = workerTimeControlMail.state; const oldReason = workerTimeControlMail.reason; - if (oldState == args.state) throw new UserError('Already has this status'); - await workerTimeControlMail.updateAttributes({ state: args.state, reason: args.reason || null }, myOptions); + if (args.state == 'SENDED') { + await workerTimeControlMail.updateAttributes({ + sendedCounter: workerTimeControlMail.sendedCounter + 1 + }, myOptions); + } + const logRecord = { originFk: args.workerId, userFk: userId, diff --git a/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js b/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js index 6feadb936..f44080559 100644 --- a/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js +++ b/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('weeklyHourRecordEmail', { description: 'Sends the weekly hour record', @@ -22,7 +20,12 @@ module.exports = Self => { required: true }, { - arg: 'url', + arg: 'workerId', + type: 'number', + required: true + }, + { + arg: 'state', type: 'string', required: true } @@ -37,17 +40,48 @@ module.exports = Self => { } }); - Self.weeklyHourRecordEmail = async(ctx, recipient, week, year, url) => { - const params = { - recipient: recipient, - lang: ctx.req.getLocale(), - week: week, - year: year, - url: url - }; + Self.weeklyHourRecordEmail = async(ctx, options) => { + const models = Self.app.models; + const args = ctx.args; + const myOptions = {}; - const email = new Email('weekly-hour-record', params); + if (typeof options == 'object') + Object.assign(myOptions, options); - return email.send(); + const salix = await models.Url.findOne({ + where: { + appName: 'salix', + environment: process.env.NODE_ENV || 'dev' + } + }, myOptions); + + const dated = getMondayDateFromYearWeek(args.year, args.week); + const timestamp = dated.getTime() / 1000; + + const url = `${salix.url}worker/${args.workerId}/time-control?timestamp=${timestamp}`; + ctx.args.url = url; + + Self.sendTemplate(ctx, 'weekly-hour-record'); + + return models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, myOptions); }; + + function getMondayDateFromYearWeek(yearNumber, weekNumber) { + const yearStart = new Date(yearNumber, 0, 1); + const firstMonday = new Date(yearStart.getTime() + ((7 - yearStart.getDay() + 1) % 7) * 86400000); + const firstMondayWeekNumber = getWeekNumber(firstMonday); + + if (firstMondayWeekNumber > 1) + firstMonday.setDate(firstMonday.getDate() + 7); + + firstMonday.setDate(firstMonday.getDate() + (weekNumber - 1) * 7); + + return firstMonday; + } + + function getWeekNumber(date) { + const firstDayOfYear = new Date(date.getFullYear(), 0, 1); + const daysPassed = (date - firstDayOfYear) / 86400000; + return Math.ceil((daysPassed + firstDayOfYear.getDay() + 1) / 7); + } }; diff --git a/modules/worker/back/methods/worker/allocatePDA.js b/modules/worker/back/methods/worker/allocatePDA.js new file mode 100644 index 000000000..8d0d25d2d --- /dev/null +++ b/modules/worker/back/methods/worker/allocatePDA.js @@ -0,0 +1,66 @@ +const UserError = require('vn-loopback/util/user-error'); + +module.exports = Self => { + Self.remoteMethodCtx('allocatePDA', { + description: 'Deallocate the PDA of the worker', + accepts: [{ + arg: 'id', + type: 'number', + required: true, + description: 'The worker id', + http: {source: 'path'} + }, { + arg: 'pda', + type: 'number', + required: true, + description: 'The pda id' + }], + returns: { + type: ['object'], + root: true + }, + http: { + path: `/:id/allocatePDA`, + verb: 'POST' + } + }); + + Self.allocatePDA = async(ctx, options) => { + const models = Self.app.models; + const args = ctx.args; + let tx; + const myOptions = {}; + + if (typeof options == 'object') + Object.assign(myOptions, options); + + if (!myOptions.transaction) { + tx = await Self.beginTransaction({}); + myOptions.transaction = tx; + } + + try { + const pda = await models.DeviceProduction.findById(args.pda, myOptions); + if (pda.stateFk != 'idle') throw new UserError(`The PDA state is not idle`); + await pda.updateAttributes({stateFk: 'active'}, myOptions); + await models.DeviceProductionUser.create({ + deviceProductionFk: args.pda, + userFk: args.id, + created: new Date() + }, myOptions); + + if (tx) await tx.commit(); + + return { + deviceProductionFk: pda.id, + deviceProduction: { + modelFk: pda.modelFk, + serialNumber: pda.serialNumber + } + }; + } catch (e) { + if (tx) await tx.rollback(); + throw e; + } + }; +}; diff --git a/modules/worker/back/methods/worker/deallocatePDA.js b/modules/worker/back/methods/worker/deallocatePDA.js new file mode 100644 index 000000000..7fa7855d1 --- /dev/null +++ b/modules/worker/back/methods/worker/deallocatePDA.js @@ -0,0 +1,53 @@ +module.exports = Self => { + Self.remoteMethodCtx('deallocatePDA', { + description: 'Deallocate the worker\'s PDA', + accepts: [{ + arg: 'id', + type: 'number', + required: true, + description: 'The worker id', + http: {source: 'path'} + }, { + arg: 'pda', + type: 'number', + required: true, + description: 'The pda id' + }], + returns: { + type: ['object'], + root: true + }, + http: { + path: `/:id/deallocatePDA`, + verb: 'POST' + } + }); + + Self.deallocatePDA = async(ctx, options) => { + const models = Self.app.models; + const args = ctx.args; + let tx; + const myOptions = {}; + + if (typeof options == 'object') + Object.assign(myOptions, options); + + if (!myOptions.transaction) { + tx = await Self.beginTransaction({}); + myOptions.transaction = tx; + } + + try { + const pda = await models.DeviceProduction.findById(args.pda, myOptions); + await pda.updateAttributes({stateFk: 'idle'}, myOptions); + await models.DeviceProductionUser.destroyAll({userFk: args.id, deviceProductionFk: args.pda}, myOptions); + + if (tx) await tx.commit(); + + return pda; + } catch (e) { + if (tx) await tx.rollback(); + throw e; + } + }; +}; diff --git a/modules/worker/back/methods/worker/filter.js b/modules/worker/back/methods/worker/filter.js index d08b27a18..71a8da96f 100644 --- a/modules/worker/back/methods/worker/filter.js +++ b/modules/worker/back/methods/worker/filter.js @@ -13,55 +13,59 @@ module.exports = Self => { type: 'Object', description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string', http: {source: 'query'} - }, { - arg: 'tags', - type: ['Object'], - description: 'List of tags to filter with', - http: {source: 'query'} - }, { + }, + { arg: 'search', type: 'String', description: `If it's and integer searchs by id, otherwise it searchs by name`, http: {source: 'query'} - }, { + }, + { arg: 'id', type: 'Integer', description: 'The worker id', http: {source: 'query'} - }, { + }, + { arg: 'userFk', type: 'Integer', description: 'The user id', http: {source: 'query'} - }, { + }, + { arg: 'fi', type: 'String', description: 'The worker fi', http: {source: 'query'} - }, { + }, + { arg: 'departmentFk', type: 'Integer', description: 'The worker department id', http: {source: 'query'} - }, { + }, + { arg: 'extension', type: 'Integer', description: 'The worker extension id', http: {source: 'query'} - }, { + }, + { arg: 'firstName', type: 'String', description: 'The worker firstName', http: {source: 'query'} - }, { - arg: 'name', + }, + { + arg: 'lastName', type: 'String', - description: 'The worker name', + description: 'The worker lastName', http: {source: 'query'} - }, { - arg: 'nickname', + }, + { + arg: 'userName', type: 'String', - description: 'The worker nickname', + description: 'The worker user name', http: {source: 'query'} } ], @@ -93,10 +97,10 @@ module.exports = Self => { return {'w.id': value}; case 'userFk': return {'w.userFk': value}; - case 'name': - return {'w.lastName': {like: `%${value}%`}}; case 'firstName': return {'w.firstName': {like: `%${value}%`}}; + case 'lastName': + return {'w.lastName': {like: `%${value}%`}}; case 'extension': return {'p.extension': value}; case 'fi': diff --git a/modules/worker/back/methods/worker/specs/allocatePDA.spec.js b/modules/worker/back/methods/worker/specs/allocatePDA.spec.js new file mode 100644 index 000000000..5c80b6408 --- /dev/null +++ b/modules/worker/back/methods/worker/specs/allocatePDA.spec.js @@ -0,0 +1,46 @@ +const models = require('vn-loopback/server/server').models; + +describe('Worker allocatePDA()', () => { + it('should allocate a new worker\'s PDA', async() => { + const tx = await models.Worker.beginTransaction({}); + try { + const workerWithoutPDA = 1101; + const PDAWithIdleState = 4; + const options = {transaction: tx}; + const ctx = {args: {id: workerWithoutPDA, pda: PDAWithIdleState}}; + + await models.Worker.allocatePDA(ctx, options); + const deviceProduction = await models.DeviceProduction.findById(PDAWithIdleState, null, options); + const deviceProductionUser = await models.DeviceProductionUser + .findById(PDAWithIdleState, null, options); + + expect(deviceProduction.stateFk).toEqual('active'); + expect(deviceProductionUser).not.toBeNull(); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); + + it('should throw error trying to allocate a non idle PDA', async() => { + const tx = await models.Worker.beginTransaction({}); + let error; + try { + const workerWithoutPDA = 1101; + const PDAWithActiveState = 1; + const options = {transaction: tx}; + const ctx = {args: {id: workerWithoutPDA, pda: PDAWithActiveState}}; + + await models.Worker.allocatePDA(ctx, options); + + await tx.rollback(); + } catch (e) { + error = e; + await tx.rollback(); + } + + expect(error).toBeDefined(); + }); +}); diff --git a/modules/worker/back/methods/worker/specs/deallocatePDA.spec.js b/modules/worker/back/methods/worker/specs/deallocatePDA.spec.js new file mode 100644 index 000000000..bddd017cd --- /dev/null +++ b/modules/worker/back/methods/worker/specs/deallocatePDA.spec.js @@ -0,0 +1,26 @@ +const models = require('vn-loopback/server/server').models; + +describe('Worker deallocatePDA()', () => { + it('should deallocate a worker\'s PDA', async() => { + const tx = await models.Worker.beginTransaction({}); + try { + const workerWithPDA = 1; + const PDAWithActiveState = 1; + const options = {transaction: tx}; + const ctx = {args: {id: workerWithPDA, pda: PDAWithActiveState}}; + + await models.Worker.deallocatePDA(ctx, options); + const deviceProduction = await models.DeviceProduction.findById(PDAWithActiveState, null, options); + const deviceProductionUser = await models.DeviceProductionUser + .findById(PDAWithActiveState, null, options); + + expect(deviceProduction.stateFk).toEqual('idle'); + expect(deviceProductionUser).toBe(null); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); +}); diff --git a/modules/worker/back/methods/worker/specs/filter.spec.js b/modules/worker/back/methods/worker/specs/filter.spec.js index c1bc05ae8..2eb353576 100644 --- a/modules/worker/back/methods/worker/specs/filter.spec.js +++ b/modules/worker/back/methods/worker/specs/filter.spec.js @@ -16,7 +16,7 @@ describe('worker filter()', () => { }); it('should return 2 results filtering by name', async() => { - let result = await app.models.Worker.filter({args: {filter: {}, name: 'agency'}}); + let result = await app.models.Worker.filter({args: {filter: {}, firstName: 'agency'}}); expect(result.length).toEqual(2); expect(result[0].nickname).toEqual('agencyNick'); diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json index 7e03c8a23..145934700 100644 --- a/modules/worker/back/model-config.json +++ b/modules/worker/back/model-config.json @@ -20,6 +20,18 @@ "Device": { "dataSource": "vn" }, + "DeviceProduction": { + "dataSource": "vn" + }, + "DeviceProductionModels": { + "dataSource": "vn" + }, + "DeviceProductionState": { + "dataSource": "vn" + }, + "DeviceProductionUser": { + "dataSource": "vn" + }, "EducationLevel": { "dataSource": "vn" }, @@ -41,6 +53,9 @@ "Worker": { "dataSource": "vn" }, + "WorkerObservation": { + "dataSource": "vn" + }, "WorkerConfig": { "dataSource": "vn" }, @@ -82,6 +97,9 @@ }, "WorkerTimeControlMail": { "dataSource": "vn" + }, + "Operator": { + "dataSource": "vn" } } diff --git a/modules/worker/back/models/device-production-models.json b/modules/worker/back/models/device-production-models.json new file mode 100644 index 000000000..dcf447520 --- /dev/null +++ b/modules/worker/back/models/device-production-models.json @@ -0,0 +1,15 @@ +{ + "name": "DeviceProductionModels", + "base": "VnModel", + "options": { + "mysql": { + "table": "deviceProductionModels" + } + }, + "properties": { + "code": { + "type": "string", + "id": true + } + } +} diff --git a/modules/worker/back/models/device-production-state.json b/modules/worker/back/models/device-production-state.json new file mode 100644 index 000000000..32695621a --- /dev/null +++ b/modules/worker/back/models/device-production-state.json @@ -0,0 +1,18 @@ +{ + "name": "DeviceProductionState", + "base": "VnModel", + "options": { + "mysql": { + "table": "deviceProductionState" + } + }, + "properties": { + "code": { + "type": "string", + "id": true + }, + "description": { + "type": "string" + } + } +} diff --git a/modules/worker/back/models/device-production-user.json b/modules/worker/back/models/device-production-user.json new file mode 100644 index 000000000..568e79413 --- /dev/null +++ b/modules/worker/back/models/device-production-user.json @@ -0,0 +1,33 @@ +{ + "name": "DeviceProductionUser", + "base": "VnModel", + "options": { + "mysql": { + "table": "deviceProductionUser" + } + }, + "properties": { + "deviceProductionFk": { + "type": "number", + "id": true + }, + "userFk": { + "type": "number" + }, + "created": { + "type": "date" + } + }, + "relations": { + "deviceProduction": { + "type": "belongsTo", + "model": "DeviceProduction", + "foreignKey": "deviceProductionFk" + }, + "user": { + "type": "belongsTo", + "model": "User", + "foreignKey": "userFk" + } + } +} diff --git a/modules/worker/back/models/device-production.json b/modules/worker/back/models/device-production.json new file mode 100644 index 000000000..63672500b --- /dev/null +++ b/modules/worker/back/models/device-production.json @@ -0,0 +1,54 @@ +{ + "name": "DeviceProduction", + "base": "VnModel", + "options": { + "mysql": { + "table": "deviceProduction" + } + }, + "properties": { + "id": { + "type": "number", + "id": true + }, + "imei": { + "type": "string" + }, + "modelFk": { + "type": "number" + }, + "macWifi": { + "type" : "string" + }, + "serialNumber": { + "type" : "string" + }, + "android_id": { + "type" : "string" + }, + "purchased": { + "type" : "date" + }, + "stateFk": { + "type" : "string" + }, + "isInScaleFusion": { + "type" : "boolean" + }, + "description": { + "type" : "string" + } + }, + "relations": { + "model": { + "type": "belongsTo", + "model": "DeviceProductionModels", + "foreignKey": "modelFk" + }, + "state": { + "type": "belongsTo", + "model": "DeviceProductionState", + "foreignKey": "stateFk" + } + } +} diff --git a/modules/worker/back/models/operator.json b/modules/worker/back/models/operator.json new file mode 100644 index 000000000..db8a8c451 --- /dev/null +++ b/modules/worker/back/models/operator.json @@ -0,0 +1,44 @@ +{ + "name": "Operator", + "base": "VnModel", + "options": { + "mysql": { + "table": "operator" + } + }, + "properties": { + "workerFk": { + "id": true, + "type": "number", + "required": true + }, + "numberOfWagons": { + "type": "number" + }, + "trainFk": { + "type": "number", + "required": true + }, + "itemPackingTypeFk": { + "type": "string", + "required": true + }, + "warehouseFk": { + "type": "number", + "required": true + }, + "sectorFk ": { + "type": "number" + }, + "labelerFk ": { + "type": "number" + } + }, + "relations": { + "sector": { + "type": "belongsTo", + "model": "Sector", + "foreignKey": "sectorFk" + } + } +} \ No newline at end of file diff --git a/modules/worker/back/models/time.json b/modules/worker/back/models/time.json index df9257540..e2f1161d7 100644 --- a/modules/worker/back/models/time.json +++ b/modules/worker/back/models/time.json @@ -14,6 +14,9 @@ "year": { "type": "number" }, + "month": { + "type": "number" + }, "week": { "type": "number" } diff --git a/modules/worker/back/models/worker-observation.js b/modules/worker/back/models/worker-observation.js new file mode 100644 index 000000000..cccc2cfbd --- /dev/null +++ b/modules/worker/back/models/worker-observation.js @@ -0,0 +1,12 @@ +module.exports = function(Self) { + Self.validatesPresenceOf('text', { + message: 'Description cannot be blank' + }); + + Self.observe('before save', async function(ctx) { + ctx.instance.created = new Date(); + let token = ctx.options.accessToken; + let userId = token && token.userId; + ctx.instance.userFk = userId; + }); +}; diff --git a/modules/worker/back/models/worker-observation.json b/modules/worker/back/models/worker-observation.json new file mode 100644 index 000000000..90eb35837 --- /dev/null +++ b/modules/worker/back/models/worker-observation.json @@ -0,0 +1,39 @@ +{ + "name": "WorkerObservation", + "base": "VnModel", + "options": { + "mysql": { + "table": "workerObservation" + } + }, + "properties": { + "id": { + "id": true, + "type": "number" + }, + "workerFk": { + "type": "number" + }, + "userFk": { + "type": "number" + }, + "text": { + "type": "string" + }, + "created": { + "type": "date" + } + }, + "relations": { + "worker": { + "type": "belongsTo", + "model": "Worker", + "foreignKey": "workerFk" + }, + "user":{ + "type": "belongsTo", + "model": "Account", + "foreignKey": "userFk" + } + } +} diff --git a/modules/worker/back/models/worker-time-control-mail.json b/modules/worker/back/models/worker-time-control-mail.json index 78b99881d..87eae9217 100644 --- a/modules/worker/back/models/worker-time-control-mail.json +++ b/modules/worker/back/models/worker-time-control-mail.json @@ -28,6 +28,9 @@ }, "reason": { "type": "string" + }, + "sendedCounter": { + "type": "number" } }, "acls": [ diff --git a/modules/worker/back/models/worker-time-control.js b/modules/worker/back/models/worker-time-control.js index 7339f5d15..d5da680cf 100644 --- a/modules/worker/back/models/worker-time-control.js +++ b/modules/worker/back/models/worker-time-control.js @@ -8,6 +8,8 @@ module.exports = Self => { require('../methods/worker-time-control/sendMail')(Self); require('../methods/worker-time-control/updateWorkerTimeControlMail')(Self); require('../methods/worker-time-control/weeklyHourRecordEmail')(Self); + require('../methods/worker-time-control/getMailStates')(Self); + require('../methods/worker-time-control/resendWeeklyHourEmail')(Self); Self.rewriteDbError(function(err) { if (err.code === 'ER_DUP_ENTRY') diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js index e66259cd0..fa17640a8 100644 --- a/modules/worker/back/models/worker.js +++ b/modules/worker/back/models/worker.js @@ -14,4 +14,10 @@ module.exports = Self => { require('../methods/worker/holidays')(Self); require('../methods/worker/activeContract')(Self); require('../methods/worker/new')(Self); + require('../methods/worker/deallocatePDA')(Self); + require('../methods/worker/allocatePDA')(Self); + + Self.validatesUniquenessOf('locker', { + message: 'This locker has already been assigned' + }); }; diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json index e3a941dd3..d21094f26 100644 --- a/modules/worker/back/models/worker.json +++ b/modules/worker/back/models/worker.json @@ -55,6 +55,9 @@ }, "code": { "type" : "string" + }, + "locker": { + "type" : "number" } }, "relations": { diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html index 5a3acdde5..d89d88f2e 100644 --- a/modules/worker/front/basic-data/index.html +++ b/modules/worker/front/basic-data/index.html @@ -11,7 +11,7 @@
@@ -24,14 +24,14 @@
@@ -73,11 +73,16 @@
+
+
diff --git a/modules/worker/front/basic-data/locale/es.yml b/modules/worker/front/basic-data/locale/es.yml
index a83c30d99..edf08de90 100644
--- a/modules/worker/front/basic-data/locale/es.yml
+++ b/modules/worker/front/basic-data/locale/es.yml
@@ -5,4 +5,5 @@ SSN: NSS
Married: Casado/a
Single: Soltero/a
Business phone: Teléfono de empresa
-Mobile extension: Extensión móvil
\ No newline at end of file
+Mobile extension: Extensión móvil
+Locker: Taquilla
diff --git a/modules/worker/front/calendar/index.html b/modules/worker/front/calendar/index.html
index cff4d0bc9..c9eacbd82 100644
--- a/modules/worker/front/calendar/index.html
+++ b/modules/worker/front/calendar/index.html
@@ -25,11 +25,11 @@
-
diff --git a/modules/worker/front/create/index.js b/modules/worker/front/create/index.js
index 7e837fe02..7966926b0 100644
--- a/modules/worker/front/create/index.js
+++ b/modules/worker/front/create/index.js
@@ -13,14 +13,20 @@ export default class Controller extends Section {
});
}
+ get ibanCountry() {
+ if (!this.worker || !this.worker.iban) return false;
+
+ let countryCode = this.worker.iban.substr(0, 2);
+
+ return countryCode;
+ }
+
autofillBic() {
if (!this.worker || !this.worker.iban) return;
let bankEntityId = parseInt(this.worker.iban.substr(4, 4));
let filter = {where: {id: bankEntityId}};
- if (this.ibanCountry != 'ES') return;
-
this.$http.get(`BankEntities`, {filter}).then(response => {
const hasData = response.data && response.data[0];
diff --git a/modules/worker/front/index.js b/modules/worker/front/index.js
index 97126407c..8fad2c0df 100644
--- a/modules/worker/front/index.js
+++ b/modules/worker/front/index.js
@@ -10,6 +10,7 @@ import './descriptor-popover';
import './search-panel';
import './basic-data';
import './pbx';
+import './pda';
import './department';
import './calendar';
import './time-control';
@@ -17,3 +18,6 @@ import './log';
import './dms/index';
import './dms/create';
import './dms/edit';
+import './note/index';
+import './note/create';
+
diff --git a/modules/worker/front/locale/es.yml b/modules/worker/front/locale/es.yml
index 672f4c52f..a25377122 100644
--- a/modules/worker/front/locale/es.yml
+++ b/modules/worker/front/locale/es.yml
@@ -23,4 +23,13 @@ worker: trabajador
Go to the worker: Ir al trabajador
Click to exclude the user from getting disabled: Marcar para no deshabilitar
Click to allow the user to be disabled: Marcar para deshabilitar
-This user can't be disabled: Fijado para no deshabilitar
\ No newline at end of file
+This user can't be disabled: Fijado para no deshabilitar
+Model: Modelo
+Serial Number: Número de serie
+Current PDA: PDA Actual
+Deallocate PDA: Desasignar PDA
+PDA deallocated: PDA desasignada
+PDA allocated: PDA asignada
+New PDA: Nueva PDA
+Notes: Notas
+New note: Nueva nota
diff --git a/modules/worker/front/note/create/index.html b/modules/worker/front/note/create/index.html
new file mode 100644
index 000000000..d09fc2da5
--- /dev/null
+++ b/modules/worker/front/note/create/index.html
@@ -0,0 +1,30 @@
+
+
+
\ No newline at end of file
diff --git a/modules/worker/front/note/create/index.js b/modules/worker/front/note/create/index.js
new file mode 100644
index 000000000..81ee247db
--- /dev/null
+++ b/modules/worker/front/note/create/index.js
@@ -0,0 +1,21 @@
+import ngModule from '../../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+ constructor($element, $) {
+ super($element, $);
+ this.note = {
+ workerFk: parseInt(this.$params.id),
+ text: null
+ };
+ }
+
+ cancel() {
+ this.$state.go('worker.card.note.index', {id: this.$params.id});
+ }
+}
+
+ngModule.vnComponent('vnNoteWorkerCreate', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/worker/front/note/create/index.spec.js b/modules/worker/front/note/create/index.spec.js
new file mode 100644
index 000000000..d900c8ee0
--- /dev/null
+++ b/modules/worker/front/note/create/index.spec.js
@@ -0,0 +1,22 @@
+import './index';
+
+describe('Worker', () => {
+ describe('Component vnNoteWorkerCreate', () => {
+ let $state;
+ let controller;
+
+ beforeEach(ngModule('worker'));
+
+ beforeEach(inject(($componentController, _$state_) => {
+ $state = _$state_;
+ $state.params.id = '1234';
+ const $element = angular.element('
+
+
+
+
+
+
+
+ ng-model="filter.lastName">
diff --git a/modules/worker/front/summary/index.html b/modules/worker/front/summary/index.html
index 0a6bec822..72b8e729a 100644
--- a/modules/worker/front/summary/index.html
+++ b/modules/worker/front/summary/index.html
@@ -11,23 +11,23 @@
-
-
-
-
-
+
+
+
-
-
-
-
-
\ No newline at end of file
+
diff --git a/modules/worker/front/summary/locale/es.yml b/modules/worker/front/summary/locale/es.yml
index e9c8e5583..fb9d2e2ca 100644
--- a/modules/worker/front/summary/locale/es.yml
+++ b/modules/worker/front/summary/locale/es.yml
@@ -1,3 +1,4 @@
Business phone: Teléfono de empresa
Personal phone: Teléfono personal
-Mobile extension: Extensión móvil
\ No newline at end of file
+Mobile extension: Extensión móvil
+Locker: Taquilla
diff --git a/modules/worker/front/time-control/index.html b/modules/worker/front/time-control/index.html
index 681d420d0..044ea4038 100644
--- a/modules/worker/front/time-control/index.html
+++ b/modules/worker/front/time-control/index.html
@@ -1,7 +1,7 @@
@@ -16,7 +16,7 @@
{{::weekday.dated | date: 'MMMM'}}
-
-
+
-
-
+
-
+
+
+
+
-
+
-
@@ -106,6 +122,8 @@
vn-id="calendar"
class="vn-pt-md"
ng-model="$ctrl.date"
+ format-week="$ctrl.formatWeek($element)"
+ on-move="$ctrl.getMailStates($date)"
has-events="$ctrl.hasEvents($day)">
@@ -166,15 +184,31 @@
vn-id="reason"
on-accept="$ctrl.isUnsatisfied()">
-
-
+
-
+
-
\ No newline at end of file
+
+
+
+
+ Are you sure you want to send it?
+
+
+
+
+
+
diff --git a/modules/worker/front/time-control/index.js b/modules/worker/front/time-control/index.js
index f7379fea0..85ddcedfe 100644
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@@ -1,6 +1,7 @@
import ngModule from '../module';
import Section from 'salix/components/section';
import './style.scss';
+import UserError from 'core/lib/user-error';
class Controller extends Section {
constructor($element, $, vnWeekDays) {
@@ -24,12 +25,31 @@ class Controller extends Section {
}
this.date = initialDate;
+
+ this.getMailStates(this.date);
+ }
+
+ get isHr() {
+ return this.aclService.hasAny(['hr']);
+ }
+
+ get isHimSelf() {
+ const userId = window.localStorage.currentUserWorkerId;
+ return userId == this.$params.id;
}
get worker() {
return this._worker;
}
+ get weekNumber() {
+ return this.getWeekNumber(this.date);
+ }
+
+ set weekNumber(value) {
+ this._weekNumber = value;
+ }
+
set worker(value) {
this._worker = value;
}
@@ -68,6 +88,27 @@ class Controller extends Section {
}
this.fetchHours();
+ this.getWeekData();
+ }
+
+ getWeekData() {
+ const filter = {
+ where: {
+ workerFk: this.$params.id,
+ year: this._date.getFullYear(),
+ week: this.getWeekNumber(this._date)
+ }
+ };
+ this.$http.get('WorkerTimeControlMails', {filter})
+ .then(res => {
+ const workerTimeControlMail = res.data;
+ if (!workerTimeControlMail.length) {
+ this.state = null;
+ return;
+ }
+ this.state = workerTimeControlMail[0].state;
+ this.reason = workerTimeControlMail[0].reason;
+ });
}
/**
@@ -262,7 +303,10 @@ class Controller extends Section {
const query = `WorkerTimeControls/${this.worker.id}/addTimeEntry`;
this.$http.post(query, entry)
- .then(() => this.fetchHours());
+ .then(() => {
+ this.fetchHours();
+ this.getMailStates(this.date);
+ });
} catch (e) {
this.vnApp.showError(this.$t(e.message));
return false;
@@ -283,6 +327,7 @@ class Controller extends Section {
this.$http.post(`WorkerTimeControls/${entryId}/deleteTimeEntry`).then(() => {
this.fetchHours();
+ this.getMailStates(this.date);
this.vnApp.showSuccess(this.$t('Entry removed'));
});
}
@@ -294,42 +339,56 @@ class Controller extends Section {
this.$.editEntry.show($event);
}
- getWeekNumber(currentDate) {
- const startDate = new Date(currentDate.getFullYear(), 0, 1);
- let days = Math.floor((currentDate - startDate) /
- (24 * 60 * 60 * 1000));
- return Math.ceil(days / 7);
+ getWeekNumber(date) {
+ const tempDate = new Date(date);
+ let dayOfWeek = tempDate.getDay();
+ dayOfWeek = (dayOfWeek === 0) ? 7 : dayOfWeek;
+ const firstDayOfWeek = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate() - (dayOfWeek - 1));
+ const firstDayOfYear = new Date(tempDate.getFullYear(), 0, 1);
+ const differenceInMilliseconds = firstDayOfWeek.getTime() - firstDayOfYear.getTime();
+ const weekNumber = Math.floor(differenceInMilliseconds / (1000 * 60 * 60 * 24 * 7)) + 1;
+ return weekNumber;
}
isSatisfied() {
- const weekNumber = this.getWeekNumber(this.date);
const params = {
workerId: this.worker.id,
year: this.date.getFullYear(),
- week: weekNumber,
+ week: this.weekNumber,
state: 'CONFIRMED'
};
const query = `WorkerTimeControls/updateWorkerTimeControlMail`;
this.$http.post(query, params).then(() => {
+ this.getMailStates(this.date);
+ this.getWeekData();
this.vnApp.showSuccess(this.$t('Data saved!'));
});
}
isUnsatisfied() {
- const weekNumber = this.getWeekNumber(this.date);
+ if (!this.reason) throw new UserError(`You must indicate a reason`);
+
const params = {
workerId: this.worker.id,
year: this.date.getFullYear(),
- week: weekNumber,
+ week: this.weekNumber,
state: 'REVISE',
reason: this.reason
};
const query = `WorkerTimeControls/updateWorkerTimeControlMail`;
this.$http.post(query, params).then(() => {
+ this.getMailStates(this.date);
+ this.getWeekData();
this.vnApp.showSuccess(this.$t('Data saved!'));
});
}
+ changeState(state, reason) {
+ this.state = state;
+ this.reason = reason;
+ this.repaint();
+ }
+
save() {
try {
const entry = this.selectedRow;
@@ -340,11 +399,83 @@ class Controller extends Section {
this.$http.post(query, {direction: entry.direction})
.then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
.then(() => this.$.editEntry.hide())
- .then(() => this.fetchHours());
+ .then(() => this.fetchHours())
+ .then(() => this.getMailStates(this.date));
} catch (e) {
this.vnApp.showError(this.$t(e.message));
}
}
+
+ resendEmail() {
+ const params = {
+ recipient: this.worker.user.emailUser.email,
+ week: this.weekNumber,
+ year: this.date.getFullYear(),
+ workerId: this.worker.id,
+ state: 'SENDED'
+ };
+ this.$http.post(`WorkerTimeControls/weekly-hour-hecord-email`, params)
+ .then(() => {
+ this.getMailStates(this.date);
+ this.vnApp.showSuccess(this.$t('Email sended'));
+ });
+ }
+
+ getTime(timeString) {
+ const [hours, minutes, seconds] = timeString.split(':');
+ return [parseInt(hours), parseInt(minutes), parseInt(seconds)];
+ }
+
+ getMailStates(date) {
+ const params = {
+ month: date.getMonth() + 1,
+ year: date.getFullYear()
+ };
+ const query = `WorkerTimeControls/${this.$params.id}/getMailStates`;
+ this.$http.get(query, {params})
+ .then(res => {
+ this.workerTimeControlMails = res.data;
+ this.repaint();
+ });
+ }
+
+ formatWeek($element) {
+ const weekNumberHTML = $element.firstElementChild;
+ const weekNumberValue = weekNumberHTML.innerHTML;
+
+ if (!this.workerTimeControlMails) return;
+ const workerTimeControlMail = this.workerTimeControlMails.find(
+ workerTimeControlMail => workerTimeControlMail.week == weekNumberValue
+ );
+
+ if (!workerTimeControlMail) return;
+ const state = workerTimeControlMail.state;
+
+ if (state == 'CONFIRMED') {
+ weekNumberHTML.classList.remove('revise');
+ weekNumberHTML.classList.remove('sended');
+
+ weekNumberHTML.classList.add('confirmed');
+ weekNumberHTML.setAttribute('title', 'Conforme');
+ }
+ if (state == 'REVISE') {
+ weekNumberHTML.classList.remove('confirmed');
+ weekNumberHTML.classList.remove('sended');
+
+ weekNumberHTML.classList.add('revise');
+ weekNumberHTML.setAttribute('title', 'No conforme');
+ }
+ if (state == 'SENDED') {
+ weekNumberHTML.classList.add('sended');
+ weekNumberHTML.setAttribute('title', 'Pendiente');
+ }
+ }
+
+ repaint() {
+ let calendars = this.element.querySelectorAll('vn-calendar');
+ for (let calendar of calendars)
+ calendar.$ctrl.repaint();
+ }
}
Controller.$inject = ['$element', '$scope', 'vnWeekDays'];
diff --git a/modules/worker/front/time-control/index.spec.js b/modules/worker/front/time-control/index.spec.js
index b68162d39..94f9d3d48 100644
--- a/modules/worker/front/time-control/index.spec.js
+++ b/modules/worker/front/time-control/index.spec.js
@@ -5,12 +5,14 @@ describe('Component vnWorkerTimeControl', () => {
let $scope;
let $element;
let controller;
+ let $httpParamSerializer;
beforeEach(ngModule('worker'));
- beforeEach(inject(($componentController, $rootScope, $stateParams, _$httpBackend_) => {
+ beforeEach(inject(($componentController, $rootScope, $stateParams, _$httpBackend_, _$httpParamSerializer_) => {
$stateParams.id = 1;
$httpBackend = _$httpBackend_;
+ $httpParamSerializer = _$httpParamSerializer_;
$scope = $rootScope.$new();
$element = angular.element('
-
+ vn-one
+ label="Max m³"
+ ng-model="$ctrl.zone.itemMaxSize"
+ min="0"
+ vn-acl="deliveryBoss"
+ rule>
+
+
+
=0.10.0"
}
},
+ "node_modules/array-parallel": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz",
+ "integrity": "sha512-TDPTwSWW5E4oiFiKmz6RGJ/a80Y91GuLgUYuLd49+XBS75tYo8PNgaT2K/OxuQYqkoI852MDGBorg9OcUSTQ8w=="
+ },
+ "node_modules/array-series": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz",
+ "integrity": "sha512-L0XlBwfx9QetHOsbLDrE/vh2t018w9462HM3iaFfxRiK83aJjAt/Ja3NMkOW7FICwWTlQBa3ZbL5FKhuQWkDrg=="
+ },
"node_modules/array-slice": {
"version": "1.1.0",
"dev": true,
@@ -9284,6 +9295,67 @@
"node": ">= 0.10"
}
},
+ "node_modules/gm": {
+ "version": "1.25.0",
+ "resolved": "https://registry.npmjs.org/gm/-/gm-1.25.0.tgz",
+ "integrity": "sha512-4kKdWXTtgQ4biIo7hZA396HT062nDVVHPjQcurNZ3o/voYN+o5FUC5kOwuORbpExp3XbTJ3SU7iRipiIhQtovw==",
+ "dependencies": {
+ "array-parallel": "~0.1.3",
+ "array-series": "~0.1.5",
+ "cross-spawn": "^4.0.0",
+ "debug": "^3.1.0"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/gm/node_modules/cross-spawn": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
+ "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
+ "dependencies": {
+ "lru-cache": "^4.0.1",
+ "which": "^1.2.9"
+ }
+ },
+ "node_modules/gm/node_modules/debug": {
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+ "dependencies": {
+ "ms": "^2.1.1"
+ }
+ },
+ "node_modules/gm/node_modules/lru-cache": {
+ "version": "4.1.5",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+ "dependencies": {
+ "pseudomap": "^1.0.2",
+ "yallist": "^2.1.2"
+ }
+ },
+ "node_modules/gm/node_modules/ms": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+ },
+ "node_modules/gm/node_modules/which": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+ "dependencies": {
+ "isexe": "^2.0.0"
+ },
+ "bin": {
+ "which": "bin/which"
+ }
+ },
+ "node_modules/gm/node_modules/yallist": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+ "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
+ },
"node_modules/google-auth-library": {
"version": "3.1.2",
"license": "Apache-2.0",
@@ -19715,9 +19787,9 @@
}
},
"node_modules/sharp": {
- "version": "0.31.2",
- "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.2.tgz",
- "integrity": "sha512-DUdNVEXgS5A97cTagSLIIp8dUZ/lZtk78iNVZgHdHbx1qnQR7JAHY0BnXnwwH39Iw+VKhO08CTYhIg0p98vQ5Q==",
+ "version": "0.31.3",
+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz",
+ "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==",
"hasInstallScript": true,
"dependencies": {
"color": "^4.2.3",
@@ -28673,6 +28745,16 @@
}
}
},
+ "array-parallel": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz",
+ "integrity": "sha512-TDPTwSWW5E4oiFiKmz6RGJ/a80Y91GuLgUYuLd49+XBS75tYo8PNgaT2K/OxuQYqkoI852MDGBorg9OcUSTQ8w=="
+ },
+ "array-series": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz",
+ "integrity": "sha512-L0XlBwfx9QetHOsbLDrE/vh2t018w9462HM3iaFfxRiK83aJjAt/Ja3NMkOW7FICwWTlQBa3ZbL5FKhuQWkDrg=="
+ },
"array-slice": {
"version": "1.1.0",
"dev": true
@@ -32611,6 +32693,63 @@
"sparkles": "^1.0.0"
}
},
+ "gm": {
+ "version": "1.25.0",
+ "resolved": "https://registry.npmjs.org/gm/-/gm-1.25.0.tgz",
+ "integrity": "sha512-4kKdWXTtgQ4biIo7hZA396HT062nDVVHPjQcurNZ3o/voYN+o5FUC5kOwuORbpExp3XbTJ3SU7iRipiIhQtovw==",
+ "requires": {
+ "array-parallel": "~0.1.3",
+ "array-series": "~0.1.5",
+ "cross-spawn": "^4.0.0",
+ "debug": "^3.1.0"
+ },
+ "dependencies": {
+ "cross-spawn": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
+ "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
+ "requires": {
+ "lru-cache": "^4.0.1",
+ "which": "^1.2.9"
+ }
+ },
+ "debug": {
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "lru-cache": {
+ "version": "4.1.5",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+ "requires": {
+ "pseudomap": "^1.0.2",
+ "yallist": "^2.1.2"
+ }
+ },
+ "ms": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+ },
+ "which": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+ "requires": {
+ "isexe": "^2.0.0"
+ }
+ },
+ "yallist": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+ "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
+ }
+ }
+ },
"google-auth-library": {
"version": "3.1.2",
"requires": {
@@ -39863,9 +40002,9 @@
}
},
"sharp": {
- "version": "0.31.2",
- "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.2.tgz",
- "integrity": "sha512-DUdNVEXgS5A97cTagSLIIp8dUZ/lZtk78iNVZgHdHbx1qnQR7JAHY0BnXnwwH39Iw+VKhO08CTYhIg0p98vQ5Q==",
+ "version": "0.31.3",
+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz",
+ "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==",
"requires": {
"color": "^4.2.3",
"detect-libc": "^2.0.1",
diff --git a/package.json b/package.json
index 89bd1a3e8..607367e7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "salix-back",
- "version": "23.06.01",
+ "version": "23.16.01",
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",
@@ -20,6 +20,7 @@
"form-data": "^4.0.0",
"fs-extra": "^5.0.0",
"ftps": "^1.2.0",
+ "gm": "^1.25.0",
"got": "^10.7.0",
"helmet": "^3.21.2",
"i18n": "^0.8.4",
@@ -43,7 +44,7 @@
"puppeteer": "^18.0.5",
"read-chunk": "^3.2.0",
"require-yaml": "0.0.1",
- "sharp": "^0.31.2",
+ "sharp": "^0.31.3",
"smbhash": "0.0.1",
"strong-error-handler": "^2.3.2",
"uuid": "^3.3.3",
diff --git a/print/core/cluster.js b/print/core/cluster.js
index 23b3d88e9..d54044fa2 100644
--- a/print/core/cluster.js
+++ b/print/core/cluster.js
@@ -4,40 +4,38 @@ const {cpus} = require('os');
module.exports = {
init() {
- if (!this.pool) {
- Cluster.launch({
- concurrency: Cluster.CONCURRENCY_CONTEXT,
- maxConcurrency: cpus().length,
- puppeteerOptions: {
- headless: true,
- args: [
- '--no-sandbox',
- '--disable-setuid-sandbox',
- '--no-zygote'
- ]
- }
- })
- .then(cluster => {
- this.pool = cluster;
+ if (this.pool) return;
+ Cluster.launch({
+ concurrency: Cluster.CONCURRENCY_CONTEXT,
+ maxConcurrency: cpus().length,
+ puppeteerOptions: {
+ headless: true,
+ args: [
+ '--no-sandbox',
+ '--disable-setuid-sandbox',
+ '--no-zygote'
+ ]
+ }
+ }).then(cluster => {
+ this.pool = cluster;
- log4js.configure({
- appenders: {
- out: {type: 'stdout'}
- },
- categories: {default: {appenders: ['out'], level: 'info'}},
- });
+ log4js.configure({
+ appenders: {
+ out: {type: 'stdout'}
+ },
+ categories: {default: {appenders: ['out'], level: 'info'}},
+ });
- const logger = log4js.getLogger();
+ const logger = log4js.getLogger();
- cluster.on('taskerror', (err, data, willRetry) => {
- if (willRetry)
- logger.warn(`[Print] => ${err.message}\nThis job will be retried`);
- else
- logger.error(`[Print] => ${err.message}`);
- });
+ cluster.on('taskerror', (err, data, willRetry) => {
+ if (willRetry)
+ logger.warn(`[Print] => ${err.message}\nThis job will be retried`);
+ else
+ logger.error(`[Print] => ${err.message}`);
+ });
- cluster.on('queue', () => logger.info('Printing task initialized by pool'));
- });
- }
+ cluster.on('queue', () => logger.info('Printing task initialized by pool'));
+ });
}
};
diff --git a/print/core/filters/index.js b/print/core/filters/index.js
index efc398508..bfd99c504 100644
--- a/print/core/filters/index.js
+++ b/print/core/filters/index.js
@@ -4,5 +4,4 @@ require('./uppercase');
require('./currency');
require('./percentage');
require('./number');
-require('./zerofill');
diff --git a/print/core/filters/specs/zerofill.spec.js b/print/core/filters/specs/zerofill.spec.js
deleted file mode 100644
index 1c00ff4a7..000000000
--- a/print/core/filters/specs/zerofill.spec.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import zerofill from '../zerofill.js';
-
-describe('zerofill filter', () => {
- const superDuperNumber = 1984;
-
- it('should filter the number filling it with zeros up to 6 characters length', () => {
- expect(zerofill(superDuperNumber, '000000')).toEqual('001984');
- });
-});
diff --git a/print/core/filters/zerofill.js b/print/core/filters/zerofill.js
deleted file mode 100644
index c3d18079b..000000000
--- a/print/core/filters/zerofill.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const Vue = require('vue');
-
-const zerofill = function(value, pad) {
- const valueStr = String(value);
- return pad.substring(0, pad.length - valueStr.length) + valueStr;
-};
-
-Vue.filter('zerofill', zerofill);
-
-module.exports = zerofill;
diff --git a/print/core/report.js b/print/core/report.js
index c5182d1a8..23cffac2c 100644
--- a/print/core/report.js
+++ b/print/core/report.js
@@ -32,28 +32,31 @@ class Report extends Component {
if (fs.existsSync(fullPath))
options = require(optionsPath);
- return new Promise(resolve => {
+ return new Promise((resolve, reject) => {
Cluster.pool.queue({}, async({page}) => {
- await page.emulateMediaType('screen');
- await page.setContent(template);
+ try {
+ await page.emulateMediaType('screen');
+ await page.setContent(template);
- const element = await page.$('#pageFooter');
+ const element = await page.$('#pageFooter');
- let footer = '\n';
- if (element) {
- footer = await page.evaluate(el => {
- const html = el.innerHTML;
- el.remove();
- return html;
- }, element);
+ let footer = '\n';
+ if (element) {
+ footer = await page.evaluate(el => {
+ const html = el.innerHTML;
+ el.remove();
+ return html;
+ }, element);
+ }
+
+ options.headerTemplate = '\n';
+ options.footerTemplate = footer;
+
+ const buffer = await page.pdf(options);
+ resolve(buffer);
+ } catch (err) {
+ reject(err);
}
-
- options.headerTemplate = '\n';
- options.footerTemplate = footer;
-
- const stream = await page.pdf(options);
-
- resolve(stream);
});
});
}
diff --git a/print/core/storage.js b/print/core/storage.js
index 063a2fbec..66f7ce98a 100644
--- a/print/core/storage.js
+++ b/print/core/storage.js
@@ -3,26 +3,14 @@ const path = require('path');
const fs = require('fs-extra');
module.exports = {
- async write(stream, options) {
+ async write(buffer, options) {
const storage = config.storage[options.type];
-
if (!storage) return;
const src = path.join(storage.root, options.path);
const fileSrc = path.join(src, options.fileName);
await fs.mkdir(src, {recursive: true});
-
- const writeStream = fs.createWriteStream(fileSrc);
- writeStream.on('open', () => writeStream.write(stream));
- writeStream.on('finish', () => writeStream.end());
-
- return new Promise(resolve => {
- writeStream.on('close', () => resolve());
- });
- },
-
- load(type, data) {
-
+ await fs.writeFile(fileSrc, buffer);
}
};
diff --git a/print/templates/email/incoterms-authorization/attachments.json b/print/templates/email/incoterms-authorization/attachments.json
new file mode 100644
index 000000000..9dfd945db
--- /dev/null
+++ b/print/templates/email/incoterms-authorization/attachments.json
@@ -0,0 +1,6 @@
+[
+ {
+ "filename": "incoterms-authorization.pdf",
+ "component": "incoterms-authorization"
+ }
+]
\ No newline at end of file
diff --git a/print/templates/email/letter-debtor-nd/attachments.json b/print/templates/email/letter-debtor-nd/attachments.json
new file mode 100644
index 000000000..1e21ea343
--- /dev/null
+++ b/print/templates/email/letter-debtor-nd/attachments.json
@@ -0,0 +1,6 @@
+[
+ {
+ "filename": "letter-debtor.pdf",
+ "component": "letter-debtor"
+ }
+]
\ No newline at end of file
diff --git a/print/templates/email/letter-debtor-st/attachments.json b/print/templates/email/letter-debtor-st/attachments.json
new file mode 100644
index 000000000..1e21ea343
--- /dev/null
+++ b/print/templates/email/letter-debtor-st/attachments.json
@@ -0,0 +1,6 @@
+[
+ {
+ "filename": "letter-debtor.pdf",
+ "component": "letter-debtor"
+ }
+]
\ No newline at end of file
diff --git a/print/templates/email/printer-setup/assets/files/model.ezp b/print/templates/email/printer-setup/assets/files/model.ezp
index 98e3302bc..dba98e0ee 100644
Binary files a/print/templates/email/printer-setup/assets/files/model.ezp and b/print/templates/email/printer-setup/assets/files/model.ezp differ
diff --git a/print/templates/email/printer-setup/locale/es.yml b/print/templates/email/printer-setup/locale/es.yml
index 7361e5ed3..f47592fcf 100644
--- a/print/templates/email/printer-setup/locale/es.yml
+++ b/print/templates/email/printer-setup/locale/es.yml
@@ -7,37 +7,27 @@ description:
followGuide: Puedes utilizar como guía, el vídeo del montaje del ribon y la cinta
https://www.youtube.com/watch?v=qhb0kgQF3o8. También
- necesitarás el QLabel, el programa para imprimir las cintas.
- downloadFrom: Puedes descargarlo desde este enlace https://cdn.verdnatura.es/public/QLabel_IV_V1.37_Install_en.exe
+ necesitarás el GoLabel, el programa para imprimir las cintas.
+ downloadFrom: Puedes descargarlo desde este enlace https://godex.s3-accelerate.amazonaws.com/_6f5glRrVhQAEBGhdUsqJA.file?v01
downloadDriver: En este enlace puedes descargar el driver de la impresora https://es.seagullscientific.com/support/downloads/drivers/godex/download/
sections:
- QLabel:
- title: Utilización de QLabel
+ GoLabel:
+ title: Utilización de GoLabel
description: Para utilizar el programa de impresión de cintas sigue estos pasos
steps:
- - Abre el programa QLabel
- - Haz clic en el icono de la barra superior con forma de 'carpeta'
- - Selecciona el archivo llamado 'model.ezp' adjunto en este correo, y haz clic
- en abrir
- - Ve a 'File' -> 'Save as' y guárdalo en el escritorio con otro nombre
- - Cierra el Qlabel y abre el archivo que acabamos de guardar
- - Haz clic encima del texto con el botón secundario del ratón
- - Elige la primera opción 'setup'
- - Cambia el texto para imprimir
- - Haz clic en el botón 'Ok'
- - Desplázate con el ratón para ver la medida máxima que ocupa el texto
- - Haz clic encima del texto con el botón secundario del ratón
- - Elige la segunda opción 'Setup printer'
- - Haz clic en la primera pestaña 'Label Setup'
- - Modifica la propiedad 'Paper Height' con la medida máxima consultada anteriormente
- - 'Comprueba el puerto de la impresora, botón de de la derecha ''SETUP PRINTER''
- y en la parte derecha, igual como la imagen que adjuntamos, seleccionar la que
- ponga ''USB00x: GODEX'''
- - Haz clic en el botón 'Ok'
- - Haz clic sobre el icono de la impresora
- - Haz clic en 'Print'
+ - Abre el programa GoLabel
+ - Haz clic en el icono de la barra superior con forma de carpeta con una hoja.
+ - Selecciona el archivo llamado 'model.ezp'(que seguramente este en 'Descargas') adjunto en este correo, haz clic en abrir.
+ - Una vez abierto el archivo, haz doble click sobre el texto, en el cuadro que nos sale pulse donde esta el texto de ejemplo (En este caso "TUS HERMANOS") y nos saldra en ese mismo recuadro a la parte izquierda para editarlo y escribir lo que quiera.
+ - Cuando ya tenga el texto que desee pulse en el boton 'OK'.
+ - Ve a 'Archivo' → 'Guardar Como' y guárdelo en el escritorio en el escritorio con otro nombre.
+ - Luego para imprimir primero deberá configurar la impresora.
+ - Pulse en el octavo icono de la barra de arriba, que en este caso será una impresora con un engranaje naranja.
+ - Una vez ahí, pulsaremos en el desplegable de modelo de impresora y elegiremos el modelo que coincida con el nuestro 'G***'.
+ - Pulse guardar y ya tendremos nuestra impresora con la configuración guardada.
+ - Y por último, para imprimir, haz click en el noveno icono, el cual corresponde a una impresora azul.
help:
title: "¿Necesitas ayuda?"
description: Si necesitas ayuda, descárgate nuestro programa de soporte para poder
diff --git a/print/templates/email/printer-setup/printer-setup.html b/print/templates/email/printer-setup/printer-setup.html
index 4320ae50d..fe4db90d3 100644
--- a/print/templates/email/printer-setup/printer-setup.html
+++ b/print/templates/email/printer-setup/printer-setup.html
@@ -8,10 +8,10 @@
-
- {{sale.itemFk | zerofill('000000')}}
+ {{sale.itemFk}}
{{Math.trunc(sale.subtotal)}}
{{sale.concept}}
diff --git a/print/templates/reports/client-debt-statement/client-debt-statement.html b/print/templates/reports/client-debt-statement/client-debt-statement.html
index fb7bfd625..30fbbe003 100644
--- a/print/templates/reports/client-debt-statement/client-debt-statement.html
+++ b/print/templates/reports/client-debt-statement/client-debt-statement.html
@@ -13,7 +13,7 @@
{{$t('date')}}
- {{formatDate(new Date(), '%d-%m-%Y');}}
+ {{formatDate(new Date(), '%d-%m-%Y')}}
@@ -44,7 +44,7 @@
- {{formatDate(sale.issued, '%d-%m-%Y');}}
+ {{formatDate(sale.issued, '%d-%m-%Y')}}
{{sale.ref}}
{{sale.debtOut}}
{{sale.debtIn}}
diff --git a/print/templates/reports/collection-label/collection-label.html b/print/templates/reports/collection-label/collection-label.html
index 2fd77079f..a699d4ac5 100644
--- a/print/templates/reports/collection-label/collection-label.html
+++ b/print/templates/reports/collection-label/collection-label.html
@@ -21,7 +21,7 @@
{{labelData.code == 'V' ? (labelData.size || 0) + 'cm' : (labelData.volume || 0) + 'm³'}}
- {{labelData.lineCount || 0}}
diff --git a/print/templates/reports/collection-label/collection-label.js b/print/templates/reports/collection-label/collection-label.js
index 74024bb56..d45ecb2bc 100644
--- a/print/templates/reports/collection-label/collection-label.js
+++ b/print/templates/reports/collection-label/collection-label.js
@@ -57,6 +57,20 @@ module.exports = {
} else
value = '-'.repeat(19);
+ return value;
+ },
+ getAgencyDescripton(labelData) {
+ let value;
+ if (labelData.agencyDescription)
+ value = labelData.agencyDescription.toUpperCase().substring(0, 11);
+ else
+ value = '---';
+
+ if (labelData.routeFk) {
+ let routeFk = labelData.routeFk.toString();
+ value = `${value} [${routeFk.substring(routeFk.length - 3)}]`;
+ }
+
return value;
},
},
diff --git a/print/templates/reports/collection-label/options.json b/print/templates/reports/collection-label/options.json
index a555c5723..ad5ad4750 100644
--- a/print/templates/reports/collection-label/options.json
+++ b/print/templates/reports/collection-label/options.json
@@ -3,9 +3,9 @@
"height": "4.9cm",
"margin": {
"top": "0.3cm",
- "right": "0.6cm",
+ "right": "0.3cm",
"bottom": "0cm",
- "left": "0cm"
+ "left": "0.2cm"
},
"printBackground": true
}
\ No newline at end of file
diff --git a/print/templates/reports/collection-label/sql/labelsData.sql b/print/templates/reports/collection-label/sql/labelsData.sql
index 1846c6893..fef692272 100644
--- a/print/templates/reports/collection-label/sql/labelsData.sql
+++ b/print/templates/reports/collection-label/sql/labelsData.sql
@@ -1,37 +1,38 @@
SELECT c.itemPackingTypeFk code,
- tc.collectionFk,
- SUBSTRING('ABCDEFGH', tc.wagon, 1) wagon,
- tc.`level`,
- t.id ticketFk,
- COALESCE(et.description, zo.name, am.name) agencyDescription,
- cc.code color,
- t.clientFk,
- CAST(SUM(sv.volume) AS DECIMAL(5, 2)) volume,
- MAX(i.`size`) `size`,
- w.code workerCode,
- TIME_FORMAT(t.shipped, '%H:%i') shippedHour,
- TIME_FORMAT(zo.`hour`, '%H:%i') zoneHour,
- DATE_FORMAT(t.shipped, '%d/%m/%y') shipped,
- tt.labelCount,
- t.nickName,
- COUNT(*) lineCount
- FROM vn.ticket t
- JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
- JOIN vn.collection c ON c.id = tc.collectionFk
- LEFT JOIN vn.collectionColors cc ON cc.shelve = tc.`level`
- AND cc.wagon = tc.wagon
- AND cc.trainFk = c.trainFk
- JOIN vn.sale s ON s.ticketFk = t.id
- LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it ON it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
- JOIN vn.worker w ON w.id = c.workerFk
- JOIN vn.agencyMode am ON am.id = t.agencyModeFk
- LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
- LEFT JOIN vn.`zone` zo ON t.zoneFk = zo.id
- LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
- LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
- WHERE t.id IN (?)
- GROUP BY t.id
- ORDER BY cc.`code`;
\ No newline at end of file
+ tc.collectionFk,
+ SUBSTRING('ABCDEFGH', tc.wagon, 1) wagon,
+ tc.`level`,
+ t.id ticketFk,
+ COALESCE(et.description, zo.name, am.name) agencyDescription,
+ cc.code color,
+ t.clientFk,
+ CAST(SUM(sv.volume) AS DECIMAL(5, 2)) volume,
+ MAX(i.`size`) `size`,
+ w.code workerCode,
+ TIME_FORMAT(t.shipped, '%H:%i') shippedHour,
+ TIME_FORMAT(zo.`hour`, '%H:%i') zoneHour,
+ DATE_FORMAT(t.shipped, '%d/%m/%y') shipped,
+ tt.labelCount,
+ t.nickName,
+ COUNT(*) lineCount,
+ rm.routeFk
+ FROM vn.ticket t
+ JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
+ JOIN vn.collection c ON c.id = tc.collectionFk
+ LEFT JOIN vn.collectionColors cc ON cc.shelve = tc.`level`
+ AND cc.wagon = tc.wagon
+ AND cc.trainFk = c.trainFk
+ JOIN vn.sale s ON s.ticketFk = t.id
+ LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.itemType it ON it.id = i.typeFk
+ JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+ JOIN vn.worker w ON w.id = c.workerFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
+ LEFT JOIN vn.`zone` zo ON t.zoneFk = zo.id
+ LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
+ LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
+ WHERE t.id IN (?)
+ GROUP BY t.id
+ ORDER BY cc.`code`;
\ No newline at end of file
diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html
index 9f217ba22..0be5a30f0 100644
--- a/print/templates/reports/delivery-note/delivery-note.html
+++ b/print/templates/reports/delivery-note/delivery-note.html
@@ -33,7 +33,7 @@
@@ -118,7 +124,7 @@
on-send="$ctrl.onSmsSend($sms)"
sms="$ctrl.newSMS">
-
diff --git a/modules/client/front/descriptor/index.js b/modules/client/front/descriptor/index.js
index 4d8d70edf..cdabf13e7 100644
--- a/modules/client/front/descriptor/index.js
+++ b/modules/client/front/descriptor/index.js
@@ -44,6 +44,12 @@ class Controller extends Descriptor {
return this.$http.post(`Clients/${this.id}/sendSms`, sms)
.then(() => this.vnApp.showSuccess(this.$t('SMS sent')));
}
+
+ clientUnpaid() {
+ return this.$t(`Unpaid`) + '
' + + this.$t(`Unpaid Dated`, {dated: this.client.unpaid.dated}) + '
' + + this.$t(`Unpaid Amount`, {amount: this.client.unpaid.amount}); + } } ngModule.vnComponent('vnClientDescriptor', { diff --git a/modules/client/front/descriptor/locale/es.yml b/modules/client/front/descriptor/locale/es.yml index 71723e654..85ae5b4a6 100644 --- a/modules/client/front/descriptor/locale/es.yml +++ b/modules/client/front/descriptor/locale/es.yml @@ -5,4 +5,6 @@ To date: Fecha hasta Go to user: Ir al usuario Go to supplier: Ir al proveedor Client invoices list: Listado de facturas del cliente -Pay method: Forma de pago \ No newline at end of file +Pay method: Forma de pago +Unpaid Dated: "Fecha: {{dated | date:'dd/MM/yyyy'}}" +Unpaid Amount: "Importe: {{amount | currency: 'EUR':2}}" diff --git a/modules/client/front/fiscal-data/index.js b/modules/client/front/fiscal-data/index.js index d76944c42..acad38185 100644 --- a/modules/client/front/fiscal-data/index.js +++ b/modules/client/front/fiscal-data/index.js @@ -2,6 +2,10 @@ import ngModule from '../module'; import Section from 'salix/components/section'; export default class Controller extends Section { + $onInit() { + this.card.reload(); + } + onSubmit() { const orgData = this.$.watcher.orgData; delete this.client.despiteOfClient; diff --git a/modules/client/front/locale/es.yml b/modules/client/front/locale/es.yml index de4b91e0b..adbca8dbf 100644 --- a/modules/client/front/locale/es.yml +++ b/modules/client/front/locale/es.yml @@ -63,4 +63,4 @@ Consumption: Consumo Compensation Account: Cuenta para compensar Amount to return: Cantidad a devolver Delivered amount: Cantidad entregada -Unpaid: Impagado \ No newline at end of file +Unpaid: Impagado diff --git a/modules/client/front/sample/create/index.js b/modules/client/front/sample/create/index.js index 13ef875da..b25bf7919 100644 --- a/modules/client/front/sample/create/index.js +++ b/modules/client/front/sample/create/index.js @@ -5,10 +5,6 @@ import './style.scss'; class Controller extends Section { constructor($element, $, vnEmail) { super($element, $); - this.clientSample = { - clientFk: this.$params.id, - companyId: this.vnConfig.companyFk - }; this.vnEmail = vnEmail; } @@ -19,10 +15,8 @@ class Controller extends Section { set client(value) { this._client = value; - if (value) { - this.clientSample.recipient = value.email; - this.getWorkerEmail(); - } + if (value) + this.setClientSample(value); } get companyId() { @@ -119,12 +113,17 @@ class Controller extends Section { .then(() => this.$state.go('client.card.sample.index')); } - getWorkerEmail() { + setClientSample(client) { const userId = window.localStorage.currentUserWorkerId; const params = {filter: {where: {userFk: userId}}}; this.$http.get('EmailUsers', params).then(res => { const [worker] = res && res.data; - this.clientSample.replyTo = worker.email; + this.clientSample = { + clientFk: this.$params.id, + companyId: this.vnConfig.companyFk, + recipient: client.email, + replyTo: worker.email + }; }); } } diff --git a/modules/client/front/sample/create/index.spec.js b/modules/client/front/sample/create/index.spec.js index 8e33a1075..ecaf038fa 100644 --- a/modules/client/front/sample/create/index.spec.js +++ b/modules/client/front/sample/create/index.spec.js @@ -191,15 +191,19 @@ describe('Client', () => { }); }); - describe('getWorkerEmail()', () => { + describe('setClientSample()', () => { it(`should perform a query and then set the replyTo property to the clientSample object`, () => { + const client = {email: 'test@example.com'}; const expectedEmail = 'batman@arkhamcity.com'; const serializedParams = $httpParamSerializer({filter: {where: {}}}); $httpBackend.expect('GET', `EmailUsers?${serializedParams}`).respond([{email: expectedEmail}]); - controller.getWorkerEmail(); + controller.setClientSample(client); $httpBackend.flush(); expect(controller.clientSample.replyTo).toEqual(expectedEmail); + expect(controller.clientSample.clientFk).toEqual(controller.$params.id); + expect(controller.clientSample.recipient).toEqual(client.email); + expect(controller.clientSample.companyId).toEqual(controller.vnConfig.companyFk); }); }); }); diff --git a/modules/client/front/unpaid/index.html b/modules/client/front/unpaid/index.html index 5f6edfe10..2a0432f5a 100644 --- a/modules/client/front/unpaid/index.html +++ b/modules/client/front/unpaid/index.html @@ -9,12 +9,12 @@ -
\ No newline at end of file
+' + + this.$t(`Unpaid Dated`, {dated: this.client.unpaid.dated}) + '
' + + this.$t(`Unpaid Amount`, {amount: this.client.unpaid.amount}); + } } ngModule.vnComponent('vnClientDescriptor', { diff --git a/modules/client/front/descriptor/locale/es.yml b/modules/client/front/descriptor/locale/es.yml index 71723e654..85ae5b4a6 100644 --- a/modules/client/front/descriptor/locale/es.yml +++ b/modules/client/front/descriptor/locale/es.yml @@ -5,4 +5,6 @@ To date: Fecha hasta Go to user: Ir al usuario Go to supplier: Ir al proveedor Client invoices list: Listado de facturas del cliente -Pay method: Forma de pago \ No newline at end of file +Pay method: Forma de pago +Unpaid Dated: "Fecha: {{dated | date:'dd/MM/yyyy'}}" +Unpaid Amount: "Importe: {{amount | currency: 'EUR':2}}" diff --git a/modules/client/front/fiscal-data/index.js b/modules/client/front/fiscal-data/index.js index d76944c42..acad38185 100644 --- a/modules/client/front/fiscal-data/index.js +++ b/modules/client/front/fiscal-data/index.js @@ -2,6 +2,10 @@ import ngModule from '../module'; import Section from 'salix/components/section'; export default class Controller extends Section { + $onInit() { + this.card.reload(); + } + onSubmit() { const orgData = this.$.watcher.orgData; delete this.client.despiteOfClient; diff --git a/modules/client/front/locale/es.yml b/modules/client/front/locale/es.yml index de4b91e0b..adbca8dbf 100644 --- a/modules/client/front/locale/es.yml +++ b/modules/client/front/locale/es.yml @@ -63,4 +63,4 @@ Consumption: Consumo Compensation Account: Cuenta para compensar Amount to return: Cantidad a devolver Delivered amount: Cantidad entregada -Unpaid: Impagado \ No newline at end of file +Unpaid: Impagado diff --git a/modules/client/front/sample/create/index.js b/modules/client/front/sample/create/index.js index 13ef875da..b25bf7919 100644 --- a/modules/client/front/sample/create/index.js +++ b/modules/client/front/sample/create/index.js @@ -5,10 +5,6 @@ import './style.scss'; class Controller extends Section { constructor($element, $, vnEmail) { super($element, $); - this.clientSample = { - clientFk: this.$params.id, - companyId: this.vnConfig.companyFk - }; this.vnEmail = vnEmail; } @@ -19,10 +15,8 @@ class Controller extends Section { set client(value) { this._client = value; - if (value) { - this.clientSample.recipient = value.email; - this.getWorkerEmail(); - } + if (value) + this.setClientSample(value); } get companyId() { @@ -119,12 +113,17 @@ class Controller extends Section { .then(() => this.$state.go('client.card.sample.index')); } - getWorkerEmail() { + setClientSample(client) { const userId = window.localStorage.currentUserWorkerId; const params = {filter: {where: {userFk: userId}}}; this.$http.get('EmailUsers', params).then(res => { const [worker] = res && res.data; - this.clientSample.replyTo = worker.email; + this.clientSample = { + clientFk: this.$params.id, + companyId: this.vnConfig.companyFk, + recipient: client.email, + replyTo: worker.email + }; }); } } diff --git a/modules/client/front/sample/create/index.spec.js b/modules/client/front/sample/create/index.spec.js index 8e33a1075..ecaf038fa 100644 --- a/modules/client/front/sample/create/index.spec.js +++ b/modules/client/front/sample/create/index.spec.js @@ -191,15 +191,19 @@ describe('Client', () => { }); }); - describe('getWorkerEmail()', () => { + describe('setClientSample()', () => { it(`should perform a query and then set the replyTo property to the clientSample object`, () => { + const client = {email: 'test@example.com'}; const expectedEmail = 'batman@arkhamcity.com'; const serializedParams = $httpParamSerializer({filter: {where: {}}}); $httpBackend.expect('GET', `EmailUsers?${serializedParams}`).respond([{email: expectedEmail}]); - controller.getWorkerEmail(); + controller.setClientSample(client); $httpBackend.flush(); expect(controller.clientSample.replyTo).toEqual(expectedEmail); + expect(controller.clientSample.clientFk).toEqual(controller.$params.id); + expect(controller.clientSample.recipient).toEqual(client.email); + expect(controller.clientSample.companyId).toEqual(controller.vnConfig.companyFk); }); }); }); diff --git a/modules/client/front/unpaid/index.html b/modules/client/front/unpaid/index.html index 5f6edfe10..2a0432f5a 100644 --- a/modules/client/front/unpaid/index.html +++ b/modules/client/front/unpaid/index.html @@ -9,12 +9,12 @@ -
| + Company + | ++ Country + | ++ Id Client + | ++ Client + | ++ Amount + | ++ Base + | ++ Id Ticket + | ++ Active + | ++ Has To Invoice + | ++ Verified data + | ++ Comercial + | +
|---|---|---|---|---|---|---|---|---|---|---|
| {{client.company | dashIfEmpty}} | +{{client.country | dashIfEmpty}} | +
+ |
+ {{client.clientSocialName | dashIfEmpty}} | +{{client.amount | currency: 'EUR':2 | dashIfEmpty}} | +{{client.taxableBase | dashIfEmpty}} | +
+ |
+
+ |
+
+ |
+
+ |
+
+ |
+
+
+ {{$ctrl.$t('Serial')}}: {{$ctrl.filter.serial}}
+
+
+'; - - body += `ID: ${failedClient.id} -
${failedClient.stacktrace}
`; - - await Self.rawSql(` - INSERT INTO vn.mail (sender, replyTo, sent, subject, body) - VALUES (?, ?, FALSE, ?, ?)`, [ - worker.email, - worker.email, - subject, - body - ], options); + return supplierCompany && supplierCompany.isSpanishCompany; } }; diff --git a/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js b/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js new file mode 100644 index 000000000..941d31596 --- /dev/null +++ b/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js @@ -0,0 +1,50 @@ +const {Report} = require('vn-print'); + +module.exports = Self => { + Self.remoteMethodCtx('invoiceOutPdf', { + description: 'Returns the invoice pdf', + accessType: 'READ', + accepts: [ + { + arg: 'reference', + type: 'string', + required: true, + description: 'The invoice reference', + http: {source: 'path'} + } + ], + returns: [ + { + arg: 'body', + type: 'file', + root: true + }, { + arg: 'Content-Type', + type: 'String', + http: {target: 'header'} + }, { + arg: 'Content-Disposition', + type: 'String', + http: {target: 'header'} + } + ], + http: { + path: '/:reference/invoice-out-pdf', + verb: 'GET' + } + }); + + Self.invoiceOutPdf = async(ctx, reference) => { + const args = Object.assign({}, ctx.args); + const params = {lang: ctx.req.getLocale()}; + + delete args.ctx; + for (const param in args) + params[param] = args[param]; + + const report = new Report('invoice', params); + const stream = await report.toPdfStream(); + + return [stream, 'application/pdf', `filename="doc-${reference}.pdf"`]; + }; +}; diff --git a/modules/invoiceOut/back/methods/invoiceOut/refund.js b/modules/invoiceOut/back/methods/invoiceOut/refund.js index 7ad6b03ec..ba1fdfedd 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/refund.js +++ b/modules/invoiceOut/back/methods/invoiceOut/refund.js @@ -35,8 +35,7 @@ module.exports = Self => { const tickets = await models.Ticket.find(filter, myOptions); const ticketsIds = tickets.map(ticket => ticket.id); - - const refundedTickets = await models.Ticket.refund(ticketsIds, myOptions); + const refundedTickets = await models.Ticket.refund(ticketsIds, true, myOptions); if (tx) await tx.commit(); diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js index 26eae45ac..803338ef3 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js @@ -11,7 +11,6 @@ describe('InvoiceOut createPdf()', () => { const ctx = {req: activeCtx}; it('should create a new PDF file and set true the hasPdf property', async() => { - pending('https://redmine.verdnatura.es/issues/5035'); const invoiceId = 1; spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ active: activeCtx diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/downloadZip.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/downloadZip.spec.js deleted file mode 100644 index 0f62a6876..000000000 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/downloadZip.spec.js +++ /dev/null @@ -1,55 +0,0 @@ -const models = require('vn-loopback/server/server').models; -const UserError = require('vn-loopback/util/user-error'); - -describe('InvoiceOut downloadZip()', () => { - const userId = 9; - const invoiceIds = '1,2'; - const ctx = { - req: { - - accessToken: {userId: userId}, - headers: {origin: 'http://localhost:5000'}, - } - }; - - it('should return part of link to dowloand the zip', async() => { - const tx = await models.InvoiceOut.beginTransaction({}); - - try { - const options = {transaction: tx}; - - const result = await models.InvoiceOut.downloadZip(ctx, invoiceIds, options); - - expect(result).toBeDefined(); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should return an error if the size of the files is too large', async() => { - pending('https://redmine.verdnatura.es/issues/5035'); - - const tx = await models.InvoiceOut.beginTransaction({}); - - let error; - try { - const options = {transaction: tx}; - const zipConfig = { - maxSize: 0 - }; - await models.ZipConfig.create(zipConfig, options); - - await models.InvoiceOut.downloadZip(ctx, invoiceIds, options); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - error = e; - } - - expect(error).toEqual(new UserError(`Files are too large`)); - }); -}); diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js index d3d789393..15e3e887e 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js @@ -66,7 +66,7 @@ describe('InvoiceOut filter()', () => { const result = await models.InvoiceOut.filter(ctx, {id: invoiceOut.id}, options); - expect(result.length).toBeGreaterThanOrEqual(1); + expect(result.length).toEqual(1); await tx.rollback(); } catch (e) { diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js index 628318d42..c5a1ac603 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js @@ -17,7 +17,7 @@ describe('InvoiceOut refund()', () => { try { const result = await models.InvoiceOut.refund('T1111111', options); - expect(result.length).toEqual(2); + expect(result.length).toEqual(1); await tx.rollback(); } catch (e) { diff --git a/modules/invoiceOut/back/model-config.json b/modules/invoiceOut/back/model-config.json index 04933c4f0..b190126ea 100644 --- a/modules/invoiceOut/back/model-config.json +++ b/modules/invoiceOut/back/model-config.json @@ -8,6 +8,9 @@ "InvoiceContainer": { "dataSource": "invoiceStorage" }, + "Printer": { + "dataSource": "vn" + }, "TaxArea": { "dataSource": "vn" }, diff --git a/modules/invoiceOut/back/models/invoice-out.js b/modules/invoiceOut/back/models/invoice-out.js index 88adae2ef..6205abe7b 100644 --- a/modules/invoiceOut/back/models/invoice-out.js +++ b/modules/invoiceOut/back/models/invoice-out.js @@ -15,4 +15,6 @@ module.exports = Self => { require('../methods/invoiceOut/exportationPdf')(Self); require('../methods/invoiceOut/invoiceCsv')(Self); require('../methods/invoiceOut/invoiceCsvEmail')(Self); + require('../methods/invoiceOut/invoiceOutPdf')(Self); + require('../methods/invoiceOut/getInvoiceDate')(Self); }; diff --git a/modules/invoiceOut/back/models/printer.json b/modules/invoiceOut/back/models/printer.json new file mode 100644 index 000000000..99003560d --- /dev/null +++ b/modules/invoiceOut/back/models/printer.json @@ -0,0 +1,28 @@ +{ + "name": "Printer", + "base": "VnModel", + "options": { + "mysql": { + "table": "printer" + } + }, + "properties": { + "id": { + "type": "number", + "id": true, + "description": "Identifier" + }, + "name": { + "type": "string" + }, + "isLabeler": { + "type": "boolean" + } + }, + "acls": [{ + "accessType": "READ", + "principalType": "ROLE", + "principalId": "$everyone", + "permission": "ALLOW" + }] +} diff --git a/modules/invoiceOut/front/descriptor/index.html b/modules/invoiceOut/front/descriptor/index.html index 92f0b9de5..e1dc579ab 100644 --- a/modules/invoiceOut/front/descriptor/index.html +++ b/modules/invoiceOut/front/descriptor/index.html @@ -3,7 +3,7 @@ description="$ctrl.invoiceOut.ref" summary="$ctrl.$.summary">
+
+
+
+ Build packaging tickets
+
+
+ {{'Invoicing client' | translate}} {{$ctrl.currentAddress.clientId}}
+
+
+ Stopping process
+
+
+ Ended process
+
+
+
+ {{$ctrl.percentage | percentage: 0}} ({{$ctrl.addressNumber}} {{'of' | translate}} {{$ctrl.nAddresses}})
+
+
-
-
-
-
- {{'Calculating packages to invoice...' | translate}}
-
-
-
-
-
-
- {{'Id Client' | translate}}: {{$ctrl.currentClientId}}
- {{'of' | translate}} {{::$ctrl.lastClientId}}
-
-
-
-
-
-
-
-
- Manual invoicing
-
-
- Global invoicing
-
-
-
+
+
{{$ctrl.available | dashIfEmpty}}
+
+
|
+ |
Item ID | Description | -- Warehouse - | Grouping price @@ -57,13 +66,24 @@ | Ended | ++ Warehouse + | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
+ |
{{price.subName}}@@ -100,18 +120,11 @@ tabindex="-1"> |
-
- |
|
|
- |
- |
+
+ |
|
+
++ {{::$ctrl.$t('Package')}}: {{::entry.packageValue | currency: 'EUR':3 | dashIfEmpty}} + {{::$ctrl.$t('Freight')}}: {{::entry.freightValue | currency: 'EUR':3 | dashIfEmpty}} + {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue | currency: 'EUR':3 | dashIfEmpty}}"> + {{::entry.cost | currency: 'EUR':3 | dashIfEmpty}} Available {{$ctrl.summary.available}}
+ - Basic dataBasic data- Other dataOther data-- Tags-Tags @@ -119,14 +138,14 @@- DescriptionDescription@@ -136,13 +155,13 @@- Tax-Tax @@ -154,33 +173,33 @@- Botanical-Botanical-- Barcode-Barcode @@ -191,6 +210,6 @@
|
Zone
|
@@ -80,7 +81,7 @@
+ |
|
- | Origin |
Destination |
+ Origin |
@@ -45,31 +45,7 @@
|
|
-
- ID
- |
-
- Date
- |
-
- IPT
- |
-
- State
- |
-
- Liters
- |
-
- Stock
- |
-
- Lines
- |
-
- Import
- |
-
+ |
ID
|
@@ -90,6 +66,30 @@
|
Import
|
+
+ ID
+ |
+
+ Date
+ |
+
+ IPT
+ |
+
+ State
+ |
+
+ Liters
+ |
+
+ Not Movable
+ |
+
+ Lines
+ |
+
+ Import
+ |
-
- {{::ticket.futureId | dashIfEmpty}}
-
- |
-
-
- {{::ticket.futureShipped | date: 'dd/MM/yyyy'}}
-
- |
- {{::ticket.futureIpt | dashIfEmpty}} |
-
-
- {{::ticket.futureState | dashIfEmpty}}
-
- |
- {{::ticket.futureLiters | dashIfEmpty}} |
- {{::ticket.hasStock | dashIfEmpty}} |
- {{::ticket.futureLines | dashIfEmpty}} |
-
-
- {{::(ticket.futureTotalWithVat ? ticket.futureTotalWithVat : 0) | currency: 'EUR': 2}}
-
- |
{{::ticket.liters | dashIfEmpty}} |
{{::ticket.lines | dashIfEmpty}} |
-
+
{{::(ticket.totalWithVat ? ticket.totalWithVat : 0) | currency: 'EUR': 2}}
|
+
+
+ {{::ticket.futureId | dashIfEmpty}}
+
+ |
+
+
+ {{::ticket.futureShipped | date: 'dd/MM/yyyy'}}
+
+ |
+ {{::ticket.futureIpt | dashIfEmpty}} |
+
+
+ {{::ticket.futureState | dashIfEmpty}}
+
+ |
+ {{::ticket.futureLiters | dashIfEmpty}} |
+ {{::ticket.notMovableLines | dashIfEmpty}} |
+ {{::ticket.futureLines | dashIfEmpty}} |
+
+
+ {{::(ticket.futureTotalWithVat ? ticket.futureTotalWithVat : 0) | currency: 'EUR': 2}}
+
+ |
+
| ||||||||||||||||||||||
' + this.$t(`Destination agency`, {agency: agency}); + '\n' + this.$t(`Destination agency`, {agency: agency}); } moveTicketsAdvance() { @@ -171,15 +177,25 @@ export default class Controller extends Section { case 'futureLines': return {'futureLines': value}; case 'ipt': - return {'ipt': value}; + return {or: + [ + {'ipt': {like: `%${value}%`}}, + {'ipt': null} + ] + }; case 'futureIpt': - return {'futureIpt': value}; + return {or: + [ + {'futureIpt': {like: `%${value}%`}}, + {'futureIpt': null} + ] + }; case 'totalWithVat': return {'totalWithVat': value}; case 'futureTotalWithVat': return {'futureTotalWithVat': value}; - case 'hasStock': - return {'hasStock': value}; + case 'notMovableLines': + return {'notMovableLines': value}; } } } diff --git a/modules/ticket/front/advance/locale/es.yml b/modules/ticket/front/advance/locale/es.yml index da22cd433..3111d9afd 100644 --- a/modules/ticket/front/advance/locale/es.yml +++ b/modules/ticket/front/advance/locale/es.yml @@ -7,3 +7,5 @@ Liters: Litros Item Packing Type: Encajado Origin agency: "Agencia origen: {{agency}}" Destination agency: "Agencia destino: {{agency}}" +Less than 50€: Menor a 50€ +Not Movable: No movibles diff --git a/modules/ticket/front/basic-data/step-two/index.html b/modules/ticket/front/basic-data/step-two/index.html index 6be455fc9..fc57a354a 100644 --- a/modules/ticket/front/basic-data/step-two/index.html +++ b/modules/ticket/front/basic-data/step-two/index.html @@ -23,7 +23,7 @@ title="{{::sale.item.name}}" vn-click-stop="itemDescriptor.show($event, sale.itemFk, sale.id)" class="link"> - {{::sale.itemFk | zeroFill:6}} + {{::sale.itemFk}}
- Price {{$ctrl.totalPrice | currency: 'EUR': 2}}
New price {{$ctrl.totalNewPrice | currency: 'EUR': 2}}
Difference {{$ctrl.totalPriceDifference | currency: 'EUR': 2}}
Total
+Total
-
Charge difference to
+Charge difference to
-
@@ -95,4 +95,10 @@
warehouse-fk="$ctrl.ticket.warehouseFk"
ticket-fk="$ctrl.ticket.id">
+
+
diff --git a/modules/ticket/front/basic-data/step-two/index.js b/modules/ticket/front/basic-data/step-two/index.js
index 4ac9f292e..74e2df074 100644
--- a/modules/ticket/front/basic-data/step-two/index.js
+++ b/modules/ticket/front/basic-data/step-two/index.js
@@ -83,6 +83,17 @@ class Controller extends Component {
}
onSubmit() {
+ if (this.haveNegatives && !this.ticket.withoutNegatives)
+ this.$.negativesConfirm.show();
+ else this.applyChanges();
+ }
+
+ onConfirmAccept() {
+ this.ticket.withWarningAccept = true;
+ this.applyChanges();
+ }
+
+ applyChanges() {
if (!this.ticket.option) {
return this.vnApp.showError(
this.$t('Choose an option')
@@ -102,7 +113,8 @@ class Controller extends Component {
landed: this.ticket.landed,
isDeleted: this.ticket.isDeleted,
option: parseInt(this.ticket.option),
- isWithoutNegatives: this.ticket.withoutNegatives
+ isWithoutNegatives: this.ticket.withoutNegatives,
+ withWarningAccept: this.ticket.withWarningAccept
};
this.$http.post(query, params)
diff --git a/modules/ticket/front/basic-data/step-two/locale/es.yml b/modules/ticket/front/basic-data/step-two/locale/es.yml
index e1f1e0bfc..71f893e1e 100644
--- a/modules/ticket/front/basic-data/step-two/locale/es.yml
+++ b/modules/ticket/front/basic-data/step-two/locale/es.yml
@@ -8,4 +8,6 @@ New price: Nuevo precio
Price difference: Diferencia de precio
Create without negatives: Crear sin negativos
Clone this ticket with the changes and only sales availables: Clona este ticket con los cambios y solo las ventas disponibles.
-Movable: Movible
\ No newline at end of file
+Movable: Movible
+Negatives are going to be generated, are you sure you want to advance all the lines?: Se van a generar negativos, ¿seguro que quieres adelantar todas las líneas?
+Edit basic data: Editar datos básicos
diff --git a/modules/ticket/front/component/index.html b/modules/ticket/front/component/index.html
index 1236059ae..39b54b461 100644
--- a/modules/ticket/front/component/index.html
+++ b/modules/ticket/front/component/index.html
@@ -27,7 +27,7 @@
- {{sale.itemFk | zeroFill:6}}
+ {{sale.itemFk}}
-
-
\ No newline at end of file
+
+
+ Id/{{$ctrl.$t('Reference')}}: {{$ctrl.filter.search}}
+
+
+ {{$ctrl.$t('Agency')}}: {{agency.selection.name}}
+
+
+ {{$ctrl.$t('Warehouse Out')}}: {{warehouseOut.selection.name}}
+
+
+ {{$ctrl.$t('Warehouse In')}}: {{warehouseIn.selection.name}}
+
+
+ {{$ctrl.$t('Days onward')}}: {{$ctrl.filter.scopeDays}}
+
+
+ {{$ctrl.$t('Landed from')}}: {{$ctrl.filter.landedFrom | date:'dd/MM/yyyy'}}
+
+
+ {{$ctrl.$t('Landed to')}}: {{$ctrl.filter.landedTo | date:'dd/MM/yyyy'}}
+
+
+ {{$ctrl.$t('Continent Out')}}: {{continent.selection.name}}
+
+
+ {{$ctrl.$t('Total entries')}}: {{$ctrl.filter.totalEntries}}
+
+
+', w.id, ' ', w.firstName, ' ', w.lastName))) + FROM tmp.timeControlError tce + JOIN vn.workerTimeControl wtc ON wtc.id = tce.id + JOIN worker w ON w.id = wtc.userFK + JOIN account.user u ON u.id = w.bossFk + GROUP BY w.bossFk`, [args.week, args.year]); + stmts.push(stmt); + stmt = new ParameterizedSQL(` SELECT CONCAT(u.name, '@verdnatura.es') receiver, u.id workerFk, @@ -131,20 +151,16 @@ module.exports = Self => { JOIN business b ON b.id = tb.businessFk LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = tb.userFk AND tc.dated = tb.dated LEFT JOIN worker w ON w.id = u.id - JOIN (SELECT tb.userFk, - SUM(IF(tb.type IS NULL, - IF(tc.timeWorkDecimal > 0, FALSE, IF(tb.timeWorkDecimal > 0, TRUE, FALSE)), - TRUE))isTeleworkingWeek - FROM tmp.timeBusinessCalculate tb - LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = tb.userFk - AND tc.dated = tb.dated - GROUP BY tb.userFk - HAVING isTeleworkingWeek > 0 - )sub ON sub.userFk = u.id - WHERE d.hasToRefill + LEFT JOIN ( + SELECT DISTINCT wtc.userFk + FROM tmp.timeControlError tce + JOIN vn.workerTimeControl wtc ON wtc.id = tce.id + )sub ON sub.userFk = tb.userFk + WHERE sub.userFK IS NULL AND IFNULL(?, u.id) = u.id AND b.companyCodeFk = 'VNL' AND w.businessFk + AND d.isTeleworking ORDER BY u.id, tb.dated `, [args.workerId]); const index = stmts.push(stmt) - 1; @@ -332,17 +348,18 @@ module.exports = Self => { const lastDay = days[index][days[index].length - 1]; if (day.workerFk != previousWorkerFk || day == lastDay) { - const salix = await models.Url.findOne({ - where: { - appName: 'salix', - environment: process.env.NODE_ENV || 'dev' - } - }, myOptions); + const query = `INSERT IGNORE INTO workerTimeControlMail (workerFk, year, week) + VALUES(?, ?, ?);`; + await Self.rawSql(query, [previousWorkerFk, args.year, args.week]); - const timestamp = started.getTime() / 1000; - const url = `${salix.url}worker/${previousWorkerFk}/time-control?timestamp=${timestamp}`; - - await models.WorkerTimeControl.weeklyHourRecordEmail(ctx, previousReceiver, args.week, args.year, url); + ctx.args = { + recipient: previousReceiver, + year: args.year, + week: args.week, + workerId: previousWorkerFk, + state: 'SENDED' + }; + await models.WorkerTimeControl.weeklyHourRecordEmail(ctx, myOptions); previousWorkerFk = day.workerFk; previousReceiver = day.receiver; diff --git a/modules/worker/back/methods/worker-time-control/specs/getMailStates.spec.js b/modules/worker/back/methods/worker-time-control/specs/getMailStates.spec.js new file mode 100644 index 000000000..cbad32323 --- /dev/null +++ b/modules/worker/back/methods/worker-time-control/specs/getMailStates.spec.js @@ -0,0 +1,29 @@ +const models = require('vn-loopback/server/server').models; + +describe('workerTimeControl getMailStates()', () => { + const workerId = 9; + const ctx = {args: { + month: 12, + year: 2000 + }}; + + it('should get the states of a month about time control mail', async() => { + const tx = await models.WorkerTimeControl.beginTransaction({}); + + try { + const options = {transaction: tx}; + + const response = await models.WorkerTimeControl.getMailStates(ctx, workerId, options); + + expect(response[0].state).toEqual('REVISE'); + expect(response[1].state).toEqual('SENDED'); + expect(response[2].state).toEqual('CONFIRMED'); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); +}); + diff --git a/modules/worker/back/methods/worker-time-control/specs/sendMail.spec.js b/modules/worker/back/methods/worker-time-control/specs/sendMail.spec.js deleted file mode 100644 index 24bfd6904..000000000 --- a/modules/worker/back/methods/worker-time-control/specs/sendMail.spec.js +++ /dev/null @@ -1,120 +0,0 @@ -const models = require('vn-loopback/server/server').models; - -describe('workerTimeControl sendMail()', () => { - const workerId = 18; - const activeCtx = { - getLocale: () => { - return 'en'; - } - }; - const ctx = {req: activeCtx, args: {}}; - - it('should fill time control of a worker without records in Journey and with rest', async() => { - const tx = await models.WorkerTimeControl.beginTransaction({}); - - try { - const options = {transaction: tx}; - - await models.WorkerTimeControl.sendMail(ctx, options); - - const workerTimeControl = await models.WorkerTimeControl.find({ - where: {userFk: workerId} - }, options); - - expect(workerTimeControl[0].timed.getHours()).toEqual(8); - expect(workerTimeControl[1].timed.getHours()).toEqual(9); - expect(`${workerTimeControl[2].timed.getHours()}:${workerTimeControl[2].timed.getMinutes()}`).toEqual('9:20'); - expect(workerTimeControl[3].timed.getHours()).toEqual(16); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should fill time control of a worker without records in Journey and without rest', async() => { - const workdayOf20Hours = 3; - const tx = await models.WorkerTimeControl.beginTransaction({}); - - try { - const options = {transaction: tx}; - query = `UPDATE business b - SET b.calendarTypeFk = ? - WHERE b.workerFk = ?; `; - await models.WorkerTimeControl.rawSql(query, [workdayOf20Hours, workerId], options); - - await models.WorkerTimeControl.sendMail(ctx, options); - - const workerTimeControl = await models.WorkerTimeControl.find({ - where: {userFk: workerId} - }, options); - - expect(workerTimeControl[0].timed.getHours()).toEqual(8); - expect(workerTimeControl[1].timed.getHours()).toEqual(12); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should fill time control of a worker with records in Journey and with rest', async() => { - const tx = await models.WorkerTimeControl.beginTransaction({}); - - try { - const options = {transaction: tx}; - query = `INSERT INTO postgresql.journey(journey_id, day_id, start, end, business_id) - VALUES - (1, 1, '09:00:00', '13:00:00', ?), - (2, 1, '14:00:00', '19:00:00', ?);`; - await models.WorkerTimeControl.rawSql(query, [workerId, workerId, workerId], options); - - await models.WorkerTimeControl.sendMail(ctx, options); - - const workerTimeControl = await models.WorkerTimeControl.find({ - where: {userFk: workerId} - }, options); - - expect(workerTimeControl[0].timed.getHours()).toEqual(9); - expect(workerTimeControl[2].timed.getHours()).toEqual(10); - expect(`${workerTimeControl[3].timed.getHours()}:${workerTimeControl[3].timed.getMinutes()}`).toEqual('10:20'); - expect(workerTimeControl[1].timed.getHours()).toEqual(13); - expect(workerTimeControl[4].timed.getHours()).toEqual(14); - expect(workerTimeControl[5].timed.getHours()).toEqual(19); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should fill time control of a worker with records in Journey and without rest', async() => { - const tx = await models.WorkerTimeControl.beginTransaction({}); - - try { - const options = {transaction: tx}; - query = `INSERT INTO postgresql.journey(journey_id, day_id, start, end, business_id) - VALUES - (1, 1, '12:30:00', '14:00:00', ?);`; - await models.WorkerTimeControl.rawSql(query, [workerId, workerId, workerId], options); - - await models.WorkerTimeControl.sendMail(ctx, options); - - const workerTimeControl = await models.WorkerTimeControl.find({ - where: {userFk: workerId} - }, options); - - expect(`${workerTimeControl[0].timed.getHours()}:${workerTimeControl[0].timed.getMinutes()}`).toEqual('12:30'); - expect(workerTimeControl[1].timed.getHours()).toEqual(14); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); -}); - diff --git a/modules/worker/back/methods/worker-time-control/updateTimeEntry.js b/modules/worker/back/methods/worker-time-control/updateTimeEntry.js index a99a61770..83349ea63 100644 --- a/modules/worker/back/methods/worker-time-control/updateTimeEntry.js +++ b/modules/worker/back/methods/worker-time-control/updateTimeEntry.js @@ -46,8 +46,12 @@ module.exports = Self => { if (notAllowed) throw new UserError(`You don't have enough privileges`); - return targetTimeEntry.updateAttributes({ + const timeEntryUpdated = await targetTimeEntry.updateAttributes({ direction: args.direction }, myOptions); + + await models.WorkerTimeControl.resendWeeklyHourEmail(ctx, targetTimeEntry.userFk, targetTimeEntry.timed, myOptions); + + return timeEntryUpdated; }; }; diff --git a/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js b/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js index a8dc14bb1..6f794511f 100644 --- a/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js +++ b/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js @@ -60,13 +60,17 @@ module.exports = Self => { const oldState = workerTimeControlMail.state; const oldReason = workerTimeControlMail.reason; - if (oldState == args.state) throw new UserError('Already has this status'); - await workerTimeControlMail.updateAttributes({ state: args.state, reason: args.reason || null }, myOptions); + if (args.state == 'SENDED') { + await workerTimeControlMail.updateAttributes({ + sendedCounter: workerTimeControlMail.sendedCounter + 1 + }, myOptions); + } + const logRecord = { originFk: args.workerId, userFk: userId, diff --git a/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js b/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js index 6feadb936..f44080559 100644 --- a/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js +++ b/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('weeklyHourRecordEmail', { description: 'Sends the weekly hour record', @@ -22,7 +20,12 @@ module.exports = Self => { required: true }, { - arg: 'url', + arg: 'workerId', + type: 'number', + required: true + }, + { + arg: 'state', type: 'string', required: true } @@ -37,17 +40,48 @@ module.exports = Self => { } }); - Self.weeklyHourRecordEmail = async(ctx, recipient, week, year, url) => { - const params = { - recipient: recipient, - lang: ctx.req.getLocale(), - week: week, - year: year, - url: url - }; + Self.weeklyHourRecordEmail = async(ctx, options) => { + const models = Self.app.models; + const args = ctx.args; + const myOptions = {}; - const email = new Email('weekly-hour-record', params); + if (typeof options == 'object') + Object.assign(myOptions, options); - return email.send(); + const salix = await models.Url.findOne({ + where: { + appName: 'salix', + environment: process.env.NODE_ENV || 'dev' + } + }, myOptions); + + const dated = getMondayDateFromYearWeek(args.year, args.week); + const timestamp = dated.getTime() / 1000; + + const url = `${salix.url}worker/${args.workerId}/time-control?timestamp=${timestamp}`; + ctx.args.url = url; + + Self.sendTemplate(ctx, 'weekly-hour-record'); + + return models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, myOptions); }; + + function getMondayDateFromYearWeek(yearNumber, weekNumber) { + const yearStart = new Date(yearNumber, 0, 1); + const firstMonday = new Date(yearStart.getTime() + ((7 - yearStart.getDay() + 1) % 7) * 86400000); + const firstMondayWeekNumber = getWeekNumber(firstMonday); + + if (firstMondayWeekNumber > 1) + firstMonday.setDate(firstMonday.getDate() + 7); + + firstMonday.setDate(firstMonday.getDate() + (weekNumber - 1) * 7); + + return firstMonday; + } + + function getWeekNumber(date) { + const firstDayOfYear = new Date(date.getFullYear(), 0, 1); + const daysPassed = (date - firstDayOfYear) / 86400000; + return Math.ceil((daysPassed + firstDayOfYear.getDay() + 1) / 7); + } }; diff --git a/modules/worker/back/methods/worker/allocatePDA.js b/modules/worker/back/methods/worker/allocatePDA.js new file mode 100644 index 000000000..8d0d25d2d --- /dev/null +++ b/modules/worker/back/methods/worker/allocatePDA.js @@ -0,0 +1,66 @@ +const UserError = require('vn-loopback/util/user-error'); + +module.exports = Self => { + Self.remoteMethodCtx('allocatePDA', { + description: 'Deallocate the PDA of the worker', + accepts: [{ + arg: 'id', + type: 'number', + required: true, + description: 'The worker id', + http: {source: 'path'} + }, { + arg: 'pda', + type: 'number', + required: true, + description: 'The pda id' + }], + returns: { + type: ['object'], + root: true + }, + http: { + path: `/:id/allocatePDA`, + verb: 'POST' + } + }); + + Self.allocatePDA = async(ctx, options) => { + const models = Self.app.models; + const args = ctx.args; + let tx; + const myOptions = {}; + + if (typeof options == 'object') + Object.assign(myOptions, options); + + if (!myOptions.transaction) { + tx = await Self.beginTransaction({}); + myOptions.transaction = tx; + } + + try { + const pda = await models.DeviceProduction.findById(args.pda, myOptions); + if (pda.stateFk != 'idle') throw new UserError(`The PDA state is not idle`); + await pda.updateAttributes({stateFk: 'active'}, myOptions); + await models.DeviceProductionUser.create({ + deviceProductionFk: args.pda, + userFk: args.id, + created: new Date() + }, myOptions); + + if (tx) await tx.commit(); + + return { + deviceProductionFk: pda.id, + deviceProduction: { + modelFk: pda.modelFk, + serialNumber: pda.serialNumber + } + }; + } catch (e) { + if (tx) await tx.rollback(); + throw e; + } + }; +}; diff --git a/modules/worker/back/methods/worker/deallocatePDA.js b/modules/worker/back/methods/worker/deallocatePDA.js new file mode 100644 index 000000000..7fa7855d1 --- /dev/null +++ b/modules/worker/back/methods/worker/deallocatePDA.js @@ -0,0 +1,53 @@ +module.exports = Self => { + Self.remoteMethodCtx('deallocatePDA', { + description: 'Deallocate the worker\'s PDA', + accepts: [{ + arg: 'id', + type: 'number', + required: true, + description: 'The worker id', + http: {source: 'path'} + }, { + arg: 'pda', + type: 'number', + required: true, + description: 'The pda id' + }], + returns: { + type: ['object'], + root: true + }, + http: { + path: `/:id/deallocatePDA`, + verb: 'POST' + } + }); + + Self.deallocatePDA = async(ctx, options) => { + const models = Self.app.models; + const args = ctx.args; + let tx; + const myOptions = {}; + + if (typeof options == 'object') + Object.assign(myOptions, options); + + if (!myOptions.transaction) { + tx = await Self.beginTransaction({}); + myOptions.transaction = tx; + } + + try { + const pda = await models.DeviceProduction.findById(args.pda, myOptions); + await pda.updateAttributes({stateFk: 'idle'}, myOptions); + await models.DeviceProductionUser.destroyAll({userFk: args.id, deviceProductionFk: args.pda}, myOptions); + + if (tx) await tx.commit(); + + return pda; + } catch (e) { + if (tx) await tx.rollback(); + throw e; + } + }; +}; diff --git a/modules/worker/back/methods/worker/filter.js b/modules/worker/back/methods/worker/filter.js index d08b27a18..71a8da96f 100644 --- a/modules/worker/back/methods/worker/filter.js +++ b/modules/worker/back/methods/worker/filter.js @@ -13,55 +13,59 @@ module.exports = Self => { type: 'Object', description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string', http: {source: 'query'} - }, { - arg: 'tags', - type: ['Object'], - description: 'List of tags to filter with', - http: {source: 'query'} - }, { + }, + { arg: 'search', type: 'String', description: `If it's and integer searchs by id, otherwise it searchs by name`, http: {source: 'query'} - }, { + }, + { arg: 'id', type: 'Integer', description: 'The worker id', http: {source: 'query'} - }, { + }, + { arg: 'userFk', type: 'Integer', description: 'The user id', http: {source: 'query'} - }, { + }, + { arg: 'fi', type: 'String', description: 'The worker fi', http: {source: 'query'} - }, { + }, + { arg: 'departmentFk', type: 'Integer', description: 'The worker department id', http: {source: 'query'} - }, { + }, + { arg: 'extension', type: 'Integer', description: 'The worker extension id', http: {source: 'query'} - }, { + }, + { arg: 'firstName', type: 'String', description: 'The worker firstName', http: {source: 'query'} - }, { - arg: 'name', + }, + { + arg: 'lastName', type: 'String', - description: 'The worker name', + description: 'The worker lastName', http: {source: 'query'} - }, { - arg: 'nickname', + }, + { + arg: 'userName', type: 'String', - description: 'The worker nickname', + description: 'The worker user name', http: {source: 'query'} } ], @@ -93,10 +97,10 @@ module.exports = Self => { return {'w.id': value}; case 'userFk': return {'w.userFk': value}; - case 'name': - return {'w.lastName': {like: `%${value}%`}}; case 'firstName': return {'w.firstName': {like: `%${value}%`}}; + case 'lastName': + return {'w.lastName': {like: `%${value}%`}}; case 'extension': return {'p.extension': value}; case 'fi': diff --git a/modules/worker/back/methods/worker/specs/allocatePDA.spec.js b/modules/worker/back/methods/worker/specs/allocatePDA.spec.js new file mode 100644 index 000000000..5c80b6408 --- /dev/null +++ b/modules/worker/back/methods/worker/specs/allocatePDA.spec.js @@ -0,0 +1,46 @@ +const models = require('vn-loopback/server/server').models; + +describe('Worker allocatePDA()', () => { + it('should allocate a new worker\'s PDA', async() => { + const tx = await models.Worker.beginTransaction({}); + try { + const workerWithoutPDA = 1101; + const PDAWithIdleState = 4; + const options = {transaction: tx}; + const ctx = {args: {id: workerWithoutPDA, pda: PDAWithIdleState}}; + + await models.Worker.allocatePDA(ctx, options); + const deviceProduction = await models.DeviceProduction.findById(PDAWithIdleState, null, options); + const deviceProductionUser = await models.DeviceProductionUser + .findById(PDAWithIdleState, null, options); + + expect(deviceProduction.stateFk).toEqual('active'); + expect(deviceProductionUser).not.toBeNull(); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); + + it('should throw error trying to allocate a non idle PDA', async() => { + const tx = await models.Worker.beginTransaction({}); + let error; + try { + const workerWithoutPDA = 1101; + const PDAWithActiveState = 1; + const options = {transaction: tx}; + const ctx = {args: {id: workerWithoutPDA, pda: PDAWithActiveState}}; + + await models.Worker.allocatePDA(ctx, options); + + await tx.rollback(); + } catch (e) { + error = e; + await tx.rollback(); + } + + expect(error).toBeDefined(); + }); +}); diff --git a/modules/worker/back/methods/worker/specs/deallocatePDA.spec.js b/modules/worker/back/methods/worker/specs/deallocatePDA.spec.js new file mode 100644 index 000000000..bddd017cd --- /dev/null +++ b/modules/worker/back/methods/worker/specs/deallocatePDA.spec.js @@ -0,0 +1,26 @@ +const models = require('vn-loopback/server/server').models; + +describe('Worker deallocatePDA()', () => { + it('should deallocate a worker\'s PDA', async() => { + const tx = await models.Worker.beginTransaction({}); + try { + const workerWithPDA = 1; + const PDAWithActiveState = 1; + const options = {transaction: tx}; + const ctx = {args: {id: workerWithPDA, pda: PDAWithActiveState}}; + + await models.Worker.deallocatePDA(ctx, options); + const deviceProduction = await models.DeviceProduction.findById(PDAWithActiveState, null, options); + const deviceProductionUser = await models.DeviceProductionUser + .findById(PDAWithActiveState, null, options); + + expect(deviceProduction.stateFk).toEqual('idle'); + expect(deviceProductionUser).toBe(null); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); +}); diff --git a/modules/worker/back/methods/worker/specs/filter.spec.js b/modules/worker/back/methods/worker/specs/filter.spec.js index c1bc05ae8..2eb353576 100644 --- a/modules/worker/back/methods/worker/specs/filter.spec.js +++ b/modules/worker/back/methods/worker/specs/filter.spec.js @@ -16,7 +16,7 @@ describe('worker filter()', () => { }); it('should return 2 results filtering by name', async() => { - let result = await app.models.Worker.filter({args: {filter: {}, name: 'agency'}}); + let result = await app.models.Worker.filter({args: {filter: {}, firstName: 'agency'}}); expect(result.length).toEqual(2); expect(result[0].nickname).toEqual('agencyNick'); diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json index 7e03c8a23..145934700 100644 --- a/modules/worker/back/model-config.json +++ b/modules/worker/back/model-config.json @@ -20,6 +20,18 @@ "Device": { "dataSource": "vn" }, + "DeviceProduction": { + "dataSource": "vn" + }, + "DeviceProductionModels": { + "dataSource": "vn" + }, + "DeviceProductionState": { + "dataSource": "vn" + }, + "DeviceProductionUser": { + "dataSource": "vn" + }, "EducationLevel": { "dataSource": "vn" }, @@ -41,6 +53,9 @@ "Worker": { "dataSource": "vn" }, + "WorkerObservation": { + "dataSource": "vn" + }, "WorkerConfig": { "dataSource": "vn" }, @@ -82,6 +97,9 @@ }, "WorkerTimeControlMail": { "dataSource": "vn" + }, + "Operator": { + "dataSource": "vn" } } diff --git a/modules/worker/back/models/device-production-models.json b/modules/worker/back/models/device-production-models.json new file mode 100644 index 000000000..dcf447520 --- /dev/null +++ b/modules/worker/back/models/device-production-models.json @@ -0,0 +1,15 @@ +{ + "name": "DeviceProductionModels", + "base": "VnModel", + "options": { + "mysql": { + "table": "deviceProductionModels" + } + }, + "properties": { + "code": { + "type": "string", + "id": true + } + } +} diff --git a/modules/worker/back/models/device-production-state.json b/modules/worker/back/models/device-production-state.json new file mode 100644 index 000000000..32695621a --- /dev/null +++ b/modules/worker/back/models/device-production-state.json @@ -0,0 +1,18 @@ +{ + "name": "DeviceProductionState", + "base": "VnModel", + "options": { + "mysql": { + "table": "deviceProductionState" + } + }, + "properties": { + "code": { + "type": "string", + "id": true + }, + "description": { + "type": "string" + } + } +} diff --git a/modules/worker/back/models/device-production-user.json b/modules/worker/back/models/device-production-user.json new file mode 100644 index 000000000..568e79413 --- /dev/null +++ b/modules/worker/back/models/device-production-user.json @@ -0,0 +1,33 @@ +{ + "name": "DeviceProductionUser", + "base": "VnModel", + "options": { + "mysql": { + "table": "deviceProductionUser" + } + }, + "properties": { + "deviceProductionFk": { + "type": "number", + "id": true + }, + "userFk": { + "type": "number" + }, + "created": { + "type": "date" + } + }, + "relations": { + "deviceProduction": { + "type": "belongsTo", + "model": "DeviceProduction", + "foreignKey": "deviceProductionFk" + }, + "user": { + "type": "belongsTo", + "model": "User", + "foreignKey": "userFk" + } + } +} diff --git a/modules/worker/back/models/device-production.json b/modules/worker/back/models/device-production.json new file mode 100644 index 000000000..63672500b --- /dev/null +++ b/modules/worker/back/models/device-production.json @@ -0,0 +1,54 @@ +{ + "name": "DeviceProduction", + "base": "VnModel", + "options": { + "mysql": { + "table": "deviceProduction" + } + }, + "properties": { + "id": { + "type": "number", + "id": true + }, + "imei": { + "type": "string" + }, + "modelFk": { + "type": "number" + }, + "macWifi": { + "type" : "string" + }, + "serialNumber": { + "type" : "string" + }, + "android_id": { + "type" : "string" + }, + "purchased": { + "type" : "date" + }, + "stateFk": { + "type" : "string" + }, + "isInScaleFusion": { + "type" : "boolean" + }, + "description": { + "type" : "string" + } + }, + "relations": { + "model": { + "type": "belongsTo", + "model": "DeviceProductionModels", + "foreignKey": "modelFk" + }, + "state": { + "type": "belongsTo", + "model": "DeviceProductionState", + "foreignKey": "stateFk" + } + } +} diff --git a/modules/worker/back/models/operator.json b/modules/worker/back/models/operator.json new file mode 100644 index 000000000..db8a8c451 --- /dev/null +++ b/modules/worker/back/models/operator.json @@ -0,0 +1,44 @@ +{ + "name": "Operator", + "base": "VnModel", + "options": { + "mysql": { + "table": "operator" + } + }, + "properties": { + "workerFk": { + "id": true, + "type": "number", + "required": true + }, + "numberOfWagons": { + "type": "number" + }, + "trainFk": { + "type": "number", + "required": true + }, + "itemPackingTypeFk": { + "type": "string", + "required": true + }, + "warehouseFk": { + "type": "number", + "required": true + }, + "sectorFk ": { + "type": "number" + }, + "labelerFk ": { + "type": "number" + } + }, + "relations": { + "sector": { + "type": "belongsTo", + "model": "Sector", + "foreignKey": "sectorFk" + } + } +} \ No newline at end of file diff --git a/modules/worker/back/models/time.json b/modules/worker/back/models/time.json index df9257540..e2f1161d7 100644 --- a/modules/worker/back/models/time.json +++ b/modules/worker/back/models/time.json @@ -14,6 +14,9 @@ "year": { "type": "number" }, + "month": { + "type": "number" + }, "week": { "type": "number" } diff --git a/modules/worker/back/models/worker-observation.js b/modules/worker/back/models/worker-observation.js new file mode 100644 index 000000000..cccc2cfbd --- /dev/null +++ b/modules/worker/back/models/worker-observation.js @@ -0,0 +1,12 @@ +module.exports = function(Self) { + Self.validatesPresenceOf('text', { + message: 'Description cannot be blank' + }); + + Self.observe('before save', async function(ctx) { + ctx.instance.created = new Date(); + let token = ctx.options.accessToken; + let userId = token && token.userId; + ctx.instance.userFk = userId; + }); +}; diff --git a/modules/worker/back/models/worker-observation.json b/modules/worker/back/models/worker-observation.json new file mode 100644 index 000000000..90eb35837 --- /dev/null +++ b/modules/worker/back/models/worker-observation.json @@ -0,0 +1,39 @@ +{ + "name": "WorkerObservation", + "base": "VnModel", + "options": { + "mysql": { + "table": "workerObservation" + } + }, + "properties": { + "id": { + "id": true, + "type": "number" + }, + "workerFk": { + "type": "number" + }, + "userFk": { + "type": "number" + }, + "text": { + "type": "string" + }, + "created": { + "type": "date" + } + }, + "relations": { + "worker": { + "type": "belongsTo", + "model": "Worker", + "foreignKey": "workerFk" + }, + "user":{ + "type": "belongsTo", + "model": "Account", + "foreignKey": "userFk" + } + } +} diff --git a/modules/worker/back/models/worker-time-control-mail.json b/modules/worker/back/models/worker-time-control-mail.json index 78b99881d..87eae9217 100644 --- a/modules/worker/back/models/worker-time-control-mail.json +++ b/modules/worker/back/models/worker-time-control-mail.json @@ -28,6 +28,9 @@ }, "reason": { "type": "string" + }, + "sendedCounter": { + "type": "number" } }, "acls": [ diff --git a/modules/worker/back/models/worker-time-control.js b/modules/worker/back/models/worker-time-control.js index 7339f5d15..d5da680cf 100644 --- a/modules/worker/back/models/worker-time-control.js +++ b/modules/worker/back/models/worker-time-control.js @@ -8,6 +8,8 @@ module.exports = Self => { require('../methods/worker-time-control/sendMail')(Self); require('../methods/worker-time-control/updateWorkerTimeControlMail')(Self); require('../methods/worker-time-control/weeklyHourRecordEmail')(Self); + require('../methods/worker-time-control/getMailStates')(Self); + require('../methods/worker-time-control/resendWeeklyHourEmail')(Self); Self.rewriteDbError(function(err) { if (err.code === 'ER_DUP_ENTRY') diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js index e66259cd0..fa17640a8 100644 --- a/modules/worker/back/models/worker.js +++ b/modules/worker/back/models/worker.js @@ -14,4 +14,10 @@ module.exports = Self => { require('../methods/worker/holidays')(Self); require('../methods/worker/activeContract')(Self); require('../methods/worker/new')(Self); + require('../methods/worker/deallocatePDA')(Self); + require('../methods/worker/allocatePDA')(Self); + + Self.validatesUniquenessOf('locker', { + message: 'This locker has already been assigned' + }); }; diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json index e3a941dd3..d21094f26 100644 --- a/modules/worker/back/models/worker.json +++ b/modules/worker/back/models/worker.json @@ -55,6 +55,9 @@ }, "code": { "type" : "string" + }, + "locker": { + "type" : "number" } }, "relations": { diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html index 5a3acdde5..d89d88f2e 100644 --- a/modules/worker/front/basic-data/index.html +++ b/modules/worker/front/basic-data/index.html @@ -11,7 +11,7 @@
{{'Contract' | translate}} #{{$ctrl.businessId}}
- {{'Used' | translate}} {{$ctrl.contractHolidays.holidaysEnjoyed || 0}}
+ {{'Used' | translate}} {{$ctrl.contractHolidays.holidaysEnjoyed || 0}}
{{'of' | translate}} {{$ctrl.contractHolidays.totalHolidays || 0}} {{'days' | translate}}
- {{'Spent' | translate}} {{$ctrl.contractHolidays.hoursEnjoyed || 0}}
+ {{'Spent' | translate}} {{$ctrl.contractHolidays.hoursEnjoyed || 0}}
{{'of' | translate}} {{$ctrl.contractHolidays.totalHours || 0}} {{'hours' | translate}}
@@ -40,11 +40,11 @@
@@ -66,7 +66,7 @@
order="businessFk DESC"
limit="5">
-
- Festive
+ Festive
- Current day
+ Current day
{{'Year' | translate}} {{$ctrl.year}}
- {{'Used' | translate}} {{$ctrl.yearHolidays.holidaysEnjoyed || 0}}
+ {{'Used' | translate}} {{$ctrl.yearHolidays.holidaysEnjoyed || 0}}
{{'of' | translate}} {{$ctrl.yearHolidays.totalHolidays || 0}} {{'days' | translate}}
- {{'Spent' | translate}} {{$ctrl.yearHolidays.hoursEnjoyed || 0}}
+ {{'Spent' | translate}} {{$ctrl.yearHolidays.hoursEnjoyed || 0}}
{{'of' | translate}} {{$ctrl.yearHolidays.totalHours || 0}} {{'hours' | translate}}
#{{businessFk}}
+ #{{businessFk}}
{{started | date: 'dd/MM/yyyy'}} - {{ended ? (ended | date: 'dd/MM/yyyy') : 'Indef.'}}
@@ -87,17 +87,17 @@
+
+ {{::note.user.nickname}}
+ {{::note.created | date:'dd/MM/yyyy HH:mm'}}
+
+
+ {{::note.text}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/worker/front/pda/index.js b/modules/worker/front/pda/index.js
new file mode 100644
index 000000000..885261e5c
--- /dev/null
+++ b/modules/worker/front/pda/index.js
@@ -0,0 +1,53 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+import './style.scss';
+
+class Controller extends Section {
+ constructor($element, $) {
+ super($element, $);
+ const filter = {
+ where: {userFk: this.$params.id},
+ include: {relation: 'deviceProduction'}
+ };
+ this.$http.get('DeviceProductionUsers', {filter}).
+ then(res => {
+ if (res.data && res.data.length > 0)
+ this.setCurrentPDA(res.data[0]);
+ });
+ }
+
+ deallocatePDA() {
+ this.$http.post(`Workers/${this.$params.id}/deallocatePDA`, {pda: this.currentPDA.deviceProductionFk})
+ .then(() => {
+ this.vnApp.showSuccess(this.$t('PDA deallocated'));
+ delete this.currentPDA;
+ });
+ }
+
+ allocatePDA() {
+ this.$http.post(`Workers/${this.$params.id}/allocatePDA`, {pda: this.newPDA})
+ .then(res => {
+ if (res.data)
+ this.setCurrentPDA(res.data);
+
+ this.vnApp.showSuccess(this.$t('PDA allocated'));
+ delete this.newPDA;
+ });
+ }
+
+ setCurrentPDA(data) {
+ this.currentPDA = data;
+ this.currentPDA.description = [];
+ this.currentPDA.description.push(`ID: ${this.currentPDA.deviceProductionFk}`);
+ this.currentPDA.description.push(`${this.$t('Model')}: ${this.currentPDA.deviceProduction.modelFk}`);
+ this.currentPDA.description.push(`${this.$t('Serial Number')}: ${this.currentPDA.deviceProduction.serialNumber}`);
+ this.currentPDA.description = this.currentPDA.description.join(' ');
+ }
+}
+
+Controller.$inject = ['$element', '$scope'];
+
+ngModule.vnComponent('vnWorkerPda', {
+ template: require('./index.html'),
+ controller: Controller,
+});
diff --git a/modules/worker/front/pda/index.spec.js b/modules/worker/front/pda/index.spec.js
new file mode 100644
index 000000000..a0540af45
--- /dev/null
+++ b/modules/worker/front/pda/index.spec.js
@@ -0,0 +1,72 @@
+import './index';
+
+describe('Worker', () => {
+ describe('Component vnWorkerPda', () => {
+ let $httpBackend;
+ let $scope;
+ let $element;
+ let controller;
+
+ beforeEach(ngModule('worker'));
+
+ beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
+ $httpBackend = _$httpBackend_;
+ $scope = $rootScope.$new();
+ $element = angular.element('- Basic data
-Basic data
-User data
-Hours
-
+
+
+
{{$t('sections.QLabel.title')}}
-{{$t('sections.QLabel.description')}}:
+{{$t('sections.GoLabel.title')}}
+{{$t('sections.GoLabel.description')}}:
-
-
- +
{{$t('Agree') | uppercase}}
- {{$t('Date')}} {{formatDate(client.payed, '%d-%m-%Y')}} {{$t('Compensate')}} {{client.amountPaid}} € - {{$t('From client')}} {{client.name}} {{$t('Toclient')}} {{company.name}}. + {{$t('Date')}} {{formatDate(receipt.payed, '%d-%m-%Y')}} {{$t('Compensate')}} {{receipt.amountPaid}} € + {{$t('From client')}} {{client.name}} {{$t('Against the balance of')}}: {{receipt.description}}.
{{$t('Reception')}} administracion@verdnatura.es diff --git a/print/templates/reports/balance-compensation/balance-compensation.js b/print/templates/reports/balance-compensation/balance-compensation.js index bae7c5c3c..c2c2e9288 100644 --- a/print/templates/reports/balance-compensation/balance-compensation.js +++ b/print/templates/reports/balance-compensation/balance-compensation.js @@ -1,12 +1,31 @@ const vnReport = require('../../../core/mixins/vn-report.js'); +const app = require('vn-loopback/server/server'); module.exports = { name: 'balance-compensation', mixins: [vnReport], async serverPrefetch() { - this.client = await this.findOneFromDef('client', [this.id]); - this.checkMainEntity(this.client); - this.company = await this.findOneFromDef('company', [this.id]); + this.receipt = await app.models.Receipt.findOne({ + fields: ['amountPaid', 'payed', 'clientFk', 'companyFk', 'description'], + include: [ + { + relation: 'client', + scope: { + fields: ['name', 'street', 'fi', 'city'], + } + }, { + relation: 'supplier', + scope: { + fields: ['name', 'street', 'nif', 'city'], + } + } + ], + where: {id: this.id} + }); + this.client = this.receipt.client(); + this.company = this.receipt.supplier(); + + this.checkMainEntity(this.receipt); }, props: { id: { diff --git a/print/templates/reports/balance-compensation/locale/es.yml b/print/templates/reports/balance-compensation/locale/es.yml index 546e55f06..1c76274ae 100644 --- a/print/templates/reports/balance-compensation/locale/es.yml +++ b/print/templates/reports/balance-compensation/locale/es.yml @@ -4,13 +4,13 @@ Compensation: Compensación de saldos deudores y acreedores In one hand: De una parte CIF: con CIF NIF: con NIF -Home: y domicilio sito en +Home: y domicilio sito en In other hand: De la otra Sr: Don/Doña Agree: Acuerdan Date: En fecha de -Compensate: se ha compensado el saldo de +Compensate: se ha compensado el saldo de From client: del cliente/proveedor -To client: con el cliente/proveedor +Against the balance of: contra el saldo de Reception: Por favor, rogamos confirmen la recepción de esta compensación al email -Greetings: Saludos cordiales, \ No newline at end of file +Greetings: Saludos cordiales, diff --git a/print/templates/reports/balance-compensation/sql/client.sql b/print/templates/reports/balance-compensation/sql/client.sql deleted file mode 100644 index b4463be23..000000000 --- a/print/templates/reports/balance-compensation/sql/client.sql +++ /dev/null @@ -1,11 +0,0 @@ -SELECT - c.name, - c.socialName, - c.street, - c.fi, - c.city, - r.amountPaid, - r.payed - FROM client c - JOIN receipt r ON r.clientFk = c.id - WHERE r.id = ? diff --git a/print/templates/reports/balance-compensation/sql/company.sql b/print/templates/reports/balance-compensation/sql/company.sql deleted file mode 100644 index e61228a10..000000000 --- a/print/templates/reports/balance-compensation/sql/company.sql +++ /dev/null @@ -1,8 +0,0 @@ -SELECT - s.name, - s.nif, - s.street, - s.city - FROM supplier s - JOIN receipt r ON r.companyFk = s.id - WHERE r.id = ?; \ No newline at end of file diff --git a/print/templates/reports/campaign-metrics/campaign-metrics.html b/print/templates/reports/campaign-metrics/campaign-metrics.html index 57d616a29..ad60c511c 100644 --- a/print/templates/reports/campaign-metrics/campaign-metrics.html +++ b/print/templates/reports/campaign-metrics/campaign-metrics.html @@ -45,7 +45,7 @@
{{labelData.agencyDescription ? labelData.agencyDescription.toUpperCase() : '---'}}
{{getAgencyDescripton(labelData)}}
{{$t('deliveryAddress')}}
-
+
- {{sale.itemFk | zerofill('000000')}}
+ {{sale.itemFk}}
{{sale.quantity}}
{{sale.concept}}
{{sale.price | currency('EUR', $i18n.locale)}}
@@ -145,7 +145,7 @@
- {{packaging.itemFk | zerofill('000000')}}
+ {{packaging.itemFk}}
{{packaging.quantity}}
{{packaging.name}}
@@ -245,13 +245,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/print/templates/reports/delivery-note/delivery-note.js b/print/templates/reports/delivery-note/delivery-note.js
index d9544a58c..50d5720ad 100755
--- a/print/templates/reports/delivery-note/delivery-note.js
+++ b/print/templates/reports/delivery-note/delivery-note.js
@@ -13,7 +13,7 @@ module.exports = {
this.sales = await this.rawSqlFromDef('sales', [this.id]);
this.address = await this.findOneFromDef(`address`, [this.id]);
this.services = await this.rawSqlFromDef('services', [this.id]);
- this.taxes = await this.rawSqlFromDef('taxes', [this.id]);
+ this.taxes = await this.findOneFromDef('taxes', [this.id]);
this.packagings = await this.rawSqlFromDef('packagings', [this.id]);
this.signature = await this.findOneFromDef('signature', [this.id]);
},
diff --git a/print/templates/reports/expedition-pallet-label/expedition-pallet-label.js b/print/templates/reports/expedition-pallet-label/expedition-pallet-label.js
index 88645309d..d2fa59612 100644
--- a/print/templates/reports/expedition-pallet-label/expedition-pallet-label.js
+++ b/print/templates/reports/expedition-pallet-label/expedition-pallet-label.js
@@ -22,6 +22,7 @@ module.exports = {
this.labelsData = await this.rawSqlFromDef('labelData', this.id);
this.username = await this.findOneFromDef('username', this.userFk);
this.labelData = this.labelsData[0];
+ this.checkMainEntity(this.labelData);
let QRdata = JSON.stringify({
company: 'vnl',
@@ -32,7 +33,6 @@ module.exports = {
});
this.QR = await this.getQR(QRdata);
- this.checkMainEntity(this.labelsData);
},
methods: {
getQR(id) {
diff --git a/print/templates/reports/expedition-pallet-label/sql/labelData.sql b/print/templates/reports/expedition-pallet-label/sql/labelData.sql
index 0661dbe0f..b2a805251 100644
--- a/print/templates/reports/expedition-pallet-label/sql/labelData.sql
+++ b/print/templates/reports/expedition-pallet-label/sql/labelData.sql
@@ -12,8 +12,8 @@ SELECT ep.id palletFk,
JOIN vn.expedition e ON e.id = es.expeditionFk
JOIN vn.ticket t ON t.id = e.ticketFk
JOIN vn.route r ON r.id = t.routeFk
- LEFT JOIN vn2008.Rutas_monitor rm ON rm.Id_Ruta = r.id
+ LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id
LEFT JOIN vn.expeditionTruck et2 ON et2.id = rm.expeditionTruckFk
WHERE ep.id = ?
GROUP BY ep.id, t.routeFk
- ORDER BY t.routeFk
\ No newline at end of file
+ ORDER BY t.routeFk
diff --git a/print/templates/reports/extra-community/extra-community.html b/print/templates/reports/extra-community/extra-community.html
index cd61a4f4d..3153b6b03 100644
--- a/print/templates/reports/extra-community/extra-community.html
+++ b/print/templates/reports/extra-community/extra-community.html
@@ -51,7 +51,7 @@
{{entry.supplierName}}
{{entry.reference}}
{{entry.volumeKg | number($i18n.locale)}}
- {{entry.loadedKg | number($i18n.locale)}}
+ {{entry.loadedkg | number($i18n.locale)}}
{{entry.stickers}}
diff --git a/print/templates/reports/extra-community/extra-community.js b/print/templates/reports/extra-community/extra-community.js
index 9941faa35..5d875d78f 100755
--- a/print/templates/reports/extra-community/extra-community.js
+++ b/print/templates/reports/extra-community/extra-community.js
@@ -1,11 +1,12 @@
const vnReport = require('../../../core/mixins/vn-report.js');
-const db = require(`vn-print/core/database`);
+const app = require('vn-loopback/server/server');
module.exports = {
name: 'extra-community',
mixins: [vnReport],
async serverPrefetch() {
const args = {
+ search: this.search,
landedTo: this.landedEnd,
shippedFrom: this.shippedStart,
continent: this.continent,
@@ -17,76 +18,24 @@ module.exports = {
ref: this.ref,
cargoSupplierFk: this.cargoSupplierFk
};
-
- const travels = await this.fetchTravels(args);
- this.checkMainEntity(travels);
- const travelIds = travels.map(travel => travel.id);
- const entries = await this.rawSqlFromDef('entries', [travelIds]);
-
- const map = new Map();
- for (let travel of travels)
- map.set(travel.id, travel);
-
- for (let entry of entries) {
- const travel = map.get(entry.travelFk);
- if (!travel.entries) travel.entries = [];
- travel.entries.push(entry);
- }
-
- this.travels = travels;
+ const ctx = {args: args};
+ this.travels = await app.models.Travel.extraCommunityFilter(ctx, this.filter);
},
computed: {
landedEnd: function() {
if (!this.landedTo) return;
- return formatDate(this.landedTo, '%Y-%m-%d');
+ return this.formatDate(this.landedTo, '%Y-%m-%d');
},
shippedStart: function() {
if (!this.shippedFrom) return;
- return formatDate(this.shippedFrom, '%Y-%m-%d');
+ return this.formatDate(this.shippedFrom, '%Y-%m-%d');
}
},
methods: {
- fetchTravels(args) {
- const where = db.buildWhere(args, (key, value) => {
- switch (key) {
- case 'shippedFrom':
- return `t.shipped >= ${value}`;
- case 'landedTo':
- return `t.landed <= ${value}`;
- case 'continent':
- return `cnt.code = ${value}`;
- case 'ref':
- return {'t.ref': {like: `%${value}%`}};
- case 'id':
- return `t.id = ${value}`;
- case 'agencyModeFk':
- return `am.id = ${value}`;
- case 'warehouseOutFk':
- return `wo.id = ${value}`;
- case 'warehouseInFk':
- return `w.id = ${value}`;
- case 'cargoSupplierFk':
- return `s.id = ${value}`;
- }
- });
-
- let query = this.getSqlFromDef('travels');
- query = db.merge(query, where);
- query = db.merge(query, 'GROUP BY t.id');
- query = db.merge(query, `
- ORDER BY
- shipped ASC,
- landed ASC,
- travelFk,
- loadPriority,
- agencyModeFk,
- evaNotes
- `);
-
- return this.rawSql(query);
- },
},
props: [
+ 'filter',
+ 'search',
'landedTo',
'shippedFrom',
'continent',
diff --git a/print/templates/reports/extra-community/sql/entries.sql b/print/templates/reports/extra-community/sql/entries.sql
deleted file mode 100644
index 84dc497c0..000000000
--- a/print/templates/reports/extra-community/sql/entries.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-SELECT
- e.id,
- e.travelFk,
- e.reference,
- s.name AS supplierName,
- SUM(b.stickers) AS stickers,
- CAST(SUM(b.weight * b.stickers) as DECIMAL(10,0)) as loadedKg,
- CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) as DECIMAL(10,0)) as volumeKg
- FROM travel t
- JOIN entry e ON e.travelFk = t.id
- JOIN buy b ON b.entryFk = e.id
- JOIN packaging pkg ON pkg.id = b.packageFk
- JOIN item i ON i.id = b.itemFk
- JOIN itemType it ON it.id = i.typeFk
- JOIN supplier s ON s.id = e.supplierFk
- JOIN vn.volumeConfig vc
- WHERE t.id IN(?)
- GROUP BY e.id
diff --git a/print/templates/reports/extra-community/sql/travels.sql b/print/templates/reports/extra-community/sql/travels.sql
deleted file mode 100644
index b0987c330..000000000
--- a/print/templates/reports/extra-community/sql/travels.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-SELECT
- t.id,
- t.ref,
- t.shipped,
- t.landed,
- t.kg,
- am.id AS agencyModeFk,
- SUM(b.stickers) AS stickers,
- CAST(SUM(b.weight * b.stickers) as DECIMAL(10,0)) as loadedKg,
- CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) as DECIMAL(10,0)) as volumeKg
-FROM travel t
- JOIN volumeConfig vc
- LEFT JOIN supplier s ON s.id = t.cargoSupplierFk
- LEFT JOIN entry e ON e.travelFk = t.id
- LEFT JOIN buy b ON b.entryFk = e.id
- LEFT JOIN packaging pkg ON pkg.id = b.packageFk
- LEFT JOIN item i ON i.id = b.itemFk
- LEFT JOIN itemType it ON it.id = i.typeFk
- JOIN warehouse w ON w.id = t.warehouseInFk
- JOIN warehouse wo ON wo.id = t.warehouseOutFk
- JOIN country c ON c.id = wo.countryFk
- LEFT JOIN continent cnt ON cnt.id = c.continentFk
- JOIN agencyMode am ON am.id = t.agencyModeFk
\ No newline at end of file
diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html
index 60d06d528..7a1ed3319 100644
--- a/print/templates/reports/invoice/invoice.html
+++ b/print/templates/reports/invoice/invoice.html
@@ -96,7 +96,7 @@
- {{sale.itemFk | zerofill('000000')}}
+ {{sale.itemFk}}
{{sale.quantity}}
{{sale.concept}}
{{sale.price | currency('EUR', $i18n.locale)}}
@@ -203,7 +203,7 @@
-
{{address.nickname}}
{{address.street}}
{{address.postalCode}}, {{address.city}} ({{address.province}})
@@ -66,7 +66,7 @@
+
@@ -240,13 +240,18 @@
-
{{$t('intrastat')}}
+
diff --git a/print/templates/reports/invoice/invoice.js b/print/templates/reports/invoice/invoice.js
index 7b572d970..42988113f 100755
--- a/print/templates/reports/invoice/invoice.js
+++ b/print/templates/reports/invoice/invoice.js
@@ -10,7 +10,9 @@ module.exports = {
this.checkMainEntity(this.invoice);
this.client = await this.findOneFromDef('client', [this.reference]);
this.taxes = await this.rawSqlFromDef(`taxes`, [this.reference]);
- this.intrastat = await this.rawSqlFromDef(`intrastat`, [this.reference, this.reference, this.reference]);
+ this.hasIntrastat = await this.findValueFromDef(`hasIntrastat`, [this.reference]);
+ this.intrastat = await this.rawSqlFromDef(`intrastat`,
+ [this.reference, this.reference, this.reference, this.reference]);
this.rectified = await this.rawSqlFromDef(`rectified`, [this.reference]);
this.hasIncoterms = await this.findValueFromDef(`hasIncoterms`, [this.reference]);
@@ -19,11 +21,15 @@ module.exports = {
const map = new Map();
+ this.ticketObservations = '';
for (let ticket of tickets) {
ticket.sales = [];
map.set(ticket.id, ticket);
+
+ if (ticket.description) this.ticketObservations += ticket.description + ' ';
}
+ this.ticketObservations = this.ticketObservations.trim();
for (let sale of sales) {
const ticket = map.get(sale.ticketFk);
diff --git a/print/templates/reports/invoice/sql/hasIntrastat.sql b/print/templates/reports/invoice/sql/hasIntrastat.sql
new file mode 100644
index 000000000..09eda94c2
--- /dev/null
+++ b/print/templates/reports/invoice/sql/hasIntrastat.sql
@@ -0,0 +1,4 @@
+SELECT taxAreaFk != 'NATIONAL'
+ FROM vn.invoiceOutSerial ios
+ JOIN vn.invoiceOut io ON io.serial = ios.code
+ WHERE io.ref = ?;
diff --git a/print/templates/reports/invoice/sql/intrastat.sql b/print/templates/reports/invoice/sql/intrastat.sql
index f986a9564..211ebfe71 100644
--- a/print/templates/reports/invoice/sql/intrastat.sql
+++ b/print/templates/reports/invoice/sql/intrastat.sql
@@ -1,26 +1,36 @@
SELECT *
- FROM invoiceOut io
- JOIN invoiceOutSerial ios ON io.serial = ios.code
- JOIN(
- SELECT ir.id code,
- ir.description,
- iii.stems,
- iii.net netKg,
- iii.amount subtotal
- FROM vn.invoiceInIntrastat iii
- LEFT JOIN vn.invoiceIn ii ON ii.id = iii.invoiceInFk
- LEFT JOIN vn.invoiceOut io ON io.ref = ii.supplierRef
- LEFT JOIN vn.intrastat ir ON ir.id = iii.intrastatFk
- WHERE io.`ref` = ?
- UNION ALL
- SELECT NULL code,
- 'Servicios' description,
- 0 stems,
- 0 netKg,
- IF(CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), 0) subtotal
- FROM vn.ticketService ts
- JOIN vn.ticket t ON ts.ticketFk = t.id
- WHERE t.refFk = ?
- ) sub
- WHERE io.ref = ? AND ios.isCEE
- ORDER BY sub.code;
+ FROM (
+ SELECT i.intrastatFk code,
+ it.description,
+ CAST(SUM(ROUND((s.quantity * s.price * (100 - s.discount) / 100 ) , 2))AS DECIMAL(10, 2)) subtotal,
+ SUM(IFNULL(i.stems, 1) * s.quantity) stems,
+ CAST(SUM(IFNULL(i.stems, 1)
+ * s.quantity
+ * IF(ic.grams, ic.grams, IFNULL(i.weightByPiece, 0)) / 1000)
+ * IF(sub.totalWeight, sub.totalWeight / vn.invoiceOut_getWeight(?), 1)
+ AS DECIMAL(10,2)) netKg
+ FROM sale s
+ JOIN ticket t ON s.ticketFk = t.id
+ JOIN supplier su ON su.id = t.companyFk
+ JOIN item i ON i.id = s.itemFk
+ JOIN intrastat it ON it.id = i.intrastatFk
+ LEFT JOIN itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk
+ LEFT JOIN (
+ SELECT SUM(weight)totalWeight
+ FROM vn.ticket
+ WHERE refFk = ?
+ AND weight
+ ) sub ON TRUE
+ WHERE t.refFk =?
+ GROUP BY i.intrastatFk
+ UNION ALL
+ SELECT NULL ,
+ IF((SUM((ts.quantity * ts.price))), 'Servicios', NULL),
+ IFNULL(CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), 0),
+ 0 ,
+ 0
+ FROM vn.ticketService ts
+ JOIN vn.ticket t ON ts.ticketFk = t.id
+ WHERE t.refFk = ?
+ ) sub2
+ WHERE `description` IS NOT NULL;
diff --git a/print/templates/reports/invoice/sql/rectified.sql b/print/templates/reports/invoice/sql/rectified.sql
index 49db8f68b..79ce733e3 100644
--- a/print/templates/reports/invoice/sql/rectified.sql
+++ b/print/templates/reports/invoice/sql/rectified.sql
@@ -1,10 +1,11 @@
SELECT
- io.amount,
- io.ref,
- io.issued,
+ io2.amount,
+ io2.ref,
+ io2.issued,
ict.description
FROM invoiceOut io
JOIN invoiceCorrection ic ON ic.correctingFk = io.id
- JOIN invoiceCorrectionType ict ON ict.id = ic.invoiceCorrectionTypeFk
+ JOIN invoiceOut io2 ON io2.id = ic.correctedFk
LEFT JOIN ticket t ON t.refFk = io.ref
-WHERE io.ref = ?
\ No newline at end of file
+ JOIN invoiceCorrectionType ict ON ict.id = ic.invoiceCorrectionTypeFk
+WHERE io.ref = ?
diff --git a/print/templates/reports/invoice/sql/tickets.sql b/print/templates/reports/invoice/sql/tickets.sql
index 162f043e2..a8385599c 100644
--- a/print/templates/reports/invoice/sql/tickets.sql
+++ b/print/templates/reports/invoice/sql/tickets.sql
@@ -1,8 +1,12 @@
SELECT
t.id,
t.shipped,
- t.nickname
-FROM invoiceOut io
- JOIN ticket t ON t.refFk = io.ref
+ t.nickname,
+ tto.description
+FROM invoiceOut io
+ JOIN ticket t ON t.refFk = io.REF
+ LEFT JOIN observationType ot ON ot.code = 'invoiceOut'
+ LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id
+ AND tto.observationTypeFk = ot.id
WHERE t.refFk = ?
-ORDER BY t.shipped
\ No newline at end of file
+ORDER BY t.shipped
{{$t('observations')}}
-
{{$t('wireTransfer')}}
- {{$t('accountNumber', [invoice.iban])}}
+
+
+ {{$t('wireTransfer')}}
+ {{$t('accountNumber', [invoice.iban])}}
+
+ {{ticketObservations}}
+