diff --git a/e2e/paths/05-ticket/18_index_payout.spec.js b/e2e/paths/05-ticket/18_index_payout.spec.js index 220dacf61..89b5937a1 100644 --- a/e2e/paths/05-ticket/18_index_payout.spec.js +++ b/e2e/paths/05-ticket/18_index_payout.spec.js @@ -63,6 +63,6 @@ describe('Ticket index payout path', () => { const reference = await page.waitToGetProperty(selectors.clientBalance.firstLineReference, 'innerText'); expect(count).toEqual(4); - expect(reference).toContain('Cash, Albaran: 7, 8Payment'); + expect(reference).toContain('Cash,Albaran: 7, 8Payment'); }); }); diff --git a/modules/entry/front/latest-buys-search-panel/index.html b/modules/entry/front/latest-buys-search-panel/index.html index bc04ccd7e..075d6a8f7 100644 --- a/modules/entry/front/latest-buys-search-panel/index.html +++ b/modules/entry/front/latest-buys-search-panel/index.html @@ -40,7 +40,7 @@ ng-model="$ctrl.filter.typeFk" fields="['categoryFk']" include="'category'" - on-change="$ctrl.applyFilters()"> + on-change="$ctrl.addFilters()">
{{name}}
@@ -60,7 +60,7 @@ value-field="id" where="{role: {inq: ['logistic', 'buyer']}}" label="Buyer" - on-change="$ctrl.applyFilters()"> + on-change="$ctrl.addFilters()"> + on-change="$ctrl.addFilters()"> {{name}}: {{nickname}} @@ -79,12 +79,12 @@ + on-change="$ctrl.addFilters()"> + on-change="$ctrl.addFilters()"> @@ -92,19 +92,19 @@ label="Is active" ng-model="$ctrl.filter.active" triple-state="true" - ng-click="$ctrl.applyFilters()"> + ng-click="$ctrl.addFilters()"> + ng-click="$ctrl.addFilters()"> + ng-click="$ctrl.addFilters()"> @@ -139,7 +139,7 @@ ng-model="itemTag.value" show-field="value" value-field="value" - on-change="$ctrl.applyFilters()"> + on-change="$ctrl.addFilters()"> -1) this.filter.tags.splice(index, 1); - this.applyFilters(); + this.addFilters(); } onKeyPress($event) { if ($event.key === 'Enter') - this.applyFilters(); + this.addFilters(); } - applyFilters() { + addFilters() { for (let i = 0; i < this.filter.tags.length; i++) { if (!this.filter.tags[i].value) this.filter.tags.splice(i, 1); } - return this.model.applyFilter({}, this.filter); + return this.model.addFilter({}, this.filter); } showTagInfo(itemTag) { diff --git a/modules/entry/front/latest-buys-search-panel/index.spec.js b/modules/entry/front/latest-buys-search-panel/index.spec.js index 4cc4aa6dc..c3c5acbfb 100644 --- a/modules/entry/front/latest-buys-search-panel/index.spec.js +++ b/modules/entry/front/latest-buys-search-panel/index.spec.js @@ -10,7 +10,7 @@ describe('Entry', () => { beforeEach(angular.mock.inject($componentController => { $element = angular.element(``); controller = $componentController('vnLatestBuysSearchPanel', {$element}); - controller.model = {applyFilter: () => {}}; + controller.model = {addFilter: () => {}}; })); describe('removeItemFilter()', () => {