+
+
+
+
+
+
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js
index 1c54aa9b8d..8aea255a2f 100644
--- a/front/salix/components/log/index.js
+++ b/front/salix/components/log/index.js
@@ -1,5 +1,6 @@
import ngModule from '../../module';
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)?$/;
@@ -7,17 +8,30 @@ const validDate = /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[
export default class Controller extends Section {
constructor($element, $) {
super($element, $);
+ this.hashToColor = hashToColor;
this.actionsText = {
insert: 'Creates',
- update: 'Updates',
+ update: 'Edits',
delete: 'Deletes',
- select: 'Views'
+ select: 'Accesses'
+ };
+ this.actionsClass = {
+ insert: 'success',
+ update: 'warning',
+ delete: 'alert',
+ select: 'notice'
+ };
+ this.actionsIcon = {
+ insert: 'add',
+ update: 'edit',
+ delete: 'remove',
+ select: 'visibility'
};
this.filter = {
include: [{
relation: 'user',
scope: {
- fields: ['name'],
+ fields: ['nickname', 'name', 'image'],
include: {
relation: 'worker',
scope: {
@@ -27,6 +41,20 @@ export default class Controller extends Section {
},
}],
};
+
+ this.dateFilter = this.$filter('date');
+ this.lang = this.$translate.use();
+ this.today = Date.vnNew();
+ this.today.setHours(0, 0, 0, 0);
+ }
+
+ $postLink() {
+ this.resetFilter();
+ this.$.$watch(
+ () => this.$.filter,
+ () => this.applyFilter(),
+ true
+ );
}
get logs() {
@@ -35,25 +63,61 @@ export default class Controller extends Section {
set logs(value) {
this._logs = value;
- if (!this.logs) return;
+ if (!value) return;
+
const empty = {};
const validations = window.validations;
- for (const log of value) {
- const oldValues = log.oldInstance || empty;
- const newValues = log.newInstance || empty;
- const locale = validations[log.changedModel]?.locale || empty;
+ const castJsonValue = this.castJsonValue;
- let props = Object.keys(oldValues).concat(Object.keys(newValues));
+ for (const log of value) {
+ 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)];
log.props = [];
for (const prop of props) {
+ if (prop.endsWith('$')) continue;
log.props.push({
- name: locale[prop] || prop,
- old: this.formatValue(oldValues[prop]),
- new: this.formatValue(newValues[prop])
+ 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};
+ }
+ }
+
+ get models() {
+ return this._models;
+ }
+
+ 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;
}
}
@@ -61,39 +125,131 @@ export default class Controller extends Section {
return !(this.changedModel && this.changedModelId);
}
- formatValue(value) {
- let type = typeof value;
+ castJsonValue(value) {
+ return typeof value === 'string' && validDate.test(value)
+ ? new Date(value)
+ : value;
+ }
- if (type === 'string' && validDate.test(value)) {
- value = new Date(value);
- type = typeof value;
- }
+ relativeDate(dateVal) {
+ if (dateVal == null) return '';
+ const date = new Date(dateVal);
+ const dateZeroTime = new Date(dateVal);
+ dateZeroTime.setHours(0, 0, 0, 0);
+ const diff = Math.trunc((this.today.getTime() - dateZeroTime.getTime()) / (1000 * 3600 * 24));
- switch (type) {
- case 'boolean':
- return value ? '✓' : '✗';
- case 'object':
- if (value instanceof Date) {
- const hasZeroTime =
- value.getHours() === 0 &&
- value.getMinutes() === 0 &&
- value.getSeconds() === 0;
- const format = hasZeroTime ? 'dd/MM/yyyy' : 'dd/MM/yyyy HH:mm:ss';
- return this.$filter('date')(value, format);
+ let format;
+ if (diff == 0)
+ format = `'${this.$t('today')}'`;
+ else if (diff == 1)
+ format = `'${this.$t('yesterday')}'`;
+ else if (diff > 1 && diff < 7)
+ format = `'${date.toLocaleDateString(this.lang, {weekday: 'short'})}'`;
+ else if (this.today.getFullYear() == date.getFullYear())
+ format = `d '${date.toLocaleDateString(this.lang, {month: 'short'})}'`;
+ else
+ format = `dd/MM/yyyy`;
+
+ return this.dateFilter(date, `${format} HH:mm`);
+ }
+
+ resetFilter() {
+ this.$.filter = {who: 'all'};
+ }
+
+ applyFilter() {
+ const filter = this.$.filter;
+
+ function getParam(prop, value) {
+ if (value == null || value == '') return null;
+ switch (prop) {
+ case 'search':
+ const or = [];
+ if (/^\s*[0-9]+\s*$/.test(value))
+ return {changedModelId: value.trim()};
+ else
+ return {changedModelValue: {like: `%${value}%`}};
+ case 'changes':
+ return {or: [
+ {oldJson: {like: `%${value}%`}},
+ {newJson: {like: `%${value}%`}},
+ {description: {like: `%${value}%`}}
+ ]};
+ case 'who':
+ switch (value) {
+ case 'all':
+ return null;
+ case 'user':
+ return {userFk: {neq: null}};
+ case 'system':
+ return {userFk: null};
+ }
+ 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) {
+ return {creationDate: {gte: value}};
+ } else {
+ const to = new Date(value);
+ to.setHours(23, 59, 59, 999);
+ return {creationDate: {between: [value, 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};
}
- else
- return value;
- default:
- return value;
+ }
+
+ const and = [];
+ for (const prop in filter) {
+ const param = getParam(prop, filter[prop]);
+ if (param) and.push(param);
+ }
+
+ const lbFilter = and.length ? {where: {and}} : null;
+ return this.$.model.applyFilter(lbFilter);
+ }
+
+ filterByEntity(log) {
+ this.$.filter = {
+ who: 'all',
+ search: log.changedModelId,
+ changedModel: log.changedModel
+ };
+ }
+
+ searchUser(search) {
+ if (/^[0-9]+$/.test(search)) {
+ return {id: search};
+ } else {
+ return {or: [
+ {name: search},
+ {nickname: {like: `%${search}%`}}
+ ]}
}
}
- showWorkerDescriptor(event, workerId) {
- if (!workerId) return;
- this.$.workerDescriptor.show(event.target, workerId);
+ showWorkerDescriptor(event, log) {
+ if (log.user?.worker)
+ this.$.workerDescriptor.show(event.target, log.userFk);
}
}
+function firstUpper(str) {
+ return str && str.charAt(0).toUpperCase() + str.substr(1);
+}
+
ngModule.vnComponent('vnLog', {
controller: Controller,
template: require('./index.html'),
@@ -105,3 +261,12 @@ ngModule.vnComponent('vnLog', {
url: '@'
}
});
+
+ngModule.component('vnLogValue', {
+ template:
+ '
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ {{::log.changedModelI18n}}
+
+
+
+ {{::$ctrl.relativeDate(log.creationDate)}}
+
+
+
+
+ #{{::log.changedModelId}}
+
+
+ {{::log.changedModelValue}}
+
+
+
+
+
+
+
+ {{::prop.nameI18n}}:
-
-
- {{::log.changedModel}}
-
-
- {{::$ctrl.actionsText[log.action]}}
-
-
- {{::log.changedModelValue}}
-
-
-
-
-
-
+| Field | -Before | -After | -
|---|---|---|
| {{prop.name}} | -{{prop.old}} | -{{prop.new}} | -
- {{::log.description}}
+
+ Recover password
{
this.goToLogin();
});
diff --git a/front/salix/components/recover-password/locale/es.yml b/front/salix/components/recover-password/locale/es.yml
index b71c71415c..69777fa657 100644
--- a/front/salix/components/recover-password/locale/es.yml
+++ b/front/salix/components/recover-password/locale/es.yml
@@ -1,3 +1,4 @@
Recover password: Recuperar contraseña
We will sent you an email to recover your password: Te enviaremos un correo para restablecer tu contraseña
Notification sent!: ¡Notificación enviada!
+User or recovery email: Usuario o correo de recuperación
diff --git a/front/salix/components/reset-password/index.js b/front/salix/components/reset-password/index.js
index 20c6c34fe7..a3ca032372 100644
--- a/front/salix/components/reset-password/index.js
+++ b/front/salix/components/reset-password/index.js
@@ -33,7 +33,7 @@ export default class Controller {
const newPassword = this.newPassword;
- this.$http.post('users/reset-password', {newPassword}, {headers})
+ this.$http.post('VnUsers/reset-password', {newPassword}, {headers})
.then(() => {
this.vnApp.showSuccess(this.$translate.instant('Password changed!'));
this.$state.go('login');
diff --git a/front/salix/components/reset-password/locale/es.yml b/front/salix/components/reset-password/locale/es.yml
index 0771d5dc35..30893a1524 100644
--- a/front/salix/components/reset-password/locale/es.yml
+++ b/front/salix/components/reset-password/locale/es.yml
@@ -1,6 +1,6 @@
Reset password: Restrablecer contraseña
New password: Nueva contraseña
-Repeat password: Repetir contraseñaç
+Repeat password: Repetir contraseña
Password changed!: ¡Contraseña cambiada!
Password requirements: >
La contraseña debe tener al menos {{ length }} caracteres de longitud,
diff --git a/front/salix/components/upload-photo/index.html b/front/salix/components/upload-photo/index.html
index 9b64a380fa..4422d88553 100644
--- a/front/salix/components/upload-photo/index.html
+++ b/front/salix/components/upload-photo/index.html
@@ -69,14 +69,6 @@
value-field="code">
-
-
-
-
diff --git a/front/salix/components/upload-photo/index.js b/front/salix/components/upload-photo/index.js
index c470183070..c9774d0370 100644
--- a/front/salix/components/upload-photo/index.js
+++ b/front/salix/components/upload-photo/index.js
@@ -64,8 +64,7 @@ export default class UploadPhoto extends Component {
this.editor = null;
this.newPhoto = {
id: id,
- collection: collection,
- fileName: id
+ collection: collection
};
this.$.dialog.show();
}
@@ -163,14 +162,8 @@ export default class UploadPhoto extends Component {
if (!this.newPhoto.files)
throw new Error(`Select an image`);
- const viewportType = this.viewportSelection;
- const output = viewportType.output;
const options = {
type: 'blob',
- size: {
- width: output.width,
- height: output.height
- }
};
return this.editor.result(options)
.then(blob => this.newPhoto.blob = blob)
@@ -197,7 +190,7 @@ export default class UploadPhoto extends Component {
timeout: this.canceler.promise,
transformRequest: ([file]) => {
const formData = new FormData();
- const now = new Date();
+ const now = Date.vnNew();
const timestamp = now.getTime();
const fileName = `${file.name}_${timestamp}`;
diff --git a/front/salix/components/user-popover/index.js b/front/salix/components/user-popover/index.js
index 6cc47db7d5..1d88137fff 100644
--- a/front/salix/components/user-popover/index.js
+++ b/front/salix/components/user-popover/index.js
@@ -20,8 +20,6 @@ class Controller {
name: config.languages[code] ? config.languages[code] : code
});
}
-
- vnConfig.initialize();
}
set lang(value) {
diff --git a/front/salix/index.js b/front/salix/index.js
index 5220f36f66..2488ef9b69 100644
--- a/front/salix/index.js
+++ b/front/salix/index.js
@@ -1,5 +1,5 @@
import './module';
import './routes';
import './components';
-import './services';
import './styles';
+import 'vn-loopback/server/boot/date';
diff --git a/front/salix/locale/es.yml b/front/salix/locale/es.yml
index d92c32b337..bed41c63b4 100644
--- a/front/salix/locale/es.yml
+++ b/front/salix/locale/es.yml
@@ -23,6 +23,7 @@ There is a new version, click here to reload: Hay una nueva versión, pulse aqu
Back: Volver
Save: Guardar
+Assign: Asignar
Create: Crear
Send: Enviar
Delete: Eliminar
diff --git a/front/salix/routes.js b/front/salix/routes.js
index f32c143ef7..4cc72ec95d 100644
--- a/front/salix/routes.js
+++ b/front/salix/routes.js
@@ -10,6 +10,9 @@ function config($stateProvider, $urlRouterProvider) {
.state('layout', {
abstract: true,
template: '
@@ -14,25 +14,25 @@
+ rule="VnUser">
+ rule="VnUser">
+ rule="VnUser">
diff --git a/modules/account/front/card/index.js b/modules/account/front/card/index.js
index 5266592f37..e06f991bbd 100644
--- a/modules/account/front/card/index.js
+++ b/modules/account/front/card/index.js
@@ -14,9 +14,9 @@ class Controller extends ModuleCard {
};
return Promise.all([
- this.$http.get(`Accounts/${this.$params.id}`, {filter})
+ this.$http.get(`VnUsers/${this.$params.id}`, {filter})
.then(res => this.user = res.data),
- this.$http.get(`UserAccounts/${this.$params.id}/exists`)
+ 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 cd28c458a0..204b897e41 100644
--- a/modules/account/front/card/index.spec.js
+++ b/modules/account/front/card/index.spec.js
@@ -15,8 +15,8 @@ describe('component vnUserCard', () => {
it('should reload the controller data', () => {
controller.$params.id = 1;
- $httpBackend.expectGET('Accounts/1').respond('foo');
- $httpBackend.expectGET('UserAccounts/1/exists').respond({exists: true});
+ $httpBackend.expectGET('VnUsers/1').respond('foo');
+ $httpBackend.expectGET('Accounts/1/exists').respond({exists: true});
controller.reload();
$httpBackend.flush();
diff --git a/modules/account/front/create/index.html b/modules/account/front/create/index.html
index ca4a2f8407..ee2de926ab 100644
--- a/modules/account/front/create/index.html
+++ b/modules/account/front/create/index.html
@@ -1,6 +1,6 @@
@@ -14,24 +14,24 @@
+ rule="VnUser">
+ rule="VnUser">
+ rule="VnUser">
this.hasAccount = res.data.exists);
}
onDelete() {
- return this.$http.delete(`Accounts/${this.id}`)
+ return this.$http.delete(`VnUsers/${this.id}`)
.then(() => this.$state.go('account.index'))
.then(() => this.vnApp.showSuccess(this.$t('User removed')));
}
@@ -69,12 +69,12 @@ class Controller extends Descriptor {
}
onEnableAccount() {
- return this.$http.post(`UserAccounts`, {id: this.id})
+ return this.$http.post(`Accounts`, {id: this.id})
.then(() => this.onSwitchAccount(true));
}
onDisableAccount() {
- return this.$http.delete(`UserAccounts/${this.id}`)
+ return this.$http.delete(`Accounts/${this.id}`)
.then(() => this.onSwitchAccount(false));
}
@@ -88,7 +88,7 @@ class Controller extends Descriptor {
}
onSetActive(active) {
- return this.$http.patch(`Accounts/${this.id}`, {active})
+ return this.$http.patch(`VnUsers/${this.id}`, {active})
.then(() => {
this.user.active = active;
const message = active
diff --git a/modules/account/front/descriptor/index.spec.js b/modules/account/front/descriptor/index.spec.js
index f5e7aa7d43..46c7e376c8 100644
--- a/modules/account/front/descriptor/index.spec.js
+++ b/modules/account/front/descriptor/index.spec.js
@@ -10,7 +10,7 @@ describe('component vnUserDescriptor', () => {
beforeEach(inject(($componentController, _$httpBackend_) => {
$httpBackend = _$httpBackend_;
- $httpBackend.whenGET('UserAccounts/1/exists').respond({exists: true});
+ $httpBackend.whenGET('Accounts/1/exists').respond({exists: true});
controller = $componentController('vnUserDescriptor', {$element: null}, {user});
jest.spyOn(controller, 'emit');
@@ -21,7 +21,7 @@ describe('component vnUserDescriptor', () => {
it('should delete entity and go to index', () => {
controller.$state.go = jest.fn();
- $httpBackend.expectDELETE('Accounts/1').respond();
+ $httpBackend.expectDELETE('VnUsers/1').respond();
controller.onDelete();
$httpBackend.flush();
@@ -61,7 +61,7 @@ describe('component vnUserDescriptor', () => {
describe('onEnableAccount()', () => {
it('should make request to enable account', () => {
- $httpBackend.expectPOST('UserAccounts', {id: 1}).respond();
+ $httpBackend.expectPOST('Accounts', {id: 1}).respond();
controller.onEnableAccount();
$httpBackend.flush();
@@ -73,7 +73,7 @@ describe('component vnUserDescriptor', () => {
describe('onDisableAccount()', () => {
it('should make request to disable account', () => {
- $httpBackend.expectDELETE('UserAccounts/1').respond();
+ $httpBackend.expectDELETE('Accounts/1').respond();
controller.onDisableAccount();
$httpBackend.flush();
@@ -85,7 +85,7 @@ describe('component vnUserDescriptor', () => {
describe('onSetActive()', () => {
it('should make request to activate/deactivate the user', () => {
- $httpBackend.expectPATCH('Accounts/1', {active: true}).respond();
+ $httpBackend.expectPATCH('VnUsers/1', {active: true}).respond();
controller.onSetActive(true);
$httpBackend.flush();
diff --git a/modules/account/front/index.js b/modules/account/front/index.js
index 0cd0c49555..695f369677 100644
--- a/modules/account/front/index.js
+++ b/modules/account/front/index.js
@@ -19,3 +19,5 @@ import './ldap';
import './samba';
import './accounts';
import './privileges';
+import './user-log';
+import './role-log';
diff --git a/modules/account/front/locale/es.yml b/modules/account/front/locale/es.yml
index 18e2c06a18..7988cbda6d 100644
--- a/modules/account/front/locale/es.yml
+++ b/modules/account/front/locale/es.yml
@@ -8,4 +8,5 @@ Role: Rol
Mail aliases: Alias de correo
Account not enabled: Cuenta no habilitada
Inherited roles: Roles heredados
-Go to the user: Ir al usuario
\ No newline at end of file
+Go to the user: Ir al usuario
+Log: Histórico
diff --git a/modules/account/front/main/index.html b/modules/account/front/main/index.html
index 5736b3a3b1..5872a328db 100644
--- a/modules/account/front/main/index.html
+++ b/modules/account/front/main/index.html
@@ -1,11 +1,12 @@
-
diff --git a/modules/account/front/role-log/index.js b/modules/account/front/role-log/index.js
new file mode 100644
index 0000000000..02448ccaa5
--- /dev/null
+++ b/modules/account/front/role-log/index.js
@@ -0,0 +1,7 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+ngModule.vnComponent('vnRoleLog', {
+ template: require('./index.html'),
+ controller: Section,
+});
diff --git a/modules/account/front/routes.json b/modules/account/front/routes.json
index a6f2f5d3f5..cc66df103c 100644
--- a/modules/account/front/routes.json
+++ b/modules/account/front/routes.json
@@ -20,12 +20,14 @@
{"state": "account.card.roles", "icon": "group"},
{"state": "account.card.mailForwarding", "icon": "forward"},
{"state": "account.card.aliases", "icon": "email"},
- {"state": "account.card.privileges", "icon": "badge"}
+ {"state": "account.card.privileges", "icon": "badge"},
+ {"state": "account.card.log", "icon": "history"}
],
"role": [
{"state": "account.role.card.basicData", "icon": "settings"},
{"state": "account.role.card.subroles", "icon": "groups"},
- {"state": "account.role.card.inherited", "icon": "account_tree"}
+ {"state": "account.role.card.inherited", "icon": "account_tree"},
+ {"state": "account.role.card.log", "icon": "history"}
],
"alias": [
{"state": "account.alias.card.basicData", "icon": "settings"},
@@ -80,6 +82,18 @@
"description": "Basic data",
"acl": ["hr"]
},
+ {
+ "url" : "/log",
+ "state": "account.card.log",
+ "component": "vn-user-log",
+ "description": "Log"
+ },
+ {
+ "url" : "/log",
+ "state": "account.role.card.log",
+ "component": "vn-role-log",
+ "description": "Log"
+ },
{
"url": "/roles",
"state": "account.card.roles",
diff --git a/modules/account/front/summary/index.js b/modules/account/front/summary/index.js
index 8ed025b613..8d30070e92 100644
--- a/modules/account/front/summary/index.js
+++ b/modules/account/front/summary/index.js
@@ -15,7 +15,7 @@ class Controller extends Summary {
}
}
};
- this.$http.get(`Accounts/${value.id}`, {filter})
+ this.$http.get(`VnUsers/${value.id}`, {filter})
.then(res => this.$.summary = res.data);
}
get isHr() {
diff --git a/modules/account/front/user-log/index.html b/modules/account/front/user-log/index.html
new file mode 100644
index 0000000000..5a77ed7b9f
--- /dev/null
+++ b/modules/account/front/user-log/index.html
@@ -0,0 +1 @@
+
+
-
+ label="Change destination"
+ disabled="$ctrl.checked.length == 0"
+ ng-click="changeDestination.show()">
+
+
+
-
-
-
+
@@ -101,7 +101,7 @@
diff --git a/modules/ticket/front/advance/index.js b/modules/ticket/front/advance/index.js
index 1404f94722..0cec41227a 100644
--- a/modules/ticket/front/advance/index.js
+++ b/modules/ticket/front/advance/index.js
@@ -1,5 +1,6 @@
import ngModule from '../module';
import Section from 'salix/components/section';
+import './style.scss';
export default class Controller extends Section {
constructor($element, $) {
@@ -39,6 +40,7 @@ export default class Controller extends Section {
field: 'ipt',
autocomplete: {
url: 'ItemPackingTypes',
+ where: `{isActive: true}`,
showField: 'description',
valueField: 'code'
}
@@ -47,6 +49,7 @@ export default class Controller extends Section {
field: 'futureIpt',
autocomplete: {
url: 'ItemPackingTypes',
+ where: `{isActive: true}`,
showField: 'description',
valueField: 'code'
}
@@ -60,19 +63,22 @@ export default class Controller extends Section {
}
setDefaultFilter() {
- let today = new Date();
+ let today = Date.vnNew();
const tomorrow = new Date(today);
tomorrow.setDate(tomorrow.getDate() + 1);
- this.filterParams = {
- dateFuture: tomorrow,
- dateToAdvance: today,
- warehouseFk: this.vnConfig.warehouseFk
- };
- this.$.model.applyFilter(null, this.filterParams);
+ this.$http.get(`UserConfigs/getUserConfig`)
+ .then(res => {
+ this.filterParams = {
+ dateFuture: tomorrow,
+ dateToAdvance: today,
+ warehouseFk: res.data.warehouseFk
+ };
+ this.$.model.addFilter({}, this.filterParams);
+ });
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0);
@@ -96,13 +102,6 @@ export default class Controller extends Section {
return checkedLines;
}
- stateColor(state) {
- if (state === 'OK')
- return 'success';
- else if (state === 'Libre')
- return 'notice';
- }
-
dateRange(value) {
const minHour = new Date(value);
minHour.setHours(0, 0, 0, 0);
@@ -113,9 +112,15 @@ export default class Controller extends Section {
}
totalPriceColor(totalWithVat) {
- const total = parseInt(totalWithVat);
- if (total > 0 && total < 50)
- return 'warning';
+ return this.isLessThan50(totalWithVat) ? 'warning' : '';
+ }
+
+ totalPriceTitle(totalWithVat) {
+ return this.isLessThan50(totalWithVat) ? 'Less than 50€' : '';
+ }
+
+ isLessThan50(totalWithVat) {
+ return (parseInt(totalWithVat) > 0 && parseInt(totalWithVat) < 50);
}
get confirmationMessage() {
@@ -126,6 +131,11 @@ export default class Controller extends Section {
});
}
+ agencies(futureAgency, agency) {
+ return this.$t(`Origin agency`, {agency: futureAgency}) +
+ '\n' + this.$t(`Destination agency`, {agency: agency});
+ }
+
moveTicketsAdvance() {
let ticketsToMove = [];
this.checked.forEach(ticket => {
@@ -155,16 +165,30 @@ export default class Controller extends Section {
return {'liters': value};
case 'lines':
return {'lines': value};
+ case 'futureLiters':
+ return {'futureLiters': value};
+ case 'futureLines':
+ return {'futureLines': value};
case 'ipt':
- return {'ipt': value};
+ return {or:
+ [
+ {'ipt': {like: `%${value}%`}},
+ {'ipt': null}
+ ]
+ };
case 'futureIpt':
- return {'futureIpt': value};
+ return {or:
+ [
+ {'futureIpt': {like: `%${value}%`}},
+ {'futureIpt': null}
+ ]
+ };
case 'totalWithVat':
return {'totalWithVat': value};
case 'futureTotalWithVat':
return {'futureTotalWithVat': value};
- case 'hasStock':
- return {'hasStock': value};
+ case 'notMovableLines':
+ return {'notMovableLines': value};
}
}
}
diff --git a/modules/ticket/front/advance/index.spec.js b/modules/ticket/front/advance/index.spec.js
index c5a04daee4..da8614ca5d 100644
--- a/modules/ticket/front/advance/index.spec.js
+++ b/modules/ticket/front/advance/index.spec.js
@@ -26,14 +26,14 @@ describe('Component vnTicketAdvance', () => {
describe('compareDate()', () => {
it('should return warning when the date is the present', () => {
- let today = new Date();
+ let today = Date.vnNew();
let result = controller.compareDate(today);
expect(result).toEqual('warning');
});
it('should return sucess when the date is in the future', () => {
- let futureDate = new Date();
+ let futureDate = Date.vnNew();
futureDate = futureDate.setDate(futureDate.getDate() + 10);
let result = controller.compareDate(futureDate);
@@ -41,7 +41,7 @@ describe('Component vnTicketAdvance', () => {
});
it('should return undefined when the date is in the past', () => {
- let pastDate = new Date();
+ let pastDate = Date.vnNew();
pastDate = pastDate.setDate(pastDate.getDate() - 10);
let result = controller.compareDate(pastDate);
@@ -61,27 +61,9 @@ describe('Component vnTicketAdvance', () => {
});
});
- describe('stateColor()', () => {
- it('should return success to the OK tickets', () => {
- const ok = controller.stateColor(controller.$.model.data[0].state);
- const notOk = controller.stateColor(controller.$.model.data[1].state);
-
- expect(ok).toEqual('success');
- expect(notOk).not.toEqual('success');
- });
-
- it('should return success to the FREE tickets', () => {
- const notFree = controller.stateColor(controller.$.model.data[0].state);
- const free = controller.stateColor(controller.$.model.data[1].state);
-
- expect(free).toEqual('notice');
- expect(notFree).not.toEqual('notice');
- });
- });
-
describe('dateRange()', () => {
it('should return two dates with the hours at the start and end of the given date', () => {
- const now = new Date();
+ const now = Date.vnNew();
const today = now.getDate();
diff --git a/modules/ticket/front/advance/locale/es.yml b/modules/ticket/front/advance/locale/es.yml
index b444fbdd3b..3111d9afd3 100644
--- a/modules/ticket/front/advance/locale/es.yml
+++ b/modules/ticket/front/advance/locale/es.yml
@@ -4,3 +4,8 @@ Advance confirmation: ¿Desea adelantar {{checked}} tickets?
Success: Tickets movidos correctamente
Lines: Líneas
Liters: Litros
+Item Packing Type: Encajado
+Origin agency: "Agencia origen: {{agency}}"
+Destination agency: "Agencia destino: {{agency}}"
+Less than 50€: Menor a 50€
+Not Movable: No movibles
diff --git a/modules/ticket/front/advance/style.scss b/modules/ticket/front/advance/style.scss
new file mode 100644
index 0000000000..8fa9de4381
--- /dev/null
+++ b/modules/ticket/front/advance/style.scss
@@ -0,0 +1,7 @@
+@import "variables";
+
+vn-ticket-advance{
+ vn-icon {
+ color: #f7931e
+ }
+}
diff --git a/modules/ticket/front/basic-data/step-one/index.html b/modules/ticket/front/basic-data/step-one/index.html
index 498630b87f..bbe315ca6e 100644
--- a/modules/ticket/front/basic-data/step-one/index.html
+++ b/modules/ticket/front/basic-data/step-one/index.html
@@ -4,6 +4,11 @@
order="name"
auto-load="true">
+
+
|
diff --git a/modules/claim/front/card/index.js b/modules/claim/front/card/index.js
index 747eea9e74..4a8677c905 100644
--- a/modules/claim/front/card/index.js
+++ b/modules/claim/front/card/index.js
@@ -19,10 +19,26 @@ class Controller extends ModuleCard {
}, {
relation: 'ticket',
scope: {
- fields: ['agencyModeFk'],
- include: {
- relation: 'agencyMode'
- }
+ fields: ['zoneFk', 'addressFk'],
+ include: [
+ {
+ relation: 'zone',
+ scope: {
+ fields: ['name']
+ }
+ },
+ {
+ relation: 'address',
+ scope: {
+ fields: ['provinceFk'],
+ include: {
+ relation: 'province',
+ scope: {
+ fields: ['name']
+ }
+ }
+ }
+ }]
}
}, {
relation: 'claimState',
diff --git a/modules/claim/front/descriptor/index.html b/modules/claim/front/descriptor/index.html
index 0bbacf94b6..5fd1984404 100644
--- a/modules/claim/front/descriptor/index.html
+++ b/modules/claim/front/descriptor/index.html
@@ -27,16 +27,16 @@
+
+
+
|
- - {{::claim.description}} + + {{::claim.stateDescription}} |
diff --git a/modules/claim/front/index/index.js b/modules/claim/front/index/index.js
index 084618e16b..e3fdabf799 100644
--- a/modules/claim/front/index/index.js
+++ b/modules/claim/front/index/index.js
@@ -55,13 +55,13 @@ class Controller extends Section {
}
}
- stateColor(claim) {
- switch (claim.description) {
- case 'Pendiente':
+ stateColor(code) {
+ switch (code) {
+ case 'pending':
return 'warning';
- case 'Gestionado':
+ case 'managed':
return 'notice';
- case 'Resuelto':
+ case 'resolved':
return 'success';
}
}
diff --git a/modules/claim/front/locale/es.yml b/modules/claim/front/locale/es.yml
index 5abdc1535e..f6dac2b838 100644
--- a/modules/claim/front/locale/es.yml
+++ b/modules/claim/front/locale/es.yml
@@ -18,3 +18,6 @@ Claim deleted!: Reclamación eliminada!
claim: reclamación
Photos: Fotos
Go to the claim: Ir a la reclamación
+Sale tracking: Líneas preparadas
+Ticket tracking: Estados del ticket
+The client does not have an email: El cliente no tiene email
diff --git a/modules/claim/front/photos/index.html b/modules/claim/front/photos/index.html
index 9e00ee02f8..8b13789179 100644
--- a/modules/claim/front/photos/index.html
+++ b/modules/claim/front/photos/index.html
@@ -1,48 +1 @@
-Compensation+Compensation-{{::bic}}
+ {{::name}}
+ Total-
-
- |
@@ -56,25 +57,32 @@
Comercial
|
-
+ Country
+ |
+
+ P.Method
+ |
+
Balance D.
|
-
Author
|
Last observation
|
-
L. O. Date
|
-
@@ -88,8 +96,9 @@
|
- |
@@ -109,6 +118,12 @@
{{::defaulter.salesPersonName | dashIfEmpty}}
+
+ {{::defaulter.country}}
+ |
+
+ {{::defaulter.payMethod}}
+ |
{{::defaulter.amount | currency: 'EUR': 2}} |
-
+
|
@@ -118,7 +128,7 @@
on-send="$ctrl.onSmsSend($sms)"
sms="$ctrl.newSMS">
-
\ No newline at end of file
+' + + this.$t(`Unpaid Dated`, {dated: this.client.unpaid.dated}) + ' ' + + this.$t(`Unpaid Amount`, {amount: this.client.unpaid.amount}); + } } ngModule.vnComponent('vnClientDescriptor', { diff --git a/modules/client/front/descriptor/locale/es.yml b/modules/client/front/descriptor/locale/es.yml index 71723e6549..776b676985 100644 --- a/modules/client/front/descriptor/locale/es.yml +++ b/modules/client/front/descriptor/locale/es.yml @@ -5,4 +5,7 @@ To date: Fecha hasta Go to user: Ir al usuario Go to supplier: Ir al proveedor Client invoices list: Listado de facturas del cliente -Pay method: Forma de pago \ No newline at end of file +Pay method: Forma de pago +Unpaid Dated: "Fecha: {{dated | date:'dd/MM/yyyy'}}" +Unpaid Amount: "Importe: {{amount | currency: 'EUR':2}}" +Business type: Tipo de negocio \ No newline at end of file diff --git a/modules/client/front/dms/edit/index.html b/modules/client/front/dms/edit/index.html index 87d69fdcde..2d653c8271 100644 --- a/modules/client/front/dms/edit/index.html +++ b/modules/client/front/dms/edit/index.html @@ -2,6 +2,11 @@ vn-id="watcher" data="$ctrl.dms"> +
-
- {{::buy.item.id | zeroFill:6}}
+ {{::buy.item.id}}
|
@@ -174,7 +175,7 @@
{{::name}}
+ #{{::id}}
-
{{buy.quantity * buy.buyingValue | currency: 'EUR':2}}
@@ -246,4 +247,4 @@
question="You are going to delete buy(s) from this entry"
message="Continue anyway?"
on-accept="$ctrl.deleteBuys()">
-
\ No newline at end of file
+
diff --git a/modules/entry/front/create/index.html b/modules/entry/front/create/index.html
index ed08b5c76c..e1e4dc064a 100644
--- a/modules/entry/front/create/index.html
+++ b/modules/entry/front/create/index.html
@@ -21,7 +21,8 @@
order="nickname"
required="true">
|
- {{::nickname}}
+ #{{::id}}
+ {{::agencyModeName}}
+ - {{::warehouseInName}} ({{::shipped | date: 'dd/MM/yyyy'}})
+ → {{::warehouseOutName}} ({{::landed | date: 'dd/MM/yyyy'}})
+
+ #{{::id}}
-
-
+{{name}}
+
+ {{category.name}}
+
+
+{{::buy.buyingValue | currency: 'EUR':2}} |
- {{::buy.freightValue | currency: 'EUR':2}} |
- {{::buy.comissionValue | currency: 'EUR':2}} |
- {{::buy.packageValue | currency: 'EUR':2}} |
+ {{::buy.buyingValue | currency: 'EUR':3}} |
+ {{::buy.freightValue | currency: 'EUR':3}} |
+ {{::buy.comissionValue | currency: 'EUR':3}} |
+ {{::buy.packageValue | currency: 'EUR':3}} |
|
- {{::buy.price2 | currency: 'EUR':2}} |
- {{::buy.price3 | currency: 'EUR':2}} |
- {{::buy.minPrice | currency: 'EUR':2}} |
+ {{::buy.price2 | currency: 'EUR':3}} |
+ {{::buy.price3 | currency: 'EUR':3}} |
+ {{::buy.minPrice | currency: 'EUR':3}} |
{{::buy.ektFk | dashIfEmpty}} |
{{::buy.weight}} |
{{::buy.packageFk}} |
@@ -261,7 +255,7 @@
Grouping |
Buying value |
Import |
- Grouping price |
- Packing price |
+ PVP |
|
@@ -125,19 +121,18 @@
{{::line.packageFk | dashIfEmpty}} | {{::line.weight}} |
- |
- | {{::line.buyingValue | currency: 'EUR':2}} |
{{::line.quantity * line.buyingValue | currency: 'EUR':2}} |
- {{::line.price2 | currency: 'EUR':2}} |
- {{::line.price3 | currency: 'EUR':2}} |
+ {{::line.price2 | currency: 'EUR':2 | dashIfEmpty}} / {{::line.price3 | currency: 'EUR':2 | dashIfEmpty}} |
@@ -150,7 +145,7 @@
- {{::line.item.id | zeroFill:6}}
+ {{::line.item.id}}
|
@@ -195,7 +190,7 @@
vn-id="item-descriptor"
warehouse-fk="$ctrl.vnConfig.warehouseFk">
- |
+
+
diff --git a/modules/invoiceIn/front/serial-search-panel/index.js b/modules/invoiceIn/front/serial-search-panel/index.js
new file mode 100644
index 0000000000..b11911ee3b
--- /dev/null
+++ b/modules/invoiceIn/front/serial-search-panel/index.js
@@ -0,0 +1,44 @@
+import ngModule from '../module';
+import SearchPanel from 'core/components/searchbar/search-panel';
+import './style.scss';
+
+class Controller extends SearchPanel {
+ constructor($element, $) {
+ super($element, $);
+ this.filter = {};
+ const filter = {
+ fields: ['daysAgo']
+ };
+ this.$http.get('InvoiceInConfigs', {filter}).then(res => {
+ if (res.data) {
+ this.invoiceInConfig = res.data[0];
+ this.addFilters();
+ }
+ });
+ }
+
+ removeItemFilter(param) {
+ this.filter[param] = null;
+ this.addFilters();
+ }
+
+ onKeyPress($event) {
+ if ($event.key === 'Enter')
+ this.addFilters();
+ }
+
+ addFilters() {
+ if (!this.filter.daysAgo)
+ this.filter.daysAgo = this.invoiceInConfig.daysAgo;
+
+ return this.model.addFilter({}, this.filter);
+ }
+}
+
+ngModule.component('vnInvoiceInSerialSearchPanel', {
+ template: require('./index.html'),
+ controller: Controller,
+ bindings: {
+ model: '<'
+ }
+});
diff --git a/modules/invoiceIn/front/serial-search-panel/index.spec.js b/modules/invoiceIn/front/serial-search-panel/index.spec.js
new file mode 100644
index 0000000000..b5228e126a
--- /dev/null
+++ b/modules/invoiceIn/front/serial-search-panel/index.spec.js
@@ -0,0 +1,43 @@
+import './index.js';
+
+describe('InvoiceIn', () => {
+ describe('Component serial-search-panel', () => {
+ let controller;
+ let $scope;
+
+ beforeEach(ngModule('invoiceIn'));
+
+ beforeEach(inject(($componentController, $rootScope) => {
+ $scope = $rootScope.$new();
+ const $element = angular.element('{{::vat}}
+ #{{::id}}
+ {{::transaction}}
+ #{{::id}}
+ '; - - body += `ID: ${failedClient.id} - ${failedClient.stacktrace} `; - - await Self.rawSql(` - INSERT INTO vn.mail (sender, replyTo, sent, subject, body) - VALUES (?, ?, FALSE, ?, ?)`, [ - worker.email, - worker.email, - subject, - body - ], options); + return supplierCompany && supplierCompany.isSpanishCompany; } }; diff --git a/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js b/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js new file mode 100644 index 0000000000..941d31596b --- /dev/null +++ b/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js @@ -0,0 +1,50 @@ +const {Report} = require('vn-print'); + +module.exports = Self => { + Self.remoteMethodCtx('invoiceOutPdf', { + description: 'Returns the invoice pdf', + accessType: 'READ', + accepts: [ + { + arg: 'reference', + type: 'string', + required: true, + description: 'The invoice reference', + http: {source: 'path'} + } + ], + returns: [ + { + arg: 'body', + type: 'file', + root: true + }, { + arg: 'Content-Type', + type: 'String', + http: {target: 'header'} + }, { + arg: 'Content-Disposition', + type: 'String', + http: {target: 'header'} + } + ], + http: { + path: '/:reference/invoice-out-pdf', + verb: 'GET' + } + }); + + Self.invoiceOutPdf = async(ctx, reference) => { + const args = Object.assign({}, ctx.args); + const params = {lang: ctx.req.getLocale()}; + + delete args.ctx; + for (const param in args) + params[param] = args[param]; + + const report = new Report('invoice', params); + const stream = await report.toPdfStream(); + + return [stream, 'application/pdf', `filename="doc-${reference}.pdf"`]; + }; +}; diff --git a/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js b/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js new file mode 100644 index 0000000000..ae9c404afd --- /dev/null +++ b/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js @@ -0,0 +1,115 @@ +const UserError = require('vn-loopback/util/user-error'); +const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; + +module.exports = Self => { + Self.remoteMethodCtx('negativeBases', { + description: 'Find all negative bases', + accessType: 'READ', + accepts: [ + { + arg: 'from', + type: 'date', + description: 'From date' + }, + { + arg: 'to', + type: 'date', + description: 'To date' + }, + { + arg: 'filter', + type: 'object', + description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string' + }, + ], + returns: { + type: ['object'], + root: true + }, + http: { + path: `/negativeBases`, + verb: 'GET' + } + }); + + Self.negativeBases = async(ctx, options) => { + const conn = Self.dataSource.connector; + const args = ctx.args; + + if (!args.from || !args.to) + throw new UserError(`Insert a date range`); + + const myOptions = {}; + + if (typeof options == 'object') + Object.assign(myOptions, options); + + const stmts = []; + let stmt; + stmts.push(`DROP TEMPORARY TABLE IF EXISTS tmp.ticket`); + + stmts.push(new ParameterizedSQL( + `CREATE TEMPORARY TABLE tmp.ticket + (KEY (ticketFk)) + ENGINE = MEMORY + SELECT id ticketFk + FROM ticket t + WHERE shipped BETWEEN ? AND ? + AND refFk IS NULL`, [args.from, args.to])); + stmts.push(`CALL vn.ticket_getTax(NULL)`); + stmts.push(`DROP TEMPORARY TABLE IF EXISTS tmp.filter`); + stmts.push(new ParameterizedSQL( + `CREATE TEMPORARY TABLE tmp.filter + ENGINE = MEMORY + SELECT + co.code company, + cou.country, + c.id clientId, + c.socialName clientSocialName, + SUM(s.quantity * s.price * ( 100 - s.discount ) / 100) amount, + negativeBase.taxableBase, + negativeBase.ticketFk, + c.isActive, + c.hasToInvoice, + c.isTaxDataChecked, + w.id comercialId, + CONCAT(w.firstName, ' ', w.lastName) comercialName + FROM vn.ticket t + JOIN vn.company co ON co.id = t.companyFk + JOIN vn.sale s ON s.ticketFk = t.id + JOIN vn.client c ON c.id = t.clientFk + JOIN vn.country cou ON cou.id = c.countryFk + LEFT JOIN vn.worker w ON w.id = c.salesPersonFk + LEFT JOIN ( + SELECT ticketFk, taxableBase + FROM tmp.ticketAmount + GROUP BY ticketFk + HAVING taxableBase < 0 + ) negativeBase ON negativeBase.ticketFk = t.id + WHERE t.shipped BETWEEN ? AND ? + AND t.refFk IS NULL + AND c.typeFk IN ('normal','trust') + GROUP BY t.clientFk, negativeBase.taxableBase + HAVING amount <> 0`, [args.from, args.to])); + + stmt = new ParameterizedSQL(` + SELECT f.* + FROM tmp.filter f`); + + if (args.filter) { + stmt.merge(conn.makeWhere(args.filter.where)); + stmt.merge(conn.makeOrderBy(args.filter.order)); + stmt.merge(conn.makeLimit(args.filter)); + } + + const negativeBasesIndex = stmts.push(stmt) - 1; + + stmts.push(`DROP TEMPORARY TABLE tmp.filter, tmp.ticket, tmp.ticketTax, tmp.ticketAmount`); + + const sql = ParameterizedSQL.join(stmts, ';'); + const result = await conn.executeStmt(sql); + + return negativeBasesIndex === 0 ? result : result[negativeBasesIndex]; + }; +}; + diff --git a/modules/invoiceOut/back/methods/invoiceOut/negativeBasesCsv.js b/modules/invoiceOut/back/methods/invoiceOut/negativeBasesCsv.js new file mode 100644 index 0000000000..d70a8fce52 --- /dev/null +++ b/modules/invoiceOut/back/methods/invoiceOut/negativeBasesCsv.js @@ -0,0 +1,68 @@ +const {toCSV} = require('vn-loopback/util/csv'); + +module.exports = Self => { + Self.remoteMethodCtx('negativeBasesCsv', { + description: 'Returns the negative bases as .csv', + accessType: 'READ', + accepts: [ + { + arg: 'from', + type: 'date', + description: 'From date', + required: true + }, + { + arg: 'to', + type: 'date', + description: 'To date', + required: true + }], + returns: [ + { + arg: 'body', + type: 'file', + root: true + }, { + arg: 'Content-Type', + type: 'String', + http: {target: 'header'} + }, { + arg: 'Content-Disposition', + type: 'String', + http: {target: 'header'} + } + ], + http: { + path: '/negativeBasesCsv', + verb: 'GET' + } + }); + + Self.negativeBasesCsv = async(ctx, options) => { + const $t = ctx.req.__; // $translate + const args = ctx.args; + const myOptions = {}; + + if (typeof options == 'object') + Object.assign(myOptions, options); + + const negativeBases = await Self.app.models.InvoiceOut.negativeBases(ctx, myOptions); + const locatedFields = []; + negativeBases.forEach(element => { + locatedFields.push(Object.keys(element).map(key => { + return {newName: $t(key), value: element[key]}; + }).filter(item => item !== null) + .reduce((result, item) => { + result[item.newName] = item.value; + return result; + }, {})); + }); + const content = toCSV(locatedFields); + + return [ + content, + 'text/csv', + `attachment; filename="negative-bases-${new Date(args.from).toLocaleDateString()}-${new Date(args.to).toLocaleDateString()}.csv"` + ]; + }; +}; diff --git a/modules/invoiceOut/back/methods/invoiceOut/refund.js b/modules/invoiceOut/back/methods/invoiceOut/refund.js index 7ad6b03ec9..1b7ccc1e42 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/refund.js +++ b/modules/invoiceOut/back/methods/invoiceOut/refund.js @@ -1,12 +1,20 @@ module.exports = Self => { - Self.remoteMethod('refund', { + Self.remoteMethodCtx('refund', { description: 'Create refund tickets with sales and services if provided', accessType: 'WRITE', - accepts: [{ - arg: 'ref', - type: 'string', - description: 'The invoice reference' - }], + accepts: [ + { + arg: 'ref', + type: 'string', + description: 'The invoice reference', + required: true + }, + { + arg: 'withWarehouse', + type: 'boolean', + required: true + } + ], returns: { type: ['number'], root: true @@ -17,7 +25,7 @@ module.exports = Self => { } }); - Self.refund = async(ref, options) => { + Self.refund = async(ctx, ref, withWarehouse, options) => { const models = Self.app.models; const myOptions = {}; let tx; @@ -35,8 +43,7 @@ module.exports = Self => { const tickets = await models.Ticket.find(filter, myOptions); const ticketsIds = tickets.map(ticket => ticket.id); - - const refundedTickets = await models.Ticket.refund(ticketsIds, myOptions); + const refundedTickets = await models.Ticket.refund(ctx, ticketsIds, withWarehouse, myOptions); if (tx) await tx.commit(); diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/book.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/book.spec.js index ee72f22186..3af7542ca4 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/book.spec.js +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/book.spec.js @@ -1,6 +1,7 @@ const models = require('vn-loopback/server/server').models; describe('invoiceOut book()', () => { + const ctx = {req: {accessToken: {userId: 9}}}; const invoiceOutId = 5; it('should update the booked property', async() => { @@ -12,7 +13,7 @@ describe('invoiceOut book()', () => { const bookedDate = originalInvoiceOut.booked; const invoiceOutRef = originalInvoiceOut.ref; - await models.InvoiceOut.book(invoiceOutRef, options); + await models.InvoiceOut.book(ctx, invoiceOutRef, options); const updatedInvoiceOut = await models.InvoiceOut.findById(invoiceOutId, {}, options); diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js index 26eae45ac6..803338ef33 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js @@ -11,7 +11,6 @@ describe('InvoiceOut createPdf()', () => { const ctx = {req: activeCtx}; it('should create a new PDF file and set true the hasPdf property', async() => { - pending('https://redmine.verdnatura.es/issues/5035'); const invoiceId = 1; spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ active: activeCtx diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/downloadZip.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/downloadZip.spec.js deleted file mode 100644 index 0f62a68763..0000000000 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/downloadZip.spec.js +++ /dev/null @@ -1,55 +0,0 @@ -const models = require('vn-loopback/server/server').models; -const UserError = require('vn-loopback/util/user-error'); - -describe('InvoiceOut downloadZip()', () => { - const userId = 9; - const invoiceIds = '1,2'; - const ctx = { - req: { - - accessToken: {userId: userId}, - headers: {origin: 'http://localhost:5000'}, - } - }; - - it('should return part of link to dowloand the zip', async() => { - const tx = await models.InvoiceOut.beginTransaction({}); - - try { - const options = {transaction: tx}; - - const result = await models.InvoiceOut.downloadZip(ctx, invoiceIds, options); - - expect(result).toBeDefined(); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should return an error if the size of the files is too large', async() => { - pending('https://redmine.verdnatura.es/issues/5035'); - - const tx = await models.InvoiceOut.beginTransaction({}); - - let error; - try { - const options = {transaction: tx}; - const zipConfig = { - maxSize: 0 - }; - await models.ZipConfig.create(zipConfig, options); - - await models.InvoiceOut.downloadZip(ctx, invoiceIds, options); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - error = e; - } - - expect(error).toEqual(new UserError(`Files are too large`)); - }); -}); diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js index e5cf5fda03..15e3e887e5 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js @@ -1,7 +1,7 @@ const models = require('vn-loopback/server/server').models; describe('InvoiceOut filter()', () => { - let today = new Date(); + let today = Date.vnNew(); today.setHours(2, 0, 0, 0); it('should return the invoice out matching ref', async() => { @@ -66,7 +66,7 @@ describe('InvoiceOut filter()', () => { const result = await models.InvoiceOut.filter(ctx, {id: invoiceOut.id}, options); - expect(result.length).toBeGreaterThanOrEqual(1); + expect(result.length).toEqual(1); await tx.rollback(); } catch (e) { diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/invoiceClient.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/invoiceClient.spec.js index 5f890de269..9a0574dba3 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/invoiceClient.spec.js +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/invoiceClient.spec.js @@ -5,7 +5,7 @@ describe('InvoiceOut invoiceClient()', () => { const clientId = 1101; const addressId = 121; const companyFk = 442; - const minShipped = new Date(); + const minShipped = Date.vnNew(); minShipped.setFullYear(minShipped.getFullYear() - 1); minShipped.setMonth(1); minShipped.setDate(1); @@ -33,8 +33,8 @@ describe('InvoiceOut invoiceClient()', () => { ctx.args = { clientId: clientId, addressId: addressId, - invoiceDate: new Date(), - maxShipped: new Date(), + invoiceDate: Date.vnNew(), + maxShipped: Date.vnNew(), companyFk: companyFk, minShipped: minShipped }; diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/negativeBases.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/negativeBases.spec.js new file mode 100644 index 0000000000..1164e894b0 --- /dev/null +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/negativeBases.spec.js @@ -0,0 +1,46 @@ +const models = require('vn-loopback/server/server').models; + +describe('invoiceOut negativeBases()', () => { + it('should return all negative bases in a date range', async() => { + const tx = await models.InvoiceOut.beginTransaction({}); + const options = {transaction: tx}; + const ctx = { + args: { + from: new Date().setMonth(new Date().getMonth() - 12), + to: new Date() + } + }; + + try { + const result = await models.InvoiceOut.negativeBases(ctx, options); + + expect(result.length).toBeGreaterThan(0); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); + + it('should throw an error if a date range is not in args', async() => { + let error; + const tx = await models.InvoiceOut.beginTransaction({}); + const options = {transaction: tx}; + const ctx = { + args: { + filter: {} + } + }; + + try { + await models.InvoiceOut.negativeBases(ctx, options); + await tx.rollback(); + } catch (e) { + error = e; + await tx.rollback(); + } + + expect(error.message).toEqual(`Insert a date range`); + }); +}); diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js index 628318d42f..072fcc12c6 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js @@ -3,6 +3,8 @@ const LoopBackContext = require('loopback-context'); describe('InvoiceOut refund()', () => { const userId = 5; + const ctx = {req: {accessToken: userId}}; + const withWarehouse = true; const activeCtx = { accessToken: {userId: userId}, }; @@ -15,9 +17,9 @@ describe('InvoiceOut refund()', () => { const options = {transaction: tx}; try { - const result = await models.InvoiceOut.refund('T1111111', options); + const result = await models.InvoiceOut.refund(ctx, 'T1111111', withWarehouse, options); - expect(result.length).toEqual(2); + expect(result).toBeDefined(); await tx.rollback(); } catch (e) { diff --git a/modules/invoiceOut/back/model-config.json b/modules/invoiceOut/back/model-config.json index 04933c4f02..b190126ea0 100644 --- a/modules/invoiceOut/back/model-config.json +++ b/modules/invoiceOut/back/model-config.json @@ -8,6 +8,9 @@ "InvoiceContainer": { "dataSource": "invoiceStorage" }, + "Printer": { + "dataSource": "vn" + }, "TaxArea": { "dataSource": "vn" }, diff --git a/modules/invoiceOut/back/models/invoice-out.js b/modules/invoiceOut/back/models/invoice-out.js index 88adae2ef0..5fcef7744a 100644 --- a/modules/invoiceOut/back/models/invoice-out.js +++ b/modules/invoiceOut/back/models/invoice-out.js @@ -15,4 +15,8 @@ module.exports = Self => { require('../methods/invoiceOut/exportationPdf')(Self); require('../methods/invoiceOut/invoiceCsv')(Self); require('../methods/invoiceOut/invoiceCsvEmail')(Self); + require('../methods/invoiceOut/invoiceOutPdf')(Self); + require('../methods/invoiceOut/getInvoiceDate')(Self); + require('../methods/invoiceOut/negativeBases')(Self); + require('../methods/invoiceOut/negativeBasesCsv')(Self); }; diff --git a/modules/invoiceOut/back/models/printer.json b/modules/invoiceOut/back/models/printer.json new file mode 100644 index 0000000000..99003560d1 --- /dev/null +++ b/modules/invoiceOut/back/models/printer.json @@ -0,0 +1,28 @@ +{ + "name": "Printer", + "base": "VnModel", + "options": { + "mysql": { + "table": "printer" + } + }, + "properties": { + "id": { + "type": "number", + "id": true, + "description": "Identifier" + }, + "name": { + "type": "string" + }, + "isLabeler": { + "type": "boolean" + } + }, + "acls": [{ + "accessType": "READ", + "principalType": "ROLE", + "principalId": "$everyone", + "permission": "ALLOW" + }] +} diff --git a/modules/invoiceOut/front/descriptor-menu/index.html b/modules/invoiceOut/front/descriptor-menu/index.html index 389fcf81ba..106f8e3cc1 100644 --- a/modules/invoiceOut/front/descriptor-menu/index.html +++ b/modules/invoiceOut/front/descriptor-menu/index.html @@ -76,14 +76,27 @@ translate> Show CITES letter -
+
+
+
+ Build packaging tickets
+
+
+ {{'Invoicing client' | translate}} {{$ctrl.currentAddress.clientId}}
+
+
+ Stopping process
+
+
+ Ended process
+
+
+
+ {{$ctrl.percentage | percentage: 0}} ({{$ctrl.addressNumber}} {{'of' | translate}} {{$ctrl.nAddresses}})
+
+
-
-
- {{'Calculating packages to invoice...' | translate}}
-
-
-
-
- {{'Id Client' | translate}}: {{$ctrl.currentClientId}}
- {{'of' | translate}} {{::$ctrl.lastClientId}}
-
-
-
#{{::id}}
+ {{::nickname}}
{{name}}
+ {{::name}}
- {{category.name}}
+ {{::category.name}}
{{::id}}
+ {{::description}}
+
+ #{{::id}}
+
{{::name}}
+
+ #{{::id}}
+
{{::id}}
+ {{::description}}
+
+ #{{::id}}
+
{{$ctrl.available | dashIfEmpty}} +
+
-
-
+{{name}}
+
+ {{category.name}}
+
+
+
+
+ |
Item ID
|
Description
|
-
- Warehouse
+ |
+ Grouping price
|
- P.P.U.
- |
-
- P.P.P.
+ field="rate3">
+ Packing price
|
Min price
@@ -59,20 +60,32 @@
|
Ended
|
+
+ Warehouse
+ |
|
+ |
|
- {{price.subName}}@@ -102,7 +115,70 @@ tabindex="-1">
+ |
+ |
+
+ |
+
+ |
+
+ |
+
+ |
+
|
-
- |
-
- |
-
- |
-
- |
-
- |
|
+
++ {{::$ctrl.$t('Package')}}: {{::entry.packageValue | currency: 'EUR':3 | dashIfEmpty}} + {{::$ctrl.$t('Freight')}}: {{::entry.freightValue | currency: 'EUR':3 | dashIfEmpty}} + {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue | currency: 'EUR':3 | dashIfEmpty}}"> + {{::entry.cost | currency: 'EUR':3 | dashIfEmpty}}
+
+ |