Bugfix/fix point router on initial load

src/api/ADempiere/form/point-of-sales.js

@@ -584,7 +584,7 @@ export function requestProcessOrder({
         amount: parameter.amount,
         tender_type_code: parameter.tenderTypeCode,
         payment_ate: parameter.paymentDate,
-        currency_uid: parameter.currency_uuid
+        currency_uid: parameter.currencyUuid
       }
     })
   }

src/components/ADempiere/Form/VPOS/BusinessPartner/businessPartnerCreate.vue

@@ -9,8 +9,8 @@
       class="create-bp"
     >
       <el-row :gutter="24">
-        <field-definition
-          v-for="(field) in fieldsList"
+        <field
+          v-for="(field) in metadataList"
           :key="field.columnName"
           :metadata-field="field"
         />
@@ -39,14 +39,21 @@
 
 <script>
 import { requestCreateBusinessPartner } from '@/api/ADempiere/system-core.js'
-import formMixin from '@/components/ADempiere/Form/formMixin.js'
 import fieldsList from './fieldsListCreate.js'
 import BParterMixin from './mixinBusinessPartner.js'
+import {
+  // createFieldFromDefinition,
+  createFieldFromDictionary
+} from '@/utils/ADempiere/lookupFactory'
+import Field from '@/components/ADempiere/Field'
 
 export default {
   name: 'BusinessPartnerCreate',
+  components: {
+    Field
+  },
   mixins: [
-    formMixin,
+    // formMixin,
     BParterMixin
   ],
   props: {
@@ -59,6 +66,11 @@ export default {
           fieldsList
         }
       }
+    },
+    showField: {
+      type: Boolean,
+      default: true
+
     }
   },
   data() {
@@ -67,6 +79,7 @@ export default {
       isLoadingRecord: false,
       fieldsList,
       isCustomForm: true,
+      metadataList: [],
       unsubscribe: () => {}
     }
   },
@@ -79,10 +92,19 @@ export default {
       return field
     }
   },
+  watch: {
+    showField(value) {
+      if (value && this.isEmptyValue(this.metadataList)) {
+        this.setFieldsList()
+      }
+    }
+  },
   beforeDestroy() {
     this.unsubscribe()
   },
+  // created()
   methods: {
+    createFieldFromDictionary,
     // TODO: Get locations values.
     createBusinessParter() {
       let values = this.$store.getters.getValuesView({
@@ -188,6 +210,23 @@ export default {
           value: undefined
         }]
       })
+    },
+    setFieldsList() {
+      const list = []
+      // Product Code
+      this.fieldsList.forEach(element => {
+        this.createFieldFromDictionary(element)
+          .then(response => {
+            const data = response
+            list.push({
+              ...data,
+              containerUuid: 'Business-Partner-Create'
+            })
+          }).catch(error => {
+            console.warn(`LookupFactory: Get Field From Server (State) - Error ${error.code}: ${error.message}.`)
+          })
+      })
+      this.metadataList = list
     }
   }
 }

src/components/ADempiere/Form/VPOS/BusinessPartner/businessPartnersList.vue

@@ -17,8 +17,8 @@
           size="small"
         >
           <el-row>
-            <field-definition
-              v-for="(field) in fieldsList"
+            <field
+              v-for="(field) in metadataList"
               :key="field.columnName"
               :metadata-field="field"
             />
@@ -72,17 +72,22 @@
 
 <script>
 import CustomPagination from '@/components/ADempiere/Pagination'
-import formMixin from '@/components/ADempiere/Form/formMixin.js'
+import {
+  // createFieldFromDefinition,
+  createFieldFromDictionary
+} from '@/utils/ADempiere/lookupFactory'
 import fieldsList from './fieldsListSearch.js'
 import BParterMixin from './mixinBusinessPartner.js'
+import Field from '@/components/ADempiere/Field'
 
 export default {
   name: 'BusinessPartnersList',
   components: {
-    CustomPagination
+    CustomPagination,
+    Field
   },
   mixins: [
-    formMixin,
+    // formMixin,
     BParterMixin
   ],
   props: {
@@ -103,13 +108,18 @@ export default {
           isShowList: false
         }
       }
+    },
+    showField: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
     return {
       isLoadedRecords: false,
       activeAccordion: 'query-criteria',
       fieldsList,
+      metadataList: [],
       unsubscribe: () => {}
     }
   },
