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

Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
Gerard 2018-04-16 12:10:56 +02:00
parent 41fc869451 3e8b26c91e
commit 8751975334
6 changed files with 61 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client/src/card/card.html
View File

@ -7,7 +7,7 @@
<vn-horizontal>
<vn-auto class="left-block">
<vn-client-descriptor client="$ctrl.client"></vn-client-descriptor>
<vn-left-menu></vn-left-menu>
<vn-left-menu depth="2"></vn-left-menu>
</vn-auto>
<vn-one>
<vn-vertical margin-medium ui-view></vn-vertical>

3
client/client/src/descriptor/descriptor.html
View File

@ -24,6 +24,9 @@
<span ng-if="$ctrl.client.creditInsurance">{{$ctrl.client.creditInsurance | currency:'€':2}}</span>
<span ng-if="!$ctrl.client.creditInsurance">-</span>
</div>
<div>
<vn-label translate>Sales person</vn-label> {{$ctrl.client.salesPerson.firstName}} {{$ctrl.client.salesPerson.name}}
</div>
</div>
<vn-horizontal pad-medium-bottom class="footer">
<vn-icon

30
client/item/src/summary/summary.html
View File

@ -1,24 +1,18 @@
<vn-card class="summary">
<vn-vertical pad-medium>
<vn-horizontal>
<vn-one margin-medium>
<vn-horizontal>
<vn-one></vn-one>
<vn-auto>
<vn-vertical>
<vn-one>
<img
ng-src="http://verdnatura.es/vn-image-data/catalog/200x200/{{$ctrl.item.image}}"
zoom-image="http://verdnatura.es/vn-image-data/catalog/900x900/{{$ctrl.item.image}}" on-error-src/>
</vn-one>
<vn-one>
<h5 text-center pad-small-v class="tittle">{{$ctrl.item.id}}</h5>
</vn-one>
</vn-vertical>
</vn-auto>
<vn-one></vn-one>
</vn-horizontal>
</vn-one>
<vn-auto margin-medium>
<vn-vertical>
<vn-one>
<img
ng-src="http://verdnatura.es/vn-image-data/catalog/200x200/{{$ctrl.item.image}}"
zoom-image="http://verdnatura.es/vn-image-data/catalog/900x900/{{$ctrl.item.image}}" on-error-src/>
</vn-one>
<vn-one>
<h5 text-center pad-small-v class="tittle">{{$ctrl.item.id}}</h5>
</vn-one>
</vn-vertical>
</vn-auto>
<vn-one margin-medium>
<vn-vertical>
<h5 translate>Basic data</h5>

8
client/salix/src/styles/misc.scss
View File

@ -235,4 +235,10 @@ fieldset[disabled] .mdl-checkbox .mdl-checkbox__label, .mdl-checkbox.is-disabled
fieldset[disabled] .mdl-textfield .mdl-textfield__label, .mdl-textfield.is-disabled.is-disabled .mdl-textfield__label {
color: rgb(255,171,64) !important;
}
/** END - FORM ELEMENTS DISABLED **/
/** END - FORM ELEMENTS DISABLED **/
.ellipsize {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden
}

40
services/client/common/models/address-observation.json
View File

@ -8,27 +8,27 @@
}
},
"properties": {
"id": {
"type": "Number",
"id": true,
"description": "Identifier"
},
"description": {
"type": "string",
"required": true
}
"id": {
"type": "Number",
"id": true,
"description": "Identifier"
},
"description": {
"type": "string",
"required": true
}
},
"relations": {
"address": {
"type": "belongsTo",
"model": "Address",
"foreignKey": "addressFk"
},
"observationType": {
"type": "belongsTo",
"model": "ObservationType",
"foreignKey": "observationTypeFk"
}
"address": {
"type": "belongsTo",
"model": "Address",
"foreignKey": "addressFk"
},
"observationType": {
"type": "belongsTo",
"model": "ObservationType",
"foreignKey": "observationTypeFk"
}
}
}
}

18
services/loopback/common/methods/client/specs/getAverageInvoiced.spec.js Normal file
View File

@ -0,0 +1,18 @@
const getAverageInvoiced = require('../getAverageInvoiced');
const {rawSql} = require('./helpers');
const model = {
remoteMethod: () => {}
};
rawSql(model);
getAverageInvoiced(model);
describe('client getAverageInvoiced()', () => {
it('should call the getAverageInvoiced method', done => {
model.getAverageInvoiced(101)
.then(response => {
expect(response.invoiced).toEqual(0);
done();
});
});
});