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

merge

This commit is contained in:
Vicente Falco 2017-09-21 12:18:29 +02:00
parent 35ce85e3fc ec4adc7552
commit 092696514f
7 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client/src/basic-data/basic-data.html
View File

@ -20,7 +20,7 @@
<vn-textfield vn-one label="Fax" field="$ctrl.client.fax"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Email" field="$ctrl.client.email" info="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur eget rhoncus metus. Nullam quis ante venenatis, laoreet tellus ac, egestas tellus. Suspendisse placerat tristique libero a posuere."></vn-textfield>
<vn-textfield vn-one label="Email" field="$ctrl.client.email" info="You can save multiple emails by chaining them using comma without spaces, example: user@domain.com,user2@domain.com the first email will be considered as the main"></vn-textfield>
<vn-autocomplete vn-one
initial-data="$ctrl.client.salesPerson"
field="$ctrl.client.salesPersonFk"

3
client/client/src/basic-data/locale/es.json
View File

@ -8,5 +8,6 @@
"Fax": "Fax",
"Email": "Correo electrónico",
"Salesperson": "Comercial",
"Channel": "Canal"
"Channel": "Canal",
"You can save multiple emails by chaining them using comma without spaces, example: user@domain.com,user2@domain.com the first email will be considered as the main": "Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios, ejemplo: user@dominio.com,user2@dominio.com siendo el primer correo electrónico el principal"
}

23
client/client/src/billing-data/billing-data.html
View File

@ -11,23 +11,24 @@
<vn-title>Billing information</vn-title>
<vn-horizontal>
<vn-autocomplete vn-two
vn-acl="administrative"
field="$ctrl.client.payMethodFk"
url="/client/api/PayMethods"
select-fields="ibanRequired"
initial-data="$ctrl.client.payMethod"
label="Forma de pago">
</vn-autocomplete>
<vn-textfield vn-two label="IBAN" field="$ctrl.client.iban"></vn-textfield>
<vn-textfield vn-one label="Vencimiento" field="$ctrl.client.dueDay"></vn-textfield>
<vn-textfield vn-two label="IBAN" field="$ctrl.client.iban" vn-acl="administrative"></vn-textfield>
<vn-textfield vn-one label="Vencimiento" field="$ctrl.client.dueDay" vn-acl="administrative"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Descuento" field="$ctrl.client.discount"></vn-textfield>
<vn-textfield vn-one label="Crédito" field="$ctrl.client.credit"></vn-textfield>
<vn-textfield vn-one label="Crédito asegurado" field="$ctrl.client.creditInsurance"></vn-textfield>
<vn-textfield vn-one label="Descuento" field="$ctrl.client.discount" vn-acl="administrative"></vn-textfield>
<vn-textfield vn-one label="Crédito" field="$ctrl.client.credit" vn-acl="administrative"></vn-textfield>
<vn-textfield vn-one label="Crédito asegurado" field="$ctrl.client.creditInsurance" vn-acl="administrative"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-check vn-one label="Recargo de equivalencia" field="$ctrl.client.equalizationTax"></vn-check>
<vn-check vn-one label="Vies" field="$ctrl.client.vies"></vn-check>
<vn-check vn-one label="Recargo de equivalencia" field="$ctrl.client.equalizationTax" vn-acl="administrative"></vn-check>
<vn-check vn-one label="Vies" field="$ctrl.client.vies" vn-acl="administrative"></vn-check>
</vn-horizontal>
</vn-vertical>
</vn-card>
@ -35,14 +36,14 @@
<vn-vertical pad-large>
<vn-title>Documentación</vn-title>
<vn-horizontal>
<vn-check vn-one label="Recibido core VNH" field="$ctrl.client.coreVnh"></vn-check>
<vn-check vn-one label="Recibido core VNL" field="$ctrl.client.coreVnl"></vn-check>
<vn-check vn-one label="Recibido B2B VNL" field="$ctrl.client.sepaVnl"></vn-check>
<vn-check vn-one label="Recibido core VNH" field="$ctrl.client.coreVnh" vn-acl="administrative"></vn-check>
<vn-check vn-one label="Recibido core VNL" field="$ctrl.client.coreVnl" vn-acl="administrative"></vn-check>
<vn-check vn-one label="Recibido B2B VNL" field="$ctrl.client.sepaVnl" vn-acl="administrative"></vn-check>
</vn-horizontal>
</vn-vertical>
</vn-card>
<vn-button-bar>
<vn-submit label="Guardar"></vn-submit>
<vn-submit label="Guardar" vn-acl="administrative"></vn-submit>
</vn-button-bar>
</form>
<vn-dialog

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

@ -19,7 +19,7 @@
<vn-textfield vn-one label="User name" field="$ctrl.client.userName"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Email" field="$ctrl.client.email" info="Push on applications menu"></vn-textfield>
<vn-textfield vn-one label="Email" field="$ctrl.client.email" info="You can save multiple emails by chaining them using comma without spaces, example: user@domain.com,user2@domain.com the first email will be considered as the main"></vn-textfield>
<vn-one></vn-one>
</vn-horizontal>
</vn-vertical>

3
client/client/src/create/locale/es.json
View File

@ -5,5 +5,6 @@
"User name": "Nombre de usuario",
"Email": "Correo electrónico",
"Create and edit": "Crear y editar",
"Create": "Crear"
"Create": "Crear",
"You can save multiple emails by chaining them using comma without spaces, example: user@domain.com,user2@domain.com the first email will be considered as the main": "Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios, ejemplo: user@dominio.com,user2@dominio.com siendo el primer correo electrónico el principal"
}

13
client/core/src/directives/acl.js
View File

@ -1,8 +1,9 @@
import {module} from '../module';
function vnAcl(aclService, $compile) {
function vnAcl(aclService, $timeout) {
return {
restrict: 'A',
priority: -1,
link: function($scope, $element, $attrs) {
let acls = $attrs.vnAcl.split(',');
let action = $attrs.vnAclAction || 'disabled';
@ -15,8 +16,12 @@ function vnAcl(aclService, $compile) {
input = input.querySelector(selector);
if (input) {
input.setAttribute("ng-disabled", "true");
$compile(input)($scope);
$timeout(() => {
input.setAttribute("disabled", "true");
});
$element[0].querySelectorAll('i, vn-drop-down').forEach(i => {
i.parentNode.removeChild(i);
});
}
} else {
$element.remove();
@ -25,6 +30,6 @@ function vnAcl(aclService, $compile) {
}
};
}
vnAcl.$inject = ['aclService', '$compile'];
vnAcl.$inject = ['aclService', '$timeout'];
module.directive('vnAcl', vnAcl);

4
client/core/src/tooltip/style.css
View File

@ -5,7 +5,7 @@
display: none;
position: fixed;
background-color: #fff;
padding: 15px;
padding: 20px;
color: #424242;
z-index: 999;
border: 1px solid #A7A7A7;
@ -23,7 +23,7 @@
}
.tooltip-text{
max-width: 250px;
max-width: 320px;
}
.tooltip-down .tooltip-arrow {