verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

cr changes

This commit is contained in:
Bernat Exposito Domenech 2020-10-29 07:44:04 +01:00
parent 665d46dec3
commit 8d32f93512
7 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/supplier/back/methods/supplier/filter.js
View File

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

6
modules/supplier/back/methods/supplier/specs/getSummary.spec.js
View File

@ -7,9 +7,11 @@ describe('Supplier getSummary()', () => {
expect(supplier.id).toEqual(1); expect(supplier.id).toEqual(1);
expect(supplier.name).toEqual('Plants SL'); expect(supplier.name).toEqual('Plants SL');
expect(supplier.nif).toEqual('06089160W'); 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 supplier = await app.models.Supplier.getSummary(1);
const country = supplier.country(); const country = supplier.country();
@ -21,8 +23,6 @@ describe('Supplier getSummary()', () => {
const supplier = await app.models.Supplier.getSummary(1); const supplier = await app.models.Supplier.getSummary(1);
const payMethod = supplier.payMethod(); const payMethod = supplier.payMethod();
expect(supplier.account).toEqual(4000000001);
expect(supplier.payDay).toEqual(15);
expect(payMethod.name).toEqual('PayMethod one'); expect(payMethod.name).toEqual('PayMethod one');
}); });
}); });

4
modules/supplier/front/descriptor/index.html
View File

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

4
modules/supplier/front/descriptor/locale/es.yml
View File

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

4
modules/supplier/front/search-panel/locale/es.yml
View File

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

4
modules/supplier/front/summary/locale/es.yml
View File

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

2
modules/supplier/front/summary/style.scss
View File

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