From d63ef5aeb6a203b08f88aea86f46f0f68f9c6e09 Mon Sep 17 00:00:00 2001
From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com>
Date: Thu, 10 Dec 2020 19:01:49 -0400
Subject: [PATCH] Correct order search error (#561)

* Correct order search error
solve product list and order popover error

* add the option to cancel the order

* minimal change

* change leng
---
 src/api/ADempiere/form/point-of-sales.js      | 12 +++---
 .../ADempiere/Form/VPOS/Options/index.vue     | 25 +++++++++--
 .../ADempiere/Form/VPOS/OrderList/index.vue   | 16 ++++----
 .../ADempiere/Form/VPOS/ProductInfo/index.vue | 41 +++++++++++++------
 src/lang/ADempiere/en.js                      |  3 +-
 src/lang/ADempiere/es.js                      |  3 +-
 6 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/src/api/ADempiere/form/point-of-sales.js b/src/api/ADempiere/form/point-of-sales.js
index 8e2effae..f646d142 100644
--- a/src/api/ADempiere/form/point-of-sales.js
+++ b/src/api/ADempiere/form/point-of-sales.js
@@ -152,8 +152,8 @@ export function requestListOrders({
   isProcessed,
   isAisleSeller,
   isInvoiced,
-  dateOrderedFrom,
-  dateOrderedTo,
+  // dateOrderedFrom,
+  // dateOrderedTo,
   salesRepresentativeUuid,
   pageSize,
   pageToken
@@ -212,9 +212,9 @@ export function requestListOrders({
       is_paid: isPaid,
       is_processed: isProcessed,
       is_aisle_seller: isAisleSeller,
-      is_invoiced: isInvoiced,
-      date_ordered_from: dateOrderedFrom,
-      date_ordered_to: dateOrderedTo
+      is_invoiced: isInvoiced
+      // date_ordered_from: dateOrderedFrom,
+      // date_ordered_to: dateOrderedTo
     },
     params: {
       page_size: pageSize,
@@ -223,7 +223,7 @@ export function requestListOrders({
   })
     .then(evaluateResponse)
     .then(ordersListResponse => {
-      const { convertOrder } = require('@/utils/ADempiere/apiConverts/core.js')
+      const { convertOrder } = require('@/utils/ADempiere/apiConverts/pos.js')
 
       return {
         nextPageToken: ordersListResponse.next_page_token,
diff --git a/src/components/ADempiere/Form/VPOS/Options/index.vue b/src/components/ADempiere/Form/VPOS/Options/index.vue
index fc8297fb..931f743c 100644
--- a/src/components/ADempiere/Form/VPOS/Options/index.vue
+++ b/src/components/ADempiere/Form/VPOS/Options/index.vue
@@ -25,13 +25,11 @@
           <el-col :span="size">
             <el-card shadow="hover">
               <el-popover
-                v-model="isShowOrdersList"
                 placement="right"
                 width="800"
                 trigger="click"
               >
                 <orders-list
-                  v-if="isShowOrdersList"
                   :parent-metadata="metadata"
                 />
                 <p
@@ -106,7 +104,7 @@
               >
                 <i class="el-icon-printer" />
                 <br>
-                {{ $t('form.pos.optionsPoinSales.salesOrder.toPrint') }}
+                {{ $t('form.pos.optionsPoinSales.salesOrder.print') }}
               </p>
             </el-card>
           </el-col>
@@ -123,6 +121,18 @@
               </p>
             </el-card>
           </el-col>
+          <el-col :span="size">
+            <el-card shadow="hover">
+              <p
+                :style="blockOption"
+                @click="deleteOrder"
+              >
+                <i class="el-icon-close" />
+                <br>
+                {{ $t('form.pos.optionsPoinSales.salesOrder.cancelOrder') }}
+              </p>
+            </el-card>
+          </el-col>
         </el-row>
       </el-collapse-item>
 
@@ -259,7 +269,8 @@ import {
   requestReverseSalesTransaction,
   requestCreateWithdrawal,
   requestCreateNewCustomerReturnOrder,
-  requestCashClosing
+  requestCashClosing,
+  requestDeleteOrder
 } from '@/api/ADempiere/form/point-of-sales.js'
 
 export default {
@@ -428,6 +439,12 @@ export default {
         posId,
         posUuid
       })
+    },
+    deleteOrder() {
+      requestDeleteOrder({
+        orderUuid: this.$route.query.action
+      })
+      this.newOrder()
     }
   }
 }
diff --git a/src/components/ADempiere/Form/VPOS/OrderList/index.vue b/src/components/ADempiere/Form/VPOS/OrderList/index.vue
index 5208b413..1dab8de7 100644
--- a/src/components/ADempiere/Form/VPOS/OrderList/index.vue
+++ b/src/components/ADempiere/Form/VPOS/OrderList/index.vue
@@ -188,13 +188,13 @@ export default {
       }
     }
   },
-  watch: {
-    isReadyFromGetData(isToLoad) {
-      if (isToLoad) {
-        this.loadOrdersList()
-      }
-    }
-  },
+  // watch: {
+  //   isReadyFromGetData(isToLoad) {
+  //     if (isToLoad) {
+  //       this.loadOrdersList()
+  //     }
+  //   }
+  // },
   created() {
     this.unsubscribe = this.subscribeChanges()
 
@@ -223,7 +223,6 @@ export default {
       let values = this.$store.getters.getValuesView({
         containerUuid: this.metadata.containerUuid
       })
-
       values = this.convertValuesToSend(values)
 
       this.$store.dispatch('listOrdersFromServer', {
@@ -257,7 +256,6 @@ export default {
           !mutation.payload.columnName.includes('_UUID') &&
           mutation.payload.containerUuid === this.metadata.containerUuid) {
           clearTimeout(this.timeOut)
-
           this.timeOut = setTimeout(() => {
             this.loadOrdersList()
           }, 2000)
diff --git a/src/components/ADempiere/Form/VPOS/ProductInfo/index.vue b/src/components/ADempiere/Form/VPOS/ProductInfo/index.vue
index 04d790c5..f970813e 100644
--- a/src/components/ADempiere/Form/VPOS/ProductInfo/index.vue
+++ b/src/components/ADempiere/Form/VPOS/ProductInfo/index.vue
@@ -1,17 +1,13 @@
 <template>
   <div>
-    <el-popover
-      ref="productsList"
-      v-model="isShowProductsPriceList"
-      placement="right"
-      width="800"
-      trigger="manual"
-    >
-      <product-info-list
-        v-if="isShowProductsPriceList"
-      />
-    </el-popover>
-
+    <el-collapse-transition name="el-fade-in">
+      <el-card
+        v-show="isShowProductsPriceList"
+        class="transition-box"
+      >
+        <product-info-list />
+      </el-card>
+    </el-collapse-transition>
     <el-form-item>
       <template slot="label">
         Código Producto
@@ -108,6 +104,12 @@ export default {
   mixins: [
     fieldMixin
   ],
+  props: {
+    popoverName: {
+      type: String,
+      default: 'isShowPopoverField'
+    }
+  },
   data() {
     return {
       timeOut: null
@@ -137,7 +139,8 @@ export default {
     keyShortcuts() {
       return {
         refreshList: ['f5'],
-        refreshList2: ['shift', 'f5']
+        refreshList2: ['shift', 'f5'],
+        closeProductList: ['esc']
       }
     }
   },
@@ -150,6 +153,12 @@ export default {
         case 'refreshList2':
           this.$store.dispatch('listProductPriceFromServer', {})
           break
+        case 'closeProductList':
+          this.$store.commit('showListProductPrice', {
+            attribute: this.popoverName,
+            isShowed: false
+          })
+          break
       }
     },
     localSearch(stringToMatch, callBack) {
@@ -221,6 +230,12 @@ export default {
 </script>
 
 <style lang="scss" scope>
+  .transition-box {
+    z-index: 3;
+    position: absolute;
+    width: 800px;
+    left: 15%;
+  }
   .custom-field-prodcut-info {
     li {
       line-height: normal;
diff --git a/src/lang/ADempiere/en.js b/src/lang/ADempiere/en.js
index ab1ac2b6..783e5457 100644
--- a/src/lang/ADempiere/en.js
+++ b/src/lang/ADempiere/en.js
@@ -345,7 +345,8 @@ export default {
           completePreparedOrder: 'Complete Prepared Order',
           cancelSaleTransaction: 'Cancel Sale Transaction',
           createPos: 'Create Point of Sale Withdrawal',
-          toPrint: 'To Print'
+          print: 'Print Document',
+          cancelOrder: 'Cancel Order'
         },
         cashManagement: {
           title: 'Cash Management',
diff --git a/src/lang/ADempiere/es.js b/src/lang/ADempiere/es.js
index 39930048..0e6db59d 100644
--- a/src/lang/ADempiere/es.js
+++ b/src/lang/ADempiere/es.js
@@ -320,7 +320,8 @@ export default {
           completePreparedOrder: 'Completar Orden Preparada',
           cancelSaleTransaction: 'Anular Transacción de Venta',
           createPos: 'Crear Retiro de Punto de Venta',
-          toPrint: 'Imprimir'
+          print: 'Imprimir Documento',
+          cancelOrder: 'Cancelar Orden'
         },
         cashManagement: {
           title: 'Gestión de Caja',