Merge branch 'master' into 5858_fix_zone-incldued_HTML

2024-04-04 09:40:47 +00:00 · 2024-04-04 09:40:47 +00:00 · ab173e8b67
parent a99ea23d43 573b57a745
commit ab173e8b67
27 changed files with 44 additions and 24 deletions
--- a/back/methods/dms/downloadFile.js
+++ b/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) {
--- a/back/methods/docuware/download.js
+++ b/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) {
--- a/back/methods/image/download.js
+++ b/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) {
--- a/db/routines/vn/procedures/duaInvoiceInBooking.sql
+++ b/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;

--- a/front/core/services/token.js
+++ b/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);
--- a/loopback/server/datasources.json
+++ b/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",
--- a/modules/claim/back/methods/claim/claimPickupPdf.js
+++ b/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');
--- a/modules/claim/back/methods/claim/downloadFile.js
+++ b/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) {
--- a/modules/client/back/methods/client/campaignMetricsPdf.js
+++ b/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');
--- a/modules/entry/back/methods/entry/entryOrderPdf.js
+++ b/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');
--- a/modules/invoiceOut/back/methods/invoiceOut/download.js
+++ b/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) {
--- a/modules/invoiceOut/back/methods/invoiceOut/downloadZip.js
+++ b/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) {
--- a/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js
+++ b/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');
--- a/modules/invoiceOut/back/methods/invoiceOut/invoiceCsv.js
+++ b/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 => {
--- a/modules/invoiceOut/back/methods/invoiceOut/negativeBasesCsv.js
+++ b/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) => {
--- a/modules/item/back/methods/item-image-queue/download.js
+++ b/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() => {
--- a/modules/route/back/methods/route/downloadCmrsZip.js
+++ b/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) {
--- a/modules/route/back/methods/route/downloadZip.js
+++ b/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) {
--- a/modules/route/back/methods/route/driverRoutePdf.js
+++ b/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']

    });

--- a/modules/supplier/back/methods/supplier/campaignMetricsPdf.js
+++ b/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');
--- a/modules/supplier/back/model-config.json
+++ b/modules/supplier/back/model-config.json
@ -8,6 +8,9 @@
    "SupplierDms": {
        "dataSource": "vn"
    },
+    "SupplierContainer": {		
+        "dataSource": "supplierStorage"		
+    },
    "SupplierAddress": {
        "dataSource": "vn"
    },
--- a/modules/ticket/back/methods/ticket-collection/hasUncheckedTicket.js
+++ b/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;
    };
 };
--- a/modules/ticket/back/methods/ticket-collection/spec/hasUncheckedTicket.spec.js
+++ b/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();
--- a/modules/ticket/back/methods/ticket/deliveryNoteCsv.js
+++ b/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 => {
--- a/modules/ticket/back/methods/ticket/deliveryNotePdf.js
+++ b/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');
--- a/modules/travel/back/methods/travel/extraCommunityPdf.js
+++ b/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');
--- a/modules/worker/back/methods/worker-dms/downloadFile.js
+++ b/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) {