Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile

modules/claim/back/models/claim.json

@@ -82,6 +82,11 @@
             "type": "hasMany",
             "model": "ClaimDms",
             "foreignKey": "claimFk"
+        },
+        "lines": {
+            "type": "hasMany",
+            "model": "ClaimBeginning",
+            "foreignKey": "claimFk"
         }
     }
 }

modules/entry/back/models/buy.json

@@ -3,7 +3,8 @@
     "base": "Loggable",
     "log": {
         "model": "EntryLog",
-        "relation": "entry"
+        "relation": "entry",
+        "grabUser": true
       },
     "options": {
         "mysql": {
@@ -70,4 +71,4 @@
 			"foreignKey": "packageFk"
 		}
     }
-}
+}

modules/entry/back/models/entry.json

@@ -2,7 +2,8 @@
     "name": "Entry",
     "base": "Loggable",
     "log": {
-        "model":"EntryLog"
+        "model":"EntryLog",
+        "grabUser": true
 	},
     "options": {
         "mysql": {

modules/item/back/models/item.json

@@ -3,7 +3,8 @@
     "base": "Loggable",
     "log": {
         "model": "ItemLog",
-        "showField": "id"
+        "showField": "id",
+        "grabUser": true
     },
     "options": {
         "mysql": {
@@ -220,4 +221,4 @@
             }
         }
     }
-}
+}

modules/route/back/models/route.json

@@ -2,7 +2,8 @@
     "name": "Route",
 	"base": "Loggable",
 	"log": {
-		"model":"RouteLog"
+		"model":"RouteLog",
+        "grabUser": true
 	},
     "options": {
         "mysql": {

modules/ticket/back/methods/ticket/new.js

@@ -127,19 +127,6 @@ module.exports = Self => {
             ], myOptions);
 
             const ticket = await models.Ticket.findById(result[1][0].newTicketId, null, myOptions);
-            const cleanInstance = JSON.parse(JSON.stringify(ticket));
-
-            const logRecord = {
-                originFk: cleanInstance.id,
-                userFk: myUserId,
-                action: 'insert',
-                changedModel: 'Ticket',
-                changedModelId: cleanInstance.id,
-                oldInstance: {},
-                newInstance: cleanInstance
-            };
-
-            await models.TicketLog.create(logRecord, myOptions);
 
             if (tx) await tx.commit();
 

modules/ticket/back/models/sale.json

@@ -4,7 +4,8 @@
     "log": {
       "model": "TicketLog",
       "relation": "ticket",
-      "showField": "concept"
+      "showField": "concept",
+      "grabUser": true
     },
     "options": {
         "mysql": {

modules/ticket/back/models/ticket.json

@@ -3,7 +3,8 @@
 	"base": "Loggable",
 	"log": {
 		"model":"TicketLog",
-        "showField": "id"
+        "showField": "id",
+        "grabUser": true
 	},
     "options": {
         "mysql": {

modules/travel/back/models/travel.json

@@ -3,7 +3,8 @@
 	"base": "Loggable",
 	"log": {
 		"model":"TravelLog",
-        "showField": "ref"
+        "showField": "ref",
+        "grabUser": true
 	},
     "options": {
         "mysql": {