Merge branch '6213-supplierFixCreateErrors' of https://gitea.verdnatura.es/verdnatura/salix into 6213-supplierFixCreateErrors

db/changes/232601/00-useSpecificsAcls.sql

@@ -3,11 +3,11 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri
         ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
         ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'salesPerson'),
         ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'salesAssistant'),
-        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryAssistant'),
         ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'buyer'),
         ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'claimManager'),
         ('Ticket', 'deleteTicketWithPartPrepared', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
-        ('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
         ('State', 'editableStates', 'READ', 'ALLOW', 'ROLE', 'employee'),
         ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'administrative'),
         ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'production'),

db/changes/234001/00-updateAfterBusinnesInsert.sql

@@ -0,0 +1,57 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`account_enable`(vSelf INT)
+BEGIN
+/**
+ * Enables a worker's account and sets up email configurations.
+ */
+    UPDATE user
+        SET active = TRUE
+        WHERE id = vSelf;
+
+    INSERT IGNORE INTO account
+        SET id = vSelf;
+
+    INSERT IGNORE INTO mailAliasAccount (mailAlias, account)
+        SELECT  id, vSelf
+            FROM mailAlias
+            WHERE alias = 'general';
+
+    INSERT IGNORE INTO mailForward (account, forwardTo)
+        SELECT vSelf, email
+            FROM user
+            WHERE id = vSelf;
+END$$
+DELIMITER ;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_updateBusiness`(vSelf INT)
+BEGIN
+/**
+ * Activates an account and configures its email settings.
+ *
+ * @param vSelf account id.
+ */
+    DECLARE vOldBusinessFk INT;
+    DECLARE vNewBusinessFk INT;
+
+    SELECT businessFk INTO vOldBusinessFk FROM worker WHERE id = vSelf;
+
+    SELECT id INTO vNewBusinessFk 
+        FROM business 
+        WHERE workerFk = vSelf
+            AND util.VN_CURDATE() BETWEEN started AND IFNULL(ended, util.VN_CURDATE());
+
+    UPDATE worker
+        SET businessFk = vNewBusinessFk
+        WHERE id = vSelf;
+
+    IF NOT (vOldBusinessFk <=> vNewBusinessFk) THEN
+        IF vNewBusinessFk IS NULL THEN 
+            CALL workerDisable(vSelf);
+        END IF;
+        IF vOldBusinessFk IS NULL THEN 
+            CALL account.account_enable(vSelf);
+        END IF;
+    END IF;
+END$$
+DELIMITER ;

db/changes/234001/01-deliveryAssistantACL.sql

@@ -0,0 +1,16 @@
+--  Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values.
+INSERT INTO `account`.`role` (name,description)
+	VALUES ('deliveryAssistant','Jefe auxiliar repartos');
+
+INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
+    SELECT (SELECT id FROM account.role r1 WHERE r1.name = 'deliveryAssistant'), ri.inheritsFrom
+FROM account.roleInherit ri
+    JOIN account.role r2 ON r2.id = ri.`role`
+WHERE r2.name = 'deliveryBoss';
+
+INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
+		SELECT (SELECT id FROM account.role WHERE name = 'deliveryBoss') role,
+		(SELECT id FROM account.role WHERE name = 'deliveryAssistant') roleInherit;
+
+
+CALL `account`.`role_syncPrivileges`();

db/dump/fixtures.sql

@@ -1013,7 +1013,7 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (4,  4, 1,  'Melee weapon heavy shield 100cm', 20, 1.69,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
         (5,  1, 2,  'Ranged weapon longbow 200cm',         1,  110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
         (6,  1, 3,  'Ranged weapon longbow 200cm',         1,  110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)),
-        (7,  2, 11, 'Melee weapon combat fist 15cm',    15, 7.44,   0, 0, 0, util.VN_CURDATE()),
+        (7,  2, 11, 'Melee weapon combat fist 15cm',    15, 7.74,   0, 0, 0, util.VN_CURDATE()),
         (8,  4, 11, 'Melee weapon heavy shield 100cm', 10, 1.79,   0, 0, 0, util.VN_CURDATE()),
         (9,  1, 16, 'Ranged weapon longbow 200cm',         1,  103.49, 0, 0, 0, util.VN_CURDATE()),
         (10, 2, 16, 'Melee weapon combat fist 15cm',    10, 7.09,   0, 0, 0, util.VN_CURDATE()),
@@ -2974,5 +2974,3 @@ INSERT INTO vn.XDiario (id, ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EU
         (4, 2.0, util.VN_CURDATE(), '4300001104', NULL, 'n/fra T4444444', 8.88, NULL, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
         (5, 2.0, util.VN_CURDATE(), '2000000000', '4300001104', 'n/fra T4444444 Tony Stark', NULL, 8.07, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
         (6, 2.0, util.VN_CURDATE(), '4770000010', '4300001104', 'Inmovilizado pendiente : n/fra T4444444 Tony Stark', NULL, 0.81, 8.07, 'T', '4444444', 10.00, NULL, NULL, NULL, NULL, NULL, '', '2', '', 1, 1, '06089160W', 'IRON MAN', 1, 1, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0);
-        
-	

db/tests/vn/item_getBalance.spec.js

@@ -6,13 +6,13 @@ describe('item_getBalance()', () => {
         let stmts = [];
 
         let params = {
-            warehouseFk: 1,
+            itemFk: 1,
-            itemFk: 1
+            warehouseFk: 1
         };
 
         const conn = await app.models.Item.dataSource.connector;
 
-        stmts.push(new ParameterizedSQL('CALL vn.item_getBalance(?, ?)', [
+        stmts.push(new ParameterizedSQL('CALL vn.item_getBalance(?, ?, NULL)', [
             params.warehouseFk,
             params.itemFk
         ]));

db/tests/vn/logAddWithUser.spec.js

@@ -1,42 +0,0 @@
-const app = require('vn-loopback/server/server');
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
-
-describe('logAddWithUser()', () => {
-    it('should log any action taken by the user in a table ending in Log', async() => {
-        let stmts = [];
-        let stmt;
-
-        stmts.push('START TRANSACTION');
-
-        let params = {
-            ticketFk: 1,
-            userId: 9,
-            actionCode: 'update',
-            targetEntity: 'ticket',
-            description: 'we are testing stuff'
-        };
-
-        stmt = new ParameterizedSQL('CALL vn.logAddWithUser(?, ?, ?, ?, ?)', [
-            params.ticketFk,
-            params.userId,
-            params.actionCode,
-            params.targetEntity,
-            params.description
-        ]);
-        stmts.push(stmt);
-
-        stmt = new ParameterizedSQL('SELECT * FROM vn.ticketLog WHERE description = ?', [
-            params.description
-        ]);
-        let ticketLogIndex = stmts.push(stmt) - 1;
-
-        stmts.push('ROLLBACK');
-
-        let sql = ParameterizedSQL.join(stmts, ';');
-        let result = await app.models.Ticket.rawStmt(sql);
-
-        savedDescription = result[ticketLogIndex][0].description;
-
-        expect(savedDescription).toEqual(params.description);
-    });
-});

db/tests/vn/timeControl_calculateByUser.spec.js

@@ -14,14 +14,6 @@ describe('timeControl_calculateByUser()', () => {
         let stmts = [];
         let stmt;
 
-        stmts.push('START TRANSACTION');
-
-        stmts.push(`
-            DROP TEMPORARY TABLE IF EXISTS
-                tmp.timeControlCalculate,
-                tmp.timeBusinessCalculate
-        `);
-
         let params = {
             workerID: 1106,
             start: start,
@@ -37,17 +29,15 @@ describe('timeControl_calculateByUser()', () => {
 
         let tableIndex = stmts.push('SELECT * FROM tmp.timeControlCalculate') - 1;
 
-        stmts.push('ROLLBACK');
-
         let sql = ParameterizedSQL.join(stmts, ';');
         let result = await app.models.Ticket.rawStmt(sql);
 
         let [timeControlCalculateTable] = result[tableIndex];
 
-        expect(timeControlCalculateTable.timeWorkSeconds).toEqual(29400);
+        expect(timeControlCalculateTable.timeWorkSeconds).toEqual(28200);
     });
-
+    // #2261
-    it(`should return the worked hours between last sunday and monday`, async() => {
+    xit(`should return the worked hours between last sunday and monday`, async() => {
         let lastSunday = Date.vnNew();
         let daysSinceSunday = lastSunday.getDay();
         if (daysSinceSunday === 0) // this means today is sunday but you need the previous sunday :)
@@ -65,13 +55,7 @@ describe('timeControl_calculateByUser()', () => {
 
         stmts.push('START TRANSACTION');
 
-        stmts.push(`
+        const workerID = 1108;
-            DROP TEMPORARY TABLE IF EXISTS
-                tmp.timeControlCalculate,
-                tmp.timeBusinessCalculate
-        `);
-
-        const workerID = 1107;
 
         stmt = new ParameterizedSQL(`
             INSERT INTO vn.workerTimeControl(userFk, timed, manual, direction)

