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

several repairs on both e2e paths create client and edit basic data plus some required refactors

This commit is contained in:
Carlos Jimenez 2017-12-05 15:28:48 +01:00
parent 08bfb80912
commit 78a2887ab3
7 changed files with 65 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/helpers/extensions.js
View File

@ -122,7 +122,7 @@ Nightmare.action('waitForNumberOfElements', function(selector, count, done) {
Nightmare.action('waitForTextInElement', function(selector, name, done) { Nightmare.action('waitForTextInElement', function(selector, name, done) {
this.wait((resultSelector, expectedName) => { this.wait((resultSelector, expectedName) => {
return document.querySelectorAll(resultSelector)[0].innerText.toLowerCase().includes(expectedName.toLowerCase()); return document.querySelector(resultSelector).innerText.toLowerCase().includes(expectedName.toLowerCase());
}, selector, name) }, selector, name)
.then(done); .then(done);
}); });

2
e2e/helpers/nightmare.js
View File

@ -13,7 +13,7 @@ export default function createNightmare(width = 1100, height = 600) {
fail(message); fail(message);
} }
if (type === 'log') { if (type === 'log') {
console.log(message); // console.log(message);
} }
}); });
return nightmare; return nightmare;

9
e2e/helpers/selectors.js
View File

@ -35,19 +35,20 @@ export default {
basicData: { basicData: {
basicDataButton: `${components.vnMenuItem}[ui-sref="clientCard.basicData"]`, basicDataButton: `${components.vnMenuItem}[ui-sref="clientCard.basicData"]`,
nameInput: `${components.vnTextfield}[name="name"]`, nameInput: `${components.vnTextfield}[name="name"]`,
taxNumberInput: `${components.vnTextfield}[name="fi"]`, contactInput: `${components.vnTextfield}[name="contact"]`,
socialNameInput: `${components.vnTextfield}[name="socialName"]`,
phoneInput: `${components.vnTextfield}[name="phone"]`, phoneInput: `${components.vnTextfield}[name="phone"]`,
mobileInput: `${components.vnTextfield}[name="mobile"]`, mobileInput: `${components.vnTextfield}[name="mobile"]`,
faxInput: `${components.vnTextfield}[name="fax"]`, faxInput: `${components.vnTextfield}[name="fax"]`,
emailInput: `${components.vnTextfield}[name="email"]`, emailInput: `${components.vnTextfield}[name="email"]`,
salesPersonInput: `${components.vnAutocomplete}[field="$ctrl.client.salesPersonFk"]`, salesPersonInput: `${components.vnAutocomplete}[field="$ctrl.client.salesPersonFk"] > vn-vertical > ${components.vnTextfield}`,
salesBruceBannerOption: `${components.vnAutocomplete}[field="$ctrl.client.salesPersonFk"] > vn-vertical > vn-drop-down > vn-vertical:not(.ng-hide) > vn-auto:nth-child(2) > ul > li:nth-child(1)`,
channelInput: `${components.vnAutocomplete}[field="$ctrl.client.contactChannelFk"] > vn-vertical > ${components.vnTextfield}`, channelInput: `${components.vnAutocomplete}[field="$ctrl.client.contactChannelFk"] > vn-vertical > ${components.vnTextfield}`,
channelMetropolisOption: `${components.vnAutocomplete}[field="$ctrl.client.contactChannelFk"] > vn-vertical > vn-drop-down > vn-vertical > vn-one:nth-child(2) > ul > li:nth-child(3)`, channelMetropolisOption: `${components.vnAutocomplete}[field="$ctrl.client.contactChannelFk"] > vn-vertical > vn-drop-down > vn-vertical:not(.ng-hide) > vn-auto:nth-child(2) > ul > li:nth-child(3)`,
saveButton: `${components.vnSubmit}` saveButton: `${components.vnSubmit}`
}, },
fiscalData: { fiscalData: {
fiscalDataButton: `${components.vnMenuItem}[ui-sref="clientCard.fiscalData"]`, fiscalDataButton: `${components.vnMenuItem}[ui-sref="clientCard.fiscalData"]`,
socialNameInput: `${components.vnTextfield}[name="socialName"]`,
hasToInvoiceCheckboxLabel: `${components.vnCheck}[label='Has to invoice'] > label`, hasToInvoiceCheckboxLabel: `${components.vnCheck}[label='Has to invoice'] > label`,
hasToInvoiceCheckboxInput: `${components.vnCheck}[label='Has to invoice'] > label > label > input`, hasToInvoiceCheckboxInput: `${components.vnCheck}[label='Has to invoice'] > label > label > input`,
invoiceByMailCheckboxLabel: `${components.vnCheck}[label='Invoice by mail'] > label`, invoiceByMailCheckboxLabel: `${components.vnCheck}[label='Invoice by mail'] > label`,

1
e2e/paths/create_client_path.spec.js
View File

@ -218,4 +218,3 @@ describe('create client path', () => {
.catch(catchErrors(done)); .catch(catchErrors(done));
}); });
}); });

