Merge pull request '5976-transferSale_call_setDeleted' (!1681) from 5976-transferSale_call_setDeleted into dev

Reviewed-on: #1681
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>

db/changes/233401/00-setDeleted_acl.sql

@@ -0,0 +1,6 @@
+UPDATE `salix`.`ACL`
+    SET principalId='salesPerson'
+        WHERE
+            model='Ticket'
+            AND property='setDeleted'
+            AND accessType='WRITE';

e2e/paths/05-ticket/14_create_ticket.spec.js

@@ -10,7 +10,7 @@ describe('Ticket create path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('employee', 'ticket');
+        await page.loginAndModule('salesPerson', 'ticket');
     });
 
     afterAll(async() => {

loopback/locale/en.json

@@ -179,6 +179,7 @@
 	"You can not use the same password": "You can not use the same password",
 	"Valid priorities": "Valid priorities: %d",
 	"Negative basis of tickets": "Negative basis of tickets: {{ticketsIds}}",
+    "This ticket cannot be left empty.": "This ticket cannot be left empty. %s",
 	"Social name should be uppercase": "Social name should be uppercase",
 	"Street should be uppercase": "Street should be uppercase",
 	"You don't have enough privileges.": "You don't have enough privileges.",

loopback/locale/es.json

@@ -306,6 +306,7 @@
 	"Valid priorities": "Prioridades válidas: %d",
 	"Negative basis of tickets": "Base negativa para los tickets: {{ticketsIds}}",
 	"You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
+	"This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
     "The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
 	"You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
 	"This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",

modules/route/front/roadmap/index/index.js

@@ -46,8 +46,6 @@ class Controller extends Section {
     }
 
     deleteRoadmaps() {
-        console.log(this.checked);
-
         for (const roadmap of this.checked) {
             this.$http.delete(`Roadmaps/${roadmap.id}`)
                 .then(() => this.$.model.refresh())

modules/ticket/back/methods/ticket/specs/transferSales.spec.js

@@ -5,6 +5,8 @@ describe('sale transferSales()', () => {
     const userId = 1101;
     const activeCtx = {
         accessToken: {userId: userId},
+        headers: {origin: ''},
+        __: value => value
     };
     const ctx = {req: activeCtx};
 

modules/ticket/back/methods/ticket/transferSales.js

@@ -37,6 +37,7 @@ module.exports = Self => {
         const userId = ctx.req.accessToken.userId;
         const models = Self.app.models;
         const myOptions = {userId};
+        const $t = ctx.req.__; // $translate
         let tx;
 
         if (typeof options == 'object')
@@ -95,9 +96,18 @@ module.exports = Self => {
 
             const isTicketEmpty = await models.Ticket.isEmpty(id, myOptions);
             if (isTicketEmpty) {
-                await originalTicket.updateAttributes({
+                try {
-                    isDeleted: true
+                    await models.Ticket.setDeleted(ctx, id, myOptions);
-                }, myOptions);
+                } catch (e) {
+                    if (e.statusCode === 400) {
+                        throw new UserError(
+                            `This ticket cannot be left empty.`,
+                            'TRANSFER_SET_DELETED',
+                            $t(e.message, ...e.translateArgs)
+                        );
+                    }
+                    throw e;
+                }
             }
 
             if (tx) await tx.commit();