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

This commit is contained in:
Daniel Herrero 2018-03-14 12:12:12 +01:00
commit 82949b42b5
9 changed files with 35 additions and 16 deletions

View File

@ -25,30 +25,36 @@
<span ng-if="!$ctrl.client.creditInsurance">-</span>
</div>
</div>
<div class="footer">
<vn-horizontal pad-medium-bottom class="footer">
<vn-icon
vn-tooltip="Client inactive"
tooltip-position = "right"
icon="person"
icon="icon-disabled"
ng-class="{bright: $ctrl.client.isActive == false}">
</vn-icon>
<vn-icon
vn-tooltip="Client Frozen"
tooltip-position = "right"
icon="mail"
icon="icon-frozen"
ng-class="{bright: $ctrl.client.isFreezed == true}">
</vn-icon>
<vn-icon
vn-tooltip="Web Account inactive"
tooltip-position = "right"
icon="phone"
icon="icon-noweb"
ng-class="{bright: $ctrl.client.account.active == false}">
</vn-icon>
<vn-icon
vn-tooltip="Client has debt"
tooltip-position = "right"
icon="power"
icon="icon-risk"
ng-class="{bright: $ctrl.clientDebt < 0}">
</vn-icon>
</div>
<vn-icon
vn-tooltip="Client not checked"
tooltip-position = "right"
icon="icon-no036"
ng-class="{bright: $ctrl.client.isTaxDataChecked == false}">
</vn-icon>
</vn-horizontal>
</vn-card>

View File

@ -3,3 +3,4 @@ Enable web access: Habilitar acceso web
New password: Nueva contraseña
Repeat password: Repetir contraseña
Change password: Cambiar contraseña
Client must be checked to activate: No se puede activar un cliente si no esta verificado (036)

View File

@ -23,6 +23,7 @@
vn-one
margin-medium-top
label="User"
info="Client must be checked to activate"
field="$ctrl.account.name">
</vn-textfield>
</vn-horizontal>

View File

@ -1,7 +1,9 @@
.icon-barcode:before { content: '\e800'; } /* '' */
.icon-tags:before { content: '\e800'; } /* '' */
.icon-volume:before { content: '\e801'; } /* '' */
.icon-bucket:before { content: '\e802'; } /* '' */
.icon-barcode:before { content: '\e802'; } /* '' */
.icon-bucket:before { content: '\e803'; } /* '' */
.icon-frozen:before { content: '\e808'; } /* '' */
.icon-disabled:before { content: '\e80b'; } /* '' */
.icon-invoices:before { content: '\e80c'; } /* '' */
.icon-noweb:before { content: '\e812'; } /* '' */
@ -15,4 +17,6 @@
.icon-addperson:before { content: '\e81e'; } /* '' */
.icon-bin:before { content: '\e81f'; } /* '' */
.icon-sms:before { content: '\e820'; } /* '' */
.icon-tags:before { content: '\e821'; } /* '' */
.icon-ticket:before { content: '\e821'; } /* '' */
.icon-tax:before { content: '\e822'; } /* '' */
.icon-no036:before { content: '\e823'; } /* '' */

View File

@ -58,7 +58,7 @@
"component": "vn-item-tax",
"menu": {
"description": "Tax",
"icon": "folder"
"icon": "icon-tax"
}
},
{
@ -82,7 +82,7 @@
},
"menu": {
"description": "Niche",
"icon": "folder"
"icon": "place"
},
"acl": ["buyer","replenisher"]
},
@ -95,7 +95,7 @@
},
"menu": {
"description": "Botanical",
"icon": "folder"
"icon": "local_florist"
},
"acl": ["buyer"]
},{

View File

@ -19,3 +19,8 @@ phone: Teléfono
creditInsurance: Crédito Asegurado
Return to module index: Volver a la página principal del módulo
Preview: Vista previa
Client has debt: Cliente con riesgo
Web Account inactive: Sin acceso Web
Client Frozen: Cliente congelado
Client inactive: Cliente inactivo
Client not checked: Cliente no comprobado

View File

@ -1,7 +1,7 @@
{
"module": "ticket",
"name": "Tickets",
"icon": "receipt",
"icon": "icon-ticket",
"validations": false,
"routes": [
{

View File

@ -5,5 +5,7 @@
"The default consignee can not be unchecked": "No se puede desmarcar el consignatario predeterminado",
"Unable to default a disabled consignee": "No se puede poner predeterminado un consignatario desactivado",
"El método de pago seleccionado requiere que se especifique el IBAN": "El método de pago seleccionado requiere que se especifique el IBAN",
"can't be blank": "can't be blank"
"can't be blank": "can't be blank",
"DNI Incorrecto": "DNI Incorrecto",
"Ya existe un usuario con ese nombre": "Ya existe un usuario con ese nombre"
}