diff --git a/back/models/account.json b/back/models/account.json
index 9cac20bc0..b59cf39c2 100644
--- a/back/models/account.json
+++ b/back/models/account.json
@@ -80,13 +80,15 @@
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
- }, {
+ },
+ {
"property": "logout",
"accessType": "EXECUTE",
"principalType": "ROLE",
"principalId": "$authenticated",
"permission": "ALLOW"
- }, {
+ },
+ {
"property": "validateToken",
"accessType": "EXECUTE",
"principalType": "ROLE",
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 4c7c18689..e2ff0f0e4 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -152,6 +152,7 @@ export default {
salesPerson: 'vn-client-basic-data vn-autocomplete[ng-model="$ctrl.client.salesPersonFk"]',
channel: 'vn-client-basic-data vn-autocomplete[ng-model="$ctrl.client.contactChannelFk"]',
transferor: 'vn-client-basic-data vn-autocomplete[ng-model="$ctrl.client.transferorFk"]',
+ businessType: 'vn-client-basic-data vn-autocomplete[ng-model="$ctrl.client.businessTypeFk"]',
saveButton: 'vn-client-basic-data button[type=submit]'
},
clientFiscalData: {
diff --git a/e2e/paths/02-client/02_edit_basic_data.spec.js b/e2e/paths/02-client/02_edit_basic_data.spec.js
index f35483edf..3a476e54f 100644
--- a/e2e/paths/02-client/02_edit_basic_data.spec.js
+++ b/e2e/paths/02-client/02_edit_basic_data.spec.js
@@ -35,6 +35,7 @@ describe('Client Edit basicData path', () => {
await page.write(selectors.clientBasicData.email, 'PWallace@verdnatura.es');
await page.autocompleteSearch(selectors.clientBasicData.channel, 'Rumors on the streets');
await page.autocompleteSearch(selectors.clientBasicData.transferor, 'Max Eisenhardt');
+ await page.autocompleteSearch(selectors.clientBasicData.businessType, 'Eventos');
await page.waitToClick(selectors.clientBasicData.saveButton);
const message = await page.waitForSnackbar();
@@ -55,6 +56,13 @@ describe('Client Edit basicData path', () => {
expect(result).toEqual('David Haller');
});
+ it('should confirm the business type have been edited', async() => {
+ const result = await page
+ .waitToGetProperty(selectors.clientBasicData.businessType, 'value');
+
+ expect(result).toEqual('Eventos');
+ });
+
it('should confirm the email have been edited', async() => {
const result = await page
.waitToGetProperty(selectors.clientBasicData.email, 'value');
diff --git a/modules/client/back/model-config.json b/modules/client/back/model-config.json
index 1f18f4963..38f5c9427 100644
--- a/modules/client/back/model-config.json
+++ b/modules/client/back/model-config.json
@@ -8,6 +8,9 @@
"BankEntity": {
"dataSource": "vn"
},
+ "BusinessType": {
+ "dataSource": "vn"
+ },
"Client": {
"dataSource": "vn"
},
diff --git a/modules/client/back/models/business-type.json b/modules/client/back/models/business-type.json
new file mode 100644
index 000000000..e8399ed68
--- /dev/null
+++ b/modules/client/back/models/business-type.json
@@ -0,0 +1,24 @@
+{
+ "name": "BusinessType",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "businessType"
+ }
+ },
+ "properties": {
+ "code": {
+ "type": "string",
+ "id": true
+ },
+ "description": {
+ "type": "string"
+ }
+ },
+ "acls": [{
+ "accessType": "READ",
+ "principalType": "ROLE",
+ "principalId": "$everyone",
+ "permission": "ALLOW"
+ }]
+}
\ No newline at end of file
diff --git a/modules/client/back/models/client.json b/modules/client/back/models/client.json
index b4682579a..1cf539439 100644
--- a/modules/client/back/models/client.json
+++ b/modules/client/back/models/client.json
@@ -168,6 +168,11 @@
"model": "ClientType",
"foreignKey": "clientTypeFk"
},
+ "businessType": {
+ "type": "belongsTo",
+ "model": "BusinessType",
+ "foreignKey": "businessTypeFk"
+ },
"addresses": {
"type": "hasMany",
"model": "Address",
diff --git a/modules/client/front/basic-data/index.html b/modules/client/front/basic-data/index.html
index 4a705c384..2bfab3f10 100644
--- a/modules/client/front/basic-data/index.html
+++ b/modules/client/front/basic-data/index.html
@@ -20,6 +20,14 @@
rule
vn-focus>
+
+
-
sin espacios, ejemplo: user@dominio.com, user2@dominio.com siendo el primer
correo electrónico el principal
Contact: Contacto
-Undo changes: Deshacer cambios
\ No newline at end of file
+Undo changes: Deshacer cambios
+Business type: Tipo de negocio
\ No newline at end of file