Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2326.01] - 2023-06-29
 
 ### Added
+- (Entradas -> Correo) Al cambiar el tipo de cambio enviará un correo a las personas designadas
 
 ### Changed
 

back/methods/vn-user/renew-token.js

@@ -0,0 +1,38 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('renewToken', {
+        description: 'Checks if the token has more than renewPeriod seconds to live and if so, renews it',
+        accepts: [],
+        returns: {
+            type: 'Object',
+            root: true
+        },
+        http: {
+            path: `/renewToken`,
+            verb: 'POST'
+        }
+    });
+
+    Self.renewToken = async function(ctx) {
+        const models = Self.app.models;
+        const userId = ctx.req.accessToken.userId;
+        const created = ctx.req.accessToken.created;
+        const tokenId = ctx.req.accessToken.id;
+
+        const now = new Date();
+        const differenceMilliseconds = now - created;
+        const differenceSeconds = Math.floor(differenceMilliseconds / 1000);
+
+        const accessTokenConfig = await models.AccessTokenConfig.findOne({fields: ['renewPeriod']});
+
+        if (differenceSeconds <= accessTokenConfig.renewPeriod)
+            throw new UserError(`The renew period has not been exceeded`);
+
+        await Self.logout(tokenId);
+        const user = await Self.findById(userId);
+        const accessToken = await user.createAccessToken();
+
+        return {token: accessToken.id, created: accessToken.created};
+    };
+};

back/methods/vn-user/specs/signIn.spec.js

@@ -19,7 +19,7 @@ describe('account login()', () => {
 
             expect(login.token).toBeDefined();
 
-            await models.VnUser.logout(ctx);
+            await models.VnUser.logout(ctx.req.accessToken.id);
         });
 
         it('should return the token if the user doesnt exist but the client does', async() => {
@@ -29,7 +29,7 @@ describe('account login()', () => {
 
             expect(login.token).toBeDefined();
 
-            await models.Account.logout(ctx);
+            await models.VnUser.logout(ctx.req.accessToken.id);
         });
     });
 

back/model-config.json

@@ -1,4 +1,12 @@
 {
+    "AccessTokenConfig": {
+        "dataSource": "vn",
+        "options": {
+            "mysql": {
+                "table": "salix.accessTokenConfig"
+            }
+        }
+    },
     "AccountingType": {
         "dataSource": "vn"
     },

back/models/access-token-config.json

@@ -0,0 +1,30 @@
+{
+    "name": "AccessTokenConfig",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "accessTokenConfig"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "renewPeriod": {
+            "type": "number",
+            "required": true
+        },
+        "renewInterval": {
+            "type": "number",
+            "required": true
+        }
+    },
+    "acls": [{
+        "accessType": "READ",
+        "principalType": "ROLE",
+        "principalId": "$everyone",
+        "permission": "ALLOW"
+    }]
+}

back/models/vn-user.js

@@ -11,6 +11,9 @@ module.exports = function(Self) {
     require('../methods/vn-user/validate-token')(Self);
     require('../methods/vn-user/privileges')(Self);
     require('../methods/vn-user/validate-auth')(Self);
+    require('../methods/vn-user/renew-token')(Self);
+
+    Self.definition.settings.acls = Self.definition.settings.acls.filter(acl => acl.property !== 'create');
 
     // Validations
 
@@ -118,7 +121,7 @@ module.exports = function(Self) {
 
         let loginInfo = Object.assign({password}, userInfo);
         token = await Self.login(loginInfo, 'user');
-        return {token: token.id};
+        return {token: token.id, created: token.created};
     };
 
     const _setPassword = Self.prototype.setPassword;

back/models/vn-user.json

@@ -128,5 +128,24 @@
 			"principalId": "$authenticated",
 			"permission": "ALLOW"
 		}
-	]
+	],
+    "scopes": {
+        "preview": {
+            "fields": [
+                "id",
+                "name",
+                "username",
+                "roleFk",
+                "nickname",
+                "lang",
+                "active",
+                "created",
+                "updated",
+                "image",
+                "hasGrant",
+                "realm",
+                "email"
+            ]
+        }
+    }
 }

back/process.yml

@@ -4,4 +4,4 @@ apps:
     instances: 1
     max_restarts: 3
     restart_delay: 15000
-    node_args: --tls-min-v1.0
+    node_args: --tls-min-v1.0 --openssl-legacy-provider

db/changes/231801/00-userAcl.sql

@@ -1,6 +1,5 @@
 INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
     VALUES
-        ('VnUser', '*', '*', 'ALLOW', 'ROLE', 'employee'),
         ('VnUser','acl','READ','ALLOW','ROLE','account'),
         ('VnUser','getCurrentUserData','READ','ALLOW','ROLE','account'),
         ('VnUser','changePassword', 'WRITE', 'ALLOW', 'ROLE', 'account');

db/changes/232601/00-aclAccount.sql

@@ -0,0 +1,8 @@
+DELETE
+    FROM `salix`.`ACL`
+    WHERE model='Account' AND property='*' AND accessType='*';
+
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+        ('Account', '*', 'WRITE', 'ALLOW', 'ROLE', 'sysadmin'),
+        ('Account', '*', 'READ', 'ALLOW', 'ROLE', 'employee');

db/changes/232601/00-aclMailAliasAccount.sql

