verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
Joan Sanchez 2018-05-10 14:07:28 +02:00
parent b14154b4e2 4ebca3f3cb
commit 700fea1d54
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/ticket/src/component/component.html
View File

@ -1,4 +1,4 @@
<mg-ajax path="/ticket/api/Sales/saleComponentFilter" options="vnIndex" actions="$ctrl.sales = index.model.instances"></mg-ajax> <mg-ajax path="/ticket/api/Sales/saleComponentFilter" options="vnIndexNonAuto" actions="$ctrl.sales = index.model.instances"></mg-ajax>
<vn-vertical> <vn-vertical>
<vn-card pad-large> <vn-card pad-large>
<vn-vertical> <vn-vertical>

11
client/ticket/src/component/component.js
View File

@ -1,7 +1,14 @@
import ngModule from '../module'; import ngModule from '../module';
import './style.scss'; import './style.scss';
import FilterTicketList from '../filter-ticket-list';
class Controller extends FilterTicketList {
constructor($scope, $timeout, $stateParams) {
super($scope, $timeout, $stateParams);
this.$scope = $scope;
this.onOrder('itemFk', 'ASC');
}
class Controller {
total() { total() {
let sum; let sum;
if (this.sales) { if (this.sales) {
@ -36,6 +43,8 @@ class Controller {
} }
} }
Controller.$inject = ['$scope', '$timeout', '$state'];
ngModule.component('vnTicketComponents', { ngModule.component('vnTicketComponents', {
template: require('./component.html'), template: require('./component.html'),
controller: Controller, controller: Controller,

2
services/loopback/common/models/state.js
View File

@ -7,7 +7,7 @@ module.exports = Self => {
* @param {Integer} stateId The user id * @param {Integer} stateId The user id
* @return {Boolean} %true if user has the role, %false otherwise * @return {Boolean} %true if user has the role, %false otherwise
*/ */
Self.isAlertLevel0 = async function(stateId) { Self.isAlertLevelZero = async function(stateId) {
let result = await Self.rawSql( let result = await Self.rawSql(
`SELECT alertLevel `SELECT alertLevel
FROM vn.state FROM vn.state

4
services/ticket/common/models/ticket-tracking.js
View File

@ -10,10 +10,10 @@ module.exports = function(Self) {
let isEmployee = await models.Account.hasRole(userId, 'employee'); let isEmployee = await models.Account.hasRole(userId, 'employee');
let isProduction = await models.Account.hasRole(userId, 'production'); let isProduction = await models.Account.hasRole(userId, 'production');
let isAlertLevel0 = await models.State.isAlertLevel0(ctx.instance.stateFk); let isAlertLevelZero = await models.State.isAlertLevelZero(ctx.instance.stateFk);
let ticketAlertLevel = await models.TicketState.findOne({where: {id: ctx.instance.ticketFk}, fields: ["alertLevel"]}); let ticketAlertLevel = await models.TicketState.findOne({where: {id: ctx.instance.ticketFk}, fields: ["alertLevel"]});
if ((!isProduction && !isAlertLevel0) || !isEmployee || (isEmployee && ticketAlertLevel != 0 && !isProduction)) if ((!isProduction && !isAlertLevelZero) || !isEmployee || (isEmployee && ticketAlertLevel != 0 && !isProduction))
throw new Error("You don't have enough privileges to do that"); throw new Error("You don't have enough privileges to do that");
let user = await models.Worker.findOne({where: {userFk: userId}}); let user = await models.Worker.findOne({where: {userFk: userId}});