Merge branch 'dev' into 5635-contadotTicketExpedition

db/changes/232401/00-printer.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`sector` DROP COLUMN `printerFk`;
+ALTER TABLE `vn`.`sector` ADD COLUMN `mainPrinterFk` tinyint(3) unsigned;
+ALTER TABLE `vn`.`sector` ADD CONSTRAINT sector_FK_1 FOREIGN KEY (mainPrinterFk) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/dump/fixtures.sql

@@ -179,6 +179,8 @@ INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAd
         (2, 'printer2', 'path2', 1, 1   , NULL),
         (4, 'printer4', 'path4', 0, NULL, '10.1.10.4');
 
+UPDATE `vn`.`sector` SET mainPrinterFk = 1 WHERE id = 1;
+
 INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossFk`, `phone`, `sectorFk`, `labelerFk`)
     VALUES
         (1106, 'LGN', 'David Charles', 'Haller', 1106, 19, 432978106, NULL, NULL),
@@ -2729,6 +2731,7 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
     VALUES
         (1, 'print-email', 'notification fixture one'),
         (2, 'invoice-electronic', 'A electronic invoice has been generated'),
+        (3, 'not-main-printer-configured', 'A printer distinct than main has been configured'),
         (4, 'supplier-pay-method-update', 'A supplier pay method has been updated');
 
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)

e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js

@@ -64,6 +64,6 @@ describe('SmartTable SearchBar integration', () => {
         await page.reload({
             waitUntil: 'networkidle2'
         });
-        await page.waitForTextInField(selectors.itemFixedPrice.firstItemID, '13');
+        await page.waitForTextInField(selectors.itemFixedPrice.firstItemID, '3');
     });
 });

e2e/paths/04-item/13_fixedPrice.spec.js

@@ -88,7 +88,8 @@ describe('Item fixed prices path', () => {
 
     it('should reload the section and check the created price has the expected ID', async() => {
         await page.goto(`http://localhost:5000/#!/item/fixed-price`);
