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 460cd49aea..c0bc91365a 100644
--- a/e2e/paths/06-claim-module/04_claim_action.spec.js
+++ b/e2e/paths/06-claim-module/04_claim_action.spec.js
@@ -32,12 +32,11 @@ describe('Claim action path', () => {
expect(result).toEqual('Data saved!');
});
- // #2036 claim.action destinatario
it('should edit the second line destination field', async() => {
await page.autocompleteSearch(selectors.claimAction.secondLineDestination, 'Bueno');
- // const result = await page.waitForLastSnackbar();
+ const result = await page.waitForLastSnackbar();
- // expect(result).toEqual('Data saved!');
+ expect(result).toEqual('Data saved!');
});
it('should delete the first line', async() => {
diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html
index 7c663eacd2..31db6dabd7 100644
--- a/modules/claim/front/action/index.html
+++ b/modules/claim/front/action/index.html
@@ -1,7 +1,10 @@
-
+ data="$ctrl.salesClaimed"
+ auto-load="true"
+ auto-save="true"
+ on-save="$ctrl.onSave()">
-
+ suggested-filter="$ctrl.filter.where"
+ info="Search request by id or alias">
+
+
@@ -21,8 +22,6 @@
Ticket ID
Shipped
- Warehouse
- SalesPerson
Description
Requested
Price
@@ -47,15 +46,7 @@
{{::request.shipped | date: 'dd/MM/yyyy'}}
- {{::request.warehouse}}
-
-
- {{::request.salesPersonNickname}}
-
-
- {{::request.description}}
+ {{::request.description}}
{{::request.quantity}}
{{::request.price | currency: 'EUR':2}}
@@ -82,7 +73,7 @@
-
+
+ translate-attr="{title: 'Discard'}"
+ tabindex="-1">
@@ -124,7 +116,7 @@
Specify the reasons to deny this request
-
diff --git a/modules/item/front/request/index.js b/modules/item/front/request/index.js
index b56df41a80..3684a19114 100644
--- a/modules/item/front/request/index.js
+++ b/modules/item/front/request/index.js
@@ -96,7 +96,6 @@ export default class Controller extends Component {
this.selectedRequest = requestId;
this.$.denyReason.parent = event.target;
this.$.denyReason.show();
- document.querySelector('vn-item-request vn-textarea textArea').focus();
}
clear() {
diff --git a/modules/route/front/card/index.html b/modules/route/front/card/index.html
index 051d8714fb..9e0ae4e8c0 100644
--- a/modules/route/front/card/index.html
+++ b/modules/route/front/card/index.html
@@ -1,5 +1,5 @@
-
+
diff --git a/modules/route/front/descriptor/index.js b/modules/route/front/descriptor/index.js
index cfa7188550..1beb7e0950 100644
--- a/modules/route/front/descriptor/index.js
+++ b/modules/route/front/descriptor/index.js
@@ -70,7 +70,7 @@ class Controller {
let url = `Routes/${this.route.id}/updateVolume`;
this.$http.post(url).then(() => {
this.vnApp.showSuccess(this.$translate.instant('Volume updated'));
- if (this.card) this.card.reload();
+ this.cardReload();
});
}
}
@@ -82,10 +82,8 @@ ngModule.component('vnRouteDescriptor', {
template: require('./index.html'),
bindings: {
route: '<',
+ cardReload: '&?',
quicklinks: '<'
},
- require: {
- card: '^?vnRouteCard'
- },
controller: Controller
});
diff --git a/modules/ticket/front/request/index/index.js b/modules/ticket/front/request/index/index.js
index 38d800aebe..e8cb54f22e 100644
--- a/modules/ticket/front/request/index/index.js
+++ b/modules/ticket/front/request/index/index.js
@@ -89,6 +89,8 @@ class Controller {
isEditable(isOk) {
if (isOk != null)
return true;
+
+ return false;
}
}
diff --git a/modules/ticket/front/request/index/index.spec.js b/modules/ticket/front/request/index/index.spec.js
new file mode 100644
index 0000000000..90d71f0626
--- /dev/null
+++ b/modules/ticket/front/request/index/index.spec.js
@@ -0,0 +1,62 @@
+import './index';
+
+describe('Ticket', () => {
+ describe('Component vnTicketRequestIndex', () => {
+ let controller;
+ let $scope;
+
+ beforeEach(ngModule('ticket'));
+
+ beforeEach(angular.mock.inject(($componentController, $rootScope) => {
+ $scope = $rootScope.$new();
+
+ controller = $componentController('vnTicketRequestIndex', {$scope});
+ }));
+
+ describe('getRequestState()', () => {
+ it('should return New when the state is null', () => {
+ let state = null;
+ let result = controller.getRequestState(state);
+
+ expect(result).toEqual('New');
+ });
+
+ it('should return Denied when the state is false', () => {
+ let state = false;
+ let result = controller.getRequestState(state);
+
+ expect(result).toEqual('Denied');
+ });
+
+ it('should return Acepted when the state is true', () => {
+ let state = true;
+ let result = controller.getRequestState(state);
+
+ expect(result).toEqual('Acepted');
+ });
+ });
+
+ describe('isEditable()', () => {
+ it('should return true when isOk is true', () => {
+ let isOk = true;
+ let result = controller.isEditable(isOk);
+
+ expect(result).toEqual(true);
+ });
+
+ it('should return true when isOk is false', () => {
+ let isOk = false;
+ let result = controller.isEditable(isOk);
+
+ expect(result).toEqual(true);
+ });
+
+ it('should return true when isOk is null', () => {
+ let isOk = null;
+ let result = controller.isEditable(isOk);
+
+ expect(result).toEqual(false);
+ });
+ });
+ });
+});
diff --git a/modules/ticket/front/request/index/locale/es.yml b/modules/ticket/front/request/index/locale/es.yml
index 65442cde1d..1adcbad496 100644
--- a/modules/ticket/front/request/index/locale/es.yml
+++ b/modules/ticket/front/request/index/locale/es.yml
@@ -3,4 +3,5 @@ Atender: Comprador
Remove request: Eliminar petición
New request: Crear petición
Sale id: Id linea
-Requester: Solicitante
\ No newline at end of file
+Requester: Solicitante
+New purchase request: Nueva petición de compra
\ No newline at end of file