2502-supplier_summary + e2e #425

Merged
joan merged 15 commits from 2502-supplier_summary into dev 2020-10-29 07:55:38 +00:00
7 changed files with 12 additions and 13 deletions
Showing only changes of commit 8d32f93512 - Show all commits

View File

@ -65,7 +65,6 @@ module.exports = Self => {
{'s.name': {like: `%${value}%`}},
{'s.nickname': {like: `%${value}%`}}
]};
// return {'s.id': value};
case 'nickname':

remove comments

remove comments
param = `s.${param}`;
return {[param]: {like: `%${value}%`}};

View File

@ -7,9 +7,11 @@ describe('Supplier getSummary()', () => {
expect(supplier.id).toEqual(1);
expect(supplier.name).toEqual('Plants SL');
expect(supplier.nif).toEqual('06089160W');
expect(supplier.account).toEqual(4000000001);
expect(supplier.payDay).toEqual(15);
});
joan marked this conversation as resolved
Review

containing it's supplier country relation

containing it's supplier country relation
it(`should return a summary object containing it's supplier country`, async() => {
it(`should return a summary object containing it's supplier country relation`, async() => {
const supplier = await app.models.Supplier.getSummary(1);
const country = supplier.country();
@ -21,8 +23,6 @@ describe('Supplier getSummary()', () => {
const supplier = await app.models.Supplier.getSummary(1);
const payMethod = supplier.payMethod();
expect(supplier.account).toEqual(4000000001);
expect(supplier.payDay).toEqual(15);
expect(payMethod.name).toEqual('PayMethod one');
});
});

View File

@ -24,12 +24,12 @@
</div>
<div class="icons">
<vn-icon
vn-tooltip="Supplier inactive"
vn-tooltip="Inactive supplier"
icon="icon-disabled"
ng-class="{bright: $ctrl.supplier.isActive == false}">
</vn-icon>
<vn-icon
vn-tooltip="Supplier official"
vn-tooltip="Official supplier"

official supplier

official supplier
icon="icon-net"
ng-class="{bright: $ctrl.supplier.isOfficial == false}">
</vn-icon>

View File

@ -1,5 +1,5 @@
Tax number: NIF / CIF
All entries with current supplier: Todas las entradas con el proveedor actual
Go to client: Ir al cliente
Supplier official: Proveedor oficial
Supplier inactive: Proveedor inactivo
Official supplier: Proveedor oficial

official supplier

official supplier
Inactive supplier: Proveedor inactivo

inactive supplier

inactive supplier

View File

@ -1,4 +1,4 @@
Province: Provincia
Country: País
Tax number: Nif
Search suppliers by id, name or alias: Busca proveedores por el id, el nombre o el alias
Tax number: NIF / CIF

NIF

NIF
Search suppliers by id, name or alias: Busca proveedores por id, nombre o alias

Busca proveedores por id, nombre o alias

Busca proveedores por id, nombre o alias

View File

@ -1,5 +1,5 @@
Is official: Es oficial
Country: País
Tax number: Nif
Search suppliers by id, name or alias: Busca proveedores por el id, el nombre o el alias
Tax number: NIF / CIF

NIF y CIF?

NIF y CIF?
Search suppliers by id, name or alias: Busca proveedores por id, nombre o alias

-el

-el
Is Farmer: Es agrícola

View File

@ -2,6 +2,6 @@
vn-client-summary {
.alert span {
color: $color-alert !important
color: $color-alert

is !important that important?

is !important that important?
}
}