diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 820e5b0174..ed10cbb92d 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -474,7 +474,6 @@ export default { }, claimBasicData: { claimStateAutocomplete: 'vn-claim-basic-data vn-autocomplete[field="$ctrl.claim.claimStateFk"]', - isPaidWithManaCheckbox: 'vn-check[field="$ctrl.claim.isChargedToMana"] md-checkbox', responsabilityInputRange: 'vn-input-range', observationInput: 'vn-textarea[field="$ctrl.claim.observation"] textarea', saveButton: `${components.vnSubmit}` @@ -510,8 +509,8 @@ export default { thirdLineDestination: 'vn-claim-action vn-tr:nth-child(3) vn-autocomplete[field="saleClaimed.claimDestinationFk"]', firstDeleteLine: 'vn-claim-action vn-tr:nth-child(1) vn-icon-button[icon="delete"]', secondDeleteLine: 'vn-claim-action vn-tr:nth-child(2) vn-icon-button[icon="delete"]', - thirdDeleteLine: 'vn-claim-action vn-tr:nth-child(3) vn-icon-button[icon="delete"]' - + thirdDeleteLine: 'vn-claim-action vn-tr:nth-child(3) vn-icon-button[icon="delete"]', + isPaidWithManaCheckbox: 'vn-check[field="$ctrl.claim.isChargedToMana"] md-checkbox' }, ordersIndex: { searchResult: 'vn-order-index vn-card > div > vn-table > div > vn-tbody > a.vn-tr', diff --git a/e2e/paths/06-claim-module/01_edit_basic_data.spec.js b/e2e/paths/06-claim-module/01_edit_basic_data.spec.js index f863c86e2f..2df37a1479 100644 --- a/e2e/paths/06-claim-module/01_edit_basic_data.spec.js +++ b/e2e/paths/06-claim-module/01_edit_basic_data.spec.js @@ -11,10 +11,9 @@ describe('Claim edit basic data path', () => { .accessToSection('claim.card.basicData'); }); - it(`should edit claim state, is paid with mana and observation fields`, async() => { + it(`should edit claim state and observation fields`, async() => { const result = await nightmare .autocompleteSearch(selectors.claimBasicData.claimStateAutocomplete, 'Gestionado') - .waitToClick(selectors.claimBasicData.isPaidWithManaCheckbox) .clearTextarea(selectors.claimBasicData.observationInput) .write(selectors.claimBasicData.observationInput, 'edited observation') .waitToClick(selectors.claimBasicData.saveButton) @@ -40,13 +39,6 @@ describe('Claim edit basic data path', () => { expect(result).toEqual('Gestionado'); }); - it('should confirm the Is paid with mana checkbox is checked', async() => { - const result = await nightmare - .checkboxState(selectors.claimBasicData.isPaidWithManaCheckbox); - - expect(result).toBe('checked'); - }); - it('should confirm the claim observation was edited', async() => { const result = await nightmare .waitToGetProperty(selectors.claimBasicData.observationInput, 'value'); @@ -57,7 +49,6 @@ describe('Claim edit basic data path', () => { it(`should edit the claim to leave it untainted`, async() => { const result = await nightmare .autocompleteSearch(selectors.claimBasicData.claimStateAutocomplete, 'Pendiente') - .waitToClick(selectors.claimBasicData.isPaidWithManaCheckbox) .clearTextarea(selectors.claimBasicData.observationInput) .write(selectors.claimBasicData.observationInput, 'Observation one') .waitToClick(selectors.claimBasicData.saveButton) diff --git a/e2e/paths/06-claim-module/04_claim_action.spec.js b/e2e/paths/06-claim-module/04_claim_action.spec.js index 2a61c088f7..a06edaa503 100644 --- a/e2e/paths/06-claim-module/04_claim_action.spec.js +++ b/e2e/paths/06-claim-module/04_claim_action.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; -describe('Claim edit basic data path', () => { +describe('Claim action path', () => { const nightmare = createNightmare(); beforeAll(() => { @@ -60,4 +60,20 @@ describe('Claim edit basic data path', () => { expect(result).toEqual('Data saved!'); }); + + it('should check the Is paid with mana checkbox', async() => { + const result = await nightmare + .waitToClick(selectors.claimAction.isPaidWithManaCheckbox) + .waitForSnackbar(); + + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); + }); + + it('should confirm the Is paid with mana checkbox is checked', async() => { + const result = await nightmare + .reloadSection('claim.card.action') + .checkboxState(selectors.claimAction.isPaidWithManaCheckbox); + + expect(result).toBe('checked'); + }); }); diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html index 4aa8909b9d..4d0de4d1d0 100644 --- a/modules/claim/front/action/index.html +++ b/modules/claim/front/action/index.html @@ -37,6 +37,16 @@ on-change="$ctrl.saveResponsibility(value)"> + + + + diff --git a/modules/claim/front/action/index.js b/modules/claim/front/action/index.js index 2d74a2aff4..f8612a9926 100644 --- a/modules/claim/front/action/index.js +++ b/modules/claim/front/action/index.js @@ -173,6 +173,13 @@ class Controller { this.vnApp.showSuccess(this.$translate.instant('Data saved!')); }); } + saveMana(value) { + let query = `/api/Claims/${this.$stateParams.id}/updateClaim`; + + this.$http.post(query, {isChargedToMana: value}).then(() => { + this.vnApp.showSuccess(this.$translate.instant('Data saved!')); + }); + } } Controller.$inject = ['$stateParams', '$scope', '$http', '$translate', 'vnApp']; diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html index 2887e5734f..d05c6ebc55 100644 --- a/modules/claim/front/basic-data/index.html +++ b/modules/claim/front/basic-data/index.html @@ -18,6 +18,15 @@ label="Client" order="id"> + + + + - - - - - -