diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js
index 803eea45e..7452c6636 100644
--- a/front/salix/components/log/index.js
+++ b/front/salix/components/log/index.js
@@ -1,5 +1,6 @@
import ngModule from '../../module';
import Section from '../section';
+import {hashToColor} from 'core/lib/string';
import './style.scss';
const validDate = /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/;
@@ -7,11 +8,12 @@ const validDate = /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[
export default class Controller extends Section {
constructor($element, $) {
super($element, $);
+ this.hashToColor = hashToColor;
this.actionsText = {
insert: 'Creates',
- update: 'Updates',
+ update: 'Edits',
delete: 'Deletes',
- select: 'Views'
+ select: 'Accesses'
};
this.actionsClass = {
insert: 'success',
@@ -19,6 +21,12 @@ export default class Controller extends Section {
delete: 'alert',
select: 'notice'
};
+ this.actionsIcon = {
+ insert: 'add',
+ update: 'edit',
+ delete: 'remove',
+ select: 'visibility'
+ };
this.filter = {
include: [{
relation: 'user',
@@ -55,14 +63,14 @@ export default class Controller extends Section {
set logs(value) {
this._logs = value;
- if (!this.logs) return;
+ if (!value) return;
const empty = {};
const validations = window.validations;
for (const log of value) {
const oldValues = log.oldInstance || empty;
const newValues = log.newInstance || empty;
const locale = validations[log.changedModel]?.locale || empty;
- log.changedModelI18n = locale.name || log.changedModel;
+ log.changedModelI18n = firstUpper(locale.name) || log.changedModel;
let props = Object.keys(oldValues).concat(Object.keys(newValues));
props = [...new Set(props)];
@@ -71,11 +79,27 @@ export default class Controller extends Section {
for (const prop of props) {
log.props.push({
name: prop,
- nameI18n: locale.columns?.[prop] || prop,
+ nameI18n: firstUpper(locale.columns?.[prop]) || prop,
old: this.castJsonValue(oldValues[prop]),
new: this.castJsonValue(newValues[prop])
});
}
+ log.props.sort(
+ (a, b) => a.nameI18n.localeCompare(b.nameI18n));
+ }
+ }
+
+ get models() {
+ return this._models;
+ }
+
+ set models(value) {
+ this._models = value;
+ if (!value) return;
+ for (const model of value) {
+ const name = model.changedModel;
+ model.changedModelI18n =
+ firstUpper(window.validations[name]?.locale?.name) || name;
}
}
@@ -93,11 +117,6 @@ export default class Controller extends Section {
return action == 'delete' ? prop.old : prop.new;
}
- toggleAttributes(log, changesEl, force) {
- log.expand = force;
- changesEl.classList.toggle('expanded', force);
- }
-
relativeDate(dateVal) {
if (dateVal == null) return '';
const date = new Date(dateVal);
@@ -130,8 +149,17 @@ export default class Controller extends Section {
function getParam(prop, value) {
if (value == null || value == '') return null;
switch (prop) {
- case 'changedModelValue':
- return {[prop]: {like: `%${value}%`}};
+ case 'search':
+ const or = [{changedModelId: value}];
+ if (!/^[0-9]+$/.test(value))
+ or.push({changedModelValue: {like: `%${value}%`}});
+ return {or};
+ case 'changes':
+ return {or: [
+ {oldInstance: {like: `%${value}%`}},
+ {newInstance: {like: `%${value}%`}},
+ {description: {like: `%${value}%`}}
+ ]};
case 'who':
switch (value) {
case 'all':
@@ -195,6 +223,10 @@ export default class Controller extends Section {
}
}
+function firstUpper(str) {
+ return str && str.charAt(0).toUpperCase() + str.substr(1);
+}
+
ngModule.vnComponent('vnLog', {
controller: Controller,
template: require('./index.html'),
diff --git a/front/salix/components/log/locale/es.yml b/front/salix/components/log/locale/es.yml
index 385b42147..95d930716 100644
--- a/front/salix/components/log/locale/es.yml
+++ b/front/salix/components/log/locale/es.yml
@@ -1,5 +1,8 @@
Date: Fecha
-Model: Modelo
+Concept: Concepto
+Search: Buscar
+Search by id or concept: Buscar por identificador o concepto
+Entity: Entidad
Action: Acción
Author: Autor
Before: Antes
@@ -7,12 +10,12 @@ After: Despues
History: Historial
Name: Nombre
Creates: Crea
-Updates: Actualiza
+Edits: Modifica
Deletes: Elimina
-Views: Visualiza
+Accesses: Accede
System: Sistema
+Details: Detalles
note: nota
Changes: Cambios
-No changes: No hay cambios
today: hoy
yesterday: ayer
diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss
index 381b99039..7a5e18049 100644
--- a/front/salix/components/log/style.scss
+++ b/front/salix/components/log/style.scss
@@ -1,4 +1,5 @@
@import "variables";
+@import "effects";
vn-log {
.change {
@@ -45,31 +46,52 @@ vn-log {
overflow: hidden;
& > .header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- & > .chip {
- padding: 2px 4px;
- border-radius: 4px;
- display: inline-block;
- color: $color-font-bg;
+ & > .action-model {
+ display: inline-flex;
+ overflow: hidden;
- &.notice {
- background-color: $color-notice-medium;
- }
- &.success {
- background-color: $color-success-medium;
- }
- &.warning {
- background-color: $color-main-medium;
- }
- &.alert {
- background-color: lighten($color-alert, 5%);
+ & > .model-name {
+ display: inline-block;
+ padding: 2px 5px;
+ color: $color-font-dark;
+ border-radius: 8px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
}
- .date {
- float: right;
+ & > .action-date {
+ white-space: nowrap;
+
+ & > .action {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ color: $color-font-bg;
+ vertical-align: middle;
+ border-radius: 50%;
+ width: 24px;
+ height: 24px;
+ font-size: 1.4em;
+
+ &.notice {
+ background-color: $color-notice-medium
+ }
+ &.success {
+ background-color: $color-success-medium;
+ }
+ &.warning {
+ background-color: $color-main-medium;
+ }
+ &.alert {
+ background-color: lighten($color-alert, 5%);
+ }
+ }
}
}
& > .model {
@@ -77,16 +99,12 @@ vn-log {
text-overflow: ellipsis;
white-space: nowrap;
- & > .model-name {
- text-transform: capitalize;
- }
& > .model-value {
font-style: italic;
- color: #c7bd2b;
}
& > .model-id {
color: $color-font-secondary;
- font-size: .9em;
+ font-size: .9rem;
}
}
}
@@ -94,59 +112,35 @@ vn-log {
.changes {
overflow: hidden;
background-color: rgba(255, 255, 255, .05);
- border-radius: 4px;
- color: $color-font-secondary;
- transition: max-height 150ms ease-in-out;
- max-height: 28px;
+ color: $color-font-light;
position: relative;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ min-height: 34px;
+ box-sizing: border-box;
- & > .expand-button,
- & > .shrink-button {
- display: none;
+ & > vn-icon {
+ @extend %clickable;
+ float: right;
+ position: relative;
+ transition-property: transform, background-color;
+ transition-duration: 150ms;
+ margin: -5px;
+ margin-left: 4px;
+ padding: 1px;
+ border-radius: 50%;
}
- &.props {
- padding-right: 24px;
+ &.expanded {
+ text-overflow: initial;
+ white-space: initial;
- & > .expand-button,
- & > .shrink-button {
- position: absolute;
- top: 6px;
- right: 8px;
- font-size: inherit;
- float: right;
- cursor: pointer;
- }
- & > .expand-button {
- display: block;
- }
- &.expanded {
- max-height: 500px;
- padding-right: 0;
-
- & > .changes-wrapper {
- text-overflow: initial;
- white-space: initial;
- }
- & > .shrink-button {
- display: block;
- }
- & > .expand-button {
- display: none;
- }
+ & > vn-icon {
+ transform: rotate(180deg);
}
}
- & > .changes-wrapper {
- padding: 4px 6px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-
- & > .no-changes {
- font-style: italic;
- }
- .json-field {
- text-transform: capitalize;
- }
+ & > .no-changes {
+ font-style: italic;
}
}
}
diff --git a/front/salix/components/reset-password/index.js b/front/salix/components/reset-password/index.js
index 20c6c34fe..a3ca03237 100644
--- a/front/salix/components/reset-password/index.js
+++ b/front/salix/components/reset-password/index.js
@@ -33,7 +33,7 @@ export default class Controller {
const newPassword = this.newPassword;
- this.$http.post('users/reset-password', {newPassword}, {headers})
+ this.$http.post('VnUsers/reset-password', {newPassword}, {headers})
.then(() => {
this.vnApp.showSuccess(this.$translate.instant('Password changed!'));
this.$state.go('login');
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index e950b981b..a517a6183 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -171,5 +171,6 @@
"Added observation": "Added observation",
"Comment added to client": "Comment added to client",
"This ticket is already a refund": "This ticket is already a refund",
- "A claim with that sale already exists": "A claim with that sale already exists"
+ "A claim with that sale already exists": "A claim with that sale already exists",
+ "ASSIGN_ZONE_FIRST": "Assign zone first"
}
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 45993bdd5..d88a4ebc9 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -84,6 +84,7 @@
"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",
+ "The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
"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",
@@ -290,5 +291,7 @@
"isTaxDataChecked": "Datos comprobados",
"comercialId": "Id comercial",
"comercialName": "Comercial",
- "Invalid NIF for VIES": "Invalid NIF for VIES"
-}
\ No newline at end of file
+ "Invalid NIF for VIES": "Invalid NIF for VIES",
+ "Ticket does not exist": "Este ticket no existe",
+ "Ticket is already signed": "Este ticket ya ha sido firmado"
+}
diff --git a/modules/account/back/locale/mail-forward/en.yml b/modules/account/back/locale/mail-forward/en.yml
new file mode 100644
index 000000000..2e136e664
--- /dev/null
+++ b/modules/account/back/locale/mail-forward/en.yml
@@ -0,0 +1,4 @@
+name: mail forward
+columns:
+ account: account
+ forwardTo: forward to
diff --git a/modules/account/back/locale/mail-forward/es.yml b/modules/account/back/locale/mail-forward/es.yml
new file mode 100644
index 000000000..3e81f833e
--- /dev/null
+++ b/modules/account/back/locale/mail-forward/es.yml
@@ -0,0 +1,4 @@
+name: reenvio de correo
+columns:
+ account: cuenta
+ forwardTo: reenviar a
diff --git a/modules/account/back/locale/mail/es.yml b/modules/account/back/locale/mail/es.yml
index a0b02b45f..340f7ec50 100644
--- a/modules/account/back/locale/mail/es.yml
+++ b/modules/account/back/locale/mail/es.yml
@@ -1,4 +1,4 @@
-name: mail
+name: correo electrónico
columns:
id: id
receiver: receptor
diff --git a/modules/account/back/locale/role-inherit/en.yml b/modules/account/back/locale/role-inherit/en.yml
new file mode 100644
index 000000000..760881325
--- /dev/null
+++ b/modules/account/back/locale/role-inherit/en.yml
@@ -0,0 +1,4 @@
+name: subrole
+columns:
+ role: rol
+ inheritsFrom: inherits
diff --git a/modules/account/back/locale/role-inherit/es.yml b/modules/account/back/locale/role-inherit/es.yml
new file mode 100644
index 000000000..c352c6ff2
--- /dev/null
+++ b/modules/account/back/locale/role-inherit/es.yml
@@ -0,0 +1,4 @@
+name: subrol
+columns:
+ role: rol
+ inheritsFrom: hereda
diff --git a/modules/account/back/locale/role/en.yml b/modules/account/back/locale/role/en.yml
new file mode 100644
index 000000000..69199dfce
--- /dev/null
+++ b/modules/account/back/locale/role/en.yml
@@ -0,0 +1,5 @@
+name: role
+columns:
+ id: id
+ name: name
+ description: description
diff --git a/modules/account/back/locale/role/es.yml b/modules/account/back/locale/role/es.yml
new file mode 100644
index 000000000..ee025be0f
--- /dev/null
+++ b/modules/account/back/locale/role/es.yml
@@ -0,0 +1,5 @@
+name: rol
+columns:
+ id: id
+ name: nombre
+ description: descripción
diff --git a/back/locale/account/en.yml b/modules/account/back/locale/vn-user/en.yml
similarity index 84%
rename from back/locale/account/en.yml
rename to modules/account/back/locale/vn-user/en.yml
index 0d6c5db80..135cf75b4 100644
--- a/back/locale/account/en.yml
+++ b/modules/account/back/locale/vn-user/en.yml
@@ -1,4 +1,4 @@
-name: account
+name: user
columns:
id: id
name: name
@@ -6,7 +6,7 @@ columns:
nickname: nickname
lang: lang
password: password
- bcryptPassword: bcrypt password
+ bcryptPassword: BCRYPT password
active: active
email: email
emailVerified: email verified
diff --git a/back/locale/account/es.yml b/modules/account/back/locale/vn-user/es.yml
similarity index 59%
rename from back/locale/account/es.yml
rename to modules/account/back/locale/vn-user/es.yml
index 79e8a8cc6..53086ae2d 100644
--- a/back/locale/account/es.yml
+++ b/modules/account/back/locale/vn-user/es.yml
@@ -1,4 +1,4 @@
-name: cuenta
+name: usuario
columns:
id: id
name: nombre
@@ -6,12 +6,12 @@ columns:
nickname: apodo
lang: idioma
password: contraseña
- bcryptPassword: contraseña bcrypt
+ bcryptPassword: contraseña BCRYPT
active: activo
- email: email
- emailVerified: email verificado
+ email: correo electrónico
+ emailVerified: correo verificado
created: creado
updated: actualizado
image: imagen
- hasGrant: tiene permiso
+ hasGrant: puede delegar
userFk: usuario
diff --git a/modules/claim/back/locale/claim-beginning/en.yml b/modules/claim/back/locale/claim-beginning/en.yml
index 47cc29c69..4c1520704 100644
--- a/modules/claim/back/locale/claim-beginning/en.yml
+++ b/modules/claim/back/locale/claim-beginning/en.yml
@@ -1,4 +1,4 @@
-name: claim beginning
+name: beginning
columns:
id: id
quantity: quantity
diff --git a/modules/claim/back/locale/claim-beginning/es.yml b/modules/claim/back/locale/claim-beginning/es.yml
index 5e898c25e..20110cb52 100644
--- a/modules/claim/back/locale/claim-beginning/es.yml
+++ b/modules/claim/back/locale/claim-beginning/es.yml
@@ -1,4 +1,4 @@
-name: comienzo reclamación
+name: comienzo
columns:
id: id
quantity: cantidad
diff --git a/modules/claim/back/locale/claim-development/en.yml b/modules/claim/back/locale/claim-development/en.yml
index 054381e67..875cbf121 100644
--- a/modules/claim/back/locale/claim-development/en.yml
+++ b/modules/claim/back/locale/claim-development/en.yml
@@ -1,4 +1,4 @@
-name: claim development
+name: development
columns:
id: id
claimFk: claim
diff --git a/modules/claim/back/locale/claim-development/es.yml b/modules/claim/back/locale/claim-development/es.yml
index d5223e755..c95a1c0e7 100644
--- a/modules/claim/back/locale/claim-development/es.yml
+++ b/modules/claim/back/locale/claim-development/es.yml
@@ -1,4 +1,4 @@
-name: desarrollo reclamación
+name: desarrollo
columns:
id: id
claimFk: reclamación
diff --git a/modules/claim/back/locale/claim-dms/en.yml b/modules/claim/back/locale/claim-dms/en.yml
index c76c364e7..4b54ca19b 100644
--- a/modules/claim/back/locale/claim-dms/en.yml
+++ b/modules/claim/back/locale/claim-dms/en.yml
@@ -1,4 +1,4 @@
-name: claim dms
+name: document
columns:
dmsFk: dms
claimFk: claim
diff --git a/modules/claim/back/locale/claim-dms/es.yml b/modules/claim/back/locale/claim-dms/es.yml
index 949e20a36..d471b1ff6 100644
--- a/modules/claim/back/locale/claim-dms/es.yml
+++ b/modules/claim/back/locale/claim-dms/es.yml
@@ -1,4 +1,4 @@
-name: documento reclamación
+name: documento
columns:
dmsFk: dms
claimFk: reclamación
diff --git a/modules/claim/back/locale/claim-end/en.yml b/modules/claim/back/locale/claim-end/en.yml
index f9e736d76..4565cd579 100644
--- a/modules/claim/back/locale/claim-end/en.yml
+++ b/modules/claim/back/locale/claim-end/en.yml
@@ -1,4 +1,4 @@
-name: claim end
+name: end
columns:
id: id
claimFk: claim
diff --git a/modules/claim/back/locale/claim-end/es.yml b/modules/claim/back/locale/claim-end/es.yml
index 9855eca03..e5511c166 100644
--- a/modules/claim/back/locale/claim-end/es.yml
+++ b/modules/claim/back/locale/claim-end/es.yml
@@ -1,4 +1,4 @@
-name: final reclamación
+name: finalización
columns:
id: id
claimFk: reclamación
diff --git a/modules/claim/back/locale/claim-observation/en.yml b/modules/claim/back/locale/claim-observation/en.yml
index 772ea038c..a0ba2c449 100644
--- a/modules/claim/back/locale/claim-observation/en.yml
+++ b/modules/claim/back/locale/claim-observation/en.yml
@@ -1,4 +1,4 @@
-name: claim observation
+name: observation
columns:
id: id
claimFk: claim
diff --git a/modules/claim/back/locale/claim-observation/es.yml b/modules/claim/back/locale/claim-observation/es.yml
index fae3a1ae9..9ea5e275c 100644
--- a/modules/claim/back/locale/claim-observation/es.yml
+++ b/modules/claim/back/locale/claim-observation/es.yml
@@ -1,4 +1,4 @@
-name: observación reclamación
+name: observación
columns:
id: id
claimFk: reclamación
diff --git a/modules/claim/back/methods/claim/createFromSales.js b/modules/claim/back/methods/claim/createFromSales.js
index 10d0b9b28..07bdb30aa 100644
--- a/modules/claim/back/methods/claim/createFromSales.js
+++ b/modules/claim/back/methods/claim/createFromSales.js
@@ -59,12 +59,14 @@ module.exports = Self => {
const landedPlusWeek = new Date(ticket.landed);
landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
- const hasClaimManagerRole = await models.VnUser.hasRole(userId, 'claimManager', myOptions);
const isClaimable = landedPlusWeek >= Date.vnNew();
+ const canCreateClaimAfterDeadline =
+ await models.ACL.checkAccessAcl(ctx, 'Claim', 'createAfterDeadline', 'WRITE');
+
if (ticket.isDeleted)
throw new UserError(`You can't create a claim for a removed ticket`);
- if (!isClaimable && !hasClaimManagerRole)
+ if (!isClaimable && !canCreateClaimAfterDeadline)
throw new UserError(`You can't create a claim from a ticket delivered more than seven days ago`);
const newClaim = await Self.create({
diff --git a/modules/claim/back/methods/claim/updateClaim.js b/modules/claim/back/methods/claim/updateClaim.js
index f10c68b21..cc7392e39 100644
--- a/modules/claim/back/methods/claim/updateClaim.js
+++ b/modules/claim/back/methods/claim/updateClaim.js
@@ -46,7 +46,6 @@ module.exports = Self => {
Self.updateClaim = async(ctx, id, options) => {
const models = Self.app.models;
- const userId = ctx.req.accessToken.userId;
const args = ctx.args;
let tx;
const myOptions = {};
@@ -81,9 +80,9 @@ module.exports = Self => {
if (args.claimStateFk) {
const canEditOldState = await models.ClaimState.isEditable(ctx, claim.claimStateFk, myOptions);
const canEditNewState = await models.ClaimState.isEditable(ctx, args.claimStateFk, myOptions);
- const isClaimManager = await models.VnUser.hasRole(userId, 'claimManager', myOptions);
+ const canEditState = await models.ACL.checkAccessAcl(ctx, 'Claim', 'editState', 'WRITE');
- if (!canEditOldState || !canEditNewState || changedHasToPickUp && !isClaimManager)
+ if (!canEditOldState || !canEditNewState || changedHasToPickUp && !canEditState)
throw new UserError(`You don't have enough privileges to change that field`);
}
diff --git a/modules/client/back/locale/address/en.yml b/modules/client/back/locale/address/en.yml
index 3d090ba89..00f3b15f5 100644
--- a/modules/client/back/locale/address/en.yml
+++ b/modules/client/back/locale/address/en.yml
@@ -18,3 +18,4 @@ columns:
addressFk: address
incotermsFk: incoterms
customsAgentFk: customs agent
+ isDefaultAddress: default
diff --git a/modules/client/back/locale/address/es.yml b/modules/client/back/locale/address/es.yml
index 1379f75a4..f2b954124 100644
--- a/modules/client/back/locale/address/es.yml
+++ b/modules/client/back/locale/address/es.yml
@@ -18,3 +18,4 @@ columns:
addressFk: dirección
incotermsFk: incoterms
customsAgentFk: agente adunanas
+ isDefaultAddress: predeterminada
diff --git a/modules/client/back/locale/client-contact/en.yml b/modules/client/back/locale/client-contact/en.yml
index 5bd6e25db..2b47f5b4b 100644
--- a/modules/client/back/locale/client-contact/en.yml
+++ b/modules/client/back/locale/client-contact/en.yml
@@ -1,4 +1,4 @@
-name: client contact
+name: contact
columns:
id: id
name: name
diff --git a/modules/client/back/locale/client-contact/es.yml b/modules/client/back/locale/client-contact/es.yml
index 5802c0dde..0116a537a 100644
--- a/modules/client/back/locale/client-contact/es.yml
+++ b/modules/client/back/locale/client-contact/es.yml
@@ -1,4 +1,4 @@
-name: contacto cliente
+name: contacto
columns:
id: id
name: nombre
diff --git a/modules/client/back/locale/client-dms/en.yml b/modules/client/back/locale/client-dms/en.yml
index c8ad68635..de4d6c434 100644
--- a/modules/client/back/locale/client-dms/en.yml
+++ b/modules/client/back/locale/client-dms/en.yml
@@ -1,4 +1,4 @@
-name: client dms
+name: document
columns:
dmsFk: dms
clientFk: client
diff --git a/modules/client/back/locale/client-dms/es.yml b/modules/client/back/locale/client-dms/es.yml
index c683f4764..e1744b019 100644
--- a/modules/client/back/locale/client-dms/es.yml
+++ b/modules/client/back/locale/client-dms/es.yml
@@ -1,4 +1,4 @@
-name: documento cliente
+name: documento
columns:
dmsFk: dms
clientFk: client
diff --git a/modules/client/back/locale/client-observation/en.yml b/modules/client/back/locale/client-observation/en.yml
index 2dd8393ae..0cf5e0dc1 100644
--- a/modules/client/back/locale/client-observation/en.yml
+++ b/modules/client/back/locale/client-observation/en.yml
@@ -1,4 +1,4 @@
-name: client observation
+name: observation
columns:
id: id
clientFk: client
diff --git a/modules/client/back/locale/client-observation/es.yml b/modules/client/back/locale/client-observation/es.yml
index 0fc6bbf04..b04ae63d9 100644
--- a/modules/client/back/locale/client-observation/es.yml
+++ b/modules/client/back/locale/client-observation/es.yml
@@ -1,4 +1,4 @@
-name: observación cliente
+name: observación
columns:
id: id
clientFk: cliente
diff --git a/modules/client/back/locale/client-sample/en.yml b/modules/client/back/locale/client-sample/en.yml
index 77639fbb4..4c355ab7f 100644
--- a/modules/client/back/locale/client-sample/en.yml
+++ b/modules/client/back/locale/client-sample/en.yml
@@ -1,4 +1,4 @@
-name: client sample
+name: sample
columns:
id: id
created: created
@@ -6,3 +6,5 @@ columns:
typeFk: type
userFk: user
companyFk: company
+ workerFk: worker
+ balance: balance
diff --git a/modules/client/back/locale/client-sample/es.yml b/modules/client/back/locale/client-sample/es.yml
index 6311eb25a..5293adaa8 100644
--- a/modules/client/back/locale/client-sample/es.yml
+++ b/modules/client/back/locale/client-sample/es.yml
@@ -1,4 +1,4 @@
-name: muestra cliente
+name: muestra
columns:
id: id
created: creado
@@ -6,3 +6,5 @@ columns:
typeFk: tipo
userFk: usuario
companyFk: compañia
+ workerFk: trabajador
+ balance: balance
diff --git a/modules/client/back/locale/client/en.yml b/modules/client/back/locale/client/en.yml
index 71048f657..74384461c 100644
--- a/modules/client/back/locale/client/en.yml
+++ b/modules/client/back/locale/client/en.yml
@@ -2,7 +2,7 @@ name: client
columns:
id: id
name: name
- fi: fi
+ fi: tax identifier
socialName: socialName
contact: contact
street: street
@@ -14,22 +14,22 @@ columns:
isActive: active
credit: credit
creditInsurance: credit insurance
- iban: iban
+ iban: IBAN
dueDay: due day
isEqualizated: equalizated
isFreezed: freezed
hasToInvoiceByAddress: invoice by address
hasToInvoice: has to invoice
- isToBeMailed: be mailed
- hasSepaVnl: sepa nnl
- hasLcr: lcr
- hasCoreVnl: core vnl
- hasCoreVnh: core vnh
+ isToBeMailed: mailed
+ hasSepaVnl: sepa VNL
+ hasLcr: LCR
+ hasCoreVnl: core VNL
+ hasCoreVnh: core VNH
hasIncoterms: incoterms
isTaxDataChecked: tax data checked
- eypbc: eypbc
+ eypbc: EYPBC
quality: quality
- isVies: vies
+ isVies: VIES
isRelevant: relevant
accountingAccount: accounting account
created: created
@@ -47,4 +47,9 @@ columns:
defaultAddressFk: default address
bankEntityFk: bank entity
transferorFk: transferor
+ riskCalculated: risk calculated
+ isCreatedAsServed: created as served
+ hasInvoiceSimplified: simplified invoice
+ typeFk: type
+ lastSalesPersonFk: last salesperson
diff --git a/modules/client/back/locale/client/es.yml b/modules/client/back/locale/client/es.yml
index 04e391af0..47bf896d9 100644
--- a/modules/client/back/locale/client/es.yml
+++ b/modules/client/back/locale/client/es.yml
@@ -2,7 +2,7 @@ name: cliente
columns:
id: id
name: nombre
- fi: fi
+ fi: identificador fiscal
socialName: nombre social
contact: contacto
street: calle
@@ -14,27 +14,27 @@ columns:
isActive: activo
credit: crédito
creditInsurance: seguro crédito
- iban: iban
+ iban: IBAN
dueDay: día vencimiento
isEqualizated: igualado
isFreezed: congelado
hasToInvoiceByAddress: factura por dirección
hasToInvoice: tiene que facturar
isToBeMailed: envío por email
- hasSepaVnl: sepa nnl
- hasLcr: lcr
- hasCoreVnl: centro vnl
- hasCoreVnh: cenrto vnh
+ hasSepaVnl: sepa VNL
+ hasLcr: LCR
+ hasCoreVnl: centro VNL
+ hasCoreVnh: centro VNH
hasIncoterms: incoterms
isTaxDataChecked: datos fiscales comprobados
- eypbc: eypbc
+ eypbc: EYPBC
quality: calidad
- isVies: vies
+ isVies: VIES
isRelevant: importante
accountingAccount: cuenta contable
created: creado
sageTaxTypeFk: tipo impuesto sage
- sageTransactionTypeFk: tipo transacción sage
+ sageTransactionTypeFk: tipo transacción Sage
businessTypeFk: tipo negocio
salesPersonFk: comercial
hasElectronicInvoice: factura electrónica
@@ -47,4 +47,9 @@ columns:
defaultAddressFk: dirección predeterminada
bankEntityFk: entidad bancaria
transferorFk: cedente
+ riskCalculated: riesgo calculado
+ isCreatedAsServed: creado como servido
+ hasInvoiceSimplified: factura simple
+ typeFk: tipo
+ lastSalesPersonFk: último comercial
diff --git a/modules/client/back/locale/tpv-transaction/en.yml b/modules/client/back/locale/tpv-transaction/en.yml
index fbe1bbadc..c70914495 100644
--- a/modules/client/back/locale/tpv-transaction/en.yml
+++ b/modules/client/back/locale/tpv-transaction/en.yml
@@ -1,4 +1,4 @@
-name: tpv transaction
+name: TPV transaction
columns:
id: id
merchantFk: merchant
diff --git a/modules/client/back/locale/tpv-transaction/es.yml b/modules/client/back/locale/tpv-transaction/es.yml
index c751b354d..7d412ba66 100644
--- a/modules/client/back/locale/tpv-transaction/es.yml
+++ b/modules/client/back/locale/tpv-transaction/es.yml
@@ -1,4 +1,4 @@
-name: transacción tpv
+name: transacción TPV
columns:
id: id
merchantFk: comerciante
diff --git a/modules/client/back/methods/client/updateAddress.js b/modules/client/back/methods/client/updateAddress.js
index e521870fd..7342b28f1 100644
--- a/modules/client/back/methods/client/updateAddress.js
+++ b/modules/client/back/methods/client/updateAddress.js
@@ -87,15 +87,15 @@ module.exports = function(Self) {
Self.updateAddress = async(ctx, clientId, addressId, options) => {
const models = Self.app.models;
const args = ctx.args;
- const userId = ctx.req.accessToken.userId;
const myOptions = {};
if (typeof options == 'object')
Object.assign(myOptions, options);
- const isSalesAssistant = await models.VnUser.hasRole(userId, 'salesAssistant', myOptions);
+ const canEditAddressLogifloraAllowed =
+ await models.ACL.checkAccessAcl(ctx, 'Client', 'editAddressLogifloraAllowed');
- if (args.isLogifloraAllowed && !isSalesAssistant)
+ if (args.isLogifloraAllowed && !canEditAddressLogifloraAllowed)
throw new UserError(`You don't have enough privileges`);
const address = await models.Address.findOne({
diff --git a/modules/client/back/methods/client/updateFiscalData.js b/modules/client/back/methods/client/updateFiscalData.js
index c63dc3991..697c567a3 100644
--- a/modules/client/back/methods/client/updateFiscalData.js
+++ b/modules/client/back/methods/client/updateFiscalData.js
@@ -131,9 +131,10 @@ module.exports = Self => {
myOptions.transaction = tx;
}
try {
- const isSalesAssistant = await models.VnUser.hasRole(userId, 'salesAssistant', myOptions);
+ const canEditNotTaxDataChecked =
+ await models.ACL.checkAccessAcl(ctx, 'Client', 'editFiscalDataWithoutTaxDataCheck', 'WRITE');
const client = await models.Client.findById(clientId, null, myOptions);
- if (!isSalesAssistant && client.isTaxDataChecked)
+ if (!canEditNotTaxDataChecked && client.isTaxDataChecked)
throw new UserError(`Not enough privileges to edit a client with verified data`);
// Sage data validation
const taxDataChecked = args.isTaxDataChecked;
diff --git a/modules/client/back/methods/client/updateUser.js b/modules/client/back/methods/client/updateUser.js
index 479b4da47..55f1accdd 100644
--- a/modules/client/back/methods/client/updateUser.js
+++ b/modules/client/back/methods/client/updateUser.js
@@ -2,6 +2,7 @@ const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethodCtx('updateUser', {
description: 'Updates the user information',
+ accessType: 'WRITE',
accepts: [
{
arg: 'id',
@@ -32,7 +33,6 @@ module.exports = Self => {
Self.updateUser = async function(ctx, id, options) {
const models = Self.app.models;
- const userId = ctx.req.accessToken.userId;
let tx;
const myOptions = {};
@@ -45,9 +45,8 @@ module.exports = Self => {
}
try {
- const isSalesPerson = await models.VnUser.hasRole(userId, 'salesPerson', myOptions);
-
- if (!isSalesPerson)
+ const canEdit = await models.ACL.checkAccessAcl(ctx, 'Client', 'updateUser', 'WRITE');
+ if (!canEdit)
throw new UserError(`Not enough privileges to edit a client`);
const isClient = await models.Client.findById(id, null, myOptions);
diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js
index 748581913..736c29f9c 100644
--- a/modules/client/back/methods/defaulter/filter.js
+++ b/modules/client/back/methods/defaulter/filter.js
@@ -67,9 +67,13 @@ module.exports = Self => {
uw.id workerFk,
uw.name workerName,
c.creditInsurance,
- d.defaulterSinced
+ d.defaulterSinced,
+ cn.country,
+ pm.name payMethod
FROM vn.defaulter d
JOIN vn.client c ON c.id = d.clientFk
+ JOIN vn.country cn ON cn.id = c.countryFk
+ JOIN vn.payMethod pm ON pm.id = c.payMethodFk
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
diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index 56adc8b03..7b577fa98 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -218,9 +218,9 @@ module.exports = Self => {
const models = Self.app.models;
const loopBackContext = LoopBackContext.getCurrentContext();
- const userId = loopBackContext.active.accessToken.userId;
+ const accessToken = {req: loopBackContext.active.accessToken};
- const isSalesAssistant = await models.VnUser.hasRole(userId, 'salesAssistant', ctx.options);
+ const editVerifiedDataWithoutTaxDataChecked = models.ACL.checkAccessAcl(accessToken, 'Client', 'editVerifiedDataWithoutTaxDataCheck', 'WRITE');
const hasChanges = orgData && changes;
const isTaxDataChecked = hasChanges && (changes.isTaxDataChecked || orgData.isTaxDataChecked);
@@ -232,8 +232,8 @@ module.exports = Self => {
const sageTransactionType = hasChanges && (changes.sageTransactionTypeFk || orgData.sageTransactionTypeFk);
const sageTransactionTypeChanged = hasChanges && orgData.sageTransactionTypeFk != sageTransactionType;
- const cantEditVerifiedData = isTaxDataCheckedChanged && !isSalesAssistant;
- const cantChangeSageData = (sageTaxTypeChanged || sageTransactionTypeChanged) && !isSalesAssistant;
+ const cantEditVerifiedData = isTaxDataCheckedChanged && !editVerifiedDataWithoutTaxDataChecked;
+ const cantChangeSageData = (sageTaxTypeChanged || sageTransactionTypeChanged) && !editVerifiedDataWithoutTaxDataChecked;
if (cantEditVerifiedData || cantChangeSageData)
throw new UserError(`You don't have enough privileges`);
@@ -401,9 +401,10 @@ module.exports = Self => {
Self.changeCredit = async function changeCredit(ctx, finalState, changes) {
const models = Self.app.models;
const userId = ctx.options.accessToken.userId;
+ const accessToken = {req: {accessToken: ctx.options.accessToken} };
- const isFinancialBoss = await models.VnUser.hasRole(userId, 'financialBoss', ctx.options);
- if (!isFinancialBoss) {
+ const canEditCredit = await models.ACL.checkAccessAcl(accessToken, 'Client', 'editCredit', 'WRITE');
+ if (!canEditCredit) {
const lastCredit = await models.ClientCredit.findOne({
where: {
clientFk: finalState.id
@@ -412,10 +413,9 @@ module.exports = Self => {
}, ctx.options);
const lastAmount = lastCredit && lastCredit.amount;
- const lastWorkerId = lastCredit && lastCredit.workerFk;
- const lastWorkerIsFinancialBoss = await models.VnUser.hasRole(lastWorkerId, 'financialBoss', ctx.options);
+ const lastCreditIsNotEditable = !await models.ACL.checkAccessAcl(accessToken, 'Client', 'isNotEditableCredit', 'WRITE');
- if (lastAmount == 0 && lastWorkerIsFinancialBoss)
+ if (lastAmount == 0 && lastCreditIsNotEditable)
throw new UserError(`You can't change the credit set to zero from a financialBoss`);
const creditLimits = await models.ClientCreditLimit.find({
diff --git a/modules/client/back/models/defaulter.json b/modules/client/back/models/defaulter.json
index ddff1d214..03d68ea71 100644
--- a/modules/client/back/models/defaulter.json
+++ b/modules/client/back/models/defaulter.json
@@ -29,6 +29,16 @@
"type": "belongsTo",
"model": "Client",
"foreignKey": "clientFk"
+ },
+ "country": {
+ "type": "belongsTo",
+ "model": "Country",
+ "foreignKey": "country"
+ },
+ "payMethod": {
+ "type": "belongsTo",
+ "model": "PayMethod",
+ "foreignKey": "payMethod"
}
}
}
\ No newline at end of file
diff --git a/modules/client/front/defaulter/index.html b/modules/client/front/defaulter/index.html
index 8f22629a9..4f662b62b 100644
--- a/modules/client/front/defaulter/index.html
+++ b/modules/client/front/defaulter/index.html
@@ -57,6 +57,13 @@
|
Comercial
|
+
+ Country
+ |
+
+ P.Method
+ |
@@ -111,6 +118,12 @@
{{::defaulter.salesPersonName | dashIfEmpty}}
+ |
+ {{::defaulter.country}}
+ |
+
+ {{::defaulter.payMethod}}
+ |
{{::defaulter.amount | currency: 'EUR': 2}} |
+
+
|