-
-
- ![]()
-
-
-
+ class="vn-w-sm vn-px-sm vn-pb-xl">
+
+
-
+
- + {{::$ctrl.modelI18n}} #{{::originLog.originFk}} +
-
-
-
- {{::$ctrl.relativeDate(log.creationDate)}}
-
-
-
- {{::log.changedModelI18n}}
-
-
+
+
+
-
+
+
+
+
+
+
+
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js
index 3392c53be..3df367cae 100644
--- a/front/salix/components/log/index.js
+++ b/front/salix/components/log/index.js
@@ -3,7 +3,10 @@ import Section from '../section';
import {hashToColor} from 'core/lib/string';
import './style.scss';
-const validDate = /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/;
+const validDate = new RegExp(
+ /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])/.source
+ + /T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source
+);
export default class Controller extends Section {
constructor($element, $) {
@@ -28,6 +31,20 @@ export default class Controller extends Section {
select: 'visibility'
};
this.filter = {
+ fields: [
+ 'id',
+ 'originFk',
+ 'userFk',
+ 'action',
+ 'changedModel',
+ 'oldInstance',
+ 'newInstance',
+ 'creationDate',
+ 'changedModel',
+ 'changedModelId',
+ 'changedModelValue',
+ 'description'
+ ],
include: [{
relation: 'user',
scope: {
@@ -48,6 +65,11 @@ export default class Controller extends Section {
this.today.setHours(0, 0, 0, 0);
}
+ $onInit() {
+ const match = this.url?.match(/(.*)Logs$/);
+ this.modelI18n = match && this.translateModel(match[1]);
+ }
+
$postLink() {
this.resetFilter();
this.$.$watch(
@@ -63,47 +85,75 @@ export default class Controller extends Section {
set logs(value) {
this._logs = value;
+ this.logTree = [];
if (!value) return;
const empty = {};
const validations = window.validations;
- const castJsonValue = this.castJsonValue;
- for (const log of value) {
+ let originLog;
+ let userLog;
+ let modelLog;
+ let nLogs;
+
+ for (let i = 0; i < value.length; i++) {
+ const log = value[i];
+ const prevLog = i > 0 ? value[i - 1] : null;
+ const locale = validations[log.changedModel]?.locale || empty;
+
+ // Origin
+
+ const originChanged = !prevLog
+ || log.originFk != prevLog.originFk;
+ if (originChanged) {
+ this.logTree.push(originLog = {
+ originFk: log.originFk,
+ logs: []
+ });
+ }
+
+ // User
+
+ const userChanged = originChanged
+ || log.userFk != prevLog.userFk
+ || nLogs >= 5;
+ if (userChanged) {
+ originLog.logs.push(userLog = {
+ user: log.user,
+ userFk: log.userFk,
+ logs: []
+ });
+ nLogs = 0;
+ }
+ nLogs++;
+
+ // Model
+
+ const modelChanged = userChanged
+ || log.changedModel != prevLog.changedModel
+ || log.changedModelId != prevLog.changedModelId;
+ if (modelChanged) {
+ userLog.logs.push(modelLog = {
+ model: log.changedModel,
+ modelI18n: firstUpper(locale.name) || log.changedModel,
+ id: log.changedModelId,
+ showValue: log.changedModelValue,
+ logs: []
+ });
+ }
+
+ modelLog.logs.push(log);
+
+ // Changes
+
const notDelete = log.action != 'delete';
const olds = (notDelete ? log.oldInstance : null) || empty;
const vals = (notDelete ? log.newInstance : log.oldInstance) || empty;
- const locale = validations[log.changedModel]?.locale || empty;
- log.changedModelI18n = firstUpper(locale.name) || log.changedModel;
- let props = Object.keys(olds).concat(Object.keys(vals));
- props = [...new Set(props)];
+ let propNames = Object.keys(olds).concat(Object.keys(vals));
+ propNames = [...new Set(propNames)];
- log.props = [];
- for (const prop of props) {
- if (prop.endsWith('$')) continue;
- log.props.push({
- name: prop,
- nameI18n: firstUpper(locale.columns?.[prop]) || prop,
- old: getVal(olds, prop),
- val: getVal(vals, prop)
- });
- }
- log.props.sort(
- (a, b) => a.nameI18n.localeCompare(b.nameI18n));
- }
-
- function getVal(vals, prop) {
- let val, id;
- const showProp = `${prop}$`;
-
- if (vals[showProp] != null) {
- val = vals[showProp];
- id = vals[prop];
- } else
- val = vals[prop];
-
- return {val: castJsonValue(val), id};
+ log.props = this.parseProps(propNames, locale, vals, olds);
}
}
@@ -114,17 +164,76 @@ export default class Controller extends Section {
set models(value) {
this._models = value;
if (!value) return;
- for (const model of value) {
- const name = model.changedModel;
- model.changedModelI18n =
- firstUpper(window.validations[name]?.locale?.name) || name;
- }
+ for (const model of value)
+ model.changedModelI18n = this.translateModel(model.changedModel);
}
get showModelName() {
return !(this.changedModel && this.changedModelId);
}
+ parseProps(propNames, locale, vals, olds) {
+ const castJsonValue = this.castJsonValue;
+ const props = [];
+
+ for (const prop of propNames) {
+ if (prop.endsWith('$')) continue;
+ props.push({
+ name: prop,
+ nameI18n: firstUpper(locale.columns?.[prop]) || prop,
+ val: getVal(vals, prop),
+ old: olds && getVal(olds, prop)
+ });
+ }
+ props.sort(
+ (a, b) => a.nameI18n.localeCompare(b.nameI18n));
+
+ function getVal(vals, prop) {
+ let val; let id;
+ const showProp = `${prop}$`;
+
+ if (vals[showProp] != null) {
+ val = vals[showProp];
+ id = vals[prop];
+ } else
+ val = vals[prop];
+
+ return {val: castJsonValue(val), id};
+ }
+
+ return props;
+ }
+
+ viewPitInstance(event, id, modelLog) {
+ if (this.instance?.canceler)
+ this.instance.canceler.resolve();
+
+ const canceler = this.$q.defer();
+ this.instance = {
+ modelLog,
+ canceler
+ };
+ const options = {timeout: canceler.promise};
+
+ this.$http.get(`${this.url}/${id}/pitInstance`, options)
+ .then(res => {
+ const instance = res.data;
+ const propNames = Object.keys(instance);
+ const locale = window.validations[modelLog.model]?.locale || {};
+ this.instance.props = this.parseProps(propNames, locale, instance);
+ })
+ .finally(() => {
+ this.instance.canceler = null;
+ this.$.$applyAsync(() => this.$.instancePopover.relocate());
+ });
+
+ this.$.instancePopover.show(event);
+ }
+
+ translateModel(name) {
+ return firstUpper(window.validations[name]?.locale?.name) || name;
+ }
+
castJsonValue(value) {
return typeof value === 'string' && validDate.test(value)
? new Date(value)
@@ -160,16 +269,14 @@ export default class Controller extends Section {
applyFilter() {
const filter = this.$.filter;
- function getParam(prop, value) {
+ const getParam = (prop, value) => {
if (value == null || value == '') return null;
switch (prop) {
case 'search':
- const or = [];
- if (/^[\w_-]+$/.test(value))
- or.push({changedModelId: value});
- if (!/^[0-9]+$/.test(value))
- or.push({changedModelValue: {like: `%${value}%`}});
- return or.length ? {or} : null;
+ if (/^\s*[0-9]+\s*$/.test(value) || this.byRecord)
+ return {changedModelId: value.trim()};
+ else
+ return {changedModelValue: {like: `%${value}%`}};
case 'changes':
return {or: [
{oldJson: {like: `%${value}%`}},
@@ -178,64 +285,86 @@ export default class Controller extends Section {
]};
case 'who':
switch (value) {
- case 'all':
- return null;
case 'user':
return {userFk: {neq: null}};
case 'system':
return {userFk: null};
+ case 'all':
+ default:
+ return null;
}
- case 'actions':
+ case 'actions': {
const inq = [];
for (const action in value) {
if (value[action])
inq.push(action);
}
return inq.length ? {action: {inq}} : null;
+ }
case 'from':
- if (filter.to) {
+ if (filter.to)
return {creationDate: {gte: value}};
- } else {
+ else {
const to = new Date(value);
to.setHours(23, 59, 59, 999);
return {creationDate: {between: [value, to]}};
}
- case 'to':
+ case 'to': {
const to = new Date(value);
to.setHours(23, 59, 59, 999);
return {creationDate: {lte: to}};
+ }
case 'userFk':
return filter.who != 'system'
? {[prop]: value} : null;
default:
return {[prop]: value};
}
- }
+ };
+ this.hasFilter = false;
const and = [];
+
+ if (!filter.search || !filter.changedModel)
+ this.byRecord = false;
+ if (!this.byRecord)
+ and.push({originFk: this.originId});
+
for (const prop in filter) {
const param = getParam(prop, filter[prop]);
- if (param) and.push(param);
+ if (param) {
+ and.push(param);
+ this.hasFilter = true;
+ }
}
const lbFilter = and.length ? {where: {and}} : null;
return this.$.model.applyFilter(lbFilter);
}
+ filterByRecord(modelLog) {
+ this.byRecord = true;
+ this.$.filter = {
+ who: 'all',
+ search: modelLog.id,
+ changedModel: modelLog.model
+ };
+ }
+
searchUser(search) {
- if (/^[0-9]+$/.test(search)) {
+ if (/^[0-9]+$/.test(search))
return {id: search};
- } else {
+ else {
return {or: [
{name: search},
{nickname: {like: `%${search}%`}}
- ]}
+ ]};
}
}
- showWorkerDescriptor(event, log) {
- if (log.user?.worker)
- this.$.workerDescriptor.show(event.target, log.userFk);
+ showWorkerDescriptor(event, userLog) {
+ if (userLog.user?.worker)
+ this.$.workerDescriptor.show(event.target, userLog.userFk);
}
}
diff --git a/front/salix/components/log/locale/es.yml b/front/salix/components/log/locale/es.yml
index 0f2755f2e..09154f04e 100644
--- a/front/salix/components/log/locale/es.yml
+++ b/front/salix/components/log/locale/es.yml
@@ -3,8 +3,8 @@ Concept: Concepto
Search: Buscar
Search by id or concept: Buscar por identificador o concepto
Search by changes: |
- Buscar por cambios realizados. Los atributos deben buscarse por su nombre
- interno, para obtenerlo situar el cursor sobre el nombre.
+ Buscar por cambios. Los atributos deben buscarse por su nombre interno,
+ para obtenerlo situar el cursor sobre el atributo.
Entity: Entidad
Action: Acción
Author: Autor
@@ -16,9 +16,13 @@ Creates: Crea
Edits: Modifica
Deletes: Elimina
Accesses: Accede
+All: Todo
System: Sistema
Details: Detalles
note: nota
Changes: Cambios
today: hoy
yesterday: ayer
+Show all record changes: Mostrar todos los cambios realizados en el registro
+View record at this point in time: Ver el registro en este punto
+Quit filter: Quitar filtro
diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss
index cec591a7f..d729d09a3 100644
--- a/front/salix/components/log/style.scss
+++ b/front/salix/components/log/style.scss
@@ -1,14 +1,49 @@
-@import "variables";
-@import "effects";
+@import "util";
vn-log {
- .change {
+ .origin-log {
+ &:first-child > .origin-info {
+ margin-top: 0;
+ }
+ & > .origin-info {
+ display: flex;
+ align-items: center;
+ margin-top: 28px;
+ gap: 6px;
+
+ & > .origin-id {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ color: $color-font-secondary;
+ margin: 0;
+ }
+ & > .line {
+ flex-grow: 1;
+ background-color: $color-font-secondary;
+ height: 2px;
+ }
+ }
+ }
+ .user-log {
display: flex;
- & > .left {
+ & > .timeline {
position: relative;
padding-right: 10px;
+ width: 38px;
+ min-width: 38px;
+ flex-grow: auto;
+ & > .arrow {
+ height: 8px;
+ width: 8px;
+ position: absolute;
+ transform: rotateY(0deg) rotate(45deg);
+ top: 15px;
+ right: -4px;
+ z-index: 1;
+ }
& > vn-avatar {
cursor: pointer;
@@ -16,136 +51,187 @@ vn-log {
background-color: $color-main !important;
}
}
- & > .arrow {
- height: 8px;
- width: 8px;
- position: absolute;
- transform: rotateY(0deg) rotate(45deg);
- top: 18px;
- right: -4px;
- z-index: 1;
- }
& > .line {
position: absolute;
background-color: $color-main;
width: 2px;
- left: 17px;
+ left: 18px;
z-index: -1;
top: 44px;
- bottom: -8px;
+ bottom: -2px;
}
}
- &:last-child > .left > .line {
+ &:last-child > .timeline > .line {
display: none;
}
- .detail {
- position: relative;
+ & > .user-changes {
flex-grow: 1;
- width: 100%;
- border-radius: 2px;
+ overflow: hidden;
+ }
+ }
+ .model-log {
+ & > .model-info {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ min-height: 22px;
+
+ & > .model-name {
+ display: inline-block;
+ padding: 2px 5px;
+ color: $color-font-dark;
+ border-radius: 8px;
+ vertical-align: middle;
+ }
+ & > .model-value {
+ font-style: italic;
+ }
+ & > .model-id {
+ color: $color-font-secondary;
+ font-size: .9rem;
+ }
+ & > vn-icon[icon="filter_alt"] {
+ @extend %clickable-light;
+ vertical-align: middle;
+ font-size: 18px;
+ color: $color-font-secondary;
+ float: right;
+ display: none;
+
+ @include mobile {
+ display: initial;
+ }
+ }
+ }
+ &:hover > .model-info > vn-icon[icon="filter_alt"] {
+ display: initial;
+ }
+ }
+ .changes-log {
+ position: relative;
+ max-width: 100%;
+ width: 100%;
+ border-radius: 2px;
+ overflow: hidden;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+ & > .change-info {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
overflow: hidden;
- & > .header {
- display: flex;
- justify-content: space-between;
- align-items: center;
- overflow: hidden;
-
- & > .action-model {
- display: inline-flex;
- overflow: hidden;
-
- & > .model-name {
- display: inline-block;
- padding: 2px 5px;
- color: $color-font-dark;
- border-radius: 8px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
- }
- & > .action-date {
- white-space: nowrap;
-
- & > .action {
- display: inline-flex;
- align-items: center;
- justify-content: center;
- color: $color-font-bg;
- vertical-align: middle;
- border-radius: 50%;
- width: 24px;
- height: 24px;
- font-size: 1.4em;
-
- &.notice {
- background-color: $color-notice-medium
- }
- &.success {
- background-color: $color-success-medium;
- }
- &.warning {
- background-color: $color-main-medium;
- }
- &.alert {
- background-color: lighten($color-alert, 5%);
- }
- }
- }
- }
- & > .model {
+ & > .date {
overflow: hidden;
+ white-space: nowrap;
text-overflow: ellipsis;
+ }
+ & > div {
white-space: nowrap;
- & > .model-value {
- font-style: italic;
- }
- & > .model-id {
+ & > vn-icon.pit {
+ @extend %clickable-light;
+ vertical-align: middle;
+ font-size: 20px;
color: $color-font-secondary;
- font-size: .9rem;
- float: right;
+ display: none;
+
+ @include mobile {
+ display: inline-block;
+ }
+ }
+ & > .action {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ color: $color-font-bg;
+ vertical-align: middle;
+ border-radius: 50%;
+ width: 24px;
+ height: 24px;
+ font-size: 18px;
+
+ &.notice {
+ background-color: $color-notice-medium
+ }
+ &.success {
+ background-color: $color-success-medium;
+ }
+ &.warning {
+ background-color: $color-main-medium;
+ }
+ &.alert {
+ background-color: lighten($color-alert, 5%);
+ }
}
}
+ &:hover vn-icon.pit {
+ display: inline-block;
+ }
}
- }
- .changes {
- overflow: hidden;
- background-color: rgba(255, 255, 255, .05);
- color: $color-font-light;
- position: relative;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- min-height: 34px;
- box-sizing: border-box;
-
- & > vn-icon {
- @extend %clickable;
- float: right;
+ & > .change-detail {
+ overflow: hidden;
+ background-color: rgba(255, 255, 255, .05);
+ color: $color-font-light;
position: relative;
- transition-property: transform, background-color;
- transition-duration: 150ms;
- margin: -5px;
- margin-left: 4px;
- padding: 1px;
- border-radius: 50%;
- }
- &.expanded {
- text-overflow: initial;
- white-space: initial;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ min-height: 34px;
+ box-sizing: border-box;
& > vn-icon {
- transform: rotate(180deg);
+ @extend %clickable;
+ float: right;
+ position: relative;
+ transition-property: transform, background-color;
+ transition-duration: 150ms;
+ margin: -5px;
+ margin-left: 4px;
+ padding: 1px;
+ border-radius: 50%;
+ }
+ &.expanded {
+ text-overflow: initial;
+ white-space: initial;
+
+ & > vn-icon {
+ transform: rotate(180deg);
+ }
+ }
+ & > .no-changes {
+ font-style: italic;
}
}
- & > .no-changes {
- font-style: italic;
+ }
+ .id-value {
+ font-size: .9rem;
+ color: $color-font-secondary;
+ }
+}
+.vn-log-instance {
+ display: block;
+
+ & > .loading {
+ display: flex;
+ justify-content: center;
+ }
+ & > .instance {
+ min-width: 180px;
+ max-width: 400px;
+
+ & > .header {
+ background-color: $color-main;
+ color: $color-font-dark;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ margin: 0;
+ }
+ & > .change-detail {
+ color: $color-font-light;
}
}
}
-vn-log-value > .id-value {
- font-size: .9rem;
- color: $color-font-secondary;
-}
diff --git a/front/salix/components/login/index.js b/front/salix/components/login/index.js
index 150e896a1..8e8f08244 100644
--- a/front/salix/components/login/index.js
+++ b/front/salix/components/login/index.js
@@ -5,10 +5,11 @@ import './style.scss';
* A simple login form.
*/
export default class Controller {
- constructor($, $element, vnAuth) {
+ constructor($, $element, $state, vnAuth) {
Object.assign(this, {
$,
$element,
+ $state,
vnAuth,
user: localStorage.getItem('lastUser'),
remember: true
@@ -22,11 +23,15 @@ export default class Controller {
localStorage.setItem('lastUser', this.user);
this.loading = false;
})
- .catch(err => {
+ .catch(req => {
this.loading = false;
this.password = '';
this.focusUser();
- throw err;
+ const err = req.data?.error;
+ if (err?.code == 'passExpired')
+ this.$state.go('change-password', err.details.token);
+
+ throw req;
});
}
@@ -35,7 +40,7 @@ export default class Controller {
this.$.userField.focus();
}
}
-Controller.$inject = ['$scope', '$element', 'vnAuth'];
+Controller.$inject = ['$scope', '$element', '$state', 'vnAuth'];
ngModule.vnComponent('vnLogin', {
template: require('./index.html'),
diff --git a/front/salix/components/outLayout/style.scss b/front/salix/components/outLayout/style.scss
index aa94fefb3..a95b75835 100644
--- a/front/salix/components/outLayout/style.scss
+++ b/front/salix/components/outLayout/style.scss
@@ -64,4 +64,25 @@ vn-out-layout{
a{
color: $color-primary;
}
+
+ .footer {
+ margin-top: 32px;
+ text-align: center;
+ position: relative;
+ & > .vn-submit {
+ display: block;
+
+ & > input {
+ display: block;
+ width: 100%;
+ }
+ }
+ & > .spinner-wrapper {
+ position: absolute;
+ width: 0;
+ top: 3px;
+ right: -8px;
+ overflow: visible;
+ }
+ }
}
diff --git a/front/salix/components/recover-password/index.js b/front/salix/components/recover-password/index.js
index e91169588..5ffc305f9 100644
--- a/front/salix/components/recover-password/index.js
+++ b/front/salix/components/recover-password/index.js
@@ -1,5 +1,4 @@
import ngModule from '../../module';
-import './style.scss';
export default class Controller {
constructor($scope, $element, $http, vnApp, $translate, $state) {
diff --git a/front/salix/components/recover-password/style.scss b/front/salix/components/recover-password/style.scss
deleted file mode 100644
index d3c6f594e..000000000
--- a/front/salix/components/recover-password/style.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-@import "variables";
-
-vn-recover-password{
- .footer {
- margin-top: 32px;
- text-align: center;
- position: relative;
- & > .vn-submit {
- display: block;
-
- & > input {
- display: block;
- width: 100%;
- }
- }
- & > .spinner-wrapper {
- position: absolute;
- width: 0;
- top: 3px;
- right: -8px;
- overflow: visible;
- }
- }
-}
diff --git a/front/salix/components/reset-password/index.js b/front/salix/components/reset-password/index.js
index a3ca03237..c0a10cc52 100644
--- a/front/salix/components/reset-password/index.js
+++ b/front/salix/components/reset-password/index.js
@@ -1,5 +1,5 @@
import ngModule from '../../module';
-import './style.scss';
+const UserError = require('vn-loopback/util/user-error');
export default class Controller {
constructor($scope, $element, $http, vnApp, $translate, $state, $location) {
diff --git a/front/salix/components/reset-password/style.scss b/front/salix/components/reset-password/style.scss
deleted file mode 100644
index 87e4adc8c..000000000
--- a/front/salix/components/reset-password/style.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-@import "variables";
-
-vn-reset-password{
- .footer {
- margin-top: 32px;
- text-align: center;
- position: relative;
- & > .vn-submit {
- display: block;
-
- & > input {
- display: block;
- width: 100%;
- }
- }
- & > .spinner-wrapper {
- position: absolute;
- width: 0;
- top: 3px;
- right: -8px;
- overflow: visible;
- }
- }
-}
diff --git a/front/salix/routes.js b/front/salix/routes.js
index 4cc72ec95..675da719a 100644
--- a/front/salix/routes.js
+++ b/front/salix/routes.js
@@ -36,6 +36,12 @@ function config($stateProvider, $urlRouterProvider) {
description: 'Reset password',
template: '
+ ng-click="removeConfirm.show(row)"
+ vn-acl="itManagement"
+ vn-acl-action="remove">
@@ -30,9 +32,11 @@
translate-attr="{title: 'Add'}"
vn-bind="+"
ng-click="$ctrl.onAddClick()"
- fixed-bottom-right>
+ fixed-bottom-right
+ vn-acl="itManagement"
+ vn-acl-action="remove">
-
@@ -49,7 +53,7 @@
- this.user = res.data),
+ this.$http.get(`VnUsers/preview`, {filter})
+ .then(res => {
+ const [user] = res.data;
+ this.user = user;
+ }),
this.$http.get(`Accounts/${this.$params.id}/exists`)
.then(res => this.hasAccount = res.data.exists)
]);
diff --git a/modules/account/front/card/index.spec.js b/modules/account/front/card/index.spec.js
index 204b897e4..712d3c1d8 100644
--- a/modules/account/front/card/index.spec.js
+++ b/modules/account/front/card/index.spec.js
@@ -15,12 +15,12 @@ describe('component vnUserCard', () => {
it('should reload the controller data', () => {
controller.$params.id = 1;
- $httpBackend.expectGET('VnUsers/1').respond('foo');
+ $httpBackend.expectGET('VnUsers/preview').respond('foo');
$httpBackend.expectGET('Accounts/1/exists').respond({exists: true});
controller.reload();
$httpBackend.flush();
- expect(controller.user).toBe('foo');
+ expect(controller.user).toBe('f');
expect(controller.hasAccount).toBeTruthy();
});
});
diff --git a/modules/account/front/create/index.html b/modules/account/front/create/index.html
index ee2de926a..acc07d346 100644
--- a/modules/account/front/create/index.html
+++ b/modules/account/front/create/index.html
@@ -12,18 +12,18 @@
@@ -39,7 +39,7 @@
type="password">
diff --git a/modules/account/front/create/index.js b/modules/account/front/create/index.js
index 41fd718f6..01ba7905b 100644
--- a/modules/account/front/create/index.js
+++ b/modules/account/front/create/index.js
@@ -2,6 +2,11 @@ import ngModule from '../module';
import Section from 'salix/components/section';
export default class Controller extends Section {
+ constructor($element, $) {
+ super($element, $);
+ this.user = {active: true};
+ }
+
onSubmit() {
return this.$.watcher.submit().then(res => {
this.$state.go('account.card.basicData', {id: res.data.id});
diff --git a/modules/account/front/descriptor/index.html b/modules/account/front/descriptor/index.html
index 7a7ba43f3..381b2991c 100644
--- a/modules/account/front/descriptor/index.html
+++ b/modules/account/front/descriptor/index.html
@@ -6,7 +6,7 @@
Delete
@@ -15,7 +15,7 @@
ng-if="::$root.user.id == $ctrl.id"
ng-click="$ctrl.onChangePassClick(true)"
name="changePassword"
- vn-acl="hr"
+ vn-acl="sysadmin"
vn-acl-action="remove"
translate>
Change password
@@ -23,7 +23,7 @@
Set password
@@ -32,7 +32,7 @@
ng-if="!$ctrl.hasAccount"
ng-click="enableAccount.show()"
name="enableAccount"
- vn-acl="it"
+ vn-acl="sysadmin"
vn-acl-action="remove"
translate>
Enable account
@@ -41,7 +41,7 @@
ng-if="$ctrl.hasAccount"
ng-click="disableAccount.show()"
name="disableAccount"
- vn-acl="it"
+ vn-acl="sysadmin"
vn-acl-action="remove"
translate>
Disable account
@@ -50,7 +50,7 @@
ng-if="!$ctrl.user.active"
ng-click="activateUser.show()"
name="activateUser"
- vn-acl="hr"
+ vn-acl="itManagement"
vn-acl-action="remove"
translate>
Activate user
@@ -59,7 +59,7 @@
ng-if="$ctrl.user.active"
ng-click="deactivateUser.show()"
name="deactivateUser"
- vn-acl="hr"
+ vn-acl="itManagement"
vn-acl-action="remove"
translate>
Deactivate user
diff --git a/modules/account/front/index/index.html b/modules/account/front/index/index.html
index d067c8c37..7502c8b3d 100644
--- a/modules/account/front/index/index.html
+++ b/modules/account/front/index/index.html
@@ -14,11 +14,11 @@
@@ -36,12 +36,12 @@
-
Todos los correos serán reenviados a la dirección especificada, no se
mantendrá copia de los mismos en el buzón del usuario.
+You don't have enough privileges: No tienes suficientes permisos
diff --git a/modules/account/front/main/index.html b/modules/account/front/main/index.html
index 5872a328d..36b493ec4 100644
--- a/modules/account/front/main/index.html
+++ b/modules/account/front/main/index.html
@@ -1,6 +1,6 @@
diff --git a/modules/account/front/privileges/index.html b/modules/account/front/privileges/index.html
index 8e33b708e..61f2c534e 100644
--- a/modules/account/front/privileges/index.html
+++ b/modules/account/front/privileges/index.html
@@ -1,9 +1,7 @@
@@ -11,15 +9,16 @@
name="form"
ng-submit="watcher.submit()"
class="vn-w-md">
-
+
-
+
+
+
this.$.summary = res.data);
+ this.$http.get(`VnUsers/preview`, {filter})
+ .then(res => {
+ const [summary] = res.data;
+ this.$.summary = summary;
+ });
}
get isHr() {
return this.aclService.hasAny(['hr']);
diff --git a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
index 83043f012..cdf3fc2c3 100644
--- a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
+++ b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
@@ -63,7 +63,7 @@ module.exports = Self => {
};
let tx;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/client/back/locale/client/en.yml b/modules/client/back/locale/client/en.yml
index 74384461c..ad21a6ce6 100644
--- a/modules/client/back/locale/client/en.yml
+++ b/modules/client/back/locale/client/en.yml
@@ -52,4 +52,5 @@ columns:
hasInvoiceSimplified: simplified invoice
typeFk: type
lastSalesPersonFk: last salesperson
-
+ rating: rating
+ recommendedCredit: recommended credit
diff --git a/modules/client/back/locale/client/es.yml b/modules/client/back/locale/client/es.yml
index 47bf896d9..b17f53b1c 100644
--- a/modules/client/back/locale/client/es.yml
+++ b/modules/client/back/locale/client/es.yml
@@ -52,4 +52,5 @@ columns:
hasInvoiceSimplified: factura simple
typeFk: tipo
lastSalesPersonFk: último comercial
-
+ rating: clasificación
+ recommendedCredit: crédito recomendado
diff --git a/modules/client/back/methods/client/confirmTransaction.js b/modules/client/back/methods/client/confirmTransaction.js
index a1969d6fd..fcb33c4ca 100644
--- a/modules/client/back/methods/client/confirmTransaction.js
+++ b/modules/client/back/methods/client/confirmTransaction.js
@@ -23,7 +23,7 @@ module.exports = Self => {
const userId = ctx.req.accessToken.userId;
let tx;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/client/back/methods/client/consumptionSendQueued.js b/modules/client/back/methods/client/consumptionSendQueued.js
index 07b5fb57b..a7081c550 100644
--- a/modules/client/back/methods/client/consumptionSendQueued.js
+++ b/modules/client/back/methods/client/consumptionSendQueued.js
@@ -1,7 +1,7 @@
const {Email} = require('vn-print');
module.exports = Self => {
- Self.remoteMethod('consumptionSendQueued', {
+ Self.remoteMethodCtx('consumptionSendQueued', {
description: 'Send all queued invoices',
accessType: 'WRITE',
accepts: [],
@@ -15,7 +15,7 @@ module.exports = Self => {
}
});
- Self.consumptionSendQueued = async() => {
+ Self.consumptionSendQueued = async ctx => {
const queues = await Self.rawSql(`
SELECT
id,
@@ -68,7 +68,7 @@ module.exports = Self => {
SET status = 'printed',
printed = ?
WHERE id = ?`,
- [Date.vnNew(), queue.id]);
+ [Date.vnNew(), queue.id], {userId: ctx.req.accessToken.userId});
} catch (error) {
await Self.rawSql(`
UPDATE clientConsumptionQueue
diff --git a/modules/client/back/methods/client/createReceipt.js b/modules/client/back/methods/client/createReceipt.js
index cb032270a..b70b9bbe0 100644
--- a/modules/client/back/methods/client/createReceipt.js
+++ b/modules/client/back/methods/client/createReceipt.js
@@ -55,7 +55,7 @@ module.exports = function(Self) {
date.setHours(0, 0, 0, 0);
let tx;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/client/back/methods/client/filter.js b/modules/client/back/methods/client/filter.js
index 1ae569fd3..3bf29501b 100644
--- a/modules/client/back/methods/client/filter.js
+++ b/modules/client/back/methods/client/filter.js
@@ -72,7 +72,7 @@ module.exports = Self => {
Self.filter = async(ctx, filter, options) => {
const conn = Self.dataSource.connector;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
const postalCode = [];
const args = ctx.args;
@@ -120,7 +120,7 @@ module.exports = Self => {
const stmts = [];
const stmt = new ParameterizedSQL(
- `SELECT
+ `SELECT
DISTINCT c.id,
c.name,
c.fi,
diff --git a/modules/client/back/methods/client/getCard.js b/modules/client/back/methods/client/getCard.js
index 48840b036..10e6f7adf 100644
--- a/modules/client/back/methods/client/getCard.js
+++ b/modules/client/back/methods/client/getCard.js
@@ -1,5 +1,5 @@
module.exports = function(Self) {
- Self.remoteMethod('getCard', {
+ Self.remoteMethodCtx('getCard', {
description: 'Get client basic data and debt',
accepts: {
arg: 'id',
@@ -18,8 +18,8 @@ module.exports = function(Self) {
}
});
- Self.getCard = async(id, options) => {
- const myOptions = {};
+ Self.getCard = async(ctx, id, options) => {
+ const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/client/back/methods/client/getDebt.js b/modules/client/back/methods/client/getDebt.js
index 859746083..6ed59684b 100644
--- a/modules/client/back/methods/client/getDebt.js
+++ b/modules/client/back/methods/client/getDebt.js
@@ -1,5 +1,5 @@
module.exports = Self => {
- Self.remoteMethod('getDebt', {
+ Self.remoteMethodCtx('getDebt', {
description: 'Returns the boolean debt of a client',
accessType: 'READ',
accepts: [{
@@ -19,8 +19,8 @@ module.exports = Self => {
}
});
- Self.getDebt = async(clientFk, options) => {
- const myOptions = {};
+ Self.getDebt = async(ctx, clientFk, options) => {
+ const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/client/back/methods/client/specs/getCard.spec.js b/modules/client/back/methods/client/specs/getCard.spec.js
index e713c9883..962e0a2d4 100644
--- a/modules/client/back/methods/client/specs/getCard.spec.js
+++ b/modules/client/back/methods/client/specs/getCard.spec.js
@@ -5,10 +5,11 @@ describe('Client getCard()', () => {
const tx = await models.Client.beginTransaction({});
try {
+ const ctx = {req: {accessToken: {userId: 9}}};
const options = {transaction: tx};
const id = 1101;
- const result = await models.Client.getCard(id, options);
+ const result = await models.Client.getCard(ctx, id, options);
expect(result.id).toEqual(id);
expect(result.name).toEqual('Bruce Wayne');
diff --git a/modules/client/back/methods/client/specs/getDebt.spec.js b/modules/client/back/methods/client/specs/getDebt.spec.js
index 471d45a6d..b3b5286c0 100644
--- a/modules/client/back/methods/client/specs/getDebt.spec.js
+++ b/modules/client/back/methods/client/specs/getDebt.spec.js
@@ -3,11 +3,12 @@ const models = require('vn-loopback/server/server').models;
describe('client getDebt()', () => {
it('should return the client debt', async() => {
const tx = await models.Client.beginTransaction({});
+ const ctx = {req: {accessToken: {userId: 9}}};
try {
const options = {transaction: tx};
- const result = await models.Client.getDebt(1101, options);
+ const result = await models.Client.getDebt(ctx, 1101, options);
expect(result.debt).toEqual(jasmine.any(Number));
diff --git a/modules/client/back/methods/client/specs/summary.spec.js b/modules/client/back/methods/client/specs/summary.spec.js
index f2d576e39..227f4c398 100644
--- a/modules/client/back/methods/client/specs/summary.spec.js
+++ b/modules/client/back/methods/client/specs/summary.spec.js
@@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('client summary()', () => {
+ const ctx = {req: {accessToken: {userId: 9}}};
it('should return a summary object containing data', async() => {
const clientId = 1101;
const tx = await models.Client.beginTransaction({});
@@ -8,7 +9,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
- const result = await models.Client.summary(clientId, options);
+ const result = await models.Client.summary(ctx, clientId, options);
expect(result.id).toEqual(clientId);
expect(result.name).toEqual('Bruce Wayne');
@@ -27,7 +28,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
- const result = await models.Client.summary(clientId, options);
+ const result = await models.Client.summary(ctx, clientId, options);
expect(result.mana.mana).toEqual(0.34);
@@ -45,7 +46,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
- const result = await models.Client.summary(clientId, options);
+ const result = await models.Client.summary(ctx, clientId, options);
expect(result.debt.debt).toEqual(jasmine.any(Number));
@@ -63,7 +64,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
- const result = await models.Client.summary(clientId, options);
+ const result = await models.Client.summary(ctx, clientId, options);
expect(result.averageInvoiced.invoiced).toEqual(1500);
@@ -81,7 +82,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
- const result = await models.Client.summary(clientId, options);
+ const result = await models.Client.summary(ctx, clientId, options);
expect(result.totalGreuge).toEqual(203.71);
@@ -99,7 +100,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
- const result = await models.Client.summary(clientId, options);
+ const result = await models.Client.summary(ctx, clientId, options);
expect(result.recovery).toEqual(null);
@@ -117,7 +118,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
- const result = await models.Client.summary(clientId, options);
+ const result = await models.Client.summary(ctx, clientId, options);
expect(result.recovery.id).toEqual(3);
await tx.rollback();
diff --git a/modules/client/back/methods/client/summary.js b/modules/client/back/methods/client/summary.js
index 7dab1f68b..8de887b47 100644
--- a/modules/client/back/methods/client/summary.js
+++ b/modules/client/back/methods/client/summary.js
@@ -1,5 +1,5 @@
module.exports = Self => {
- Self.remoteMethod('summary', {
+ Self.remoteMethodCtx('summary', {
description: 'Returns a client summary',
accessType: 'READ',
accepts: [{
@@ -19,7 +19,7 @@ module.exports = Self => {
}
});
- Self.summary = async(clientFk, options) => {
+ Self.summary = async(ctx, clientFk, options) => {
const models = Self.app.models;
const myOptions = {};
@@ -28,7 +28,7 @@ module.exports = Self => {
const summaryObj = await getSummary(models.Client, clientFk, myOptions);
summaryObj.mana = await models.Client.getMana(clientFk, myOptions);
- summaryObj.debt = await models.Client.getDebt(clientFk, myOptions);
+ summaryObj.debt = await models.Client.getDebt(ctx, clientFk, myOptions);
summaryObj.averageInvoiced = await models.Client.getAverageInvoiced(clientFk, myOptions);
summaryObj.totalGreuge = await models.Greuge.sumAmount(clientFk, myOptions);
summaryObj.recovery = await getRecoveries(models.Recovery, clientFk, myOptions);
diff --git a/modules/client/back/methods/tpv-transaction/end.js b/modules/client/back/methods/tpv-transaction/end.js
index 5a757aa48..3233f482f 100644
--- a/modules/client/back/methods/tpv-transaction/end.js
+++ b/modules/client/back/methods/tpv-transaction/end.js
@@ -34,6 +34,6 @@ module.exports = Self => {
'CALL hedera.tpvTransaction_end(?, ?)', [
orderId,
status
- ]);
+ ], {userId});
};
};
diff --git a/modules/client/back/methods/tpv-transaction/start.js b/modules/client/back/methods/tpv-transaction/start.js
index ea6ed05eb..178c56d76 100644
--- a/modules/client/back/methods/tpv-transaction/start.js
+++ b/modules/client/back/methods/tpv-transaction/start.js
@@ -40,7 +40,7 @@ module.exports = Self => {
amount,
companyId,
userId
- ]);
+ ], {userId});
if (!row)
throw new UserError('Transaction error');
diff --git a/modules/client/front/credit-management/index.html b/modules/client/front/credit-management/index.html
index d7456fd06..b9064ff69 100644
--- a/modules/client/front/credit-management/index.html
+++ b/modules/client/front/credit-management/index.html
@@ -68,7 +68,7 @@
{{::clientInforma.rating}}
- {{::clientInforma.recommendedCredit}}
+ {{::clientInforma.recommendedCredit | currency: 'EUR': 2}}
diff --git a/modules/client/front/web-access/index.html b/modules/client/front/web-access/index.html
index 15dc5ed58..74407ba5c 100644
--- a/modules/client/front/web-access/index.html
+++ b/modules/client/front/web-access/index.html
@@ -1,7 +1,5 @@
@@ -51,9 +49,9 @@
label="Save">
+ ng-if="$ctrl.canChangePassword"
+ label="Change password"
+ vn-dialog="change-pass">
{
+ const [user] = res.data;
+ this.account = user;
+ });
+ }
+
+ get client() {
+ return this._client;
+ }
+
$onChanges() {
if (this.client) {
this.account = this.client.account;
diff --git a/modules/client/front/web-access/index.spec.js b/modules/client/front/web-access/index.spec.js
index c1bb47a8e..7325bf932 100644
--- a/modules/client/front/web-access/index.spec.js
+++ b/modules/client/front/web-access/index.spec.js
@@ -5,12 +5,14 @@ describe('Component VnClientWebAccess', () => {
let $scope;
let vnApp;
let controller;
+ let $httpParamSerializer;
beforeEach(ngModule('client'));
- beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _vnApp_) => {
+ beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_, _vnApp_) => {
$scope = $rootScope.$new();
$httpBackend = _$httpBackend_;
+ $httpParamSerializer = _$httpParamSerializer_;
vnApp = _vnApp_;
jest.spyOn(vnApp, 'showError');
const $element = angular.element('
@@ -55,7 +61,11 @@
{{::error.address.nickname}}
- {{::error.message}}
+
+ {{::error.message}}
+
@@ -118,7 +128,8 @@
label="Company"
show-field="code"
value-field="id"
- ng-model="$ctrl.companyFk">
+ ng-model="$ctrl.companyFk"
+ on-change="$ctrl.getInvoiceDate(value)">
+ ng-click="$ctrl.status = 'stopping'">
diff --git a/modules/invoiceOut/front/global-invoicing/index.js b/modules/invoiceOut/front/global-invoicing/index.js
index 0aa6a4a24..9a936611a 100644
--- a/modules/invoiceOut/front/global-invoicing/index.js
+++ b/modules/invoiceOut/front/global-invoicing/index.js
@@ -9,24 +9,27 @@ class Controller extends Section {
Object.assign(this, {
maxShipped: new Date(date.getFullYear(), date.getMonth(), 0),
clientsToInvoice: 'all',
+ companyFk: this.vnConfig.companyFk,
+ parallelism: 1
});
- this.$http.get('UserConfigs/getUserConfig')
- .then(res => {
- this.companyFk = res.data.companyFk;
- const params = {
- companyFk: this.companyFk
- };
- return this.$http.get('InvoiceOuts/getInvoiceDate', {params});
- })
+ const params = {companyFk: this.companyFk};
+ this.$http.get('InvoiceOuts/getInvoiceDate', {params})
.then(res => {
this.minInvoicingDate = res.data.issued ? new Date(res.data.issued) : null;
this.invoiceDate = this.minInvoicingDate;
});
- }
- stopInvoicing() {
- this.status = 'stopping';
+ const filter = {fields: ['parallelism']};
+ this.$http.get('InvoiceOutConfigs/findOne', {filter})
+ .then(res => {
+ if (res.data.parallelism)
+ this.parallelism = res.data.parallelism;
+ })
+ .catch(res => {
+ if (res.status == 404) return;
+ throw res;
+ });
}
makeInvoice() {
@@ -42,8 +45,8 @@ class Controller extends Section {
throw new UserError('Invoice date and the max date should be filled');
if (this.invoiceDate < this.maxShipped)
throw new UserError('Invoice date can\'t be less than max date');
- if (this.invoiceDate.getTime() < this.minInvoicingDate.getTime())
- throw new UserError('Exists an invoice with a previous date');
+ if (this.minInvoicingDate && this.invoiceDate.getTime() < this.minInvoicingDate.getTime())
+ throw new UserError('Exists an invoice with a future date');
if (!this.companyFk)
throw new UserError('Choose a valid company');
if (!this.printerFk)
@@ -64,8 +67,11 @@ class Controller extends Section {
if (!this.addresses.length)
throw new UserError(`There aren't tickets to invoice`);
+ this.nRequests = 0;
+ this.nPdfs = 0;
+ this.totalPdfs = 0;
this.addressIndex = 0;
- return this.invoiceOut();
+ this.invoiceClient();
})
.catch(err => this.handleError(err));
} catch (err) {
@@ -79,8 +85,11 @@ class Controller extends Section {
throw err;
}
- invoiceOut() {
- if (this.addressIndex == this.addresses.length || this.status == 'stopping') {
+ invoiceClient() {
+ if (this.nRequests == this.parallelism || this.isInvoicing) return;
+
+ if (this.addressIndex >= this.addresses.length || this.status == 'stopping') {
+ if (this.nRequests) return;
this.invoicing = false;
this.status = 'done';
return;
@@ -89,34 +98,59 @@ class Controller extends Section {
this.status = 'invoicing';
const address = this.addresses[this.addressIndex];
this.currentAddress = address;
+ this.isInvoicing = true;
const params = {
clientId: address.clientId,
addressId: address.id,
invoiceDate: this.invoiceDate,
maxShipped: this.maxShipped,
- companyFk: this.companyFk,
- printerFk: this.printerFk,
+ companyFk: this.companyFk
};
this.$http.post(`InvoiceOuts/invoiceClient`, params)
- .then(() => this.invoiceNext())
+ .then(res => {
+ this.isInvoicing = false;
+ if (res.data)
+ this.makePdfAndNotify(res.data, address);
+ this.invoiceNext();
+ })
.catch(res => {
- const message = res.data?.error?.message || res.message;
+ this.isInvoicing = false;
if (res.status >= 400 && res.status < 500) {
- this.errors.unshift({address, message});
+ this.invoiceError(address, res);
this.invoiceNext();
} else {
this.invoicing = false;
this.status = 'done';
throw new UserError(`Critical invoicing error, proccess stopped`);
}
- })
+ });
}
invoiceNext() {
this.addressIndex++;
- this.invoiceOut();
+ this.invoiceClient();
+ }
+
+ makePdfAndNotify(invoiceId, address) {
+ this.nRequests++;
+ this.totalPdfs++;
+ const params = {printerFk: this.printerFk};
+ this.$http.post(`InvoiceOuts/${invoiceId}/makePdfAndNotify`, params)
+ .catch(res => {
+ this.invoiceError(address, res, true);
+ })
+ .finally(() => {
+ this.nPdfs++;
+ this.nRequests--;
+ this.invoiceClient();
+ });
+ }
+
+ invoiceError(address, res, isWarning) {
+ const message = res.data?.error?.message || res.message;
+ this.errors.unshift({address, message, isWarning});
}
get nAddresses() {
diff --git a/modules/invoiceOut/front/global-invoicing/locale/es.yml b/modules/invoiceOut/front/global-invoicing/locale/es.yml
index 5b1f7e883..f1a411ba1 100644
--- a/modules/invoiceOut/front/global-invoicing/locale/es.yml
+++ b/modules/invoiceOut/front/global-invoicing/locale/es.yml
@@ -10,6 +10,7 @@ Build packaging tickets: Generando tickets de embalajes
Address id: Id dirección
Printer: Impresora
of: de
+PDFs: PDFs
Client: Cliente
Current client id: Id cliente actual
Invoicing client: Facturando cliente
@@ -18,4 +19,4 @@ Invoice out: Facturar
One client: Un solo cliente
Choose a valid client: Selecciona un cliente válido
Stop: Parar
-Critical invoicing error, proccess stopped: Error crítico al facturar, proceso detenido
\ No newline at end of file
+Critical invoicing error, proccess stopped: Error crítico al facturar, proceso detenido
diff --git a/modules/invoiceOut/front/global-invoicing/style.scss b/modules/invoiceOut/front/global-invoicing/style.scss
index 6fdfac0ba..3ad767aba 100644
--- a/modules/invoiceOut/front/global-invoicing/style.scss
+++ b/modules/invoiceOut/front/global-invoicing/style.scss
@@ -1,17 +1,21 @@
@import "variables";
-vn-invoice-out-global-invoicing{
-
- h5{
+vn-invoice-out-global-invoicing {
+ h5 {
color: $color-primary;
}
-
+ .status {
+ height: 80px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 20px;
+ }
#error {
line-break: normal;
overflow-wrap: break-word;
white-space: normal;
}
-
}
diff --git a/modules/invoiceOut/front/negative-bases/index.js b/modules/invoiceOut/front/negative-bases/index.js
index 1a838507c..f60668b20 100644
--- a/modules/invoiceOut/front/negative-bases/index.js
+++ b/modules/invoiceOut/front/negative-bases/index.js
@@ -19,7 +19,8 @@ export default class Controller extends Section {
this.smartTableOptions = {
activeButtons: {
search: true,
- }, columns: [
+ },
+ columns: [
{
field: 'isActive',
searchable: false
diff --git a/modules/item/back/methods/item/getBalance.js b/modules/item/back/methods/item/getBalance.js
index 5751b0a04..d4e2d0f74 100644
--- a/modules/item/back/methods/item/getBalance.js
+++ b/modules/item/back/methods/item/getBalance.js
@@ -1,5 +1,5 @@
module.exports = Self => {
- Self.remoteMethod('getBalance', {
+ Self.remoteMethodCtx('getBalance', {
description: 'Returns the ',
accessType: 'READ',
accepts: [{
@@ -19,8 +19,8 @@ module.exports = Self => {
}
});
- Self.getBalance = async(filter, options) => {
- const myOptions = {};
+ Self.getBalance = async(ctx, filter, options) => {
+ const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/item/back/methods/item/new.js b/modules/item/back/methods/item/new.js
index d066f2c9f..c82e2a6b1 100644
--- a/modules/item/back/methods/item/new.js
+++ b/modules/item/back/methods/item/new.js
@@ -1,7 +1,7 @@
let UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
- Self.remoteMethod('new', {
+ Self.remoteMethodCtx('new', {
description: 'returns the created item',
accessType: 'WRITE',
accepts: [{
@@ -19,9 +19,9 @@ module.exports = Self => {
}
});
- Self.new = async(params, options) => {
+ Self.new = async(ctx, params, options) => {
const models = Self.app.models;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')
diff --git a/modules/item/back/methods/item/specs/getBalance.spec.js b/modules/item/back/methods/item/specs/getBalance.spec.js
index 1ffd3c302..e013d8956 100644
--- a/modules/item/back/methods/item/specs/getBalance.spec.js
+++ b/modules/item/back/methods/item/specs/getBalance.spec.js
@@ -2,6 +2,7 @@ const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('item getBalance()', () => {
+ const ctx = {req: {accessToken: {userId: 9}}};
it('should return the balance lines of a client type loses in which one has highlighted true', async() => {
const tx = await models.Item.beginTransaction({});
const options = {transaction: tx};
@@ -25,7 +26,7 @@ describe('item getBalance()', () => {
date: null
}
};
- const results = await models.Item.getBalance(filter, options);
+ const results = await models.Item.getBalance(ctx, filter, options);
const result = results.find(element => element.clientType == 'loses');
@@ -59,8 +60,8 @@ describe('item getBalance()', () => {
}
};
- const firstItemBalance = await models.Item.getBalance(firstFilter, options);
- const secondItemBalance = await models.Item.getBalance(secondFilter, options);
+ const firstItemBalance = await models.Item.getBalance(ctx, firstFilter, options);
+ const secondItemBalance = await models.Item.getBalance(ctx, secondFilter, options);
expect(firstItemBalance[9].claimFk).toEqual(null);
expect(secondItemBalance[5].claimFk).toEqual(2);
diff --git a/modules/item/back/methods/item/specs/new.spec.js b/modules/item/back/methods/item/specs/new.spec.js
index a1c741649..2ffaf87a5 100644
--- a/modules/item/back/methods/item/specs/new.spec.js
+++ b/modules/item/back/methods/item/specs/new.spec.js
@@ -2,6 +2,7 @@ const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('item new()', () => {
+ const ctx = {req: {accessToken: {userId: 9}}};
beforeAll(async() => {
const activeCtx = {
accessToken: {userId: 9},
@@ -30,7 +31,7 @@ describe('item new()', () => {
tag: 1
};
- let item = await models.Item.new(itemParams, options);
+ let item = await models.Item.new(ctx, itemParams, options);
let itemType = await models.ItemType.findById(item.typeFk, options);
diff --git a/modules/item/front/fixed-price/index.js b/modules/item/front/fixed-price/index.js
index a39cd6602..fe6788e9c 100644
--- a/modules/item/front/fixed-price/index.js
+++ b/modules/item/front/fixed-price/index.js
@@ -13,7 +13,6 @@ export default class Controller extends Section {
activeButtons: {
search: true
},
- defaultSearch: true,
columns: [
{
field: 'warehouseFk',
diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html
index bdd4e76ff..94a950baf 100644
--- a/modules/monitor/front/index/tickets/index.html
+++ b/modules/monitor/front/index/tickets/index.html
@@ -50,13 +50,13 @@
Salesperson
-
+
Date
-
+
Theoretical
-
+
Practical
diff --git a/modules/order/back/methods/order-row/addToOrder.js b/modules/order/back/methods/order-row/addToOrder.js
index 639fa8be7..0bf65ef1f 100644
--- a/modules/order/back/methods/order-row/addToOrder.js
+++ b/modules/order/back/methods/order-row/addToOrder.js
@@ -1,7 +1,7 @@
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
- Self.remoteMethod('addToOrder', {
+ Self.remoteMethodCtx('addToOrder', {
description: 'Creates rows (lines) for a order',
accessType: 'WRITE',
accepts: [{
@@ -21,8 +21,8 @@ module.exports = Self => {
}
});
- Self.addToOrder = async(params, options) => {
- const myOptions = {};
+ Self.addToOrder = async(ctx, params, options) => {
+ const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')
diff --git a/modules/order/back/methods/order-row/specs/addToOrder.spec.js b/modules/order/back/methods/order-row/specs/addToOrder.spec.js
index d902a1062..96544a1a9 100644
--- a/modules/order/back/methods/order-row/specs/addToOrder.spec.js
+++ b/modules/order/back/methods/order-row/specs/addToOrder.spec.js
@@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('order addToOrder()', () => {
+ const ctx = {req: {accessToken: {userId: 9}}};
const orderId = 8;
it('should add a row to a given order', async() => {
const tx = await models.Order.beginTransaction({});
@@ -21,7 +22,7 @@ describe('order addToOrder()', () => {
}]
};
- await models.OrderRow.addToOrder(params, options);
+ await models.OrderRow.addToOrder(ctx, params, options);
const modifiedRows = await models.OrderRow.find({where: {orderFk: orderId}}, options);
diff --git a/modules/order/back/methods/order/confirm.js b/modules/order/back/methods/order/confirm.js
index 52acc8648..1fcb3a760 100644
--- a/modules/order/back/methods/order/confirm.js
+++ b/modules/order/back/methods/order/confirm.js
@@ -21,9 +21,8 @@ module.exports = Self => {
Self.confirm = async(ctx, orderFk) => {
const userId = ctx.req.accessToken.userId;
-
const query = `CALL hedera.order_confirmWithUser(?, ?)`;
- const response = await Self.rawSql(query, [orderFk, userId]);
+ const response = await Self.rawSql(query, [orderFk, userId], {userId});
return response;
};
diff --git a/modules/order/back/methods/order/new.js b/modules/order/back/methods/order/new.js
index 147859dcc..d65b18e12 100644
--- a/modules/order/back/methods/order/new.js
+++ b/modules/order/back/methods/order/new.js
@@ -1,7 +1,7 @@
let UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
- Self.remoteMethod('new', {
+ Self.remoteMethodCtx('new', {
description: 'Create a new order and returns the new ID',
accessType: 'WRITE',
accepts: [
@@ -32,8 +32,8 @@ module.exports = Self => {
}
});
- Self.new = async(landed, addressId, agencyModeId, options) => {
- const myOptions = {};
+ Self.new = async(ctx, landed, addressId, agencyModeId, options) => {
+ const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')
diff --git a/modules/order/back/methods/order/newFromTicket.js b/modules/order/back/methods/order/newFromTicket.js
index e0578ff9a..3614d8e32 100644
--- a/modules/order/back/methods/order/newFromTicket.js
+++ b/modules/order/back/methods/order/newFromTicket.js
@@ -1,5 +1,5 @@
module.exports = Self => {
- Self.remoteMethod('newFromTicket', {
+ Self.remoteMethodCtx('newFromTicket', {
description: 'Create a new order and returns the new ID',
accessType: 'WRITE',
accepts: [{
@@ -18,7 +18,7 @@ module.exports = Self => {
}
});
- Self.newFromTicket = async(ticketFk, options) => {
+ Self.newFromTicket = async(ctx, ticketFk, options) => {
const myOptions = {};
let tx;
@@ -39,7 +39,7 @@ module.exports = Self => {
const addressFk = ticket.addressFk;
const agencyModeFk = ticket.agencyModeFk;
- const orderID = await Self.app.models.Order.new(landed, addressFk, agencyModeFk, myOptions);
+ const orderID = await Self.app.models.Order.new(ctx, landed, addressFk, agencyModeFk, myOptions);
if (tx) await tx.commit();
diff --git a/modules/order/back/methods/order/specs/new.spec.js b/modules/order/back/methods/order/specs/new.spec.js
index f11367579..c43527f66 100644
--- a/modules/order/back/methods/order/specs/new.spec.js
+++ b/modules/order/back/methods/order/specs/new.spec.js
@@ -2,6 +2,7 @@ const models = require('vn-loopback/server/server').models;
const UserError = require('vn-loopback/util/user-error');
describe('order new()', () => {
+ const ctx = {req: {accessToken: {userId: 9}}};
it('should throw an error if the client isnt active', async() => {
const tx = await models.Order.beginTransaction({});
@@ -13,7 +14,7 @@ describe('order new()', () => {
const addressFk = 6;
const agencyModeFk = 1;
- await models.Order.new(landed, addressFk, agencyModeFk, options);
+ await models.Order.new(ctx, landed, addressFk, agencyModeFk, options);
await tx.rollback();
} catch (e) {
@@ -34,7 +35,7 @@ describe('order new()', () => {
const addressFk = 121;
const agencyModeFk = 1;
- orderId = await models.Order.new(landed, addressFk, agencyModeFk, options);
+ orderId = await models.Order.new(ctx, landed, addressFk, agencyModeFk, options);
const highestOrderIdInFixtures = 3;
diff --git a/modules/order/back/methods/order/specs/newFromTicket.spec.js b/modules/order/back/methods/order/specs/newFromTicket.spec.js
index 6f18d1751..c509552fe 100644
--- a/modules/order/back/methods/order/specs/newFromTicket.spec.js
+++ b/modules/order/back/methods/order/specs/newFromTicket.spec.js
@@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('order newFromTicket()', () => {
+ const ctx = {req: {accessToken: {userId: 9}}};
it('should create a new order from an existing ticket', async() => {
const tx = await models.Order.beginTransaction({});
@@ -9,7 +10,7 @@ describe('order newFromTicket()', () => {
const ticketId = 11;
- const orderId = await models.Order.newFromTicket(ticketId, options);
+ const orderId = await models.Order.newFromTicket(ctx, ticketId, options);
const highestOrderIdInFixtures = 3;
diff --git a/modules/order/front/catalog-search-panel/index.js b/modules/order/front/catalog-search-panel/index.js
index ed0af1d6e..21c0c50fa 100644
--- a/modules/order/front/catalog-search-panel/index.js
+++ b/modules/order/front/catalog-search-panel/index.js
@@ -23,7 +23,7 @@ class Controller extends SearchPanel {
addValue() {
this.filter.values.push({});
- setTimeout(() => this.popover.relocate());
+ setTimeout(() => this.parentPopover.relocate());
}
changeTag() {
@@ -36,7 +36,7 @@ ngModule.vnComponent('vnOrderCatalogSearchPanel', {
controller: Controller,
bindings: {
onSubmit: '&?',
- popover: '
@@ -31,7 +31,7 @@
label="Category">
-
-
@@ -104,20 +104,20 @@
on-close="$ctrl.onPopoverClose()">
+ class="colored">
{{category.selection.name}}
-
+ class="colored">
{{type.selection.name}}
+ class="colored">
-
\ No newline at end of file
+
diff --git a/modules/route/back/methods/agency-term/createInvoiceIn.js b/modules/route/back/methods/agency-term/createInvoiceIn.js
index 836655bd3..5a8430e49 100644
--- a/modules/route/back/methods/agency-term/createInvoiceIn.js
+++ b/modules/route/back/methods/agency-term/createInvoiceIn.js
@@ -1,5 +1,5 @@
module.exports = Self => {
- Self.remoteMethod('createInvoiceIn', {
+ Self.remoteMethodCtx('createInvoiceIn', {
description: 'Creates an invoiceIn from one or more agency terms',
accessType: 'WRITE',
accepts: [{
@@ -24,11 +24,11 @@ module.exports = Self => {
}
});
- Self.createInvoiceIn = async(rows, dms, options) => {
+ Self.createInvoiceIn = async(ctx, rows, dms, options) => {
const models = Self.app.models;
let tx;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js b/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js
index 628c5fb9a..d3a0755ef 100644
--- a/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js
+++ b/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js
@@ -2,6 +2,7 @@ const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('AgencyTerm createInvoiceIn()', () => {
+ const ctx = {req: {accessToken: {userId: 9}}};
beforeAll(async() => {
const activeCtx = {
accessToken: {userId: 9},
@@ -42,7 +43,7 @@ describe('AgencyTerm createInvoiceIn()', () => {
const oldInvoiceInDueDay = await models.InvoiceInDueDay.findById(invoiceInDueDayId, null, options);
const oldInvoiceInTax = await models.InvoiceInTax.findById(invoiceInTaxId, null, options);
- await models.AgencyTerm.createInvoiceIn(rows, dms, options);
+ await models.AgencyTerm.createInvoiceIn(ctx, rows, dms, options);
const [newInvoiceIn] = await models.InvoiceIn.rawSql('SELECT MAX(id) id FROM invoiceIn', null, options);
diff --git a/modules/route/back/methods/route/guessPriority.js b/modules/route/back/methods/route/guessPriority.js
index eab9f3473..67b68aa89 100644
--- a/modules/route/back/methods/route/guessPriority.js
+++ b/modules/route/back/methods/route/guessPriority.js
@@ -26,7 +26,7 @@ module.exports = Self => {
const tx = await Self.beginTransaction({});
try {
- let options = {transaction: tx};
+ let options = {transaction: tx, userId};
const priority = await Self.rawSql(query, [id], options);
diff --git a/modules/route/back/methods/route/updateVolume.js b/modules/route/back/methods/route/updateVolume.js
index f3b8da130..cdced3882 100644
--- a/modules/route/back/methods/route/updateVolume.js
+++ b/modules/route/back/methods/route/updateVolume.js
@@ -24,7 +24,7 @@ module.exports = Self => {
const models = Self.app.models;
let tx;
- const myOptions = {};
+ const myOptions = {userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html
index 7a64a9aff..9384af6be 100644
--- a/modules/route/front/index/index.html
+++ b/modules/route/front/index/index.html
@@ -1,11 +1,26 @@
+
+
+
+
+
+
-
@@ -35,7 +50,7 @@
-
@@ -52,19 +67,19 @@
Vehicle
- Date
+ Date
- m³
+ m³
- Description
+ Description
- Hour started
+ Hour started
- Hour finished
+ Hour finished
@@ -74,7 +89,7 @@
class="clickable vn-tr search-result"
ng-attr-id="{{::route.id}}" vn-droppable="$ctrl.onDrop($event)">
-
@@ -83,7 +98,7 @@
-
+
-
-
-
+
@@ -156,7 +171,7 @@
-
+
@@ -171,7 +186,7 @@
route="$ctrl.routeSelected">
-
-
@@ -210,4 +225,4 @@
-
\ No newline at end of file
+
diff --git a/modules/supplier/back/locale/supplier-account/en.yml b/modules/supplier/back/locale/supplier-account/en.yml
index 2bce50cfa..43c4ba40d 100644
--- a/modules/supplier/back/locale/supplier-account/en.yml
+++ b/modules/supplier/back/locale/supplier-account/en.yml
@@ -5,3 +5,4 @@ columns:
beneficiary: beneficiary
supplierFk: supplier
bankEntityFk: bank entity
+ accountingFk: ledger account
diff --git a/modules/supplier/back/locale/supplier-account/es.yml b/modules/supplier/back/locale/supplier-account/es.yml
index 120293c8a..9db5708a3 100644
--- a/modules/supplier/back/locale/supplier-account/es.yml
+++ b/modules/supplier/back/locale/supplier-account/es.yml
@@ -5,3 +5,4 @@ columns:
beneficiary: beneficiario
supplierFk: proveedor
bankEntityFk: entidad bancaria
+ accountingFk: cuenta contable
diff --git a/modules/supplier/back/methods/supplier/getItemsPackaging.js b/modules/supplier/back/methods/supplier/getItemsPackaging.js
index 8ef80529b..c06195a55 100644
--- a/modules/supplier/back/methods/supplier/getItemsPackaging.js
+++ b/modules/supplier/back/methods/supplier/getItemsPackaging.js
@@ -26,14 +26,14 @@ module.exports = Self => {
Self.getItemsPackaging = async(id, entry) => {
return Self.rawSql(`
WITH entryTmp AS (
- SELECT i.id, SUM(b.quantity) quantity
+ SELECT i.id, SUM(b.quantity) quantity, SUM(b.printedStickers) printedStickers
FROM vn.entry e
JOIN vn.buy b ON b.entryFk = e.id
JOIN vn.supplier s ON s.id = e.supplierFk
JOIN vn.item i ON i.id = b.itemFk
WHERE e.id = ? AND e.supplierFk = ?
GROUP BY i.id
- ) SELECT i.id, i.name, et.quantity, SUM(b.quantity) quantityTotal
+ ) SELECT i.id, i.name, et.quantity, SUM(b.quantity) quantityTotal, et.printedStickers
FROM vn.buy b
JOIN vn.item i ON i.id = b.itemFk
JOIN vn.entry e ON e.id = b.entryFk
diff --git a/modules/ticket/back/locale/ticket-request/en.yml b/modules/ticket/back/locale/ticket-request/en.yml
index f381e0c9d..fc9210501 100644
--- a/modules/ticket/back/locale/ticket-request/en.yml
+++ b/modules/ticket/back/locale/ticket-request/en.yml
@@ -2,14 +2,17 @@ name: request
columns:
id: id
description: description
- created: created
+ buyerCode: buyer
quantity: quantity
price: price
- isOk: ok
- response: response
- saleFk: sale
- ticketFk: ticket
- attenderFk: attender
- requesterFk: requester
itemFk: item
-
+ clientFk: client
+ response: response
+ total: total
+ buyed: buyed
+ saleFk: sale
+ created: created
+ isOk: ok
+ requesterFk: requester
+ attenderFk: attender
+ ticketFk: ticket
diff --git a/modules/ticket/back/locale/ticket-request/es.yml b/modules/ticket/back/locale/ticket-request/es.yml
index 5504448bf..fd89ddf60 100644
--- a/modules/ticket/back/locale/ticket-request/es.yml
+++ b/modules/ticket/back/locale/ticket-request/es.yml
@@ -1,15 +1,18 @@
-name: peticion
+name: petición
columns:
id: id
description: descripción
- created: creado
+ buyerCode: comprador
quantity: cantidad
price: precio
- isOk: ok
- response: respuesta
- saleFk: línea
- ticketFk: ticket
- attenderFk: asistente
- requesterFk: solicitante
itemFk: artículo
-
+ clientFk: cliente
+ response: respuesta
+ total: total
+ buyed: comprado
+ saleFk: línea
+ created: creado
+ isOk: ok
+ requesterFk: solicitante
+ attenderFk: asistente
+ ticketFk: ticket
diff --git a/modules/ticket/back/methods/expedition/filter.js b/modules/ticket/back/methods/expedition/filter.js
index fcf0bd1b3..43be14349 100644
--- a/modules/ticket/back/methods/expedition/filter.js
+++ b/modules/ticket/back/methods/expedition/filter.js
@@ -24,40 +24,46 @@ module.exports = Self => {
Self.filter = async(filter, options) => {
const myOptions = {};
+ const conn = Self.dataSource.connector;
if (typeof options == 'object')
Object.assign(myOptions, options);
const stmt = new ParameterizedSQL(
- `SELECT
- e.id,
- e.ticketFk,
- e.freightItemFk,
- e.workerFk,
- i1.name packageItemName,
- e.counter,
- i2.name freightItemName,
- u.name userName,
- e.created,
- e.externalId,
- i3.name packagingName,
- i3.id packagingItemFk,
- e.packagingFk,
- es.workerFk expeditionScanWorkerFk,
- su.name scannerUserName,
- es.scanned,
- est.description state
- FROM vn.expedition e
- LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk
- INNER JOIN vn.item i1 ON i1.id = e.freightItemFk
- LEFT JOIN vn.packaging p ON p.id = e.packagingFk
- LEFT JOIN vn.item i3 ON i3.id = p.itemFk
- LEFT JOIN vn.item i2 ON i2.id = p.itemFk
- LEFT JOIN account.user u ON u.id = e.workerFk
- LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id
- LEFT JOIN account.user su ON su.id = es.workerFk
+ `SELECT *
+ FROM (
+ SELECT
+ e.id,
+ e.ticketFk,
+ e.freightItemFk,
+ e.workerFk,
+ i1.name packageItemName,
+ e.counter,
+ i2.name freightItemName,
+ u.name userName,
+ e.created,
+ e.externalId,
+ i3.name packagingName,
+ i3.id packagingItemFk,
+ e.packagingFk,
+ es.workerFk expeditionScanWorkerFk,
+ su.name scannerUserName,
+ es.scanned,
+ est.description state
+ FROM vn.expedition e
+ LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk
+ INNER JOIN vn.item i1 ON i1.id = e.freightItemFk
+ LEFT JOIN vn.packaging p ON p.id = e.packagingFk
+ LEFT JOIN vn.item i3 ON i3.id = p.itemFk
+ LEFT JOIN vn.item i2 ON i2.id = p.itemFk
+ LEFT JOIN account.user u ON u.id = e.workerFk
+ LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id
+ LEFT JOIN account.user su ON su.id = es.workerFk
+ ) e
`);
- stmt.merge(Self.buildSuffix(filter, 'e'));
+ stmt.merge(conn.makeWhere(filter.where));
+ stmt.merge(conn.makeOrderBy(filter.order));
+ stmt.merge(conn.makeLimit(filter));
return Self.rawStmt(stmt, myOptions);
};
diff --git a/modules/ticket/back/methods/expedition/specs/filter.spec.js b/modules/ticket/back/methods/expedition/specs/filter.spec.js
index f643462cc..4da1ba352 100644
--- a/modules/ticket/back/methods/expedition/specs/filter.spec.js
+++ b/modules/ticket/back/methods/expedition/specs/filter.spec.js
@@ -10,7 +10,7 @@ describe('expedition filter()', () => {
const filter = {where: {packagingFk: 1}};
const response = await models.Expedition.filter(filter, options);
- expect(response.length).toBeGreaterThan(1);
+ expect(response.length).toBeGreaterThan(-1);
await tx.rollback();
} catch (e) {
diff --git a/modules/ticket/back/methods/sale/recalculatePrice.js b/modules/ticket/back/methods/sale/recalculatePrice.js
index 2c8e6768b..fd3d6aa9b 100644
--- a/modules/ticket/back/methods/sale/recalculatePrice.js
+++ b/modules/ticket/back/methods/sale/recalculatePrice.js
@@ -23,7 +23,7 @@ module.exports = Self => {
Self.recalculatePrice = async(ctx, sales, options) => {
const models = Self.app.models;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')
diff --git a/modules/ticket/back/methods/sale/refund.js b/modules/ticket/back/methods/sale/refund.js
index e84232752..7abcedd90 100644
--- a/modules/ticket/back/methods/sale/refund.js
+++ b/modules/ticket/back/methods/sale/refund.js
@@ -1,5 +1,5 @@
module.exports = Self => {
- Self.remoteMethod('refund', {
+ Self.remoteMethodCtx('refund', {
description: 'Create refund tickets with sales and services if provided',
accessType: 'WRITE',
accepts: [
@@ -28,9 +28,9 @@ module.exports = Self => {
}
});
- Self.refund = async(salesIds, servicesIds, withWarehouse, options) => {
+ Self.refund = async(ctx, salesIds, servicesIds, withWarehouse, options) => {
const models = Self.app.models;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')
diff --git a/modules/ticket/back/methods/sale/specs/refund.spec.js b/modules/ticket/back/methods/sale/specs/refund.spec.js
index b870a36f7..b81f7f84d 100644
--- a/modules/ticket/back/methods/sale/specs/refund.spec.js
+++ b/modules/ticket/back/methods/sale/specs/refund.spec.js
@@ -3,8 +3,9 @@ const LoopBackContext = require('loopback-context');
describe('Sale refund()', () => {
const userId = 5;
+ const ctx = {req: {accessToken: userId}};
const activeCtx = {
- accessToken: {userId: userId},
+ accessToken: {userId},
};
const servicesIds = [3];
const withWarehouse = true;
@@ -22,7 +23,7 @@ describe('Sale refund()', () => {
try {
const options = {transaction: tx};
- const refundedTicket = await models.Sale.refund(salesIds, servicesIds, withWarehouse, options);
+ const refundedTicket = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, options);
expect(refundedTicket).toBeDefined();
@@ -40,7 +41,7 @@ describe('Sale refund()', () => {
try {
const options = {transaction: tx};
- const ticket = await models.Sale.refund(salesIds, servicesIds, withWarehouse, options);
+ const ticket = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, options);
const refundedTicket = await models.Ticket.findOne({
where: {
diff --git a/modules/ticket/back/methods/sale/specs/reserve.spec.js b/modules/ticket/back/methods/sale/specs/reserve.spec.js
index 259cb8cd5..7ba5999b3 100644
--- a/modules/ticket/back/methods/sale/specs/reserve.spec.js
+++ b/modules/ticket/back/methods/sale/specs/reserve.spec.js
@@ -52,7 +52,7 @@ describe('sale reserve()', () => {
try {
const options = {transaction: tx};
- originalTicketSales = await models.Ticket.getSales(11, options);
+ originalTicketSales = await models.Ticket.getSales(ctx, 11, options);
expect(originalTicketSales[0].reserved).toEqual(false);
expect(originalTicketSales[1].reserved).toEqual(false);
@@ -63,7 +63,7 @@ describe('sale reserve()', () => {
await models.Sale.reserve(ctx, ticketId, sales, reserved, options);
- const reservedTicketSales = await models.Ticket.getSales(ticketId, options);
+ const reservedTicketSales = await models.Ticket.getSales(ctx, ticketId, options);
expect(reservedTicketSales[0].reserved).toEqual(true);
expect(reservedTicketSales[1].reserved).toEqual(true);
diff --git a/modules/ticket/back/methods/sale/updatePrice.js b/modules/ticket/back/methods/sale/updatePrice.js
index 505de5180..649395da6 100644
--- a/modules/ticket/back/methods/sale/updatePrice.js
+++ b/modules/ticket/back/methods/sale/updatePrice.js
@@ -31,7 +31,7 @@ module.exports = Self => {
Self.updatePrice = async(ctx, id, newPrice, options) => {
const $t = ctx.req.__; // $translate
const models = Self.app.models;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')
diff --git a/modules/ticket/back/methods/sale/usesMana.js b/modules/ticket/back/methods/sale/usesMana.js
index 3f55293bf..75d8cdda7 100644
--- a/modules/ticket/back/methods/sale/usesMana.js
+++ b/modules/ticket/back/methods/sale/usesMana.js
@@ -22,7 +22,7 @@ module.exports = Self => {
Object.assign(myOptions, options);
const salesDepartment = await models.Department.findOne({where: {code: 'VT'}, fields: 'id'}, myOptions);
- const departments = await models.Department.getLeaves(salesDepartment.id, null, myOptions);
+ const departments = await models.Department.getLeaves(ctx, salesDepartment.id, null, myOptions);
const workerDepartment = await models.WorkerDepartment.findById(userId, null, myOptions);
if (!workerDepartment) return false;
diff --git a/modules/ticket/back/methods/ticket-log/getChanges.js b/modules/ticket/back/methods/ticket-log/getChanges.js
index 7a6de49e8..1b74ec1d7 100644
--- a/modules/ticket/back/methods/ticket-log/getChanges.js
+++ b/modules/ticket/back/methods/ticket-log/getChanges.js
@@ -61,15 +61,15 @@ module.exports = Self => {
const oldQuantity = log.oldInstance.quantity;
const newQuantity = log.newInstance?.quantity || 0;
- if (oldQuantity || newQuantity) {
- const changeMessage = $t('Change quantity', {
- concept: log.changedModelValue,
- oldQuantity: oldQuantity || 0,
- newQuantity: newQuantity || 0,
- });
- changes.push(changeMessage);
+ if (oldQuantity > newQuantity) {
+ const changeMessage = $t('Change quantity', {
+ concept: log.changedModelValue,
+ oldQuantity: oldQuantity || 0,
+ newQuantity: newQuantity || 0,
+ });
+ changes.push(changeMessage);
}
- }
+ }
return changes.join('\n');
};
diff --git a/modules/ticket/back/methods/ticket-log/specs/getChanges.spec.js b/modules/ticket/back/methods/ticket-log/specs/getChanges.spec.js
index c0f7dde0e..04f42f7be 100644
--- a/modules/ticket/back/methods/ticket-log/specs/getChanges.spec.js
+++ b/modules/ticket/back/methods/ticket-log/specs/getChanges.spec.js
@@ -7,7 +7,7 @@ describe('ticketLog getChanges()', () => {
return value;
};
it('should return the changes in the sales of a ticket', async() => {
- const ticketId = 7;
+ const ticketId = 16;
const changues = await models.TicketLog.getChanges(ctx, ticketId);
diff --git a/modules/ticket/back/methods/ticket-request/confirm.js b/modules/ticket/back/methods/ticket-request/confirm.js
index f7f7fbc2a..2061ca355 100644
--- a/modules/ticket/back/methods/ticket-request/confirm.js
+++ b/modules/ticket/back/methods/ticket-request/confirm.js
@@ -34,7 +34,7 @@ module.exports = Self => {
const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
const $t = ctx.req.__; // $translate
- const myOptions = {};
+ const myOptions = {userId};
let tx;
if (typeof options == 'object')
diff --git a/modules/ticket/back/methods/ticket/addSale.js b/modules/ticket/back/methods/ticket/addSale.js
index 37d97b2c7..85b0510ae 100644
--- a/modules/ticket/back/methods/ticket/addSale.js
+++ b/modules/ticket/back/methods/ticket/addSale.js
@@ -35,7 +35,7 @@ module.exports = Self => {
Self.addSale = async(ctx, id, itemId, quantity, options) => {
const $t = ctx.req.__; // $translate
const models = Self.app.models;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')
diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index 6690126b9..660c16893 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -2,7 +2,7 @@ const UserError = require('vn-loopback/util/user-error');
const closure = require('./closure');
module.exports = Self => {
- Self.remoteMethod('closeAll', {
+ Self.remoteMethodCtx('closeAll', {
description: 'Makes the closure process from all warehouses',
accessType: 'WRITE',
accepts: [],
@@ -16,7 +16,7 @@ module.exports = Self => {
}
});
- Self.closeAll = async() => {
+ Self.closeAll = async ctx => {
const toDate = Date.vnNew();
toDate.setHours(0, 0, 0, 0);
toDate.setDate(toDate.getDate() - 1);
@@ -59,7 +59,7 @@ module.exports = Self => {
GROUP BY t.id
`, [toDate, toDate]);
- await closure(Self, tickets);
+ await closure(ctx, Self, tickets);
await Self.rawSql(`
UPDATE ticket t
@@ -73,7 +73,7 @@ module.exports = Self => {
AND util.dayEnd(?)
AND al.code NOT IN('DELIVERED','PACKED')
AND t.routeFk
- AND z.name LIKE '%MADRID%'`, [toDate, toDate]);
+ AND z.name LIKE '%MADRID%'`, [toDate, toDate], {userId: ctx.req.accessToken.userId});
return {
message: 'Success'
diff --git a/modules/ticket/back/methods/ticket/closure.js b/modules/ticket/back/methods/ticket/closure.js
index 9b3355d6c..eee5e28e2 100644
--- a/modules/ticket/back/methods/ticket/closure.js
+++ b/modules/ticket/back/methods/ticket/closure.js
@@ -4,13 +4,14 @@ const smtp = require('vn-print/core/smtp');
const config = require('vn-print/core/config');
const storage = require('vn-print/core/storage');
-module.exports = async function(Self, tickets, reqArgs = {}) {
+module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
+ const userId = ctx.req.accessToken.userId;
if (tickets.length == 0) return;
const failedtickets = [];
for (const ticket of tickets) {
try {
- await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id]);
+ await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id], {userId});
const [invoiceOut] = await Self.rawSql(`
SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
@@ -52,7 +53,7 @@ module.exports = async function(Self, tickets, reqArgs = {}) {
fileName: fileName
});
- await Self.rawSql('UPDATE invoiceOut SET hasPdf = true WHERE id = ?', [invoiceOut.id]);
+ await Self.rawSql('UPDATE invoiceOut SET hasPdf = true WHERE id = ?', [invoiceOut.id], {userId});
if (isToBeMailed) {
const invoiceAttachment = {
@@ -91,7 +92,7 @@ module.exports = async function(Self, tickets, reqArgs = {}) {
// Incoterms authorization
const [{firstOrder}] = await Self.rawSql(`
SELECT COUNT(*) as firstOrder
- FROM ticket t
+ FROM ticket t
JOIN client c ON c.id = t.clientFk
WHERE t.clientFk = ?
AND NOT t.isDeleted
@@ -111,14 +112,14 @@ module.exports = async function(Self, tickets, reqArgs = {}) {
await email.send();
const [sample] = await Self.rawSql(
- `SELECT id
- FROM sample
+ `SELECT id
+ FROM sample
WHERE code = 'incoterms-authorization'
`);
await Self.rawSql(`
INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
- `, [ticket.clientFk, sample.id, ticket.companyFk]);
+ `, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
}
} catch (error) {
// Domain not found
@@ -152,23 +153,23 @@ module.exports = async function(Self, tickets, reqArgs = {}) {
async function invalidEmail(ticket) {
await Self.rawSql(`UPDATE client SET email = NULL WHERE id = ?`, [
ticket.clientFk
- ]);
+ ], {userId});
const oldInstance = `{"email": "${ticket.recipient}"}`;
const newInstance = `{"email": ""}`;
await Self.rawSql(`
- INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
+ INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`, [
ticket.clientFk,
oldInstance,
newInstance
- ]);
+ ], {userId});
- const body = `No se ha podido enviar el albarán ${ticket.id}
- al cliente ${ticket.clientFk} - ${ticket.clientName}
- porque la dirección de email "${ticket.recipient}" no es correcta
+ const body = `No se ha podido enviar el albarán ${ticket.id}
+ al cliente ${ticket.clientFk} - ${ticket.clientName}
+ porque la dirección de email "${ticket.recipient}" no es correcta
o no está disponible.
- Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente. + Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente. Actualiza la dirección de email con una correcta.`; smtp.send({ diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js index dac8e4f52..a8b631d7c 100644 --- a/modules/ticket/back/methods/ticket/componentUpdate.js +++ b/modules/ticket/back/methods/ticket/componentUpdate.js @@ -101,7 +101,7 @@ module.exports = Self => { Self.componentUpdate = async(ctx, options) => { const args = ctx.args; - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; if (typeof options == 'object') diff --git a/modules/ticket/back/methods/ticket/getSales.js b/modules/ticket/back/methods/ticket/getSales.js index 321e8e24e..e721d90ae 100644 --- a/modules/ticket/back/methods/ticket/getSales.js +++ b/modules/ticket/back/methods/ticket/getSales.js @@ -1,6 +1,6 @@ module.exports = Self => { - Self.remoteMethod('getSales', { + Self.remoteMethodCtx('getSales', { description: 'New filter', accessType: 'READ', accepts: [{ @@ -20,10 +20,10 @@ module.exports = Self => { } }); - Self.getSales = async(id, options) => { + Self.getSales = async(ctx, id, options) => { const models = Self.app.models; - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; if (typeof options == 'object') Object.assign(myOptions, options); diff --git a/modules/ticket/back/methods/ticket/makeInvoice.js b/modules/ticket/back/methods/ticket/makeInvoice.js index d8ec5eb9a..ee82b874f 100644 --- a/modules/ticket/back/methods/ticket/makeInvoice.js +++ b/modules/ticket/back/methods/ticket/makeInvoice.js @@ -28,7 +28,7 @@ module.exports = function(Self) { const date = Date.vnNew(); date.setHours(0, 0, 0, 0); - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; if (typeof options == 'object') diff --git a/modules/ticket/back/methods/ticket/new.js b/modules/ticket/back/methods/ticket/new.js index 5f7cf3cb6..b461fb26d 100644 --- a/modules/ticket/back/methods/ticket/new.js +++ b/modules/ticket/back/methods/ticket/new.js @@ -59,9 +59,9 @@ module.exports = Self => { Self.new = async(ctx, options) => { const args = ctx.args; - const myUserId = ctx.req.accessToken.userId; + const userId = ctx.req.accessToken.userId; const models = Self.app.models; - const myOptions = {}; + const myOptions = {userId}; let tx; if (typeof options == 'object') @@ -123,7 +123,7 @@ module.exports = Self => { args.routeId || null, args.landed, true, - myUserId + userId ], myOptions); const ticket = await models.Ticket.findById(result[1][0].newTicketId, null, myOptions); diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js index 27fdb9160..42a71f1c8 100644 --- a/modules/ticket/back/methods/ticket/priceDifference.js +++ b/modules/ticket/back/methods/ticket/priceDifference.js @@ -60,7 +60,7 @@ module.exports = Self => { Self.priceDifference = async(ctx, options) => { const args = ctx.args; const models = Self.app.models; - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; if (typeof options == 'object') diff --git a/modules/ticket/back/methods/ticket/recalculateComponents.js b/modules/ticket/back/methods/ticket/recalculateComponents.js index 5b9e8e5dc..eb9c8a72e 100644 --- a/modules/ticket/back/methods/ticket/recalculateComponents.js +++ b/modules/ticket/back/methods/ticket/recalculateComponents.js @@ -21,7 +21,7 @@ module.exports = Self => { }); Self.recalculateComponents = async(ctx, id, options) => { - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; if (typeof options == 'object') diff --git a/modules/ticket/back/methods/ticket/refund.js b/modules/ticket/back/methods/ticket/refund.js index fe17b7101..c99b6aa83 100644 --- a/modules/ticket/back/methods/ticket/refund.js +++ b/modules/ticket/back/methods/ticket/refund.js @@ -1,5 +1,5 @@ module.exports = Self => { - Self.remoteMethod('refund', { + Self.remoteMethodCtx('refund', { description: 'Create refund tickets with all their sales and services', accessType: 'WRITE', accepts: [ @@ -24,7 +24,7 @@ module.exports = Self => { } }); - Self.refund = async(ticketsIds, withWarehouse, options) => { + Self.refund = async(ctx, ticketsIds, withWarehouse, options) => { const models = Self.app.models; const myOptions = {}; let tx; @@ -46,7 +46,7 @@ module.exports = Self => { const services = await models.TicketService.find(filter, myOptions); const servicesIds = services.map(service => service.id); - const refundedTickets = await models.Sale.refund(salesIds, servicesIds, withWarehouse, myOptions); + const refundedTickets = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, myOptions); if (tx) await tx.commit(); diff --git a/modules/ticket/back/methods/ticket/saveSign.js b/modules/ticket/back/methods/ticket/saveSign.js index b8f9d5ced..55d2e3281 100644 --- a/modules/ticket/back/methods/ticket/saveSign.js +++ b/modules/ticket/back/methods/ticket/saveSign.js @@ -31,7 +31,7 @@ module.exports = Self => { Self.saveSign = async(ctx, tickets, location, signedTime, options) => { const models = Self.app.models; - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; let dms; let gestDocCreated = false; diff --git a/modules/ticket/back/methods/ticket/setDeleted.js b/modules/ticket/back/methods/ticket/setDeleted.js index 228e2e765..4d7fe73d4 100644 --- a/modules/ticket/back/methods/ticket/setDeleted.js +++ b/modules/ticket/back/methods/ticket/setDeleted.js @@ -24,7 +24,7 @@ module.exports = Self => { Self.setDeleted = async(ctx, id, options) => { const models = Self.app.models; const $t = ctx.req.__; // $translate - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; if (typeof options == 'object') @@ -81,17 +81,15 @@ module.exports = Self => { throw new UserError('You must delete all the buy requests first'); // removes item shelvings - if (hasItemShelvingSales && isSalesAssistant) { - const promises = []; - for (let sale of sales) { - if (sale.itemShelvingSale()) { - const itemShelvingSale = sale.itemShelvingSale(); - const destroyedShelving = models.ItemShelvingSale.destroyById(itemShelvingSale.id, myOptions); - promises.push(destroyedShelving); - } + const promises = []; + for (let sale of sales) { + if (sale.itemShelvingSale()) { + const itemShelvingSale = sale.itemShelvingSale(); + const destroyedShelving = models.ItemShelvingSale.destroyById(itemShelvingSale.id, myOptions); + promises.push(destroyedShelving); } - await Promise.all(promises); } + await Promise.all(promises); // Remove ticket greuges const ticketGreuges = await models.Greuge.find({where: {ticketFk: id}}, myOptions); diff --git a/modules/ticket/back/methods/ticket/specs/getSales.spec.js b/modules/ticket/back/methods/ticket/specs/getSales.spec.js index b9f78e40b..7c0a67d45 100644 --- a/modules/ticket/back/methods/ticket/specs/getSales.spec.js +++ b/modules/ticket/back/methods/ticket/specs/getSales.spec.js @@ -1,13 +1,14 @@ const models = require('vn-loopback/server/server').models; describe('ticket getSales()', () => { + const ctx = {req: {accessToken: 9}}; it('should return the sales of a ticket', async() => { const tx = await models.Ticket.beginTransaction({}); try { const options = {transaction: tx}; - const sales = await models.Ticket.getSales(16, options); + const sales = await models.Ticket.getSales(ctx, 16, options); expect(sales.length).toEqual(4); expect(sales[0].item).toBeDefined(); diff --git a/modules/ticket/back/methods/ticket/specs/summary.spec.js b/modules/ticket/back/methods/ticket/specs/summary.spec.js index 5d2991b0a..2c4aedf1e 100644 --- a/modules/ticket/back/methods/ticket/specs/summary.spec.js +++ b/modules/ticket/back/methods/ticket/specs/summary.spec.js @@ -1,13 +1,14 @@ const models = require('vn-loopback/server/server').models; describe('ticket summary()', () => { + const ctx = {req: {accessToken: 9}}; it('should return a summary object containing data from 1 ticket', async() => { const tx = await models.Ticket.beginTransaction({}); try { const options = {transaction: tx}; - const result = await models.Ticket.summary(1, options); + const result = await models.Ticket.summary(ctx, 1, options); expect(result.id).toEqual(1); expect(result.nickname).toEqual('Bat cave'); @@ -25,7 +26,7 @@ describe('ticket summary()', () => { try { const options = {transaction: tx}; - const result = await models.Ticket.summary(1, options); + const result = await models.Ticket.summary(ctx, 1, options); expect(result.sales.length).toEqual(4); @@ -42,7 +43,7 @@ describe('ticket summary()', () => { try { const options = {transaction: tx}; - const result = await models.Ticket.summary(1, options); + const result = await models.Ticket.summary(ctx, 1, options); expect(result.totalWithoutVat).toEqual(jasmine.any(Number)); @@ -59,7 +60,7 @@ describe('ticket summary()', () => { try { const options = {transaction: tx}; - const result = await models.Ticket.summary(1, options); + const result = await models.Ticket.summary(ctx, 1, options); expect(result.totalWithVat).toEqual(jasmine.any(Number)); diff --git a/modules/ticket/back/methods/ticket/specs/transferSales.spec.js b/modules/ticket/back/methods/ticket/specs/transferSales.spec.js index 270aae2f8..562688917 100644 --- a/modules/ticket/back/methods/ticket/specs/transferSales.spec.js +++ b/modules/ticket/back/methods/ticket/specs/transferSales.spec.js @@ -67,7 +67,7 @@ describe('sale transferSales()', () => { const ticketId = 11; const receiverTicketId = null; - const sales = await models.Ticket.getSales(ticketId, options); + const sales = await models.Ticket.getSales(ctx, ticketId, options); await models.Ticket.transferSales(ctx, ticketId, receiverTicketId, sales, options); @@ -89,7 +89,7 @@ describe('sale transferSales()', () => { const formerTicketId = 22; let createdTicketId = undefined; - let formerTicketSales = await models.Ticket.getSales(formerTicketId, options); + let formerTicketSales = await models.Ticket.getSales(ctx, formerTicketId, options); expect(formerTicketSales.length).toEqual(2); @@ -98,8 +98,8 @@ describe('sale transferSales()', () => { createdTicketId = createdTicket.id; - formerTicketSales = await models.Ticket.getSales(formerTicketId, options); - let createdTicketSales = await models.Ticket.getSales(createdTicketId, options); + formerTicketSales = await models.Ticket.getSales(ctx, formerTicketId, options); + let createdTicketSales = await models.Ticket.getSales(ctx, createdTicketId, options); expect(formerTicketSales.length).toEqual(0); expect(createdTicketSales.length).toEqual(2); @@ -120,7 +120,7 @@ describe('sale transferSales()', () => { const options = {transaction: tx}; const currentTicketId = 22; - const currentTicketSales = await models.Ticket.getSales(currentTicketId, options); + const currentTicketSales = await models.Ticket.getSales(ctx, currentTicketId, options); const receiverTicketId = undefined; @@ -147,7 +147,7 @@ describe('sale transferSales()', () => { const formerTicketId = 22; let createdTicketId = undefined; - let formerTicketSales = await models.Ticket.getSales(formerTicketId, options); + let formerTicketSales = await models.Ticket.getSales(ctx, formerTicketId, options); const completeSaleId = formerTicketSales[1].id; let partialSaleTotalQuantity = formerTicketSales[0].quantity; @@ -161,8 +161,8 @@ describe('sale transferSales()', () => { createdTicketId = createdTicket.id; - formerTicketSales = await models.Ticket.getSales(formerTicketId, options); - createdTicketSales = await models.Ticket.getSales(createdTicketId, options); + formerTicketSales = await models.Ticket.getSales(ctx, formerTicketId, options); + createdTicketSales = await models.Ticket.getSales(ctx, createdTicketId, options); const [createdPartialSale] = createdTicketSales.filter(sale => { return sale.id != completeSaleId; diff --git a/modules/ticket/back/methods/ticket/summary.js b/modules/ticket/back/methods/ticket/summary.js index a57968fc1..1ce91e1b2 100644 --- a/modules/ticket/back/methods/ticket/summary.js +++ b/modules/ticket/back/methods/ticket/summary.js @@ -1,5 +1,5 @@ module.exports = Self => { - Self.remoteMethod('summary', { + Self.remoteMethodCtx('summary', { description: 'Returns a ticket summary', accessType: 'READ', accepts: [{ @@ -19,7 +19,7 @@ module.exports = Self => { } }); - Self.summary = async(ticketFk, options) => { + Self.summary = async(ctx, ticketFk, options) => { const models = Self.app.models; const myOptions = {}; @@ -28,7 +28,7 @@ module.exports = Self => { const summaryObj = await getTicketData(Self, ticketFk, myOptions); - summaryObj.sales = await models.Ticket.getSales(ticketFk, myOptions); + summaryObj.sales = await models.Ticket.getSales(ctx, ticketFk, myOptions); summaryObj.packagings = await models.TicketPackaging.find({ where: {ticketFk: ticketFk}, diff --git a/modules/ticket/back/methods/ticket/transferSales.js b/modules/ticket/back/methods/ticket/transferSales.js index 5737e628f..01ada49d0 100644 --- a/modules/ticket/back/methods/ticket/transferSales.js +++ b/modules/ticket/back/methods/ticket/transferSales.js @@ -36,7 +36,7 @@ module.exports = Self => { Self.transferSales = async(ctx, id, ticketId, sales, options) => { const userId = ctx.req.accessToken.userId; const models = Self.app.models; - const myOptions = {}; + const myOptions = {userId}; let tx; if (typeof options == 'object') diff --git a/modules/ticket/back/methods/ticket/updateDiscount.js b/modules/ticket/back/methods/ticket/updateDiscount.js index 4b31c0ce4..6feeafa1a 100644 --- a/modules/ticket/back/methods/ticket/updateDiscount.js +++ b/modules/ticket/back/methods/ticket/updateDiscount.js @@ -44,7 +44,7 @@ module.exports = Self => { Self.updateDiscount = async(ctx, id, salesIds, newDiscount, manaCode, options) => { const $t = ctx.req.__; // $translate const models = Self.app.models; - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; if (typeof options == 'object') diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json index bee01a875..3c7e12eea 100644 --- a/modules/ticket/back/model-config.json +++ b/modules/ticket/back/model-config.json @@ -100,5 +100,8 @@ }, "TicketConfig": { "dataSource": "vn" + }, + "PackingSiteAdvanced": { + "dataSource": "vn" } } diff --git a/modules/ticket/back/models/packing-site-advanced.json b/modules/ticket/back/models/packing-site-advanced.json new file mode 100644 index 000000000..f48cbf412 --- /dev/null +++ b/modules/ticket/back/models/packing-site-advanced.json @@ -0,0 +1,18 @@ +{ + "name": "PackingSiteAdvanced", + "base": "VnModel", + "options": { + "mysql": { + "table": "packingSiteAdvanced" + } + }, + "properties": { + "ticketFk": { + "id": true, + "type": "number" + }, + "workerFk": { + "type": "number" + } + } +} diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js index 835f395a8..17a34ad59 100644 --- a/modules/ticket/front/descriptor-menu/index.js +++ b/modules/ticket/front/descriptor-menu/index.js @@ -326,14 +326,8 @@ class Controller extends Section { if (!force) return this.$.pdfToTablet.show(); - return this.$http.post(`Docuwares/${this.id}/upload`, {fileCabinet: 'deliveryNote'}) + return this.$http.post(`Docuwares/upload`, {fileCabinet: 'deliveryNote', ticketIds: [this.id]}) .then(() => { - this.$.balanceCreate.amountPaid = this.ticket.totalWithVat; - this.$.balanceCreate.clientFk = this.ticket.clientFk; - this.$.balanceCreate.description = 'Albaran: '; - this.$.balanceCreate.description += this.ticket.id; - - this.$.balanceCreate.show(); this.vnApp.showSuccess(this.$t('PDF sent!')); }); } diff --git a/modules/ticket/front/descriptor-menu/index.spec.js b/modules/ticket/front/descriptor-menu/index.spec.js index 5d27acff1..0aef956db 100644 --- a/modules/ticket/front/descriptor-menu/index.spec.js +++ b/modules/ticket/front/descriptor-menu/index.spec.js @@ -304,17 +304,15 @@ describe('Ticket Component vnTicketDescriptorMenu', () => { expect(controller.$.pdfToTablet.show).toHaveBeenCalled(); }); - it('should make a query and show balance create', () => { + it('should make a query', () => { controller.$.balanceCreate = {show: () => {}}; - jest.spyOn(controller.$.balanceCreate, 'show'); jest.spyOn(controller.vnApp, 'showSuccess'); - $httpBackend.whenPOST(`Docuwares/${ticket.id}/upload`).respond(true); + $httpBackend.whenPOST(`Docuwares/upload`).respond(true); controller.uploadDocuware(true); $httpBackend.flush(); expect(controller.vnApp.showSuccess).toHaveBeenCalled(); - expect(controller.$.balanceCreate.show).toHaveBeenCalled(); }); }); diff --git a/modules/ticket/front/descriptor/locale/es.yml b/modules/ticket/front/descriptor/locale/es.yml index d921b5dc2..3da013467 100644 --- a/modules/ticket/front/descriptor/locale/es.yml +++ b/modules/ticket/front/descriptor/locale/es.yml @@ -23,4 +23,4 @@ Restore ticket: Restaurar ticket You are going to restore this ticket: Vas a restaurar este ticket Are you sure you want to restore this ticket?: ¿Seguro que quieres restaurar el ticket? Are you sure you want to refund all?: ¿Seguro que quieres abonar todo? -Send changes: "Verdnatura le recuerda:\rPedido {{ticketId}} día {{created | date: 'dd/MM/yyyy'}}\r{{changes}}" +Send changes: "Verdnatura:\rPedido {{ticketId}}\r{{changes}}" diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html index 447411f3a..831b8ef7e 100644 --- a/modules/ticket/front/expedition/index.html +++ b/modules/ticket/front/expedition/index.html @@ -7,10 +7,12 @@ order="created DESC" auto-load="true"> -
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- Expedition
- Item
- Name
- Package type
- Counter
- externalId
- Created
- State
-
-
-
-
-
-
-
-
- {{expedition.id}}
-
-
- {{expedition.packagingFk}}
-
-
- {{::expedition.packageItemName}}
- {{::expedition.freightItemName}}
- {{::expedition.counter}}
- {{::expedition.externalId}}
- {{::expedition.created | date:'dd/MM/yyyy HH:mm'}}
- {{::expedition.state}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
@@ -33,7 +33,7 @@
class="clickable vn-tr search-result"
ui-sref="ticket.card.summary({id: {{::ticket.id}}})">
-
@@ -109,7 +109,7 @@
class="link">
{{::ticket.refFk}}
-
{{ticket.state}}
@@ -132,8 +132,8 @@
-
-
-
-
-
-
Filter by selection
-
Exclude selection
-
Remove filter
-
Remove all filters
-
Copy value
@@ -241,4 +241,4 @@
on-accept="$ctrl.makeInvoice()"
question="{{$ctrl.confirmationMessage}}"
message="Invoice selected tickets">
-
\ No newline at end of file
+
diff --git a/modules/ticket/front/index/index.js b/modules/ticket/front/index/index.js
index 42332ccc8..55229eabb 100644
--- a/modules/ticket/front/index/index.js
+++ b/modules/ticket/front/index/index.js
@@ -9,28 +9,23 @@ export default class Controller extends Section {
this.vnReport = vnReport;
}
- setDelivered() {
+ sendDocuware() {
const checkedTickets = this.checked;
- let ids = [];
+ let ticketIds = [];
for (let ticket of checkedTickets)
- ids.push(ticket.id);
+ ticketIds.push(ticket.id);
- this.$http.post('TicketTrackings/setDelivered', ids).then(res => {
- let state = res.data;
- for (let ticket of checkedTickets) {
- ticket.stateFk = state.id;
- ticket.state = state.name;
- ticket.alertLevel = state.alertLevel;
- ticket.alertLevelCode = state.code;
- }
- this.openDeliveryNotes(ids);
- });
- }
-
- openDeliveryNotes(ids) {
- for (let id of ids)
- this.vnReport.show(`Tickets/${id}/delivery-note-pdf`);
+ return this.$http.post(`Docuwares/upload`, {fileCabinet: 'deliveryNote', ticketIds})
+ .then(res => {
+ let state = res.data;
+ for (let ticket of checkedTickets) {
+ ticket.stateFk = state.id;
+ ticket.state = state.name;
+ ticket.alertLevel = state.alertLevel;
+ ticket.alertLevelCode = state.code;
+ }
+ });
}
openBalanceDialog() {
diff --git a/modules/ticket/front/index/index.spec.js b/modules/ticket/front/index/index.spec.js
index 5046387b0..951c6aa09 100644
--- a/modules/ticket/front/index/index.spec.js
+++ b/modules/ticket/front/index/index.spec.js
@@ -12,12 +12,14 @@ describe('Component vnTicketIndex', () => {
id: 2,
clientFk: 1,
checked: true,
- totalWithVat: 20.5
+ totalWithVat: 20.5,
+ stateFk: 1
}, {
id: 3,
clientFk: 1,
checked: true,
- totalWithVat: 30
+ totalWithVat: 30,
+ stateFk: 1
}];
beforeEach(ngModule('ticket'));
@@ -86,18 +88,16 @@ describe('Component vnTicketIndex', () => {
});
});
- describe('setDelivered()/openDeliveryNotes()', () => {
- it('should perform a post to setDelivered and open tabs with the delivery notes', () => {
+ describe('sendDocuware()', () => {
+ it('should perform a post to sendDocuware and change tickets state', () => {
controller.$.model = {data: tickets, refresh: () => {}};
+ const newState = {id: 2};
- $window.open = jest.fn();
-
- $httpBackend.expect('POST', 'TicketTrackings/setDelivered').respond('ok');
- controller.setDelivered();
+ $httpBackend.expect('POST', 'Docuwares/upload').respond({id: newState.id});
+ controller.sendDocuware();
$httpBackend.flush();
- expect($window.open).toHaveBeenCalledWith(`api/Tickets/${tickets[1].id}/delivery-note-pdf`);
- expect($window.open).toHaveBeenCalledWith(`api/Tickets/${tickets[2].id}/delivery-note-pdf`);
+ expect(controller.$.model.data[1].stateFk).toEqual(newState.id);
});
});
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index f50ef10a5..be9e81964 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -69,7 +69,7 @@
Price
Disc
Amount
- Packaging
+ Packaging
- {{$ctrl.getSaleTotal(sale) | currency: 'EUR':2}}
+ {{sale.amount | currency: 'EUR':2}}
{{::sale.item.itemPackingTypeFk | dashIfEmpty}}
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index 88a59e605..b68db6dc0 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -34,6 +34,11 @@ class Controller extends Section {
}
get sales() {
+ if (this._sales) {
+ for (let sale of this._sales)
+ sale.amount = this.getSaleTotal(sale);
+ }
+
return this._sales;
}
@@ -49,6 +54,7 @@ class Controller extends Section {
return ticketState && ticketState.state.code;
}
+
getConfig() {
let filter = {
fields: ['daysForWarningClaim'],
diff --git a/modules/travel/back/methods/thermograph/createThermograph.js b/modules/travel/back/methods/thermograph/createThermograph.js
index 75d967628..243e2129f 100644
--- a/modules/travel/back/methods/thermograph/createThermograph.js
+++ b/modules/travel/back/methods/thermograph/createThermograph.js
@@ -1,5 +1,5 @@
module.exports = Self => {
- Self.remoteMethod('createThermograph', {
+ Self.remoteMethodCtx('createThermograph', {
description: 'Creates a new thermograph',
accessType: 'WRITE',
accepts: [{
@@ -36,10 +36,10 @@ module.exports = Self => {
}
});
- Self.createThermograph = async(thermographId, model, temperatureFk, warehouseId, options) => {
+ Self.createThermograph = async(ctx, thermographId, model, temperatureFk, warehouseId, options) => {
const models = Self.app.models;
let tx;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
const date = Date.vnNew();
if (typeof options == 'object')
diff --git a/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js b/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js
index 32014e303..90855bf81 100644
--- a/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js
+++ b/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js
@@ -5,6 +5,7 @@ describe('Termograph createThermograph()', () => {
const model = 'DISPOSABLE';
const temperatureFk = 'COOL';
const warehouseId = 1;
+ const ctx = {req: {accessToken: {userId: 9}}};
it(`should create a thermograph which is saved in both thermograph and travelThermograph`, async() => {
const tx = await models.Thermograph.beginTransaction({});
@@ -12,7 +13,7 @@ describe('Termograph createThermograph()', () => {
try {
const options = {transaction: tx};
- const createdThermograph = await models.Thermograph.createThermograph(thermographId, model, temperatureFk, warehouseId, options);
+ const createdThermograph = await models.Thermograph.createThermograph(ctx, thermographId, model, temperatureFk, warehouseId, options);
expect(createdThermograph.id).toEqual(thermographId);
expect(createdThermograph.model).toEqual(model);
@@ -37,8 +38,8 @@ describe('Termograph createThermograph()', () => {
try {
const options = {transaction: tx};
- await models.Thermograph.createThermograph(thermographId, model, temperatureFk, warehouseId, options);
- await models.Thermograph.createThermograph(thermographId, model, temperatureFk, warehouseId, options);
+ await models.Thermograph.createThermograph(ctx, thermographId, model, temperatureFk, warehouseId, options);
+ await models.Thermograph.createThermograph(ctx, thermographId, model, temperatureFk, warehouseId, options);
await tx.rollback();
} catch (e) {
diff --git a/modules/travel/back/methods/travel/deleteThermograph.js b/modules/travel/back/methods/travel/deleteThermograph.js
index ba541c560..d22fc8b29 100644
--- a/modules/travel/back/methods/travel/deleteThermograph.js
+++ b/modules/travel/back/methods/travel/deleteThermograph.js
@@ -26,9 +26,9 @@ module.exports = Self => {
await models.Dms.removeFile(ctx, travelThermograph.dmsFk);
await Self.rawSql(`
- UPDATE travelThermograph
- SET travelFk = NULL, dmsFk = NULL
- WHERE id = ?`, [id]);
+ UPDATE travelThermograph
+ SET travelFk = NULL, dmsFk = NULL
+ WHERE id = ?`, [id], {userId});
const oldInstance = {
travelFk: travelThermograph.travelFk,
diff --git a/modules/worker/back/methods/department/getLeaves.js b/modules/worker/back/methods/department/getLeaves.js
index 614f3388e..b1ce2fbe8 100644
--- a/modules/worker/back/methods/department/getLeaves.js
+++ b/modules/worker/back/methods/department/getLeaves.js
@@ -1,5 +1,5 @@
module.exports = Self => {
- Self.remoteMethod('getLeaves', {
+ Self.remoteMethodCtx('getLeaves', {
description: 'Returns the nodes for a department',
accepts: [{
arg: 'parentId',
@@ -20,10 +20,11 @@ module.exports = Self => {
}
});
- Self.getLeaves = async(parentId = null, search) => {
+ Self.getLeaves = async(ctx, parentId = null, search) => {
let [res] = await Self.rawSql(
`CALL department_getLeaves(?, ?)`,
- [parentId, search]
+ [parentId, search],
+ {userId: ctx.req.accessToken.userId}
);
let map = new Map();
diff --git a/modules/worker/back/methods/worker-time-control/addTimeEntry.js b/modules/worker/back/methods/worker-time-control/addTimeEntry.js
index bcc96985f..cc652fb90 100644
--- a/modules/worker/back/methods/worker-time-control/addTimeEntry.js
+++ b/modules/worker/back/methods/worker-time-control/addTimeEntry.js
@@ -33,15 +33,15 @@ module.exports = Self => {
Self.addTimeEntry = async(ctx, workerId, options) => {
const models = Self.app.models;
const args = ctx.args;
- const currentUserId = ctx.req.accessToken.userId;
- const myOptions = {};
+ const userId = ctx.req.accessToken.userId;
+ const myOptions = {userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
const isSubordinate = await models.Worker.isSubordinate(ctx, workerId, myOptions);
const isTeamBoss = await models.ACL.checkAccessAcl(ctx, 'Worker', 'isTeamBoss', 'WRITE');
- const isHimself = currentUserId == workerId;
+ const isHimself = userId == workerId;
if (!isSubordinate || (isSubordinate && isHimself && !isTeamBoss))
throw new UserError(`You don't have enough privileges`);
diff --git a/modules/worker/back/methods/worker-time-control/deleteTimeEntry.js b/modules/worker/back/methods/worker-time-control/deleteTimeEntry.js
index 80482901f..8f9541596 100644
--- a/modules/worker/back/methods/worker-time-control/deleteTimeEntry.js
+++ b/modules/worker/back/methods/worker-time-control/deleteTimeEntry.js
@@ -22,10 +22,10 @@ module.exports = Self => {
});
Self.deleteTimeEntry = async(ctx, id, options) => {
- const currentUserId = ctx.req.accessToken.userId;
+ const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
- const myOptions = {};
+ const myOptions = {userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
@@ -33,7 +33,7 @@ module.exports = Self => {
const targetTimeEntry = await Self.findById(id, null, myOptions);
const isSubordinate = await models.Worker.isSubordinate(ctx, targetTimeEntry.userFk, myOptions);
const isTeamBoss = await models.ACL.checkAccessAcl(ctx, 'Worker', 'isTeamBoss', 'WRITE');
- const isHimself = currentUserId == targetTimeEntry.userFk;
+ const isHimself = userId == targetTimeEntry.userFk;
if (isSubordinate === false || (isSubordinate && isHimself && !isTeamBoss))
throw new UserError(`You don't have enough privileges`);
diff --git a/modules/worker/back/methods/worker-time-control/sendMail.js b/modules/worker/back/methods/worker-time-control/sendMail.js
index 3d57ebbbd..ab5e56a77 100644
--- a/modules/worker/back/methods/worker-time-control/sendMail.js
+++ b/modules/worker/back/methods/worker-time-control/sendMail.js
@@ -33,7 +33,7 @@ module.exports = Self => {
const conn = Self.dataSource.connector;
const args = ctx.args;
let tx;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/worker/back/methods/worker/isAuthorized.js b/modules/worker/back/methods/worker/isAuthorized.js
new file mode 100644
index 000000000..519aab94f
--- /dev/null
+++ b/modules/worker/back/methods/worker/isAuthorized.js
@@ -0,0 +1,44 @@
+module.exports = Self => {
+ Self.remoteMethod('isAuthorized', {
+ description: 'Return true if the current user is a superior of the worker that is passed by parameter',
+ accessType: 'READ',
+ accepts: [{
+ arg: 'ctx',
+ type: 'Object',
+ http: {source: 'context'}
+ }, {
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'The worker id',
+ http: {source: 'path'}
+ }],
+ returns: {
+ type: 'boolean',
+ root: true
+ },
+ http: {
+ path: `/:id/isAuthorized`,
+ verb: 'GET'
+ }
+ });
+
+ Self.isAuthorized = async(ctx, id, options) => {
+ const models = Self.app.models;
+ const currentUserId = ctx.req.accessToken.userId;
+ const isHimself = currentUserId == id;
+
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const isSubordinate = await models.Worker.isSubordinate(ctx, id, myOptions);
+ const isTeamBoss = await models.VnUser.hasRole(currentUserId, 'teamBoss', myOptions);
+
+ if (!isSubordinate || (isSubordinate && isHimself && !isTeamBoss))
+ return false;
+
+ return true;
+ };
+};
diff --git a/modules/worker/back/methods/worker/new.js b/modules/worker/back/methods/worker/new.js
index 398411118..27acc98ab 100644
--- a/modules/worker/back/methods/worker/new.js
+++ b/modules/worker/back/methods/worker/new.js
@@ -119,7 +119,7 @@ module.exports = Self => {
Self.new = async(ctx, options) => {
const models = Self.app.models;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
const args = ctx.args;
let tx;
diff --git a/modules/worker/back/methods/worker/specs/new.spec.js b/modules/worker/back/methods/worker/specs/new.spec.js
index 44f6e9b09..b2804c203 100644
--- a/modules/worker/back/methods/worker/specs/new.spec.js
+++ b/modules/worker/back/methods/worker/specs/new.spec.js
@@ -36,6 +36,7 @@ describe('Worker new', () => {
payMethodFk: 1,
roleFk: 1
};
+ const req = {accessToken: {userId: 9}};
it('should return error if personal mail already exists', async() => {
const user = await models.VnUser.findById(employeeId, {fields: ['email']});
@@ -46,7 +47,8 @@ describe('Worker new', () => {
try {
const options = {transaction: tx};
const ctx = {
- args: Object.assign({}, defaultWorker, {email: user.email})
+ args: Object.assign({}, defaultWorker, {email: user.email}),
+ req
};
await models.Worker.new(ctx, options);
@@ -69,7 +71,8 @@ describe('Worker new', () => {
try {
const options = {transaction: tx};
const ctx = {
- args: Object.assign({}, defaultWorker, {code: worker.code})
+ args: Object.assign({}, defaultWorker, {code: worker.code}),
+ req
};
await models.Worker.new(ctx, options);
@@ -92,7 +95,8 @@ describe('Worker new', () => {
try {
const options = {transaction: tx};
const ctx = {
- args: Object.assign({}, defaultWorker, {fi: worker.fi})
+ args: Object.assign({}, defaultWorker, {fi: worker.fi}),
+ req
};
await models.Worker.new(ctx, options);
@@ -119,7 +123,8 @@ describe('Worker new', () => {
try {
const options = {transaction: tx};
const ctx = {
- args: Object.assign({}, defaultWorker, {payMethodFk: payMethodIbanRequired.id})
+ args: Object.assign({}, defaultWorker, {payMethodFk: payMethodIbanRequired.id}),
+ req
};
await models.Worker.new(ctx, options);
@@ -133,7 +138,7 @@ describe('Worker new', () => {
});
it('should create a new worker', async() => {
- const newWorker = await models.Worker.new({args: defaultWorker});
+ const newWorker = await models.Worker.new({args: defaultWorker, req});
await models.Worker.destroyById(newWorker.id);
await models.Address.destroyAll({clientFk: newWorker.id});
@@ -155,7 +160,8 @@ describe('Worker new', () => {
{
fi: client.fi,
email: client.email
- })
+ }),
+ req
};
const newWorker = await models.Worker.new(newWorkerData);
diff --git a/modules/worker/back/models/operator.js b/modules/worker/back/models/operator.js
index e9b590fa6..db1ac7e49 100644
--- a/modules/worker/back/models/operator.js
+++ b/modules/worker/back/models/operator.js
@@ -1,10 +1,10 @@
module.exports = function(Self) {
Self.observe('after save', async function(ctx) {
- const instance = ctx.instance;
+ const instance = ctx.data || ctx.instance;
const models = Self.app.models;
const options = ctx.options;
- if (!instance.sectorFk || !instance.labelerFk) return;
+ if (!instance?.sectorFk || !instance?.labelerFk) return;
const sector = await models.Sector.findById(instance.sectorFk, {
fields: ['mainPrinterFk']
diff --git a/modules/worker/back/models/operator.json b/modules/worker/back/models/operator.json
index 9433a0fd5..2417078e1 100644
--- a/modules/worker/back/models/operator.json
+++ b/modules/worker/back/models/operator.json
@@ -16,18 +16,12 @@
"type": "number"
},
"trainFk": {
- "type": "number",
- "required": true
+ "type": "number"
},
"itemPackingTypeFk": {
- "type": "string",
- "required": true
+ "type": "string"
},
"warehouseFk": {
- "type": "number",
- "required": true
- },
- "sectorFk": {
"type": "number"
},
"labelerFk": {
diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js
index fa17640a8..b44703a88 100644
--- a/modules/worker/back/models/worker.js
+++ b/modules/worker/back/models/worker.js
@@ -16,6 +16,7 @@ module.exports = Self => {
require('../methods/worker/new')(Self);
require('../methods/worker/deallocatePDA')(Self);
require('../methods/worker/allocatePDA')(Self);
+ require('../methods/worker/isAuthorized')(Self);
Self.validatesUniquenessOf('locker', {
message: 'This locker has already been assigned'
diff --git a/modules/worker/front/account/index.html b/modules/worker/front/account/index.html
deleted file mode 100644
index 6f6be660c..000000000
--- a/modules/worker/front/account/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
diff --git a/modules/worker/front/calendar/index.html b/modules/worker/front/calendar/index.html
index c9eacbd82..ace2f4e27 100644
--- a/modules/worker/front/calendar/index.html
+++ b/modules/worker/front/calendar/index.html
@@ -3,27 +3,35 @@
data="absenceTypes"
auto-load="true">
-
+
+ ![]()
+
+
+
+
-
- #{{::log.changedModelId}}
- {{::log.changedModelValue}}
-
-
-
-
-
-
-
- {{::prop.nameI18n}}:
+
+
+
+
+
+
+
+ {{::modelLog.modelI18n}}
-
+
+
+
+
+ {{::$ctrl.relativeDate(log.creationDate)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{::prop.nameI18n}}:
+
+
+
+
+ + {{$ctrl.instance.modelLog.modelI18n}} #{{$ctrl.instance.modelLog.id}} +
+
+
+
+
+ {{::prop.nameI18n}}:
+
+
+
+ No data
+
+ {{::user.nickname}}
- {{$ctrl.percentage | percentage: 0}} ({{$ctrl.addressNumber}} {{'of' | translate}} {{$ctrl.nAddresses}})
+
+
+ {{$ctrl.percentage | percentage: 0}}
+ ({{$ctrl.addressNumber}} of {{$ctrl.nAddresses}})
+
+
+ {{$ctrl.nPdfs}} of {{$ctrl.totalPdfs}}
+ PDFs
+
-
+ class="colored">
Id: {{$ctrl.itemId}}
- {{$ctrl.itemName}}
-
{{::tagGroup.tagSelection.name}}:
@@ -163,4 +163,4 @@
- Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente. + Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente. Actualiza la dirección de email con una correcta.`; smtp.send({ diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js index dac8e4f52..a8b631d7c 100644 --- a/modules/ticket/back/methods/ticket/componentUpdate.js +++ b/modules/ticket/back/methods/ticket/componentUpdate.js @@ -101,7 +101,7 @@ module.exports = Self => { Self.componentUpdate = async(ctx, options) => { const args = ctx.args; - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; if (typeof options == 'object') diff --git a/modules/ticket/back/methods/ticket/getSales.js b/modules/ticket/back/methods/ticket/getSales.js index 321e8e24e..e721d90ae 100644 --- a/modules/ticket/back/methods/ticket/getSales.js +++ b/modules/ticket/back/methods/ticket/getSales.js @@ -1,6 +1,6 @@ module.exports = Self => { - Self.remoteMethod('getSales', { + Self.remoteMethodCtx('getSales', { description: 'New filter', accessType: 'READ', accepts: [{ @@ -20,10 +20,10 @@ module.exports = Self => { } }); - Self.getSales = async(id, options) => { + Self.getSales = async(ctx, id, options) => { const models = Self.app.models; - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; if (typeof options == 'object') Object.assign(myOptions, options); diff --git a/modules/ticket/back/methods/ticket/makeInvoice.js b/modules/ticket/back/methods/ticket/makeInvoice.js index d8ec5eb9a..ee82b874f 100644 --- a/modules/ticket/back/methods/ticket/makeInvoice.js +++ b/modules/ticket/back/methods/ticket/makeInvoice.js @@ -28,7 +28,7 @@ module.exports = function(Self) { const date = Date.vnNew(); date.setHours(0, 0, 0, 0); - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; if (typeof options == 'object') diff --git a/modules/ticket/back/methods/ticket/new.js b/modules/ticket/back/methods/ticket/new.js index 5f7cf3cb6..b461fb26d 100644 --- a/modules/ticket/back/methods/ticket/new.js +++ b/modules/ticket/back/methods/ticket/new.js @@ -59,9 +59,9 @@ module.exports = Self => { Self.new = async(ctx, options) => { const args = ctx.args; - const myUserId = ctx.req.accessToken.userId; + const userId = ctx.req.accessToken.userId; const models = Self.app.models; - const myOptions = {}; + const myOptions = {userId}; let tx; if (typeof options == 'object') @@ -123,7 +123,7 @@ module.exports = Self => { args.routeId || null, args.landed, true, - myUserId + userId ], myOptions); const ticket = await models.Ticket.findById(result[1][0].newTicketId, null, myOptions); diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js index 27fdb9160..42a71f1c8 100644 --- a/modules/ticket/back/methods/ticket/priceDifference.js +++ b/modules/ticket/back/methods/ticket/priceDifference.js @@ -60,7 +60,7 @@ module.exports = Self => { Self.priceDifference = async(ctx, options) => { const args = ctx.args; const models = Self.app.models; - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; if (typeof options == 'object') diff --git a/modules/ticket/back/methods/ticket/recalculateComponents.js b/modules/ticket/back/methods/ticket/recalculateComponents.js index 5b9e8e5dc..eb9c8a72e 100644 --- a/modules/ticket/back/methods/ticket/recalculateComponents.js +++ b/modules/ticket/back/methods/ticket/recalculateComponents.js @@ -21,7 +21,7 @@ module.exports = Self => { }); Self.recalculateComponents = async(ctx, id, options) => { - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; if (typeof options == 'object') diff --git a/modules/ticket/back/methods/ticket/refund.js b/modules/ticket/back/methods/ticket/refund.js index fe17b7101..c99b6aa83 100644 --- a/modules/ticket/back/methods/ticket/refund.js +++ b/modules/ticket/back/methods/ticket/refund.js @@ -1,5 +1,5 @@ module.exports = Self => { - Self.remoteMethod('refund', { + Self.remoteMethodCtx('refund', { description: 'Create refund tickets with all their sales and services', accessType: 'WRITE', accepts: [ @@ -24,7 +24,7 @@ module.exports = Self => { } }); - Self.refund = async(ticketsIds, withWarehouse, options) => { + Self.refund = async(ctx, ticketsIds, withWarehouse, options) => { const models = Self.app.models; const myOptions = {}; let tx; @@ -46,7 +46,7 @@ module.exports = Self => { const services = await models.TicketService.find(filter, myOptions); const servicesIds = services.map(service => service.id); - const refundedTickets = await models.Sale.refund(salesIds, servicesIds, withWarehouse, myOptions); + const refundedTickets = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, myOptions); if (tx) await tx.commit(); diff --git a/modules/ticket/back/methods/ticket/saveSign.js b/modules/ticket/back/methods/ticket/saveSign.js index b8f9d5ced..55d2e3281 100644 --- a/modules/ticket/back/methods/ticket/saveSign.js +++ b/modules/ticket/back/methods/ticket/saveSign.js @@ -31,7 +31,7 @@ module.exports = Self => { Self.saveSign = async(ctx, tickets, location, signedTime, options) => { const models = Self.app.models; - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; let dms; let gestDocCreated = false; diff --git a/modules/ticket/back/methods/ticket/setDeleted.js b/modules/ticket/back/methods/ticket/setDeleted.js index 228e2e765..4d7fe73d4 100644 --- a/modules/ticket/back/methods/ticket/setDeleted.js +++ b/modules/ticket/back/methods/ticket/setDeleted.js @@ -24,7 +24,7 @@ module.exports = Self => { Self.setDeleted = async(ctx, id, options) => { const models = Self.app.models; const $t = ctx.req.__; // $translate - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; if (typeof options == 'object') @@ -81,17 +81,15 @@ module.exports = Self => { throw new UserError('You must delete all the buy requests first'); // removes item shelvings - if (hasItemShelvingSales && isSalesAssistant) { - const promises = []; - for (let sale of sales) { - if (sale.itemShelvingSale()) { - const itemShelvingSale = sale.itemShelvingSale(); - const destroyedShelving = models.ItemShelvingSale.destroyById(itemShelvingSale.id, myOptions); - promises.push(destroyedShelving); - } + const promises = []; + for (let sale of sales) { + if (sale.itemShelvingSale()) { + const itemShelvingSale = sale.itemShelvingSale(); + const destroyedShelving = models.ItemShelvingSale.destroyById(itemShelvingSale.id, myOptions); + promises.push(destroyedShelving); } - await Promise.all(promises); } + await Promise.all(promises); // Remove ticket greuges const ticketGreuges = await models.Greuge.find({where: {ticketFk: id}}, myOptions); diff --git a/modules/ticket/back/methods/ticket/specs/getSales.spec.js b/modules/ticket/back/methods/ticket/specs/getSales.spec.js index b9f78e40b..7c0a67d45 100644 --- a/modules/ticket/back/methods/ticket/specs/getSales.spec.js +++ b/modules/ticket/back/methods/ticket/specs/getSales.spec.js @@ -1,13 +1,14 @@ const models = require('vn-loopback/server/server').models; describe('ticket getSales()', () => { + const ctx = {req: {accessToken: 9}}; it('should return the sales of a ticket', async() => { const tx = await models.Ticket.beginTransaction({}); try { const options = {transaction: tx}; - const sales = await models.Ticket.getSales(16, options); + const sales = await models.Ticket.getSales(ctx, 16, options); expect(sales.length).toEqual(4); expect(sales[0].item).toBeDefined(); diff --git a/modules/ticket/back/methods/ticket/specs/summary.spec.js b/modules/ticket/back/methods/ticket/specs/summary.spec.js index 5d2991b0a..2c4aedf1e 100644 --- a/modules/ticket/back/methods/ticket/specs/summary.spec.js +++ b/modules/ticket/back/methods/ticket/specs/summary.spec.js @@ -1,13 +1,14 @@ const models = require('vn-loopback/server/server').models; describe('ticket summary()', () => { + const ctx = {req: {accessToken: 9}}; it('should return a summary object containing data from 1 ticket', async() => { const tx = await models.Ticket.beginTransaction({}); try { const options = {transaction: tx}; - const result = await models.Ticket.summary(1, options); + const result = await models.Ticket.summary(ctx, 1, options); expect(result.id).toEqual(1); expect(result.nickname).toEqual('Bat cave'); @@ -25,7 +26,7 @@ describe('ticket summary()', () => { try { const options = {transaction: tx}; - const result = await models.Ticket.summary(1, options); + const result = await models.Ticket.summary(ctx, 1, options); expect(result.sales.length).toEqual(4); @@ -42,7 +43,7 @@ describe('ticket summary()', () => { try { const options = {transaction: tx}; - const result = await models.Ticket.summary(1, options); + const result = await models.Ticket.summary(ctx, 1, options); expect(result.totalWithoutVat).toEqual(jasmine.any(Number)); @@ -59,7 +60,7 @@ describe('ticket summary()', () => { try { const options = {transaction: tx}; - const result = await models.Ticket.summary(1, options); + const result = await models.Ticket.summary(ctx, 1, options); expect(result.totalWithVat).toEqual(jasmine.any(Number)); diff --git a/modules/ticket/back/methods/ticket/specs/transferSales.spec.js b/modules/ticket/back/methods/ticket/specs/transferSales.spec.js index 270aae2f8..562688917 100644 --- a/modules/ticket/back/methods/ticket/specs/transferSales.spec.js +++ b/modules/ticket/back/methods/ticket/specs/transferSales.spec.js @@ -67,7 +67,7 @@ describe('sale transferSales()', () => { const ticketId = 11; const receiverTicketId = null; - const sales = await models.Ticket.getSales(ticketId, options); + const sales = await models.Ticket.getSales(ctx, ticketId, options); await models.Ticket.transferSales(ctx, ticketId, receiverTicketId, sales, options); @@ -89,7 +89,7 @@ describe('sale transferSales()', () => { const formerTicketId = 22; let createdTicketId = undefined; - let formerTicketSales = await models.Ticket.getSales(formerTicketId, options); + let formerTicketSales = await models.Ticket.getSales(ctx, formerTicketId, options); expect(formerTicketSales.length).toEqual(2); @@ -98,8 +98,8 @@ describe('sale transferSales()', () => { createdTicketId = createdTicket.id; - formerTicketSales = await models.Ticket.getSales(formerTicketId, options); - let createdTicketSales = await models.Ticket.getSales(createdTicketId, options); + formerTicketSales = await models.Ticket.getSales(ctx, formerTicketId, options); + let createdTicketSales = await models.Ticket.getSales(ctx, createdTicketId, options); expect(formerTicketSales.length).toEqual(0); expect(createdTicketSales.length).toEqual(2); @@ -120,7 +120,7 @@ describe('sale transferSales()', () => { const options = {transaction: tx}; const currentTicketId = 22; - const currentTicketSales = await models.Ticket.getSales(currentTicketId, options); + const currentTicketSales = await models.Ticket.getSales(ctx, currentTicketId, options); const receiverTicketId = undefined; @@ -147,7 +147,7 @@ describe('sale transferSales()', () => { const formerTicketId = 22; let createdTicketId = undefined; - let formerTicketSales = await models.Ticket.getSales(formerTicketId, options); + let formerTicketSales = await models.Ticket.getSales(ctx, formerTicketId, options); const completeSaleId = formerTicketSales[1].id; let partialSaleTotalQuantity = formerTicketSales[0].quantity; @@ -161,8 +161,8 @@ describe('sale transferSales()', () => { createdTicketId = createdTicket.id; - formerTicketSales = await models.Ticket.getSales(formerTicketId, options); - createdTicketSales = await models.Ticket.getSales(createdTicketId, options); + formerTicketSales = await models.Ticket.getSales(ctx, formerTicketId, options); + createdTicketSales = await models.Ticket.getSales(ctx, createdTicketId, options); const [createdPartialSale] = createdTicketSales.filter(sale => { return sale.id != completeSaleId; diff --git a/modules/ticket/back/methods/ticket/summary.js b/modules/ticket/back/methods/ticket/summary.js index a57968fc1..1ce91e1b2 100644 --- a/modules/ticket/back/methods/ticket/summary.js +++ b/modules/ticket/back/methods/ticket/summary.js @@ -1,5 +1,5 @@ module.exports = Self => { - Self.remoteMethod('summary', { + Self.remoteMethodCtx('summary', { description: 'Returns a ticket summary', accessType: 'READ', accepts: [{ @@ -19,7 +19,7 @@ module.exports = Self => { } }); - Self.summary = async(ticketFk, options) => { + Self.summary = async(ctx, ticketFk, options) => { const models = Self.app.models; const myOptions = {}; @@ -28,7 +28,7 @@ module.exports = Self => { const summaryObj = await getTicketData(Self, ticketFk, myOptions); - summaryObj.sales = await models.Ticket.getSales(ticketFk, myOptions); + summaryObj.sales = await models.Ticket.getSales(ctx, ticketFk, myOptions); summaryObj.packagings = await models.TicketPackaging.find({ where: {ticketFk: ticketFk}, diff --git a/modules/ticket/back/methods/ticket/transferSales.js b/modules/ticket/back/methods/ticket/transferSales.js index 5737e628f..01ada49d0 100644 --- a/modules/ticket/back/methods/ticket/transferSales.js +++ b/modules/ticket/back/methods/ticket/transferSales.js @@ -36,7 +36,7 @@ module.exports = Self => { Self.transferSales = async(ctx, id, ticketId, sales, options) => { const userId = ctx.req.accessToken.userId; const models = Self.app.models; - const myOptions = {}; + const myOptions = {userId}; let tx; if (typeof options == 'object') diff --git a/modules/ticket/back/methods/ticket/updateDiscount.js b/modules/ticket/back/methods/ticket/updateDiscount.js index 4b31c0ce4..6feeafa1a 100644 --- a/modules/ticket/back/methods/ticket/updateDiscount.js +++ b/modules/ticket/back/methods/ticket/updateDiscount.js @@ -44,7 +44,7 @@ module.exports = Self => { Self.updateDiscount = async(ctx, id, salesIds, newDiscount, manaCode, options) => { const $t = ctx.req.__; // $translate const models = Self.app.models; - const myOptions = {}; + const myOptions = {userId: ctx.req.accessToken.userId}; let tx; if (typeof options == 'object') diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json index bee01a875..3c7e12eea 100644 --- a/modules/ticket/back/model-config.json +++ b/modules/ticket/back/model-config.json @@ -100,5 +100,8 @@ }, "TicketConfig": { "dataSource": "vn" + }, + "PackingSiteAdvanced": { + "dataSource": "vn" } } diff --git a/modules/ticket/back/models/packing-site-advanced.json b/modules/ticket/back/models/packing-site-advanced.json new file mode 100644 index 000000000..f48cbf412 --- /dev/null +++ b/modules/ticket/back/models/packing-site-advanced.json @@ -0,0 +1,18 @@ +{ + "name": "PackingSiteAdvanced", + "base": "VnModel", + "options": { + "mysql": { + "table": "packingSiteAdvanced" + } + }, + "properties": { + "ticketFk": { + "id": true, + "type": "number" + }, + "workerFk": { + "type": "number" + } + } +} diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js index 835f395a8..17a34ad59 100644 --- a/modules/ticket/front/descriptor-menu/index.js +++ b/modules/ticket/front/descriptor-menu/index.js @@ -326,14 +326,8 @@ class Controller extends Section { if (!force) return this.$.pdfToTablet.show(); - return this.$http.post(`Docuwares/${this.id}/upload`, {fileCabinet: 'deliveryNote'}) + return this.$http.post(`Docuwares/upload`, {fileCabinet: 'deliveryNote', ticketIds: [this.id]}) .then(() => { - this.$.balanceCreate.amountPaid = this.ticket.totalWithVat; - this.$.balanceCreate.clientFk = this.ticket.clientFk; - this.$.balanceCreate.description = 'Albaran: '; - this.$.balanceCreate.description += this.ticket.id; - - this.$.balanceCreate.show(); this.vnApp.showSuccess(this.$t('PDF sent!')); }); } diff --git a/modules/ticket/front/descriptor-menu/index.spec.js b/modules/ticket/front/descriptor-menu/index.spec.js index 5d27acff1..0aef956db 100644 --- a/modules/ticket/front/descriptor-menu/index.spec.js +++ b/modules/ticket/front/descriptor-menu/index.spec.js @@ -304,17 +304,15 @@ describe('Ticket Component vnTicketDescriptorMenu', () => { expect(controller.$.pdfToTablet.show).toHaveBeenCalled(); }); - it('should make a query and show balance create', () => { + it('should make a query', () => { controller.$.balanceCreate = {show: () => {}}; - jest.spyOn(controller.$.balanceCreate, 'show'); jest.spyOn(controller.vnApp, 'showSuccess'); - $httpBackend.whenPOST(`Docuwares/${ticket.id}/upload`).respond(true); + $httpBackend.whenPOST(`Docuwares/upload`).respond(true); controller.uploadDocuware(true); $httpBackend.flush(); expect(controller.vnApp.showSuccess).toHaveBeenCalled(); - expect(controller.$.balanceCreate.show).toHaveBeenCalled(); }); }); diff --git a/modules/ticket/front/descriptor/locale/es.yml b/modules/ticket/front/descriptor/locale/es.yml index d921b5dc2..3da013467 100644 --- a/modules/ticket/front/descriptor/locale/es.yml +++ b/modules/ticket/front/descriptor/locale/es.yml @@ -23,4 +23,4 @@ Restore ticket: Restaurar ticket You are going to restore this ticket: Vas a restaurar este ticket Are you sure you want to restore this ticket?: ¿Seguro que quieres restaurar el ticket? Are you sure you want to refund all?: ¿Seguro que quieres abonar todo? -Send changes: "Verdnatura le recuerda:\rPedido {{ticketId}} día {{created | date: 'dd/MM/yyyy'}}\r{{changes}}" +Send changes: "Verdnatura:\rPedido {{ticketId}}\r{{changes}}" diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html index 447411f3a..831b8ef7e 100644 --- a/modules/ticket/front/expedition/index.html +++ b/modules/ticket/front/expedition/index.html @@ -7,10 +7,12 @@ order="created DESC" auto-load="true"> -
|
+ |
+ + Expedition + | ++ Item + | ++ Name + | ++ Package Type + | ++ Counter + | ++ externalId + | ++ Created + | ++ State + | ++ |
|---|---|---|---|---|---|---|---|---|---|
|
+ |
+ {{expedition.id}} | ++ + {{expedition.packagingItemFk}} + + | +{{::expedition.packageItemName}} | +{{::expedition.freightItemName}} | +{{::expedition.counter}} | +{{::expedition.externalId}} | +{{::expedition.created | date:'dd/MM/yyyy HH:mm'}} | +{{::expedition.state}} | +
+ |
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ Autonomous worker
-
{{'Contract' | translate}} #{{$ctrl.businessId}}
+{{'Contract' | translate}} #{{$ctrl.card.worker.hasWorkCenter}}
{{'Used' | translate}} {{$ctrl.contractHolidays.holidaysEnjoyed || 0}}
{{'of' | translate}} {{$ctrl.contractHolidays.totalHolidays || 0}} {{'days' | translate}}
@@ -102,3 +110,4 @@
message="This item will be deleted"
question="Are you sure you want to continue?">
+
diff --git a/modules/worker/front/calendar/index.js b/modules/worker/front/calendar/index.js
index 4ca0fc929..87e806cc3 100644
--- a/modules/worker/front/calendar/index.js
+++ b/modules/worker/front/calendar/index.js
@@ -64,17 +64,12 @@ class Controller extends Section {
set worker(value) {
this._worker = value;
-
- if (value) {
+ if (value && value.hasWorkCenter) {
this.getIsSubordinate();
this.getActiveContract();
}
}
- get payedHolidays() {
- return this._businessId;
- }
-
buildYearFilter() {
const now = Date.vnNew();
now.setFullYear(now.getFullYear() + 1);
@@ -95,10 +90,10 @@ class Controller extends Section {
}
getActiveContract() {
- this.$http.get(`Workers/${this.worker.id}/activeContract`).then(res => {
- if (res.data)
- this.businessId = res.data.businessFk;
- });
+ this.$http.get(`Workers/${this.worker.id}/activeContract`)
+ .then(res => {
+ if (res.data) this.businessId = res.data.businessFk;
+ });
}
getContractHolidays() {
diff --git a/modules/worker/front/calendar/index.spec.js b/modules/worker/front/calendar/index.spec.js
index 586a7223d..4b78d883b 100644
--- a/modules/worker/front/calendar/index.spec.js
+++ b/modules/worker/front/calendar/index.spec.js
@@ -74,7 +74,7 @@ describe('Worker', () => {
let yesterday = new Date(today.getTime());
yesterday.setDate(yesterday.getDate() - 1);
- controller.worker = {id: 1107};
+ controller.worker = {id: 1107, hasWorkCenter: true};
expect(controller.getIsSubordinate).toHaveBeenCalledWith();
expect(controller.getActiveContract).toHaveBeenCalledWith();
diff --git a/modules/worker/front/calendar/locale/es.yml b/modules/worker/front/calendar/locale/es.yml
index bd75458aa..50bb4bb52 100644
--- a/modules/worker/front/calendar/locale/es.yml
+++ b/modules/worker/front/calendar/locale/es.yml
@@ -11,4 +11,5 @@ Choose an absence type from the right menu: Elige un tipo de ausencia desde el m
To start adding absences, click an absence type from the right menu and then on the day you want to add an absence: Para empezar a añadir ausencias, haz clic en un tipo de ausencia desde el menu de la derecha y después en el día que quieres añadir la ausencia
You can just add absences within the current year: Solo puedes añadir ausencias dentro del año actual
Current day: Día actual
-Paid holidays: Vacaciones pagadas
\ No newline at end of file
+Paid holidays: Vacaciones pagadas
+Autonomous worker: Trabajador autónomo
diff --git a/modules/worker/front/card/index.js b/modules/worker/front/card/index.js
index 415b60787..e1eb97327 100644
--- a/modules/worker/front/card/index.js
+++ b/modules/worker/front/card/index.js
@@ -34,6 +34,10 @@ class Controller extends ModuleCard {
this.$http.get(`Workers/${this.$params.id}`, {filter})
.then(res => this.worker = res.data);
+ this.$http.get(`Workers/${this.$params.id}/activeContract`)
+ .then(res => {
+ if (res.data) this.worker.hasWorkCenter = res.data.workCenterFk;
+ });
}
}
diff --git a/modules/worker/front/time-control/index.html b/modules/worker/front/time-control/index.html
index 044ea4038..5f0855ee6 100644
--- a/modules/worker/front/time-control/index.html
+++ b/modules/worker/front/time-control/index.html
@@ -4,106 +4,114 @@
filter="::$ctrl.filter"
data="$ctrl.hours">
-
-
-
-
-
-
-
-
+
{{::$ctrl.weekdayNames[$index].name}}
-
- {{::weekday.dated | date: 'dd'}}
-
- {{::weekday.dated | date: 'MMMM'}}
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- {{::hour.timed | date: 'HH:mm'}}
+ title="{{::weekday.event.name}}"
+ ng-class="{invisible: !weekday.event}">
+
+
+
-
-
-
-
-
-
-
- {{$ctrl.formatHours(weekday.workedHours)}} h.
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{::hour.timed | date: 'HH:mm'}}
+
+
+
+
+
+
+
+
+ {{$ctrl.formatHours(weekday.workedHours)}} h.
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+{{::$ctrl.weekdayNames[$index].name}}
- {{::weekday.event.name}}
+ {{::weekday.dated | date: 'dd'}}
+
+ {{::weekday.dated | date: 'MMMM'}}
+
-
-
+ {{::weekday.event.name}}
+
+ Autonomous worker
+
diff --git a/modules/worker/front/time-control/index.js b/modules/worker/front/time-control/index.js
index 85ddcedfe..90ec33293 100644
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@@ -151,6 +151,7 @@ class Controller extends Section {
}
getAbsences() {
+ if (!this.worker.hasWorkerCenter) return;
const fullYear = this.started.getFullYear();
let params = {
workerFk: this.$params.id,
diff --git a/modules/worker/front/time-control/index.spec.js b/modules/worker/front/time-control/index.spec.js
index 94f9d3d48..0132f50fe 100644
--- a/modules/worker/front/time-control/index.spec.js
+++ b/modules/worker/front/time-control/index.spec.js
@@ -16,6 +16,10 @@ describe('Component vnWorkerTimeControl', () => {
$scope = $rootScope.$new();
$element = angular.element('
+
diff --git a/print/templates/email/entry-update-comission/entry-update-comission.js b/print/templates/email/entry-update-comission/entry-update-comission.js
new file mode 100755
index 000000000..8afe10ea0
--- /dev/null
+++ b/print/templates/email/entry-update-comission/entry-update-comission.js
@@ -0,0 +1,19 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+
+module.exports = {
+ name: 'entry-update-comission',
+ components: {
+ 'email-body': emailBody.build(),
+ },
+ props: {
+ currencyName: {
+ type: String,
+ required: true
+ },
+ referenceCurrent: {
+ type: Number,
+ required: true
+ }
+ }
+};
diff --git a/print/templates/email/entry-update-comission/locale/es.yml b/print/templates/email/entry-update-comission/locale/es.yml
new file mode 100644
index 000000000..de58be3e7
--- /dev/null
+++ b/print/templates/email/entry-update-comission/locale/es.yml
@@ -0,0 +1,4 @@
+subject: Actualización tipo de cambio en entradas
+title: Actualización tipo de cambio en entradas
+dear: Hola,
+body: 'El tipo de cambio para las ENTRADAS/COMPRAS en {0} se ha actualizado a partir de hoy en: {1}'
\ No newline at end of file
diff --git a/print/templates/email/modified-entry/assets/css/import.js b/print/templates/email/modified-entry/assets/css/import.js
new file mode 100644
index 000000000..4b4bb7086
--- /dev/null
+++ b/print/templates/email/modified-entry/assets/css/import.js
@@ -0,0 +1,11 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+ `${vnPrintPath}/common/css/spacing.css`,
+ `${vnPrintPath}/common/css/misc.css`,
+ `${vnPrintPath}/common/css/layout.css`,
+ `${vnPrintPath}/common/css/email.css`])
+ .mergeStyles();
diff --git a/print/templates/email/modified-entry/locale/en.yml b/print/templates/email/modified-entry/locale/en.yml
new file mode 100644
index 000000000..7bdfa15ff
--- /dev/null
+++ b/print/templates/email/modified-entry/locale/en.yml
@@ -0,0 +1,3 @@
+subject: Modified entry
+title: Modified entry
+description: From Warehouse the following packaging entry has been created/modified
diff --git a/print/templates/email/modified-entry/locale/es.yml b/print/templates/email/modified-entry/locale/es.yml
new file mode 100644
index 000000000..5a00307f9
--- /dev/null
+++ b/print/templates/email/modified-entry/locale/es.yml
@@ -0,0 +1,3 @@
+subject: Entrada modificada
+title: Entrada modificada
+description: Desde Almacén se ha creado/modificado la siguiente entrada de embalajes
diff --git a/print/templates/email/modified-entry/modified-entry.html b/print/templates/email/modified-entry/modified-entry.html
new file mode 100644
index 000000000..869d019a4
--- /dev/null
+++ b/print/templates/email/modified-entry/modified-entry.html
@@ -0,0 +1,11 @@
+
+
diff --git a/print/templates/email/modified-entry/modified-entry.js b/print/templates/email/modified-entry/modified-entry.js
new file mode 100755
index 000000000..35474a12f
--- /dev/null
+++ b/print/templates/email/modified-entry/modified-entry.js
@@ -0,0 +1,16 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+
+module.exports = {
+ name: 'modified-entry',
+ components: {
+ 'email-body': emailBody.build(),
+ },
+ props: {
+ url: {
+ type: String,
+ required: true
+ }
+ }
+};
+
diff --git a/print/templates/reports/invoice/assets/css/style.css b/print/templates/reports/invoice/assets/css/style.css
index 9fda2a613..d4526ce56 100644
--- a/print/templates/reports/invoice/assets/css/style.css
+++ b/print/templates/reports/invoice/assets/css/style.css
@@ -16,6 +16,10 @@ h2 {
font-size: 22px
}
+.column-oriented td,
+.column-oriented th {
+ padding: 6px
+}
#nickname h2 {
max-width: 400px;
@@ -39,4 +43,4 @@ h2 {
.phytosanitary-info {
margin-top: 10px
-}
\ No newline at end of file
+}
diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html
index 727621b2c..45b6c3934 100644
--- a/print/templates/reports/invoice/invoice.html
+++ b/print/templates/reports/invoice/invoice.html
@@ -62,7 +62,7 @@
-
+
+
+
+ + {{$t('dear')}} +
+ +
+
+
+
+ {{ $t('title') }}
++ {{ $t('description') }}: + {{ url }} +
+
+
{{sale.vatType}}
{{saleImport(sale) | currency('EUR', $i18n.locale)}}
-
-
- {{sale.tag5}} {{sale.value5}}
- {{sale.tag6}} {{sale.value6}}
- {{sale.tag7}} {{sale.value7}}
-
-
@@ -242,7 +235,7 @@
-
{{$t('deliveryNote')}}
@@ -106,13 +106,6 @@
+
{{$t('observations')}}
@@ -267,9 +260,7 @@
v-bind:left-text="$t('invoiceRef', [invoice.ref])"
v-bind:center-text="client.socialName"
v-bind:recipient-id="client.id"
- v-bind="$props"
-
- >
+ v-bind="$props">
diff --git a/webpack.config.js b/webpack.config.js
index 7a94b993d..a102b838e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,7 +9,7 @@ let mode = env == 'development' ? env : 'production';
let baseConfig = {
entry: {salix: 'salix'},
- mode: mode,
+ mode,
output: {
path: path.join(__dirname, 'dist'),
publicPath: '/'