Fix: Maximun Line DIscount Allowed (#1893)

solop-develop · Jan 30, 2024 · 351790e · 351790e
1 parent 9e9132e
commit 351790e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/src/components/ADempiere/Form/VPOS2/DialogInfo/pin.vue b/src/components/ADempiere/Form/VPOS2/DialogInfo/pin.vue
@@ -115,6 +115,8 @@ export default defineComponent({
       const { srcKey } = event
       if (srcKey === 'close') {
         closeDialog()
+      } else if (srcKey === 'enter') {
+        doneButton()
       }
     }
 

diff --git a/src/components/ADempiere/Form/VPOS2/MainOrder/index.vue b/src/components/ADempiere/Form/VPOS2/MainOrder/index.vue
@@ -358,12 +358,12 @@ export default defineComponent({
         })
     }
     function updateDiscount(discount_rate) {
-      const { is_allows_modify_discount } = currentPos.value
+      const { is_allows_modify_discount, maximum_line_discount_allowed } = currentPos.value
       const {
         quantity_ordered
       } = currentLine.value
       isLoadingDiscount.value = true
-      if (!is_allows_modify_discount) {
+      if (!is_allows_modify_discount || (Number(maximum_line_discount_allowed) !== 0 && discount_rate > Number(maximum_line_discount_allowed))) {
         store.dispatch('setModalPin', {
           title: lang.t('form.pos.pinMessage.pin') + lang.t('form.pos.pinMessage.qtyEntered'),
           doneMethod: () => {

diff --git a/src/components/ADempiere/FormDefinition/ExpressMovement/index.vue b/src/components/ADempiere/FormDefinition/ExpressMovement/index.vue
@@ -312,7 +312,7 @@ export default defineComponent({
      * Computed
      */
     const listProdcut = computed(() => {
-      return store.getters.getListProduct
+      return store.getters.getListProductExpressMovement
     })
     const listMovementLines = computed(() => {
       return store.getters.getListMovementLines

diff --git a/src/store/modules/ADempiere/form/VPOS/index.js b/src/store/modules/ADempiere/form/VPOS/index.js
@@ -429,9 +429,9 @@ export default {
     getListCampaigns: (state) => {
       return state.listCampaigns
     },
-    getListSellers: (state) => {
-      return state.listSellers
-    },
+    // getListSellers: (state) => {
+    //   return state.listSellers
+    // },
     getListDocumentTypes: (state) => {
       return state.listDocumentTypes
     },

diff --git a/src/store/modules/ADempiere/form/expressMovement.js b/src/store/modules/ADempiere/form/expressMovement.js
@@ -252,7 +252,7 @@ export default {
     }
   },
   getters: {
-    getListProduct(state) {
+    getListProductExpressMovement(state) {
       return state.listProduct
     },
     getListMovementLines(state) {