133
e2e/paths/edit_basic_data.spec.js
View File

@ -76,7 +76,7 @@ describe('Edit basicData path', () => {
nightmare nightmare
.wait(selectors.basicData.nameInput) .wait(selectors.basicData.nameInput)
.clearInput(selectors.basicData.nameInput) .clearInput(selectors.basicData.nameInput)
.type(selectors.basicData.nameInput, 'Carol Danvers Edited') .type(selectors.basicData.nameInput, 'Ororo Munroe')
.click(selectors.basicData.saveButton) .click(selectors.basicData.saveButton)
.wait(selectors.globalItems.snackbarIsActive) .wait(selectors.globalItems.snackbarIsActive)
.getInnerText(selectors.globalItems.snackbarIsActive) .getInnerText(selectors.globalItems.snackbarIsActive)
@ -96,17 +96,17 @@ describe('Edit basicData path', () => {
.wait(selectors.basicData.nameInput) .wait(selectors.basicData.nameInput)
.getInputValue(selectors.basicData.nameInput) .getInputValue(selectors.basicData.nameInput)
.then(result => { .then(result => {
expect(result).toEqual('Carol Danvers Edited'); expect(result).toEqual('Ororo Munroe');
done(); done();
}) })
.catch(catchErrors(done)); .catch(catchErrors(done));
}); });
it('should edit the tax number', done => { it('should edit the contact name', done => {
nightmare nightmare
.wait(selectors.basicData.taxNumberInput) .wait(selectors.basicData.contactInput)
.clearInput(selectors.basicData.taxNumberInput) .clearInput(selectors.basicData.contactInput)
.type(selectors.basicData.taxNumberInput, 'AVG tax Edited') .type(selectors.basicData.contactInput, 'Black Panther')
.click(selectors.basicData.saveButton) .click(selectors.basicData.saveButton)
.wait(selectors.globalItems.snackbarIsActive) .wait(selectors.globalItems.snackbarIsActive)
.getInnerText(selectors.globalItems.snackbarIsActive) .getInnerText(selectors.globalItems.snackbarIsActive)
@ -117,46 +117,16 @@ describe('Edit basicData path', () => {
.catch(catchErrors(done)); .catch(catchErrors(done));
}); });
it('should confirm the tax number have been edited', done => { it('should confirm the contact name have been edited', done => {
nightmare nightmare
.waitForSnackbarReset() .waitForSnackbarReset()
.click(selectors.fiscalData.fiscalDataButton) .click(selectors.fiscalData.fiscalDataButton)
.wait(selectors.fiscalData.addressInput) .wait(selectors.fiscalData.addressInput)
.click(selectors.basicData.basicDataButton) .click(selectors.basicData.basicDataButton)
.wait(selectors.basicData.taxNumberInput) .wait(selectors.basicData.contactInput)
.getInputValue(selectors.basicData.taxNumberInput) .getInputValue(selectors.basicData.contactInput)
.then(result => { .then(result => {
expect(result).toEqual('AVG tax Edited'); expect(result).toEqual('Black Panther');
done();
})
.catch(catchErrors(done));
});
it('should edit the social name', done => {
nightmare
.wait(selectors.basicData.socialNameInput)
.clearInput(selectors.basicData.socialNameInput)
.type(selectors.basicData.socialNameInput, 'Avengers Team Edited')
.click(selectors.basicData.saveButton)
.wait(selectors.globalItems.snackbarIsActive)
.getInnerText(selectors.globalItems.snackbarIsActive)
.then(result => {
expect(result).toEqual('¡Datos guardados!');
done();
})
.catch(catchErrors(done));
});
it('should confirm the social name have been edited', done => {
nightmare
.waitForSnackbarReset()
.click(selectors.fiscalData.fiscalDataButton)
.wait(selectors.fiscalData.addressInput)
.click(selectors.basicData.basicDataButton)
.wait(selectors.basicData.socialNameInput)
.getInputValue(selectors.basicData.socialNameInput)
.then(result => {
expect(result).toEqual('Avengers Team Edited');
done(); done();
}) })
.catch(catchErrors(done)); .catch(catchErrors(done));
@ -222,41 +192,11 @@ describe('Edit basicData path', () => {
.catch(catchErrors(done)); .catch(catchErrors(done));
}); });
it('should add the fax number', done => {
nightmare
.wait(selectors.basicData.faxInput)
.clearInput(selectors.basicData.faxInput)
.type(selectors.basicData.faxInput, '432198765')
.click(selectors.basicData.saveButton)
.wait(selectors.globalItems.snackbarIsActive)
.getInnerText(selectors.globalItems.snackbarIsActive)
.then(result => {
expect(result).toEqual('¡Datos guardados!');
done();
})
.catch(catchErrors(done));
});
it('should confirm the fax number have been added', done => {
nightmare
.waitForSnackbarReset()
.click(selectors.fiscalData.fiscalDataButton)
.wait(selectors.fiscalData.addressInput)
.click(selectors.basicData.basicDataButton)
.wait(selectors.basicData.faxInput)
.getInputValue(selectors.basicData.faxInput)
.then(result => {
expect(result).toEqual('432198765');
done();
})
.catch(catchErrors(done));
});
it('should edit the email', done => { it('should edit the email', done => {
nightmare nightmare
.wait(selectors.basicData.emailInput) .wait(selectors.basicData.emailInput)
.clearInput(selectors.basicData.emailInput) .clearInput(selectors.basicData.emailInput)
.type(selectors.basicData.emailInput, 'CarolDanversEdited@verdnatura.es') .type(selectors.basicData.emailInput, 'Storm@verdnatura.es')
.click(selectors.basicData.saveButton) .click(selectors.basicData.saveButton)
.wait(selectors.globalItems.snackbarIsActive) .wait(selectors.globalItems.snackbarIsActive)
.getInnerText(selectors.globalItems.snackbarIsActive) .getInnerText(selectors.globalItems.snackbarIsActive)
@ -276,30 +216,47 @@ describe('Edit basicData path', () => {
.wait(selectors.basicData.emailInput) .wait(selectors.basicData.emailInput)
.getInputValue(selectors.basicData.emailInput) .getInputValue(selectors.basicData.emailInput)
.then(result => { .then(result => {
expect(result).toEqual('CarolDanversEdited@verdnatura.es'); expect(result).toEqual('Storm@verdnatura.es');
done(); done();
}) })
.catch(catchErrors(done)); .catch(catchErrors(done));
}); });
// it('should select the sales person', done => { it('should select the sales person', done => {
// nightmare nightmare
// .wait(selectors.basicData.salesPersonInput) .waitToClick(selectors.basicData.salesPersonInput)
// .select(selectors.basicData.salesPersonInput, '') // not working quite yet .waitToClick(selectors.basicData.salesBruceBannerOption)
// .click(selectors.basicData.saveButton) .wait(100)
// .wait(selectors.globalItems.snackbarIsActive) .waitToClick(selectors.basicData.saveButton)
// .getInnerText(selectors.globalItems.snackbarIsActive) .wait(selectors.globalItems.snackbarIsActive)
// .then(result => { .getInnerText(selectors.globalItems.snackbarIsActive)
// expect(result).toEqual('¡Datos guardados!'); .then(result => {
// done(); expect(result).toEqual('¡Datos guardados!');
// }) done();
// .catch(catchErrors(done)); })
// }); .catch(catchErrors(done));
});
it('should confirm the sales person have been selected', done => {
nightmare
.waitForSnackbarReset()
.waitToClick(selectors.fiscalData.fiscalDataButton)
.wait(selectors.fiscalData.addressInput)
.waitToClick(selectors.basicData.basicDataButton)
.wait(selectors.basicData.salesPersonInput)
.getInputValue(selectors.basicData.salesPersonInput)
.then(result => {
expect(result).toEqual('Bruce Banner');
done();
})
.catch(catchErrors(done));
});
it('should select the channel', done => { it('should select the channel', done => {
nightmare nightmare
.waitToClick(selectors.basicData.channelInput) .waitToClick(selectors.basicData.channelInput)
.waitToClick(selectors.basicData.channelMetropolisOption) .waitToClick(selectors.basicData.channelMetropolisOption)
.wait(100)
.waitToClick(selectors.basicData.saveButton) .waitToClick(selectors.basicData.saveButton)
.wait(selectors.globalItems.snackbarIsActive) .wait(selectors.globalItems.snackbarIsActive)
.getInnerText(selectors.globalItems.snackbarIsActive) .getInnerText(selectors.globalItems.snackbarIsActive)
@ -313,10 +270,10 @@ describe('Edit basicData path', () => {
it('should confirm the channel have been selected', done => { it('should confirm the channel have been selected', done => {
nightmare nightmare
.waitForSnackbarReset() .waitForSnackbarReset()
.click(selectors.fiscalData.fiscalDataButton) .waitToClick(selectors.fiscalData.fiscalDataButton)
.wait(selectors.fiscalData.addressInput) .wait(selectors.fiscalData.addressInput)
.click(selectors.basicData.basicDataButton) .waitToClick(selectors.basicData.basicDataButton)
.wait(selectors.basicData.basicDataButton) .wait(selectors.basicData.channelInput)
.getInputValue(selectors.basicData.channelInput) .getInputValue(selectors.basicData.channelInput)
.then(result => { .then(result => {
expect(result).toEqual('Metropolis newspaper'); expect(result).toEqual('Metropolis newspaper');

3
services/client/common/validations/validateDni.js
View File

@ -12,7 +12,6 @@ module.exports = fi => {
case 'X': case 'Y': case 'Z': case 'X': case 'Y': case 'Z':
positionLetter = parseInt(dni.replace(letterDni, letterDni.charCodeAt(0) - 88)) % 23; positionLetter = parseInt(dni.replace(letterDni, letterDni.charCodeAt(0) - 88)) % 23;
getLetter = regExpDni.substring(positionLetter + 1, positionLetter); getLetter = regExpDni.substring(positionLetter + 1, positionLetter);
console.log(letterDni.charCodeAt(0));
} }
return getLetter; return getLetter;
}; };
@ -83,11 +82,9 @@ module.exports = fi => {
dniValue = getDniItaly(dniLetterCountry); dniValue = getDniItaly(dniLetterCountry);
break; break;
case (dniLetterAscii >= 48 && dniLetterAscii <= 57): // 0- 9 case (dniLetterAscii >= 48 && dniLetterAscii <= 57): // 0- 9
console.log('dni spain');
dniValue = getDniSpain(dniNumeric, dniLetter); dniValue = getDniSpain(dniNumeric, dniLetter);
break; break;
default: default:
console.log('default');
dniValue = true; dniValue = true;
} }
return dniValue; return dniValue;

26
services/db/localDB02Inserts.sql
View File

@ -265,10 +265,10 @@ INSERT INTO `salix`.`Account`(`id`,`name`,`password`,`roleFk`,`active`,`email`)
(3, 'ClarkKent', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'ClarkKent@verdnatura.es'), (3, 'ClarkKent', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'ClarkKent@verdnatura.es'),
(4, 'TonyStark', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'TonyStark@verdnatura.es'), (4, 'TonyStark', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'TonyStark@verdnatura.es'),
(5, 'MaxEisenhardt', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'MaxEisenhardt@verdnatura.es'), (5, 'MaxEisenhardt', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'MaxEisenhardt@verdnatura.es'),
(6, 'DavidCharlesHaller', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'DavidCharlesHaller@verdnatura.es'), (6, 'DavidCharlesHaller', 'ac754a330530832ba1bf7687f577da91', 18, 1, 'DavidCharlesHaller@verdnatura.es'),
(7, 'HankPym', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'HankPym@verdnatura.es'), (7, 'HankPym', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'HankPym@verdnatura.es'),
(8, 'CharlesXavier', 'ac754a330530832ba1bf7687f577da91', 18, 1, 'CharlesXavier@verdnatura.es'), (8, 'CharlesXavier', 'ac754a330530832ba1bf7687f577da91', 18, 1, 'CharlesXavier@verdnatura.es'),
(9, 'BruceBanner', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'BruceBanner@verdnatura.es'), (9, 'BruceBanner', 'ac754a330530832ba1bf7687f577da91', 18, 1, 'BruceBanner@verdnatura.es'),
(10, 'JessicaJones', 'ac754a330530832ba1bf7687f577da91', 9, 1, 'JessicaJones@verdnatura.es'); (10, 'JessicaJones', 'ac754a330530832ba1bf7687f577da91', 9, 1, 'JessicaJones@verdnatura.es');
INSERT INTO `salix`.`Country`(`id`, `name`, `inCee`, `code`, `currencyFk`, `realCountryFk`) INSERT INTO `salix`.`Country`(`id`, `name`, `inCee`, `code`, `currencyFk`, `realCountryFk`)
@ -357,7 +357,7 @@ INSERT INTO `vn`.`cplusTerIdNif`(`id`, `description`)
VALUES VALUES
(1, 'NIF'); (1, 'NIF');
INSERT INTO `vn2008`.`Trabajadores`(`CodigoTrabajador`, `Id_Trabajador`, `Nombre`, `Apellidos`, `user`) INSERT INTO `vn2008`.`Trabajadores`(`CodigoTrabajador`, `Id_Trabajador`, `Nombre`, `Apellidos`, `user_id`)
VALUES VALUES
('LGN', 1, 'David Charles', 'Haller', 6), ('LGN', 1, 'David Charles', 'Haller', 6),
('ANT', 2, 'Hank', 'Pym', 7), ('ANT', 2, 'Hank', 'Pym', 7),
@ -375,16 +375,16 @@ INSERT INTO `salix`.`ContactChannel`(`id`, `name`)
INSERT INTO `salix`.`Client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `provinceFk`, `countryFk`, `email`, `phone`, `mobile`, `fax`, `active`, `discount`, `credit`, `creditInsurance`, `iban`, `dueDay`, `equalizationTax`, `hasToInvoice`, `isToBeMailed`, `payMethodFk`, `salesPersonFk`, `contactChannelFk`, `sepaVnl`, `coreVnl`, `coreVnh`, `eypbc`, `quality`, `vies`, `isRelevant`, `typeFk`, `accountingAccount`, `created`) INSERT INTO `salix`.`Client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `provinceFk`, `countryFk`, `email`, `phone`, `mobile`, `fax`, `active`, `discount`, `credit`, `creditInsurance`, `iban`, `dueDay`, `equalizationTax`, `hasToInvoice`, `isToBeMailed`, `payMethodFk`, `salesPersonFk`, `contactChannelFk`, `sepaVnl`, `coreVnl`, `coreVnh`, `eypbc`, `quality`, `vies`, `isRelevant`, `typeFk`, `accountingAccount`, `created`)
VALUES VALUES
(1, 'Bruce Wayne', '11111111B', 'Batman', 'Alfred', '1007 Mountain Drive, Gotham', 'Silla', 46460, 1, 1, 'BruceWayne@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 4, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()), (1, 'Bruce Wayne', '74451390E', 'Batman', 'Alfred', '1007 Mountain Drive, Gotham', 'Silla', 46460, 1, 1, 'BruceWayne@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 1, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()),
(2, 'Petter Parker', '22222222P', 'Spider-Man', 'Aunt May', '20 Ingram Street', 'Silla', 46460, 1, 1, 'PetterParker@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 4, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()), (2, 'Petter Parker', '87945234L', 'Spider-Man', 'Aunt May', '20 Ingram Street', 'Silla', 46460, 1, 1, 'PetterParker@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 1, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()),
(3, 'Clark Kent', '33333333C', 'Super-Man', 'lois lane', '344 Clinton Street', 'Silla', 46460, 1, 1, 'ClarkKent@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 4, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()), (3, 'Clark Kent', '06815934E', 'Super-Man', 'lois lane', '344 Clinton Street', 'Silla', 46460, 1, 1, 'ClarkKent@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 1, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()),
(4, 'Tony Stark', '44444444T', 'Iron-Man', 'Pepper Potts', '10880 Malibu Point', 'Silla', 46460, 1, 1, 'TonyStark@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 4, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()), (4, 'Tony Stark', '06089160W', 'Iron-Man', 'Pepper Potts', '10880 Malibu Point', 'Silla', 46460, 1, 1, 'TonyStark@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 1, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()),
(5, 'Max Eisenhardt', '55555555M', 'Magneto', 'Rogue', 'Unknown Whereabouts', 'Silla', 46460, 1, 1, 'MaxEisenhardt@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 4, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()), (5, 'Max Eisenhardt', '39182496H', 'Magneto', 'Rogue', 'Unknown Whereabouts', 'Silla', 46460, 1, 1, 'MaxEisenhardt@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 3, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()),
(6, 'DavidCharlesHaller', '66666666D', 'Legion', 'Charles Xavier', 'Evil hideout', 'Silla', 46460, 1, 1, 'DavidCharlesHaller@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 4, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()), (6, 'DavidCharlesHaller', '53136686Q', 'Legion', 'Charles Xavier', 'Evil hideout', 'Silla', 46460, 1, 1, 'DavidCharlesHaller@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 3, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()),
(7, 'Hank Pym', '77777777H', 'Ant-Man', 'Hawk', 'Anthill', 'Silla', 46460, 1, 1, 'HankPym@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 4, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()), (7, 'Hank Pym', '09854837G', 'Ant-Man', 'Hawk', 'Anthill', 'Silla', 46460, 1, 1, 'HankPym@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 3, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()),
(8, 'Charles Xavier', '88888888C', 'Professor X', 'Beast', '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Silla', 46460, 1, 1, 'CharlesXavier@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 4, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()), (8, 'Charles Xavier', '22641921P', 'Professor X', 'Beast', '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Silla', 46460, 1, 1, 'CharlesXavier@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 4, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()),
(9, 'Bruce Banner', '99999999B', 'Hulk', 'Black widow', 'Somewhere in New York', 'Silla', 46460, 1, 1, 'BruceBanner@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 4, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()), (9, 'Bruce Banner', '16104829E', 'Hulk', 'Black widow', 'Somewhere in New York', 'Silla', 46460, 1, 1, 'BruceBanner@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 4, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()),
(10, 'Jessica Jones', '10101010J', 'Jessica Jones', 'Luke Cage', 'NYCC 2015 Poster', 'Silla', 46460, 1, 1, 'JessicaJones@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 4, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE()); (10, 'Jessica Jones', '58282869H', 'Jessica Jones', 'Luke Cage', 'NYCC 2015 Poster', 'Silla', 46460, 1, 1, 'JessicaJones@verdnatura.es', 1111111111, 222222222, 333333333, 1, 1, 300, NULL, NULL, 0, 1, 1, 1, 5, 4, 5, 1, 1, 1, 1, 10, 0, 1, 1, 1234567890, CURDATE());
INSERT INTO `salix`.`Address`(`id`, `consignee`, `street`, `city`, `postcode`, `provinceFk`, `phone`, `mobile`, `isEnabled`, `isDefaultAddress`, `clientFk`, `defaultAgencyFk`, `longitude`, `latitude`, `isEqualizated`) INSERT INTO `salix`.`Address`(`id`, `consignee`, `street`, `city`, `postcode`, `provinceFk`, `phone`, `mobile`, `isEnabled`, `isDefaultAddress`, `clientFk`, `defaultAgencyFk`, `longitude`, `latitude`, `isEqualizated`)
VALUES VALUES