diff --git a/modules/supplier/back/methods/supplier/filter.js b/modules/supplier/back/methods/supplier/filter.js index b1e7d3884..3500afacd 100644 --- a/modules/supplier/back/methods/supplier/filter.js +++ b/modules/supplier/back/methods/supplier/filter.js @@ -65,7 +65,6 @@ module.exports = Self => { {'s.name': {like: `%${value}%`}}, {'s.nickname': {like: `%${value}%`}} ]}; - // return {'s.id': value}; case 'nickname': param = `s.${param}`; return {[param]: {like: `%${value}%`}}; diff --git a/modules/supplier/back/methods/supplier/specs/getSummary.spec.js b/modules/supplier/back/methods/supplier/specs/getSummary.spec.js index 73feba9ad..7179e2d77 100644 --- a/modules/supplier/back/methods/supplier/specs/getSummary.spec.js +++ b/modules/supplier/back/methods/supplier/specs/getSummary.spec.js @@ -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); }); - 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'); }); }); diff --git a/modules/supplier/front/descriptor/index.html b/modules/supplier/front/descriptor/index.html index 405f2da21..5e7225e1c 100644 --- a/modules/supplier/front/descriptor/index.html +++ b/modules/supplier/front/descriptor/index.html @@ -24,12 +24,12 @@
diff --git a/modules/supplier/front/descriptor/locale/es.yml b/modules/supplier/front/descriptor/locale/es.yml index be1f4e9fe..c92a917c7 100644 --- a/modules/supplier/front/descriptor/locale/es.yml +++ b/modules/supplier/front/descriptor/locale/es.yml @@ -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 \ No newline at end of file +Official supplier: Proveedor oficial +Inactive supplier: Proveedor inactivo \ No newline at end of file diff --git a/modules/supplier/front/search-panel/locale/es.yml b/modules/supplier/front/search-panel/locale/es.yml index 964e7a8d9..77253a4ef 100644 --- a/modules/supplier/front/search-panel/locale/es.yml +++ b/modules/supplier/front/search-panel/locale/es.yml @@ -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 \ No newline at end of file +Tax number: NIF / CIF +Search suppliers by id, name or alias: Busca proveedores por id, nombre o alias \ No newline at end of file diff --git a/modules/supplier/front/summary/locale/es.yml b/modules/supplier/front/summary/locale/es.yml index b367ebb35..abdb4d1c7 100644 --- a/modules/supplier/front/summary/locale/es.yml +++ b/modules/supplier/front/summary/locale/es.yml @@ -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 +Search suppliers by id, name or alias: Busca proveedores por id, nombre o alias Is Farmer: Es agrícola \ No newline at end of file diff --git a/modules/supplier/front/summary/style.scss b/modules/supplier/front/summary/style.scss index 1520659d2..1eb6b2323 100644 --- a/modules/supplier/front/summary/style.scss +++ b/modules/supplier/front/summary/style.scss @@ -2,6 +2,6 @@ vn-client-summary { .alert span { - color: $color-alert !important + color: $color-alert } } \ No newline at end of file