Merge branch 'test' into dev

back/methods/viaexpress-config/internationalExpedition.js

@@ -20,7 +20,7 @@ module.exports = Self => {
         }
     });
 
-    Self.internationalExpedition = async expeditionFk => {
+    Self.internationalExpedition = async (expeditionFk) => {
         const models = Self.app.models;
 
         const viaexpressConfig = await models.ViaexpressConfig.findOne({

back/methods/viaexpress-config/renderer.js

@@ -20,11 +20,11 @@ module.exports = Self => {
         }
     });
 
-    Self.renderer = async expeditionFk => {
+    Self.renderer = async (expeditionFk) => {
         const models = Self.app.models;
 
         const viaexpressConfig = await models.ViaexpressConfig.findOne({
-            fields: ['client', 'user', 'password', 'defaultWeight', 'deliveryType']
+            fields: ['client', 'user', 'password', 'defaultWeight', 'deliveryType', 'agencyModeFk']
         });
 
         const expedition = await models.Expedition.findOne({
@@ -34,7 +34,7 @@ module.exports = Self => {
                 {
                     relation: 'ticket',
                     scope: {
-                        fields: ['shipped', 'addressFk', 'clientFk', 'companyFk'],
+                        fields: ['shipped', 'addressFk', 'clientFk', 'companyFk', 'agencyModeFk'],
                         include: [
                             {
                                 relation: 'client',
@@ -102,7 +102,6 @@ module.exports = Self => {
                             }
                         ]
                     }
-
                 }
             ]
         });
@@ -110,13 +109,15 @@ module.exports = Self => {
         const ticket = expedition.ticket();
         const sender = ticket.company().client();
         const shipped = ticket.shipped.toISOString();
+        const isInterdia = (ticket.agencyModeFk === viaexpressConfig.agencyModeFk)
         const data = {
             viaexpressConfig,
             sender,
             senderAddress: sender.defaultAddress(),
             client: ticket.client(),
             address: ticket.address(),
-            shipped
+            shipped,
+            isInterdia
         };
 
         const template = fs.readFileSync(__dirname + '/template.ejs', 'utf-8');

back/methods/viaexpress-config/template.ejs

@@ -13,7 +13,7 @@
             <Asegurado>0</Asegurado>
             <Imprimir>0</Imprimir>
             <ConDevolucionAlbaran>0</ConDevolucionAlbaran>
-            <Intradia>0</Intradia>
+            <Intradia><%= isInterdia %></Intradia>
             <Observaciones></Observaciones>
             <AlbaranRemitente></AlbaranRemitente>
             <Modo>0</Modo>

back/models/viaexpress-config.json

@@ -29,6 +29,9 @@
 		},
 		"deliveryType": {
 			"type": "string"
+		},
+		"agencyModeFk": {
+			"type": "number"
 		}
 	}
 }

db/changes/240203/00-viaExpressConfig.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `vn`.`viaexpressConfig` ADD agencyModeFk int DEFAULT NULL NULL COMMENT 'Indica el agencyMode que es interdia';
+ALTER TABLE `vn`.`viaexpressConfig` ADD CONSTRAINT viaexpressConfig_agencyMode_Fk FOREIGN KEY (agencyModeFK) REFERENCES vn.agencyMode(id) ON DELETE RESTRICT ON UPDATE RESTRICT;

modules/ticket/back/methods/sale/clone.js

@@ -14,7 +14,11 @@ module.exports = Self => {
         }
 
         try {
-            const salesFilter = {
+            let sales;
+            let services;
+
+            if (salesIds && salesIds.length) {
+                sales = await models.Sale.find({
                     where: {id: {inq: salesIds}},
                     include: {
                         relation: 'components',
@@ -22,9 +26,18 @@ module.exports = Self => {
                             fields: ['saleFk', 'componentFk', 'value']
                         }
                     }
-            };
+                }, myOptions);
-            const sales = await models.Sale.find(salesFilter, myOptions);
+            }
-            let ticketsIds = [...new Set(sales.map(sale => sale.ticketFk))];
+
+            if (servicesIds && servicesIds.length) {
+                services = await models.TicketService.find({
+                    where: {id: {inq: servicesIds}}
+                }, myOptions);
+            }
+
+            let ticketsIds = sales ?
+                [...new Set(sales.map(sale => sale.ticketFk))] :
+                [...new Set(services.map(service => service.ticketFk))];
 
             const mappedTickets = new Map();
 
@@ -39,7 +52,7 @@ module.exports = Self => {
                 newTickets.push(newTicket);
                 mappedTickets.set(ticketId, newTicket.id);
             }
-
+            if (sales) {
                 for (const sale of sales) {
                     const newTicketId = mappedTickets.get(sale.ticketFk);
 
@@ -58,13 +71,9 @@ module.exports = Self => {
 
                     await models.SaleComponent.create(components, myOptions);
                 }
+            }
 
-            if (servicesIds && servicesIds.length) {
+            if (services) {
-                const servicesFilter = {
-                    where: {id: {inq: servicesIds}}
-                };
-                const services = await models.TicketService.find(servicesFilter, myOptions);
-
                 for (const service of services) {
                     const newTicketId = mappedTickets.get(service.ticketFk);
 

modules/ticket/back/methods/sale/refund.js

@@ -6,7 +6,6 @@ module.exports = Self => {
             {
                 arg: 'salesIds',
                 type: ['number'],
-                required: true
             },
             {
                 arg: 'servicesIds',

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

@@ -44,24 +44,7 @@ describe('Sale refund()', () => {
 
             const tickets = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, options);
 
-            const refundedTicket = await models.Ticket.findOne({
+            const refundedTicket = await getTicketRefund(tickets[0].id, options);
-                where: {
-                    id: tickets[0].id
-                },
-                include: [
-                    {
-                        relation: 'ticketSales',
-                        scope: {
-                            include: {
-                                relation: 'components'
-                            }
-                        }
-                    },
-                    {
-                        relation: 'ticketServices',
-                    }
-                ]
-            }, options);
             const ticketsAfter = await models.Ticket.find({}, options);
             const salesLength = refundedTicket.ticketSales().length;
             const componentsLength = refundedTicket.ticketSales()[0].components().length;
@@ -77,4 +60,42 @@ describe('Sale refund()', () => {
             throw e;
         }
     });
+
+    it('should create a ticket  without sales', async() => {
+        const servicesIds = [4];
+        const tx = await models.Sale.beginTransaction({});
+        const options = {transaction: tx};
+        try {
+            const tickets = await models.Sale.refund(ctx, null, servicesIds, withWarehouse, options);
+            const refundedTicket = await getTicketRefund(tickets[0].id, options);
+
+            expect(refundedTicket).toBeDefined();
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     });
+});
+
+async function getTicketRefund(id, options) {
+    return models.Ticket.findOne({
+        where: {
+            id
+        },
+        include: [
+            {
+                relation: 'ticketSales',
+                scope: {
+                    include: {
+                        relation: 'components'
+                    }
+                }
+            },
+            {
+                relation: 'ticketServices',
+            }
+        ]
+    }, options);
+}

modules/worker/back/methods/worker-time-control/updateTimeEntry.js

@@ -3,7 +3,7 @@ const UserError = require('vn-loopback/util/user-error');
 module.exports = Self => {
     Self.remoteMethodCtx('updateTimeEntry', {
         description: 'Updates a time entry for a worker if the user role is above the worker',
-        accessType: 'READ',
+        accessType: 'WRITE',
         accepts: [{
             arg: 'id',
             type: 'number',