@@ -0,0 +1,5 @@
+DELETE FROM `salix`.`ACL` WHERE model = 'MailAliasAccount';
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('MailAliasAccount', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('MailAliasAccount', '*', 'WRITE', 'ALLOW', 'ROLE', 'itManagement');

db/changes/232601/00-aclMailForward.sql

@@ -0,0 +1,5 @@
+DELETE FROM `salix`.`ACL` WHERE model = 'MailForward';
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('MailForward', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('MailForward', '*', 'WRITE', 'ALLOW', 'ROLE', 'itManagement');

db/changes/232601/00-aclRole.sql

@@ -0,0 +1,5 @@
+DELETE FROM `salix`.`ACL` WHERE model = 'Role';
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Role', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Role', '*', 'WRITE', 'ALLOW', 'ROLE', 'it');

db/changes/232601/00-aclVnUser.sql

@@ -0,0 +1,10 @@
+DELETE
+	FROM `salix`.`ACL`
+	WHERE model = 'VnUser' AND property = '*' AND principalId = 'employee';
+
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+        ('VnUser', '*', '*', 'ALLOW', 'ROLE', 'itManagement'),
+        ('VnUser', '__get__preview', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('VnUser', 'preview', '*', 'ALLOW', 'ROLE', 'employee'),
+        ('VnUser', 'create', '*', 'ALLOW', 'ROLE', 'itManagement');

db/changes/232601/00-entry_updateComission.sql

@@ -0,0 +1,40 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_updateComission`(vCurrency INT)
+BEGIN
+/**
+ * Actualiza la comision de las entradas de hoy a futuro y las recalcula
+ *
+ * @param vCurrency id del tipo de moneda(SAR,EUR,USD,GBP,JPY)
+ */
+	DECLARE vCurrencyName VARCHAR(25);
+	DECLARE vComission INT;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.recalcEntryCommision
+		SELECT e.id 
+			FROM vn.entry e
+				JOIN vn.travel t ON t.id = e.travelFk
+				JOIN vn.warehouse w ON w.id = t.warehouseInFk 
+			WHERE t.shipped >= util.VN_CURDATE()
+				AND e.currencyFk = vCurrency;
+
+	SET vComission = currency_getCommission(vCurrency);
+
+	UPDATE vn.entry e 
+		JOIN tmp.recalcEntryCommision tmp ON tmp.id = e.id
+	SET e.commission = vComission;
+
+	SELECT `name` INTO vCurrencyName 
+		FROM currency 
+			WHERE id = vCurrency;
+
+	CALL entry_recalc();
+	SELECT util.notification_send(
+		'entry-update-comission',
+		JSON_OBJECT('currencyName', vCurrencyName, 'referenceCurrent', vComission),
+		account.myUser_getId()
+	);
+
+	DROP TEMPORARY TABLE  tmp.recalcEntryCommision;
+END$$
+DELIMITER ;

db/changes/232601/00-salix.sql

@@ -0,0 +1,10 @@
+CREATE TABLE `salix`.`accessTokenConfig` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `renewPeriod` int(10) unsigned DEFAULT NULL,
+  `renewInterval` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `renewInterval`)
+    VALUES
+        (1, 21600, 300);

db/dump/fixtures.sql

@@ -2895,6 +2895,10 @@ INSERT INTO `vn`.`wagonTypeTray` (`id`, `typeFk`, `height`, `colorFk`)
         (2, 1, 50, 2),
         (3, 1, 0, 3);
 
+INSERT INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `renewInterval`)
+    VALUES
+        (1, 21600, 300);
+
 INSERT INTO `vn`.`travelConfig` (`id`, `warehouseInFk`, `warehouseOutFk`, `agencyFk`, `companyFk`)
     VALUES
         (1, 1, 1, 1, 442);

e2e/paths/03-worker/06_create.spec.js

@@ -53,7 +53,7 @@ describe('Worker create path', () => {
         expect(message.text).toContain('Data saved!');
 
         // 'rollback'
-        await page.loginAndModule('sysadmin', 'account');
+        await page.loginAndModule('itManagement', 'account');
         await page.accessToSearchResult(newWorker);
 
         await page.waitToClick(selectors.accountDescriptor.menuButton);

e2e/paths/14-account/01_create_and_basic_data.spec.js

@@ -8,7 +8,7 @@ describe('Account create and basic data path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('developer', 'account');
+        await page.loginAndModule('itManagement', 'account');
     });
 
     afterAll(async() => {

front/core/services/auth.js

@@ -81,7 +81,7 @@ export default class Auth {
     }
 
     onLoginOk(json, remember) {
-        this.vnToken.set(json.data.token, remember);
+        this.vnToken.set(json.data.token, json.data.created, remember);
 
         return this.loadAcls().then(() => {
             let continueHash = this.$state.params.continue;

front/core/services/index.js

@@ -11,3 +11,4 @@ import './report';
 import './email';
 import './file';
 import './date';
+

front/core/services/token.js

@@ -9,25 +9,33 @@ export default class Token {
     constructor() {
         try {
             this.token = sessionStorage.getItem('vnToken');
-            if (!this.token)
+            this.created = sessionStorage.getItem('vnTokenCreated');
+            if (!this.token) {
                 this.token = localStorage.getItem('vnToken');
+                this.created = localStorage.getItem('vnTokenCreated');
+            }
         } catch (e) {}
     }
-    set(value, remember) {
+    set(token, created, remember) {
         this.unset();
         try {
-            if (remember)
-                localStorage.setItem('vnToken', value);
-            else
-                sessionStorage.setItem('vnToken', value);
+            if (remember) {
+                localStorage.setItem('vnToken', token);
+                localStorage.setItem('vnTokenCreated', created);
+            } else {
+                sessionStorage.setItem('vnToken', token);
+                sessionStorage.setItem('vnTokenCreated', created);
+            }
         } catch (e) {}
 
-        this.token = value;
+        this.token = token;
+        this.created = created;
     }
     unset() {
         localStorage.removeItem('vnToken');
         sessionStorage.removeItem('vnToken');
         this.token = null;
+        this.created = null;
     }
 }
 

front/salix/components/layout/index.js

@@ -3,13 +3,14 @@ import Component from 'core/lib/component';
 import './style.scss';
 
 export class Layout extends Component {
-    constructor($element, $, vnModules) {
+    constructor($element, $, vnModules, vnToken) {
         super($element, $);
         this.modules = vnModules.get();
     }
 
     $onInit() {
         this.getUserData();
+        this.getAccessTokenConfig();
     }
 
     getUserData() {
@@ -30,8 +31,42 @@ export class Layout extends Component {
     refresh() {
         window.location.reload();
     }
+
+    getAccessTokenConfig() {
+        this.$http.get('AccessTokenConfigs').then(json => {
+            const firtsResult = json.data[0];
+            if (!firtsResult) return;
+            this.renewPeriod = firtsResult.renewPeriod;
+            this.renewInterval = firtsResult.renewInterval;
+
+            const intervalMilliseconds = firtsResult.renewInterval * 1000;
+            this.inservalId = setInterval(this.checkTokenValidity.bind(this), intervalMilliseconds);
+        });
+    }
+
+    checkTokenValidity() {
+        const now = new Date();
+        const differenceMilliseconds = now - new Date(this.vnToken.created);
+        const differenceSeconds = Math.floor(differenceMilliseconds / 1000);
+
+        if (differenceSeconds > this.renewPeriod) {
+            this.$http.post('VnUsers/renewToken')
+                .then(json => {
+                    if (json.data.token) {
+                        let remember = true;
+                        if (window.sessionStorage.vnToken) remember = false;
+
+                        this.vnToken.set(json.data.token, json.data.created, remember);
+                    }
+                });
+        }
+    }
+
+    $onDestroy() {
+        clearInterval(this.inservalId);
+    }
 }
-Layout.$inject = ['$element', '$scope', 'vnModules'];
+Layout.$inject = ['$element', '$scope', 'vnModules', 'vnToken'];
 
 ngModule.vnComponent('vnLayout', {
     template: require('./index.html'),

front/salix/components/layout/index.spec.js

@@ -37,4 +37,49 @@ describe('Component vnLayout', () => {
             expect(url).not.toBeDefined();
         });
     });
+
+    describe('getAccessTokenConfig()', () => {
+        it(`should set the renewPeriod and renewInterval properties in localStorage`, () => {
+            const response = [{
+                renewPeriod: 100,
+                renewInterval: 5
+            }];
+
+            $httpBackend.expect('GET', `AccessTokenConfigs`).respond(response);
+            controller.getAccessTokenConfig();
+            $httpBackend.flush();
+
+            expect(controller.renewPeriod).toBe(100);
+            expect(controller.renewInterval).toBe(5);
+            expect(controller.inservalId).toBeDefined();
+        });
+    });
+
+    describe('checkTokenValidity()', () => {
+        it(`should not call renewToken and not set vnToken in the controller`, () => {
+            controller.renewPeriod = 100;
+            controller.vnToken.created = new Date();
+
+            controller.checkTokenValidity();
+
+            expect(controller.vnToken.token).toBeNull();
+        });
+
+        it(`should call renewToken and set vnToken properties in the controller`, () => {
+            const response = {
+                token: 999,
+                created: new Date()
+            };
+            controller.renewPeriod = 100;
+            const oneHourBefore = new Date(Date.now() - (60 * 60 * 1000));
+            controller.vnToken.created = oneHourBefore;
+
+            $httpBackend.expect('POST', `VnUsers/renewToken`).respond(response);
+            controller.checkTokenValidity();
+            $httpBackend.flush();
+
+            expect(controller.vnToken.token).toBe(999);
+            expect(controller.vnToken.created).toEqual(response.created);
+        });
+    });
 });

loopback/common/models/vn-model.js

@@ -200,22 +200,20 @@ module.exports = function(Self) {
             const connector = this.dataSource.connector;
             let conn;
             let res;
-            const opts = Object.assign({}, options);
 
             try {
                 if (userId) {
-                    conn = await new Promise((resolve, reject) => {
-                        connector.client.getConnection(function(err, conn) {
-                            if (err)
-                                reject(err);
-                            else
-                                resolve(conn);
+                    if (!options.transaction) {
+                        options = Object.assign({}, options);
+                        conn = await new Promise((resolve, reject) => {
+                            connector.client.getConnection(function(err, conn) {
+                                if (err)
+                                    reject(err);
+                                else
+                                    resolve(conn);
+                            });
                         });
-                    });
-
-                    const opts = Object.assign({}, options);
-                    if (!opts.transaction) {
-                        opts.transaction = {
+                        options.transaction = {
                             connection: conn,
                             connector
                         };
@@ -223,15 +221,14 @@ module.exports = function(Self) {
 
                     await connector.executeP(
                         'CALL account.myUser_loginWithName((SELECT name FROM account.user WHERE id = ?))',
-                        [userId], opts
+                        [userId], options
                     );
                 }
 
-                res = await connector.executeP(query, params, opts);
+                res = await connector.executeP(query, params, options);
 
-                if (userId) {
-                    await connector.executeP('CALL account.myUser_logout()', null, opts);
-                }
+                if (userId)
+                    await connector.executeP('CALL account.myUser_logout()', null, options);
             } finally {
                 if (conn) conn.release();
             }

loopback/locale/es.json

@@ -297,5 +297,6 @@
 	"Ticket does not exist": "Este ticket no existe",
 	"Ticket is already signed": "Este ticket ya ha sido firmado",
 	"Authentication failed": "Autenticación fallida",
-	"You can't use the same password": "No puedes usar la misma contraseña"
+	"You can't use the same password": "No puedes usar la misma contraseña",
+	"The renew period has not been exceeded": "El periodo de renovación no ha sido superado"
 }

modules/account/front/aliases/index.html

@@ -17,7 +17,9 @@
                         <vn-icon-button
                             icon="delete"
                             translate-attr="{title: 'Unsubscribe'}"
-                            ng-click="removeConfirm.show(row)">
+                            ng-click="removeConfirm.show(row)"
+                            vn-acl="itManagement"
+                            vn-acl-action="remove">
                         </vn-icon-button>
                     </vn-item-section>
                 </vn-item>
@@ -30,9 +32,11 @@
         translate-attr="{title: 'Add'}"
         vn-bind="+"
         ng-click="$ctrl.onAddClick()"
-        fixed-bottom-right>
+        fixed-bottom-right
+        vn-acl="itManagement"
+        vn-acl-action="remove">
     </vn-float-button>
-    <vn-dialog 
+    <vn-dialog
         vn-id="dialog"
         on-accept="$ctrl.onAddSave()">
         <tpl-body>
@@ -49,7 +53,7 @@
             <button response="accept" translate>Save</button>
         </tpl-buttons>
     </vn-dialog>
-    <vn-confirm 
+    <vn-confirm
         vn-id="removeConfirm"
         message="User will be removed from alias"
         question="Are you sure you want to continue?"

modules/account/front/card/index.js

@@ -5,6 +5,7 @@ import './style.scss';
 class Controller extends ModuleCard {
     reload() {
         const filter = {
+            where: {id: this.$params.id},
             include: {
                 relation: 'role',
                 scope: {
@@ -14,8 +15,11 @@ class Controller extends ModuleCard {
         };
 
         return Promise.all([
-            this.$http.get(`VnUsers/${this.$params.id}`, {filter})
-                .then(res => this.user = res.data),
+            this.$http.get(`VnUsers/preview`, {filter})
+                .then(res => {
+                    const [user] = res.data;
+                    this.user = user;
+                }),
             this.$http.get(`Accounts/${this.$params.id}/exists`)
                 .then(res => this.hasAccount = res.data.exists)
         ]);

modules/account/front/card/index.spec.js

@@ -15,12 +15,12 @@ describe('component vnUserCard', () => {
         it('should reload the controller data', () => {
             controller.$params.id = 1;
 
-            $httpBackend.expectGET('VnUsers/1').respond('foo');
+            $httpBackend.expectGET('VnUsers/preview').respond('foo');
             $httpBackend.expectGET('Accounts/1/exists').respond({exists: true});
             controller.reload();
             $httpBackend.flush();
 
-            expect(controller.user).toBe('foo');
+            expect(controller.user).toBe('f');
             expect(controller.hasAccount).toBeTruthy();
         });
     });

modules/account/front/create/index.html

@@ -12,18 +12,18 @@
     <vn-card class="vn-pa-lg">
         <vn-vertical>
             <vn-textfield
-                label="Name" 
+                label="Name"
                 ng-model="$ctrl.user.name"
                 rule="VnUser"
                 vn-focus>
             </vn-textfield>
             <vn-textfield
-                label="Nickname" 
+                label="Nickname"
                 ng-model="$ctrl.user.nickname"
                 rule="VnUser">
             </vn-textfield>
             <vn-textfield
-                label="Email" 
+                label="Email"
                 ng-model="$ctrl.user.email"
                 rule="VnUser">
             </vn-textfield>
@@ -39,7 +39,7 @@
                 type="password">
             </vn-textfield>
             <vn-check
-                label="Active" 
+                label="Active"
                 ng-model="$ctrl.user.active">
             </vn-check>
         </vn-vertical>

modules/account/front/create/index.js

@@ -2,6 +2,11 @@ import ngModule from '../module';
 import Section from 'salix/components/section';
 
 export default class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+        this.user = {active: true};
+    }
+
     onSubmit() {
         return this.$.watcher.submit().then(res => {
             this.$state.go('account.card.basicData', {id: res.data.id});

modules/account/front/descriptor/index.html

@@ -6,7 +6,7 @@
         <vn-item
             ng-click="deleteUser.show()"
             name="deleteUser"
-            vn-acl="it"
+            vn-acl="itManagement"
             vn-acl-action="remove"
             translate>
             Delete
@@ -15,7 +15,7 @@
             ng-if="::$root.user.id == $ctrl.id"
             ng-click="$ctrl.onChangePassClick(true)"
             name="changePassword"
-            vn-acl="hr"
+            vn-acl="sysadmin"
             vn-acl-action="remove"
             translate>
             Change password
@@ -23,7 +23,7 @@
         <vn-item
             ng-click="$ctrl.onChangePassClick(false)"
             name="setPassword"
-            vn-acl="hr"
+            vn-acl="sysadmin"
             vn-acl-action="remove"
             translate>
             Set password
@@ -32,7 +32,7 @@
             ng-if="!$ctrl.hasAccount"
             ng-click="enableAccount.show()"
             name="enableAccount"
-            vn-acl="it"
+            vn-acl="sysadmin"
             vn-acl-action="remove"
             translate>
             Enable account
@@ -41,7 +41,7 @@
             ng-if="$ctrl.hasAccount"
             ng-click="disableAccount.show()"
             name="disableAccount"
-            vn-acl="it"
+            vn-acl="sysadmin"
             vn-acl-action="remove"
             translate>
             Disable account
@@ -50,7 +50,7 @@
             ng-if="!$ctrl.user.active"
             ng-click="activateUser.show()"
             name="activateUser"
-            vn-acl="hr"
+            vn-acl="itManagement"
             vn-acl-action="remove"
             translate>
             Activate user
@@ -59,7 +59,7 @@
             ng-if="$ctrl.user.active"
             ng-click="deactivateUser.show()"
             name="deactivateUser"
-            vn-acl="hr"
+            vn-acl="itManagement"
             vn-acl-action="remove"
             translate>
             Deactivate user

modules/account/front/index/index.html

@@ -14,11 +14,11 @@
                 <vn-item-section>
                     <h6>{{::user.nickname}}</h6>
                     <vn-label-value
-                        label="Id" 
+                        label="Id"
                         value="{{::user.id}}">
                     </vn-label-value>
                     <vn-label-value
-                        label="User" 
+                        label="User"
                         value="{{::user.name}}">
                     </vn-label-value>
                 </vn-item-section>
@@ -36,12 +36,12 @@
 <vn-popup vn-id="summary">
     <vn-user-summary user="$ctrl.selectedUser"></vn-user-summary>
 </vn-popup>
-<a 
+<a
     fixed-bottom-right
     ui-sref="account.create"
     vn-tooltip="New user"
     vn-bind="+"
-    vn-acl="it"
+    vn-acl="itManagement"
     vn-acl-action="remove">
     <vn-float-button icon="add"></vn-float-button>
-</a>
+</a>

modules/account/front/mail-forwarding/index.html

@@ -14,12 +14,12 @@
         <vn-card class="vn-pa-lg">
             <vn-vertical>
                 <vn-check
-                    label="Enable mail forwarding" 
+                    label="Enable mail forwarding"
                     ng-model="watcher.hasData">
                 </vn-check>
                 <vn-textfield
                     ng-if="watcher.hasData"
-                    label="Forward email" 
+                    label="Forward email"
                     ng-model="data.forwardTo"
                     info="All emails will be forwarded to the specified address."
                     rule="MailForward"

modules/account/front/mail-forwarding/locale/es.yml

@@ -4,3 +4,4 @@ Enable mail forwarding: Habilitar redirección de correo
 All emails will be forwarded to the specified address.: >
     Todos los correos serán reenviados a la dirección especificada, no se
     mantendrá copia de los mismos en el buzón del usuario.
+You don't have enough privileges: No tienes suficientes permisos

modules/account/front/main/index.html

@@ -1,6 +1,6 @@
 <vn-crud-model
     vn-id="model"
-    url="VnUsers"
+    url="VnUsers/preview"
     filter="::$ctrl.filter"
     limit="20">
 </vn-crud-model>

modules/account/front/privileges/index.html

@@ -1,9 +1,7 @@
 <mg-ajax path="VnUsers/{{post.params.id}}/privileges" options="vnPost"></mg-ajax>
 <vn-watcher
     vn-id="watcher"
-    url="VnUsers"
     data="$ctrl.user"
-    id-value="$ctrl.$params.id"
     form="form"
     save="post">
 </vn-watcher>
@@ -11,15 +9,16 @@
     name="form"
     ng-submit="watcher.submit()"
     class="vn-w-md">
-    <vn-card class="vn-pa-lg" vn-focus>
+    <vn-card class="vn-pa-lg">
         <vn-vertical>
             <vn-check
                 label="Has grant"
                 ng-model="$ctrl.user.hasGrant">
             </vn-check>
         </vn-vertical>
-        <vn-vertical
-            class="vn-mt-md">
+    </vn-card>
+    <vn-card class="vn-pa-lg vn-mt-md">
+        <vn-vertical>
             <vn-autocomplete
                 label="Role"
                 ng-model="$ctrl.user.roleFk"

modules/account/front/privileges/index.js

@@ -1,9 +1,21 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
 
-export default class Controller extends Section {}
+export default class Controller extends Section {
+    get user() {
+        return this._user;
+    }
+
+    set user(value) {
+        this._user = value;
+        if (!value) return;
+    }
+}
 
 ngModule.component('vnUserPrivileges', {
     template: require('./index.html'),
-    controller: Controller
+    controller: Controller,
+    bindings: {
+        user: '<'
+    }
 });

modules/account/front/routes.json

@@ -49,15 +49,13 @@
             "url": "/index?q",
             "state": "account.index",
             "component": "vn-user-index",
-            "description": "Users",
-            "acl": ["marketing", "hr"]
+            "description": "Users"
         },
         {
             "url": "/create",
             "state": "account.create",
             "component": "vn-user-create",
-            "description": "New user",
-            "acl": ["it"]
+            "description": "New user"
         },
         {
             "url": "/:id",
@@ -80,7 +78,7 @@
             "state": "account.card.basicData",
             "component": "vn-user-basic-data",
             "description": "Basic data",
-            "acl": ["hr"]
+            "acl": ["itManagement"]
         },
         {
             "url" : "/log",
@@ -98,8 +96,7 @@
             "url": "/roles",
             "state": "account.card.roles",
             "component": "vn-user-roles",
-            "description": "Inherited roles",
-            "acl": ["it"]
+            "description": "Inherited roles"
         },
         {
             "url": "/mail-forwarding",
@@ -111,15 +108,16 @@
             "url": "/aliases",
             "state": "account.card.aliases",
             "component": "vn-user-aliases",
-            "description": "Mail aliases",
-            "acl": ["marketing", "hr"]
+            "description": "Mail aliases"
         },
         {
             "url": "/privileges",
             "state": "account.card.privileges",
             "component": "vn-user-privileges",
             "description": "Privileges",
-            "acl": ["hr"]
+            "params": {
+                "user": "$ctrl.user"
+            }
         },
         {
             "url": "/role?q",
@@ -180,8 +178,7 @@
             "url": "/alias?q",
             "state": "account.alias",
             "component": "vn-alias",
-            "description": "Mail aliases",
-            "acl": ["marketing"]
+            "description": "Mail aliases"
         },
         {
             "url": "/create",

modules/account/front/summary/index.js

@@ -8,6 +8,7 @@ class Controller extends Summary {
         if (!value) return;
 
         const filter = {
+            where: {id: value.id},
             include: {
                 relation: 'role',
                 scope: {
@@ -15,8 +16,11 @@ class Controller extends Summary {
                 }
             }
         };
-        this.$http.get(`VnUsers/${value.id}`, {filter})
-            .then(res => this.$.summary = res.data);
+        this.$http.get(`VnUsers/preview`, {filter})
+            .then(res => {
+                const [summary] = res.data;
+                this.$.summary = summary;
+            });
     }
     get isHr() {
         return this.aclService.hasAny(['hr']);

modules/client/front/web-access/index.html

@@ -1,7 +1,5 @@
 <vn-watcher
     vn-id="watcher"
-    url="VnUsers" 
-    id-field="id"
     data="$ctrl.account"
     form="form">
 </vn-watcher>
@@ -51,9 +49,9 @@
             label="Save">
         </vn-submit>
         <vn-button
-        ng-if="$ctrl.canChangePassword"
-        label="Change password"
-        vn-dialog="change-pass">
+            ng-if="$ctrl.canChangePassword"
+            label="Change password"
+            vn-dialog="change-pass">
         </vn-button>
         <vn-button
             class="cancel"

modules/client/front/web-access/index.js

@@ -8,6 +8,22 @@ export default class Controller extends Section {
         this.canEnableCheckBox = true;
     }
 
+    set client(value) {
+        this._client = value;
+        if (!value) return;
+
+        const filter = {where: {id: value.id}};
+        this.$http.get(`VnUsers/preview`, {filter})
+            .then(res => {
+                const [user] = res.data;
+                this.account = user;
+            });
+    }
+
+    get client() {
+        return this._client;
+    }
+
     $onChanges() {
         if (this.client) {
             this.account = this.client.account;

modules/client/front/web-access/index.spec.js

@@ -5,12 +5,14 @@ describe('Component VnClientWebAccess', () => {
     let $scope;
     let vnApp;
     let controller;
+    let $httpParamSerializer;
 
     beforeEach(ngModule('client'));
 
-    beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _vnApp_) => {
+    beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_, _vnApp_) => {
         $scope = $rootScope.$new();
         $httpBackend = _$httpBackend_;
+        $httpParamSerializer = _$httpParamSerializer_;
         vnApp = _vnApp_;
         jest.spyOn(vnApp, 'showError');
         const $element = angular.element('<vn-client-web-access></vn-client-web-access>');
@@ -32,7 +34,10 @@ describe('Component VnClientWebAccess', () => {
     describe('isCustomer()', () => {
         it('should return true if the password can be modified', () => {
             controller.client = {id: '1234'};
+            const filter = {where: {id: controller.client.id}};
+            const serializedParams = $httpParamSerializer({filter});
 
+            $httpBackend.expectGET(`VnUsers/preview?${serializedParams}`).respond('foo');
             $httpBackend.expectGET(`Clients/${controller.client.id}/hasCustomerRole`).respond(true);
             controller.isCustomer();
             $httpBackend.flush();
@@ -42,7 +47,10 @@ describe('Component VnClientWebAccess', () => {
 
         it(`should return a false if the password can't be modified`, () => {
             controller.client = {id: '1234'};
+            const filter = {where: {id: controller.client.id}};
+            const serializedParams = $httpParamSerializer({filter});
 
+            $httpBackend.expectGET(`VnUsers/preview?${serializedParams}`).respond('foo');
             $httpBackend.expectGET(`Clients/${controller.client.id}/hasCustomerRole`).respond(false);
             controller.isCustomer();
             $httpBackend.flush();
@@ -54,9 +62,12 @@ describe('Component VnClientWebAccess', () => {
     describe('checkConditions()', () => {
         it('should perform a query to check if the client is valid', () => {
             controller.client = {id: '1234'};
+            const filter = {where: {id: controller.client.id}};
+            const serializedParams = $httpParamSerializer({filter});
 
             expect(controller.canEnableCheckBox).toBeTruthy();
 
+            $httpBackend.expectGET(`VnUsers/preview?${serializedParams}`).respond('foo');
             $httpBackend.expectGET(`Clients/${controller.client.id}/isValidClient`).respond(false);
             controller.checkConditions();
             $httpBackend.flush();
@@ -82,7 +93,10 @@ describe('Component VnClientWebAccess', () => {
             controller.newPassword = 'm24x8';
             controller.repeatPassword = 'm24x8';
             controller.canChangePassword = true;
+            const filter = {where: {id: controller.client.id}};
+            const serializedParams = $httpParamSerializer({filter});
 
+            $httpBackend.expectGET(`VnUsers/preview?${serializedParams}`).respond('foo');
             const query = `Clients/${controller.client.id}/setPassword`;
             $httpBackend.expectPATCH(query, {newPassword: controller.newPassword}).respond('done');
             controller.onPassChange();

modules/monitor/front/index/tickets/index.html

@@ -50,13 +50,13 @@
                         <th field="salesPersonFk">
                             <span translate>Salesperson</span>
                         </th>
-                        <th field="shippedDate" shrink-date>
+                        <th field="shippedDate" shrink-date filter-enabled="false">
                             <span translate>Date</span>
                         </th>
-                        <th field="theoreticalHour">
+                        <th field="theoreticalHour" filter-enabled="false">
                             <span translate>Theoretical</span>
                         </th>
-                        <th field="practicalHour">
+                        <th field="practicalHour" filter-enabled="false">
                             <span translate>Practical</span>
                         </th>
                         <th field="preparationHour" filter-enabled="false">

modules/order/back/methods/order/confirm.js

@@ -21,7 +21,6 @@ module.exports = Self => {
 
     Self.confirm = async(ctx, orderFk) => {
         const userId = ctx.req.accessToken.userId;
-
         const query = `CALL hedera.order_confirmWithUser(?, ?)`;
         const response = await Self.rawSql(query, [orderFk, userId], {userId});
 

modules/supplier/back/locale/supplier-account/en.yml

@@ -5,3 +5,4 @@ columns:
     beneficiary: beneficiary
     supplierFk: supplier
     bankEntityFk: bank entity
+    accountingFk: ledger account

modules/supplier/back/locale/supplier-account/es.yml

@@ -5,3 +5,4 @@ columns:
     beneficiary: beneficiario
     supplierFk: proveedor
     bankEntityFk: entidad bancaria
+    accountingFk: cuenta contable

modules/ticket/front/sale/index.html

@@ -69,7 +69,7 @@
                     <vn-th ng-click="$ctrl.sortBy('price')" field="price" number>Price</vn-th>
                     <vn-th ng-click="$ctrl.sortBy('discount')" field="discount" number>Disc</vn-th>
                     <vn-th ng-click="$ctrl.sortBy('amount')" field="amount" number>Amount</vn-th>
-                    <vn-th ng-click="$ctrl.sortBy('itemPackingTypeFk')" field="itemPackingTypeFk" shrink>Packaging</vn-th>
+                    <vn-th ng-click="$ctrl.sortBy('item.itemPackingTypeFk')" field="itemPackingTypeFk" shrink>Packaging</vn-th>
                     <vn-th shrink></vn-th>
                 </vn-tr>
             </vn-thead>
@@ -202,7 +202,7 @@
                         </span>
                     </vn-td>
                     <vn-td number>
-                        {{$ctrl.getSaleTotal(sale) | currency: 'EUR':2}}
+                        {{sale.amount | currency: 'EUR':2}}
                     </vn-td>
                     <vn-td shrink>
                         {{::sale.item.itemPackingTypeFk | dashIfEmpty}}

modules/ticket/front/sale/index.js

@@ -34,6 +34,11 @@ class Controller extends Section {
     }
 
     get sales() {
+        if (this._sales) {
+            for (let sale of this._sales)
+                sale.amount = this.getSaleTotal(sale);
+        }
+
         return this._sales;
     }
 
@@ -49,6 +54,7 @@ class Controller extends Section {
 
         return ticketState && ticketState.state.code;
     }
+
     getConfig() {
         let filter = {
             fields: ['daysForWarningClaim'],

modules/worker/back/methods/department/getLeaves.js

@@ -1,5 +1,5 @@
 module.exports = Self => {
-    Self.remoteMethodCtx, ('getLeaves', {
+    Self.remoteMethodCtx('getLeaves', {
         description: 'Returns the nodes for a department',
         accepts: [{
             arg: 'parentId',

modules/worker/back/methods/worker/isAuthorized.js

@@ -0,0 +1,44 @@
+module.exports = Self => {
+    Self.remoteMethod('isAuthorized', {
+        description: 'Return true if the current user is a superior of the worker that is passed by parameter',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'ctx',
+            type: 'Object',
+            http: {source: 'context'}
+        }, {
+            arg: 'id',
+            type: 'number',
+            required: true,
+            description: 'The worker id',
+            http: {source: 'path'}
+        }],
+        returns: {
+            type: 'boolean',
+            root: true
+        },
+        http: {
+            path: `/:id/isAuthorized`,
+            verb: 'GET'
+        }
+    });
+
+    Self.isAuthorized = async(ctx, id, options) => {
+        const models = Self.app.models;
+        const currentUserId = ctx.req.accessToken.userId;
+        const isHimself = currentUserId == id;
+
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const isSubordinate = await models.Worker.isSubordinate(ctx, id, myOptions);
+        const isTeamBoss = await models.VnUser.hasRole(currentUserId, 'teamBoss', myOptions);
+
+        if (!isSubordinate || (isSubordinate && isHimself && !isTeamBoss))
+            return false;
+
+        return true;
+    };
+};

modules/worker/back/models/worker.js

@@ -16,6 +16,7 @@ module.exports = Self => {
     require('../methods/worker/new')(Self);
     require('../methods/worker/deallocatePDA')(Self);
     require('../methods/worker/allocatePDA')(Self);
+    require('../methods/worker/isAuthorized')(Self);
 
     Self.validatesUniquenessOf('locker', {
         message: 'This locker has already been assigned'

modules/worker/front/account/index.html

@@ -1,33 +0,0 @@
-<mg-ajax
-    path="VnUsers/{{$ctrl.worker.userFk}}"
-    actions="user = edit.model"
-    options="mgEdit">
-</mg-ajax>
-<vn-watcher
-    vn-id="watcher"
-    url="VnUsers"
-    id-field="id"
-    data="user"
-    form="form">
-</vn-watcher>
-<form name="form" ng-submit="$ctrl.onSubmit()" class="vn-w-md">
-    <vn-card class="vn-pa-lg">
-        <vn-vertical>
-            <vn-horizontal>
-                <vn-field
-                    vn-one
-                    label="Nickname" 
-                    ng-model="user.nickname">
-                </vn-field>
-            </vn-horizontal>
-        </vn-vertical>
-    </vn-card>
-    <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button
-            label="Undo changes"
-            ng-if="watcher.dataChanged()"
-            ng-click="watcher.loadOriginalData()">
-        </vn-button>
-    </vn-button-bar>
-</form>

modules/worker/front/calendar/index.html

@@ -63,6 +63,7 @@
                 ng-model="$ctrl.businessId"
                 search-function="{businessFk: $search}"
                 value-field="businessFk"
+                show-field="businessFk"
                 order="businessFk DESC"
                 limit="5">
                 <tpl-item>

modules/worker/front/calendar/index.js

@@ -71,10 +71,6 @@ class Controller extends Section {
         }
     }
 
-    get payedHolidays() {
-        return this._businessId;
-    }
-
     buildYearFilter() {
         const now = Date.vnNew();
         now.setFullYear(now.getFullYear() + 1);
@@ -95,10 +91,10 @@ class Controller extends Section {
     }
 
     getActiveContract() {
-        this.$http.get(`Workers/${this.worker.id}/activeContract`).then(res => {
-            if (res.data)
-                this.businessId = res.data.businessFk;
-        });
+        this.$http.get(`Workers/${this.worker.id}/activeContract`)
+            .then(res => {
+                if (res.data) this.businessId = res.data.businessFk;
+            });
     }
 
     getContractHolidays() {

print/templates/email/entry-update-comission/assets/css/import.js

@@ -0,0 +1,13 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`,
+    `${__dirname}/style.css`])
+    .mergeStyles();
+

print/templates/email/entry-update-comission/assets/css/style.css

@@ -0,0 +1,5 @@
+.external-link {
+    border: 2px dashed #8dba25;
+    border-radius: 3px;
+    text-align: center
+}

print/templates/email/entry-update-comission/entry-update-comission.html

@@ -0,0 +1,10 @@
+<email-body v-bind="$props">
+    <div class="grid-row">
+        <div class="grid-block vn-pa-ml">
+            <p>
+                {{$t('dear')}}
+            </p>
+            <p v-html="$t('body',[currencyName,referenceCurrent])"></p>
+        </div>
+    </div>
+</email-body>

print/templates/email/entry-update-comission/entry-update-comission.js

@@ -0,0 +1,19 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+
+module.exports = {
+    name: 'entry-update-comission',
+    components: {
+        'email-body': emailBody.build(),
+    },
+    props: {
+        currencyName: {
+            type: String,
+            required: true
+        },
+        referenceCurrent: {
+            type: Number,
+            required: true
+        }
+    }
+};

print/templates/email/entry-update-comission/locale/es.yml

@@ -0,0 +1,4 @@
+subject: Actualización tipo de cambio en entradas
+title: Actualización tipo de cambio en entradas
+dear: Hola,
+body: 'El tipo de cambio para las ENTRADAS/COMPRAS en <strong>{0}</strong> se ha actualizado a partir de hoy en: <strong>{1}</strong>'

print/templates/reports/invoice/invoice.html

@@ -242,7 +242,7 @@
                     </tfoot>
                 </table>
             </div>
-            <div class="columns vn-mt-xl" v-if="invoice.payMethodCode == 'wireTransfer' && invoice.iban">
+            <div class="columns vn-mt-lg" v-if="(invoice.payMethodCode == 'wireTransfer' && invoice.iban) || ticketObservations">
                 <div class="size50 pull-left no-page-break">
                     <div class="panel">
                         <div class="header">{{$t('observations')}}</div>
@@ -267,9 +267,7 @@
             v-bind:left-text="$t('invoiceRef', [invoice.ref])"
             v-bind:center-text="client.socialName"
             v-bind:recipient-id="client.id"
-            v-bind="$props"
-            
-        >
+            v-bind="$props">
         </report-footer>
     </template>
 </report-body>