From 90deabf9d2607e3a67c1b5b912357928f76b5da9 Mon Sep 17 00:00:00 2001
From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com>
Date: Thu, 19 Aug 2021 07:57:28 -0400
Subject: [PATCH] Add converted order total (#1072)

Co-authored-by: elsiosanchez <elsiossanches@gmail.com>
---
 .../ADempiere/Form/VPOS/Collection/index.vue    |  2 +-
 .../Form/VPOS/Collection/typeCollection.vue     |  2 +-
 .../ADempiere/Form/VPOS/Options/index.vue       |  2 +-
 .../ADempiere/Form/VPOS/Order/index.vue         | 17 ++++++++++-------
 src/components/ADempiere/Form/VPOS/posMixin.js  |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/components/ADempiere/Form/VPOS/Collection/index.vue b/src/components/ADempiere/Form/VPOS/Collection/index.vue
index 58242141..8dda8cc4 100644
--- a/src/components/ADempiere/Form/VPOS/Collection/index.vue
+++ b/src/components/ADempiere/Form/VPOS/Collection/index.vue
@@ -638,7 +638,7 @@ export default {
       if (!this.isEmptyValue(this.convertionsList)) {
         let rate
         payment.forEach((pay) => {
-          rate = this.convertionsList.find(currency => currency.currencyTo.uuid === pay.currencyUuid)
+          rate = this.convertionsList.find(currency => !this.isEmptyValue(currency.currencyTo) && currency.currencyTo.uuid === pay.currencyUuid)
           if (!rate) {
             if (this.currentPointOfSales.priceList.currency.uuid !== pay.currencyUuid) {
               this.searchConversion(pay.currencyUuid)
diff --git a/src/components/ADempiere/Form/VPOS/Collection/typeCollection.vue b/src/components/ADempiere/Form/VPOS/Collection/typeCollection.vue
index fcb0a1f7..49be9531 100644
--- a/src/components/ADempiere/Form/VPOS/Collection/typeCollection.vue
+++ b/src/components/ADempiere/Form/VPOS/Collection/typeCollection.vue
@@ -184,7 +184,7 @@ export default {
     formatDate,
     formatPrice,
     iSOCode(value) {
-      const currencyPay = this.convertionsList.find(currency => currency.currencyTo.uuid === value.currencyUuid)
+      const currencyPay = this.convertionsList.find(currency => !this.isEmptyValue(currency.currencyTo) && currency.currencyTo.uuid === value.currencyUuid)
       if (!currencyPay) {
         return ''
       }
diff --git a/src/components/ADempiere/Form/VPOS/Options/index.vue b/src/components/ADempiere/Form/VPOS/Options/index.vue
index d90cd8c5..3e130c15 100644
--- a/src/components/ADempiere/Form/VPOS/Options/index.vue
+++ b/src/components/ADempiere/Form/VPOS/Options/index.vue
@@ -696,7 +696,7 @@ export default {
         }
       }).catch(() => {
       }).finally(() => {
-        this.$store.commit('setListPayments', [])
+        this.$store.commit('setListPayments', {})
         const { templateBusinessPartner } = this.currentPointOfSales
         this.$store.commit('updateValuesOfContainer', {
           containerUuid: this.metadata.containerUuid,
diff --git a/src/components/ADempiere/Form/VPOS/Order/index.vue b/src/components/ADempiere/Form/VPOS/Order/index.vue
index 4a8e2450..fd39f639 100644
--- a/src/components/ADempiere/Form/VPOS/Order/index.vue
+++ b/src/components/ADempiere/Form/VPOS/Order/index.vue
@@ -62,7 +62,7 @@
                   @command="changeDocumentType"
                 >
                   <span>
-                    <icon class="el-icon-document" />
+                    <el-icon class="el-icon-document" />
                     <b style="cursor: pointer"> {{ currentDocumentType.name }} </b>
                   </span>
                   <el-dropdown-menu slot="dropdown">
@@ -335,14 +335,15 @@
               <p class="total">{{ $t('form.pos.order.seller') }}:<b style="float: right;">
                 {{ currentOrder.salesRepresentative.name }}
               </b></p>
-              <p class="total"> {{ $t('form.pos.order.subTotal') }}:<b class="order-info">{{ formatPrice(currentOrder.totalLines, pointOfSalesCurrency.iSOCode) }}</b></p>
-              <p class="total"> {{ $t('form.pos.order.tax') }}:<b style="float: right;">{{ getOrderTax(pointOfSalesCurrency.iSOCode) }}</b> </p>
+              <p class="total"> {{ $t('form.pos.order.subTotal') }}:<b v-if="!isEmptyValue(currentOrder.uuid)" class="order-info">{{ formatPrice(currentOrder.totalLines, pointOfSalesCurrency.iSOCode) }}</b></p>
+              <p class="total"> {{ $t('form.pos.order.tax') }}:<b v-if="!isEmptyValue(currentOrder.uuid)" style="float: right;">{{ getOrderTax(pointOfSalesCurrency.iSOCode) }}</b> </p>
               <p class="total">
                 <b>
                   {{ $t('form.pos.order.total') }}:
                 </b>
                 <b style="float: right;">
                   <el-popover
+                    v-if="!isEmptyValue(currentOrder.uuid)"
                     :v-model="seeConversion"
                     placement="top-start"
                     trigger="click"
@@ -361,27 +362,29 @@
                   </el-popover>
                 </b>
               </p>
+              <p v-if="!isEmptyValue(currentPointOfSales.displayCurrency)" class="total"> <b> {{ $t('form.pos.collect.convertedAmount') }}: </b> <b v-if="!isEmptyValue(currentOrder.uuid)" style="float: right;">{{ formatPrice(currentOrder.grandTotal / totalAmountConverted, currentPointOfSales.displayCurrency.iso_code) }}</b> </p>
             </span>
             <span v-if="!isMobile" style="float: right;padding-right: 3%;">
               <p class="total">{{ $t('form.pos.order.order') }}: <b class="order-info">{{ currentOrder.documentNo }}</b></p>
               <p class="total">
                 {{ $t('form.pos.order.date') }}:
-                <b class="order-info">
+                <b v-if="!isEmptyValue(currentOrder.uuid)" class="order-info">
                   {{ orderDate }}
                 </b>
               </p>
               <p class="total">{{ $t('form.pos.order.type') }}:<b class="order-info">{{ currentOrder.documentType.name }}</b></p>
               <p class="total">
                 {{ $t('form.pos.order.itemQuantity') }}
-                <b class="order-info">
+                <b v-if="!isEmptyValue(currentOrder.uuid)" class="order-info">
                   {{ getItemQuantity }}
                 </b>
               </p>
               <p class="total">
                 {{ $t('form.pos.order.numberLines') }}
-                <b class="order-info">
+                <b v-if="!isEmptyValue(currentOrder.uuid)" class="order-info">
                   {{ numberOfLines }}
-                </b></p>
+                </b>
+              </p>
             </span>
           </el-footer>
         </el-container>
diff --git a/src/components/ADempiere/Form/VPOS/posMixin.js b/src/components/ADempiere/Form/VPOS/posMixin.js
index cf17512a..dee9b151 100644
--- a/src/components/ADempiere/Form/VPOS/posMixin.js
+++ b/src/components/ADempiere/Form/VPOS/posMixin.js
@@ -593,7 +593,7 @@ export default {
         }
       }).catch(() => {
       }).finally(() => {
-        this.$store.commit('setListPayments', [])
+        this.$store.commit('setListPayments', {})
         const { templateBusinessPartner } = this.currentPointOfSales
         this.$store.commit('updateValuesOfContainer', {
           containerUuid: this.metadata.containerUuid,