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

Merge pull request '2949-client_basicdata_businesstype' (#681) from 2949-client_basicdata_businesstype into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #681
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2021-06-30 06:11:53 +00:00
parent c9f1f2ed2a 15c7c0cb4b
commit 4b8d27a8be
8 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
back/models/account.json
View File

@ -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",

1
e2e/helpers/selectors.js
View File

@ -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: {

8
e2e/paths/02-client/02_edit_basic_data.spec.js
View File

@ -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');

3
modules/client/back/model-config.json
View File

@ -8,6 +8,9 @@
"BankEntity": {
"dataSource": "vn"
},
"BusinessType": {
"dataSource": "vn"
},
"Client": {
"dataSource": "vn"
},

24
modules/client/back/models/business-type.json Normal file
View File

@ -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"
}]
}

5
modules/client/back/models/client.json
View File

@ -168,6 +168,11 @@
"model": "ClientType",
"foreignKey": "clientTypeFk"
},
"businessType": {
"type": "belongsTo",
"model": "BusinessType",
"foreignKey": "businessTypeFk"
},
"addresses": {
"type": "hasMany",
"model": "Address",

8
modules/client/front/basic-data/index.html
View File

@ -20,6 +20,14 @@
rule
vn-focus>
</vn-textfield>
<vn-autocomplete
vn-one
ng-model="$ctrl.client.businessTypeFk"
url="BusinessTypes"
show-field="description"
value-field="code"
label="Business type">
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal>
<vn-textfield

3
modules/client/front/basic-data/locale/es.yml
View File

@ -12,4 +12,5 @@ You can save multiple emails: >-
sin espacios, ejemplo: user@dominio.com, user2@dominio.com siendo el primer
correo electrónico el principal
Contact: Contacto
Undo changes: Deshacer cambios
Undo changes: Deshacer cambios
Business type: Tipo de negocio