From 9b722f278064b62ce35b5622f8e11847a9b034a8 Mon Sep 17 00:00:00 2001
From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com>
Date: Mon, 30 Oct 2023 17:51:34 -0400
Subject: [PATCH] Fix: Support  Create Order from RMA (Transcoding) (#1571)

---
 src/api/ADempiere/form/VPOS/index.js          |  22 +++-
 .../Form/VPOS2/Options/RMA/index.vue          |  67 +++++++----
 .../Form/VPOS2/Options/RMA/infoRMA.vue        |   2 +
 .../Form/VPOS2/Options/RMA/previwerRMA.vue    | 107 +++++++++++++++---
 .../Form/VPOS2/Options/salesOrder.vue         |   8 +-
 .../modules/ADempiere/form/VPOS/options.js    | 104 +++++++++++++++--
 .../modules/ADempiere/form/VPOS/order.js      |   1 -
 src/utils/ADempiere/dictionary/form/VPOS.js   |   2 +-
 8 files changed, 260 insertions(+), 53 deletions(-)

diff --git a/src/api/ADempiere/form/VPOS/index.js b/src/api/ADempiere/form/VPOS/index.js
index 1f4ee1f43f7..9d3a5b30369 100644
--- a/src/api/ADempiere/form/VPOS/index.js
+++ b/src/api/ADempiere/form/VPOS/index.js
@@ -1398,10 +1398,30 @@ export function processRMA({
 }) {
   return request({
     url: `point-of-sales/returns/${rmaId}/process`,
-    method: 'get',
+    method: 'put',
     params: {
       pos_id: posId,
+      rma_id: rmaId,
       document_action: documentAction
     }
   })
 }
+
+/**
+ * Create Order from RMA
+ */
+
+export function createOrderFromRMA({
+  posId,
+  salesRepresentativeId,
+  sourceRmaId
+}) {
+  return request({
+    url: `point-of-sales/returns/${sourceRmaId}/create-order`,
+    method: 'post',
+    params: {
+      pos_id: posId,
+      sales_representative_id: salesRepresentativeId
+    }
+  })
+}
diff --git a/src/components/ADempiere/Form/VPOS2/Options/RMA/index.vue b/src/components/ADempiere/Form/VPOS2/Options/RMA/index.vue
index e9d94cf85f5..e9af24ccc5c 100644
--- a/src/components/ADempiere/Form/VPOS2/Options/RMA/index.vue
+++ b/src/components/ADempiere/Form/VPOS2/Options/RMA/index.vue
@@ -18,6 +18,7 @@ along with this program. If not, see <https:www.gnu.org/licenses/>.
 
 <template>
   <el-main
+    v-if="!isEmptyValue(currentRMA)"
     class="product-list-content"
   >
     <el-form
@@ -84,13 +85,16 @@ along with this program. If not, see <https:www.gnu.org/licenses/>.
               icon="el-icon-document-copy"
               @click="copyCode(scope.row)"
             />
-            <edit-qty-entered
-              v-if="scope.row.isEditQtyEntered && valueOrder.columnName === 'QtyEntered'"
-              :qty="Number(scope.row.quantity_ordered.value)"
-              :handle-change="updateQuantity"
-            />
+            <span v-if="scope.row.isEditQty && valueOrder.columnName === 'QtyEntered'">
+              <el-button v-if="scope.row.isLoading" :loading="scope.row.isLoading" />
+              <edit-qty-entered
+                v-else
+                :qty="Number(scope.row.quantity_ordered.value)"
+                :handle-change="updateQuantity"
+              />
+            </span>
             <span v-else>
-              {{ displayValue({ row: scope.row, columnName: valueOrder.columnName}) }}
+              {{ displayValue({ row: scope.row, columnName: valueOrder.columnName }) }}
             </span>
           </template>
         </el-table-column>
@@ -111,7 +115,15 @@ along with this program. If not, see <https:www.gnu.org/licenses/>.
         </template>
       </el-table-column>
     </el-table>
+    <info-r-m-a />
   </el-main>
+  <div
+    v-else
+    v-loading="true"
+    :element-loading-text="$t('notifications.loading')"
+    element-loading-background="rgba(255, 255, 255, 0.7)"
+    style="height: 350px;"
+  />
 </template>
 
 <script>
@@ -123,8 +135,10 @@ import infoRMA from '@/components/ADempiere/Form/VPOS2/Options/RMA/infoRMA.vue'
 import editQtyEntered from '@/components/ADempiere/Form/VPOS2/MainOrder/OptionLine/editLine/editQtyEntered.vue'
 // Utils and Helper Methods
 import { formatQuantity } from '@/utils/ADempiere/formatValue/numberFormat'
+import { copyToClipboard } from '@/utils/ADempiere/coreUtils.js'
 import {
-  displayLabel
+  displayLabel,
+  displayValue
 } from '@/utils/ADempiere/dictionary/form/VPOS'
 
 export default defineComponent({
@@ -190,12 +204,6 @@ export default defineComponent({
           isNumeric: true,
           isVisible: true,
           size: '150px'
-        },
-        convertedAmount: {
-          columnName: 'ConvertedAmount',
-          label: lang.t('form.pos.collect.convertedAmount'),
-          isNumeric: true,
-          size: '150px'
         }
       }
     })
@@ -211,6 +219,12 @@ export default defineComponent({
       })
     })
 
