diff --git a/back/methods/vn-user/addAlias.js b/back/methods/vn-user/addAlias.js
deleted file mode 100644
index 9fe43e713..000000000
--- a/back/methods/vn-user/addAlias.js
+++ /dev/null
@@ -1,68 +0,0 @@
-const UserError = require('vn-loopback/util/user-error');
-
-module.exports = Self => {
- Self.remoteMethod('addAlias', {
- description: 'Add an alias if the user has the grant',
- accessType: 'WRITE',
- accepts: [
- {
- arg: 'ctx',
- type: 'Object',
- http: {source: 'context'}
- },
- {
- arg: 'id',
- type: 'number',
- required: true,
- description: 'The user id',
- http: {source: 'path'}
- },
- {
- arg: 'mailAlias',
- type: 'number',
- description: 'The new alias for user',
- required: true
- }
- ],
- http: {
- path: `/:id/addAlias`,
- verb: 'POST'
- }
- });
-
- Self.addAlias = async function(ctx, id, mailAlias, options) {
- const models = Self.app.models;
- const userId = ctx.req.accessToken.userId;
-
- const myOptions = {};
-
- if (typeof options == 'object')
- Object.assign(myOptions, options);
-
- const user = await Self.findById(userId, {fields: ['hasGrant']}, myOptions);
-
- if (!user.hasGrant)
- throw new UserError(`You don't have grant privilege`);
-
- const account = await models.Account.findById(userId, {
- fields: ['id'],
- include: {
- relation: 'aliases',
- scope: {
- fields: ['mailAlias']
- }
- }
- }, myOptions);
-
- const aliases = account.aliases().map(alias => alias.mailAlias);
-
- const hasAlias = aliases.includes(mailAlias);
- if (!hasAlias)
- throw new UserError(`You cannot assign an alias that you are not assigned to`);
-
- return models.MailAliasAccount.create({
- mailAlias: mailAlias,
- account: id
- }, myOptions);
- };
-};
diff --git a/back/methods/vn-user/removeAlias.js b/back/methods/vn-user/removeAlias.js
deleted file mode 100644
index 0424c3e96..000000000
--- a/back/methods/vn-user/removeAlias.js
+++ /dev/null
@@ -1,55 +0,0 @@
-const UserError = require('vn-loopback/util/user-error');
-
-module.exports = Self => {
- Self.remoteMethod('removeAlias', {
- description: 'Remove alias if the user has the grant',
- accessType: 'WRITE',
- accepts: [
- {
- arg: 'ctx',
- type: 'Object',
- http: {source: 'context'}
- },
- {
- arg: 'id',
- type: 'number',
- required: true,
- description: 'The user id',
- http: {source: 'path'}
- },
- {
- arg: 'mailAlias',
- type: 'number',
- description: 'The alias to delete',
- required: true
- }
- ],
- http: {
- path: `/:id/removeAlias`,
- verb: 'POST'
- }
- });
-
- Self.removeAlias = async function(ctx, id, mailAlias, options) {
- const models = Self.app.models;
- const userId = ctx.req.accessToken.userId;
-
- const myOptions = {};
-
- if (typeof options == 'object')
- Object.assign(myOptions, options);
-
- const canRemoveAlias = await models.ACL.checkAccessAcl(ctx, 'VnUser', 'canRemoveAlias', 'WRITE');
-
- if (userId != id && !canRemoveAlias) throw new UserError(`You don't have grant privilege`);
-
- const mailAliasAccount = await models.MailAliasAccount.findOne({
- where: {
- mailAlias: mailAlias,
- account: id
- }
- }, myOptions);
-
- await mailAliasAccount.destroy(myOptions);
- };
-};
diff --git a/back/models/vn-user.js b/back/models/vn-user.js
index 11d4bf250..a7ce12073 100644
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@@ -12,8 +12,6 @@ module.exports = function(Self) {
require('../methods/vn-user/privileges')(Self);
require('../methods/vn-user/validate-auth')(Self);
require('../methods/vn-user/renew-token')(Self);
- require('../methods/vn-user/addAlias')(Self);
- require('../methods/vn-user/removeAlias')(Self);
Self.definition.settings.acls = Self.definition.settings.acls.filter(acl => acl.property !== 'create');
diff --git a/db/changes/232601/00-aclAddAlias.sql b/db/changes/232601/00-aclAddAlias.sql
deleted file mode 100644
index cc96f5ad8..000000000
--- a/db/changes/232601/00-aclAddAlias.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
- VALUES
- ('VnUser', 'addAlias', 'WRITE', 'ALLOW', 'ROLE', 'employee');
-
-INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
- VALUES
- ('VnUser', 'removeAlias', 'WRITE', 'ALLOW', 'ROLE', 'employee');
-
-INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
- VALUES
- ('VnUser', 'canRemoveAlias', 'WRITE', 'ALLOW', 'ROLE', 'itManagement');
diff --git a/db/changes/232602/01-aclAddAlias.sql b/db/changes/232602/01-aclAddAlias.sql
new file mode 100644
index 000000000..d4df3cd44
--- /dev/null
+++ b/db/changes/232602/01-aclAddAlias.sql
@@ -0,0 +1,8 @@
+DELETE FROM `salix`.`ACL` WHERE model = 'MailAliasAccount';
+
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+ VALUES
+ ('MailAliasAccount', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
+ ('MailAliasAccount', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+ ('MailAliasAccount', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+ ('MailAliasAccount', 'canEditAlias', 'WRITE', 'ALLOW', 'ROLE', 'itManagement');
diff --git a/db/changes/232802/01-aclWorkerDisable.sql b/db/changes/232802/01-aclWorkerDisable.sql
new file mode 100644
index 000000000..149dd6f15
--- /dev/null
+++ b/db/changes/232802/01-aclWorkerDisable.sql
@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+ VALUES
+ ('WorkerDisableExcluded', '*', 'READ', 'ALLOW', 'ROLE', 'itManagement'),
+ ('WorkerDisableExcluded', '*', 'WRITE', 'ALLOW', 'ROLE', 'itManagement');
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 784ff5e6e..08f5bf765 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -305,5 +305,6 @@
"The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
"Valid priorities": "Prioridades válidas: %d",
"Negative basis of tickets": "Base negativa para los tickets: {{ticketsIds}}",
- "You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado"
+ "You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
+ "This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado"
}
diff --git a/modules/account/back/models/mail-alias-account.js b/modules/account/back/models/mail-alias-account.js
new file mode 100644
index 000000000..6f5213f24
--- /dev/null
+++ b/modules/account/back/models/mail-alias-account.js
@@ -0,0 +1,55 @@
+
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.observe('before save', async ctx => {
+ const changes = ctx.currentInstance || ctx.instance;
+
+ await Self.hasGrant(ctx, changes.mailAlias);
+ });
+
+ Self.observe('before delete', async ctx => {
+ const mailAliasAccount = await Self.findById(ctx.where.id);
+
+ await Self.hasGrant(ctx, mailAliasAccount.mailAlias);
+ });
+
+ /**
+ * Checks if current user has
+ * grant to add/remove alias
+ *
+ * @param {Object} ctx - Request context
+ * @param {Interger} mailAlias - mailAlias id
+ * @return {Boolean} True for user with grant
+ */
+ Self.hasGrant = async function(ctx, mailAlias) {
+ const models = Self.app.models;
+ const accessToken = {req: {accessToken: ctx.options.accessToken}};
+ const userId = accessToken.req.accessToken.userId;
+
+ const canEditAlias = await models.ACL.checkAccessAcl(accessToken, 'MailAliasAccount', 'canEditAlias', 'WRITE');
+ if (canEditAlias) return true;
+
+ const user = await models.VnUser.findById(userId, {fields: ['hasGrant']});
+ if (!user.hasGrant)
+ throw new UserError(`You don't have grant privilege`);
+
+ const account = await models.Account.findById(userId, {
+ fields: ['id'],
+ include: {
+ relation: 'aliases',
+ scope: {
+ fields: ['mailAlias']
+ }
+ }
+ });
+
+ const aliases = account.aliases().map(alias => alias.mailAlias);
+
+ const hasAlias = aliases.includes(mailAlias);
+ if (!hasAlias)
+ throw new UserError(`You cannot assign/remove an alias that you are not assigned to`);
+
+ return true;
+ };
+};
diff --git a/modules/account/front/aliases/index.js b/modules/account/front/aliases/index.js
index e0c738ee4..0fc806a71 100644
--- a/modules/account/front/aliases/index.js
+++ b/modules/account/front/aliases/index.js
@@ -21,11 +21,12 @@ export default class Controller extends Section {
}
onAddClick() {
+ this.addData = {account: this.$params.id};
this.$.dialog.show();
}
onAddSave() {
- return this.$http.post(`VnUsers/${this.$params.id}/addAlias`, this.addData)
+ return this.$http.post(`MailAliasAccounts`, this.addData)
.then(() => this.refresh())
.then(() => this.vnApp.showSuccess(
this.$t('Subscribed to alias!'))
@@ -33,12 +34,11 @@ export default class Controller extends Section {
}
onRemove(row) {
- const params = {
- mailAlias: row.mailAlias
- };
- return this.$http.post(`VnUsers/${this.$params.id}/removeAlias`, params)
- .then(() => this.refresh())
- .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
+ return this.$http.delete(`MailAliasAccounts/${row.id}`)
+ .then(() => {
+ this.$.data.splice(this.$.data.indexOf(row), 1);
+ this.vnApp.showSuccess(this.$t('Unsubscribed from alias!'));
+ });
}
}
diff --git a/modules/account/front/aliases/index.spec.js b/modules/account/front/aliases/index.spec.js
index 61f71949c..466f1e1e9 100644
--- a/modules/account/front/aliases/index.spec.js
+++ b/modules/account/front/aliases/index.spec.js
@@ -25,9 +25,8 @@ describe('component vnUserAliases', () => {
describe('onAddSave()', () => {
it('should add the new row', () => {
controller.addData = {account: 1};
- controller.$params = {id: 1};
- $httpBackend.expectPOST('VnUsers/1/addAlias').respond();
+ $httpBackend.expectPOST('MailAliasAccounts').respond();
$httpBackend.expectGET('MailAliasAccounts').respond('foo');
controller.onAddSave();
$httpBackend.flush();
@@ -42,14 +41,12 @@ describe('component vnUserAliases', () => {
{id: 1, alias: 'foo'},
{id: 2, alias: 'bar'}
];
- controller.$params = {id: 1};
- $httpBackend.expectPOST('VnUsers/1/removeAlias').respond();
- $httpBackend.expectGET('MailAliasAccounts').respond(controller.$.data[1]);
+ $httpBackend.expectDELETE('MailAliasAccounts/1').respond();
controller.onRemove(controller.$.data[0]);
$httpBackend.flush();
- expect(controller.$.data).toEqual({id: 2, alias: 'bar'});
+ expect(controller.$.data).toEqual([{id: 2, alias: 'bar'}]);
expect(controller.vnApp.showSuccess).toHaveBeenCalled();
});
});
diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js
index 56afb64db..220cb957b 100644
--- a/modules/client/back/methods/defaulter/filter.js
+++ b/modules/client/back/methods/defaulter/filter.js
@@ -70,11 +70,12 @@ module.exports = Self => {
c.creditInsurance,
d.defaulterSinced,
cn.country,
+ c.countryFk,
pm.name payMethod
FROM vn.defaulter d
JOIN vn.client c ON c.id = d.clientFk
JOIN vn.country cn ON cn.id = c.countryFk
- JOIN vn.payMethod pm ON pm.id = c.payMethodFk
+ JOIN vn.payMethod pm ON pm.id = c.payMethodFk
LEFT JOIN vn.clientObservation co ON co.clientFk = c.id
LEFT JOIN account.user u ON u.id = c.salesPersonFk
LEFT JOIN account.user uw ON uw.id = co.workerFk
diff --git a/modules/client/back/models/defaulter.json b/modules/client/back/models/defaulter.json
index 03d68ea71..ef22c2429 100644
--- a/modules/client/back/models/defaulter.json
+++ b/modules/client/back/models/defaulter.json
@@ -33,7 +33,7 @@
"country": {
"type": "belongsTo",
"model": "Country",
- "foreignKey": "country"
+ "foreignKey": "countryFk"
},
"payMethod": {
"type": "belongsTo",
@@ -41,4 +41,4 @@
"foreignKey": "payMethod"
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/client/front/defaulter/index.html b/modules/client/front/defaulter/index.html
index 3ea88088b..33bb751f1 100644
--- a/modules/client/front/defaulter/index.html
+++ b/modules/client/front/defaulter/index.html
@@ -60,7 +60,7 @@
|
Comercial
|
-
+ |
Country
|
|
{{::defaulter.payMethod}}
- |
+
{{::defaulter.amount | currency: 'EUR': 2}} |
{
require('../methods/invoice-in/filter')(Self);
require('../methods/invoice-in/summary')(Self);
@@ -7,4 +9,9 @@ module.exports = Self => {
require('../methods/invoice-in/invoiceInPdf')(Self);
require('../methods/invoice-in/invoiceInEmail')(Self);
require('../methods/invoice-in/getSerial')(Self);
+ Self.rewriteDbError(function(err) {
+ if (err.code === 'ER_ROW_IS_REFERENCED_2' && err.sqlMessage.includes('vehicleInvoiceIn'))
+ return new UserError(`This invoice has a linked vehicle.`);
+ return err;
+ });
};
diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js
index e88fadc0b..f359d0580 100644
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@@ -68,9 +68,9 @@ module.exports = Self => {
};
const country = await Self.app.models.Country.findOne(filter);
const code = country ? country.code.toLowerCase() : null;
- const countryCode = this.nif.toLowerCase().substring(0, 2);
+ const countryCode = this.nif?.toLowerCase().substring(0, 2);
- if (!this.nif || !validateTin(this.nif, code) || (this.isVies && countryCode == code))
+ if (!validateTin(this.nif, code) || (this.isVies && countryCode == code))
err();
done();
}
@@ -122,7 +122,7 @@ module.exports = Self => {
});
async function hasSupplierSameName(err, done) {
- if (!this.name || !this.countryFk) done();
+ if (!this.name || !this.countryFk) return done();
const supplier = await Self.app.models.Supplier.findOne(
{
where: {
diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index 6cc1a3ad2..510446cab 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -141,6 +141,7 @@ describe('ticket filter()', () => {
});
it('should return the tickets that are not pending', async() => {
+ pending('#6010 test intermitente');
const tx = await models.Ticket.beginTransaction({});
try {
diff --git a/modules/travel/front/search-panel/index.js b/modules/travel/front/search-panel/index.js
index 089953127..f53c15ca8 100644
--- a/modules/travel/front/search-panel/index.js
+++ b/modules/travel/front/search-panel/index.js
@@ -38,10 +38,12 @@ class Controller extends SearchPanel {
applyFilters(param) {
if (typeof this.filter.scopeDays === 'number') {
- const shippedFrom = Date.vnNew();
+ const today = Date.vnNew();
+ const shippedFrom = new Date(today.getTime());
+ shippedFrom.setDate(today.getDate() - 30);
shippedFrom.setHours(0, 0, 0, 0);
- const shippedTo = new Date(shippedFrom.getTime());
+ const shippedTo = new Date(today.getTime());
shippedTo.setDate(shippedTo.getDate() + this.filter.scopeDays);
shippedTo.setHours(23, 59, 59, 999);
Object.assign(this.filter, {shippedFrom, shippedTo});
diff --git a/modules/worker/front/calendar/index.html b/modules/worker/front/calendar/index.html
index 877add57b..08f63ddf9 100644
--- a/modules/worker/front/calendar/index.html
+++ b/modules/worker/front/calendar/index.html
@@ -3,7 +3,7 @@
data="absenceTypes"
auto-load="true">
-
+
Autonomous worker
@@ -73,41 +73,39 @@
value-field="businessFk"
order="businessFk DESC"
limit="5">
-
- #{{businessFk}}
-
- {{started | date: 'dd/MM/yyyy'}} - {{ended ? (ended | date: 'dd/MM/yyyy') : 'Indef.'}}
-
-
-
-
-
-
-
-
-
- {{absenceType.name}}
-
-
-
-
-
-
- Festive
-
-
-
-
- Current day
-
-
+
+ #{{businessFk}}
+
+ {{started | date: 'dd/MM/yyyy'}} - {{ended ? (ended | date: 'dd/MM/yyyy') : 'Indef.'}}
+
+
+
+
+
+
+
+
+ {{absenceType.name}}
+
+
+
+
+
+
+ Festive
+
+
+
+
+ Current day
+
+
+
![]()
-
- Click to exclude the user from getting disabled
-
-
- Click to allow the user to be disabled
-
+
+ {{$ctrl.workerExcluded
+ ? 'Click to allow the user to be disabled'
+ : 'Click to exclude the user from getting disabled'}}
+
@@ -84,7 +77,7 @@
-
-
\ No newline at end of file
+
diff --git a/modules/worker/front/descriptor/index.js b/modules/worker/front/descriptor/index.js
index ef2f64e85..a53528ef2 100644
--- a/modules/worker/front/descriptor/index.js
+++ b/modules/worker/front/descriptor/index.js
@@ -18,28 +18,19 @@ class Controller extends Descriptor {
this.getIsExcluded();
}
- get excluded() {
- return this.entity.excluded;
- }
-
- set excluded(value) {
- this.entity.excluded = value;
- }
-
getIsExcluded() {
- this.$http.get(`workerDisableExcludeds/${this.entity.id}/exists`).then(data => {
- this.excluded = data.data.exists;
+ this.$http.get(`WorkerDisableExcludeds/${this.entity.id}/exists`).then(data => {
+ this.workerExcluded = data.data.exists;
});
}
handleExcluded() {
- if (this.excluded) {
- this.$http.delete(`workerDisableExcludeds/${this.entity.id}`);
- this.excluded = false;
- } else {
- this.$http.post(`workerDisableExcludeds`, {workerFk: this.entity.id, dated: new Date});
- this.excluded = true;
- }
+ if (this.workerExcluded)
+ this.$http.delete(`WorkerDisableExcludeds/${this.entity.id}`);
+ else
+ this.$http.post(`WorkerDisableExcludeds`, {workerFk: this.entity.id, dated: new Date});
+
+ this.workerExcluded = !this.workerExcluded;
}
loadData() {
diff --git a/modules/worker/front/time-control/index.html b/modules/worker/front/time-control/index.html
index 5f0855ee6..760b0dafc 100644
--- a/modules/worker/front/time-control/index.html
+++ b/modules/worker/front/time-control/index.html
@@ -4,7 +4,7 @@
filter="::$ctrl.filter"
data="$ctrl.hours">
-
+
@@ -107,7 +107,7 @@
Autonomous worker
@@ -136,6 +136,7 @@
+
{
+ if (!this.card.hasWorkCenter) return;
+
this.getWorkedHours(this.started, this.ended);
this.getAbsences();
});
@@ -151,7 +153,6 @@ class Controller extends Section {
}
getAbsences() {
- if (!this.worker.hasWorkerCenter) return;
const fullYear = this.started.getFullYear();
let params = {
workerFk: this.$params.id,
@@ -486,5 +487,8 @@ ngModule.vnComponent('vnWorkerTimeControl', {
controller: Controller,
bindings: {
worker: '<'
+ },
+ require: {
+ card: '^vnWorkerCard'
}
});
diff --git a/modules/worker/front/time-control/index.spec.js b/modules/worker/front/time-control/index.spec.js
index 0132f50fe..6d8510ba8 100644
--- a/modules/worker/front/time-control/index.spec.js
+++ b/modules/worker/front/time-control/index.spec.js
@@ -16,9 +16,8 @@ describe('Component vnWorkerTimeControl', () => {
$scope = $rootScope.$new();
$element = angular.element('');
controller = $componentController('vnWorkerTimeControl', {$element, $scope});
- controller.worker = {
- hasWorkerCenter: true
-
+ controller.card = {
+ hasWorkCenter: true
};
}));
diff --git a/print/core/smtp.js b/print/core/smtp.js
index 276b85401..8c07e7eca 100644
--- a/print/core/smtp.js
+++ b/print/core/smtp.js
@@ -10,16 +10,17 @@ module.exports = {
async send(options) {
options.from = `${config.app.senderName} <${config.app.senderEmail}>`;
- if (!process.env.NODE_ENV)
- options.to = config.app.senderEmail;
+ const env = process.env.NODE_ENV;
+ const canSend = env === 'production' || !env || options.force;
- if (process.env.NODE_ENV !== 'production' && !options.force) {
+ if (!canSend || !config.smtp.auth.user) {
const notProductionError = {message: 'This not production, this email not sended'};
await this.mailLog(options, notProductionError);
+ return Promise.resolve(true);
}
- if (!config.smtp.auth.user)
- return Promise.resolve(true);
+ if (!env)
+ options.to = config.app.senderEmail;
let res;
let error;
|