{{turnover.giftcardPrice | number: '1.2-2'}}
@if (turnover.giftcardPrice) {
@@ -106,7 +112,7 @@
{{'turnover.remark' | i18n}} |
- {{turnover.remark}}
+ {{turnover.remark}}
|
@@ -114,7 +120,7 @@
{{'turnover.materialConsumption' | i18n}} |
{{turnover.materialConsumption}}
+ [matTooltip]="turnover.materialConsumption">{{turnover.materialConsumption}}
|
@@ -122,7 +128,7 @@
{{'turnover.created' |
i18n}}
|
-
+ |
{{turnover.created | datef}}
|
@@ -132,7 +138,7 @@
{{'turnover.updated' | i18n}}
-
+ |
@if(turnover.created != turnover.updated) {
diff --git a/frontend/src/app/ui/turnovers/turnovers.ui.ts b/frontend/src/app/ui/turnovers/turnovers.ui.ts
index 10aca5e..09620fb 100644
--- a/frontend/src/app/ui/turnovers/turnovers.ui.ts
+++ b/frontend/src/app/ui/turnovers/turnovers.ui.ts
@@ -62,6 +62,7 @@ export class UiTurnovers implements OnInit {
this.i18n.get('turnover.customer'),
this.i18n.get('turnover.motif'),
this.i18n.get('turnover.price'),
+ this.i18n.get('turnover.paymentMethod'),
this.i18n.get('turnover.giftcard.number'),
this.i18n.get('turnover.giftcard.price'),
this.i18n.get('turnover.timeInvestment'),
@@ -81,8 +82,9 @@ export class UiTurnovers implements OnInit {
turnover.customer,
turnover.motif,
turnover.price.toFixed(2),
+ turnover.paymentMethod ? this.i18n.get('turnover.paymentMethod.' + turnover.paymentMethod) : '',
turnover.giftcardNumber,
- turnover.giftcardPrice && turnover.giftcardPrice.toFixed(2) || '',
+ turnover.giftcardPrice ? turnover.giftcardPrice.toFixed(2) : '',
turnover.timeInvestment.toFixed(1),
turnover.remark,
turnover.materialConsumption,
diff --git a/frontend/src/assets/i18n/de-informal.json b/frontend/src/assets/i18n/de-informal.json
index 6a93dd7..16fea26 100644
--- a/frontend/src/assets/i18n/de-informal.json
+++ b/frontend/src/assets/i18n/de-informal.json
@@ -141,6 +141,15 @@
"REQUIRED": "Angabe von Motiv erforderlich"
}
},
+ "paymentMethod": {
+ ".": "Zahlungsmethode",
+ "card":"Kartenzahlung",
+ "cash": "Barzahlung",
+ "error": {
+ "INVALID": "Üngültiger Wert",
+ "REQUIRED": "Angabe einer Zahlungsmethode erforderlich"
+ }
+ },
"price": {
".": "Preis",
"error": {
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index 1d81641..b42db00 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -210,10 +210,18 @@ qrcode canvas {
.spacer {
flex: 1 1 auto;
+
+ &.with-margin {
+ margin: 5px;
+ }
}
.margin {
margin: 0 15px;
+
+ &.horizontal {
+ margin: 15px 0;
+ }
}
.hint {
@@ -365,7 +373,7 @@ a[href*="//"]::after {
app-root {
background-color: #303030;
}
-
+
a {
color: $accent;
}
|