PanJiaChen#2840 (#2870)

solop-develop · Oct 24, 2024 · 8726fc7 · 8726fc7
1 parent e63544d
commit 8726fc7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/src/components/ADempiere/Form/VPOS2/FooterOrder/ButtonGroupOptions.vue b/src/components/ADempiere/Form/VPOS2/FooterOrder/ButtonGroupOptions.vue
@@ -34,9 +34,10 @@ along with this program. If not, see <https:www.gnu.org/licenses/>.
         style="font-size: 12px;"
       />
       <el-button
-        v-show="!isEmptyValue(order)"
+        v-show="!isEmptyValue(order) && !isEmptyValue(currentLine)"
         type="danger"
         icon="el-icon-delete"
+        @click="deleteOrderLine(currentLine)"
       />
       <el-button
         v-show="!isEmptyValue(order)"
@@ -71,6 +72,10 @@ export default defineComponent({
       return store.getters.getCurrentOrder
     })
 
+    const currentLine = computed(() => {
+      return store.getters.getCurrentLine
+    })
+
     function releaseOrder(order) {
       store.dispatch('releaseCurrentOrder', { order })
     }
@@ -84,10 +89,18 @@ export default defineComponent({
       })
     }
 
+    function deleteOrderLine(line) {
+      store.dispatch('deleteCurrentLine', {
+        lineId: line
+      })
+    }
+
     return {
       order,
+      currentLine,
       // isEmptyValue,
       releaseOrder,
+      deleteOrderLine,
       openShowCollections
     }
   }

diff --git a/src/store/modules/ADempiere/form/VPOS/index.js b/src/store/modules/ADempiere/form/VPOS/index.js
@@ -134,6 +134,11 @@ export default {
     }) {
       return new Promise(resolve => {
         const currentPos = getters.getVPOS
+        const lisVPOS = getters.getLisVPOS
+        if (!isEmptyValue(lisVPOS)) {
+          resolve(lisVPOS)
+          return
+        }
         listPointOfSales()
           .then(response => {
             const { selling_points } = response
@@ -163,9 +168,6 @@ export default {
             })
             resolve([])
           })
-          .finally(() => {
-            dispatch('availablePaymentMethods')
-          })
       })
     },
     /**

diff --git a/src/store/modules/ADempiere/form/VPOS/order.js b/src/store/modules/ADempiere/form/VPOS/order.js
@@ -466,7 +466,8 @@ export default {
                 orderId: response.id
               }
             }, () => {})
-            dispatch('overloadOrder', { order: response })
+            dispatch('currentOrder', response)
+            // dispatch('overloadOrder', { order: response })
             resolve({})
           })
           .catch(error => {