diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index c4f022e67..b94fbd221 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -272,9 +272,9 @@ export default { firstRequestItemID: 'vn-item-request vn-tbody > vn-tr:nth-child(1) > vn-td-editable:nth-child(7)', firstRequestQuantity: 'vn-item-request vn-tbody > vn-tr:nth-child(1) > vn-td-editable:nth-child(8)', firstRequestConcept: 'vn-item-request vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(9)', - secondRequestStatus: 'vn-item-request vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(10)', firstRequestStatus: 'vn-item-request vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(10)', - secondRequestDecline: 'vn-item-request vn-tbody > vn-tr:nth-child(1) vn-icon-button[icon="thumb_down"]', + secondRequestStatus: 'vn-item-request vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(10)', + secondRequestDecline: 'vn-item-request vn-tr:nth-child(2) vn-icon-button[icon="thumb_down"]', declineReason: 'vn-textarea[ng-model="$ctrl.denyObservation"]' }, itemBasicData: { diff --git a/e2e/paths/04-item/13_request.spec.js b/e2e/paths/04-item/13_request.spec.js index 66cd7a0f5..19838883e 100644 --- a/e2e/paths/04-item/13_request.spec.js +++ b/e2e/paths/04-item/13_request.spec.js @@ -28,7 +28,7 @@ describe('Item request path', () => { expect(filledConcept).toContain('Melee weapon heavy shield 1x0.5m'); }); - it('should the status of the request should now be accepted', async() => { + it('should check the status of the request should now be accepted', async() => { let status = await page.waitToGetProperty(selectors.itemRequest.firstRequestStatus, 'innerText'); expect(status).toContain('Accepted'); @@ -38,7 +38,7 @@ describe('Item request path', () => { await page.waitToClick(selectors.itemRequest.secondRequestDecline); await page.write(selectors.itemRequest.declineReason, 'Not quite as expected'); await page.respondToDialog('accept'); - let status = await page.waitToGetProperty(selectors.itemRequest.firstRequestStatus, 'innerText'); + let status = await page.waitToGetProperty(selectors.itemRequest.secondRequestStatus, 'innerText'); expect(status).toContain('Denied'); }); diff --git a/modules/item/front/diary/index.html b/modules/item/front/diary/index.html index b8572dcff..3fdc9a9e4 100644 --- a/modules/item/front/diary/index.html +++ b/modules/item/front/diary/index.html @@ -30,10 +30,10 @@ Date - Id + Id State Reference - Client + Client In Out Balance @@ -54,7 +54,7 @@ {{::sale.shipped | date:'dd/MM/yyyy' }} - + @@ -63,7 +63,7 @@ {{::sale.stateName | dashIfEmpty}} {{::sale.reference | dashIfEmpty}} - + {{::sale.name | dashIfEmpty}} diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html index 29a103746..9b129a017 100644 --- a/modules/item/front/request/index.html +++ b/modules/item/front/request/index.html @@ -93,7 +93,7 @@ class="bright">