+    const currentRMA = computed(() => {
+      return store.getters.getAttributeRMA({
+        attribute: 'current'
+      })
+    })
+
     // Methods
 
     /**
@@ -233,31 +247,36 @@ export default defineComponent({
         id,
         quantity_ordered
       } = item
-      store.dispatch('createShipmentLine', {
+      store.dispatch('createRMALine', {
         quantity: quantity_ordered.value,
-        orderLineId: id
+        sourceOrderLineId: id
       })
     }
 
     function selectLine(row, column, event) {
-      const { property } = column
-      if (property === 'quantity') {
+      const { columnKey } = column
+      if (columnKey === 'QtyEntered') {
         row.isEditQty = true
       }
     }
 
     function exitLine(row, column, event) {
-      const { property } = column
-      if (property === 'quantity') {
+      const { columnKey } = column
+      if (columnKey === 'QtyEntered') {
         row.isEditQty = false
       }
     }
 
     function updateQuantity(quantity) {
+      line.value.isLoading = true
       store.dispatch('updateRMALine', {
         lineId: line.value.id,
         quantity
       })
+        .finally(() => {
+          line.value.isEditQty = false
+          line.value.isLoading = false
+        })
     }
 
     function currentLine(currentRow, oldCurrentRow) {
@@ -274,14 +293,23 @@ export default defineComponent({
         })
     }
 
+    function copyCode(value) {
+      copyToClipboard({
+        text: value.product.value,
+        isShowMessage: true
+      })
+    }
+
     return {
       // Ref
       searchProduct,
       // Computed
       lines,
+      currentRMA,
       listLineRMA,
       orderLineDefinition,
       // Methods
+      copyCode,
       exitLine,
       selectLine,
       deleteLine,
@@ -291,6 +319,7 @@ export default defineComponent({
       productFilter,
       updateQuantity,
       displayLabel,
+      displayValue,
       formatQuantity
     }
   }
diff --git a/src/components/ADempiere/Form/VPOS2/Options/RMA/infoRMA.vue b/src/components/ADempiere/Form/VPOS2/Options/RMA/infoRMA.vue
index 4ff1935a91d..9f2f8581c69 100644
--- a/src/components/ADempiere/Form/VPOS2/Options/RMA/infoRMA.vue
+++ b/src/components/ADempiere/Form/VPOS2/Options/RMA/infoRMA.vue
@@ -125,6 +125,7 @@ import { defineComponent, computed } from '@vue/composition-api'
 import { formatPrice } from '@/utils/ADempiere/formatValue/numberFormat'
 import { formatDate } from '@/utils/ADempiere/valueFormat.js'
 import { isEmptyValue } from '@/utils/ADempiere/valueUtils'
+import { formatQuantity } from '@/utils/ADempiere/formatValue/numberFormat'
 
 export default defineComponent({
   name: 'infoRMA',
@@ -172,6 +173,7 @@ export default defineComponent({
       // Methods
       display,
       formatDate,
+      formatQuantity,
       displayAmount
     }
   }
diff --git a/src/components/ADempiere/Form/VPOS2/Options/RMA/previwerRMA.vue b/src/components/ADempiere/Form/VPOS2/Options/RMA/previwerRMA.vue
index 090db63d127..39e867ae057 100644
--- a/src/components/ADempiere/Form/VPOS2/Options/RMA/previwerRMA.vue
+++ b/src/components/ADempiere/Form/VPOS2/Options/RMA/previwerRMA.vue
@@ -45,11 +45,46 @@ along with this program. If not, see <https:www.gnu.org/licenses/>.
               icon="el-icon-document-copy"
               @click="copyCode(scope.row)"
             />
-            {{ displayValue({ row: scope.row, columnName: valueOrder.columnName}) }}
+            <span v-if="scope.row.isEditQty && valueOrder.columnName === 'QtyEntered'">
+              <el-button v-if="scope.row.isLoading" :loading="scope.row.isLoading" />
+              <edit-qty-entered
+                v-else
+                :qty="Number(scope.row.quantity_ordered.value)"
+                :handle-change="updateQuantity"
+              />
+            </span>
+            <span v-else>
+              {{ displayValue({ row: scope.row, columnName: valueOrder.columnName }) }}
+            </span>
           </template>
         </el-table-column>
       </template>
+      <el-table-column
+        :label="$t('form.pos.tableProduct.options')"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="danger"
+            icon="el-icon-delete"
+            style="margin-left: 5px;"
+            :disabled="scope.row.isLoading"
+            :loading="scope.row.isLoading"
+            @click="deleteLine(scope.row)"
+          />
+        </template>
+      </el-table-column>
     </el-table>
+    <info-r-m-a />
+    <br>
+    <span v-if="isShowCheck" style="float: right;margin-top: 10px;">
+      <el-checkbox
+        v-model="isCreateNewSubstituteOrder"
+        :label="$t('form.pos.orderRMA.createNewSubstituteOrder')"
+        :border="true"
+        style="margin-right: 10px"
+      />
+    </span>
   </el-main>
 </template>
 
@@ -63,11 +98,13 @@ import editQtyEntered from '@/components/ADempiere/Form/VPOS2/MainOrder/OptionLi
 // Utils and Helper Methods
 import { formatQuantity } from '@/utils/ADempiere/formatValue/numberFormat'
 import {
-  displayLabel
+  displayLabel,
+  displayValue
 } from '@/utils/ADempiere/dictionary/form/VPOS'
+import { copyToClipboard } from '@/utils/ADempiere/coreUtils.js'
 
 export default defineComponent({
-  name: 'PreviwerRMA',
+  name: 'Shipments',
   components: {
     infoRMA,
     editQtyEntered
@@ -129,12 +166,6 @@ export default defineComponent({
           isNumeric: true,
           isVisible: true,
           size: '150px'
-        },
-        convertedAmount: {
-          columnName: 'ConvertedAmount',
-          label: lang.t('form.pos.collect.convertedAmount'),
-          isNumeric: true,
-          size: '150px'
         }
       }
     })
@@ -150,6 +181,33 @@ export default defineComponent({
       })
     })
 
+    const isShowCheck = computed(() => {
+      return store.getters.getAttributeRMA({
+        attribute: 'isShowCheck'
+      })
+    })
+
+    const currentRMA = computed(() => {
+      return store.getters.getAttributeRMA({
+        attribute: 'current'
+      })
+    })
+
+    const isCreateNewSubstituteOrder = computed({
+      get() {
+        return store.getters.getAttributeRMA({
+          attribute: 'isCreateNewSubstituteOrder'
+        })
+      },
+      // setter
+      set(show) {
+        store.commit('setAttributeRMA', {
+          attribute: 'isCreateNewSubstituteOrder',
+          value: show
+        })
+      }
+    })
+
     // Methods
 
     /**
@@ -172,31 +230,36 @@ export default defineComponent({
         id,
         quantity_ordered
       } = item
-      store.dispatch('createShipmentLine', {
+      store.dispatch('createRMALine', {
         quantity: quantity_ordered.value,
-        orderLineId: id
+        sourceOrderLineId: id
       })
     }
 
     function selectLine(row, column, event) {
-      const { property } = column
-      if (property === 'quantity') {
+      const { columnKey } = column
+      if (columnKey === 'QtyEntered') {
         row.isEditQty = true
       }
     }
 
     function exitLine(row, column, event) {
-      const { property } = column
-      if (property === 'quantity') {
+      const { columnKey } = column
+      if (columnKey === 'QtyEntered') {
         row.isEditQty = false
       }
     }
 
     function updateQuantity(quantity) {
+      line.value.isLoading = true
       store.dispatch('updateRMALine', {
         lineId: line.value.id,
         quantity
       })
+        .finally(() => {
+          line.value.isEditQty = false
+          line.value.isLoading = false
+        })
     }
 
     function currentLine(currentRow, oldCurrentRow) {
@@ -208,19 +271,30 @@ export default defineComponent({
       store.dispatch('deleteRMALine', {
         lineId: line.id
       })
-        .then(() => {
+        .finally(() => {
           line.isLoading = false
         })
     }
 
+    function copyCode(value) {
+      copyToClipboard({
+        text: value.product.value,
+        isShowMessage: true
+      })
+    }
+
     return {
       // Ref
       searchProduct,
       // Computed
       lines,
+      currentRMA,
       listLineRMA,
+      isShowCheck,
       orderLineDefinition,
+      isCreateNewSubstituteOrder,
       // Methods
+      copyCode,
       exitLine,
       selectLine,
       deleteLine,
@@ -230,6 +304,7 @@ export default defineComponent({
       productFilter,
       updateQuantity,
       displayLabel,
+      displayValue,
       formatQuantity
     }
   }
diff --git a/src/components/ADempiere/Form/VPOS2/Options/salesOrder.vue b/src/components/ADempiere/Form/VPOS2/Options/salesOrder.vue
index d97903c9125..4f61f1cadde 100644
--- a/src/components/ADempiere/Form/VPOS2/Options/salesOrder.vue
+++ b/src/components/ADempiere/Form/VPOS2/Options/salesOrder.vue
@@ -511,11 +511,12 @@ export default defineComponent({
     })
 
     const isRMA = computed(() => {
+      const { is_allows_return_order } = currentPointOfSales.value
       const { is_rma } = currentOrder.value
       if (!isEmptyValue(currentOrder.value.id)) {
-        return is_rma
+        return !is_rma
       }
-      return false
+      return is_allows_return_order
     })
 
     function newOrder() {
@@ -692,9 +693,6 @@ export default defineComponent({
               doneMethod: () => {
                 store.dispatch('processRMA')
               },
-              isDisabledDone: () => {
-                return isEmptyValue(store.getters.getCurrentShipment) || isEmptyValue(store.getters.getShipmentList)
-              },
               componentPath: () => import('@/components/ADempiere/Form/VPOS2/Options/RMA/previwerRMA.vue'),
               isShowed: true
             })
diff --git a/src/store/modules/ADempiere/form/VPOS/options.js b/src/store/modules/ADempiere/form/VPOS/options.js
index 270ff10928a..726bc7e36b1 100644
--- a/src/store/modules/ADempiere/form/VPOS/options.js
+++ b/src/store/modules/ADempiere/form/VPOS/options.js
@@ -34,7 +34,8 @@ import {
   createShipmentLine,
   updateShipmentLine,
   deleteShipmentLine,
-  printShipmentPreview
+  printShipmentPreview,
+  createOrderFromRMA
 } from '@/api/ADempiere/form/VPOS'
 // // Utils and Helper Methods
 import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js'
@@ -53,7 +54,9 @@ const options = {
   rma: {
     list: [],
     current: {},
-    listLine: []
+    listLine: [],
+    isShowCheck: false,
+    isCreateNewSubstituteOrder: true
   }
 }
 
@@ -708,12 +711,12 @@ export default {
               attribute: 'current',
               value: response
             })
-            dispatch('listShipmentLines')
-            resolve(response)
+            dispatch('listRMALine')
+              .finally(() => {
+                resolve(response)
+              })
           })
           .catch(error => {
-            commit('setShipment', {})
-            commit('setShipmentList', [])
             console.warn(`Create RMA: ${error.message}. Code: ${error.code}.`)
             let message = error.message
             if (!isEmptyValue(error.response) && !isEmptyValue(error.response.data.message)) {
@@ -756,7 +759,7 @@ export default {
           quantity
         })
           .then(response => {
-            dispatch('listRMALine')
+            dispatch('createRMA')
             resolve(response)
           })
           .catch(error => {
@@ -799,8 +802,10 @@ export default {
           quantity
         })
           .then(response => {
-            dispatch('listRMALine')
-            resolve(response)
+            dispatch('createRMA')
+              .finally(() => {
+                resolve(response)
+              })
           })
           .catch(error => {
             dispatch('listRMALine')
@@ -890,7 +895,7 @@ export default {
           lineId
         })
           .then(response => {
-            dispatch('listRMALine')
+            dispatch('createRMA')
             resolve(response)
           })
           .catch(error => {
@@ -911,14 +916,19 @@ export default {
       })
     },
     processRMA({
+      commit,
       getters,
       dispatch
     }) {
       return new Promise(resolve => {
         const currentPos = getters.getVPOS
+        const currentOrder = getters.getCurrentOrder
         const currentRMA = getters.getAttributeRMA({
           attribute: 'current'
         })
+        const isCreateNewSubstituteOrder = getters.getAttributeRMA({
+          attribute: 'isCreateNewSubstituteOrder'
+        })
         if (
           isEmptyValue(currentPos.id) ||
           isEmptyValue(currentRMA.id)
@@ -928,7 +938,37 @@ export default {
           rmaId: currentRMA.id
         })
           .then(response => {
+            commit('setAttributeRMA', {
+              attribute: 'isShowCheck',
+              value: true
+            })
             dispatch('listRMALine')
+            dispatch('overloadOrder', { order: currentOrder })
+            dispatch('setModalDialogVPOS', {
+              title: lang.t('form.pos.optionsPoinSales.salesOrder.newOrderFromRMA'),
+              type: 'success',
+              doneMethod: () => {
+                commit('setShowedModalDialogVPOS', {
+                  isShowed: false
+                })
+                commit('setAttributeRMA', {
+                  attribute: 'current',
+                  value: {}
+                })
+                commit('setAttributeRMA', {
+                  attribute: 'list',
+                  value: []
+                })
+                if (isCreateNewSubstituteOrder) {
+                  dispatch('createOrderFromRMA', {
+                    sourceRmaId: response.id,
+                    salesRepresentativeId: response.sales_representative.id
+                  })
+                }
+              },
+              componentPath: () => import('@/components/ADempiere/Form/VPOS2/Options/RMA/previwerRMA.vue'),
+              isShowed: true
+            })
             resolve(response)
           })
           .catch(error => {
@@ -939,6 +979,50 @@ export default {
               message = error.response.data.message
             }
 
+            showMessage({
+              type: 'error',
+              message,
+              showClose: true
+            })
+            dispatch('setModalDialogVPOS', {
+              title: message,
+              type: 'error',
+              doneMethod: () => {
+                dispatch('processRMA', {})
+              },
+              // TODO: Change to string and import dynamic in component
+              componentPath: () => import('@/components/ADempiere/Form/VPOS2/Options/RMA/previwerRMA.vue'),
+              isShowed: true
+            })
+            resolve({})
+          })
+      })
+    },
+    createOrderFromRMA({
+      dispatch,
+      getters
+    }, {
+      sourceRmaId,
+      salesRepresentativeId
+    }) {
+      return new Promise(resolve => {
+        const currentPos = getters.getVPOS
+        createOrderFromRMA({
+          posId: currentPos.id,
+          sourceRmaId,
+          salesRepresentativeId
+        })
+          .then(response => {
+            dispatch('overloadOrder', { order: response })
+            resolve(response)
+          })
+          .catch(error => {
+            console.warn(`Create Order from RMA: ${error.message}. Code: ${error.code}.`)
+            let message = error.message
+            if (!isEmptyValue(error.response) && !isEmptyValue(error.response.data.message)) {
+              message = error.response.data.message
+            }
+
             showMessage({
               type: 'error',
               message,
diff --git a/src/store/modules/ADempiere/form/VPOS/order.js b/src/store/modules/ADempiere/form/VPOS/order.js
index 9169bf927f3..0e0d6a602ed 100644
--- a/src/store/modules/ADempiere/form/VPOS/order.js
+++ b/src/store/modules/ADempiere/form/VPOS/order.js
@@ -327,7 +327,6 @@ export default {
         const pos = getters.getVPOS
         if (isEmptyValue(order)) resolve({})
         if (order.document_status.value === 'CO') {
-          dispatch('overloadOrder', { order })
           resolve({})
           return
         }
diff --git a/src/utils/ADempiere/dictionary/form/VPOS.js b/src/utils/ADempiere/dictionary/form/VPOS.js
index cf8f9cb41ab..2afaced5fc9 100644
--- a/src/utils/ADempiere/dictionary/form/VPOS.js
+++ b/src/utils/ADempiere/dictionary/form/VPOS.js
@@ -132,7 +132,7 @@ function displayLineDescription({
   } = row
   const isMobile = store.getters.device === 'mobile'
   if (isMobile) return product.name
-  if (resource_assignment.id > 0) return product.name + ' - (' + resource_assignment.name + ')'
+  if (!isEmptyValue(resource_assignment) && resource_assignment.id > 0) return product.name + ' - (' + resource_assignment.name + ')'
   if (charge.id > 0) return charge.name
   return product.value + ' - ' + product.name
 }