diff --git a/front/core/components/label-value/label-value.html b/front/core/components/label-value/label-value.html
index ab7cdbc28e..714c0f278a 100644
--- a/front/core/components/label-value/label-value.html
+++ b/front/core/components/label-value/label-value.html
@@ -1,4 +1,9 @@
\ No newline at end of file
diff --git a/front/core/components/label-value/label-value.js b/front/core/components/label-value/label-value.js
index 88edb53817..ecf3bf4b39 100644
--- a/front/core/components/label-value/label-value.js
+++ b/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,
diff --git a/front/core/components/label-value/style.scss b/front/core/components/label-value/style.scss
index e4360cec43..7caa0175fc 100644
--- a/front/core/components/label-value/style.scss
+++ b/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
+ }
}
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index 7c8ca2a979..b4a333dc7f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -100,7 +100,7 @@ function backTest(done) {
nodemon({
exec: gulpBin,
- args: ['dockerAndBackTest'],
+ args: ['backendUnitTest'],
watch: backSources,
done: done
});
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index bc7db2e301..e9395682f6 100644
--- a/loopback/locale/en.json
+++ b/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"
}
\ No newline at end of file
diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html
index e47c2e76a5..f14f4e651e 100644
--- a/modules/client/front/summary/index.html
+++ b/modules/client/front/summary/index.html
@@ -168,22 +168,27 @@
Financial information
+ ng-class="{alert: $ctrl.summary.debt.debt > $ctrl.summary.credit}"
+ info="Invoices minus payments plus orders not yet invoiced">
+ ($ctrl.summary.credit && $ctrl.summary.creditInsurance == null)}"
+ info="Verdnatura's maximum risk">
+ value="{{$ctrl.summary.creditInsurance | currency:'€':2}} ({{$ctrl.summary.classifications[0].insurances[0].grade}})"
+ info="Solunion's maximum risk">
+ value="{{$ctrl.summary.sumRisk | currency:'€':2}}"
+ info="Invoices minus payments">
+ ng-class="{alert: $ctrl.summary.defaulters[0].amount}"
+ info="Deviated invoices minus payments">