Merge branch 'dev' into 6358-boxPicking_YellowZebra

db/dump/fixtures.before.sql

@@ -2802,7 +2802,7 @@ INSERT INTO `vn`.`packingSiteConfig` (`id`, `shinobiUrl`, `shinobiToken`, `shino
 INSERT INTO `util`.`notificationConfig`
 	SET `id` = 1,
         `cleanDays` = 90;
-
+TRUNCATE `util`.`notification`;
 INSERT INTO `util`.`notification` (`id`, `name`, `description`)
     VALUES
         (1, 'print-email', 'notification fixture one'),
@@ -2813,6 +2813,7 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
         (6, 'book-entry-deleted', 'accounting entries deleted'),
         (7, 'zone-included','An email to notify zoneCollisions');
 
+TRUNCATE `util`.`notificationAcl`;
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
     VALUES
         (1, 9),
@@ -2824,11 +2825,13 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
         (6, 9),
         (7, 9);
 
+TRUNCATE `util`.`notificationQueue`;
 INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)
     VALUES
         (1, 'print-email', '{"id": "1"}', 9, 'pending', util.VN_CURDATE()),
         (2, 'print-email', '{"id": "2"}', null, 'pending', util.VN_CURDATE()),
         (3, 'print-email', null, null, 'pending', util.VN_CURDATE());
+TRUNCATE `util`.`notificationSubscription`;
 
 INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
     VALUES

db/routines/vn/procedures/collection_new.sql

@@ -28,6 +28,7 @@ proc:BEGIN
 	DECLARE vLockName VARCHAR(215);
 	DECLARE vLockTime INT DEFAULT 15;
 	DECLARE vFreeWagonFk INT;
+
 	DECLARE c1 CURSOR FOR
 		SELECT ticketFk, `lines`, m3
 			FROM tmp.productionBuffer
@@ -44,13 +45,21 @@ proc:BEGIN
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		IF vLockName IS NOT NULL THEN
+			DO RELEASE_LOCK(vLockName);
+		END IF;
+
+		RESIGNAL;
+	END;
+
 	SELECT pc.ticketTrolleyMax * o.numberOfWagons,
 			pc.hasUniqueCollectionTime,
 			w.code,
 			o.warehouseFk,
 			o.itemPackingTypeFk,
 			st.code,
-			CONCAT('collection_new', o.warehouseFk, ':',o.itemPackingTypeFk),
 			o.numberOfWagons,
 			o.trainFk,
 			o.linesLimit,
@@ -61,7 +70,6 @@ proc:BEGIN
 				vWarehouseFk,
 				vItemPackingTypeFk,
 				vStateFk,
-				vLockName,
 				vWagons,
 				vTrainFk,
 				vLinesLimit,
@@ -71,6 +79,12 @@ proc:BEGIN
 			JOIN state st ON st.`code` = 'ON_PREPARATION'
 			JOIN operator o ON o.workerFk = vUserFk;
 
+	SET vLockName = CONCAT_WS('/',
+		'collection_new',
+		vWarehouseFk,
+		vItemPackingTypeFk
+	);
+
 	IF NOT GET_LOCK(vLockName, vLockTime) THEN
 		LEAVE proc;
 	END IF;
@@ -250,13 +264,13 @@ proc:BEGIN
 					UPDATE tTrain
 						SET ticketFk = vFirstTicketFk
 						WHERE wagon = vFreeWagonFk;
-	
+
 					-- Se anulan el resto de carros libres para que sólo uno lleve un pedido excesivo
 					DELETE tt.*
 						FROM tTrain tt
 							LEFT JOIN (
-								SELECT DISTINCT wagon 
+								SELECT DISTINCT wagon
-									FROM tTrain 
+									FROM tTrain
 									WHERE ticketFk IS NOT NULL
 							) nn ON nn.wagon = tt.wagon
 						WHERE nn.wagon IS NULL;
@@ -271,7 +285,7 @@ proc:BEGIN
 			FETCH c1 INTO vTicketFk, vTicketLines, vTicketVolume;
 			IF vDone THEN
 				LEAVE read_loop;
-			END IF;		
+			END IF;
 		END IF;
 	END LOOP;
 	CLOSE c1;

db/routines/vn/procedures/productionError_add.sql

@@ -34,16 +34,22 @@ BEGIN
 	-- Rellena la tabla tmp.errorsByChecker con fallos de revisores
 	CREATE OR REPLACE TEMPORARY TABLE tmp.errorsByChecker
 		ENGINE = MEMORY
-			SELECT 	st.workerFk,
+		WITH rankedWorkers AS (
-				COUNT(t.id) errors
+			SELECT sm.id,
-			FROM saleMistake sm
+					st.workerFk,
-				JOIN saleTracking st ON sm.saleFk = st.saleFk
+					ROW_NUMBER() OVER(PARTITION BY sm.id ORDER BY s2.`order`) rnk
-				JOIN `state` s2 ON s2.id = st.stateFk
+				FROM vn.saleMistake sm
-				JOIN sale s ON s.id = sm.saleFk
+					JOIN vn.saleTracking st ON sm.saleFk = st.saleFk
-				JOIN ticket t on t.id = s.ticketFk
+					JOIN vn.`state` s2 ON s2.id = st.stateFk
-			WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo)
+					JOIN vn.sale s ON s.id = sm.saleFk
-				AND s2.code IN ('OK','PREVIOUS_PREPARATION','PREPARED','CHECKED')
+					JOIN vn.ticket t ON t.id = s.ticketFk
-			GROUP BY st.workerFk;
+				WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
+					AND s2.code IN ('OK', 'PREVIOUS_PREPARATION', 'PREPARED', 'CHECKED')
+		)
+		SELECT workerFk, COUNT(*) errors
+			FROM rankedWorkers
+			WHERE rnk = 1
+			GROUP BY workerFk;
 
  	-- Rellena la tabla tmp.expeditionErrors con fallos de expediciones
 	CREATE OR REPLACE TEMPORARY TABLE tmp.expeditionErrors

front/core/services/file.js

@@ -14,7 +14,7 @@ class File {
      */
     getPath(dmsUrl) {
         const serializedParams = this.$httpParamSerializer({
-            access_token: this.vnToken.token
+            access_token: this.vnToken.tokenMultimedia
         });
 
         return `${dmsUrl}?${serializedParams}`;

front/core/services/report.js

@@ -15,7 +15,7 @@ class Report {
      */
     show(path, params) {
         params = Object.assign({
-            access_token: this.vnToken.token
+            access_token: this.vnToken.tokenMultimedia
         }, params);
         const serializedParams = this.$httpParamSerializer(params);
         const query = serializedParams ? `?${serializedParams}` : '';

modules/claim/back/methods/claim/claimPickupPdf.js

@@ -34,7 +34,8 @@ module.exports = Self => {
         http: {
             path: '/:id/claim-pickup-pdf',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.claimPickupPdf = (ctx, id) => Self.printReport(ctx, id, 'claim-pickup-order');

modules/client/back/methods/client/campaignMetricsPdf.js

@@ -45,7 +45,8 @@ module.exports = Self => {
         http: {
             path: '/:id/campaign-metrics-pdf',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'campaign-metrics');

modules/entry/back/methods/entry/entryOrderPdf.js

@@ -33,7 +33,8 @@ module.exports = Self => {
         http: {
             path: '/:id/entry-order-pdf',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.entryOrderPdf = (ctx, id) => Self.printReport(ctx, id, 'entry-order');

modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js

@@ -34,7 +34,8 @@ module.exports = Self => {
         http: {
             path: '/:reference/exportation-pdf',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.exportationPdf = (ctx, reference) => Self.printReport(ctx, reference, 'exportation');

modules/invoiceOut/back/methods/invoiceOut/invoiceCsv.js

@@ -37,23 +37,24 @@ module.exports = Self => {
         http: {
             path: '/:reference/invoice-csv',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.invoiceCsv = async reference => {
         const sales = await Self.rawSql(`
             SELECT io.ref Invoice,
                     io.issued InvoiceDate,
-                    s.ticketFk Ticket, 
+                    s.ticketFk Ticket,
-                    s.itemFk Item, 
+                    s.itemFk Item,
-                    s.concept  Description, 
+                    s.concept  Description,
-                    i.size, 
+                    i.size,
                     i.subName Producer,
-                    s.quantity Quantity, 
+                    s.quantity Quantity,
-                    s.price Price, 
+                    s.price Price,
-                    s.discount Discount, 
+                    s.discount Discount,
-                    s.created Created, 
+                    s.created Created,
-                    tc.code Taxcode, 
+                    tc.code Taxcode,
                     tc.description TaxDescription,
                     i.tag5,
                     i.value5,
@@ -67,14 +68,14 @@ module.exports = Self => {
                     i.value9,
                     i.tag10,
                     i.value10
-                FROM sale s 
+                FROM sale s
-                    JOIN ticket t ON t.id = s.ticketFk 
+                    JOIN ticket t ON t.id = s.ticketFk
-                    JOIN item i ON i.id = s.itemFk 
+                    JOIN item i ON i.id = s.itemFk
-                    JOIN supplier s2 ON s2.id = t.companyFk 
+                    JOIN supplier s2 ON s2.id = t.companyFk
-                    JOIN itemTaxCountry itc ON itc.itemFk = i.id 
+                    JOIN itemTaxCountry itc ON itc.itemFk = i.id
-                        AND itc.countryFk = s2.countryFk 
+                        AND itc.countryFk = s2.countryFk
-                    JOIN taxClass tc ON tc.id = itc.taxClassFk     
+                    JOIN taxClass tc ON tc.id = itc.taxClassFk
-                    JOIN invoiceOut io ON io.ref = t.refFk 
+                    JOIN invoiceOut io ON io.ref = t.refFk
                 WHERE t.refFk = ?
                 ORDER BY s.ticketFk, s.created`, [reference]);
 

modules/invoiceOut/back/methods/invoiceOut/negativeBasesCsv.js

@@ -39,7 +39,8 @@ module.exports = Self => {
         http: {
             path: '/negativeBasesCsv',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.negativeBasesCsv = async(ctx, options) => {

modules/supplier/back/methods/supplier/campaignMetricsPdf.js

@@ -44,7 +44,8 @@ module.exports = Self => {
         http: {
             path: '/:id/campaign-metrics-pdf',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'supplier-campaign-metrics');

modules/ticket/back/methods/ticket/deliveryNoteCsv.js

@@ -37,23 +37,24 @@ module.exports = Self => {
         http: {
             path: '/:id/delivery-note-csv',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.deliveryNoteCsv = async id => {
         const sales = await Self.rawSql(`
             SELECT  io.ref Invoice,
                     io.issued InvoiceDate,
-                    s.ticketFk Ticket, 
+                    s.ticketFk Ticket,
-                    s.itemFk Item, 
+                    s.itemFk Item,
-                    s.concept  Description, 
+                    s.concept  Description,
-                    i.size, 
+                    i.size,
                     i.subName Producer,
-                    s.quantity Quantity, 
+                    s.quantity Quantity,
-                    s.price Price, 
+                    s.price Price,
-                    s.discount Discount, 
+                    s.discount Discount,
-                    s.created Created, 
+                    s.created Created,
-                    tc.code Taxcode, 
+                    tc.code Taxcode,
                     tc.description TaxDescription,
                     i.tag5,
                     i.value5,
@@ -67,14 +68,14 @@ module.exports = Self => {
                     i.value9,
                     i.tag10,
                     i.value10
-                FROM vn.sale s 
+                FROM vn.sale s
-                    JOIN vn.ticket t ON t.id = s.ticketFk 
+                    JOIN vn.ticket t ON t.id = s.ticketFk
-                    JOIN vn.item i ON i.id = s.itemFk 
+                    JOIN vn.item i ON i.id = s.itemFk
-                    JOIN vn.supplier s2 ON s2.id = t.companyFk 
+                    JOIN vn.supplier s2 ON s2.id = t.companyFk
-                    JOIN vn.itemTaxCountry itc ON itc.itemFk = i.id 
+                    JOIN vn.itemTaxCountry itc ON itc.itemFk = i.id
-                        AND itc.countryFk = s2.countryFk 
+                        AND itc.countryFk = s2.countryFk
-                    JOIN vn.taxClass tc ON tc.id = itc.taxClassFk     
+                    JOIN vn.taxClass tc ON tc.id = itc.taxClassFk
-                    LEFT JOIN vn.invoiceOut io ON io.id = t.refFk 
+                    LEFT JOIN vn.invoiceOut io ON io.id = t.refFk
                 WHERE s.ticketFk = ?
                 ORDER BY s.ticketFk, s.created`, [id]);
         const content = toCSV(sales);

modules/ticket/back/methods/ticket/deliveryNotePdf.js

@@ -41,7 +41,8 @@ module.exports = Self => {
         http: {
             path: '/:id/delivery-note-pdf',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.deliveryNotePdf = (ctx, id) => Self.printReport(ctx, id, 'delivery-note');

modules/travel/back/methods/travel/extraCommunityPdf.js

@@ -78,7 +78,8 @@ module.exports = Self => {
         http: {
             path: '/extra-community-pdf',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.extraCommunityPdf = ctx => Self.printReport(ctx, null, 'extra-community');

modules/travel/front/extra-community/index.js

@@ -144,7 +144,7 @@ class Controller extends Section {
         const currentFilter = this.$.model.currentFilter;
 
         return Object.assign({
-            authorization: this.vnToken.token,
+            authorization: this.vnToken.tokenMultimedia,
             filter: currentFilter
         }, userParams);
     }