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

front/core/components/label-value/label-value.html

@@ -1,4 +1,9 @@
 <section class="ellipsize">
-    <vn-label></vn-label> 
+	<vn-label></vn-label> 
     <span></span>
+	<vn-icon
+		ng-if="$ctrl.hasInfo"
+		vn-tooltip="{{$ctrl.info}}"
+		icon="info_outline">
+	</vn-icon>
 </section>

front/core/components/label-value/label-value.js

@@ -2,9 +2,11 @@ import ngModule from '../../module';
 import './style.scss';
 
 export default class Controller {
-    constructor($element, $translate) {
+    constructor($element, $translate, $attrs) {
         this.element = $element[0];
         this._ = $translate;
+        this.hasInfo = Boolean($attrs.info);
+        this.info = $attrs.info || null;
     }
     set label(value) {
         let label = this.element.querySelector('vn-label');
@@ -24,7 +26,7 @@ export default class Controller {
         return this._value;
     }
 }
-Controller.$inject = ['$element', '$translate'];
+Controller.$inject = ['$element', '$translate', '$attrs'];
 
 ngModule.component('vnLabelValue', {
     controller: Controller,

front/core/components/label-value/style.scss

@@ -11,4 +11,10 @@ vn-label-value > section {
     & > span {
         color: $main-font-color;
     }
+
+    & > vn-icon {
+        vertical-align: middle;
+        color: $secondary-font-color;
+        font-size: 1.2em
+    }
 }

gulpfile.js

@@ -100,7 +100,7 @@ function backTest(done) {
 
     nodemon({
         exec: gulpBin,
-        args: ['dockerAndBackTest'],
+        args: ['backendUnitTest'],
         watch: backSources,
         done: done
     });

loopback/locale/en.json

@@ -29,5 +29,6 @@
 	"You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows",
 	"You can't create a ticket for a inactive client": "You can't create a ticket for a inactive client",
 	"Worker cannot be blank": "Worker cannot be blank",
-	"You don't have enough privileges to change the state of this ticket": "You don't have enough privileges to change the state of this ticket"
+	"You don't have enough privileges to change the state of this ticket": "You don't have enough privileges to change the state of this ticket",
+	"You must delete the claim id %d first": "You must delete the claim id %d first"
 }

modules/client/front/summary/index.html

@@ -168,22 +168,27 @@
             <h4 translate>Financial information</h4>
             <vn-label-value label="Risk" 
                 value="{{$ctrl.summary.debt.debt | currency:'€':2}}"
-                ng-class="{alert: $ctrl.summary.debt.debt > $ctrl.summary.credit}">  
+                ng-class="{alert: $ctrl.summary.debt.debt > $ctrl.summary.credit}"
+                info="Invoices minus payments  plus orders not yet invoiced">  
             </vn-label-value>
             <vn-label-value label="Credit" 
                 value="{{$ctrl.summary.credit | currency:'€':2 }} "
                 ng-class="{alert: $ctrl.summary.credit > $ctrl.summary.creditInsurance ||
-                                ($ctrl.summary.credit  && $ctrl.summary.creditInsurance == null)}">
+                                ($ctrl.summary.credit  && $ctrl.summary.creditInsurance == null)}"
+                info="Verdnatura's maximum risk">
             </vn-label-value>
             <vn-label-value label="Secured credit" 
-                value="{{$ctrl.summary.creditInsurance | currency:'€':2}} ({{$ctrl.summary.classifications[0].insurances[0].grade}})">
+                value="{{$ctrl.summary.creditInsurance | currency:'€':2}} ({{$ctrl.summary.classifications[0].insurances[0].grade}})"
+                info="Solunion's maximum risk">
             </vn-label-value>
             <vn-label-value label="Balance" 
-                value="{{$ctrl.summary.sumRisk | currency:'€':2}}">
+                value="{{$ctrl.summary.sumRisk | currency:'€':2}}"
+                info="Invoices minus payments">
             </vn-label-value>
             <vn-label-value label="Balance due" 
                 value="{{$ctrl.summary.defaulters[0].amount | currency:'€':2}}"
-                ng-class="{alert: $ctrl.summary.defaulters[0].amount}">
+                ng-class="{alert: $ctrl.summary.defaulters[0].amount}"
+                info="Deviated invoices minus payments">
             </vn-label-value>
             <vn-vertical ng-if="$ctrl.summary.recovery.started">
                 <vn-label-value label="Recovery since" 

modules/client/front/summary/locale/es.yml

@@ -12,3 +12,8 @@ Rate: Tarifa
 Business data: Datos comerciales
 Recovery since: Recobro desde
 Fiscal address: Dirección fiscal
+Invoices minus payments  plus orders not yet invoiced: Facturas menos recibos mas pedidos sin facturar
+Verdnatura's maximum risk: Riesgo máximo asumido por Verdnatura
+Solunion's maximum risk: Riesgo máximo asumido por Solunion
+Invoices minus payments: Facturas menos recibos
+Deviated invoices minus payments: Facturas fuera de plazo menos recibos

modules/ticket/front/locale/es.yml

@@ -58,6 +58,8 @@ Delay: Retraso
 Code 100: Código 100
 Invoice: Factura
 Client card: Ficha del cliente
+You are going to delete this ticket: Vas a borrar este ticket
+Ticket deleted: Ticket borrado
 
 #sections
 List: Listado