From b6450dc4063f0392d78fd2450def8d93c793469a Mon Sep 17 00:00:00 2001
From: Yamel Senih <ysenih@erpya.com>
Date: Mon, 20 Apr 2020 01:12:42 -0400
Subject: [PATCH] Add Dictionary fields from ADempiere (#454)

---
 .../ADempiere/Form/PriceInquiry/index.vue     | 150 ++++++++++--------
 src/components/ADempiere/Form/formMixin.js    |   6 +-
 src/utils/ADempiere/lookupFactory.js          |   6 +
 3 files changed, 90 insertions(+), 72 deletions(-)

diff --git a/src/components/ADempiere/Form/PriceInquiry/index.vue b/src/components/ADempiere/Form/PriceInquiry/index.vue
index 091523f3..e0bdb260 100644
--- a/src/components/ADempiere/Form/PriceInquiry/index.vue
+++ b/src/components/ADempiere/Form/PriceInquiry/index.vue
@@ -28,8 +28,7 @@
 
 <script>
 import formMixin from '@/components/ADempiere/Form/formMixin'
-import { COSTS_PLUS_PRICES, CHAR, TEXT } from '@/utils/ADempiere/references'
-
+import { TEXT } from '@/utils/ADempiere/references'
 export default {
   name: 'TestView',
   mixins: [formMixin],
@@ -52,84 +51,97 @@ export default {
   methods: {
     setFieldsList() {
       const fieldsList = []
-      let sequence = 10
-      const sequenceIncrement = () => {
-        sequence = sequence + 10
-        return sequence
-      }
-
-      fieldsList.push(this.createField({
+      // Product Code
+      this.createFieldFromDictionary({
         containerUuid: this.metadata.containerUuid,
-        columnName: 'Value',
-        definition: {
-          name: 'Product Code/Bar Code',
-          displayType: CHAR.id,
-          panelType: this.panelType,
-          sequence,
-          size: 24
+        elementColumnName: 'ProductValue',
+        overwriteDefinition: {
+          size: 24,
+          sequence: 10,
+          isMandatory: true
         }
-      }))
-
-      fieldsList.push(this.createField({
+      })
+        .then(metadata => {
+          fieldsList.push(metadata)
+        }).catch(error => {
+          console.warn(`LookupFactory: Get Field From Server (State) - Error ${error.code}: ${error.message}.`)
+        })
+      // Product Name
+      this.createFieldFromDictionary({
         containerUuid: this.metadata.containerUuid,
-        columnName: 'Name',
-        definition: {
-          name: 'Product Name',
+        elementColumnName: 'ProductName',
+        overwriteDefinition: {
+          size: 24,
+          sequence: 20,
+          isReadOnly: true
+        }
+      })
+        .then(metadata => {
+          fieldsList.push(metadata)
+        }).catch(error => {
+          console.warn(`LookupFactory: Get Field From Server (State) - Error ${error.code}: ${error.message}.`)
+        })
+      // Product Description
+      this.createFieldFromDictionary({
+        containerUuid: this.metadata.containerUuid,
+        elementColumnName: 'ProductDescription',
+        overwriteDefinition: {
+          size: 24,
+          sequence: 30,
           displayType: TEXT.id,
-          panelType: this.panelType,
-          sequence: sequenceIncrement(),
-          size: 24
+          isReadOnly: true
         }
-      }))
-
-      fieldsList.push(this.createField({
+      })
+        .then(metadata => {
+          fieldsList.push(metadata)
+        }).catch(error => {
+          console.warn(`LookupFactory: Get Field From Server (State) - Error ${error.code}: ${error.message}.`)
+        })
+      // Price List
+      this.createFieldFromDictionary({
         containerUuid: this.metadata.containerUuid,
-        columnName: 'Description',
-        definition: {
-          name: 'Product Description',
-          displayType: TEXT.id,
-          panelType: this.panelType,
-          sequence: sequenceIncrement(),
-          size: 24
+        elementColumnName: 'PriceList',
+        overwriteDefinition: {
+          size: 16,
+          sequence: 40,
+          isReadOnly: true
         }
-      }))
-
-      fieldsList.push(this.createField({
+      })
+        .then(metadata => {
+          fieldsList.push(metadata)
+        }).catch(error => {
+          console.warn(`LookupFactory: Get Field From Server (State) - Error ${error.code}: ${error.message}.`)
+        })
+      // Tax Amount
+      this.createFieldFromDictionary({
         containerUuid: this.metadata.containerUuid,
-        columnName: 'Price',
-        definition: {
-          name: 'Price',
-          displayType: COSTS_PLUS_PRICES.id,
-          panelType: this.panelType,
-          sequence: sequenceIncrement(),
-          size: 16
+        elementColumnName: 'TaxAmt',
+        overwriteDefinition: {
+          size: 8,
+          sequence: 50,
+          isReadOnly: true
         }
-      }))
-
-      fieldsList.push(this.createField({
+      })
+        .then(metadata => {
+          fieldsList.push(metadata)
+        }).catch(error => {
+          console.warn(`LookupFactory: Get Field From Server (State) - Error ${error.code}: ${error.message}.`)
+        })
+      // Total
+      this.createFieldFromDictionary({
         containerUuid: this.metadata.containerUuid,
-        columnName: 'Tax',
-        definition: {
-          name: 'Tax',
-          displayType: COSTS_PLUS_PRICES.id,
-          panelType: this.panelType,
-          sequence: sequenceIncrement(),
-          size: 8
+        elementColumnName: 'GrandTotal',
+        overwriteDefinition: {
+          size: 24,
+          sequence: 60,
+          isReadOnly: true
         }
-      }))
-
-      fieldsList.push(this.createField({
-        containerUuid: this.metadata.containerUuid,
-        columnName: 'Total',
-        definition: {
-          name: 'Total',
-          displayType: COSTS_PLUS_PRICES.id,
-          panelType: this.panelType,
-          sequence: sequenceIncrement(),
-          size: 24
-        }
-      }))
-
+      })
+        .then(metadata => {
+          fieldsList.push(metadata)
+        }).catch(error => {
+          console.warn(`LookupFactory: Get Field From Server (State) - Error ${error.code}: ${error.message}.`)
+        })
       this.metadataList = fieldsList
     }
   }
diff --git a/src/components/ADempiere/Form/formMixin.js b/src/components/ADempiere/Form/formMixin.js
index b90e2368..a2720f28 100644
--- a/src/components/ADempiere/Form/formMixin.js
+++ b/src/components/ADempiere/Form/formMixin.js
@@ -1,5 +1,5 @@
 import Field from '@/components/ADempiere/Field'
-import { createField, createFieldDictionary } from '@/utils/ADempiere/lookupFactory'
+import { createFieldFromDefinition, createFieldFromDictionary } from '@/utils/ADempiere/lookupFactory'
 
 export default {
   name: 'FormMixn',
@@ -26,8 +26,8 @@ export default {
     }
   },
   methods: {
-    createField,
-    createFieldDictionary,
+    createFieldFromDefinition,
+    createFieldFromDictionary,
     getPanel() {
       const panel = this.getterPanel
       if (panel) {
diff --git a/src/utils/ADempiere/lookupFactory.js b/src/utils/ADempiere/lookupFactory.js
index 8c40d09e..2ddd7a84 100644
--- a/src/utils/ADempiere/lookupFactory.js
+++ b/src/utils/ADempiere/lookupFactory.js
@@ -198,6 +198,12 @@ function getFactoryFromField({
     if (!isEmptyValue(overwriteDefinition.defaultValueTo)) {
       fieldDefinition.defaultValueTo = overwriteDefinition.defaultValueTo
     }
+    if (!isEmptyValue(overwriteDefinition.displayType)) {
+      fieldDefinition.displayType = overwriteDefinition.displayType
+    }
+    if (!isEmptyValue(overwriteDefinition.size)) {
+      fieldDefinition.size = overwriteDefinition.size
+    }
   }
   //  Convert it
   return createFieldFromDefinition({