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

Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev

This commit is contained in:
Juan Ferrer Toribio 2017-05-17 21:23:54 +02:00
parent 4eff9d451b 5f9160c172
commit 9d4acfc64f
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client/src/fiscal-data/index.html
View File

@ -42,7 +42,6 @@
<vn-vertical pad-large> <vn-vertical pad-large>
<vn-title>Información de facturación</vn-title> <vn-title>Información de facturación</vn-title>
<vn-horizontal> <vn-horizontal>
<vn-textfield vn-two label="IBAN" field="fiscal.client.iban"></vn-textfield>
<vn-autocomplete vn-two <vn-autocomplete vn-two
initial-value="fiscal.client.payMethod" initial-value="fiscal.client.payMethod"
field="fiscal.client.payMethodFk" field="fiscal.client.payMethodFk"
@ -51,6 +50,7 @@
value-field="id" value-field="id"
label="Forma de pago"> label="Forma de pago">
</vn-autocomplete> </vn-autocomplete>
<vn-textfield vn-two label="IBAN" field="fiscal.client.iban"></vn-textfield>
<vn-textfield vn-one label="Vencimiento" field="fiscal.client.dueDay"></vn-textfield> <vn-textfield vn-one label="Vencimiento" field="fiscal.client.dueDay"></vn-textfield>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>

1
client/core/src/textfield/index.mdl.html
View File

@ -5,6 +5,7 @@
name="*[name]*" name="*[name]*"
ng-model="*[model]*" ng-model="*[model]*"
vn-validation="*[rule]*" vn-validation="*[rule]*"
ng-disabled="*[disable]*"
*[enabled]*/> *[enabled]*/>
<button <button
type="button" type="button"

1
services/client/common/models/Client.js
View File

@ -22,6 +22,7 @@ module.exports = function(Client) {
if(this.payMethod && !this.salesPerson) err(); if(this.payMethod && !this.salesPerson) err();
}; };
Client.validatesLengthOf('iban', {allowNull: true, min: 23, max: 23});
// Hooks // Hooks
Client.observe('before save', function(ctx, next) { Client.observe('before save', function(ctx, next) {