Compare commits
11 Commits
52d698b0eb
...
86ecaedb0e
Author | SHA1 | Date |
---|---|---|
|
86ecaedb0e | |
|
f46d6355dd | |
|
27a9881a6a | |
|
3795404789 | |
|
7c6e3d3fc5 | |
|
00201197cc | |
|
473e710d1b | |
|
281ae0eb04 | |
|
7d8828e604 | |
|
e7cd052199 | |
|
8d0b3efa11 |
|
@ -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');
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
<span ng-if="$ctrl.showNumber">
|
||||
{{ $ctrl.phoneNumber }}
|
||||
</span>
|
||||
<a href="{{$ctrl.schemeUrl}}:{{$ctrl.phoneNumber}}">
|
||||
<a href="tel:{{$ctrl.phoneNumber}}">
|
||||
<vn-icon
|
||||
flat
|
||||
round
|
||||
|
@ -14,7 +14,7 @@
|
|||
</vn-icon>
|
||||
</a>
|
||||
</span>
|
||||
<a ng-if="!$ctrl.icon" href="$ctrl.schemeUrl:$ctrl.phoneNumber">
|
||||
<a ng-if="!$ctrl.icon" href="tel:$ctrl.phoneNumber">
|
||||
{{ $ctrl.phoneNumber }}
|
||||
</a>
|
||||
</span>
|
||||
|
|
|
@ -5,7 +5,6 @@ class Controller {
|
|||
this.phoneNumber = null;
|
||||
this.icon = true;
|
||||
this.showNumber = true;
|
||||
this.schemeUrl = 'tel';
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -16,6 +15,5 @@ ngModule.vnComponent('vnLinkPhone', {
|
|||
phoneNumber: '<',
|
||||
icon: '<?',
|
||||
showNumber: '<?',
|
||||
schemeUrl: '<?',
|
||||
}
|
||||
});
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -23,6 +23,9 @@
|
|||
"Device": {
|
||||
"dataSource": "vn"
|
||||
},
|
||||
"DeviceLog": {
|
||||
"dataSource": "vn"
|
||||
},
|
||||
"DeviceProduction": {
|
||||
"dataSource": "vn"
|
||||
},
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue