feat(supplier): add checkbox isPayMethodChecked
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
parent
127077b985
commit
119d5e45b9
|
@ -1285,11 +1285,11 @@ INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `pr
|
||||||
(5, 442, 'GCR building', 'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222'),
|
(5, 442, 'GCR building', 'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222'),
|
||||||
(6, 442, 'The Gotham Tonight building', 'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222');
|
(6, 442, 'The Gotham Tonight building', 'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222');
|
||||||
|
|
||||||
INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`,`isFarmer`,`commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`)
|
INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`,`isFarmer`,`commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'Plants SL', 'Plants nick', 4100000001, 1, '06089160W', 0, 0, CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants'),
|
(1, 'Plants SL', 'Plants nick', 4100000001, 1, '06089160W', 0, 0, CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1),
|
||||||
(2, 'Farmer King', 'The farmer', 4000020002, 1, '87945234L', 1, 0, CURDATE(), 1, 'supplier address 2', 'SILLA', 2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals'),
|
(2, 'Farmer King', 'The farmer', 4000020002, 1, '87945234L', 1, 0, CURDATE(), 1, 'supplier address 2', 'SILLA', 2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals', 1),
|
||||||
(442, 'Verdnatura Levante SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, 0, CURDATE(), 1, 'supplier address 3', 'SILLA', 1, 43022, 1, 2, 15, 6, 9, 3, 18, 'flowerPlants');
|
(442, 'Verdnatura Levante SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, 0, CURDATE(), 1, 'supplier address 3', 'SILLA', 1, 43022, 1, 2, 15, 6, 9, 3, 18, 'flowerPlants', 1);
|
||||||
|
|
||||||
INSERT INTO `vn`.`supplierContact`(`id`, `supplierFk`, `phone`, `mobile`, `email`, `observation`, `name`)
|
INSERT INTO `vn`.`supplierContact`(`id`, `supplierFk`, `phone`, `mobile`, `email`, `observation`, `name`)
|
||||||
VALUES
|
VALUES
|
||||||
|
|
|
@ -1147,6 +1147,7 @@ export default {
|
||||||
alias: 'vn-supplier-basic-data vn-textfield[ng-model="$ctrl.supplier.nickname"]',
|
alias: 'vn-supplier-basic-data vn-textfield[ng-model="$ctrl.supplier.nickname"]',
|
||||||
isSerious: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isSerious"]',
|
isSerious: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isSerious"]',
|
||||||
isActive: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isActive"]',
|
isActive: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isActive"]',
|
||||||
|
isPayMethodChecked: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isPayMethodChecked"]',
|
||||||
notes: 'vn-supplier-basic-data vn-textarea[ng-model="$ctrl.supplier.note"]',
|
notes: 'vn-supplier-basic-data vn-textarea[ng-model="$ctrl.supplier.note"]',
|
||||||
saveButton: 'vn-supplier-basic-data button[type="submit"]',
|
saveButton: 'vn-supplier-basic-data button[type="submit"]',
|
||||||
},
|
},
|
||||||
|
|
|
@ -22,6 +22,7 @@ describe('Supplier basic data path', () => {
|
||||||
await page.write(selectors.supplierBasicData.alias, 'Plants Nick SL');
|
await page.write(selectors.supplierBasicData.alias, 'Plants Nick SL');
|
||||||
await page.waitToClick(selectors.supplierBasicData.isSerious);
|
await page.waitToClick(selectors.supplierBasicData.isSerious);
|
||||||
await page.waitToClick(selectors.supplierBasicData.isActive);
|
await page.waitToClick(selectors.supplierBasicData.isActive);
|
||||||
|
await page.waitToClick(selectors.supplierBasicData.isPayMethodChecked);
|
||||||
await page.write(selectors.supplierBasicData.notes, 'Some notes');
|
await page.write(selectors.supplierBasicData.notes, 'Some notes');
|
||||||
|
|
||||||
await page.waitToClick(selectors.supplierBasicData.saveButton);
|
await page.waitToClick(selectors.supplierBasicData.saveButton);
|
||||||
|
@ -52,6 +53,12 @@ describe('Supplier basic data path', () => {
|
||||||
expect(result).toBe('unchecked');
|
expect(result).toBe('unchecked');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should check the isPayMethodChecked checkbox is now unchecked', async() => {
|
||||||
|
const result = await page.checkboxState(selectors.supplierBasicData.isPayMethodChecked);
|
||||||
|
|
||||||
|
expect(result).toBe('unchecked');
|
||||||
|
});
|
||||||
|
|
||||||
it('should check the notes were edited', async() => {
|
it('should check the notes were edited', async() => {
|
||||||
const result = await page.waitToGetProperty(selectors.supplierBasicData.notes, 'value');
|
const result = await page.waitToGetProperty(selectors.supplierBasicData.notes, 'value');
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,7 @@ describe('loopback model Supplier', () => {
|
||||||
.catch(e => {
|
.catch(e => {
|
||||||
error = e;
|
error = e;
|
||||||
});
|
});
|
||||||
|
console.log(error);
|
||||||
|
|
||||||
expect(error).toBeDefined();
|
expect(error).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|
|
@ -101,7 +101,10 @@
|
||||||
"mysql": {
|
"mysql": {
|
||||||
"columnName": "withholdingSageFk"
|
"columnName": "withholdingSageFk"
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"isPayMethodChecked": {
|
||||||
|
"type": "boolean"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"relations": {
|
"relations": {
|
||||||
"payMethod": {
|
"payMethod": {
|
||||||
|
|
|
@ -36,6 +36,10 @@
|
||||||
label="Active"
|
label="Active"
|
||||||
ng-model="$ctrl.supplier.isActive">
|
ng-model="$ctrl.supplier.isActive">
|
||||||
</vn-check>
|
</vn-check>
|
||||||
|
<vn-check
|
||||||
|
label="PayMethodChecked"
|
||||||
|
ng-model="$ctrl.supplier.isPayMethodChecked">
|
||||||
|
</vn-check>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<vn-horizontal>
|
<vn-horizontal>
|
||||||
<vn-textarea
|
<vn-textarea
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
Notes: Notas
|
Notes: Notas
|
||||||
Active: Activo
|
Active: Activo
|
||||||
Verified: Verificado
|
Verified: Verificado
|
||||||
|
PayMethodChecked: Método de pago validado
|
||||||
Responsible for approving invoices: Responsable de aprobar las facturas
|
Responsible for approving invoices: Responsable de aprobar las facturas
|
Loading…
Reference in New Issue