db/tests/vn/zone_getFromGeo.spec.js

@@ -7,7 +7,7 @@ describe('zone zone_getFromGeo()', () => {
         let stmt;
 
         stmts.push('START TRANSACTION');
-        let geoFk = 17;
+        let geoFk = 16;
 
         stmt = new ParameterizedSQL('CALL zone_getFromGeo(?)', [
             geoFk,

e2e/paths/02-client/01_create_client.spec.js

@@ -8,7 +8,7 @@ describe('Client create path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule(' deliveryBoss', 'client');
+        await page.loginAndModule('deliveryAssistant', 'client');
     });
 
     afterAll(async() => {

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

@@ -45,7 +45,7 @@ describe('Worker create path', () => {
 
         // should create a new worker and go to worker basic data'
         await page.pickDate(selectors.workerCreate.birth, new Date(1962, 8, 5));
-        await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryBoss');
+        await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryAssistant');
         await page.waitToClick(selectors.workerCreate.createButton);
         message = await page.waitForSnackbar();
         await page.waitForState('worker.card.basicData');

e2e/paths/05-ticket/06_basic_data_steps.spec.js

@@ -75,7 +75,7 @@ describe('Ticket Edit basic data path', () => {
         const result = await page
             .waitToGetProperty(selectors.ticketBasicData.stepTwoTotalPriceDif, 'innerText');
 
-        expect(result).toContain('-€232.75');
+        expect(result).toContain('-€228.25');
     });
 
     it(`should select a new reason for the changes made then click on finalize`, async() => {

e2e/paths/11-zone/01_basic-data.spec.js

@@ -8,7 +8,9 @@ describe('Zone basic data path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('deliveryBoss', 'zone'); // turns up the zone module name and route aint the same lol
+
+        await page.loginAndModule('deliveryAssistant',
+            'zone'); // turns up the zone module name and route aint the same lol
         await page.accessToSearchResult('10');
         await page.accessToSection('zone.card.basicData');
     });

e2e/paths/11-zone/02_descriptor.spec.js

@@ -8,7 +8,7 @@ describe('Zone descriptor path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('deliveryBoss', 'zone');
+        await page.loginAndModule('deliveryAssistant', 'zone');
         await page.accessToSearchResult('13');
     });
 

loopback/locale/es.json

@@ -317,5 +317,6 @@
 	"The ticket doesn't exist.": "No existe el ticket.",
 	"Social name should be uppercase": "La razón social debe ir en mayúscula",
 	"Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
+	"The response is not a PDF": "La respuesta no es un PDF",
 	"Ticket without Route": "Ticket sin ruta"
 }

modules/client/back/methods/client/filter.js

@@ -80,10 +80,15 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         if (args.zoneFk) {
-            query = `CALL vn.zone_getPostalCode(?)`;
+            let stmts = [];
-            const [geos] = await Self.rawSql(query, [args.zoneFk]);
+            stmts.push(new ParameterizedSQL('CALL vn.zone_getPostalCode(?)', [args.zoneFk]));
-            for (let geo of geos)
+            stmts.push(`SELECT name FROM tmp.zoneNodes`);
-                postalCode.push(geo.name);
+            stmts.push(`DROP TEMPORARY TABLE tmp.zoneNodes`);
+            const sql = ParameterizedSQL.join(stmts, ';');
+            const [results] = await conn.executeStmt(sql);
+
+            for (let result of results)
+                postalCode.push(result.name);
         }
 
         const where = buildFilter(ctx.args, (param, value) => {

modules/client/front/address/create/index.html

@@ -68,7 +68,7 @@
                         icon="add_circle"
                         vn-tooltip="New postcode"
                         ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/client/front/address/edit/index.html

@@ -81,7 +81,7 @@
                         icon="add_circle"
                         vn-tooltip="New postcode"
                         ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/client/front/create/index.html

@@ -73,7 +73,7 @@
                         icon="add_circle"
                         vn-tooltip="New postcode"
                         ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/client/front/fiscal-data/index.html

@@ -94,7 +94,7 @@
                         icon="add_circle"
                         vn-tooltip="New postcode"
                         ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/client/front/postcode/index.html

@@ -27,7 +27,7 @@
                         icon="add_circle"
                         vn-tooltip="New city"
                         ng-click="city.open($event)"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>
@@ -45,7 +45,7 @@
                         icon="add_circle"
                         vn-tooltip="New province"
                         ng-click="province.open($event)"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/route/back/methods/route/downloadCmrsZip.js

@@ -0,0 +1,71 @@
+const JSZip = require('jszip');
+const axios = require('axios');
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('downloadCmrsZip', {
+        description: 'Download a zip file with multiple cmrs pdfs',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'ids',
+                type: 'string',
+                description: 'The cmrs 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: '/downloadCmrsZip',
+            verb: 'GET'
+        }
+    });
+
+    Self.downloadCmrsZip = async function(ctx, ids, options) {
+        const models = Self.app.models;
+        const myOptions = {};
+        const token = ctx.req.accessToken;
+        const zip = new JSZip();
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const zipConfig = await models.ZipConfig.findOne(null, myOptions);
+        let totalSize = 0;
+        ids = ids.split(',');
+        try {
+            for (let id of ids) {
+                if (zipConfig && totalSize > zipConfig.maxSize) throw new UserError('Files are too large');
+                const response = await axios.get(
+                    `${ctx.req.headers.referer}api/Routes/${id}/cmr?access_token=${token.id}`, {
+                    ...myOptions,
+                    responseType: 'arraybuffer',
+                });
+    
+                if (response.headers['content-type'] !== 'application/pdf')
+                    throw new UserError(`The response is not a PDF`);
+    
+                zip.file(`${id}.pdf`, response.data, { binary: true });
+            }
+    
+            const zipStream = zip.generateNodeStream({ streamFiles: true });
+    
+            return [zipStream, 'application/zip', `filename="cmrs.zip"`];
+        } catch (e) {
+            throw e;
+        }
+    };
+};

modules/route/back/methods/route/getExternalCmrs.js

@@ -22,6 +22,11 @@ module.exports = Self => {
 				type: 'integer',
 				description: 'The worker id',
 			},
+			{
+				arg: 'routeFk',
+				type: 'integer',
+				description: 'The route id',
+			},
 			{
 				arg: 'country',
 				type: 'string',
@@ -57,6 +62,7 @@ module.exports = Self => {
 		filter,
 		cmrFk,
 		ticketFk,
+		routeFk,
 		country,
 		clientFk,
 		hasCmrDms,
@@ -66,6 +72,7 @@ module.exports = Self => {
 		const params = {
 			cmrFk,
 			ticketFk,
+			routeFk,
 			country,
 			clientFk,
 			hasCmrDms,
@@ -93,6 +100,7 @@ module.exports = Self => {
 				FROM (
 					SELECT t.cmrFk,
 							t.id ticketFk,
+							t.routeFk,
 							co.country,
 							t.clientFk,
 							IF(sub.id, TRUE, FALSE) hasCmrDms,

modules/route/back/models/route.js

@@ -16,6 +16,7 @@ module.exports = Self => {
     require('../methods/route/downloadZip')(Self);
     require('../methods/route/cmr')(Self);
     require('../methods/route/getExternalCmrs')(Self);
+    require('../methods/route/downloadCmrsZip')(Self);
 
     Self.validate('kmStart', validateDistance, {
         message: 'Distance must be lesser than 1000'

modules/route/front/descriptor/index.html

@@ -15,14 +15,14 @@
         </vn-item>
         <vn-item
             ng-click="updateVolumeConfirmation.show()"
-            vn-acl="deliveryBoss"
+            vn-acl="deliveryAssistant"
             vn-acl-action="remove"
             translate>
             Update volume
         </vn-item>
         <vn-item
             ng-click="$ctrl.deleteCurrentRoute()"
-            vn-acl="deliveryBoss"
+            vn-acl="deliveryAssistant"
             vn-acl-action="remove"
             translate>
             Delete route

modules/route/front/tickets/index.html

@@ -37,7 +37,7 @@
                     icon="format_list_numbered">
                 </vn-button>
                 <vn-button
-                    vn-acl="deliveryBoss"
+                    vn-acl="deliveryAssistant"
                     vn-acl-action="remove"
                     disabled="!$ctrl.isChecked"
                     icon="sms"

modules/supplier/front/address/create/index.html

@@ -50,7 +50,7 @@
                         icon="add_circle"
                         vn-tooltip="New postcode"
                         ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/supplier/front/address/edit/index.html

@@ -48,7 +48,7 @@
                         icon="add_circle"
                         vn-tooltip="New postcode"
                         ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/supplier/front/fiscal-data/index.html

@@ -150,7 +150,7 @@
                         icon="add_circle"
                         vn-tooltip="New postcode"
                         ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/ticket/back/methods/sale/specs/updatePrice.spec.js

@@ -108,7 +108,7 @@ describe('sale updatePrice()', () => {
                 }}, options);
 
             expect(updatedSale.price).toBe(price);
-            expect(createdSaleComponent.value).toEqual(-2.04);
+            expect(createdSaleComponent.value).toEqual(-2.34);
 
             const updatedSalesPersonMana = await models.WorkerMana.findById(18, null, options);
 

modules/worker/back/methods/calendar/specs/absences.spec.js

@@ -50,7 +50,7 @@ describe('Worker absences()', () => {
         }
     });
 
-    it('should give the same holidays as worked days since the holidays amount matches the amount of days in a year', async() => {
+    it('Should have an equal number of holidays and workdays, as they both total the days in a year', async() => {
         const businessId = 1106;
         const workerId = 1106;
 

modules/worker/front/create/index.html

@@ -72,7 +72,7 @@
                         icon="add_circle"
                         vn-tooltip="New postcode"
                         ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/zone/front/basic-data/index.html

@@ -14,7 +14,7 @@
             <vn-textfield
                 label="Name"
                 ng-model="$ctrl.zone.name"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                 rule>
             </vn-textfield>
         </vn-horizontal>
@@ -26,7 +26,7 @@
                 show-field="name"
                 value-field="id"
                 label="Agency"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                 rule>
             </vn-autocomplete>
             <vn-input-number
@@ -34,7 +34,7 @@
                 label="Max m³"
                 ng-model="$ctrl.zone.itemMaxSize"
                 min="0"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                 rule>
             </vn-input-number>
             <vn-input-number
@@ -42,7 +42,7 @@
                 label="Maximum m³"
                 ng-model="$ctrl.zone.m3Max"
                 min="0"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                 rule>
             </vn-input-number>
         </vn-horizontal>
@@ -52,13 +52,13 @@
                 ng-model="$ctrl.zone.travelingDays"
                 min="0"
                 step="1"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                 rule>
             </vn-input-number>
             <vn-input-time
                 label="Closing"
                 ng-model="$ctrl.zone.hour"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                 rule>
             </vn-input-time>
         </vn-horizontal>
@@ -68,14 +68,14 @@
                 ng-model="$ctrl.zone.price"
                 min="0"
                 step="0.01"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                 rule>
             </vn-input-number>
             <vn-input-number
                 label="Bonus"
                 ng-model="$ctrl.zone.bonus"
                 step="0.01"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                 rule>
             </vn-input-number>
         </vn-horizontal>
@@ -86,14 +86,14 @@
                 ng-model="$ctrl.zone.inflation"
                 min="0"
                 step="0.01"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                 rule>
             </vn-input-number>
             <vn-check
                 vn-one
                 label="Volumetric"
                 ng-model="$ctrl.zone.isVolumetric"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                 rule>
             </vn-check>
         </vn-horizontal>
@@ -101,7 +101,7 @@
     <vn-button-bar>
         <vn-submit
             disabled="!watcher.dataChanged()"
-            vn-acl="deliveryBoss"
+            vn-acl="deliveryAssistant"
             label="Save">
         </vn-submit>
         <vn-button

modules/zone/front/index/index.html

@@ -32,7 +32,7 @@
                             vn-click-stop="clone.show(zone)"
                             vn-tooltip="Clone"
                             icon="icon-clone"
-                            vn-acl="deliveryBoss"
+                            vn-acl="deliveryAssistant"
                             vn-acl-action="remove">
                         </vn-icon-button>
                         <vn-icon-button
@@ -62,7 +62,7 @@
     fixed-bottom-right>
     <vn-float-button
         icon="add"
-        vn-acl="deliveryBoss"
+        vn-acl="deliveryAssistant"
         vn-acl-action="remove">
     </vn-float-button>
 </a>

modules/zone/front/location/index.html

@@ -16,7 +16,7 @@
         root-label="Locations"
         fetch-func="$ctrl.onFetch($item)"
         sort-func="$ctrl.onSort($a, $b)">
-        <vn-check acl-role="deliveryBoss"
+        <vn-check acl-role="deliveryAssistant"
             ng-model="item.selected"
             on-change="$ctrl.onSelection(value, item)"
             triple-state="true"