-
+        await page.autocompleteSearch($.warehouseFilter, 'Warehouse one');
+        await page.click($.chip);
         const result = await page.waitToGetProperty($.fourthItemID, 'value');
 
         expect(result).toContain('13');

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -316,7 +316,7 @@ describe('Ticket Edit sale path', () => {
     it('should confirm the transfered quantity is the correct one', async() => {
         const result = await page.waitToGetProperty(selectors.ticketSales.secondSaleQuantityCell, 'innerText');
 
-        expect(result).toContain('10');
+        expect(result).toContain('20');
     });
 
     it('should go back to the original ticket sales section', async() => {

e2e/paths/05-ticket/21_future.spec.js

@@ -1,8 +1,7 @@
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
-// 'https:// redmine.verdnatura.es/issues/5642'
+describe('Ticket Future path', () => {
-xdescribe('Ticket Future path', () => {
     let browser;
     let page;
     let httpRequest;
@@ -22,7 +21,7 @@ xdescribe('Ticket Future path', () => {
         await browser.close();
     });
 
-    it('should show errors snackbar because of the required data', async() => {
+    it('should search with required data, check three last tickets and move to the future', async() => {
         await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
         await page.clearInput(selectors.ticketFuture.warehouseFk);
         await page.waitToClick(selectors.ticketFuture.submit);
@@ -43,69 +42,58 @@ xdescribe('Ticket Future path', () => {
         message = await page.waitForSnackbar();
 
         expect(message.text).toContain('originDated is a required argument');
+
+        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
+        await page.waitToClick(selectors.ticketFuture.submit);
+
+        expect(httpRequest).toBeDefined();
+
+        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
+
+        await page.autocompleteSearch(selectors.ticketFuture.ipt, 'H');
+        await page.waitToClick(selectors.ticketFuture.submit);
+
+        expect(httpRequest).toContain('ipt=H');
+
+        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
+
+        await page.clearInput(selectors.ticketFuture.ipt);
+
+        await page.autocompleteSearch(selectors.ticketFuture.futureIpt, 'H');
+        await page.waitToClick(selectors.ticketFuture.submit);
+
+        expect(httpRequest).toContain('futureIpt=H');
+
+        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
+
+        await page.clearInput(selectors.ticketFuture.futureIpt);
+
+        await page.autocompleteSearch(selectors.ticketFuture.state, 'Free');
+        await page.waitToClick(selectors.ticketFuture.submit);
+
+        expect(httpRequest).toContain('state=FREE');
+
+        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
+
+        await page.clearInput(selectors.ticketFuture.state);
+
+        await page.autocompleteSearch(selectors.ticketFuture.futureState, 'Free');
+        await page.waitToClick(selectors.ticketFuture.submit);
+
+        expect(httpRequest).toContain('futureState=FREE');
+
+        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
+        await page.clearInput(selectors.ticketFuture.state);
+        await page.clearInput(selectors.ticketFuture.futureState);
+        await page.waitToClick(selectors.ticketFuture.submit);
+
+        await page.waitForNumberOfElements(selectors.ticketFuture.searchResult, 4);
+        await page.waitToClick(selectors.ticketFuture.multiCheck);
+        await page.waitToClick(selectors.ticketFuture.firstCheck);
+        await page.waitToClick(selectors.ticketFuture.moveButton);
+        await page.waitToClick(selectors.globalItems.acceptButton);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Tickets moved successfully!');
     });
-
-    // it('should search with the required data', async() => {
-    //     await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-    //     await page.waitToClick(selectors.ticketFuture.submit);
-
-    //     expect(httpRequest).toBeDefined();
-    // });
-
-    // it('should search with the origin IPT', async() => {
-    //     await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-
-    //     await page.autocompleteSearch(selectors.ticketFuture.ipt, 'H');
-    //     await page.waitToClick(selectors.ticketFuture.submit);
-
-    //     expect(httpRequest).toContain('ipt=H');
-    // });
-
-    // it('should search with the destination IPT', async() => {
-    //     await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-
-    //     await page.clearInput(selectors.ticketFuture.ipt);
-
-    //     await page.autocompleteSearch(selectors.ticketFuture.futureIpt, 'H');
-    //     await page.waitToClick(selectors.ticketFuture.submit);
-
-    //     expect(httpRequest).toContain('futureIpt=H');
-    // });
-
-    // it('should search with the origin grouped state', async() => {
-    //     await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-
-    //     await page.clearInput(selectors.ticketFuture.futureIpt);
-
-    //     await page.autocompleteSearch(selectors.ticketFuture.state, 'Free');
-    //     await page.waitToClick(selectors.ticketFuture.submit);
-
-    //     expect(httpRequest).toContain('state=FREE');
-    // });
-
-    // it('should search with the destination grouped state', async() => {
-    //     await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-
-    //     await page.clearInput(selectors.ticketFuture.state);
-
-    //     await page.autocompleteSearch(selectors.ticketFuture.futureState, 'Free');
-    //     await page.waitToClick(selectors.ticketFuture.submit);
-
-    //     expect(httpRequest).toContain('futureState=FREE');
-
-    //     await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-    //     await page.clearInput(selectors.ticketFuture.futureState);
-    //     await page.waitToClick(selectors.ticketFuture.submit);
-    // });
-
-    // it('should check the three last tickets and move to the future', async() => {
-    //     await page.waitForNumberOfElements(selectors.ticketFuture.searchResult, 4);
-    //     await page.waitToClick(selectors.ticketFuture.multiCheck);
-    //     await page.waitToClick(selectors.ticketFuture.firstCheck);
-    //     await page.waitToClick(selectors.ticketFuture.moveButton);
-    //     await page.waitToClick(selectors.globalItems.acceptButton);
-    //     const message = await page.waitForSnackbar();
-
-    //     expect(message.text).toContain('Tickets moved successfully!');
-    // });
 });

e2e/paths/05-ticket/22_advance.spec.js

@@ -1,8 +1,7 @@
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
-// 'https:// redmine.verdnatura.es/issues/5642'
+describe('Ticket Advance path', () => {
-xdescribe('Ticket Advance path', () => {
     let browser;
     let page;
     let httpRequest;
@@ -22,7 +21,7 @@ xdescribe('Ticket Advance path', () => {
         await browser.close();
     });
 
-    it('should show errors snackbar because of the required data', async() => {
+    it('should search with the required data, check the first ticket and move to the present', async() => {
         await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
         await page.clearInput(selectors.ticketAdvance.warehouseFk);
 
@@ -44,45 +43,37 @@ xdescribe('Ticket Advance path', () => {
         message = await page.waitForSnackbar();
 
         expect(message.text).toContain('dateFuture is a required argument');
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+
+        expect(httpRequest).toBeDefined();
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.autocompleteSearch(selectors.ticketAdvance.futureIpt, 'H');
+        await page.waitToClick(selectors.ticketAdvance.submit);
+
+        expect(httpRequest).toContain('futureIpt=H');
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.clearInput(selectors.ticketAdvance.futureIpt);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.autocompleteSearch(selectors.ticketAdvance.ipt, 'H');
+        await page.waitToClick(selectors.ticketAdvance.submit);
+
+        expect(httpRequest).toContain('ipt=H');
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.clearInput(selectors.ticketAdvance.ipt);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+
+        await page.waitToClick(selectors.ticketAdvance.firstCheck);
+        await page.waitToClick(selectors.ticketAdvance.moveButton);
+        await page.waitToClick(selectors.ticketAdvance.acceptButton);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Tickets moved successfully!');
     });
-
-    // it('should search with the required data', async() => {
-    //     await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-    //     await page.waitToClick(selectors.ticketAdvance.submit);
-
-    //     expect(httpRequest).toBeDefined();
-    // });
-
-    // it('should search with the origin IPT', async() => {
-    //     await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-    //     await page.autocompleteSearch(selectors.ticketAdvance.futureIpt, 'H');
-    //     await page.waitToClick(selectors.ticketAdvance.submit);
-
-    //     expect(httpRequest).toContain('futureIpt=H');
-
-    //     await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-    //     await page.clearInput(selectors.ticketAdvance.futureIpt);
-    //     await page.waitToClick(selectors.ticketAdvance.submit);
-    // });
-
-    // it('should search with the destination IPT', async() => {
-    //     await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-    //     await page.autocompleteSearch(selectors.ticketAdvance.ipt, 'H');
-    //     await page.waitToClick(selectors.ticketAdvance.submit);
-
-    //     expect(httpRequest).toContain('ipt=H');
-
-    //     await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-    //     await page.clearInput(selectors.ticketAdvance.ipt);
-    //     await page.waitToClick(selectors.ticketAdvance.submit);
-    // });
-
-    // it('should check the first ticket and move to the present', async() => {
-    //     await page.waitToClick(selectors.ticketAdvance.firstCheck);
-    //     await page.waitToClick(selectors.ticketAdvance.moveButton);
-    //     await page.waitToClick(selectors.ticketAdvance.acceptButton);
-    //     const message = await page.waitForSnackbar();
-
-    //     expect(message.text).toContain('Tickets moved successfully!');
-    // });
 });

front/salix/components/user-popover/index.js

@@ -20,8 +20,6 @@ class Controller {
                 name: config.languages[code] ? config.languages[code] : code
             });
         }
-
-        vnConfig.initialize();
     }
 
     set lang(value) {

front/salix/routes.js

@@ -10,6 +10,9 @@ function config($stateProvider, $urlRouterProvider) {
         .state('layout', {
             abstract: true,
             template: '<vn-layout></vn-layout>',
+            resolve: {
+                config: ['vnConfig', vnConfig => vnConfig.initialize()]
+            }
         })
         .state('outLayout', {
             abstract: true,

modules/entry/back/methods/entry/addFromBuy.js

@@ -48,7 +48,7 @@ module.exports = Self => {
         try {
             let buy = await models.Buy.findOne({where: {entryFk: args.id}}, myOptions);
             if (buy)
-                await buy.updateAttribute('printedStickers', args.printedStickers);
+                await buy.updateAttribute('printedStickers', args.printedStickers, myOptions);
             else {
                 const userConfig = await models.UserConfig.findById(userId, {fields: ['warehouseFk']}, myOptions);
                 await Self.rawSql(

modules/shelving/back/models/sector.json

@@ -56,7 +56,7 @@
             "type": "number",
             "required": false
         },
-        "printerFk": {
+        "mainPrinterFk": {
             "type": "number",
             "required": false
         },
@@ -69,4 +69,4 @@
             "required": true
         }
     }
-}
+}

modules/worker/back/methods/operator/spec/operator.spec.js

@@ -0,0 +1,62 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('Operator', () => {
+    const authorFk = 9;
+    const sectorId = 1;
+    const mainPrinter = 1;
+    const notificationName = 'not-main-printer-configured';
+    const operator = {
+        workerFk: 1,
+        trainFk: 1,
+        itemPackingTypeFk: 'H',
+        warehouseFk: 1,
+        sectorFk: sectorId
+    };
+
+    async function createOperator(labelerFk, options) {
+        operator.labelerFk = labelerFk;
+        await models.Operator.create(operator, options);
+        return models.NotificationQueue.findOne({
+            where: {
+                notificationFk: notificationName
+            }
+        }, options);
+    }
+
+    it('should create notification when configured a not main printer in the sector', async() => {
+        const tx = await models.Operator.beginTransaction({});
+
+        try {
+            const options = {transaction: tx, accessToken: {userId: authorFk}};
+            const notificationQueue = await createOperator(2, options);
+            const params = JSON.parse(notificationQueue.params);
+
+            expect(notificationQueue.notificationFk).toEqual(notificationName);
+            expect(notificationQueue.authorFk).toEqual(authorFk);
+            expect(params.labelerId).toEqual(2);
+            expect(params.sectorId).toEqual(1);
+            expect(params.workerId).toEqual(9);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should not create notification when configured the main printer in the sector', async() => {
+        const tx = await models.Operator.beginTransaction({});
+
+        try {
+            const options = {transaction: tx, accessToken: {userId: authorFk}};
+            const notificationQueue = await createOperator(mainPrinter, options);
+
+            expect(notificationQueue).toEqual(null);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

modules/worker/back/models/operator.js

@@ -0,0 +1,28 @@
+module.exports = function(Self) {
+    Self.observe('after save', async function(ctx) {
+        const instance = ctx.instance;
+        const models = Self.app.models;
+        const options = ctx.options;
+
+        if (!instance.sectorFk || !instance.labelerFk) return;
+
+        const sector = await models.Sector.findById(instance.sectorFk, {
+            fields: ['mainPrinterFk']
+        }, options);
+
+        if (sector.mainPrinterFk && sector.mainPrinterFk != instance.labelerFk) {
+            const userId = ctx.options.accessToken.userId;
+            await models.NotificationQueue.create({
+                notificationFk: 'not-main-printer-configured',
+                authorFk: userId,
+                params: JSON.stringify(
+                    {
+                        'labelerId': instance.labelerFk,
+                        'sectorId': instance.sectorFk,
+                        'workerId': userId
+                    }
+                )
+            }, options);
+        }
+    });
+};

modules/worker/back/models/operator.json

@@ -27,10 +27,10 @@
 			"type": "number",
 			"required": true
 		},
-		"sectorFk ": {
+		"sectorFk": {
 			"type": "number"
 		},
-		"labelerFk ": {
+		"labelerFk": {
 			"type": "number"
 		}
     },
@@ -41,4 +41,4 @@
             "foreignKey": "sectorFk"
         }
     }
-}
+}

print/templates/email/not-main-printer-configured/assets/css/import.js

@@ -0,0 +1,11 @@
+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`])
+    .mergeStyles();

print/templates/email/not-main-printer-configured/locale/en.yml

@@ -0,0 +1,3 @@
+subject: Not main printer configured
+title: Not main printer configured
+description: 'Printer #{0} {1} has been configured in sector #{2} {3} (the main printer for that sector is #{4} {5}). Ask the worker {6}.'

print/templates/email/not-main-printer-configured/locale/es.yml

@@ -0,0 +1,3 @@
+subject: Configurada impresora no principal
+title: Configurada impresora no principal
+description: 'Se ha configurado la impresora #{0} {1} en el sector #{2} {3} (la impresora principal de ese sector es la #{4} {5}). Preguntar al trabajador {6}.'

print/templates/email/not-main-printer-configured/not-main-printer-configured.html

@@ -0,0 +1,8 @@
+<email-body v-bind="$props">
+    <div class="grid-row">
+        <div class="grid-block vn-pa-ml">
+            <h1>{{ $t('title') }}</h1>
+            <p v-html="$t('description', [labeler.id, labeler.name, sector.id, sector.description, mainPrinter.id, mainPrinter.name, worker.nickname])"></p>
+        </div>
+    </div>
+</email-body>

print/templates/email/not-main-printer-configured/not-main-printer-configured.js

@@ -0,0 +1,33 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+
+module.exports = {
+    name: 'not-main-printer-configured',
+    async serverPrefetch() {
+        this.sector = await this.findOneFromDef('sector', [this.sectorId]);
+
+        if (!this.sector)
+            throw new Error('Something went wrong');
+
+        this.labeler = await this.findOneFromDef('printer', [this.labelerId]);
+        this.mainPrinter = await this.findOneFromDef('printer', [this.sector.mainPrinterFk]);
+        this.worker = await this.findOneFromDef('worker', [this.workerId]);
+    },
+    components: {
+        'email-body': emailBody.build(),
+    },
+    props: {
+        labelerId: {
+            type: Number,
+            required: true
+        },
+        sectorId: {
+            type: Number,
+            required: true
+        },
+        workerId: {
+            type: Number,
+            required: true
+        }
+    }
+};

print/templates/email/not-main-printer-configured/sql/printer.sql

@@ -0,0 +1,3 @@
+SELECT id, name
+	FROM vn.printer
+	WHERE id = ?

print/templates/email/not-main-printer-configured/sql/sector.sql

@@ -0,0 +1,3 @@
+SELECT id, description, mainPrinterFk
+	FROM vn.sector
+	WHERE id = ?

print/templates/email/not-main-printer-configured/sql/worker.sql

@@ -0,0 +1,3 @@
+SELECT nickname
+ 	FROM account.user
+ 	WHERE id = ?