@@ -130,6 +140,11 @@ export default {
       if (isToLoad) {
         this.searchBPartnerList({})
       }
+    },
+    showField(value) {
+      if (value && this.isEmptyValue(this.metadataList)) {
+        this.setFieldsList()
+      }
     }
   },
   created() {
@@ -143,6 +158,7 @@ export default {
     this.unsubscribe()
   },
   methods: {
+    createFieldFromDictionary,
     keyAction(event) {
       switch (event.srcKey) {
         case 'refreshList': {
@@ -192,6 +208,23 @@ export default {
         .finally(() => {
           this.isLoadedRecords = true
         })
+    },
+    setFieldsList() {
+      const list = []
+      // Product Code
+      this.fieldsList.forEach(element => {
+        this.createFieldFromDictionary(element)
+          .then(response => {
+            const data = response
+            list.push({
+              ...data,
+              containerUuid: 'Business-Partner-List'
+            })
+          }).catch(error => {
+            console.warn(`LookupFactory: Get Field From Server (State) - Error ${error.code}: ${error.message}.`)
+          })
+      })
+      this.metadataList = list
     }
   }
 }

src/components/ADempiere/Form/VPOS/BusinessPartner/index.vue

@@ -3,14 +3,47 @@
     <el-form-item>
       <template slot="label">
         {{ $t('form.pos.order.BusinessPartnerCreate.businessPartner') }}
-        <i
-          v-popover:businessPartnerCreate
-          class="el-icon-circle-plus"
-        />
-        <i
-          v-popover:businessPartnersList
-          class="el-icon-search"
-        />
+        <el-popover
+          placement="right"
+          width="400"
+          trigger="click"
+          @hide="showFieldCreate = !showFieldCreate"
+        >
+          <business-partner-create
+            :parent-metadata="parentMetadata"
+            :show-field="showFieldCreate"
+          />
+          <el-button
+            slot="reference"
+            type="text"
+            @click="showFieldCreate = !showFieldCreate"
+          >
+            <i
+              class="el-icon-circle-plus"
+            />
+          </el-button>
+        </el-popover>
+        <el-popover
+          placement="right"
+          width="800"
+          trigger="click"
+          @hide="showFieldList = !showFieldList"
+        >
+          <business-partners-list
+            :parent-metadata="parentMetadata"
+            :shows-popovers="showsPopovers"
+            :show-field="showFieldList"
+          />
+          <el-button
+            slot="reference"
+            type="text"
+            @click="showFieldList = !showFieldList"
+          >
+            <i
+              class="el-icon-search"
+            />
+          </el-button>
+        </el-popover>
       </template>
 
       <el-autocomplete
@@ -45,32 +78,7 @@
         </template>
       </el-autocomplete>
     </el-form-item>
-    <el-popover
-      ref="businessPartnerCreate"
-      v-model="showsPopovers.isShowCreate"
-      placement="right"
-      width="400"
-      trigger="click"
-    >
-      <business-partner-create
-        v-if="showsPopovers.isShowCreate"
-        :parent-metadata="parentMetadata"
-        :shows-popovers="showsPopovers"
-      />
-    </el-popover>
 
-    <el-popover
-      ref="businessPartnersList"
-      v-model="showsPopovers.isShowList"
-      placement="right"
-      width="800"
-      trigger="click"
-    >
-      <business-partners-list
-        :parent-metadata="parentMetadata"
-        :shows-popovers="showsPopovers"
-      />
-    </el-popover>
   </div>
 </template>
 
@@ -81,6 +89,7 @@
  */
 import { requestGetBusinessPartner } from '@/api/ADempiere/system-core.js'
 import BusinessPartnerCreate from './businessPartnerCreate'
+// import FieldListBusinessPartner from './fieldBusinessPartners/index'
 import BusinessPartnersList from './businessPartnersList'
 import BParterMixin from './mixinBusinessPartner.js'
 const { setBusinessPartner } = BParterMixin.methods
@@ -92,6 +101,7 @@ export default {
   components: {
     BusinessPartnerCreate,
     BusinessPartnersList
+    // FieldListBusinessPartner
   },
   props: {
     parentMetadata: {
@@ -111,7 +121,9 @@ export default {
   data() {
     return {
       controlDisplayed: this.displayedValue,
-      timeOut: null
+      timeOut: null,
+      showFieldCreate: false,
+      showFieldList: false
     }
   },
   computed: {

src/components/ADempiere/Form/VPOS/Collection/index.vue

@@ -606,7 +606,7 @@ export default {
           amount: this.amontSend,
           paymentDate,
           tenderTypeCode,
-          currencyUuid: this.currencyDisplay(currencyToPay).currencyUuid
+          currencyUuid: this.currencyDisplay(currencyToPay)
         })
       }
       this.addCollect()
@@ -739,6 +739,9 @@ export default {
       if (display) {
         return display
       }
+      if (currency === this.currencyPoint.id) {
+        return this.currencyPoint.uuid
+      }
       return currency
     },
     convertCurrency() {

src/components/ADempiere/Form/VPOS/Options/index.vue

@@ -33,18 +33,33 @@
                 width="800"
                 trigger="click"
                 @show="seeOrderList"
+                @hide="showFieldListOrder = !showFieldListOrder"
               >
                 <orders-list
                   :parent-metadata="metadata"
+                  :show-field="showFieldListOrder"
                 />
                 <p
                   slot="reference"
                   :style="blockOption"
+                >
+                  <el-button
+                    type="text"
+                    @click="showFieldListOrder = !showFieldListOrder"
+                  >
+                    <svg-icon icon-class="list" />
+                    <br>
+                    {{ $t('form.pos.optionsPoinSales.salesOrder.ordersHistory') }}
+                  </el-button>
+                </p>
+                <!-- <p
+                  slot="reference"
+                  :style="blockOption"
                 >
                   <svg-icon icon-class="list" />
                   <br>
                   {{ $t('form.pos.optionsPoinSales.salesOrder.ordersHistory') }}
-                </p>
+                </p> -->
               </el-popover>
             </el-card>
           </el-col>
@@ -286,7 +301,8 @@ export default {
   data() {
     return {
       activeName: '',
-      processPos: ''
+      processPos: '',
+      showFieldListOrder: false
     }
   },
   computed: {