-
-
-
-
diff --git a/front/salix/components/upload-photo/index.js b/front/salix/components/upload-photo/index.js
index c47018307..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();
}
@@ -197,7 +196,7 @@ export default class UploadPhoto extends Component {
timeout: this.canceler.promise,
transformRequest: ([file]) => {
const formData = new FormData();
- const now = new Date();
+ const now = Date.vnNew();
const timestamp = now.getTime();
const fileName = `${file.name}_${timestamp}`;
diff --git a/front/salix/index.js b/front/salix/index.js
index 5220f36f6..2488ef9b6 100644
--- a/front/salix/index.js
+++ b/front/salix/index.js
@@ -1,5 +1,5 @@
import './module';
import './routes';
import './components';
-import './services';
import './styles';
+import 'vn-loopback/server/boot/date';
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/jest-front.js b/jest-front.js
index 6d7532260..eabda9110 100644
--- a/jest-front.js
+++ b/jest-front.js
@@ -14,6 +14,10 @@ import './modules/ticket/front/module.js';
import './modules/travel/front/module.js';
import './modules/worker/front/module.js';
import './modules/shelving/front/module.js';
+import 'vn-loopback/server/boot/date';
+
+// Set NODE_ENV
+process.env.NODE_ENV = 'development';
core.run(vnInterceptor => {
vnInterceptor.setApiPath(null);
@@ -39,3 +43,4 @@ window.ngModule = function(moduleName, ...args) {
return angular.mock.module(...fns);
};
+
diff --git a/jest.front.config.js b/jest.front.config.js
index a03c61d11..3289df8bb 100644
--- a/jest.front.config.js
+++ b/jest.front.config.js
@@ -1,5 +1,6 @@
// For a detailed explanation regarding each configuration property, visit:
// https://jestjs.io/docs/en/configuration.html
+/* eslint max-len: ["error", { "code": 150 }]*/
module.exports = {
name: 'front end',
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 a406b55a5..e9fd67209 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -67,7 +67,7 @@
"Changed client paymethod": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
"Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
"Change quantity": "{{concept}} change of {{oldQuantity}} to {{newQuantity}}",
- "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
+ "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
"Claim state has changed to incomplete": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *incomplete*",
"Claim state has changed to canceled": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *canceled*",
"Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
@@ -137,15 +137,22 @@
"Password does not meet requirements": "Password does not meet requirements",
"You don't have privileges to change the zone": "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies",
"Not enough privileges to edit a client": "Not enough privileges to edit a client",
- "Claim pickup order sent": "Claim pickup order sent [{{claimId}}]({{{claimUrl}}}) to client *{{clientName}}*",
+ "Claim pickup order sent": "Claim pickup order sent [{{claimId}}]({{{claimUrl}}}) to client *{{clientName}}*",
"You don't have grant privilege": "You don't have grant privilege",
"You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user",
- "Email verify": "Email verify",
+ "Email verify": "Email verify",
"Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) merged with [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
- "Sale(s) blocked, please contact production": "Sale(s) blocked, please contact production",
"App locked": "App locked by user {{userId}}",
- "The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified",
- "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"
+ "The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified",
+ "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",
+ "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 f6f305dc3..788c2fa96 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -84,7 +84,6 @@
"The current ticket can't be modified": "El ticket actual no puede ser modificado",
"The current claim can't be modified": "La reclamación actual no puede ser modificada",
"The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
- "Sale(s) blocked, contact production": "Linea(s) bloqueada(s), contacte con produccion",
"Please select at least one sale": "Por favor selecciona al menos una linea",
"All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
"NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
@@ -252,9 +251,24 @@
"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",
"App name does not exist": "El nombre de aplicación no es válido",
"Try again": "Vuelve a intentarlo",
"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": "The DOCUWARE PDF document does not exists"
-}
\ No newline at end of file
+ "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",
+ "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",
+ "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"
+}
diff --git a/loopback/server/boot/date.js b/loopback/server/boot/date.js
new file mode 100644
index 000000000..810745562
--- /dev/null
+++ b/loopback/server/boot/date.js
@@ -0,0 +1,17 @@
+module.exports = () => {
+ Date.vnUTC = () => {
+ const env = process.env.NODE_ENV;
+ if (!env || env === 'development')
+ return new Date(Date.UTC(2001, 0, 1, 11));
+
+ return new Date();
+ };
+
+ Date.vnNew = () => {
+ return new Date(Date.vnUTC());
+ };
+
+ Date.vnNow = () => {
+ return new Date(Date.vnUTC()).getTime();
+ };
+};
diff --git a/loopback/server/connectors/vn-mysql.js b/loopback/server/connectors/vn-mysql.js
index fde0ddcf6..5c1ceaa32 100644
--- a/loopback/server/connectors/vn-mysql.js
+++ b/loopback/server/connectors/vn-mysql.js
@@ -2,8 +2,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 = require('loopback-connector').Transaction;
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 +252,277 @@ 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(...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 => {
+ const fnArgs = args.slice(0, -2);
+ fnArgs.push(opts, (...args) => 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[1])
+ ids.push(row[idName]);
+ break;
+ case 'create':
+ ids.push(res[1]);
+ break;
+ case 'update':
+ if (data[idName] != null)
+ ids.push(data[idName]);
+ break;
+ }
+
+ const newWhere = ids.length ? {[idName]: 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;
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/loopback/util/not-found-error.js b/loopback/util/not-found-error.js
new file mode 100644
index 000000000..7a05254f9
--- /dev/null
+++ b/loopback/util/not-found-error.js
@@ -0,0 +1,9 @@
+module.exports = class NotFoundError extends Error {
+ constructor(message = 'Not found', code = 'NOT_FOUND', ...translateArgs) {
+ super(message);
+ this.name = 'NotFoundError';
+ this.statusCode = 404;
+ this.code = code;
+ this.translateArgs = translateArgs;
+ }
+};
diff --git a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
index 22a48f83e..f0686ffa6 100644
--- a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
+++ b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
@@ -95,7 +95,7 @@ module.exports = Self => {
}, myOptions);
const claim = await models.Claim.findOne(filter, myOptions);
- const today = new Date();
+ const today = Date.vnNew();
const newRefundTicket = await models.Ticket.create({
clientFk: claim.ticket().clientFk,
@@ -172,7 +172,7 @@ module.exports = Self => {
async function saveObservation(observation, options) {
const query = `INSERT INTO vn.ticketObservation (ticketFk, observationTypeFk, description) VALUES(?, ?, ?)
- ON DUPLICATE KEY
+ ON DUPLICATE KEY
UPDATE description = CONCAT(vn.ticketObservation.description, VALUES(description),' ')`;
await Self.rawSql(query, [
observation.ticketFk,
diff --git a/modules/claim/back/methods/claim/isEditable.js b/modules/claim/back/methods/claim-state/isEditable.js
similarity index 52%
rename from modules/claim/back/methods/claim/isEditable.js
rename to modules/claim/back/methods/claim-state/isEditable.js
index cd14d70c7..2d0a8dc44 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'
- }]
- }, myOptions);
-
- const isClaimResolved = claim && claim.claimState().code == 'resolved';
-
- if (!claim || (isClaimResolved && !isClaimManager))
- return false;
-
- return true;
+
+ const state = await models.ClaimState.findById(id, {
+ include: {
+ relation: 'writeRole'
+ }
+ }, myOptions);
+ 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/createFromSales.js b/modules/claim/back/methods/claim/createFromSales.js
index ba7bda71d..2ce3bc44b 100644
--- a/modules/claim/back/methods/claim/createFromSales.js
+++ b/modules/claim/back/methods/claim/createFromSales.js
@@ -60,7 +60,7 @@ module.exports = Self => {
const landedPlusWeek = new Date(ticket.landed);
landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
const hasClaimManagerRole = await models.Account.hasRole(userId, 'claimManager', myOptions);
- const isClaimable = landedPlusWeek >= new Date();
+ const isClaimable = landedPlusWeek >= Date.vnNew();
if (ticket.isDeleted)
throw new UserError(`You can't create a claim for a removed ticket`);
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..c7e69680b
--- /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/regularizeClaim.js b/modules/claim/back/methods/claim/regularizeClaim.js
index ab8ea58a4..672c94947 100644
--- a/modules/claim/back/methods/claim/regularizeClaim.js
+++ b/modules/claim/back/methods/claim/regularizeClaim.js
@@ -1,6 +1,6 @@
module.exports = Self => {
Self.remoteMethodCtx('regularizeClaim', {
- description: `Imports lines from claimBeginning to a new ticket
+ description: `Imports lines from claimBeginning to a new ticket
with specific shipped, landed dates, agency and company`,
accessType: 'WRITE',
accepts: [{
@@ -135,10 +135,10 @@ module.exports = Self => {
}
async function getTicketId(params, options) {
- const minDate = new Date();
+ const minDate = Date.vnNew();
minDate.setHours(0, 0, 0, 0);
- const maxDate = new Date();
+ const maxDate = Date.vnNew();
maxDate.setHours(23, 59, 59, 59);
let ticket = await Self.app.models.Ticket.findOne({
@@ -155,8 +155,8 @@ module.exports = Self => {
}
async function createTicket(ctx, options) {
- ctx.args.shipped = new Date();
- ctx.args.landed = new Date();
+ ctx.args.shipped = Date.vnNew();
+ ctx.args.landed = Date.vnNew();
ctx.args.agencyModeId = null;
ctx.args.routeId = null;
diff --git a/modules/claim/back/methods/claim/specs/createFromSales.spec.js b/modules/claim/back/methods/claim/specs/createFromSales.spec.js
index 9151c361e..7cf663caf 100644
--- a/modules/claim/back/methods/claim/specs/createFromSales.spec.js
+++ b/modules/claim/back/methods/claim/specs/createFromSales.spec.js
@@ -54,7 +54,7 @@ describe('Claim createFromSales()', () => {
try {
const options = {transaction: tx};
- const todayMinusEightDays = new Date();
+ const todayMinusEightDays = Date.vnNew();
todayMinusEightDays.setDate(todayMinusEightDays.getDate() - 8);
const ticket = await models.Ticket.findById(ticketId, null, options);
@@ -85,7 +85,7 @@ describe('Claim createFromSales()', () => {
try {
const options = {transaction: tx};
- const todayMinusEightDays = new Date();
+ const todayMinusEightDays = Date.vnNew();
todayMinusEightDays.setDate(todayMinusEightDays.getDate() - 8);
const ticket = await models.Ticket.findById(ticketId, null, options);
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/updateClaim.spec.js b/modules/claim/back/methods/claim/specs/updateClaim.spec.js
index 8d888eb40..113df35c9 100644
--- a/modules/claim/back/methods/claim/specs/updateClaim.spec.js
+++ b/modules/claim/back/methods/claim/specs/updateClaim.spec.js
@@ -1,7 +1,7 @@
const app = require('vn-loopback/server/server');
describe('Update Claim', () => {
- const newDate = new Date();
+ const newDate = Date.vnNew();
const originalData = {
ticketFk: 3,
clientFk: 1101,
diff --git a/modules/claim/back/methods/claim/specs/updateClaimAction.spec.js b/modules/claim/back/methods/claim/specs/updateClaimAction.spec.js
index 4cd4ce528..12ab45fac 100644
--- a/modules/claim/back/methods/claim/specs/updateClaimAction.spec.js
+++ b/modules/claim/back/methods/claim/specs/updateClaimAction.spec.js
@@ -1,7 +1,7 @@
const app = require('vn-loopback/server/server');
describe('Update Claim', () => {
- const newDate = new Date();
+ const newDate = Date.vnNew();
const original = {
ticketFk: 3,
clientFk: 1101,
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..4c4b59737 100644
--- a/modules/claim/back/models/claim-beginning.js
+++ b/modules/claim/back/models/claim-beginning.js
@@ -11,7 +11,7 @@ module.exports = Self => {
Self.observe('before save', async ctx => {
if (ctx.isNewInstance) return;
- await claimIsEditable(ctx);
+ //await claimIsEditable(ctx);
});
Self.observe('before delete', async ctx => {
@@ -22,8 +22,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..cd5b767e4 100644
--- a/modules/claim/back/models/claim.json
+++ b/modules/claim/back/models/claim.json
@@ -77,6 +77,11 @@
"type": "belongsTo",
"model": "Ticket",
"foreignKey": "ticketFk"
- }
+ },
+ "claimDms": {
+ "type": "hasMany",
+ "model": "ClaimDms",
+ "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/card/index.js b/modules/claim/front/card/index.js
index 8fb35db75..4a8677c90 100644
--- a/modules/claim/front/card/index.js
+++ b/modules/claim/front/card/index.js
@@ -19,10 +19,26 @@ class Controller extends ModuleCard {
}, {
relation: 'ticket',
scope: {
- fields: ['zoneFk'],
- include: {
- relation: 'zone'
- }
+ fields: ['zoneFk', 'addressFk'],
+ include: [
+ {
+ relation: 'zone',
+ scope: {
+ fields: ['name']
+ }
+ },
+ {
+ relation: 'address',
+ scope: {
+ fields: ['provinceFk'],
+ include: {
+ relation: 'province',
+ scope: {
+ fields: ['name']
+ }
+ }
+ }
+ }]
}
}, {
relation: 'claimState',
diff --git a/modules/claim/front/descriptor/index.html b/modules/claim/front/descriptor/index.html
index 90246824b..5fd198440 100644
--- a/modules/claim/front/descriptor/index.html
+++ b/modules/claim/front/descriptor/index.html
@@ -55,9 +55,13 @@
- {{$ctrl.claim.ticket.zoneFk}}
+ {{$ctrl.claim.ticket.zone.name}}
+
+
-
+
+
+
+
+
+
+
+
diff --git a/modules/claim/front/detail/index.js b/modules/claim/front/detail/index.js
index 7c3c04f44..833519579 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.id}/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..8f3049339 100644
--- a/modules/claim/front/detail/index.spec.js
+++ b/modules/claim/front/detail/index.spec.js
@@ -17,7 +17,7 @@ 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('
-
- {{::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/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/consumptionSendQueued.js b/modules/client/back/methods/client/consumptionSendQueued.js
index 77e0e34f2..31b54b21d 100644
--- a/modules/client/back/methods/client/consumptionSendQueued.js
+++ b/modules/client/back/methods/client/consumptionSendQueued.js
@@ -32,7 +32,7 @@ module.exports = Self => {
c.id AS clientFk,
c.email AS clientEmail,
eu.email salesPersonEmail
- FROM client c
+ FROM client c
JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
JOIN ticket t ON t.clientFk = c.id
JOIN sale s ON s.ticketFk = t.id
@@ -61,10 +61,10 @@ module.exports = Self => {
SET status = 'printed',
printed = ?
WHERE id = ?`,
- [new Date(), queue.id]);
+ [Date.vnNew(), queue.id]);
} catch (error) {
await Self.rawSql(`
- UPDATE clientConsumptionQueue
+ UPDATE clientConsumptionQueue
SET status = ?
WHERE id = ?`,
[error.message, queue.id]);
diff --git a/modules/client/back/methods/client/createReceipt.js b/modules/client/back/methods/client/createReceipt.js
index a75ee8844..cb032270a 100644
--- a/modules/client/back/methods/client/createReceipt.js
+++ b/modules/client/back/methods/client/createReceipt.js
@@ -51,7 +51,7 @@ module.exports = function(Self) {
Self.createReceipt = async(ctx, options) => {
const models = Self.app.models;
const args = ctx.args;
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
let tx;
@@ -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 21b3140bd..a2365ee25 100644
--- a/modules/client/back/methods/client/getCard.js
+++ b/modules/client/back/methods/client/getCard.js
@@ -74,12 +74,13 @@ module.exports = function(Self) {
]
}, myOptions);
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const query = `SELECT vn.clientGetDebt(?, ?) AS debt`;
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/getDebt.js b/modules/client/back/methods/client/getDebt.js
index aafdbfa48..5f8a8c569 100644
--- a/modules/client/back/methods/client/getDebt.js
+++ b/modules/client/back/methods/client/getDebt.js
@@ -25,7 +25,7 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const query = `SELECT vn.clientGetDebt(?, ?) AS debt`;
const [debt] = await Self.rawSql(query, [clientFk, date], 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/lastActiveTickets.js b/modules/client/back/methods/client/lastActiveTickets.js
index 03616a0e3..d662f75aa 100644
--- a/modules/client/back/methods/client/lastActiveTickets.js
+++ b/modules/client/back/methods/client/lastActiveTickets.js
@@ -32,14 +32,14 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const ticket = await Self.app.models.Ticket.findById(ticketId, null, myOptions);
const query = `
- SELECT
+ SELECT
t.id,
t.shipped,
- a.name AS agencyName,
+ a.name AS agencyName,
w.name AS warehouseName,
ad.nickname AS nickname,
ad.city AS city,
@@ -52,7 +52,7 @@ module.exports = Self => {
JOIN vn.warehouse w ON t.warehouseFk = w.id
JOIN vn.address ad ON t.addressFk = ad.id
JOIN vn.province pr ON ad.provinceFk = pr.id
- WHERE t.shipped >= ? AND t.clientFk = ? AND ts.alertLevel = 0
+ WHERE t.shipped >= ? AND t.clientFk = ? AND ts.alertLevel = 0
AND t.id <> ? AND t.warehouseFk = ?
ORDER BY t.shipped
LIMIT 10`;
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/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/summary.js b/modules/client/back/methods/client/summary.js
index 48cb75f31..caa3d8033 100644
--- a/modules/client/back/methods/client/summary.js
+++ b/modules/client/back/methods/client/summary.js
@@ -125,7 +125,7 @@ module.exports = Self => {
async function getRecoveries(recoveryModel, clientId, options) {
const filter = {
where: {
- and: [{clientFk: clientId}, {or: [{finished: null}, {finished: {gt: Date.now()}}]}]
+ and: [{clientFk: clientId}, {or: [{finished: null}, {finished: {gt: Date.vnNow()}}]}]
},
limit: 1
};
diff --git a/modules/client/back/methods/credit-classification/createWithInsurance.spec.js b/modules/client/back/methods/credit-classification/createWithInsurance.spec.js
index 95ff5025f..a5837bb90 100644
--- a/modules/client/back/methods/credit-classification/createWithInsurance.spec.js
+++ b/modules/client/back/methods/credit-classification/createWithInsurance.spec.js
@@ -23,7 +23,7 @@ describe('Client createWithInsurance', () => {
try {
const options = {transaction: tx};
- const data = {clientFk: 1101, started: Date.now(), credit: 999, grade: 255};
+ const data = {clientFk: 1101, started: Date.vnNow(), credit: 999, grade: 255};
const result = await models.CreditClassification.createWithInsurance(data, options);
diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js
index ce1d89818..748581913 100644
--- a/modules/client/back/methods/defaulter/filter.js
+++ b/modules/client/back/methods/defaulter/filter.js
@@ -51,7 +51,7 @@ module.exports = Self => {
const stmts = [];
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const stmt = new ParameterizedSQL(
`SELECT *
@@ -65,14 +65,14 @@ module.exports = Self => {
co.created,
co.text observation,
uw.id workerFk,
- uw.name workerName,
+ uw.name workerName,
c.creditInsurance,
d.defaulterSinced
FROM vn.defaulter d
JOIN vn.client c ON c.id = d.clientFk
LEFT JOIN vn.clientObservation co ON co.clientFk = c.id
LEFT JOIN account.user u ON u.id = c.salesPersonFk
- LEFT JOIN account.user uw ON uw.id = co.workerFk
+ LEFT JOIN account.user uw ON uw.id = co.workerFk
WHERE
d.created = ?
AND d.amount > 0
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/recovery/hasActiveRecovery.js b/modules/client/back/methods/recovery/hasActiveRecovery.js
index 6b69d99d7..344b6b6ab 100644
--- a/modules/client/back/methods/recovery/hasActiveRecovery.js
+++ b/modules/client/back/methods/recovery/hasActiveRecovery.js
@@ -27,7 +27,7 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const query = `
SELECT count(*) AS hasActiveRecovery
diff --git a/modules/client/back/methods/tpv-transaction/confirm.js b/modules/client/back/methods/tpv-transaction/confirm.js
new file mode 100644
index 000000000..41229a1fd
--- /dev/null
+++ b/modules/client/back/methods/tpv-transaction/confirm.js
@@ -0,0 +1,97 @@
+const UserError = require('vn-loopback/util/user-error');
+const base64url = require('base64url');
+
+module.exports = Self => {
+ Self.remoteMethod('confirm', {
+ description: 'Confirms electronic payment transaction',
+ accessType: 'WRITE',
+ accepts: [
+ {
+ arg: 'Ds_SignatureVersion',
+ type: 'string',
+ required: false,
+ }, {
+ arg: 'Ds_MerchantParameters',
+ type: 'string',
+ required: true,
+ }, {
+ arg: 'Ds_Signature',
+ type: 'string',
+ required: true,
+ }
+ ],
+ returns: {
+ type: 'Boolean',
+ root: true
+ },
+ http: {
+ path: `/confirm`,
+ verb: 'POST'
+ }
+ });
+
+ Self.confirm = async(signatureVersion, merchantParameters, signature) => {
+ const $ = Self.app.models;
+ let transaction;
+
+ try {
+ const decodedParams = JSON.parse(
+ base64url.decode(merchantParameters, 'utf8'));
+ const params = {};
+
+ for (const param in decodedParams)
+ params[param] = decodeURIComponent(decodedParams[param]);
+
+ const orderId = params['Ds_Order'];
+ if (!orderId)
+ throw new UserError('Order id not provided');
+
+ transaction = await Self.findById(orderId, {fields: ['id']});
+ if (!transaction)
+ throw new UserError('Order not found');
+
+ await transaction.updateAttributes({
+ merchantParameters,
+ signature,
+ signatureVersion,
+ });
+
+ const merchantId = parseInt(params['Ds_MerchantCode']);
+ if (!merchantId)
+ throw new UserError('Merchant id not provided');
+
+ const merchant = await $.TpvMerchant.findById(merchantId, {
+ fields: ['id', 'secretKey']
+ });
+ if (!merchant)
+ throw new UserError('Merchant not found');
+
+ const base64hmac = Self.createSignature(
+ orderId,
+ merchant.secretKey,
+ merchantParameters
+ );
+
+ 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/methods/tpv-transaction/end.js b/modules/client/back/methods/tpv-transaction/end.js
new file mode 100644
index 000000000..5a757aa48
--- /dev/null
+++ b/modules/client/back/methods/tpv-transaction/end.js
@@ -0,0 +1,39 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.remoteMethodCtx('end', {
+ description: 'Ends electronic payment transaction',
+ accessType: 'WRITE',
+ accepts: [
+ {
+ arg: 'orderId',
+ type: 'string',
+ required: true,
+ }, {
+ arg: 'status',
+ type: 'string',
+ required: true,
+ }
+ ],
+ http: {
+ path: `/end`,
+ verb: 'POST'
+ }
+ });
+
+ Self.end = async(ctx, orderId, status) => {
+ const userId = ctx.req.accessToken.userId;
+ const transaction = await Self.findById(orderId, {
+ fields: ['id', 'clientFk']
+ });
+
+ if (transaction?.clientFk != userId)
+ throw new UserError('Transaction not owned by user');
+
+ await Self.rawSql(
+ 'CALL hedera.tpvTransaction_end(?, ?)', [
+ orderId,
+ status
+ ]);
+ };
+};
diff --git a/modules/client/back/methods/tpv-transaction/start.js b/modules/client/back/methods/tpv-transaction/start.js
new file mode 100644
index 000000000..ea6ed05eb
--- /dev/null
+++ b/modules/client/back/methods/tpv-transaction/start.js
@@ -0,0 +1,85 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.remoteMethodCtx('start', {
+ description: 'Starts electronic payment transaction',
+ accessType: 'WRITE',
+ accepts: [
+ {
+ arg: 'amount',
+ type: 'Number',
+ required: true,
+ }, {
+ arg: 'companyId',
+ type: 'Number',
+ required: false,
+ }, {
+ arg: 'urlOk',
+ type: 'String',
+ required: false,
+ }, {
+ arg: 'urlKo',
+ type: 'String',
+ required: false,
+ }
+ ],
+ returns: {
+ type: 'Object',
+ root: true
+ },
+ http: {
+ path: `/start`,
+ verb: 'POST'
+ }
+ });
+
+ Self.start = async(ctx, amount, companyId, urlOk, urlKo) => {
+ const userId = ctx.req.accessToken.userId;
+ const [[row]] = await Self.rawSql(
+ 'CALL hedera.tpvTransaction_start(?, ?, ?)', [
+ amount,
+ companyId,
+ userId
+ ]);
+
+ if (!row)
+ throw new UserError('Transaction error');
+
+ const orderId = row.transactionId.padStart(12, '0');
+ const merchantUrl = row.merchantUrl ? row.merchantUrl : '';
+ urlOk = urlOk ? urlOk.replace('_transactionId_', orderId) : '';
+ urlKo = urlKo ? urlKo.replace('_transactionId_', orderId) : '';
+
+ const params = {
+ 'Ds_Merchant_Amount': amount,
+ 'Ds_Merchant_Order': orderId,
+ 'Ds_Merchant_MerchantCode': row.merchant,
+ 'Ds_Merchant_Currency': row.currency,
+ 'Ds_Merchant_TransactionType': row.transactionType,
+ 'Ds_Merchant_Terminal': row.terminal,
+ 'Ds_Merchant_MerchantURL': merchantUrl,
+ 'Ds_Merchant_UrlOK': urlOk,
+ 'Ds_Merchant_UrlKO': urlKo
+ };
+ for (const param in params)
+ params[param] = encodeURIComponent(params[param]);
+
+ const json = JSON.stringify(params);
+ const merchantParameters = Buffer.from(json).toString('base64');
+
+ const signature = Self.createSignature(
+ orderId,
+ row.secretKey,
+ merchantParameters
+ );
+
+ return {
+ url: row.url,
+ postValues: {
+ 'Ds_SignatureVersion': 'HMAC_SHA256_V1',
+ 'Ds_MerchantParameters': merchantParameters,
+ 'Ds_Signature': signature
+ }
+ };
+ };
+};
diff --git a/modules/client/back/models/client-methods.js b/modules/client/back/models/client-methods.js
index 4b20a822c..9241d80cf 100644
--- a/modules/client/back/models/client-methods.js
+++ b/modules/client/back/models/client-methods.js
@@ -47,4 +47,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-sample.js b/modules/client/back/models/client-sample.js
index 787cc2ad8..5e4393042 100644
--- a/modules/client/back/models/client-sample.js
+++ b/modules/client/back/models/client-sample.js
@@ -41,7 +41,7 @@ module.exports = Self => {
// Disable old mandate
if (oldMandate)
- oldMandate.updateAttribute('finished', new Date());
+ oldMandate.updateAttribute('finished', Date.vnNew());
// Create a new mandate
await models.Mandate.create({
diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index e07993f79..c41085b79 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -141,6 +141,16 @@ module.exports = Self => {
done();
}
+ Self.validateAsync('isToBeMailed', isToBeMailed, {
+ message: 'There is no assigned email for this client'
+ });
+
+ function isToBeMailed(err, done) {
+ if (this.isToBeMailed == true && !this.email)
+ err();
+ done();
+ }
+
Self.validateAsync('defaultAddressFk', isActive,
{message: 'Unable to default a disabled consignee'}
);
@@ -269,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/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.js b/modules/client/back/models/tpv-transaction.js
new file mode 100644
index 000000000..eb9dd7d6c
--- /dev/null
+++ b/modules/client/back/models/tpv-transaction.js
@@ -0,0 +1,29 @@
+const crypto = require('crypto');
+
+module.exports = Self => {
+ require('../methods/tpv-transaction/confirm')(Self);
+ require('../methods/tpv-transaction/start')(Self);
+ require('../methods/tpv-transaction/end')(Self);
+
+ Self.createSignature = function(orderId, secretKey, merchantParameters) {
+ secretKey = Buffer.from(secretKey, 'base64');
+ const iv = Buffer.alloc(8, 0);
+
+ const cipher = crypto.createCipheriv('des-ede3-cbc', secretKey, iv);
+ cipher.setAutoPadding(false);
+ const orderKey = Buffer.concat([
+ cipher.update(zeroPad(orderId, 8)),
+ cipher.final()
+ ]);
+
+ return crypto.createHmac('sha256', orderKey)
+ .update(merchantParameters)
+ .digest('base64');
+ };
+
+ function zeroPad(buf, blocksize) {
+ const buffer = typeof buf === 'string' ? Buffer.from(buf, 'utf8') : buf;
+ const pad = Buffer.alloc((blocksize - (buffer.length % blocksize)) % blocksize, 0);
+ return Buffer.concat([buffer, pad]);
+ }
+};
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">
+
+ Compensation
+
+
+
-
- Compensation
-
-
-
-
@@ -89,4 +89,4 @@
Accept
-
\ 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 35b2e0b38..cc9e1ab5a 100644
--- a/modules/client/front/balance/create/index.js
+++ b/modules/client/front/balance/create/index.js
@@ -4,7 +4,6 @@ import Dialog from 'core/components/dialog';
class Controller extends Dialog {
constructor($element, $, $transclude, vnReport) {
super($element, $, $transclude);
- this.viewReceipt = true;
this.vnReport = vnReport;
this.receipt = {};
}
@@ -59,16 +58,21 @@ class Controller extends Dialog {
if (value) {
const accountingType = value.accountingType;
- if (this.originalDescription) {
- this.receipt.description =
- `${accountingType && accountingType.receiptDescription}, ${this.originalDescription}`;
- } else {
- this.receipt.description =
- `${accountingType && accountingType.receiptDescription}`;
+
+ this.receipt.description = [];
+ this.viewReceipt = accountingType.code == 'cash';
+ 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 = new Date();
+ this.receipt.payed = Date.vnNew();
if (accountingType.daysInFuture)
this.receipt.payed.setDate(this.receipt.payed.getDate() + accountingType.daysInFuture);
}
@@ -111,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 2c4ed1940..fa6b48ea4 100644
--- a/modules/client/front/balance/create/index.spec.js
+++ b/modules/client/front/balance/create/index.spec.js
@@ -75,7 +75,6 @@ describe('Client', () => {
jest.spyOn(controller.vnReport, 'show');
controller.$params = {id: 1101};
- controller.viewReceipt = false;
$httpBackend.expect('POST', `Clients/1101/createReceipt`).respond({id: 1});
controller.responseHandler('accept');
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/consumption/index.js b/modules/client/front/consumption/index.js
index d9b657318..eb3a10dd6 100644
--- a/modules/client/front/consumption/index.js
+++ b/modules/client/front/consumption/index.js
@@ -17,11 +17,11 @@ class Controller extends Section {
}
setDefaultFilter() {
- const minDate = new Date();
+ const minDate = Date.vnNew();
minDate.setHours(0, 0, 0, 0);
minDate.setMonth(minDate.getMonth() - 2);
- const maxDate = new Date();
+ const maxDate = Date.vnNew();
maxDate.setHours(23, 59, 59, 59);
this.filterParams = {
diff --git a/modules/client/front/consumption/index.spec.js b/modules/client/front/consumption/index.spec.js
index 33cbce58f..f2acddbca 100644
--- a/modules/client/front/consumption/index.spec.js
+++ b/modules/client/front/consumption/index.spec.js
@@ -26,7 +26,7 @@ describe('Client', () => {
it('should call the window.open function', () => {
jest.spyOn(window, 'open').mockReturnThis();
- const now = new Date();
+ const now = Date.vnNew();
controller.$.model.userParams = {
from: now,
to: now
@@ -49,7 +49,7 @@ describe('Client', () => {
describe('sendEmail()', () => {
it('should make a GET query sending the report', () => {
- const now = new Date();
+ const now = Date.vnNew();
controller.$.model.userParams = {
from: now,
to: now
diff --git a/modules/client/front/credit-insurance/create/index.js b/modules/client/front/credit-insurance/create/index.js
index 83dc18806..e3138e459 100644
--- a/modules/client/front/credit-insurance/create/index.js
+++ b/modules/client/front/credit-insurance/create/index.js
@@ -5,7 +5,7 @@ class Controller extends Section {
constructor($element, $) {
super($element, $);
this.creditClassification = {
- started: this.$filter('date')(new Date(), 'yyyy-MM-dd HH:mm')
+ started: this.$filter('date')(Date.vnNew(), 'yyyy-MM-dd HH:mm')
};
}
diff --git a/modules/client/front/credit-insurance/create/index.spec.js b/modules/client/front/credit-insurance/create/index.spec.js
index 36a91ceca..c50afd5cf 100644
--- a/modules/client/front/credit-insurance/create/index.spec.js
+++ b/modules/client/front/credit-insurance/create/index.spec.js
@@ -24,7 +24,7 @@ describe('Client', () => {
describe('onSubmit()', () => {
it('should perform a POST query', () => {
- let started = new Date();
+ let started = Date.vnNew();
controller.creditClassification = {
started: started,
credit: 300,
diff --git a/modules/client/front/credit-insurance/index/index.js b/modules/client/front/credit-insurance/index/index.js
index 5f59c918a..b40025c65 100644
--- a/modules/client/front/credit-insurance/index/index.js
+++ b/modules/client/front/credit-insurance/index/index.js
@@ -52,7 +52,7 @@ class Controller extends Section {
}
returnDialog() {
- let params = {finished: Date.now()};
+ let params = {finished: Date.vnNow()};
this.$http.patch(`CreditClassifications/${this.classificationId}`, params).then(() => {
this._getClassifications(this.client.id);
});
diff --git a/modules/client/front/credit-insurance/index/index.spec.js b/modules/client/front/credit-insurance/index/index.spec.js
index 8629db684..af072691a 100644
--- a/modules/client/front/credit-insurance/index/index.spec.js
+++ b/modules/client/front/credit-insurance/index/index.spec.js
@@ -39,7 +39,7 @@ describe('Client', () => {
it(`should return false if finds a classification without due date`, () => {
controller.classifications = [
- {finished: Date.now()},
+ {finished: Date.vnNow()},
{finished: null}
];
@@ -50,8 +50,8 @@ describe('Client', () => {
it(`should return true if all classifications are defined with due date`, () => {
controller.classifications = [
- {finished: Date.now()},
- {finished: Date.now()}
+ {finished: Date.vnNow()},
+ {finished: Date.vnNow()}
];
let result = controller.canCreateNew();
diff --git a/modules/client/front/credit-insurance/insurance/create/index.js b/modules/client/front/credit-insurance/insurance/create/index.js
index 94de53352..9eae5bfa9 100644
--- a/modules/client/front/credit-insurance/insurance/create/index.js
+++ b/modules/client/front/credit-insurance/insurance/create/index.js
@@ -5,7 +5,7 @@ class Controller extends Section {
constructor($element, $) {
super($element, $);
this.insurance = {
- created: this.$filter('date')(new Date(), 'yyyy-MM-dd HH:mm:ss')
+ created: this.$filter('date')(Date.vnNew(), 'yyyy-MM-dd HH:mm:ss')
};
}
diff --git a/modules/client/front/defaulter/index.js b/modules/client/front/defaulter/index.js
index 4beadfda6..bfadc5c6a 100644
--- a/modules/client/front/defaulter/index.js
+++ b/modules/client/front/defaulter/index.js
@@ -82,7 +82,7 @@ export default class Controller extends Section {
chipColor(date) {
const day = 24 * 60 * 60 * 1000;
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
const observationShipped = new Date(date);
diff --git a/modules/client/front/defaulter/index.spec.js b/modules/client/front/defaulter/index.spec.js
index 0732c68a1..f92378d08 100644
--- a/modules/client/front/defaulter/index.spec.js
+++ b/modules/client/front/defaulter/index.spec.js
@@ -38,14 +38,14 @@ describe('client defaulter', () => {
describe('chipColor()', () => {
it('should return undefined when the date is the present', () => {
- let today = new Date();
+ let today = Date.vnNew();
let result = controller.chipColor(today);
expect(result).toEqual(undefined);
});
it('should return warning when the date is 10 days in the past', () => {
- let pastDate = new Date();
+ let pastDate = Date.vnNew();
pastDate = pastDate.setDate(pastDate.getDate() - 11);
let result = controller.chipColor(pastDate);
@@ -53,7 +53,7 @@ describe('client defaulter', () => {
});
it('should return alert when the date is 20 days in the past', () => {
- let pastDate = new Date();
+ let pastDate = Date.vnNew();
pastDate = pastDate.setDate(pastDate.getDate() - 21);
let result = controller.chipColor(pastDate);
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">
+
+
@@ -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`) + '
\ No newline at end of file
+
diff --git a/modules/client/front/unpaid/index.js b/modules/client/front/unpaid/index.js
index a8ff64386..1585b808d 100644
--- a/modules/client/front/unpaid/index.js
+++ b/modules/client/front/unpaid/index.js
@@ -4,11 +4,19 @@ import Section from 'salix/components/section';
export default class Controller extends Section {
setDefaultDate(hasData) {
if (hasData && !this.clientUnpaid.dated)
- this.clientUnpaid.dated = new Date();
+ 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/unpaid/index.spec.js b/modules/client/front/unpaid/index.spec.js
index bfeb7df19..0f6460a03 100644
--- a/modules/client/front/unpaid/index.spec.js
+++ b/modules/client/front/unpaid/index.spec.js
@@ -14,7 +14,7 @@ describe('client unpaid', () => {
describe('setDefaultDate()', () => {
it(`should not set today date if has dated`, () => {
const hasData = true;
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setDate(yesterday.getDate() - 1);
controller.clientUnpaid = {
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/latestBuysFilter.js b/modules/entry/back/methods/entry/latestBuysFilter.js
index b920f4b58..30d47a2a3 100644
--- a/modules/entry/back/methods/entry/latestBuysFilter.js
+++ b/modules/entry/back/methods/entry/latestBuysFilter.js
@@ -150,10 +150,10 @@ module.exports = Self => {
const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
stmt = new ParameterizedSQL(`
- SELECT
+ SELECT
i.image,
i.id AS itemFk,
i.size,
@@ -209,7 +209,7 @@ module.exports = Self => {
LEFT JOIN itemType t ON t.id = i.typeFk
LEFT JOIN intrastat intr ON intr.id = i.intrastatFk
LEFT JOIN origin ori ON ori.id = i.originFk
- LEFT JOIN entry e ON e.id = b.entryFk AND e.created >= DATE_SUB(? ,INTERVAL 1 YEAR)
+ LEFT JOIN entry e ON e.id = b.entryFk AND e.created >= DATE_SUB(? ,INTERVAL 1 YEAR)
LEFT JOIN supplier s ON s.id = e.supplierFk`
, [userConfig.warehouseFk, date]);
diff --git a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js
index 9b1e60532..0578fcdd4 100644
--- a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js
+++ b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js
@@ -332,10 +332,10 @@ describe('Entry latests buys filter()', () => {
const options = {transaction: tx};
try {
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
- const to = new Date();
+ const to = Date.vnNew();
to.setHours(23, 59, 59, 999);
const ctx = {
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 48b4d1be0..5aa175758 100644
--- a/modules/entry/back/models/entry.json
+++ b/modules/entry/back/models/entry.json
@@ -78,6 +78,9 @@
"companyFk": {
"type": "number",
"required": true
+ },
+ "observationEditorFk": {
+ "type": "number"
}
},
"relations": {
@@ -100,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}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{name}}
+
+ {{category.name}}
+
>
+
+
+
+
+
+
+ {{name}}: {{nickname}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tags
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Id/Name: {{$ctrl.filter.search}}
+
+
+ {{category.selection.name}}
+
+
+ {{type.selection.name}}
+
+
+ Sales person: {{salesPerson.selection.nickname}}
+
+
+ Supplier: {{supplier.selection.name}}
+
+
+ From: {{$ctrl.filter.from | date:'dd/MM/yyyy'}}
+
+
+ To: {{$ctrl.filter.to | date:'dd/MM/yyyy'}}
+
+
+ Active: {{$ctrl.filter.active ? '✓' : '✗'}}
+
+
+ Floramondo: {{$ctrl.filter.floramondo ? '✓' : '✗'}}
+
+
+ Visible: {{$ctrl.filter.visible ? '✓' : '✗'}}
+
+
+ {{$ctrl.showTagInfo(chipTag)}}
+
+
+
+
diff --git a/modules/entry/front/latest-buys-search-panel/index.js b/modules/entry/front/latest-buys-search-panel/index.js
index 83dc88724..4078580ea 100644
--- a/modules/entry/front/latest-buys-search-panel/index.js
+++ b/modules/entry/front/latest-buys-search-panel/index.js
@@ -1,67 +1,61 @@
import ngModule from '../module';
import SearchPanel from 'core/components/searchbar/search-panel';
+import './style.scss';
class Controller extends SearchPanel {
constructor($element, $) {
super($element, $);
- let model = 'Item';
- let moreFields = ['description', 'name'];
+ }
- let properties;
- let validations = window.validations;
+ $onInit() {
+ this.filter = {
+ isActive: true,
+ tags: []
+ };
+ }
- if (validations && validations[model])
- properties = validations[model].properties;
- else
- properties = {};
-
- this.moreFields = [];
- for (let field of moreFields) {
- let prop = properties[field];
- this.moreFields.push({
- name: field,
- label: prop ? prop.description : field,
- type: prop ? prop.type : null
- });
+ changeCategory(id) {
+ if (this.filter.categoryFk != id) {
+ this.filter.categoryFk = id;
+ this.addFilters();
}
}
- get filter() {
- let filter = this.$.filter;
-
- for (let fieldFilter of this.fieldFilters)
- filter[fieldFilter.name] = fieldFilter.value;
-
- return filter;
+ removeItemFilter(param) {
+ this.filter[param] = null;
+ if (param == 'categoryFk') this.filter['typeFk'] = null;
+ this.addFilters();
}
- set filter(value) {
- if (!value)
- value = {};
- if (!value.tags)
- value.tags = [{}];
+ removeTag(tag) {
+ const index = this.filter.tags.indexOf(tag);
+ if (index > -1) this.filter.tags.splice(index, 1);
+ this.addFilters();
+ }
- this.fieldFilters = [];
- for (let field of this.moreFields) {
- if (value[field.name] != undefined) {
- this.fieldFilters.push({
- name: field.name,
- value: value[field.name],
- info: field
- });
- }
+ onKeyPress($event) {
+ if ($event.key === 'Enter')
+ this.addFilters();
+ }
+
+ addFilters() {
+ for (let i = 0; i < this.filter.tags.length; i++) {
+ if (!this.filter.tags[i].value)
+ this.filter.tags.splice(i, 1);
}
-
- this.$.filter = value;
+ return this.model.addFilter({}, this.filter);
}
- removeField(index, field) {
- this.fieldFilters.splice(index, 1);
- delete this.$.filter[field];
+ showTagInfo(itemTag) {
+ if (!itemTag.tagFk) return itemTag.value;
+ return `${this.tags.find(tag => tag.id == itemTag.tagFk).name}: ${itemTag.value}`;
}
}
ngModule.component('vnLatestBuysSearchPanel', {
template: require('./index.html'),
- controller: Controller
+ controller: Controller,
+ bindings: {
+ model: '<'
+ }
});
diff --git a/modules/entry/front/latest-buys-search-panel/index.spec.js b/modules/entry/front/latest-buys-search-panel/index.spec.js
index 9e187a25a..c3c5acbfb 100644
--- a/modules/entry/front/latest-buys-search-panel/index.spec.js
+++ b/modules/entry/front/latest-buys-search-panel/index.spec.js
@@ -10,50 +10,46 @@ describe('Entry', () => {
beforeEach(angular.mock.inject($componentController => {
$element = angular.element(`
-
-
-
+
+
+
Create
+ Save
-
{{$ctrl.entryData.travel.ref}}
@@ -114,8 +114,7 @@
Grouping
Buying value
Import
- Grouping price
- Packing price
+ PVP
@@ -125,19 +124,18 @@
{{::line.packageFk | dashIfEmpty}}
{{::line.weight}}
-
+
{{::line.packing | dashIfEmpty}}
-
+
{{::line.grouping | dashIfEmpty}}
{{::line.buyingValue | currency: 'EUR':2}}
{{::line.quantity * line.buyingValue | currency: 'EUR':2}}
- {{::line.price2 | currency: 'EUR':2}}
- {{::line.price3 | currency: 'EUR':2}}
+ {{::line.price2 | currency: 'EUR':2 | dashIfEmpty}} / {{::line.price3 | currency: 'EUR':2 | dashIfEmpty}}
@@ -150,7 +148,7 @@
- {{::line.item.id | zeroFill:6}}
+ {{::line.item.id}}
@@ -195,7 +193,7 @@
vn-id="item-descriptor"
warehouse-fk="$ctrl.vnConfig.warehouseFk">
-
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/specs/filter.spec.js b/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
index 401b8dab0..adab3cbeb 100644
--- a/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
@@ -146,8 +146,8 @@ describe('InvoiceIn filter()', () => {
const options = {transaction: tx};
try {
- const from = new Date();
- const to = new Date();
+ const from = Date.vnNew();
+ const to = Date.vnNew();
from.setHours(0, 0, 0, 0);
to.setHours(23, 59, 59, 999);
to.setDate(to.getDate() + 1);
diff --git a/modules/invoiceIn/back/models/invoice-in.json b/modules/invoiceIn/back/models/invoice-in.json
index fa8a1d8f8..c6a736b06 100644
--- a/modules/invoiceIn/back/models/invoice-in.json
+++ b/modules/invoiceIn/back/models/invoice-in.json
@@ -94,11 +94,6 @@
"model": "Supplier",
"foreignKey": "supplierFk"
},
- "supplierContact": {
- "type": "hasMany",
- "model": "SupplierContact",
- "foreignKey": "supplierFk"
- },
"currency": {
"type": "belongsTo",
"model": "Currency",
diff --git a/modules/invoiceIn/front/basic-data/index.spec.js b/modules/invoiceIn/front/basic-data/index.spec.js
index 09aa08293..98710ac35 100644
--- a/modules/invoiceIn/front/basic-data/index.spec.js
+++ b/modules/invoiceIn/front/basic-data/index.spec.js
@@ -78,7 +78,7 @@ describe('InvoiceIn', () => {
description: 'This is a description',
files: [{
lastModified: 1668673957761,
- lastModifiedDate: new Date(),
+ lastModifiedDate: Date.vnNew(),
name: 'file-example.png',
size: 19653,
type: 'image/png',
diff --git a/modules/invoiceIn/front/card/index.js b/modules/invoiceIn/front/card/index.js
index c7ac08cc7..48217faa5 100644
--- a/modules/invoiceIn/front/card/index.js
+++ b/modules/invoiceIn/front/card/index.js
@@ -6,13 +6,15 @@ class Controller extends ModuleCard {
const filter = {
include: [
{
- relation: 'supplier'
- },
- {
- relation: 'supplierContact',
+ relation: 'supplier',
scope: {
- where: {
- email: {neq: null}
+ include: {
+ relation: 'contacts',
+ scope: {
+ where: {
+ email: {neq: null},
+ }
+ }
}
}
},
diff --git a/modules/invoiceIn/front/descriptor/index.html b/modules/invoiceIn/front/descriptor/index.html
index 223914c9c..c4330fbf0 100644
--- a/modules/invoiceIn/front/descriptor/index.html
+++ b/modules/invoiceIn/front/descriptor/index.html
@@ -40,7 +40,7 @@
Send agricultural receipt as PDF
diff --git a/modules/invoiceIn/front/descriptor/index.js b/modules/invoiceIn/front/descriptor/index.js
index 4dc89a459..e005211a3 100644
--- a/modules/invoiceIn/front/descriptor/index.js
+++ b/modules/invoiceIn/front/descriptor/index.js
@@ -75,7 +75,7 @@ class Controller extends Descriptor {
filter: {
where: {
invoiceInFk: id,
- dueDated: {gte: new Date()}
+ dueDated: {gte: Date.vnNew()}
}
}})
.then(res => {
diff --git a/modules/invoiceIn/front/dueDay/index.js b/modules/invoiceIn/front/dueDay/index.js
index 3cc1c81e8..ee9b13e5c 100644
--- a/modules/invoiceIn/front/dueDay/index.js
+++ b/modules/invoiceIn/front/dueDay/index.js
@@ -4,7 +4,7 @@ import Section from 'salix/components/section';
class Controller extends Section {
add() {
this.$.model.insert({
- dueDated: new Date(),
+ dueDated: Date.vnNew(),
bankFk: this.vnConfig.local.bankFk
});
}
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}}
- {{::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 d42184ae5..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 = new Date();
- 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 = new Date();
- 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/createManualInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
index 297afa8e8..a458aa18e 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
@@ -108,14 +108,14 @@ module.exports = Self => {
throw new UserError(`This client is not invoiceable`);
// Can't invoice tickets into future
- const tomorrow = new Date();
+ const tomorrow = Date.vnNew();
tomorrow.setDate(tomorrow.getDate() + 1);
if (maxShipped >= tomorrow)
throw new UserError(`Can't invoice to future`);
const maxInvoiceDate = await getMaxIssued(args.serial, companyId, myOptions);
- if (new Date() < maxInvoiceDate)
+ if (Date.vnNew() < maxInvoiceDate)
throw new UserError(`Can't invoice to past`);
if (ticketId) {
@@ -155,7 +155,7 @@ module.exports = Self => {
async function isInvoiceable(clientId, options) {
const models = Self.app.models;
const query = `SELECT (hasToInvoice AND isTaxDataChecked) AS invoiceable
- FROM client
+ FROM client
WHERE id = ?`;
const [result] = await models.InvoiceOut.rawSql(query, [clientId], options);
@@ -172,12 +172,12 @@ module.exports = Self => {
async function getMaxIssued(serial, companyId, options) {
const models = Self.app.models;
- const query = `SELECT MAX(issued) AS issued
- FROM invoiceOut
+ const query = `SELECT MAX(issued) AS issued
+ FROM invoiceOut
WHERE serial = ? AND companyFk = ?`;
const [maxIssued] = await models.InvoiceOut.rawSql(query,
[serial, companyId], options);
- const maxInvoiceDate = maxIssued && maxIssued.issued || new Date();
+ const maxInvoiceDate = maxIssued && maxIssued.issued || Date.vnNew();
return maxInvoiceDate;
}
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`) + ':${failedClient.id}
- ${failedClient.stacktrace}
-
-
{{$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 @@
+
+
+
+
+
+
+ Build packaging tickets
+
+
+ {{'Invoicing client' | translate}} {{$ctrl.currentAddress.clientId}}
+
+
+ Stopping process
+
+
+ Ended process
+
+
+
+ {{$ctrl.percentage | percentage: 0}} ({{$ctrl.addressNumber}} {{'of' | translate}} {{$ctrl.nAddresses}})
+
+
+
+
+
+
+ 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..0ac0223b4
--- /dev/null
+++ b/modules/invoiceOut/front/global-invoicing/index.js
@@ -0,0 +1,133 @@
+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)
+ .catch(res => {
+ this.errors.unshift({
+ address,
+ message: res.data.error.message
+ });
+ })
+ .finally(() => {
+ 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
-
-
-
-
-
-
-
-
-
- {{'Calculating packages to invoice...' | translate}}
-
-
-
-
-
- {{'Id Client' | translate}}: {{$ctrl.currentClientId}}
- {{'of' | translate}} {{::$ctrl.lastClientId}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{::id}} - {{::name}}
-
-
- {{::id}} - {{::name}}
-
-
-
-
-
-
-
-
- Invoice {{$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 f772a4936..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: new Date()
- };
- 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 @@
-
-
-
-
-
-
- Manual invoicing
-
-
- Global invoicing
-
-
-
+
+
-
-
\ 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">
-
- Invoicing in progress...
@@ -80,4 +80,4 @@
Make invoice
-
\ No newline at end of file
+
diff --git a/modules/invoiceOut/front/index/manual/index.js b/modules/invoiceOut/front/index/manual/index.js
index ed50e37da..3abe4b825 100644
--- a/modules/invoiceOut/front/index/manual/index.js
+++ b/modules/invoiceOut/front/index/manual/index.js
@@ -8,7 +8,7 @@ class Controller extends Dialog {
this.isInvoicing = false;
this.invoice = {
- maxShipped: new Date()
+ maxShipped: Date.vnNew()
};
}
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/specs/upsertFixedPrice.spec.js b/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js
index 68eacfbad..5a47de6bf 100644
--- a/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js
+++ b/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js
@@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('upsertFixedPrice()', () => {
- const now = new Date();
+ const now = Date.vnNew();
const fixedPriceId = 1;
let originalFixedPrice;
@@ -72,4 +72,45 @@ describe('upsertFixedPrice()', () => {
throw e;
}
});
+
+ it(`should recalculate rate2 if change rate3`, async() => {
+ const tx = await models.FixedPrice.beginTransaction({});
+
+ const tomorrow = new Date(now);
+ tomorrow.setDate(tomorrow.getDate() + 1);
+
+ const rate2 = 2;
+ const firstRate3 = 1;
+ const secondRate3 = 2;
+ try {
+ const options = {transaction: tx};
+ const ctx = {args: {
+ id: undefined,
+ itemFk: 1,
+ warehouseFk: 1,
+ started: tomorrow,
+ ended: tomorrow,
+ rate2: rate2,
+ rate3: firstRate3,
+ minPrice: 0,
+ hasMinPrice: false
+ }};
+
+ // create new fixed price
+ const newFixedPrice = await models.FixedPrice.upsertFixedPrice(ctx, options);
+
+ // change rate3 to same fixed price id
+ ctx.args.id = newFixedPrice.id;
+ ctx.args.rate3 = secondRate3;
+
+ const result = await models.FixedPrice.upsertFixedPrice(ctx, options);
+
+ expect(result.rate2).not.toEqual(rate2);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
});
diff --git a/modules/item/back/methods/fixed-price/upsertFixedPrice.js b/modules/item/back/methods/fixed-price/upsertFixedPrice.js
index ad35ec3a1..eb3eec1bd 100644
--- a/modules/item/back/methods/fixed-price/upsertFixedPrice.js
+++ b/modules/item/back/methods/fixed-price/upsertFixedPrice.js
@@ -72,6 +72,16 @@ module.exports = Self => {
try {
delete args.ctx; // removed unwanted data
+
+ if (args.id) {
+ const beforeFixedPrice = await models.FixedPrice.findById(args.id, {fields: ['rate3']}, myOptions);
+ const [result] = await Self.rawSql(`SELECT vn.priceFixed_getRate2(?, ?) as rate2`,
+ [args.id, args.rate3], myOptions);
+
+ if (beforeFixedPrice.rate3 != args.rate3 && result && result.rate2)
+ args.rate2 = result.rate2;
+ }
+
const fixedPrice = await models.FixedPrice.upsert(args, myOptions);
const targetItem = await models.Item.findById(args.itemFk, null, myOptions);
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..cdc0fe049
--- /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
index 05b223598..7f53df95a 100644
--- a/modules/item/back/methods/item-image-queue/downloadImages.js
+++ b/modules/item/back/methods/item-image-queue/downloadImages.js
@@ -1,6 +1,7 @@
const https = require('https');
const fs = require('fs-extra');
const path = require('path');
+const uuid = require('uuid');
module.exports = Self => {
Self.remoteMethod('downloadImages', {
@@ -27,7 +28,7 @@ module.exports = Self => {
});
for (let image of images) {
- const currentStamp = new Date().getTime();
+ 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;
@@ -46,10 +47,8 @@ module.exports = Self => {
if (!image) return;
- const srcFile = image.url;
- const fileName = srcFile.replace(/\.|\/|:|\?|\\|=|%/g, '');
- const file = `${fileName}.png`;
- const filePath = path.join(tempPath, file);
+ const fileName = `${uuid.v4()}.png`;
+ const filePath = path.join(tempPath, fileName);
const imageUrl = image.url.replace('http://', 'https://');
https.get(imageUrl, async response => {
@@ -60,17 +59,10 @@ module.exports = Self => {
}
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('open', () => response.pipe(writeStream));
+ writeStream.on('error', async error =>
+ await errorHandler(image.itemFk, error, filePath));
+ writeStream.on('finish', () => writeStream.end());
writeStream.on('close', async function() {
try {
@@ -97,7 +89,7 @@ module.exports = Self => {
await row.updateAttributes({
error: error,
attempts: row.attempts + 1,
- updated: new Date()
+ updated: Date.vnNew()
});
}
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/getVisibleAvailable.js b/modules/item/back/methods/item/getVisibleAvailable.js
index b291ad9b4..612f64022 100644
--- a/modules/item/back/methods/item/getVisibleAvailable.js
+++ b/modules/item/back/methods/item/getVisibleAvailable.js
@@ -29,7 +29,7 @@ module.exports = Self => {
}
});
- Self.getVisibleAvailable = async(id, warehouseFk, dated = new Date(), options) => {
+ Self.getVisibleAvailable = async(id, warehouseFk, dated = Date.vnNew(), options) => {
const myOptions = {};
if (typeof options == 'object')
diff --git a/modules/item/back/methods/item/getWasteByItem.js b/modules/item/back/methods/item/getWasteByItem.js
index b93d534da..56b90b04a 100644
--- a/modules/item/back/methods/item/getWasteByItem.js
+++ b/modules/item/back/methods/item/getWasteByItem.js
@@ -32,7 +32,7 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const wastes = await Self.rawSql(`
SELECT *, 100 * dwindle / total AS percentage
@@ -43,7 +43,7 @@ module.exports = Self => {
sum(ws.saleTotal) AS total,
sum(ws.saleWaste) AS dwindle
FROM bs.waste ws
- WHERE buyer = ? AND family = ?
+ WHERE buyer = ? AND family = ?
AND year = YEAR(TIMESTAMPADD(WEEK,-1, ?))
AND week = WEEK(TIMESTAMPADD(WEEK,-1, ?), 1)
GROUP BY buyer, itemFk
diff --git a/modules/item/back/methods/item/getWasteByWorker.js b/modules/item/back/methods/item/getWasteByWorker.js
index 4c3c64a91..8fa351eed 100644
--- a/modules/item/back/methods/item/getWasteByWorker.js
+++ b/modules/item/back/methods/item/getWasteByWorker.js
@@ -19,7 +19,7 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const wastes = await Self.rawSql(`
SELECT *, 100 * dwindle / total AS percentage
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 fae37836f..d066f2c9f 100644
--- a/modules/item/back/methods/item/new.js
+++ b/modules/item/back/methods/item/new.js
@@ -37,7 +37,8 @@ module.exports = Self => {
'typeFk',
'intrastatFk',
'originFk',
- 'relevancy'
+ 'priority',
+ 'tag'
];
for (const key in params) {
@@ -46,12 +47,17 @@ module.exports = Self => {
}
try {
+ const itemConfig = await models.ItemConfig.findOne({fields: ['validPriorities']}, myOptions);
+ if (!itemConfig.validPriorities.includes(params.priority))
+ throw new UserError(`Valid priorities: ${[...itemConfig.validPriorities]}`);
+
const provisionalName = params.provisionalName;
delete params.provisionalName;
- const itemType = await models.ItemType.findById(params.typeFk, myOptions);
+ 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);
@@ -63,13 +69,14 @@ module.exports = Self => {
await Self.rawSql(query, null, myOptions);
- let nameTag = await models.Tag.findOne({where: {name: 'Nombre temporal'}});
+ const nameTag = await models.Tag.findById(params.tag, {fields: ['id']}, myOptions);
let newTags = [];
- newTags.push({itemFk: item.id, tagFk: nameTag.id, value: provisionalName, priority: '2'});
+ newTags.push({itemFk: item.id, tagFk: nameTag.id, value: provisionalName, priority: item.priority});
typeTags.forEach(typeTag => {
- newTags.push({itemFk: item.id, tagFk: typeTag.tagFk, value: '', priority: typeTag.priority});
+ if (nameTag.id != typeTag.tagFk)
+ newTags.push({itemFk: item.id, tagFk: typeTag.tagFk, value: '', priority: typeTag.priority});
});
await models.ItemTag.create(newTags, myOptions);
diff --git a/modules/item/back/methods/item/regularize.js b/modules/item/back/methods/item/regularize.js
index 0878e3242..dfbcaa69f 100644
--- a/modules/item/back/methods/item/regularize.js
+++ b/modules/item/back/methods/item/regularize.js
@@ -94,8 +94,8 @@ module.exports = Self => {
}
async function createTicket(ctx, options) {
- ctx.args.shipped = new Date();
- ctx.args.landed = new Date();
+ ctx.args.shipped = Date.vnNew();
+ ctx.args.landed = Date.vnNew();
ctx.args.companyId = null;
ctx.args.agencyModeId = null;
ctx.args.routeId = null;
@@ -106,10 +106,10 @@ module.exports = Self => {
}
async function getTicketId(params, options) {
- const minDate = new Date();
+ const minDate = Date.vnNew();
minDate.setHours(0, 0, 0, 0);
- const maxDate = new Date();
+ const maxDate = Date.vnNew();
maxDate.setHours(23, 59, 59, 59);
let ticket = await Self.app.models.Ticket.findOne({
diff --git a/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js b/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js
index 8e4864ee8..61bf6b3e7 100644
--- a/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js
+++ b/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js
@@ -8,11 +8,11 @@ describe('item getVisibleAvailable()', () => {
try {
const itemFk = 1;
const warehouseFk = 1;
- const dated = new Date();
+ const dated = Date.vnNew();
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();
@@ -29,7 +29,7 @@ describe('item getVisibleAvailable()', () => {
try {
const itemFk = 1;
const warehouseFk = 1;
- const dated = new Date();
+ const dated = Date.vnNew();
dated.setDate(dated.getDate() - 1);
const result = await models.Item.getVisibleAvailable(itemFk, warehouseFk, dated, options);
diff --git a/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js b/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
index 25e661aee..00488e534 100644
--- a/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
+++ b/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
@@ -1,9 +1,9 @@
const {models} = require('vn-loopback/server/server');
describe('item lastEntriesFilter()', () => {
it('should return one entry for the given item', async() => {
- const minDate = new Date();
+ const minDate = Date.vnNew();
minDate.setHours(0, 0, 0, 0);
- const maxDate = new Date();
+ const maxDate = Date.vnNew();
maxDate.setHours(23, 59, 59, 59);
const tx = await models.Item.beginTransaction({});
@@ -23,11 +23,11 @@ describe('item lastEntriesFilter()', () => {
});
it('should return five entries for the given item', async() => {
- const minDate = new Date();
+ const minDate = Date.vnNew();
minDate.setHours(0, 0, 0, 0);
minDate.setMonth(minDate.getMonth() - 2, 1);
- const maxDate = new Date();
+ const maxDate = Date.vnNew();
maxDate.setHours(23, 59, 59, 59);
const tx = await models.Item.beginTransaction({});
diff --git a/modules/item/back/methods/item/specs/new.spec.js b/modules/item/back/methods/item/specs/new.spec.js
index 7364faa7d..e34ab2cf5 100644
--- a/modules/item/back/methods/item/specs/new.spec.js
+++ b/modules/item/back/methods/item/specs/new.spec.js
@@ -11,7 +11,8 @@ describe('item new()', () => {
originFk: 1,
provisionalName: 'planta',
typeFk: 2,
- relevancy: 0
+ priority: 2,
+ tag: 1
};
let item = await models.Item.new(itemParams, options);
@@ -20,7 +21,7 @@ describe('item new()', () => {
item.isLaid = itemType.isLaid;
- const temporalNameTag = await models.Tag.findOne({where: {name: 'Nombre temporal'}}, options);
+ const temporalNameTag = await models.Tag.findById(itemParams.tag, {fields: ['id']}, options);
const temporalName = await models.ItemTag.findOne({
where: {
@@ -31,7 +32,7 @@ describe('item new()', () => {
item = await models.Item.findById(item.id, null, options);
- itemType = await models.ItemType.findById(item.typeFk, options);
+ itemType = await models.ItemType.findById(item.typeFk, {fields: ['isLaid']}, options);
item.isLaid = itemType.isLaid;
diff --git a/modules/item/back/methods/tag/onSubmit.js b/modules/item/back/methods/tag/onSubmit.js
new file mode 100644
index 000000000..7abbe60d4
--- /dev/null
+++ b/modules/item/back/methods/tag/onSubmit.js
@@ -0,0 +1,81 @@
+
+module.exports = function(Self) {
+ Self.remoteMethodCtx('onSubmit', {
+ description: 'Save model changes',
+ accessType: 'WRITE',
+ accepts: [
+ {
+ arg: 'creates',
+ type: ['object'],
+ description: 'The itemTags records to create'
+ }, {
+ arg: 'deletes',
+ type: ['number'],
+ description: 'The itemTags ids to delete'
+ }, {
+ arg: 'updates',
+ type: ['object'],
+ description: 'The itemTags records to update'
+ }, {
+ arg: 'maxPriority',
+ type: 'number',
+ description: 'The maxPriority value'
+ }
+ ],
+ returns: {
+ root: true,
+ type: 'object'
+ },
+ http: {
+ verb: 'PATCH',
+ path: '/onSubmit'
+ }
+ });
+
+ Self.onSubmit = 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 {
+ if (args.deletes) {
+ for (const itemTagId of args.deletes)
+ await models.ItemTag.destroyById(itemTagId, myOptions);
+ }
+
+ if (args.updates) {
+ for (const row of args.updates) {
+ if (row.data.priority) {
+ const itemTag = await models.ItemTag.findById(row.where.id, null, myOptions);
+ await itemTag.updateAttributes({
+ priority: row.data.priority + args.maxPriority
+ }, myOptions);
+ }
+ }
+ for (const row of args.updates) {
+ const itemTag = await models.ItemTag.findById(row.where.id, null, myOptions);
+ await itemTag.updateAttributes(row.data, myOptions);
+ }
+ }
+
+ if (args.creates) {
+ for (const itemTag of args.creates)
+ await models.ItemTag.create(itemTag, myOptions);
+ }
+
+ if (tx) await tx.commit();
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/item/back/methods/tag/specs/onSubmit.spec.js b/modules/item/back/methods/tag/specs/onSubmit.spec.js
new file mode 100644
index 000000000..f24aad7e4
--- /dev/null
+++ b/modules/item/back/methods/tag/specs/onSubmit.spec.js
@@ -0,0 +1,96 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('tag onSubmit()', () => {
+ it('should delete a tag', async() => {
+ const tx = await models.Item.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ const deletes = [40];
+ const ctx = {
+ args: {
+ deletes: deletes
+ }
+ };
+ await models.Tag.onSubmit(ctx, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should update a tag', async() => {
+ const tx = await models.Item.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ const updates = [{data: {value: 'Container Test'}, where: {id: 36}}];
+ const ctx = {
+ args: {
+ updates: updates
+ }
+ };
+ await models.Tag.onSubmit(ctx, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should create a tag', async() => {
+ const tx = await models.Item.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ const creates = [{
+ 'itemFk': '6',
+ 'priority': 8,
+ '$orgIndex': null,
+ '$oldData': null,
+ '$isNew': true,
+ 'tagFk': 3,
+ 'value': 'madera'
+ }];
+ const ctx = {
+ args: {
+ creates: creates
+ }
+ };
+ await models.Tag.onSubmit(ctx, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should swap priority for two tags', async() => {
+ const tx = await models.Item.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ const updates = [
+ {data: {priority: 2}, where: {id: 36}},
+ {data: {priority: 1}, where: {id: 37}}
+ ];
+ const ctx = {
+ args: {
+ updates: updates,
+ maxPriority: 7,
+
+ }
+ };
+ await models.Tag.onSubmit(ctx, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/item/back/models/item-config.json b/modules/item/back/models/item-config.json
index 364879986..7ad1d8785 100644
--- a/modules/item/back/models/item-config.json
+++ b/modules/item/back/models/item-config.json
@@ -16,6 +16,25 @@
"wasteRecipients": {
"type": "string",
"description": "Buyers waste report recipients"
+ },
+ "validPriorities": {
+ "type": "array"
+ },
+ "defaultPriority": {
+ "type": "number"
+ },
+ "defaultTag": {
+ "type": "number"
+ },
+ "warehouseFk": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "tag": {
+ "type": "belongsTo",
+ "model": "Tag",
+ "foreignKey": "defaultTag"
}
}
-}
\ No newline at end of file
+}
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.json b/modules/item/back/models/item.json
index dc38a44e6..d6b3c27ad 100644
--- a/modules/item/back/models/item.json
+++ b/modules/item/back/models/item.json
@@ -147,6 +147,12 @@
},
"isLaid": {
"type": "boolean"
+ },
+ "isPhotoRequested": {
+ "type": "boolean",
+ "mysql":{
+ "columnName": "doPhoto"
+ }
}
},
"relations": {
diff --git a/modules/item/back/models/tag.js b/modules/item/back/models/tag.js
index 43fbc0db3..92760e34f 100644
--- a/modules/item/back/models/tag.js
+++ b/modules/item/back/models/tag.js
@@ -1,3 +1,4 @@
module.exports = Self => {
require('../methods/tag/filterValue')(Self);
+ require('../methods/tag/onSubmit')(Self);
};
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 @@
-
');
controller = $componentController('vnItemCard', {$element});
@@ -19,6 +22,7 @@ describe('Item', () => {
}));
it('should request data and set it on the controller', () => {
+ $httpBackend.expect('GET', `ItemConfigs/findOne`).respond({});
controller.reload();
$httpBackend.flush();
diff --git a/modules/item/front/create/index.html b/modules/item/front/create/index.html
index 6deaab1cd..15e212250 100644
--- a/modules/item/front/create/index.html
+++ b/modules/item/front/create/index.html
@@ -16,10 +16,24 @@
+
+
+
+
{
+ if (res.data) {
+ const dataRow = res.data[0];
+ dataRow.validPriorities.forEach(priority => {
+ this.validPriorities.push({priority});
+ });
+ this.item = {
+ priority: dataRow.defaultPriority,
+ tag: dataRow.defaultTag
+ };
+ }
+ });
}
onSubmit() {
diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html
index 321545b38..8e85e043f 100644
--- a/modules/item/front/descriptor/index.html
+++ b/modules/item/front/descriptor/index.html
@@ -19,7 +19,7 @@
Available
{{$ctrl.available | dashIfEmpty}}
+
+
+
+
+
+
-
{{$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 133b11b48..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() {
@@ -80,7 +83,7 @@ class Controller extends Descriptor {
}
onUploadResponse() {
- const timestamp = new Date().getTime();
+ const timestamp = Date.vnNew().getTime();
const src = this.$rootScope.imagePath('catalog', '200x200', this.item.id);
const zoomSrc = this.$rootScope.imagePath('catalog', '1600x900', this.item.id);
const newSrc = `${src}&t=${timestamp}`;
@@ -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 c997ea491..03134913f 100644
--- a/modules/item/front/diary/index.js
+++ b/modules/item/front/diary/index.js
@@ -7,7 +7,7 @@ class Controller extends Section {
super($element, $scope);
this.$anchorScroll = $anchorScroll;
this.$location = $location;
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
this.today = today.toJSON();
}
@@ -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 f9d177562..ce7cefe7a 100644
--- a/modules/item/front/fixed-price/index.html
+++ b/modules/item/front/fixed-price/index.html
@@ -131,7 +131,7 @@
class="dense"
vn-focus
ng-model="price.rate3"
- on-change="$ctrl.upsertPrice(price); $ctrl.recalculateRate2(price)"
+ on-change="$ctrl.upsertPrice(price);"
step="0.01"s>
diff --git a/modules/item/front/fixed-price/index.js b/modules/item/front/fixed-price/index.js
index f03d73f08..df2989043 100644
--- a/modules/item/front/fixed-price/index.js
+++ b/modules/item/front/fixed-price/index.js
@@ -113,24 +113,6 @@ export default class Controller extends Section {
return {[param]: value};
}
}
-
- recalculateRate2(price) {
- if (!price.id || !price.rate3) return;
-
- const query = 'FixedPrices/getRate2';
- const params = {
- fixedPriceId: price.id,
- rate3: price.rate3
- };
- this.$http.get(query, {params})
- .then(res => {
- const rate2 = res.data.rate2;
- if (rate2) {
- price.rate2 = rate2;
- this.upsertPrice(price);
- }
- });
- }
}
ngModule.vnComponent('vnFixedPrice', {
diff --git a/modules/item/front/fixed-price/index.spec.js b/modules/item/front/fixed-price/index.spec.js
index db9579444..42dd898b3 100644
--- a/modules/item/front/fixed-price/index.spec.js
+++ b/modules/item/front/fixed-price/index.spec.js
@@ -24,7 +24,7 @@ describe('fixed price', () => {
});
it('should perform an http request to update the price', () => {
- const now = new Date();
+ const now = Date.vnNew();
jest.spyOn(controller.vnApp, 'showSuccess');
$httpBackend.expectPATCH('FixedPrices/upsertFixedPrice').respond();
@@ -85,25 +85,5 @@ describe('fixed price', () => {
expect(controller.$.model.remove).toHaveBeenCalled();
});
});
-
- describe('recalculateRate2()', () => {
- it(`should rate2 recalculate`, () => {
- jest.spyOn(controller.vnApp, 'showSuccess');
- const price = {
- id: 1,
- itemFk: 1,
- rate2: 2,
- rate3: 2
- };
- const response = {rate2: 1};
- controller.recalculateRate2(price);
-
- const query = `FixedPrices/getRate2?fixedPriceId=${price.id}&rate3=${price.rate3}`;
- $httpBackend.expectGET(query).respond(response);
- $httpBackend.flush();
-
- expect(price.rate2).toEqual(response.rate2);
- });
- });
});
});
diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index 0348d4f66..f6cdf8343 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -9,15 +9,17 @@
-
+
@@ -35,8 +37,7 @@
Warehouse
Landed
Entry
- P.P.U
- P.P.P
+ PVP
Label
Packing
Grouping
@@ -51,7 +52,7 @@
-
@@ -65,30 +66,31 @@
{{::entry.entryFk | dashIfEmpty}}
- {{::entry.price2 | dashIfEmpty}}
- {{::entry.price3 | dashIfEmpty}}
+
+ {{::entry.price2 | currency: 'EUR':2 | dashIfEmpty}} / {{::entry.price3 | currency: 'EUR':2 | dashIfEmpty}}
+
{{entry.stickers | dashIfEmpty}}
-
+
{{::entry.packing | dashIfEmpty}}
-
+
{{::entry.grouping | dashIfEmpty}}
{{::entry.stems | dashIfEmpty}}
{{::entry.quantity}}
-
- {{::entry.cost | dashIfEmpty}}
+ {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue | currency: 'EUR':2 | dashIfEmpty}}
{{::entry.weight | dashIfEmpty}}
@@ -113,24 +115,24 @@
ng-click="contextmenu.filterBySelection()">
Filter by selection
-
Exclude selection
-
Remove filter
-
Remove all filters
-
Copy value
-
\ No newline at end of file
+
diff --git a/modules/item/front/last-entries/index.js b/modules/item/front/last-entries/index.js
index 014761da9..0c6804838 100644
--- a/modules/item/front/last-entries/index.js
+++ b/modules/item/front/last-entries/index.js
@@ -5,11 +5,11 @@ class Controller extends Section {
constructor($element, $) {
super($element, $);
- const from = new Date();
+ const from = Date.vnNew();
from.setDate(from.getDate() - 75);
from.setHours(0, 0, 0, 0);
- const to = new Date();
+ const to = Date.vnNew();
to.setDate(to.getDate() + 10);
to.setHours(23, 59, 59, 59);
diff --git a/modules/item/front/request-search-panel/index.spec.js b/modules/item/front/request-search-panel/index.spec.js
index 2fb339209..56c76eabf 100644
--- a/modules/item/front/request-search-panel/index.spec.js
+++ b/modules/item/front/request-search-panel/index.spec.js
@@ -15,7 +15,7 @@ describe(' Component vnRequestSearchPanel', () => {
it('should clear the scope days when setting the from property', () => {
controller.filter.scopeDays = 1;
- controller.from = new Date();
+ controller.from = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.from).toBeDefined();
@@ -26,7 +26,7 @@ describe(' Component vnRequestSearchPanel', () => {
it('should clear the scope days when setting the to property', () => {
controller.filter.scopeDays = 1;
- controller.to = new Date();
+ controller.to = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.to).toBeDefined();
@@ -35,8 +35,8 @@ describe(' Component vnRequestSearchPanel', () => {
describe('scopeDays() setter', () => {
it('should clear the date range when setting the scopeDays property', () => {
- controller.filter.from = new Date();
- controller.filter.to = new Date();
+ controller.filter.from = Date.vnNew();
+ controller.filter.to = Date.vnNew();
controller.scopeDays = 1;
diff --git a/modules/item/front/request/index.js b/modules/item/front/request/index.js
index 2fe08ada6..747cbeff2 100644
--- a/modules/item/front/request/index.js
+++ b/modules/item/front/request/index.js
@@ -7,10 +7,10 @@ export default class Controller extends Section {
super($element, $);
if (!this.$state.q) {
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
- const nextWeek = new Date();
+ const nextWeek = Date.vnNew();
nextWeek.setHours(23, 59, 59, 59);
nextWeek.setDate(nextWeek.getDate() + 7);
@@ -27,7 +27,7 @@ export default class Controller extends Section {
$params.scopeDays = 1;
if (typeof $params.scopeDays === 'number') {
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
const to = new Date(from.getTime());
@@ -82,7 +82,7 @@ export default class Controller extends Section {
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0);
diff --git a/modules/item/front/request/index.spec.js b/modules/item/front/request/index.spec.js
index 0fc061023..aadeaddca 100644
--- a/modules/item/front/request/index.spec.js
+++ b/modules/item/front/request/index.spec.js
@@ -93,7 +93,7 @@ describe('Item', () => {
});
it(`should return "warning" if date is today`, () => {
- let date = new Date();
+ let date = Date.vnNew();
let result = controller.compareDate(date);
expect(result).toEqual('warning');
diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html
index a4d40c829..46a2baef4 100644
--- a/modules/item/front/summary/index.html
+++ b/modules/item/front/summary/index.html
@@ -11,7 +11,7 @@
@@ -22,91 +22,110 @@
Available
{{$ctrl.summary.available}}
+
+
+
+
+
+
Basic data
-
-
-
-
-
-
-
{{$ctrl.summary.item.itemType.worker.user.name}}
+
+
+
+
Other data
-
-
-
-
-
-
-
Tags
@@ -119,14 +138,14 @@
Description
@@ -136,13 +155,13 @@
-
Tax
@@ -154,33 +173,33 @@
-
Botanical
-
-
-
Barcode
@@ -191,6 +210,6 @@
-
-
\ No newline at end of file
+
diff --git a/modules/item/front/summary/index.js b/modules/item/front/summary/index.js
index 52753ff65..e17a6a8c4 100644
--- a/modules/item/front/summary/index.js
+++ b/modules/item/front/summary/index.js
@@ -7,6 +7,24 @@ class Controller extends Summary {
this.$http.get(`Items/${this.item.id}/getSummary`).then(response => {
this.summary = response.data;
});
+
+ this.$http.get('ItemConfigs/findOne')
+ .then(res => {
+ if (this.card) this.card.warehouseFk = res.data.warehouseFk;
+ this.getWarehouseName(res.data.warehouseFk);
+ });
+ }
+
+ getWarehouseName(warehouseFk) {
+ const filter = {
+ where: {id: warehouseFk}
+ };
+ this.$http.get('Warehouses/findOne', {filter})
+ .then(res => {
+ this.warehouseText = this.$t('WarehouseFk', {
+ warehouseName: res.data.name
+ });
+ });
}
$onChanges() {
@@ -37,4 +55,7 @@ ngModule.vnComponent('vnItemSummary', {
bindings: {
item: '<',
},
+ require: {
+ card: '?^vnItemCard'
+ }
});
diff --git a/modules/item/front/summary/index.spec.js b/modules/item/front/summary/index.spec.js
index 0b349194c..d7821bea0 100644
--- a/modules/item/front/summary/index.spec.js
+++ b/modules/item/front/summary/index.spec.js
@@ -14,12 +14,15 @@ describe('Item', () => {
const $element = angular.element('
+ ng-show="$ctrl.wasteConfig[detail.buyer].hidden">
{{::waste.family}}
{{::(waste.percentage / 100) | percentage: 2}}
{{::waste.dwindle | currency: 'EUR'}}
{{::waste.total | currency: 'EUR'}}
+
diff --git a/modules/mdb/back/methods/mdbApp/lock.js b/modules/mdb/back/methods/mdbApp/lock.js
index 98e61fb53..a12a93814 100644
--- a/modules/mdb/back/methods/mdbApp/lock.js
+++ b/modules/mdb/back/methods/mdbApp/lock.js
@@ -51,7 +51,7 @@ module.exports = Self => {
const updatedMdbApp = await mdbApp.updateAttributes({
userFk: userId,
- locked: new Date()
+ locked: Date.vnNew()
}, myOptions);
if (tx) await tx.commit();
diff --git a/modules/mdb/back/methods/mdbVersion/upload.js b/modules/mdb/back/methods/mdbVersion/upload.js
index 1df4365a9..58fc46abb 100644
--- a/modules/mdb/back/methods/mdbVersion/upload.js
+++ b/modules/mdb/back/methods/mdbVersion/upload.js
@@ -26,6 +26,11 @@ module.exports = Self => {
type: 'string',
required: true,
description: `The old version number`
+ }, {
+ arg: 'description',
+ type: 'string',
+ required: false,
+ description: `The description of changes`
}, {
arg: 'unlock',
type: 'boolean',
@@ -42,8 +47,16 @@ module.exports = Self => {
verb: 'POST'
}
});
-
- Self.upload = async(ctx, appName, toVersion, branch, fromVersion, unlock, options) => {
+ Self.upload = async(
+ ctx,
+ appName,
+ toVersion,
+ branch,
+ fromVersion,
+ description,
+ unlock,
+ options
+ ) => {
const models = Self.app.models;
const myOptions = {};
const $t = ctx.req.__; // $translate
@@ -132,13 +145,49 @@ module.exports = Self => {
await fs.symlink(rootRelative, destinationRoot);
}
}
+ if (description) {
+ let formatDesc;
+ const mainBranches = new Set(['master', 'test', 'dev']);
+ if (mainBranches.has(branch))
+ formatDesc = `> :branch_${branch}: `;
+ else
+ formatDesc = `> :branch: `;
+ formatDesc += `*${appName.toUpperCase()}* v.${toVersion} `;
+
+ const oldVersion = await models.MdbVersionTree.findOne({
+ where: {
+ version: fromVersion,
+ app: appName
+ },
+ fields: ['branchFk']
+ }, myOptions);
+
+ if (!oldVersion || branch == oldVersion.branchFk)
+ formatDesc += `[*${branch}*]: `;
+ else
+ formatDesc += `[*${oldVersion.branchFk}* » *${branch}*]: `;
+
+ const params = await models.MdbConfig.findOne(myOptions);
+ const issueTrackerUrl = params.issueTrackerUrl;
+ const issueNumberRegex = params.issueNumberRegex;
+ const chatDestination = params.chatDestination;
+
+ const regex = new RegExp(issueNumberRegex, 'g');
+ formatDesc += description.replace(regex, (match, issueId) => {
+ const newUrl = issueTrackerUrl.replace('{index}', issueId);
+ return `[#${issueId}](${newUrl})`;
+ });
+
+ await models.Chat.send(ctx, chatDestination, formatDesc, myOptions);
+ }
await models.MdbVersionTree.create({
app: appName,
version: toVersion,
branchFk: branch,
fromVersion,
- userFk: userId
+ userFk: userId,
+ description,
}, myOptions);
await models.MdbVersion.upsert({
diff --git a/modules/mdb/back/model-config.json b/modules/mdb/back/model-config.json
index 8010afca2..b59a4fda0 100644
--- a/modules/mdb/back/model-config.json
+++ b/modules/mdb/back/model-config.json
@@ -11,6 +11,9 @@
"MdbVersionTree": {
"dataSource": "vn"
},
+ "MdbConfig": {
+ "dataSource": "vn"
+ },
"AccessContainer": {
"dataSource": "accessStorage"
}
diff --git a/modules/mdb/back/models/mdbBranch.json b/modules/mdb/back/models/mdbBranch.json
index 486dfaf25..b22d14ece 100644
--- a/modules/mdb/back/models/mdbBranch.json
+++ b/modules/mdb/back/models/mdbBranch.json
@@ -11,6 +11,11 @@
"id": true,
"type": "string",
"description": "Identifier"
+ },
+ "dsName": {
+ "id": true,
+ "type": "string",
+ "description": "ODBC name"
}
}
}
\ No newline at end of file
diff --git a/modules/mdb/back/models/mdbConfig.json b/modules/mdb/back/models/mdbConfig.json
new file mode 100644
index 000000000..60634104a
--- /dev/null
+++ b/modules/mdb/back/models/mdbConfig.json
@@ -0,0 +1,24 @@
+{
+ "name": "MdbConfig",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "mdbConfig"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "string",
+ "id": true
+ },
+ "issueTrackerUrl": {
+ "type": "string"
+ },
+ "issueNumberRegex": {
+ "type": "string"
+ },
+ "chatDestination": {
+ "type": "string"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/mdb/back/models/mdbVersionTree.json b/modules/mdb/back/models/mdbVersionTree.json
index 8c0260e54..106473b64 100644
--- a/modules/mdb/back/models/mdbVersionTree.json
+++ b/modules/mdb/back/models/mdbVersionTree.json
@@ -23,6 +23,9 @@
},
"userFk": {
"type": "number"
+ },
+ "description": {
+ "type": "string"
}
},
"relations": {
diff --git a/modules/monitor/back/methods/sales-monitor/clientsFilter.js b/modules/monitor/back/methods/sales-monitor/clientsFilter.js
index 09ea24eb1..13e38f8e1 100644
--- a/modules/monitor/back/methods/sales-monitor/clientsFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/clientsFilter.js
@@ -34,7 +34,7 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const stmt = new ParameterizedSQL(`
SELECT
@@ -51,7 +51,7 @@ module.exports = Self => {
JOIN account.user u ON c.salesPersonFk = u.id
LEFT JOIN sharingCart sc ON sc.workerFk = c.salesPersonFk
AND ? BETWEEN sc.started AND sc.ended
- LEFT JOIN workerTeamCollegues wtc
+ LEFT JOIN workerTeamCollegues wtc
ON wtc.collegueFk = IFNULL(sc.workerSubstitute, c.salesPersonFk)`,
[date]);
diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js
index 7be130dda..881fc637a 100644
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@@ -104,7 +104,7 @@ module.exports = Self => {
const userId = ctx.req.accessToken.userId;
const conn = Self.dataSource.connector;
const models = Self.app.models;
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const args = ctx.args;
const myOptions = {};
diff --git a/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js b/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js
index bcb37830c..febfc5357 100644
--- a/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js
+++ b/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js
@@ -8,8 +8,8 @@ describe('SalesMonitor clientsFilter()', () => {
const options = {transaction: tx};
const ctx = {req: {accessToken: {userId: 18}}, args: {}};
- const from = new Date();
- const to = new Date();
+ const from = Date.vnNew();
+ const to = Date.vnNew();
from.setHours(0, 0, 0, 0);
to.setHours(23, 59, 59, 59);
@@ -35,9 +35,9 @@ describe('SalesMonitor clientsFilter()', () => {
try {
const options = {transaction: tx};
const ctx = {req: {accessToken: {userId: 18}}, args: {}};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setDate(yesterday.getDate() - 1);
- const today = new Date();
+ const today = Date.vnNew();
yesterday.setHours(0, 0, 0, 0);
today.setHours(23, 59, 59, 59);
diff --git a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
index d2e1a5bec..4e0fb85b7 100644
--- a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
+++ b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
@@ -26,9 +26,9 @@ describe('SalesMonitor salesFilter()', () => {
try {
const options = {transaction: tx};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setHours(0, 0, 0, 0);
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
const ctx = {req: {accessToken: {userId: 9}}, args: {
@@ -54,10 +54,10 @@ describe('SalesMonitor salesFilter()', () => {
try {
const options = {transaction: tx};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setDate(yesterday.getDate() - 1);
yesterday.setHours(0, 0, 0, 0);
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
const ctx = {req: {accessToken: {userId: 9}}, args: {
@@ -205,10 +205,10 @@ describe('SalesMonitor salesFilter()', () => {
try {
const options = {transaction: tx};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setDate(yesterday.getDate() - 1);
yesterday.setHours(0, 0, 0, 0);
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
const ctx = {req: {accessToken: {userId: 18}}, args: {}};
@@ -234,10 +234,10 @@ describe('SalesMonitor salesFilter()', () => {
try {
const options = {transaction: tx};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setDate(yesterday.getDate() - 1);
yesterday.setHours(0, 0, 0, 0);
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
const ctx = {req: {accessToken: {userId: 18}}, args: {}};
diff --git a/modules/monitor/front/index/clients/index.js b/modules/monitor/front/index/clients/index.js
index 58613f09d..ac3ce9140 100644
--- a/modules/monitor/front/index/clients/index.js
+++ b/modules/monitor/front/index/clients/index.js
@@ -5,7 +5,7 @@ export default class Controller extends Section {
constructor($element, $) {
super($element, $);
- const date = new Date();
+ const date = Date.vnNew();
this.dateFrom = date;
this.dateTo = date;
this.filter = {
@@ -64,9 +64,9 @@ export default class Controller extends Section {
let from = this.dateFrom;
let to = this.dateTo;
if (!from)
- from = new Date();
+ from = Date.vnNew();
if (!to)
- to = new Date();
+ to = Date.vnNew();
const minHour = new Date(from);
minHour.setHours(0, 0, 0, 0);
const maxHour = new Date(to);
diff --git a/modules/monitor/front/index/orders/index.js b/modules/monitor/front/index/orders/index.js
index e3a47f68b..40100b79f 100644
--- a/modules/monitor/front/index/orders/index.js
+++ b/modules/monitor/front/index/orders/index.js
@@ -26,7 +26,7 @@ export default class Controller extends Section {
}
chipColor(date) {
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
const orderLanded = new Date(date);
diff --git a/modules/monitor/front/index/search-panel/index.spec.js b/modules/monitor/front/index/search-panel/index.spec.js
index f862e8d77..18cf1abfc 100644
--- a/modules/monitor/front/index/search-panel/index.spec.js
+++ b/modules/monitor/front/index/search-panel/index.spec.js
@@ -38,7 +38,7 @@ describe('Monitor Component vnMonitorSalesSearchPanel', () => {
it('should clear the scope days when setting the from property', () => {
controller.filter.scopeDays = 1;
- controller.from = new Date();
+ controller.from = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.from).toBeDefined();
@@ -49,7 +49,7 @@ describe('Monitor Component vnMonitorSalesSearchPanel', () => {
it('should clear the scope days when setting the to property', () => {
controller.filter.scopeDays = 1;
- controller.to = new Date();
+ controller.to = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.to).toBeDefined();
@@ -58,8 +58,8 @@ describe('Monitor Component vnMonitorSalesSearchPanel', () => {
describe('scopeDays() setter', () => {
it('should clear the date range when setting the scopeDays property', () => {
- controller.filter.from = new Date();
- controller.filter.to = new Date();
+ controller.filter.from = Date.vnNew();
+ controller.filter.to = Date.vnNew();
controller.scopeDays = 1;
diff --git a/modules/monitor/front/index/tickets/index.js b/modules/monitor/front/index/tickets/index.js
index 91d9079d8..2f2dead05 100644
--- a/modules/monitor/front/index/tickets/index.js
+++ b/modules/monitor/front/index/tickets/index.js
@@ -91,7 +91,7 @@ export default class Controller extends Section {
$params.scopeDays = 1;
if (typeof $params.scopeDays === 'number') {
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
const to = new Date(from.getTime());
@@ -105,7 +105,7 @@ export default class Controller extends Section {
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0);
diff --git a/modules/monitor/front/index/tickets/index.spec.js b/modules/monitor/front/index/tickets/index.spec.js
index 5d42743c1..c12ea6844 100644
--- a/modules/monitor/front/index/tickets/index.spec.js
+++ b/modules/monitor/front/index/tickets/index.spec.js
@@ -32,7 +32,7 @@ describe('Component vnMonitorSalesTickets', () => {
let params = controller.fetchParams({
scopeDays: 2
});
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
const to = new Date(from.getTime());
to.setDate(to.getDate() + params.scopeDays);
@@ -66,14 +66,14 @@ describe('Component vnMonitorSalesTickets', () => {
describe('compareDate()', () => {
it('should return warning when the date is the present', () => {
- let today = new Date();
+ let today = Date.vnNew();
let result = controller.compareDate(today);
expect(result).toEqual('warning');
});
it('should return sucess when the date is in the future', () => {
- let futureDate = new Date();
+ let futureDate = Date.vnNew();
futureDate = futureDate.setDate(futureDate.getDate() + 10);
let result = controller.compareDate(futureDate);
@@ -81,7 +81,7 @@ describe('Component vnMonitorSalesTickets', () => {
});
it('should return undefined when the date is in the past', () => {
- let pastDate = new Date();
+ let pastDate = Date.vnNew();
pastDate = pastDate.setDate(pastDate.getDate() - 10);
let result = controller.compareDate(pastDate);
@@ -99,7 +99,7 @@ describe('Component vnMonitorSalesTickets', () => {
describe('dateRange()', () => {
it('should return two dates with the hours at the start and end of the given date', () => {
- const now = new Date();
+ const now = Date.vnNew();
const today = now.getDate();
diff --git a/modules/order/back/methods/order/specs/new.spec.js b/modules/order/back/methods/order/specs/new.spec.js
index 5873189f8..f11367579 100644
--- a/modules/order/back/methods/order/specs/new.spec.js
+++ b/modules/order/back/methods/order/specs/new.spec.js
@@ -9,7 +9,7 @@ describe('order new()', () => {
try {
const options = {transaction: tx};
- const landed = new Date();
+ const landed = Date.vnNew();
const addressFk = 6;
const agencyModeFk = 1;
@@ -30,7 +30,7 @@ describe('order new()', () => {
try {
const options = {transaction: tx};
- const landed = new Date();
+ const landed = Date.vnNew();
const addressFk = 121;
const agencyModeFk = 1;
diff --git a/modules/order/front/basic-data/index.spec.js b/modules/order/front/basic-data/index.spec.js
index 01009d085..21dee0765 100644
--- a/modules/order/front/basic-data/index.spec.js
+++ b/modules/order/front/basic-data/index.spec.js
@@ -46,7 +46,7 @@ describe('Order', () => {
it('should set agencyModeFk to null and get the available agencies if the order has landed and client', async() => {
controller.order.agencyModeFk = 999;
controller.order.addressFk = 999;
- controller.order.landed = new Date();
+ controller.order.landed = Date.vnNew();
const expectedAgencies = [{id: 1}, {id: 2}];
diff --git a/modules/order/front/catalog/index.js b/modules/order/front/catalog/index.js
index 5fdd2e238..c0777ebc9 100644
--- a/modules/order/front/catalog/index.js
+++ b/modules/order/front/catalog/index.js
@@ -157,7 +157,7 @@ class Controller extends Section {
* Apply order to model
*/
applyOrder() {
- if (this.typeId || this.tagGroups.length > 0)
+ if (this.typeId || this.tagGroups.length > 0 || this.itemName)
this.$.model.addFilter(null, {orderBy: this.getOrderBy()});
}
diff --git a/modules/order/front/index/index.js b/modules/order/front/index/index.js
index a8e6e977e..750f2e226 100644
--- a/modules/order/front/index/index.js
+++ b/modules/order/front/index/index.js
@@ -8,7 +8,7 @@ export default class Controller extends Section {
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
date = new Date(date);
diff --git a/modules/order/front/index/index.spec.js b/modules/order/front/index/index.spec.js
index 5b85b3333..abe336478 100644
--- a/modules/order/front/index/index.spec.js
+++ b/modules/order/front/index/index.spec.js
@@ -26,14 +26,14 @@ describe('Component vnOrderIndex', () => {
describe('compareDate()', () => {
it('should return warning when the date is the present', () => {
- let curDate = new Date();
+ let curDate = Date.vnNew();
let result = controller.compareDate(curDate);
expect(result).toEqual('warning');
});
it('should return sucess when the date is in the future', () => {
- let futureDate = new Date();
+ let futureDate = Date.vnNew();
futureDate = futureDate.setDate(futureDate.getDate() + 10);
let result = controller.compareDate(futureDate);
@@ -41,7 +41,7 @@ describe('Component vnOrderIndex', () => {
});
it('should return undefined when the date is in the past', () => {
- let pastDate = new Date();
+ let pastDate = Date.vnNew();
pastDate = pastDate.setDate(pastDate.getDate() - 10);
let result = controller.compareDate(pastDate);
diff --git a/modules/order/front/line/index.html b/modules/order/front/line/index.html
index f0a2f2bdf..7be5a00af 100644
--- a/modules/order/front/line/index.html
+++ b/modules/order/front/line/index.html
@@ -39,7 +39,7 @@
- {{::row.itemFk | zeroFill:6}}
+ {{::row.itemFk}}
diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html
index 2813aeb9b..3622ae932 100644
--- a/modules/order/front/summary/index.html
+++ b/modules/order/front/summary/index.html
@@ -95,7 +95,7 @@
- {{::row.itemFk | zeroFill:6}}
+ {{::row.itemFk}}
diff --git a/modules/route/back/methods/agency-term/filter.js b/modules/route/back/methods/agency-term/filter.js
index 0ecec7e88..9d1268958 100644
--- a/modules/route/back/methods/agency-term/filter.js
+++ b/modules/route/back/methods/agency-term/filter.js
@@ -74,35 +74,35 @@ module.exports = Self => {
filter = mergeFilters(filter, {where});
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const stmts = [];
const stmt = new ParameterizedSQL(
`SELECT *
FROM (
- SELECT r.id routeFk,
- r.created,
- r.agencyModeFk,
+ SELECT r.id routeFk,
+ r.created,
+ r.agencyModeFk,
am.name agencyModeName,
- am.agencyFk,
+ am.agencyFk,
a.name agencyAgreement,
SUM(t.packages) packages,
r.m3,
- r.kmEnd - r.kmStart kmTotal,
- CAST(IFNULL(sat.routePrice,
- (sat.kmPrice * (GREATEST(r.kmEnd - r.kmStart , sat.minimumKm))
- + GREATEST(r.m3 , sat.minimumM3) * sat.m3Price)
- + sat.packagePrice * SUM(t.packages) )
+ r.kmEnd - r.kmStart kmTotal,
+ CAST(IFNULL(sat.routePrice,
+ (sat.kmPrice * (GREATEST(r.kmEnd - r.kmStart , sat.minimumKm))
+ + GREATEST(r.m3 , sat.minimumM3) * sat.m3Price)
+ + sat.packagePrice * SUM(t.packages) )
AS DECIMAL(10,2)) price,
r.invoiceInFk,
sat.supplierFk,
s.name supplierName
FROM vn.route r
- LEFT JOIN vn.agencyMode am ON r.agencyModeFk = am.id
+ LEFT JOIN vn.agencyMode am ON r.agencyModeFk = am.id
LEFT JOIN vn.agency a ON am.agencyFk = a.id
LEFT JOIN vn.ticket t ON t.routeFk = r.id
LEFT JOIN vn.supplierAgencyTerm sat ON sat.agencyFk = a.id
- LEFT JOIN vn.supplier s ON s.id = sat.supplierFk
+ LEFT JOIN vn.supplier s ON s.id = sat.supplierFk
WHERE r.created > DATE_ADD(?, INTERVAL -2 MONTH) AND sat.supplierFk IS NOT NULL
GROUP BY r.id
) a`
diff --git a/modules/route/back/methods/agency-term/specs/filter.spec.js b/modules/route/back/methods/agency-term/specs/filter.spec.js
index d6c00e585..41e696157 100644
--- a/modules/route/back/methods/agency-term/specs/filter.spec.js
+++ b/modules/route/back/methods/agency-term/specs/filter.spec.js
@@ -3,7 +3,7 @@ const models = require('vn-loopback/server/server').models;
describe('AgencyTerm filter()', () => {
const authUserId = 9;
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(2, 0, 0, 0);
it('should return all results matching the filter', async() => {
@@ -57,10 +57,10 @@ describe('AgencyTerm filter()', () => {
const options = {transaction: tx};
try {
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
- const to = new Date();
+ const to = Date.vnNew();
to.setHours(23, 59, 59, 999);
const ctx = {
diff --git a/modules/route/back/methods/route/downloadZip.js b/modules/route/back/methods/route/downloadZip.js
new file mode 100644
index 000000000..597f1d1f6
--- /dev/null
+++ b/modules/route/back/methods/route/downloadZip.js
@@ -0,0 +1,62 @@
+const JSZip = require('jszip');
+
+module.exports = Self => {
+ Self.remoteMethodCtx('downloadZip', {
+ description: 'Download a zip file with multiple routes pdfs',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'id',
+ type: 'string',
+ description: 'The routes ids',
+ }
+ ],
+ 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: '/downloadZip',
+ verb: 'GET'
+ }
+ });
+
+ Self.downloadZip = async function(ctx, id, options) {
+ const models = Self.app.models;
+ const myOptions = {};
+ const zip = new JSZip();
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const ids = id.split(',');
+ for (let id of ids) {
+ ctx.args.id = id;
+ const routePdf = await models.Route.driverRoutePdf(ctx, id);
+ const fileName = extractFileName(routePdf[2]);
+ const body = routePdf[0];
+
+ zip.file(fileName, body);
+ }
+
+ const stream = zip.generateNodeStream({streamFiles: true});
+
+ return [stream, 'application/zip', `filename="download.zip"`];
+ };
+
+ function extractFileName(str) {
+ const matches = str.match(/"(.*?)"/);
+ return matches ? matches[1] : str;
+ }
+};
diff --git a/modules/route/back/methods/route/driverRouteEmail.js b/modules/route/back/methods/route/driverRouteEmail.js
index 4d5279d2d..82b005e44 100644
--- a/modules/route/back/methods/route/driverRouteEmail.js
+++ b/modules/route/back/methods/route/driverRouteEmail.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('driverRouteEmail', {
description: 'Sends the driver route email with an attached PDF',
@@ -41,19 +39,5 @@ module.exports = Self => {
}
});
- Self.driverRouteEmail = 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('driver-route', params);
-
- return email.send();
- };
+ Self.driverRouteEmail = ctx => Self.sendTemplate(ctx, 'driver-route');
};
diff --git a/modules/route/back/methods/route/driverRoutePdf.js b/modules/route/back/methods/route/driverRoutePdf.js
index 65748afad..f0cd75f0e 100644
--- a/modules/route/back/methods/route/driverRoutePdf.js
+++ b/modules/route/back/methods/route/driverRoutePdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('driverRoutePdf', {
description: 'Returns the driver route pdf',
@@ -39,17 +37,5 @@ module.exports = Self => {
}
});
- Self.driverRoutePdf = 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('driver-route', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.driverRoutePdf = (ctx, id) => Self.printReport(ctx, id, 'driver-route');
};
diff --git a/modules/route/back/methods/route/getTickets.js b/modules/route/back/methods/route/getTickets.js
index 708644c1a..1eb9e27f5 100644
--- a/modules/route/back/methods/route/getTickets.js
+++ b/modules/route/back/methods/route/getTickets.js
@@ -50,14 +50,17 @@ module.exports = Self => {
am.name AS agencyModeName,
u.nickname AS userNickname,
vn.ticketTotalVolume(t.id) AS volume,
- tob.description
+ tob.description,
+ GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt
FROM vn.route r
JOIN ticket t ON t.routeFk = r.id
+ JOIN vn.sale s ON s.ticketFk = t.id
+ JOIN vn.item i ON i.id = s.itemFk
LEFT JOIN ticketState ts ON ts.ticketFk = t.id
LEFT JOIN state st ON st.id = ts.stateFk
LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
LEFT JOIN observationType ot ON ot.code = 'delivery'
- LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id
+ LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id
AND tob.observationTypeFk = ot.id
LEFT JOIN address a ON a.id = t.addressFk
LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
@@ -70,7 +73,9 @@ module.exports = Self => {
const where = filter.where;
where['r.id'] = filter.id;
- stmt.merge(conn.makeSuffix(filter));
+ stmt.merge(conn.makeWhere(filter.where));
+ stmt.merge(conn.makeGroupBy('t.id'));
+ stmt.merge(conn.makeOrderBy(filter.order));
const tickets = await conn.executeStmt(stmt, myOptions);
diff --git a/modules/route/back/methods/route/specs/clone.spec.js b/modules/route/back/methods/route/specs/clone.spec.js
index d1fc6b297..9192854f8 100644
--- a/modules/route/back/methods/route/specs/clone.spec.js
+++ b/modules/route/back/methods/route/specs/clone.spec.js
@@ -1,7 +1,7 @@
const app = require('vn-loopback/server/server');
describe('route clone()', () => {
- const createdDate = new Date();
+ const createdDate = Date.vnNew();
it('should throw an error if the amount of ids pased to the clone function do no match the database', async() => {
const ids = [996, 997, 998, 999];
diff --git a/modules/route/back/methods/route/specs/filter.spec.js b/modules/route/back/methods/route/specs/filter.spec.js
index 9d481f21e..18c0ca04f 100644
--- a/modules/route/back/methods/route/specs/filter.spec.js
+++ b/modules/route/back/methods/route/specs/filter.spec.js
@@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
const models = require('vn-loopback/server/server').models;
describe('Route filter()', () => {
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(2, 0, 0, 0);
it('should return the routes matching "search"', async() => {
@@ -23,10 +23,10 @@ describe('Route filter()', () => {
const options = {transaction: tx};
try {
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
- const to = new Date();
+ const to = Date.vnNew();
to.setHours(23, 59, 59, 999);
const ctx = {
args: {
diff --git a/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js b/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
index bb38cb50e..0acc6c1a7 100644
--- a/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
+++ b/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
@@ -23,7 +23,7 @@ describe('route getSuggestedTickets()', () => {
await ticketInRoute.updateAttributes({
routeFk: null,
- landed: new Date()
+ landed: Date.vnNew()
}, options);
const result = await models.Route.getSuggestedTickets(routeID, options);
diff --git a/modules/route/back/methods/route/specs/insertTicket.spec.js b/modules/route/back/methods/route/specs/insertTicket.spec.js
index 7c60e755f..19d02e1ef 100644
--- a/modules/route/back/methods/route/specs/insertTicket.spec.js
+++ b/modules/route/back/methods/route/specs/insertTicket.spec.js
@@ -23,7 +23,7 @@ describe('route insertTicket()', () => {
const ticketInRoute = await app.models.Ticket.findById(ticketId, null, options);
await ticketInRoute.updateAttributes({
routeFk: null,
- landed: new Date()
+ landed: Date.vnNew()
}, options);
const result = await app.models.Route.insertTicket(routeId, ticketId, options);
diff --git a/modules/route/back/methods/route/updateWorkCenter.js b/modules/route/back/methods/route/updateWorkCenter.js
index 7796fba41..75169ce7e 100644
--- a/modules/route/back/methods/route/updateWorkCenter.js
+++ b/modules/route/back/methods/route/updateWorkCenter.js
@@ -33,12 +33,13 @@ module.exports = Self => {
}
try {
+ const date = Date.vnNew();
const [result] = await Self.rawSql(`
SELECT IFNULL(wl.workCenterFk, r.defaultWorkCenterFk) AS commissionWorkCenter
FROM vn.routeConfig r
LEFT JOIN vn.workerLabour wl ON wl.workerFk = ?
- AND CURDATE() BETWEEN wl.started AND IFNULL(wl.ended, CURDATE());
- `, [userId], myOptions);
+ AND ? BETWEEN wl.started AND IFNULL(wl.ended, ?);
+ `, [userId, date, date], myOptions);
const route = await models.Route.findById(id, null, myOptions);
await route.updateAttribute('commissionWorkCenterFk', result.commissionWorkCenter, myOptions);
diff --git a/modules/route/back/models/route.js b/modules/route/back/models/route.js
index 08cabd30e..883f4597e 100644
--- a/modules/route/back/models/route.js
+++ b/modules/route/back/models/route.js
@@ -13,6 +13,7 @@ module.exports = Self => {
require('../methods/route/driverRoutePdf')(Self);
require('../methods/route/driverRouteEmail')(Self);
require('../methods/route/sendSms')(Self);
+ require('../methods/route/downloadZip')(Self);
Self.validate('kmStart', validateDistance, {
message: 'Distance must be lesser than 1000'
diff --git a/modules/route/front/index/index.js b/modules/route/front/index/index.js
index 9258c8fac..7c19a26cd 100644
--- a/modules/route/front/index/index.js
+++ b/modules/route/front/index/index.js
@@ -34,17 +34,27 @@ export default class Controller extends Section {
}
showRouteReport() {
- const routes = [];
+ const routesIds = [];
for (let route of this.checked)
- routes.push(route.id);
- const routesId = routes.join(',');
+ routesIds.push(route.id);
+ const stringRoutesIds = routesIds.join(',');
- this.vnReport.show(`Routes/${routesId}/driver-route-pdf`);
+ if (this.checked.length <= 1) {
+ const url = `api/Routes/${stringRoutesIds}/driver-route-pdf?access_token=${this.vnToken.token}`;
+ window.open(url, '_blank');
+ } else {
+ const serializedParams = this.$httpParamSerializer({
+ access_token: this.vnToken.token,
+ id: stringRoutesIds
+ });
+ const url = `api/Routes/downloadZip?${serializedParams}`;
+ window.open(url, '_blank');
+ }
}
openClonationDialog() {
this.$.clonationDialog.show();
- this.createdDate = new Date();
+ this.createdDate = Date.vnNew();
}
cloneSelectedRoutes() {
diff --git a/modules/route/front/index/index.spec.js b/modules/route/front/index/index.spec.js
index 05dd56433..399ece714 100644
--- a/modules/route/front/index/index.spec.js
+++ b/modules/route/front/index/index.spec.js
@@ -44,23 +44,21 @@ describe('Component vnRouteIndex', () => {
describe('showRouteReport()', () => {
it('should call to the vnReport show method', () => {
- controller.vnReport.show = jest.fn();
+ jest.spyOn(window, 'open').mockReturnThis();
const data = controller.$.model.data;
data[0].checked = true;
data[2].checked = true;
- const routeIds = '1,3';
-
controller.showRouteReport();
- expect(controller.vnReport.show).toHaveBeenCalledWith(`Routes/${routeIds}/driver-route-pdf`);
+ expect(window.open).toHaveBeenCalled();
});
});
describe('cloneSelectedRoutes()', () => {
it('should perform an http request to Routes/clone', () => {
- controller.createdDate = new Date();
+ controller.createdDate = Date.vnNew();
$httpBackend.expect('POST', 'Routes/clone').respond();
controller.cloneSelectedRoutes();
diff --git a/modules/route/front/main/index.js b/modules/route/front/main/index.js
index 938f81bcc..8c57bbad6 100644
--- a/modules/route/front/main/index.js
+++ b/modules/route/front/main/index.js
@@ -3,11 +3,11 @@ import ModuleMain from 'salix/components/module-main';
export default class Route extends ModuleMain {
$postLink() {
- const to = new Date();
+ const to = Date.vnNew();
to.setDate(to.getDate() + 1);
to.setHours(0, 0, 0, 0);
- const from = new Date();
+ const from = Date.vnNew();
from.setDate(from.getDate());
from.setHours(0, 0, 0, 0);
@@ -21,7 +21,7 @@ export default class Route extends ModuleMain {
$params.scopeDays = 1;
if (typeof $params.scopeDays === 'number') {
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
const to = new Date(from.getTime());
diff --git a/modules/route/front/main/index.spec.js b/modules/route/front/main/index.spec.js
index e5724b493..0c16a7b1f 100644
--- a/modules/route/front/main/index.spec.js
+++ b/modules/route/front/main/index.spec.js
@@ -15,7 +15,7 @@ describe('Route Component vnRoute', () => {
let params = controller.fetchParams({
scopeDays: 2
});
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
const to = new Date(from.getTime());
to.setDate(to.getDate() + params.scopeDays);
diff --git a/modules/route/front/search-panel/index.spec.js b/modules/route/front/search-panel/index.spec.js
index 16e1a5cfc..ae15e16e4 100644
--- a/modules/route/front/search-panel/index.spec.js
+++ b/modules/route/front/search-panel/index.spec.js
@@ -15,7 +15,7 @@ describe('Route Component vnRouteSearchPanel', () => {
it('should clear the scope days when setting the from property', () => {
controller.filter.scopeDays = 1;
- controller.from = new Date();
+ controller.from = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.from).toBeDefined();
@@ -26,7 +26,7 @@ describe('Route Component vnRouteSearchPanel', () => {
it('should clear the scope days when setting the to property', () => {
controller.filter.scopeDays = 1;
- controller.to = new Date();
+ controller.to = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.to).toBeDefined();
@@ -35,8 +35,8 @@ describe('Route Component vnRouteSearchPanel', () => {
describe('scopeDays() setter', () => {
it('should clear the date range when setting the scopeDays property', () => {
- controller.filter.from = new Date();
- controller.filter.to = new Date();
+ controller.filter.from = Date.vnNew();
+ controller.filter.to = Date.vnNew();
controller.scopeDays = 1;
diff --git a/modules/route/front/summary/index.html b/modules/route/front/summary/index.html
index 86f558634..56f7a49b9 100644
--- a/modules/route/front/summary/index.html
+++ b/modules/route/front/summary/index.html
@@ -10,26 +10,26 @@
-
-
-
-
-
{{$ctrl.summary.route.worker.user.name}}
-
@@ -40,35 +40,35 @@
-
-
-
-
-
Ticket
@@ -77,45 +77,56 @@
Order
- Ticket id
- Alias
+ Street
+ City
+ PC
+ Client
+ Warehouse
Packages
m³
- Warehouse
- PC
- Street
+ Packaging
+ Ticket
{{ticket.priority | dashIfEmpty}}
+ {{ticket.street}}
+
+ {{::ticket.city}}
+
+ {{ticket.postalCode}}
+
+
+ {{ticket.nickname}}
+
+
+ {{ticket.warehouseName}}
+ {{ticket.packages}}
+ {{ticket.volume}}
+ {{ticket.ipt}}
-
{{ticket.id}}
-
- {{ticket.nickname}}
-
-
- {{ticket.packages}}
- {{ticket.volume}}
- {{ticket.warehouseName}}
- {{ticket.postalCode}}
- {{ticket.street}}
-
-
-
+
+
@@ -123,12 +134,12 @@
-
-
diff --git a/modules/route/front/summary/index.js b/modules/route/front/summary/index.js
index 543c54afc..9e1ea1856 100644
--- a/modules/route/front/summary/index.js
+++ b/modules/route/front/summary/index.js
@@ -31,6 +31,21 @@ class Controller extends Summary {
this.sumPackages();
});
}
+
+ goToBuscaman(ticket) {
+ if (!this.route.vehicleFk)
+ throw new UserError(`The route doesn't have a vehicle`);
+ let query = `Routes/${this.route.vehicleFk}/getDeliveryPoint`;
+
+ this.$http.get(query).then(response => {
+ if (!response.data)
+ throw new UserError(`The route's vehicle doesn't have a delivery point`);
+
+ const address = response.data + '+to:' + ticket.postalCode + ' ' + ticket.city + ' ' + ticket.street;
+ const url = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=';
+ window.open(url + encodeURI(address), '_blank');
+ });
+ }
}
ngModule.vnComponent('vnRouteSummary', {
diff --git a/modules/route/front/summary/index.spec.js b/modules/route/front/summary/index.spec.js
index ad300817a..cfa21aeb9 100644
--- a/modules/route/front/summary/index.spec.js
+++ b/modules/route/front/summary/index.spec.js
@@ -37,5 +37,29 @@ describe('Route', () => {
expect(controller.packagesTotal).toEqual(4);
});
});
+
+ describe('goToBuscaman()', () => {
+ it('should open buscaman with the given arguments', () => {
+ jest.spyOn(window, 'open').mockReturnThis();
+ const expectedUrl = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=46460%20Av%20Espioca%20100+to:n19%20London%20my%20street';
+ controller.route = {vehicleFk: 1};
+ const url = `Routes/${controller.route.vehicleFk}/getDeliveryPoint`;
+ $httpBackend.when('GET', `Routes/1/summary`).respond();
+ $httpBackend.expectGET(url).respond('46460 Av Espioca 100');
+
+ const ticket = {
+ id: 1,
+ checked: true,
+ street: 'my street',
+ postalCode: 'n19',
+ city: 'London'
+ };
+
+ controller.goToBuscaman(ticket);
+ $httpBackend.flush();
+
+ expect(window.open).toHaveBeenCalledWith(expectedUrl, '_blank');
+ });
+ });
});
});
diff --git a/modules/route/front/tickets/index.html b/modules/route/front/tickets/index.html
index dae894ac7..32a4a2d7c 100644
--- a/modules/route/front/tickets/index.html
+++ b/modules/route/front/tickets/index.html
@@ -6,9 +6,9 @@
data="$ctrl.tickets"
auto-load="true">
-
-
{{::ticket.street}}
- {{::ticket.city}}
+
+ {{::ticket.city}}
+
{{::ticket.postalCode}}
+ {{ticket.warehouseName}}
{{::ticket.packages}}
{{::ticket.volume | number:2}}
+ {{::ticket.ipt}}
-
-
@@ -160,7 +171,7 @@
-
-
-
\ No newline at end of file
+
diff --git a/modules/route/front/tickets/index.js b/modules/route/front/tickets/index.js
index 80f8ad4f4..8789708ac 100644
--- a/modules/route/front/tickets/index.js
+++ b/modules/route/front/tickets/index.js
@@ -74,29 +74,24 @@ class Controller extends Section {
return selectedItems;
}
- goToBuscaman() {
+ goToBuscaman(ticket) {
if (!this.route.vehicleFk)
throw new UserError(`The route doesn't have a vehicle`);
- let query = `Routes/${this.route.vehicleFk}/getDeliveryPoint`;
- this.$http.get(query).then(response => {
- if (!response.data)
+ this.$http.get(`Routes/${this.route.vehicleFk}/getDeliveryPoint`).then(res => {
+ if (!res.data)
throw new UserError(`The route's vehicle doesn't have a delivery point`);
- return response.data;
- }).then(address => {
- let addresses;
- if (address) addresses = address;
- let lines = this.getSelectedItems(this.tickets);
-
- let url = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=';
+ let addresses = res.data;
+ const lines = ticket ? [ticket] : this.getSelectedItems(this.tickets);
lines.forEach((line, index) => {
- const previusLine = lines[index - 1] ? lines[index - 1].street : null;
- if (previusLine != line.street)
+ const previousLine = lines[index - 1] ? lines[index - 1].street : null;
+ if (previousLine != line.street)
addresses = addresses + '+to:' + line.postalCode + ' ' + line.city + ' ' + line.street;
});
- window.open(url + addresses, '_blank');
+ const url = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=';
+ window.open(url + encodeURI(addresses), '_blank');
});
}
diff --git a/modules/route/front/tickets/index.spec.js b/modules/route/front/tickets/index.spec.js
index f4a58154e..2c73048bd 100644
--- a/modules/route/front/tickets/index.spec.js
+++ b/modules/route/front/tickets/index.spec.js
@@ -136,7 +136,7 @@ describe('Route', () => {
describe('goToBuscaman()', () => {
it('should open buscaman with the given arguments', () => {
jest.spyOn(window, 'open').mockReturnThis();
- const expectedUrl = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=46460 Av Espioca 100+to:n19 London my street';
+ const expectedUrl = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=46460%20Av%20Espioca%20100+to:n19%20London%20my%20street';
controller.route = {vehicleFk: 1};
const url = `Routes/${controller.route.vehicleFk}/getDeliveryPoint`;
$httpBackend.expectGET(url).respond('46460 Av Espioca 100');
diff --git a/modules/shelving/back/models/parking.json b/modules/shelving/back/models/parking.json
index 7efcf72d3..53fec6e69 100644
--- a/modules/shelving/back/models/parking.json
+++ b/modules/shelving/back/models/parking.json
@@ -29,5 +29,12 @@
"pickingOrder": {
"type": "number"
}
+ },
+ "relations": {
+ "saleGroup": {
+ "type": "hasMany",
+ "model": "saleGroup",
+ "foreignKey": "parkingFk"
+ }
}
}
diff --git a/modules/shelving/front/routes.json b/modules/shelving/front/routes.json
index 09a8e389b..4059e5095 100644
--- a/modules/shelving/front/routes.json
+++ b/modules/shelving/front/routes.json
@@ -1,12 +1,12 @@
{
"module": "shelving",
"name": "Shelvings",
- "icon" : "contact_support",
+ "icon" : "icon-inventory",
"dependencies": ["worker"],
"validations" : true,
"menus": {
"main": [
- {"state": "shelving.index", "icon": "contact_support"}
+ {"state": "shelving.index", "icon": "icon-inventory"}
],
"card": [
{"state": "shelving.card.basicData", "icon": "settings"},
@@ -20,7 +20,7 @@
"abstract": true,
"component": "vn-shelving",
"description": "Shelvings"
- },
+ },
{
"url": "/index?q",
"state": "shelving.index",
@@ -32,13 +32,13 @@
"state": "shelving.create",
"component": "vn-shelving-create",
"description": "New shelving"
- },
+ },
{
"url": "/:id",
"state": "shelving.card",
"abstract": true,
"component": "vn-shelving-card"
- },
+ },
{
"url": "/summary",
"state": "shelving.card.summary",
@@ -47,7 +47,7 @@
"params": {
"shelving": "$ctrl.shelving"
}
- },
+ },
{
"url": "/basic-data",
"state": "shelving.card.basicData",
@@ -56,7 +56,7 @@
"params": {
"shelving": "$ctrl.shelving"
}
- },
+ },
{
"url" : "/log",
"state": "shelving.card.log",
@@ -64,4 +64,4 @@
"description": "Log"
}
]
-}
\ No newline at end of file
+}
diff --git a/modules/supplier/back/methods/supplier/campaignMetricsPdf.js b/modules/supplier/back/methods/supplier/campaignMetricsPdf.js
index 7bd65ffcb..f7ff900e7 100644
--- a/modules/supplier/back/methods/supplier/campaignMetricsPdf.js
+++ b/modules/supplier/back/methods/supplier/campaignMetricsPdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('campaignMetricsPdf', {
description: 'Returns the campaign metrics pdf',
@@ -49,17 +47,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('supplier-campaign-metrics', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'supplier-campaign-metrics');
};
diff --git a/modules/supplier/back/methods/supplier/newSupplier.js b/modules/supplier/back/methods/supplier/newSupplier.js
index f4059a259..ae71380f3 100644
--- a/modules/supplier/back/methods/supplier/newSupplier.js
+++ b/modules/supplier/back/methods/supplier/newSupplier.js
@@ -39,7 +39,7 @@ module.exports = Self => {
return supplier;
} catch (e) {
if (tx) await tx.rollback();
- return params;
+ throw e;
}
};
};
diff --git a/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js b/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js
index 8f22a4f20..44252e71b 100644
--- a/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js
@@ -8,6 +8,7 @@ describe('Supplier newSupplier()', () => {
const administrativeId = 5;
it('should create a new supplier containing only the name', async() => {
+ pending('https://redmine.verdnatura.es/issues/5203');
const activeCtx = {
accessToken: {userId: administrativeId},
};
diff --git a/modules/supplier/back/methods/supplier/updateFiscalData.js b/modules/supplier/back/methods/supplier/updateFiscalData.js
index 4604b3f91..271ed8769 100644
--- a/modules/supplier/back/methods/supplier/updateFiscalData.js
+++ b/modules/supplier/back/methods/supplier/updateFiscalData.js
@@ -64,6 +64,14 @@ module.exports = Self => {
{
arg: 'healthRegister',
type: 'string'
+ },
+ {
+ arg: 'isVies',
+ type: 'boolean'
+ },
+ {
+ arg: 'isTrucker',
+ type: 'boolean'
}],
returns: {
arg: 'res',
diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js
index 44549c65c..4e509aafc 100644
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@@ -16,10 +16,6 @@ module.exports = Self => {
message: 'The social name cannot be empty'
});
- Self.validatesUniquenessOf('name', {
- message: 'The supplier name must be unique'
- });
-
if (this.city) {
Self.validatesPresenceOf('city', {
message: 'City cannot be empty'
@@ -117,6 +113,27 @@ module.exports = Self => {
throw new UserError('You can not modify is pay method checked');
});
+ Self.validateAsync('name', 'countryFk', hasSupplierSameName, {
+ message: 'A supplier with the same name already exists. Change the country.'
+ });
+
+ async function hasSupplierSameName(err, done) {
+ if (!this.name || !this.countryFk) done();
+ const supplier = await Self.app.models.Supplier.findOne(
+ {
+ where: {
+ name: this.name,
+ countryFk: this.countryFk
+ },
+ fields: ['id']
+ });
+
+ if (supplier && supplier.id != this.id)
+ err();
+
+ done();
+ }
+
Self.observe('before save', async function(ctx) {
const changes = ctx.data || ctx.instance;
const orgData = ctx.currentInstance;
diff --git a/modules/supplier/back/models/supplier.json b/modules/supplier/back/models/supplier.json
index 3cd6386a8..ee2c4fbbd 100644
--- a/modules/supplier/back/models/supplier.json
+++ b/modules/supplier/back/models/supplier.json
@@ -110,6 +110,9 @@
},
"healthRegister": {
"type": "string"
+ },
+ "isVies": {
+ "type": "boolean"
}
},
"relations": {
@@ -175,4 +178,4 @@
"foreignKey": "supplierActivityFk"
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/supplier/front/agency-term/index/index.html b/modules/supplier/front/agency-term/index/index.html
index 9d53226c5..44c6deba9 100644
--- a/modules/supplier/front/agency-term/index/index.html
+++ b/modules/supplier/front/agency-term/index/index.html
@@ -24,36 +24,42 @@
diff --git a/modules/supplier/front/consumption/index.js b/modules/supplier/front/consumption/index.js
index 8de6a1e71..9af0d1747 100644
--- a/modules/supplier/front/consumption/index.js
+++ b/modules/supplier/front/consumption/index.js
@@ -11,11 +11,11 @@ class Controller extends Section {
}
setDefaultFilter() {
- const minDate = new Date();
+ const minDate = Date.vnNew();
minDate.setHours(0, 0, 0, 0);
minDate.setMonth(minDate.getMonth() - 2);
- const maxDate = new Date();
+ const maxDate = Date.vnNew();
maxDate.setHours(23, 59, 59, 59);
this.filterParams = {
diff --git a/modules/supplier/front/consumption/index.spec.js b/modules/supplier/front/consumption/index.spec.js
index ebf19ccec..0ac531a68 100644
--- a/modules/supplier/front/consumption/index.spec.js
+++ b/modules/supplier/front/consumption/index.spec.js
@@ -28,7 +28,7 @@ describe('Supplier', () => {
it('should call the window.open function', () => {
jest.spyOn(window, 'open').mockReturnThis();
- const now = new Date();
+ const now = Date.vnNew();
controller.$.model.userParams = {
from: now,
to: now
@@ -86,7 +86,7 @@ describe('Supplier', () => {
{id: 1, email: 'batman@gothamcity.com'}
]);
- const now = new Date();
+ const now = Date.vnNew();
controller.$.model.userParams = {
from: now,
to: now
diff --git a/modules/supplier/front/descriptor/index.js b/modules/supplier/front/descriptor/index.js
index a26d9c510..9f23ce68c 100644
--- a/modules/supplier/front/descriptor/index.js
+++ b/modules/supplier/front/descriptor/index.js
@@ -13,7 +13,7 @@ class Controller extends Descriptor {
get entryFilter() {
if (!this.supplier) return null;
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const from = new Date(date.getTime());
diff --git a/modules/supplier/front/fiscal-data/index.html b/modules/supplier/front/fiscal-data/index.html
index a3ede2058..ccbd5b0d9 100644
--- a/modules/supplier/front/fiscal-data/index.html
+++ b/modules/supplier/front/fiscal-data/index.html
@@ -129,7 +129,7 @@
show-field="code"
rule>
- {{code}} - {{town.name}} ({{town.province.name}},
+ {{code}} - {{town.name}} ({{town.province.name}},
{{town.province.country.country}})
@@ -144,7 +144,7 @@
-
-
-
-
+
+
+
+
+
+
@@ -203,4 +210,4 @@
-
\ No newline at end of file
+
diff --git a/modules/ticket/back/locale/ticket/es.yml b/modules/ticket/back/locale/ticket/es.yml
index 2c524a74f..15b5a39bf 100644
--- a/modules/ticket/back/locale/ticket/es.yml
+++ b/modules/ticket/back/locale/ticket/es.yml
@@ -21,3 +21,5 @@ companyFk: empresa
agencyModeFk: agencia
ticketFk: ticket
mergedTicket: ticket fusionado
+withWarningAccept: aviso negativos
+isWithoutNegatives: sin negativos
diff --git a/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js b/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
index 67919e76c..ac397d38e 100644
--- a/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
+++ b/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
@@ -14,7 +14,7 @@ describe('ticket moveExpeditions()', () => {
const options = {transaction: tx};
myCtx.args = {
clientId: 1101,
- landed: new Date(),
+ landed: Date.vnNew(),
warehouseId: 1,
addressId: 121,
agencyModeId: 1,
diff --git a/modules/ticket/back/methods/sale/canEdit.js b/modules/ticket/back/methods/sale/canEdit.js
index f44bd6743..3091ebca7 100644
--- a/modules/ticket/back/methods/sale/canEdit.js
+++ b/modules/ticket/back/methods/sale/canEdit.js
@@ -56,6 +56,13 @@ module.exports = Self => {
const shouldEditCloned = canEditCloned || !hasSaleCloned;
const shouldEditFloramondo = canEditFloramondo || !hasSaleFloramondo;
- return shouldEditTracked && shouldEditCloned && shouldEditFloramondo;
+ if (!shouldEditTracked)
+ throw new UserError('It is not possible to modify tracked sales');
+ if (!shouldEditCloned)
+ throw new UserError('It is not possible to modify cloned sales');
+ if (!shouldEditFloramondo)
+ throw new UserError('It is not possible to modify sales that their articles are from Floramondo');
+
+ return true;
};
};
diff --git a/modules/ticket/back/methods/sale/deleteSales.js b/modules/ticket/back/methods/sale/deleteSales.js
index c045b9197..5d1463a66 100644
--- a/modules/ticket/back/methods/sale/deleteSales.js
+++ b/modules/ticket/back/methods/sale/deleteSales.js
@@ -43,9 +43,7 @@ module.exports = Self => {
try {
const saleIds = sales.map(sale => sale.id);
- const canEditSales = await models.Sale.canEdit(ctx, saleIds, myOptions);
- if (!canEditSales)
- throw new UserError(`Sale(s) blocked, please contact production`);
+ await models.Sale.canEdit(ctx, saleIds, myOptions);
const ticket = await models.Ticket.findById(ticketId, {
include: {
diff --git a/modules/ticket/back/methods/sale/getClaimableFromTicket.js b/modules/ticket/back/methods/sale/getClaimableFromTicket.js
index ecbc52b94..c51781f59 100644
--- a/modules/ticket/back/methods/sale/getClaimableFromTicket.js
+++ b/modules/ticket/back/methods/sale/getClaimableFromTicket.js
@@ -24,24 +24,24 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const query = `
- SELECT
- s.id AS saleFk,
- t.id AS ticketFk,
+ SELECT
+ s.id AS saleFk,
+ t.id AS ticketFk,
t.landed,
- s.concept,
- s.itemFk,
- s.quantity,
- s.price,
- s.discount,
+ s.concept,
+ s.itemFk,
+ s.quantity,
+ s.price,
+ s.discount,
t.nickname
- FROM vn.ticket t
+ FROM vn.ticket t
INNER JOIN vn.sale s ON s.ticketFk = t.id
LEFT JOIN vn.claimBeginning cb ON cb.saleFk = s.id
- WHERE (t.landed) >= TIMESTAMPADD(DAY, -7, ?)
+ WHERE (t.landed) >= TIMESTAMPADD(DAY, -7, ?)
AND t.id = ? AND cb.id IS NULL
ORDER BY t.landed DESC, t.id DESC`;
diff --git a/modules/ticket/back/methods/sale/recalculatePrice.js b/modules/ticket/back/methods/sale/recalculatePrice.js
index 38c68d7f6..2c8e6768b 100644
--- a/modules/ticket/back/methods/sale/recalculatePrice.js
+++ b/modules/ticket/back/methods/sale/recalculatePrice.js
@@ -37,9 +37,7 @@ module.exports = Self => {
try {
const salesIds = sales.map(sale => sale.id);
- const canEditSale = await models.Sale.canEdit(ctx, salesIds, myOptions);
- if (!canEditSale)
- throw new UserError(`Sale(s) blocked, please contact production`);
+ await models.Sale.canEdit(ctx, salesIds, myOptions);
const query = `
DROP TEMPORARY TABLE IF EXISTS tmp.recalculateSales;
diff --git a/modules/ticket/back/methods/sale/refund.js b/modules/ticket/back/methods/sale/refund.js
index c0c431636..7b63fd66e 100644
--- a/modules/ticket/back/methods/sale/refund.js
+++ b/modules/ticket/back/methods/sale/refund.js
@@ -12,6 +12,11 @@ module.exports = Self => {
arg: 'servicesIds',
type: ['number']
},
+ {
+ arg: 'createSingleTicket',
+ type: 'boolean',
+ required: false
+ }
],
returns: {
type: ['number'],
@@ -23,7 +28,7 @@ module.exports = Self => {
}
});
- Self.refund = async(salesIds, servicesIds, options) => {
+ Self.refund = async(salesIds, servicesIds, createSingleTicket = false, options) => {
const models = Self.app.models;
const myOptions = {};
let tx;
@@ -63,38 +68,37 @@ module.exports = Self => {
const ticketsIds = [...new Set(sales.map(sale => sale.ticketFk))];
const refundTickets = [];
-
- const now = new Date();
const mappedTickets = new Map();
+ const now = Date.vnNew();
- for (let ticketId of ticketsIds) {
- const filter = {include: {relation: 'address'}};
- const ticket = await models.Ticket.findById(ticketId, filter, myOptions);
-
- const refundTicket = await models.Ticket.create({
- clientFk: ticket.clientFk,
- shipped: now,
- addressFk: ticket.address().id,
- agencyModeFk: refundAgencyMode.id,
- nickname: ticket.address().nickname,
- warehouseFk: ticket.warehouseFk,
- companyFk: ticket.companyFk,
- landed: now,
- zoneFk: refoundZoneId
- }, myOptions);
-
- refundTickets.push(refundTicket);
-
- mappedTickets.set(ticketId, refundTicket.id);
-
- await models.TicketRefund.create({
- refundTicketFk: refundTicket.id,
- originalTicketFk: ticket.id,
- }, myOptions);
+ const [firstTicketId] = ticketsIds;
+ if (createSingleTicket) {
+ await createTicketRefund(
+ firstTicketId,
+ refundTickets,
+ mappedTickets,
+ now,
+ refundAgencyMode,
+ refoundZoneId,
+ myOptions
+ );
+ } else {
+ for (let ticketId of ticketsIds) {
+ await createTicketRefund(
+ ticketId,
+ refundTickets,
+ mappedTickets,
+ now,
+ refundAgencyMode,
+ refoundZoneId,
+ myOptions
+ );
+ }
}
for (const sale of sales) {
- const refundTicketId = mappedTickets.get(sale.ticketFk);
+ const refundTicketId = await getTicketRefundId(createSingleTicket, sale.ticketFk, refundTickets, mappedTickets);
+
const createdSale = await models.Sale.create({
ticketFk: refundTicketId,
itemFk: sale.itemFk,
@@ -118,7 +122,7 @@ module.exports = Self => {
const services = await models.TicketService.find(servicesFilter, myOptions);
for (const service of services) {
- const refundTicketId = mappedTickets.get(service.ticketFk);
+ const refundTicketId = await getTicketRefundId(createSingleTicket, service.ticketFk, refundTickets, mappedTickets);
await models.TicketService.create({
description: service.description,
@@ -139,4 +143,47 @@ module.exports = Self => {
throw e;
}
};
+
+ async function createTicketRefund(
+ ticketId,
+ refundTickets,
+ mappedTickets,
+ now,
+ refundAgencyMode,
+ refoundZoneId,
+ myOptions
+ ) {
+ const models = Self.app.models;
+
+ const filter = {include: {relation: 'address'}};
+ const ticket = await models.Ticket.findById(ticketId, filter, myOptions);
+
+ const refundTicket = await models.Ticket.create({
+ clientFk: ticket.clientFk,
+ shipped: now,
+ addressFk: ticket.address().id,
+ agencyModeFk: refundAgencyMode.id,
+ nickname: ticket.address().nickname,
+ warehouseFk: ticket.warehouseFk,
+ companyFk: ticket.companyFk,
+ landed: now,
+ zoneFk: refoundZoneId
+ }, myOptions);
+
+ refundTickets.push(refundTicket);
+
+ mappedTickets.set(ticketId, refundTicket.id);
+
+ await models.TicketRefund.create({
+ refundTicketFk: refundTicket.id,
+ originalTicketFk: ticket.id,
+ }, myOptions);
+ }
+
+ async function getTicketRefundId(createSingleTicket, ticketId, refundTickets, mappedTickets) {
+ if (createSingleTicket) {
+ const [firstRefundTicket] = refundTickets;
+ return firstRefundTicket.id;
+ } else return mappedTickets.get(ticketId);
+ }
};
diff --git a/modules/ticket/back/methods/sale/reserve.js b/modules/ticket/back/methods/sale/reserve.js
index 648e6de23..2dc368af6 100644
--- a/modules/ticket/back/methods/sale/reserve.js
+++ b/modules/ticket/back/methods/sale/reserve.js
@@ -51,9 +51,7 @@ module.exports = Self => {
try {
const salesIds = sales.map(sale => sale.id);
- const canEditSale = await models.Sale.canEdit(ctx, salesIds, myOptions);
- if (!canEditSale)
- throw new UserError(`Sale(s) blocked, please contact production`);
+ await models.Sale.canEdit(ctx, salesIds, myOptions);
let changesMade = '';
const promises = [];
diff --git a/modules/ticket/back/methods/sale/specs/canEdit.spec.js b/modules/ticket/back/methods/sale/specs/canEdit.spec.js
index 2aa873df5..a6c299321 100644
--- a/modules/ticket/back/methods/sale/specs/canEdit.spec.js
+++ b/modules/ticket/back/methods/sale/specs/canEdit.spec.js
@@ -47,51 +47,10 @@ describe('sale canEdit()', () => {
throw e;
}
});
-
- it('should return false if any of the sales has a saleTracking record', async() => {
- const tx = await models.Sale.beginTransaction({});
-
- try {
- const options = {transaction: tx};
-
- const buyerId = 35;
- const ctx = {req: {accessToken: {userId: buyerId}}};
-
- const sales = [31];
-
- const result = await models.Sale.canEdit(ctx, sales, options);
-
- expect(result).toEqual(false);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
- });
});
describe('sale editCloned', () => {
const saleCloned = [29];
- it('should return false if any of the sales is cloned', async() => {
- const tx = await models.Sale.beginTransaction({});
-
- try {
- const options = {transaction: tx};
-
- const buyerId = 35;
- const ctx = {req: {accessToken: {userId: buyerId}}};
-
- const result = await models.Sale.canEdit(ctx, saleCloned, options);
-
- expect(result).toEqual(false);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
- });
it('should return true if any of the sales is cloned and has the correct role', async() => {
const tx = await models.Sale.beginTransaction({});
@@ -130,25 +89,23 @@ describe('sale canEdit()', () => {
it('should return false if any of the sales isFloramondo', async() => {
const tx = await models.Sale.beginTransaction({});
const sales = [26];
-
+ let error;
try {
const options = {transaction: tx};
const ctx = {req: {accessToken: {userId: employeeId}}};
-
- // For test
const saleToEdit = await models.Sale.findById(sales[0], null, options);
await saleToEdit.updateAttribute('itemFk', 9, options);
- const result = await models.Sale.canEdit(ctx, sales, options);
-
- expect(result).toEqual(false);
-
+ await models.Sale.canEdit(ctx, sales, options);
await tx.rollback();
} catch (e) {
await tx.rollback();
- throw e;
+ error = e;
}
+
+ expect(error).toEqual(
+ new Error('It is not possible to modify sales that their articles are from Floramondo'));
});
it('should return true if any of the sales is of isFloramondo and has the correct role', async() => {
diff --git a/modules/ticket/back/methods/sale/specs/refund.spec.js b/modules/ticket/back/methods/sale/specs/refund.spec.js
index 74077cf29..403b4b477 100644
--- a/modules/ticket/back/methods/sale/specs/refund.spec.js
+++ b/modules/ticket/back/methods/sale/specs/refund.spec.js
@@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
-describe('sale refund()', () => {
+describe('Sale refund()', () => {
const userId = 5;
const activeCtx = {
accessToken: {userId: userId},
@@ -22,7 +22,7 @@ describe('sale refund()', () => {
try {
const options = {transaction: tx};
- const response = await models.Sale.refund(salesIds, servicesIds, options);
+ const response = await models.Sale.refund(salesIds, servicesIds, false, options);
expect(response.length).toBeGreaterThanOrEqual(1);
@@ -40,7 +40,8 @@ describe('sale refund()', () => {
try {
const options = {transaction: tx};
- const tickets = await models.Sale.refund(salesIds, servicesIds, options);
+ const createSingleTicket = false;
+ const tickets = await models.Sale.refund(salesIds, servicesIds, createSingleTicket, options);
const ticketsIds = tickets.map(ticket => ticket.id);
diff --git a/modules/ticket/back/methods/sale/updateConcept.js b/modules/ticket/back/methods/sale/updateConcept.js
index 0730f85e2..dcd25dcbb 100644
--- a/modules/ticket/back/methods/sale/updateConcept.js
+++ b/modules/ticket/back/methods/sale/updateConcept.js
@@ -40,10 +40,7 @@ module.exports = Self => {
try {
const currentLine = await models.Sale.findById(id, null, myOptions);
- const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
-
- if (!canEditSale)
- throw new UserError(`Sale(s) blocked, please contact production`);
+ await models.Sale.canEdit(ctx, [id], myOptions);
const line = await currentLine.updateAttributes({concept: newConcept}, myOptions);
diff --git a/modules/ticket/back/methods/sale/updatePrice.js b/modules/ticket/back/methods/sale/updatePrice.js
index 8f27e1af5..505de5180 100644
--- a/modules/ticket/back/methods/sale/updatePrice.js
+++ b/modules/ticket/back/methods/sale/updatePrice.js
@@ -66,9 +66,7 @@ module.exports = Self => {
const sale = await models.Sale.findById(id, filter, myOptions);
- const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
- if (!canEditSale)
- throw new UserError(`Sale(s) blocked, please contact production`);
+ await models.Sale.canEdit(ctx, [id], myOptions);
const oldPrice = sale.price;
const userId = ctx.req.accessToken.userId;
diff --git a/modules/ticket/back/methods/sale/updateQuantity.js b/modules/ticket/back/methods/sale/updateQuantity.js
index 8cf0720ce..d2927c65c 100644
--- a/modules/ticket/back/methods/sale/updateQuantity.js
+++ b/modules/ticket/back/methods/sale/updateQuantity.js
@@ -41,9 +41,7 @@ module.exports = Self => {
}
try {
- const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
- if (!canEditSale)
- throw new UserError(`Sale(s) blocked, please contact production`);
+ await models.Sale.canEdit(ctx, [id], myOptions);
const filter = {
include: {
diff --git a/modules/ticket/back/methods/state/editableStates.js b/modules/ticket/back/methods/state/editableStates.js
index 2c90ac43b..115876f26 100644
--- a/modules/ticket/back/methods/state/editableStates.js
+++ b/modules/ticket/back/methods/state/editableStates.js
@@ -24,7 +24,7 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
- let statesList = await models.State.find({where: filter.where}, myOptions);
+ let statesList = await models.State.find(filter, myOptions);
const isProduction = await models.Account.hasRole(userId, 'production', myOptions);
const isSalesPerson = await models.Account.hasRole(userId, 'salesPerson', myOptions);
const isAdministrative = await models.Account.hasRole(userId, 'administrative', myOptions);
diff --git a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js b/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
index 746e1b7fc..175bc4e4b 100644
--- a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
+++ b/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
@@ -9,7 +9,7 @@ describe('ticket changeState()', () => {
accessToken: {userId: 9},
};
const ctx = {req: activeCtx};
- const now = new Date();
+ const now = Date.vnNew();
const sampleTicket = {
shipped: now,
landed: now,
diff --git a/modules/ticket/back/methods/ticket/canBeInvoiced.js b/modules/ticket/back/methods/ticket/canBeInvoiced.js
index a009d63cf..6b8f9e71a 100644
--- a/modules/ticket/back/methods/ticket/canBeInvoiced.js
+++ b/modules/ticket/back/methods/ticket/canBeInvoiced.js
@@ -43,7 +43,7 @@ module.exports = function(Self) {
ticketBases => ticketBases.hasSomeNegativeBase
);
- const today = new Date();
+ const today = Date.vnNew();
const invalidTickets = tickets.some(ticket => {
const shipped = new Date(ticket.shipped);
diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index 327278c2b..3726d85b7 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -17,14 +17,14 @@ module.exports = Self => {
});
Self.closeAll = async() => {
- const toDate = new Date();
+ const toDate = Date.vnNew();
toDate.setHours(0, 0, 0, 0);
toDate.setDate(toDate.getDate() - 1);
- const todayMinDate = new Date();
+ const todayMinDate = Date.vnNew();
todayMinDate.setHours(0, 0, 0, 0);
- const todayMaxDate = new Date();
+ const todayMaxDate = Date.vnNew();
todayMaxDate.setHours(23, 59, 59, 59);
// Prevent closure for current day
@@ -32,7 +32,7 @@ module.exports = Self => {
throw new UserError('You cannot close tickets for today');
const tickets = await Self.rawSql(`
- SELECT
+ SELECT
t.id,
t.clientFk,
t.companyFk,
@@ -53,7 +53,7 @@ module.exports = Self => {
JOIN country co ON co.id = p.countryFk
LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
WHERE al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered')
- AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
+ AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
AND util.dayEnd(?)
AND t.refFk IS NULL
GROUP BY t.id
diff --git a/modules/ticket/back/methods/ticket/collectionLabel.js b/modules/ticket/back/methods/ticket/collectionLabel.js
index 7601961fb..74b5b2c0a 100644
--- a/modules/ticket/back/methods/ticket/collectionLabel.js
+++ b/modules/ticket/back/methods/ticket/collectionLabel.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('collectionLabel', {
description: 'Returns the collection label',
@@ -39,17 +37,5 @@ module.exports = Self => {
}
});
- Self.collectionLabel = 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('collection-label', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.collectionLabel = (ctx, id) => Self.printReport(ctx, id, 'collection-label');
};
diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js
index f4a4bb98d..c23d1669e 100644
--- a/modules/ticket/back/methods/ticket/componentUpdate.js
+++ b/modules/ticket/back/methods/ticket/componentUpdate.js
@@ -83,6 +83,11 @@ module.exports = Self => {
type: 'boolean',
description: 'Is whithout negatives',
required: true
+ },
+ {
+ arg: 'withWarningAccept',
+ type: 'boolean',
+ description: 'Has pressed in confirm message',
}],
returns: {
type: ['object'],
@@ -160,18 +165,29 @@ module.exports = Self => {
'shipped',
'landed',
'isDeleted',
- 'routeFk'
+ 'routeFk',
+ 'nickname'
],
include: [
{
relation: 'client',
scope: {
fields: 'salesPersonFk'
- }
- }]
+ },
+ include: [
+ {
+ relation: 'address',
+ scope: {
+ fields: 'nickname'
+ }
+ }
+ ]
+ },
+ ]
}, myOptions);
args.routeFk = null;
+ if (args.isWithoutNegatives === false) delete args.isWithoutNegatives;
const updatedTicket = Object.assign({}, args);
delete updatedTicket.ctx;
delete updatedTicket.option;
@@ -219,37 +235,41 @@ module.exports = Self => {
}
const changes = loggable.getChanges(originalTicket, updatedTicket);
- const oldProperties = await loggable.translateValues(Self, changes.old);
- const newProperties = await loggable.translateValues(Self, changes.new);
+ const hasChanges = Object.keys(changes.old).length > 0 || Object.keys(changes.new).length > 0;
- await models.TicketLog.create({
- originFk: args.id,
- userFk: userId,
- action: 'update',
- changedModel: 'Ticket',
- changedModelId: args.id,
- oldInstance: oldProperties,
- newInstance: newProperties
- }, myOptions);
+ if (hasChanges) {
+ const oldProperties = await loggable.translateValues(Self, changes.old);
+ const newProperties = await loggable.translateValues(Self, changes.new);
- const salesPersonId = originalTicket.client().salesPersonFk;
- if (salesPersonId) {
- const origin = ctx.req.headers.origin;
+ await models.TicketLog.create({
+ originFk: args.id,
+ userFk: userId,
+ action: 'update',
+ changedModel: 'Ticket',
+ changedModelId: args.id,
+ oldInstance: oldProperties,
+ newInstance: newProperties
+ }, myOptions);
- let changesMade = '';
- for (let change in newProperties) {
- let value = newProperties[change];
- let oldValue = oldProperties[change];
+ const salesPersonId = originalTicket.client().salesPersonFk;
+ if (salesPersonId) {
+ const origin = ctx.req.headers.origin;
- changesMade += `\r\n~${$t(change)}: ${oldValue}~ ➔ *${$t(change)}: ${value}*`;
+ let changesMade = '';
+ for (let change in newProperties) {
+ let value = newProperties[change];
+ let oldValue = oldProperties[change];
+
+ changesMade += `\r\n~${$t(change)}: ${oldValue}~ ➔ *${$t(change)}: ${value}*`;
+ }
+
+ const message = $t('Changed this data from the ticket', {
+ ticketId: args.id,
+ ticketUrl: `${origin}/#!/ticket/${args.id}/sale`,
+ changes: changesMade
+ });
+ await models.Chat.sendCheckingPresence(ctx, salesPersonId, message);
}
-
- const message = $t('Changed this data from the ticket', {
- ticketId: args.id,
- ticketUrl: `${origin}/#!/ticket/${args.id}/sale`,
- changes: changesMade
- });
- await models.Chat.sendCheckingPresence(ctx, salesPersonId, message);
}
res.id = args.id;
diff --git a/modules/ticket/back/methods/ticket/deliveryNoteEmail.js b/modules/ticket/back/methods/ticket/deliveryNoteEmail.js
index cf9f5dd62..4b275b45e 100644
--- a/modules/ticket/back/methods/ticket/deliveryNoteEmail.js
+++ b/modules/ticket/back/methods/ticket/deliveryNoteEmail.js
@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('deliveryNoteEmail', {
description: 'Sends the delivery note email with an attached PDF',
@@ -47,19 +45,5 @@ module.exports = Self => {
}
});
- Self.deliveryNoteEmail = 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('delivery-note', params);
-
- return email.send();
- };
+ Self.deliveryNoteEmail = ctx => Self.sendTemplate(ctx, 'delivery-note');
};
diff --git a/modules/ticket/back/methods/ticket/deliveryNotePdf.js b/modules/ticket/back/methods/ticket/deliveryNotePdf.js
index b2b3f7198..628e16bcd 100644
--- a/modules/ticket/back/methods/ticket/deliveryNotePdf.js
+++ b/modules/ticket/back/methods/ticket/deliveryNotePdf.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('deliveryNotePdf', {
description: 'Returns the delivery note pdf',
@@ -46,17 +44,5 @@ module.exports = Self => {
}
});
- Self.deliveryNotePdf = 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('delivery-note', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.deliveryNotePdf = (ctx, id) => Self.printReport(ctx, id, 'delivery-note');
};
diff --git a/modules/ticket/back/methods/ticket/expeditionPalletLabel.js b/modules/ticket/back/methods/ticket/expeditionPalletLabel.js
index 2215263dd..9830364d6 100644
--- a/modules/ticket/back/methods/ticket/expeditionPalletLabel.js
+++ b/modules/ticket/back/methods/ticket/expeditionPalletLabel.js
@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
module.exports = Self => {
Self.remoteMethodCtx('expeditionPalletLabel', {
description: 'Returns the expedition pallet label',
@@ -39,17 +37,5 @@ module.exports = Self => {
}
});
- Self.expeditionPalletLabel = 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('expedition-pallet-label', params);
- const stream = await report.toPdfStream();
-
- return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
- };
+ Self.expeditionPalletLabel = (ctx, id) => Self.printReport(ctx, id, 'expedition-pallet-label');
};
diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index a2add2e82..262b3fd74 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -137,7 +137,7 @@ module.exports = Self => {
Self.filter = async(ctx, filter, options) => {
const userId = ctx.req.accessToken.userId;
const conn = Self.dataSource.connector;
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const models = Self.app.models;
const args = ctx.args;
@@ -295,10 +295,10 @@ module.exports = Self => {
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.sale_getProblems');
stmt = new ParameterizedSQL(`
- CREATE TEMPORARY TABLE tmp.sale_getProblems
+ CREATE TEMPORARY TABLE tmp.sale_getProblems
(INDEX (ticketFk))
ENGINE = MEMORY
- SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped
+ SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped
FROM tmp.filter f
LEFT JOIN alertLevel al ON al.id = f.alertLevel
WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)
@@ -350,7 +350,7 @@ module.exports = Self => {
const ticketsIndex = stmts.push(stmt) - 1;
stmts.push(
- `DROP TEMPORARY TABLE
+ `DROP TEMPORARY TABLE
tmp.filter,
tmp.ticket_problems`);
diff --git a/modules/ticket/back/methods/ticket/getSales.js b/modules/ticket/back/methods/ticket/getSales.js
index 3e45b3fb5..321e8e24e 100644
--- a/modules/ticket/back/methods/ticket/getSales.js
+++ b/modules/ticket/back/methods/ticket/getSales.js
@@ -87,6 +87,14 @@ module.exports = Self => {
for (let problem of problems)
saleProblems.set(problem.saleFk, problem);
+ const ticketLog = await Self.rawSql(`SELECT DISTINCT changedModelId
+ FROM ticketLog tl
+ WHERE changedModel = 'Sale'
+ AND originFk = ?`, [id], myOptions);
+ const salesWithLogs = ticketLog.map(sale => {
+ return sale.changedModelId;
+ });
+
for (let sale of sales) {
const problems = saleProblems.get(sale.id);
const itemStock = itemAvailable.get(sale.itemFk);
@@ -98,6 +106,8 @@ module.exports = Self => {
sale.hasTicketRequest = problems.hasTicketRequest;
sale.hasComponentLack = problems.hasComponentLack;
}
+ if (salesWithLogs.includes(sale.id))
+ sale.$hasLogs = true;
}
return sales;
diff --git a/modules/ticket/back/methods/ticket/getTicketsAdvance.js b/modules/ticket/back/methods/ticket/getTicketsAdvance.js
index 19571bb51..ec9314db2 100644
--- a/modules/ticket/back/methods/ticket/getTicketsAdvance.js
+++ b/modules/ticket/back/methods/ticket/getTicketsAdvance.js
@@ -50,15 +50,9 @@ module.exports = Self => {
required: false
},
{
- arg: 'state',
- type: 'string',
- description: 'Origin state',
- required: false
- },
- {
- arg: 'futureState',
- type: 'string',
- description: 'Destination state',
+ arg: 'isFullMovable',
+ type: 'boolean',
+ description: 'True when lines and stock of origin are equal',
required: false
},
{
@@ -92,13 +86,21 @@ module.exports = Self => {
case 'futureId':
return {'f.futureId': value};
case 'ipt':
- return {'f.ipt': value};
+ return {or:
+ [
+ {'f.ipt': {like: `%${value}%`}},
+ {'f.ipt': null}
+ ]
+ };
case 'futureIpt':
- return {'f.futureIpt': value};
- case 'state':
- return {'f.stateCode': {like: `%${value}%`}};
- case 'futureState':
- return {'f.futureStateCode': {like: `%${value}%`}};
+ return {or:
+ [
+ {'f.futureIpt': {like: `%${value}%`}},
+ {'f.futureIpt': null}
+ ]
+ };
+ case 'isFullMovable':
+ return {'f.isFullMovable': value};
}
});
diff --git a/modules/ticket/back/methods/ticket/makeInvoice.js b/modules/ticket/back/methods/ticket/makeInvoice.js
index 4e9c22a24..9739f5985 100644
--- a/modules/ticket/back/methods/ticket/makeInvoice.js
+++ b/modules/ticket/back/methods/ticket/makeInvoice.js
@@ -26,7 +26,7 @@ module.exports = function(Self) {
Self.makeInvoice = async(ctx, ticketsIds, options) => {
const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const myOptions = {};
diff --git a/modules/ticket/back/methods/ticket/new.js b/modules/ticket/back/methods/ticket/new.js
index e7e4cd01b..a5d04bc4c 100644
--- a/modules/ticket/back/methods/ticket/new.js
+++ b/modules/ticket/back/methods/ticket/new.js
@@ -111,7 +111,7 @@ module.exports = Self => {
args.landed = landedResult && landedResult.landed;
}
- query = `CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @result);
+ query = `CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @result);
SELECT @result newTicketId;`;
const result = await Self.rawSql(query, [
args.clientId,
@@ -122,6 +122,7 @@ module.exports = Self => {
args.agencyModeId || null,
args.routeId || null,
args.landed,
+ true,
myUserId
], myOptions);
diff --git a/modules/ticket/back/methods/ticket/refund.js b/modules/ticket/back/methods/ticket/refund.js
index 620c8b0c7..1f0021316 100644
--- a/modules/ticket/back/methods/ticket/refund.js
+++ b/modules/ticket/back/methods/ticket/refund.js
@@ -8,6 +8,11 @@ module.exports = Self => {
type: ['number'],
required: true
},
+ {
+ arg: 'createSingleTicket',
+ type: 'boolean',
+ required: false
+ }
],
returns: {
type: ['number'],
@@ -19,7 +24,7 @@ module.exports = Self => {
}
});
- Self.refund = async(ticketsIds, options) => {
+ Self.refund = async(ticketsIds, createSingleTicket = false, options) => {
const models = Self.app.models;
const myOptions = {};
let tx;
@@ -41,7 +46,7 @@ module.exports = Self => {
const services = await models.TicketService.find(filter, myOptions);
const servicesIds = services.map(service => service.id);
- const refundedTickets = await models.Sale.refund(salesIds, servicesIds, myOptions);
+ const refundedTickets = await models.Sale.refund(salesIds, servicesIds, createSingleTicket, myOptions);
if (tx) await tx.commit();
diff --git a/modules/ticket/back/methods/ticket/restore.js b/modules/ticket/back/methods/ticket/restore.js
index c9bb126fd..722c3294e 100644
--- a/modules/ticket/back/methods/ticket/restore.js
+++ b/modules/ticket/back/methods/ticket/restore.js
@@ -38,7 +38,7 @@ module.exports = Self => {
}]
}, myOptions);
- const now = new Date();
+ const now = Date.vnNew();
const maxDate = new Date(ticket.updated);
maxDate.setHours(maxDate.getHours() + 1);
@@ -56,7 +56,7 @@ module.exports = Self => {
await models.Chat.sendCheckingPresence(ctx, salesPersonId, message);
}
- const fullYear = new Date().getFullYear();
+ const fullYear = Date.vnNew().getFullYear();
const newShipped = ticket.shipped;
const newLanded = ticket.landed;
newShipped.setFullYear(fullYear);
diff --git a/modules/ticket/back/methods/ticket/setDeleted.js b/modules/ticket/back/methods/ticket/setDeleted.js
index cec8096a6..6ebc37d6e 100644
--- a/modules/ticket/back/methods/ticket/setDeleted.js
+++ b/modules/ticket/back/methods/ticket/setDeleted.js
@@ -42,6 +42,14 @@ module.exports = Self => {
if (!isEditable)
throw new UserError(`The sales of this ticket can't be modified`);
+ // Check if ticket has refunds
+ const ticketRefunds = await models.TicketRefund.find({
+ where: {originalTicketFk: id},
+ fields: ['id']}
+ , myOptions);
+ if (ticketRefunds.length > 0)
+ throw new UserError($t('Tickets with associated refunds', {id: ticketRefunds[0].id}));
+
// Check if has sales with shelving
const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant', myOptions);
const sales = await models.Sale.find({
@@ -134,12 +142,12 @@ module.exports = Self => {
await models.TicketCollection.destroyById(ticketCollection.id, myOptions);
await Self.rawSql(`
- DELETE sc
+ DELETE sc
FROM vn.saleGroup sg
JOIN vn.sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sg.id
JOIN vn.sectorCollection sc ON sc.id = scsg.sectorCollectionFk
JOIN vn.saleGroupDetail sgd ON sgd.saleGroupFk = sg.id
- JOIN vn.sale s ON s.id = sgd.saleFk
+ JOIN vn.sale s ON s.id = sgd.saleFk
WHERE s.ticketFk = ?;`, [ticket.id], myOptions);
if (tx) await tx.commit();
diff --git a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
index 8b7e1685d..806f80227 100644
--- a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
@@ -61,7 +61,7 @@ describe('ticket canBeInvoiced()', () => {
const ticket = await models.Ticket.findById(ticketId, null, options);
- const shipped = new Date();
+ const shipped = Date.vnNew();
shipped.setDate(shipped.getDate() + 1);
await ticket.updateAttribute('shipped', shipped, options);
diff --git a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
index 3a9c2db50..d65c87654 100644
--- a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
@@ -4,8 +4,8 @@ const LoopBackContext = require('loopback-context');
describe('ticket componentUpdate()', () => {
const userID = 1101;
const ticketID = 11;
- const today = new Date();
- const tomorrow = new Date();
+ const today = Date.vnNew();
+ const tomorrow = Date.vnNew();
tomorrow.setDate(tomorrow.getDate() + 1);
@@ -19,11 +19,11 @@ describe('ticket componentUpdate()', () => {
beforeAll(async() => {
const deliveryComponenet = await models.Component.findOne({where: {code: 'delivery'}});
deliveryComponentId = deliveryComponenet.id;
- componentOfSaleSeven = `SELECT value
- FROM vn.saleComponent
+ componentOfSaleSeven = `SELECT value
+ FROM vn.saleComponent
WHERE saleFk = 7 AND componentFk = ${deliveryComponentId}`;
- componentOfSaleEight = `SELECT value
- FROM vn.saleComponent
+ componentOfSaleEight = `SELECT value
+ FROM vn.saleComponent
WHERE saleFk = 8 AND componentFk = ${deliveryComponentId}`;
[componentValue] = await models.SaleComponent.rawSql(componentOfSaleSeven);
firstvalueBeforeChange = componentValue.value;
diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index 688b0de61..6cc1a3ad2 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -26,9 +26,9 @@ describe('ticket filter()', () => {
try {
const options = {transaction: tx};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setHours(0, 0, 0, 0);
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
const ctx = {req: {accessToken: {userId: 9}}, args: {
@@ -54,10 +54,10 @@ describe('ticket filter()', () => {
try {
const options = {transaction: tx};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setDate(yesterday.getDate() - 1);
yesterday.setHours(0, 0, 0, 0);
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
const ctx = {req: {accessToken: {userId: 9}}, args: {
diff --git a/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js b/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
index aab053127..5a3209a6d 100644
--- a/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
@@ -1,9 +1,9 @@
const models = require('vn-loopback/server/server').models;
describe('TicketFuture getTicketsAdvance()', () => {
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
- let tomorrow = new Date();
+ let tomorrow = Date.vnNew();
tomorrow.setDate(today.getDate() + 1);
it('should return the tickets passing the required data', async() => {
@@ -29,7 +29,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
}
});
- it('should return the tickets matching the origin grouped state', async() => {
+ it('should return the tickets matching the fullMovable true', async() => {
const tx = await models.Ticket.beginTransaction({});
try {
@@ -39,7 +39,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
dateFuture: tomorrow,
dateToAdvance: today,
warehouseFk: 1,
- state: 'OK'
+ isFullMovable: true
};
const ctx = {req: {accessToken: {userId: 9}}, args};
@@ -54,7 +54,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
}
});
- it('should return the tickets matching the destination grouped state', async() => {
+ it('should return the tickets matching the fullMovable false', async() => {
const tx = await models.Ticket.beginTransaction({});
try {
@@ -64,13 +64,13 @@ describe('TicketFuture getTicketsAdvance()', () => {
dateFuture: tomorrow,
dateToAdvance: today,
warehouseFk: 1,
- futureState: 'FREE'
+ isFullMovable: false
};
const ctx = {req: {accessToken: {userId: 9}}, args};
const result = await models.Ticket.getTicketsAdvance(ctx, options);
- expect(result.length).toBeGreaterThan(0);
+ expect(result.length).toEqual(0);
await tx.rollback();
} catch (e) {
@@ -89,13 +89,13 @@ describe('TicketFuture getTicketsAdvance()', () => {
dateFuture: tomorrow,
dateToAdvance: today,
warehouseFk: 1,
- ipt: 'Vertical'
+ ipt: 'V'
};
const ctx = {req: {accessToken: {userId: 9}}, args};
const result = await models.Ticket.getTicketsAdvance(ctx, options);
- expect(result.length).toBeLessThan(5);
+ expect(result.length).toBeGreaterThan(5);
await tx.rollback();
} catch (e) {
@@ -114,13 +114,13 @@ describe('TicketFuture getTicketsAdvance()', () => {
dateFuture: tomorrow,
dateToAdvance: today,
warehouseFk: 1,
- tfIpt: 'Vertical'
+ tfIpt: 'V'
};
const ctx = {req: {accessToken: {userId: 9}}, args};
const result = await models.Ticket.getTicketsAdvance(ctx, options);
- expect(result.length).toBeLessThan(5);
+ expect(result.length).toBeGreaterThan(5);
await tx.rollback();
} catch (e) {
diff --git a/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js b/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js
index 51639e304..44896493f 100644
--- a/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js
@@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('ticket getTicketsFuture()', () => {
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
it('should return the tickets passing the required data', async() => {
diff --git a/modules/ticket/back/methods/ticket/specs/merge.spec.js b/modules/ticket/back/methods/ticket/specs/merge.spec.js
index 275484f67..78eb0c8f3 100644
--- a/modules/ticket/back/methods/ticket/specs/merge.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/merge.spec.js
@@ -2,13 +2,13 @@ const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('ticket merge()', () => {
- const tickets = [{
+ const tickets = {
originId: 13,
destinationId: 12,
- originShipped: new Date(),
- destinationShipped: new Date(),
+ originShipped: Date.vnNew(),
+ destinationShipped: Date.vnNew(),
workerFk: 1
- }];
+ };
const activeCtx = {
accessToken: {userId: 9},
@@ -37,14 +37,14 @@ describe('ticket merge()', () => {
const options = {transaction: tx};
const chatNotificationBeforeMerge = await models.Chat.find();
- await models.Ticket.merge(ctx, tickets, options);
+ await models.Ticket.merge(ctx, [tickets], options);
- const createdTicketLog = await models.TicketLog.find({where: {originFk: tickets[0].originId}}, options);
- const deletedTicket = await models.Ticket.findOne({where: {id: tickets[0].originId}}, options);
- const salesTicketFuture = await models.Sale.find({where: {ticketFk: tickets[0].destinationId}}, options);
+ const createdTicketLog = await models.TicketLog.find({where: {originFk: tickets.originId}}, options);
+ const deletedTicket = await models.Ticket.findOne({where: {id: tickets.originId}}, options);
+ const salesTicketFuture = await models.Sale.find({where: {ticketFk: tickets.destinationId}}, options);
const chatNotificationAfterMerge = await models.Chat.find();
- expect(createdTicketLog.length).toEqual(1);
+ expect(createdTicketLog.length).toEqual(2);
expect(deletedTicket.isDeleted).toEqual(true);
expect(salesTicketFuture.length).toEqual(2);
expect(chatNotificationBeforeMerge.length).toEqual(chatNotificationAfterMerge.length - 2);
diff --git a/modules/ticket/back/methods/ticket/specs/new.spec.js b/modules/ticket/back/methods/ticket/specs/new.spec.js
index fce7cdceb..0a2f93bc4 100644
--- a/modules/ticket/back/methods/ticket/specs/new.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/new.spec.js
@@ -2,7 +2,7 @@ const models = require('vn-loopback/server/server').models;
let UserError = require('vn-loopback/util/user-error');
describe('ticket new()', () => {
- const today = new Date();
+ const today = Date.vnNew();
const ctx = {req: {accessToken: {userId: 1}}};
it('should throw an error if the client isnt frozen and isnt active', async() => {
diff --git a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
index 5470382f9..cc54353ef 100644
--- a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
@@ -8,7 +8,7 @@ describe('sale priceDifference()', () => {
try {
const options = {transaction: tx};
- const tomorrow = new Date();
+ const tomorrow = Date.vnNew();
tomorrow.setDate(tomorrow.getDate() + 1);
const ctx = {req: {accessToken: {userId: 1106}}};
@@ -45,8 +45,8 @@ describe('sale priceDifference()', () => {
const ctx = {req: {accessToken: {userId: 1106}}};
ctx.args = {
id: 1,
- landed: new Date(),
- shipped: new Date(),
+ landed: Date.vnNew(),
+ shipped: Date.vnNew(),
addressId: 121,
zoneId: 3,
warehouseId: 1
@@ -68,7 +68,7 @@ describe('sale priceDifference()', () => {
try {
const options = {transaction: tx};
- const tomorrow = new Date();
+ const tomorrow = Date.vnNew();
tomorrow.setDate(tomorrow.getDate() + 1);
const ctx = {req: {accessToken: {userId: 1106}}};
@@ -86,7 +86,7 @@ describe('sale priceDifference()', () => {
const firstItem = result.items[0];
const secondtItem = result.items[1];
- expect(firstItem.movable).toEqual(410);
+ expect(firstItem.movable).toEqual(380);
expect(secondtItem.movable).toEqual(1790);
await tx.rollback();
diff --git a/modules/ticket/back/methods/ticket/specs/restore.spec.js b/modules/ticket/back/methods/ticket/specs/restore.spec.js
index bd976d124..3b35ae2b4 100644
--- a/modules/ticket/back/methods/ticket/specs/restore.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/restore.spec.js
@@ -24,8 +24,8 @@ describe('ticket restore()', () => {
let error;
const tx = await app.models.Ticket.beginTransaction({});
- const now = new Date();
- now.setHours(now.getHours() - 1);
+ const now = Date.vnNew();
+ now.setHours(now.getHours() - 1.1);
try {
const options = {transaction: tx};
@@ -46,7 +46,7 @@ describe('ticket restore()', () => {
it('should restore the ticket making its state no longer deleted', async() => {
const tx = await app.models.Ticket.beginTransaction({});
- const now = new Date();
+ const now = Date.vnNew();
try {
const options = {transaction: tx};
diff --git a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
index 1c17d4d0b..b2e70697a 100644
--- a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
@@ -101,4 +101,32 @@ describe('ticket setDeleted()', () => {
throw e;
}
});
+
+ it('should show error trying to delete a ticket with a refund', async() => {
+ const tx = await models.Ticket.beginTransaction({});
+ let error;
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {
+ req: {
+ accessToken: {userId: 9},
+ headers: {origin: 'http://localhost:5000'},
+ }
+ };
+ ctx.req.__ = value => {
+ return value;
+ };
+
+ const ticketId = 12;
+ await models.Ticket.setDeleted(ctx, ticketId, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error.message).toContain('Tickets with associated refunds');
+ });
});
diff --git a/modules/ticket/back/methods/ticket/specs/transferSales.spec.js b/modules/ticket/back/methods/ticket/specs/transferSales.spec.js
index cd2ce8599..270aae2f8 100644
--- a/modules/ticket/back/methods/ticket/specs/transferSales.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/transferSales.spec.js
@@ -80,34 +80,6 @@ describe('sale transferSales()', () => {
expect(error.message).toEqual(`Can't transfer claimed sales`);
});
- it('should be able to transfer claimed sales if the role is claimManager', async() => {
- const tx = await models.Ticket.beginTransaction({});
-
- let error;
- try {
- const options = {transaction: tx};
-
- const claimManagerId = 72;
- const myActiveCtx = {
- accessToken: {userId: claimManagerId},
- };
- const myCtx = {req: myActiveCtx};
-
- const ticketId = 11;
- const receiverTicketId = null;
- const sales = await models.Ticket.getSales(ticketId, options);
-
- await models.Ticket.transferSales(myCtx, ticketId, receiverTicketId, sales, options);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- error = e;
- }
-
- expect(error).toBeUndefined();
- });
-
it('should transfer the sales from a ticket to a new one', async() => {
const tx = await models.Ticket.beginTransaction({});
diff --git a/modules/ticket/back/methods/ticket/summary.js b/modules/ticket/back/methods/ticket/summary.js
index 848913fe1..a57968fc1 100644
--- a/modules/ticket/back/methods/ticket/summary.js
+++ b/modules/ticket/back/methods/ticket/summary.js
@@ -71,7 +71,7 @@ module.exports = Self => {
}, {
relation: 'address',
scope: {
- fields: ['street', 'city', 'provinceFk', 'phone', 'mobile', 'postalCode'],
+ fields: ['street', 'city', 'provinceFk', 'phone', 'mobile', 'postalCode', 'isEqualizated'],
include: {
relation: 'province',
scope: {
diff --git a/modules/ticket/back/methods/ticket/transferSales.js b/modules/ticket/back/methods/ticket/transferSales.js
index 1b8476184..48035648c 100644
--- a/modules/ticket/back/methods/ticket/transferSales.js
+++ b/modules/ticket/back/methods/ticket/transferSales.js
@@ -77,9 +77,8 @@ module.exports = Self => {
const saleIds = sales.map(sale => sale.id);
- const isClaimManager = await models.Account.hasRole(userId, 'claimManager');
const hasClaimedSales = await models.ClaimBeginning.findOne({where: {saleFk: {inq: saleIds}}});
- if (hasClaimedSales && !isClaimManager)
+ if (hasClaimedSales)
throw new UserError(`Can't transfer claimed sales`);
for (const sale of sales) {
@@ -106,8 +105,8 @@ module.exports = Self => {
originFk: id,
userFk: userId,
action: 'update',
- changedModel: 'Ticket',
- changedModelId: id,
+ changedModel: 'Sale',
+ changedModelId: sale.id,
oldInstance: {
item: originalSaleData.itemFk,
quantity: originalSaleData.quantity,
@@ -127,8 +126,8 @@ module.exports = Self => {
originFk: ticketId,
userFk: userId,
action: 'update',
- changedModel: 'Ticket',
- changedModelId: ticketId,
+ changedModel: 'Sale',
+ changedModelId: sale.id,
oldInstance: {
item: originalSaleData.itemFk,
quantity: originalSaleData.quantity,
@@ -178,16 +177,16 @@ module.exports = Self => {
// Update original sale
const rest = originalSale.quantity - sale.quantity;
- query = `UPDATE sale
+ query = `UPDATE sale
SET quantity = ?
WHERE id = ?`;
await Self.rawSql(query, [rest, sale.id], options);
// Clone sale with new quantity
- query = `INSERT INTO sale (itemFk, ticketFk, concept, quantity, originalQuantity, price, discount, priceFixed,
+ query = `INSERT INTO sale (itemFk, ticketFk, concept, quantity, originalQuantity, price, discount, priceFixed,
reserved, isPicked, isPriceFixed, isAdded)
- SELECT itemFk, ?, concept, ?, originalQuantity, price, discount, priceFixed,
- reserved, isPicked, isPriceFixed, isAdded
+ SELECT itemFk, ?, concept, ?, originalQuantity, price, discount, priceFixed,
+ reserved, isPicked, isPriceFixed, isAdded
FROM sale
WHERE id = ?`;
await Self.rawSql(query, [ticketId, sale.quantity, sale.id], options);
diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json
index 62e763c8f..bee01a875 100644
--- a/modules/ticket/back/model-config.json
+++ b/modules/ticket/back/model-config.json
@@ -41,6 +41,12 @@
"SaleComponent": {
"dataSource": "vn"
},
+ "SaleGroup": {
+ "dataSource": "vn"
+ },
+ "SaleGroupDetail": {
+ "dataSource": "vn"
+ },
"SaleTracking": {
"dataSource": "vn"
},
diff --git a/modules/ticket/back/models/sale.json b/modules/ticket/back/models/sale.json
index b1f70f5e2..7b8cf501b 100644
--- a/modules/ticket/back/models/sale.json
+++ b/modules/ticket/back/models/sale.json
@@ -76,6 +76,11 @@
"type": "hasOne",
"model": "ItemShelvingSale",
"foreignKey": "saleFk"
+ },
+ "saleGroupDetail": {
+ "type": "hasOne",
+ "model": "SaleGroupDetail",
+ "foreignKey": "saleFk"
}
}
}
diff --git a/modules/ticket/back/models/saleGroup.json b/modules/ticket/back/models/saleGroup.json
new file mode 100644
index 000000000..d5cf82cb5
--- /dev/null
+++ b/modules/ticket/back/models/saleGroup.json
@@ -0,0 +1,31 @@
+{
+ "name": "SaleGroup",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "saleGroup"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number",
+ "description": "Identifier"
+ },
+ "parkingFk": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "saleGroupDetail": {
+ "type": "hasMany",
+ "model": "SaleGroupDetail",
+ "foreignKey": "saleGroupFk"
+ },
+ "parking": {
+ "type": "belongsTo",
+ "model": "Parking",
+ "foreignKey": "parkingFk"
+ }
+ }
+}
diff --git a/modules/ticket/back/models/saleGroupDetail.json b/modules/ticket/back/models/saleGroupDetail.json
new file mode 100644
index 000000000..2fbc71bbd
--- /dev/null
+++ b/modules/ticket/back/models/saleGroupDetail.json
@@ -0,0 +1,31 @@
+{
+ "name": "SaleGroupDetail",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "saleGroupDetail"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number",
+ "description": "Identifier"
+ },
+ "saleFk": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "sale": {
+ "type": "belongsTo",
+ "model": "Sale",
+ "foreignKey": "saleFk"
+ },
+ "saleGroup": {
+ "type": "belongsTo",
+ "model": "SaleGroup",
+ "foreignKey": "saleGroupFk"
+ }
+ }
+}
diff --git a/modules/ticket/front/advance-search-panel/index.html b/modules/ticket/front/advance-search-panel/index.html
index e8d5dc60d..ee18c26f9 100644
--- a/modules/ticket/front/advance-search-panel/index.html
+++ b/modules/ticket/front/advance-search-panel/index.html
@@ -39,28 +39,12 @@
-
-
- {{name}}
-
-
-
-
- {{name}}
-
-
-
-
+
+
{
- for (let state of res.data) {
- groupedStates.push({
- id: state.id,
- code: state.code,
- name: this.$t(state.code)
- });
- }
- this.groupedStates = groupedStates;
- });
- }
-
getItemPackingTypes() {
let itemPackingTypes = [];
const filter = {
diff --git a/modules/ticket/front/advance-search-panel/locale/es.yml b/modules/ticket/front/advance-search-panel/locale/es.yml
index 3dce7dae5..7be2efe96 100644
--- a/modules/ticket/front/advance-search-panel/locale/es.yml
+++ b/modules/ticket/front/advance-search-panel/locale/es.yml
@@ -1 +1,2 @@
Advance tickets: Adelantar tickets
+100% movable: 100% movible
diff --git a/modules/ticket/front/advance/index.html b/modules/ticket/front/advance/index.html
index f63c0fbf7..007f80fe6 100644
--- a/modules/ticket/front/advance/index.html
+++ b/modules/ticket/front/advance/index.html
@@ -32,8 +32,8 @@
Origin
- Destination
+ Destination
+ Origin
@@ -43,28 +43,15 @@
check-field="checked">
-
- ID
+
-
- Date
-
-
- IPT
-
-
- State
-
-
- Import
-
-
+
ID
Date
-
+
IPT
@@ -73,12 +60,33 @@
Liters
-
- Stock
-
Lines
+
+ Import
+
+
+ ID
+
+
+ Date
+
+
+ IPT
+
+
+ State
+
+
+ Liters
+
+
+ Not Movable
+
+
+ Lines
+
Import
@@ -93,28 +101,11 @@
-
- {{::ticket.futureId | dashIfEmpty}}
-
-
-
-
- {{::ticket.futureShipped | date: 'dd/MM/yyyy'}}
-
-
- {{::ticket.futureIpt | dashIfEmpty}}
-
-
- {{::ticket.futureState | dashIfEmpty}}
-
-
-
-
- {{::(ticket.futureTotalWithVat ? ticket.futureTotalWithVat : 0) | currency: 'EUR': 2}}
-
+
+
{{::ticket.liters | dashIfEmpty}}
- {{::ticket.hasStock | 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}}
+
+
+
diff --git a/modules/ticket/front/advance/index.js b/modules/ticket/front/advance/index.js
index b770440f1..7b8008426 100644
--- a/modules/ticket/front/advance/index.js
+++ b/modules/ticket/front/advance/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 {
constructor($element, $) {
@@ -62,19 +63,22 @@ export default class Controller extends Section {
}
setDefaultFilter() {
- let today = new Date();
+ let today = Date.vnNew();
const tomorrow = new Date(today);
tomorrow.setDate(tomorrow.getDate() + 1);
- this.filterParams = {
- dateFuture: tomorrow,
- dateToAdvance: today,
- warehouseFk: this.vnConfig.warehouseFk
- };
- this.$.model.applyFilter(null, this.filterParams);
+ this.$http.get(`UserConfigs/getUserConfig`)
+ .then(res => {
+ this.filterParams = {
+ dateFuture: tomorrow,
+ dateToAdvance: today,
+ warehouseFk: res.data.warehouseFk
+ };
+ this.$.model.addFilter({}, this.filterParams);
+ });
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0);
@@ -115,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() {
@@ -128,6 +138,11 @@ export default class Controller extends Section {
});
}
+ agencies(futureAgency, agency) {
+ return this.$t(`Origin agency`, {agency: futureAgency}) +
+ '\n' + this.$t(`Destination agency`, {agency: agency});
+ }
+
moveTicketsAdvance() {
let ticketsToMove = [];
this.checked.forEach(ticket => {
@@ -157,16 +172,30 @@ export default class Controller extends Section {
return {'liters': value};
case 'lines':
return {'lines': value};
+ case 'futureLiters':
+ return {'futureLiters': value};
+ 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/index.spec.js b/modules/ticket/front/advance/index.spec.js
index c5a04daee..6874f914b 100644
--- a/modules/ticket/front/advance/index.spec.js
+++ b/modules/ticket/front/advance/index.spec.js
@@ -26,14 +26,14 @@ describe('Component vnTicketAdvance', () => {
describe('compareDate()', () => {
it('should return warning when the date is the present', () => {
- let today = new Date();
+ let today = Date.vnNew();
let result = controller.compareDate(today);
expect(result).toEqual('warning');
});
it('should return sucess when the date is in the future', () => {
- let futureDate = new Date();
+ let futureDate = Date.vnNew();
futureDate = futureDate.setDate(futureDate.getDate() + 10);
let result = controller.compareDate(futureDate);
@@ -41,7 +41,7 @@ describe('Component vnTicketAdvance', () => {
});
it('should return undefined when the date is in the past', () => {
- let pastDate = new Date();
+ let pastDate = Date.vnNew();
pastDate = pastDate.setDate(pastDate.getDate() - 10);
let result = controller.compareDate(pastDate);
@@ -81,7 +81,7 @@ describe('Component vnTicketAdvance', () => {
describe('dateRange()', () => {
it('should return two dates with the hours at the start and end of the given date', () => {
- const now = new Date();
+ const now = Date.vnNew();
const today = now.getDate();
diff --git a/modules/ticket/front/advance/locale/es.yml b/modules/ticket/front/advance/locale/es.yml
index b444fbdd3..3111d9afd 100644
--- a/modules/ticket/front/advance/locale/es.yml
+++ b/modules/ticket/front/advance/locale/es.yml
@@ -4,3 +4,8 @@ Advance confirmation: ¿Desea adelantar {{checked}} tickets?
Success: Tickets movidos correctamente
Lines: Líneas
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/advance/style.scss b/modules/ticket/front/advance/style.scss
new file mode 100644
index 000000000..8fa9de438
--- /dev/null
+++ b/modules/ticket/front/advance/style.scss
@@ -0,0 +1,7 @@
+@import "variables";
+
+vn-ticket-advance{
+ vn-icon {
+ color: #f7931e
+ }
+}
diff --git a/modules/ticket/front/basic-data/step-one/index.js b/modules/ticket/front/basic-data/step-one/index.js
index f532265e2..99782de44 100644
--- a/modules/ticket/front/basic-data/step-one/index.js
+++ b/modules/ticket/front/basic-data/step-one/index.js
@@ -75,8 +75,10 @@ class Controller extends Component {
}
set shipped(value) {
+ if (new Date(this.ticket.shipped).toDateString() != value.toDateString())
+ value.setHours(0, 0, 0, 0);
+
this.ticket.shipped = value;
- this.ticket.shipped.setHours(0, 0, 0, 0);
this.getLanded({
shipped: value,
addressFk: this.ticket.addressFk,
diff --git a/modules/ticket/front/basic-data/step-one/index.spec.js b/modules/ticket/front/basic-data/step-one/index.spec.js
index 2b14c18cc..30946dab0 100644
--- a/modules/ticket/front/basic-data/step-one/index.spec.js
+++ b/modules/ticket/front/basic-data/step-one/index.spec.js
@@ -67,7 +67,7 @@ describe('Ticket', () => {
jest.spyOn(controller, 'getShipped');
controller.ticket.addressFk = 99;
controller.addressId = 100;
- const landed = new Date();
+ const landed = Date.vnNew();
const expectedResult = {
landed: landed,
addressFk: 100,
@@ -101,7 +101,7 @@ describe('Ticket', () => {
describe('shipped() getter', () => {
it('should return the shipped property', () => {
- const shipped = new Date();
+ const shipped = Date.vnNew();
controller.ticket.shipped = shipped;
expect(controller.shipped).toEqual(shipped);
@@ -111,7 +111,7 @@ describe('Ticket', () => {
describe('shipped() setter', () => {
it('should set shipped property and call getLanded() method ', () => {
jest.spyOn(controller, 'getLanded');
- const shipped = new Date();
+ const shipped = Date.vnNew();
const expectedResult = {
shipped: shipped,
addressFk: 121,
@@ -126,7 +126,7 @@ describe('Ticket', () => {
describe('landed() getter', () => {
it('should return the landed property', () => {
- const landed = new Date();
+ const landed = Date.vnNew();
controller.ticket.landed = landed;
expect(controller.landed).toEqual(landed);
@@ -136,7 +136,7 @@ describe('Ticket', () => {
describe('landed() setter', () => {
it('should set shipped property and call getShipped() method ', () => {
jest.spyOn(controller, 'getShipped');
- const landed = new Date();
+ const landed = Date.vnNew();
const expectedResult = {
landed: landed,
addressFk: 121,
@@ -161,7 +161,7 @@ describe('Ticket', () => {
it('should set agencyModeId property and call getLanded() method', () => {
jest.spyOn(controller, 'getLanded');
controller.$.agencyMode = {selection: {warehouseFk: 1}};
- const shipped = new Date();
+ const shipped = Date.vnNew();
const agencyModeId = 8;
const expectedResult = {
shipped: shipped,
@@ -177,7 +177,7 @@ describe('Ticket', () => {
it('should do nothing if attempting to set the same agencyMode id', () => {
jest.spyOn(controller, 'getShipped');
- const landed = new Date();
+ const landed = Date.vnNew();
const agencyModeId = 7;
const expectedResult = {
landed: landed,
@@ -278,8 +278,8 @@ describe('Ticket', () => {
agencyModeFk: 1,
companyFk: 442,
warehouseFk: 1,
- shipped: new Date(),
- landed: new Date()
+ shipped: Date.vnNew(),
+ landed: Date.vnNew()
};
expect(controller.isFormInvalid()).toBeFalsy();
@@ -288,7 +288,7 @@ describe('Ticket', () => {
describe('onStepChange()', () => {
it('should call onStepChange method and return a NO_AGENCY_AVAILABLE signal error', async() => {
- let landed = new Date();
+ let landed = Date.vnNew();
landed.setHours(0, 0, 0, 0);
controller._ticket = {
@@ -299,7 +299,7 @@ describe('Ticket', () => {
agencyModeFk: 1,
companyFk: 442,
warehouseFk: 1,
- shipped: new Date(),
+ shipped: Date.vnNew(),
landed: landed
};
@@ -314,8 +314,8 @@ describe('Ticket', () => {
describe('getLanded()', () => {
it('should return an available landed date', async() => {
- const shipped = new Date();
- const expectedResult = {landed: new Date()};
+ const shipped = Date.vnNew();
+ const expectedResult = {landed: Date.vnNew()};
const params = {
shipped: shipped,
addressFk: 121,
@@ -336,8 +336,8 @@ describe('Ticket', () => {
describe('getShipped()', () => {
it('should return an available shipped date', async() => {
- const landed = new Date();
- const expectedResult = {shipped: new Date()};
+ const landed = Date.vnNew();
+ const expectedResult = {shipped: Date.vnNew()};
const params = {
landed: landed,
addressFk: 121,
@@ -358,7 +358,7 @@ describe('Ticket', () => {
describe('zoneWhere() getter', () => {
it('should return an object containing filter properties', async() => {
- const shipped = new Date();
+ const shipped = Date.vnNew();
controller.ticket.shipped = shipped;
const expectedResult = {
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 @@
-
Total
+
Total
Price {{$ctrl.totalPrice | currency: 'EUR': 2}}
New price {{$ctrl.totalNewPrice | currency: 'EUR': 2}}
Difference {{$ctrl.totalPriceDifference | currency: 'EUR': 2}}
-
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}}
diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js
index f6001c6b8..ff029db78 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -177,7 +177,7 @@ class Controller extends Section {
get canRestoreTicket() {
const isDeleted = this.ticket.isDeleted;
- const now = new Date();
+ const now = Date.vnNew();
const maxDate = new Date(this.ticket.updated);
maxDate.setHours(maxDate.getHours() + 1);
diff --git a/modules/ticket/front/descriptor-menu/index.spec.js b/modules/ticket/front/descriptor-menu/index.spec.js
index 67dc0affa..babc22038 100644
--- a/modules/ticket/front/descriptor-menu/index.spec.js
+++ b/modules/ticket/front/descriptor-menu/index.spec.js
@@ -43,7 +43,7 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
describe('canRestoreTicket() getter', () => {
it('should return true for a ticket deleted within the last hour', () => {
controller.ticket.isDeleted = true;
- controller.ticket.updated = new Date();
+ controller.ticket.updated = Date.vnNew();
const result = controller.canRestoreTicket;
@@ -51,7 +51,7 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
});
it('should return false for a ticket deleted more than one hour ago', () => {
- const pastHour = new Date();
+ const pastHour = Date.vnNew();
pastHour.setHours(pastHour.getHours() - 2);
controller.ticket.isDeleted = true;
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}}
{
it('should make a query and then call to the $state go() method', () => {
jest.spyOn(controller.$state, 'go').mockReturnThis();
- const landed = new Date();
+ const landed = Date.vnNew();
const ticket = {
clientFk: 1101,
landed: landed,
diff --git a/modules/ticket/front/future/index.html b/modules/ticket/front/future/index.html
index c0e1decc2..8628bb34c 100644
--- a/modules/ticket/front/future/index.html
+++ b/modules/ticket/front/future/index.html
@@ -143,7 +143,7 @@
{{::ticket.liters}}
{{::ticket.lines}}
-
+
diff --git a/modules/ticket/front/future/index.js b/modules/ticket/front/future/index.js
index 5fb2c8f82..8cb7f16aa 100644
--- a/modules/ticket/front/future/index.js
+++ b/modules/ticket/front/future/index.js
@@ -57,18 +57,21 @@ export default class Controller extends Section {
}
setDefaultFilter() {
- const today = new Date();
+ const today = Date.vnNew();
- this.filterParams = {
- originDated: today,
- futureDated: today,
- warehouseFk: this.vnConfig.warehouseFk
- };
- this.$.model.applyFilter(null, this.filterParams);
+ this.$http.get(`UserConfigs/getUserConfig`)
+ .then(res => {
+ this.filterParams = {
+ originDated: today,
+ futureDated: today,
+ warehouseFk: res.data.warehouseFk
+ };
+ this.$.model.applyFilter(null, this.filterParams);
+ });
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0);
@@ -146,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/future/index.spec.js b/modules/ticket/front/future/index.spec.js
index c609a4891..188421298 100644
--- a/modules/ticket/front/future/index.spec.js
+++ b/modules/ticket/front/future/index.spec.js
@@ -2,7 +2,7 @@ import './index.js';
import crudModel from 'core/mocks/crud-model';
describe('Component vnTicketFuture', () => {
- const today = new Date();
+ const today = Date.vnNew();
let controller;
let $httpBackend;
@@ -32,7 +32,7 @@ describe('Component vnTicketFuture', () => {
});
it('should return sucess when the date is in the future', () => {
- let futureDate = new Date();
+ let futureDate = Date.vnNew();
futureDate = futureDate.setDate(futureDate.getDate() + 10);
let result = controller.compareDate(futureDate);
@@ -40,7 +40,7 @@ describe('Component vnTicketFuture', () => {
});
it('should return undefined when the date is in the past', () => {
- let pastDate = new Date();
+ let pastDate = Date.vnNew();
pastDate = pastDate.setDate(pastDate.getDate() - 10);
let result = controller.compareDate(pastDate);
diff --git a/modules/ticket/front/index/index.js b/modules/ticket/front/index/index.js
index 3039a2a03..42332ccc8 100644
--- a/modules/ticket/front/index/index.js
+++ b/modules/ticket/front/index/index.js
@@ -90,7 +90,7 @@ export default class Controller extends Section {
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0);
diff --git a/modules/ticket/front/index/index.spec.js b/modules/ticket/front/index/index.spec.js
index 03071654e..5046387b0 100644
--- a/modules/ticket/front/index/index.spec.js
+++ b/modules/ticket/front/index/index.spec.js
@@ -31,14 +31,14 @@ describe('Component vnTicketIndex', () => {
describe('compareDate()', () => {
it('should return warning when the date is the present', () => {
- let today = new Date();
+ let today = Date.vnNew();
let result = controller.compareDate(today);
expect(result).toEqual('warning');
});
it('should return sucess when the date is in the future', () => {
- let futureDate = new Date();
+ let futureDate = Date.vnNew();
futureDate = futureDate.setDate(futureDate.getDate() + 10);
let result = controller.compareDate(futureDate);
@@ -46,7 +46,7 @@ describe('Component vnTicketIndex', () => {
});
it('should return undefined when the date is in the past', () => {
- let pastDate = new Date();
+ let pastDate = Date.vnNew();
pastDate = pastDate.setDate(pastDate.getDate() - 10);
let result = controller.compareDate(pastDate);
diff --git a/modules/ticket/front/main/index.js b/modules/ticket/front/main/index.js
index 1b807216b..3f9482fc4 100644
--- a/modules/ticket/front/main/index.js
+++ b/modules/ticket/front/main/index.js
@@ -22,7 +22,7 @@ export default class Ticket extends ModuleMain {
$params.scopeDays = 1;
if (typeof $params.scopeDays === 'number') {
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
const to = new Date(from.getTime());
diff --git a/modules/ticket/front/package/index.js b/modules/ticket/front/package/index.js
index ed13f12d8..fd67ce583 100644
--- a/modules/ticket/front/package/index.js
+++ b/modules/ticket/front/package/index.js
@@ -6,7 +6,7 @@ class Controller extends Section {
this.$.model.insert({
packagingFk: null,
quantity: null,
- created: new Date(),
+ created: Date.vnNew(),
ticketFk: this.$params.id
});
}
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}}
@@ -130,7 +131,7 @@
+ 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/index.js b/modules/ticket/front/sale/index.js
index 618d4727d..f3fb89d04 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -51,7 +51,7 @@ class Controller extends Section {
const hasClaimManagerRole = this.aclService.hasAny(['claimManager']);
- return landedPlusWeek >= new Date() || hasClaimManagerRole;
+ return landedPlusWeek >= Date.vnNew() || hasClaimManagerRole;
}
return false;
}
diff --git a/modules/ticket/front/sale/index.spec.js b/modules/ticket/front/sale/index.spec.js
index fbee966fd..8585503cc 100644
--- a/modules/ticket/front/sale/index.spec.js
+++ b/modules/ticket/front/sale/index.spec.js
@@ -15,9 +15,9 @@ describe('Ticket', () => {
const ticket = {
id: 1,
clientFk: 1101,
- shipped: new Date(),
- landed: new Date(),
- created: new Date(),
+ shipped: Date.vnNew(),
+ landed: Date.vnNew(),
+ created: Date.vnNew(),
client: {salesPersonFk: 1},
address: {mobile: 111111111}
};
diff --git a/modules/ticket/front/search-panel/index.spec.js b/modules/ticket/front/search-panel/index.spec.js
index 41c32c047..df320b55b 100644
--- a/modules/ticket/front/search-panel/index.spec.js
+++ b/modules/ticket/front/search-panel/index.spec.js
@@ -38,7 +38,7 @@ describe('Ticket Component vnTicketSearchPanel', () => {
it('should clear the scope days when setting the from property', () => {
controller.filter.scopeDays = 1;
- controller.from = new Date();
+ controller.from = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.from).toBeDefined();
@@ -49,7 +49,7 @@ describe('Ticket Component vnTicketSearchPanel', () => {
it('should clear the scope days when setting the to property', () => {
controller.filter.scopeDays = 1;
- controller.to = new Date();
+ controller.to = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.to).toBeDefined();
@@ -58,8 +58,8 @@ describe('Ticket Component vnTicketSearchPanel', () => {
describe('scopeDays() setter', () => {
it('should clear the date range when setting the scopeDays property', () => {
- controller.filter.from = new Date();
- controller.filter.to = new Date();
+ controller.filter.from = Date.vnNew();
+ controller.filter.to = Date.vnNew();
controller.scopeDays = 1;
diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html
index fe49a301f..97055208b 100644
--- a/modules/ticket/front/summary/index.html
+++ b/modules/ticket/front/summary/index.html
@@ -1,6 +1,6 @@
-
- Ticket #{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}}
+ Ticket #{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}}
({{$ctrl.summary.client.id}}) - {{$ctrl.summary.nickname}}
-
-
-
-
{{$ctrl.summary.client.salesPersonUser.name}}
-
@@ -47,11 +48,11 @@
{{$ctrl.summary.zone.name}}
-
-
{{$ctrl.summary.routeFk}}
@@ -66,17 +67,17 @@
-
-
-
Subtotal {{$ctrl.summary.totalWithoutVat | currency: 'EUR':2}}
- VAT {{$ctrl.summary.totalWithVat - $ctrl.summary.totalWithoutVat | currency: 'EUR':2}}
+ VAT + RE
+ VAT
+ {{$ctrl.summary.totalWithVat - $ctrl.summary.totalWithoutVat | currency: 'EUR':2}}
+
Total {{$ctrl.summary.totalWithVat | currency: 'EUR':2}}
-
- {{sale.itemFk | zeroFill:6}}
+ {{sale.itemFk}}
-
{{::sale.visible}}
-
{{::sale.available}}
@@ -216,7 +220,7 @@