From ab9ec66ea332d3ed457c1c309b0d55bfaeef94c4 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 27 May 2019 15:17:23 +0200
Subject: [PATCH] refactor display values
---
entity/Offeritem_entity/Offeritem_entity.aod | 3 +++
.../entityfields/price/displayValueProcess.js | 6 ++++++
.../entityfields/totalprice/displayValueProcess.js | 6 ++++++
.../entityfields/vat/displayValueProcess.js | 6 ++++++
entity/Orderitem_entity/Orderitem_entity.aod | 13 +++++++++++++
.../entityfields/price/displayValueProcess.js | 6 ++++++
.../entityfields/totalprice/displayValueProcess.js | 6 ++++++
.../entityfields/vat/displayValueProcess.js | 6 ++++++
8 files changed, 52 insertions(+)
create mode 100644 entity/Offeritem_entity/entityfields/price/displayValueProcess.js
create mode 100644 entity/Offeritem_entity/entityfields/totalprice/displayValueProcess.js
create mode 100644 entity/Offeritem_entity/entityfields/vat/displayValueProcess.js
create mode 100644 entity/Orderitem_entity/entityfields/price/displayValueProcess.js
create mode 100644 entity/Orderitem_entity/entityfields/totalprice/displayValueProcess.js
create mode 100644 entity/Orderitem_entity/entityfields/vat/displayValueProcess.js
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index b5231edb5de..8b0810ae316 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -65,6 +65,7 @@
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>PRODUCT_ID</name>
@@ -113,6 +114,7 @@
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
<name>OfferId_param</name>
@@ -142,6 +144,7 @@
<inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>IMAGE</name>
diff --git a/entity/Offeritem_entity/entityfields/price/displayValueProcess.js b/entity/Offeritem_entity/entityfields/price/displayValueProcess.js
new file mode 100644
index 00000000000..f9efef77b57
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/price/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("Util_lib");
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$param.Currency_param")));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/totalprice/displayValueProcess.js b/entity/Offeritem_entity/entityfields/totalprice/displayValueProcess.js
new file mode 100644
index 00000000000..f9efef77b57
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/totalprice/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("Util_lib");
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$param.Currency_param")));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/vat/displayValueProcess.js b/entity/Offeritem_entity/entityfields/vat/displayValueProcess.js
new file mode 100644
index 00000000000..f9efef77b57
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/vat/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("Util_lib");
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$param.Currency_param")));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index eaa4cda062d..62b8be3a9d8 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -17,6 +17,8 @@
<entityField>
<name>DISCOUNT</name>
<title>Discount</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
</entityField>
<entityField>
<name>GROUPCODEID</name>
@@ -56,6 +58,10 @@
<entityField>
<name>PRICE</name>
<title>Unit price</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>PRODUCT_ID</name>
@@ -72,6 +78,8 @@
<name>QUANTITY</name>
<documentation>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/documentation.adoc</documentation>
<title>Quantity</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#</outputFormat>
<valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/onValueChange.js</onValueChange>
<onValueChangeTypes>
@@ -88,7 +96,11 @@
<entityField>
<name>VAT</name>
<title>VAT in %</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
<state>AUTO</state>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
<name>OrderId_param</name>
@@ -118,6 +130,7 @@
<inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/displayValueProcess.js</displayValueProcess>
<onValidation></onValidation>
</entityField>
<entityField>
diff --git a/entity/Orderitem_entity/entityfields/price/displayValueProcess.js b/entity/Orderitem_entity/entityfields/price/displayValueProcess.js
new file mode 100644
index 00000000000..f9efef77b57
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/price/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("Util_lib");
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$param.Currency_param")));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/totalprice/displayValueProcess.js b/entity/Orderitem_entity/entityfields/totalprice/displayValueProcess.js
new file mode 100644
index 00000000000..f9efef77b57
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/totalprice/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("Util_lib");
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$param.Currency_param")));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/vat/displayValueProcess.js b/entity/Orderitem_entity/entityfields/vat/displayValueProcess.js
new file mode 100644
index 00000000000..f9efef77b57
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/vat/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("Util_lib");
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$param.Currency_param")));
\ No newline at end of file
--
GitLab