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

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2020-05-21 12:33:01 +02:00
parent 10049fa8a2 a7cd7b582d
commit aa95a9f984
9 changed files with 56 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/paths/07-order/03_lines.spec.js
View File

@ -35,7 +35,7 @@ describe('Order lines', () => {
const result = await page
.waitToGetProperty(selectors.orderLine.orderSubtotal, 'innerText');
expect(result).toContain('80.54');
expect(result).toContain('90.10');
});
it('should confirm the whole order and redirect to ticket index filtered by clientFk', async() => {

3
front/core/components/datalist/index.js
View File

@ -33,9 +33,6 @@ export default class Datalist extends Textfield {
if (this.validSelection(value)) return;
if (!oldValue)
return this.fetchSelection();
this.$timeout.cancel(this.searchTimeout);
if (this.model) {

3
front/core/filters/specs/percentage.spec.js
View File

@ -3,8 +3,9 @@ describe('Percentage filter', () => {
beforeEach(ngModule('vnCore'));
beforeEach(inject(_percentageFilter_ => {
beforeEach(inject((_percentageFilter_, $translate) => {
percentageFilter = _percentageFilter_;
jest.spyOn($translate, 'use').mockReturnValue('en-US');
}));
it('should return null for input null', () => {

4
modules/client/front/address/create/index.js
View File

@ -45,6 +45,7 @@ export default class Controller extends Section {
const province = selection.province;
const postcodes = selection.postcodes;
if (!this.address.provinceI)
this.address.provinceId = province.id;
if (postcodes.length === 1)
@ -64,7 +65,10 @@ export default class Controller extends Section {
const town = selection.town;
const province = town.province;
if (!this.address.city)
this.address.city = town.name;
if (!this.address.provinceId)
this.address.provinceId = province.id;
}

10
modules/client/front/address/edit/index.js
View File

@ -42,14 +42,14 @@ export default class Controller extends Section {
// Town auto complete
set town(selection) {
const oldValue = this._town;
this._town = selection;
if (!oldValue) return;
if (!selection) return;
const province = selection.province;
const postcodes = selection.postcodes;
if (!this.address.provinceFk)
this.address.provinceFk = province.id;
if (postcodes.length === 1)
@ -62,15 +62,17 @@ export default class Controller extends Section {
// Postcode auto complete
set postcode(selection) {
const oldValue = this._postcode;
this._postcode = selection;
if (!oldValue) return;
if (!selection) return;
const town = selection.town;
const province = town.province;
if (!this.address.city)
this.address.city = town.name;
if (!this.address.provinceFk)
this.address.provinceFk = province.id;
}

9
modules/client/front/create/index.js
View File

@ -27,6 +27,7 @@ export default class Controller extends Section {
const country = selection.country;
if (!this.client.countryFk)
this.client.countryFk = country.id;
}
@ -44,7 +45,10 @@ export default class Controller extends Section {
const country = province.country;
const postcodes = selection.postcodes;
if (!this.client.provinceFk)
this.client.provinceFk = province.id;
if (!this.client.countryFk)
this.client.countryFk = country.id;
if (postcodes.length === 1)
@ -65,8 +69,13 @@ export default class Controller extends Section {
const province = town.province;
const country = province.country;
if (!this.client.city)
this.client.city = town.name;
if (!this.client.provinceFk)
this.client.provinceFk = province.id;
if (!this.client.countryFk)
this.client.countryFk = country.id;
}

1
modules/client/front/create/index.spec.js
View File

@ -41,6 +41,7 @@ describe('Client', () => {
describe('province() setter', () => {
it(`should set countryFk property`, () => {
controller.client.countryFk = null;
controller.province = {
id: 1,
name: 'New york',

15
modules/client/front/fiscal-data/index.js
View File

@ -98,13 +98,13 @@ export default class Controller extends Section {
// Province auto complete
set province(selection) {
const oldValue = this._province;
this._province = selection;
if (!selection || !oldValue) return;
if (!selection) return;
const country = selection.country;
if (!this.client.countryFk)
this.client.countryFk = country.id;
}
@ -114,16 +114,18 @@ export default class Controller extends Section {
// Town auto complete
set town(selection) {
const oldValue = this._town;
this._town = selection;
if (!selection || !oldValue) return;
if (!selection) return;
const province = selection.province;
const country = province.country;
const postcodes = selection.postcodes;
if (!this.client.provinceFk)
this.client.provinceFk = province.id;
if (!this.client.countryFk)
this.client.countryFk = country.id;
if (postcodes.length === 1)
@ -145,8 +147,13 @@ export default class Controller extends Section {
const province = town.province;
const country = province.country;
if (!this.client.city)
this.client.city = town.name;
if (!this.client.provinceFk)
this.client.provinceFk = province.id;
if (!this.client.countryFk)
this.client.countryFk = country.id;
}

7
modules/client/front/fiscal-data/index.spec.js
View File

@ -26,9 +26,9 @@ describe('Client', () => {
isTaxDataChecked: false
};
controller.province = {};
controller.town = {};
controller.postcode = {};
controller._province = {};
controller._town = {};
controller._postcode = {};
}));
describe('onSubmit()', () => {
@ -135,6 +135,7 @@ describe('Client', () => {
describe('province() setter', () => {
it(`should set countryFk property`, () => {
controller.client.countryFk = null;
controller.province = {
id: 1,
name: 'New york',