Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

back/methods/dms/downloadFile.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: `/:id/downloadFile`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

back/methods/docuware/download.js

@@ -43,7 +43,7 @@ module.exports = Self => {
             path: `/:id/download`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.download = async function(id, fileCabinet, filter) {

back/methods/image/download.js

@@ -48,7 +48,7 @@ module.exports = Self => {
             path: `/:collection/:size/:id/download`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.download = async function(ctx, collection, size, id) {

db/routines/vn/events/clientsDisable.sql

@@ -7,9 +7,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`clientsDisable`
 DO BEGIN
 	UPDATE account.user u
 			JOIN client c ON c.id = u.id
-			JOIN clientType ct ON ct.id = c.typeFk
 		SET u.active = FALSE
-		WHERE ct.code = 'normal'
+		WHERE c.typeFk = 'normal'
 			AND u.id NOT IN (
 				SELECT DISTINCT c.id
 					FROM client c

db/routines/vn/procedures/collection_assign.sql

@@ -1,8 +1,8 @@
-DELIMITER $$
+DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_assign`(
 	vUserFk INT,
 	OUT vCollectionFk INT
-)
+)
 proc:BEGIN   
 /**
  * Comprueba si existen colecciones libres que se ajustan
@@ -15,6 +15,13 @@ proc:BEGIN
 	DECLARE vHasTooMuchCollections BOOL;
 	DECLARE vLockTime INT DEFAULT 15;
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		DO RELEASE_LOCK('collection_assign');
+		
+		RESIGNAL;
+	END;
+
 	-- Si hay colecciones sin terminar, sale del proceso
 	CALL collection_get(vUserFk);
 
@@ -84,5 +91,5 @@ proc:BEGIN
 		WHERE id = vCollectionFk;
 
 	DO RELEASE_LOCK('collection_assign');
-END$$
+END$$
-DELIMITER ;
+DELIMITER ;

db/routines/vn/procedures/collection_new.sql

@@ -219,9 +219,11 @@ proc:BEGIN
 			UPDATE tmp.productionBuffer pb
 					JOIN (
 						SELECT SUM(litros) liters,
-								@lines:= COUNT(*) + @lines `lines`,
+								@lines:= COUNT(*) + @lines,
+								COUNT(*) `lines`,
 								MAX(i.`size`) height,
-								@volume := SUM(sv.volume) + @volume volume
+								@volume := SUM(sv.volume) + @volume,
+								SUM(sv.volume) volume
 							FROM saleVolume sv
 								JOIN sale s ON s.id = sv.saleFk
 								JOIN item i ON i.id = s.itemFk

db/routines/vn/procedures/duaInvoiceInBooking.sql

@@ -33,6 +33,7 @@ BEGIN
 			ii.operated = IFNULL(ii.operated,d.operated),
 			ii.issued = IFNULL(ii.issued,d.issued),
 			ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried),
+			e.isBooked = TRUE,
 			e.isConfirmed = TRUE
 		WHERE d.id = vDuaFk;
 

db/versions/10975-whiteIvy/00-action.sql

@@ -0,0 +1 @@
+CREATE INDEX expeditionLog_action_IDX USING BTREE ON srt.expeditionLog (`action`);

db/versions/10975-whiteIvy/01-expeditionFk.sql

@@ -0,0 +1 @@
+CREATE INDEX expeditionLog_expeditionFk_IDX USING BTREE ON srt.expeditionLog (expeditionFk);

front/core/services/token.js

@@ -59,7 +59,8 @@ export default class Token {
 
     getStorage(storage) {
         this.token = storage.getItem('vnToken');
-        this.tokenMultimedia = storage.getItem('vnTokenMultimedia');
+        // Cambio realizado temporalmente
+        this.tokenMultimedia = this.token; // storage.getItem('vnTokenMultimedia');
         if (!this.token) return;
         const created = storage.getItem('vnTokenCreated');
         this.created = created && new Date(created);

loopback/server/datasources.json

@@ -117,6 +117,21 @@
             "video/mp4"
         ]
     },
+    "supplierStorage": {		
+        "name": "supplierStorage",		
+        "connector": "loopback-component-storage",		
+        "provider": "filesystem",		
+        "root": "./storage/dms",		
+        "maxFileSize": "31457280",		
+        "allowedContentTypes": [		
+            "image/png",		
+            "image/jpeg",		
+            "image/jpg",		
+            "image/webp",		
+            "video/mp4",		
+            "application/pdf"		
+        ]
+    },
     "accessStorage": {
         "name": "accessStorage",
         "connector": "loopback-component-storage",

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

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

modules/claim/back/methods/claim/downloadFile.js

@@ -33,7 +33,7 @@ module.exports = Self => {
             path: `/:id/downloadFile`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

modules/claim/back/methods/claim/updateClaim.js

@@ -96,9 +96,9 @@ module.exports = Self => {
             // When claimState has been changed
             if (args.claimStateFk) {
                 const newState = await models.ClaimState.findById(args.claimStateFk, null, myOptions);
-                await notifyStateChange(ctx, salesPerson.id, claim, newState.code);
+                await notifyStateChange(ctx, salesPerson.id, claim, newState.description);
                 if (newState.code == 'canceled')
-                    await notifyStateChange(ctx, claim.workerFk, claim, newState.code);
+                    await notifyStateChange(ctx, claim.workerFk, claim, newState.description);
             }
 
             if (tx) await tx.commit();

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

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

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

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

modules/invoiceOut/back/methods/invoiceOut/download.js

@@ -32,7 +32,7 @@ module.exports = Self => {
             path: '/:id/download',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.download = async function(ctx, id, options) {

modules/invoiceOut/back/methods/invoiceOut/downloadZip.js

@@ -32,7 +32,7 @@ module.exports = Self => {
             path: '/downloadZip',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.downloadZip = async function(ctx, ids, options) {

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

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

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

@@ -38,7 +38,7 @@ module.exports = Self => {
             path: '/:reference/invoice-csv',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.invoiceCsv = async reference => {

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

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

modules/item/back/methods/item-image-queue/download.js

@@ -11,7 +11,7 @@ module.exports = Self => {
             path: `/download`,
             verb: 'POST',
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.download = async() => {

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

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: '/downloadCmrsZip',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.downloadCmrsZip = async function(ctx, ids, options) {

modules/route/back/methods/route/downloadZip.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: '/downloadZip',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.downloadZip = async function(ctx, id, options) {

modules/route/back/methods/route/driverRoutePdf.js

@@ -35,7 +35,7 @@ module.exports = Self => {
             path: '/:id/driver-route-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
 
     });
 

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

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

modules/supplier/back/model-config.json

@@ -8,6 +8,9 @@
     "SupplierDms": {
         "dataSource": "vn"
     },
+    "SupplierContainer": {		
+        "dataSource": "supplierStorage"		
+    },
     "SupplierAddress": {
         "dataSource": "vn"
     },

modules/ticket/back/methods/ticket-collection/hasUncheckedTicket.js

@@ -35,6 +35,6 @@ module.exports = Self => {
                 WHERE tc.ticketFk = ? AND s.order < s2.id
                 LIMIT 1;`,
         [ticketFk], myOptions);
-        return result.length > 0 && result[0]['ticketFk'] > 0;
+        return result[0]?.ticketFk > 0 && result[0].ticketFk;
     };
 };

modules/ticket/back/methods/ticket-collection/spec/hasUncheckedTicket.spec.js

@@ -27,7 +27,7 @@ describe('ticketCollection hasUncheckedTicket()', () => {
             }, myOptions);
             const result = await models.TicketCollection.hasUncheckedTicket(ticketFk, myOptions);
 
-            expect(result).toBe(true);
+            expect(result).toBeTruthy();
             await tx.rollback();
         } catch (e) {
             await tx.rollback();

modules/ticket/back/methods/ticket/closure.js

@@ -147,6 +147,10 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                 );
             }
         } catch (error) {
+            await Self.rawSql(`
+                INSERT INTO util.debug (variable, value)
+                    VALUES ('invoicingTicketError', ?)
+            `, [ticket.id + ' - ' + error]);
             // Domain not found
             if (error.responseCode == 450) return invalidEmail(ticket);
 

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

@@ -38,7 +38,7 @@ module.exports = Self => {
             path: '/:id/delivery-note-csv',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.deliveryNoteCsv = async id => {

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

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

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

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

modules/worker/back/methods/worker-dms/downloadFile.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: `/:id/downloadFile`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

print/templates/email/zone-included/zone-included.html

@@ -18,7 +18,7 @@
                 </tr>
             </thead>
             <tbody>
-                <tr v-for="zone in zoneCollisions">
+                <tr v-for="zone in zones" v-bind:key="zone.zoneFk">
                     <td>{{ zone.zn.name }}</td>
                     <td>{{ zone.zoneFk }}</td>
                     <td>{{ zone.z.price }}</td>

print/templates/email/zone-included/zone-included.js

@@ -8,5 +8,10 @@ module.exports = {
     },
     props: {
         zoneCollisions: {type: Array, required: true}
+    },
+    computed: {
+        zones() {
+            return JSON.parse(this.zoneCollisions);
+        }
     }
 };

print/templates/reports/driver-route/assets/css/style.css

@@ -1,3 +1,9 @@
+td{
+    overflow: hidden;
+    max-width: 100px;
+    text-overflow: ellipsis;
+}
+
 h1 {
     text-align: center;
 }

print/templates/reports/driver-route/sql/routes.sql

@@ -1,19 +1,18 @@
-SELECT
+SELECT r.id,
-    r.id,
+        r.m3,
-    r.m3,
+        r.created,
-    r.created,
+        r.time,
-    r.time,
+        u.nickName userNickName,
-    u.nickName userNickName,
+        v.tradeMark vehicleTradeMark,
-    v.tradeMark vehicleTradeMark,
+        v.model vehicleModel,
-    v.model vehicleModel,
+        v.numberPlate plateNumber,
-    v.numberPlate plateNumber,
+        IFNULL(s.name, am.name) agencyName
-    IFNULL(s.name, am.name) AS agencyName
+    FROM route r
-FROM route r
+        LEFT JOIN vehicle v ON v.id = r.vehicleFk
-    LEFT JOIN vehicle v ON v.id = r.vehicleFk
+        LEFT JOIN worker w ON w.id = r.workerFk
-    LEFT JOIN worker w ON w.id = r.workerFk
+        LEFT JOIN account.user u ON u.id = w.id
-    LEFT JOIN account.user u ON u.id = w.id
+        LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
-    LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
+        LEFT JOIN agency a ON a.id = am.agencyFk
-    LEFT JOIN agency a ON a.id = am.agencyFk
+        LEFT JOIN supplierAgencyTerm sa ON sa.agencyFk = a.id
-    LEFT JOIN supplierAgencyTerm sa ON sa.agencyFk = a.id
+        LEFT JOIN supplier s ON s.id = sa.supplierFk
-    LEFT JOIN supplier s ON s.id = sa.supplierFk
+    WHERE r.id IN(?)
-WHERE r.id IN(?)

print/templates/reports/driver-route/sql/tickets.sql

@@ -1,43 +1,42 @@
-SELECT
+SELECT t.nickname addressName,
-    t.nickname addressName,
+        t.packages,
-    t.packages,
+        t.priority,
-    t.priority,
+        t.id,
-    t.id,
+        t.clientFk,
-    t.clientFk,
+        t.companyFk,
-    t.companyFk,
+        t.routeFk,
-    t.routeFk,
+        if(a.phone, a.phone, c.phone) phone,
-    if(a.phone, a.phone, c.phone) AS phone,
+        if(a.mobile, a.mobile, c.mobile) mobile,
-    if(a.mobile, a.mobile, c.mobile) AS mobile,
+        wh.name warehouseName,
-    wh.name warehouseName,
+        a.city,
-    a.city,
+        a.street,
-    a.street,
+        a.postalCode,
-    a.postalCode,
+        LPAD(a.id, 5, '0') addressFk,
-    LPAD(a.id, 5, '0') AS addressFk,
+        p.name province,
-    p.name province,
+        0 import,
-    0 AS import,
+        am.name ticketAgency,
-    am.name ticketAgency,
+        tob.description,
-    tob.description,
+        u.nickName salesPersonName,
-    u.nickName salesPersonName,
+        ipkg.itemPackingTypes
-    ipkg.itemPackingTypes
+    FROM route r
-FROM route r
+        JOIN ticket t ON t.routeFk = r.id
-    JOIN ticket t ON t.routeFk = r.id
+        LEFT JOIN address a ON a.id = t.addressFk
-    LEFT JOIN address a ON a.id = t.addressFk
+        LEFT JOIN client c ON c.id = t.clientFk
-    LEFT JOIN client c ON c.id = t.clientFk
+        LEFT JOIN worker w ON w.id = client_getSalesPerson(t.clientFk, CURDATE())
-    LEFT JOIN worker w ON w.id = client_getSalesPerson(t.clientFk, CURDATE())
+        LEFT JOIN account.user u ON u.id = w.id
-    LEFT JOIN account.user u ON u.id = w.id
+        LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 3
-    LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 3
+        LEFT JOIN province p ON a.provinceFk = p.id
-    LEFT JOIN province p ON a.provinceFk = p.id
+        LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
-    LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
+        LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
-    LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
+        LEFT JOIN (
-    LEFT JOIN (
+            SELECT t.id AS ticketFk, 
-        SELECT t.id AS ticketFk, 
+                GROUP_CONCAT(DISTINCT(i.itemPackingTypeFk)) AS itemPackingTypes
-               GROUP_CONCAT(DISTINCT(i.itemPackingTypeFk)) AS itemPackingTypes
+            FROM route r
-        FROM route r
+                JOIN ticket t ON t.routeFk = r.id
-            JOIN ticket t ON t.routeFk = r.id
+                JOIN sale s ON s.ticketFk = t.id
-            JOIN sale s ON s.ticketFk = t.id
+                JOIN item i ON i.id = s.itemFk
-            JOIN item i ON i.id = s.itemFk
+            WHERE r.id IN (?)
-        WHERE r.id IN (?)
+            GROUP BY t.id
-        GROUP BY t.id
+        ) ipkg ON ipkg.ticketFk = t.id
-    ) ipkg ON ipkg.ticketFk = t.id
+    WHERE r.id IN (?)
-WHERE r.id IN (?)
+    ORDER BY t.priority, t.id;
-ORDER BY t.priority, t.id;