Merge branch 'dev' into 6044-fixTickCalendar

db/changes/233401/01-deviceLog_acl.sql

@@ -0,0 +1,6 @@
+
+ALTER TABLE `vn`.`deviceLog` ADD serialNumber varchar(45) DEFAULT NULL NULL;
+
+INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId) 
+VALUES( 'DeviceLog', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');
+

loopback/locale/en.json

@@ -185,5 +185,6 @@
 	"You don't have enough privileges.": "You don't have enough privileges.",
 	"This ticket is locked.": "This ticket is locked.",
 	"This ticket is not editable.": "This ticket is not editable.",
-	"The ticket doesn't exist.": "The ticket doesn't exist."
+	"The ticket doesn't exist.": "The ticket doesn't exist.",
+	"Ticket without Route": "Ticket without route"
 }

loopback/locale/es.json

@@ -315,5 +315,6 @@
 	"This ticket is not editable.": "Este ticket no es editable.",
 	"The ticket doesn't exist.": "No existe el ticket.",
     "Social name should be uppercase": "La razón social debe ir en mayúscula",
-	"Street should be uppercase": "La dirección fiscal debe ir en mayúscula"
+	"Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
+	"Ticket without Route": "Ticket sin ruta"
 }

modules/ticket/back/methods/ticket/saveSign.js

@@ -93,6 +93,8 @@ module.exports = Self => {
                 }, myOptions);
             const dmsType = await models.DmsType.findOne({where: {code: 'Ticket'}, fields: ['id']}, myOptions);
             const ctxUploadFile = Object.assign({}, ctx);
+            if (ticket.route() === null)
+                throw new UserError('Ticket without route');
             ctxUploadFile.args = {
                 warehouseId: ticket.warehouseFk,
                 companyId: ticket.companyFk,

modules/worker/back/model-config.json

@@ -23,6 +23,9 @@
     "Device": {
         "dataSource": "vn"
     },
+    "DeviceLog": {
+        "dataSource": "vn"
+    },
     "DeviceProduction": {
         "dataSource": "vn"
     },

modules/worker/back/models/device-log.json

@@ -0,0 +1,40 @@
+{
+    "name": "DeviceLog",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "deviceLog"
+        }
+    },
+    "properties": {
+        "id": {
+            "id": true,
+            "type": "number"
+        },
+        "android_id": {
+            "type": "string"
+        },
+        "userFk": {
+            "type": "number"
+        },
+        "created": {
+            "type": "date"
+        },
+        "nameApp": {
+            "type": "string"
+        },
+        "versionApp": {
+            "type": "string"
+        },
+        "deviceProductionFk": {
+            "type": "number"
+        }
+    },
+    "relations": {
+        "user": {
+            "type": "belongsTo",
+            "model": "VnUser",
+            "foreignKey": "userFk"
+        }
+    }
+}