Fix: Update Line Total Amount With Tax (#1812)

* Fix: Update Line Total Amount With Tax * Search Product List
solop-develop · Dec 29, 2023 · 23e48a2 · 23e48a2
1 parent b706dbd
commit 23e48a2
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/src/components/ADempiere/Form/VPOS2/HeaderOrder/ProductInfo/ProductListTable.vue b/src/components/ADempiere/Form/VPOS2/HeaderOrder/ProductInfo/ProductListTable.vue
@@ -115,6 +115,14 @@ along with this program. If not, see <https:www.gnu.org/licenses/>.
         :disabled="isEmptyValue(selectProduct)"
         @click="addProduct(selectProduct)"
       />
+      <el-button
+        :loading="isLoadingRecords"
+        type="success"
+        class="button-base-icon"
+        style="float: right;margin-left: 5px;"
+        icon="el-icon-refresh-right"
+        @click="refresh();"
+      />
       <el-button
         type="danger"
         class="button-base-icon"
@@ -149,6 +157,7 @@ export default defineComponent({
      */
     const searchValue = ref('')
     const isLoading = ref(false)
+    const isLoadingRecords = ref(false)
     const pageSizeNumber = ref(15)
     const selection = ref(0)
     const selectProduct = ref({})
@@ -257,13 +266,27 @@ export default defineComponent({
       }, 500)
     }
 
+    function refresh() {
+      isLoading.value = true
+      isLoadingRecords.value = true
+      store.dispatch('searchProductList', {
+        searchValue: searchValue.value,
+        pageSize: pageSizeNumber.value
+      })
+        .finally(() => {
+          isLoading.value = false
+          isLoadingRecords.value = false
+        })
+    }
+
     return {
       // Ref
       selection,
       isLoading,
       searchValue,
       selectProduct,
       pageSizeNumber,
+      isLoadingRecords,
       // Computed
       listProducto,
       recordCount,
@@ -277,6 +300,7 @@ export default defineComponent({
       searchProduct,
       addProduct,
       copyCode,
+      refresh,
       close
     }
   }

diff --git a/src/components/ADempiere/Form/VPOS2/HeaderOrder/ProductInfo/SearchProduct.vue b/src/components/ADempiere/Form/VPOS2/HeaderOrder/ProductInfo/SearchProduct.vue
@@ -211,6 +211,10 @@ export default defineComponent({
 
     function showPopever() {
       show.value = true
+      store.dispatch('searchProductList', {
+        searchValue: searchProduct.value,
+        pageSize: 15
+      })
     }
 
     watch(productList, (newValue, oldValue) => {

diff --git a/src/components/ADempiere/Form/VPOS2/MainOrder/index.vue b/src/components/ADempiere/Form/VPOS2/MainOrder/index.vue
@@ -277,6 +277,7 @@ export default defineComponent({
             })
               .then(updateLineResponse => {
                 currentLine.value.price = updateLineResponse.price
+                currentLine.value.total_amount_with_tax = updateLineResponse.total_amount_with_tax
                 isLoadingQty.value = false
                 currentLine.value.isEditCurrentPrice = false
               })
@@ -299,6 +300,7 @@ export default defineComponent({
       })
         .then(updateLineResponse => {
           currentLine.value.price = updateLineResponse.price
+          currentLine.value.total_amount_with_tax = updateLineResponse.total_amount_with_tax
           isLoadingPrice.value = false
           currentLine.value.isEditCurrentPrice = false
         })
@@ -320,6 +322,7 @@ export default defineComponent({
             })
               .then(updateLineResponse => {
                 currentLine.value.quantity_ordered = updateLineResponse.quantity_ordered
+                currentLine.value.total_amount_with_tax = updateLineResponse.total_amount_with_tax
                 isLoadingQty.value = false
                 currentLine.value.isEditQtyEntered = false
               })
@@ -341,6 +344,7 @@ export default defineComponent({
       })
         .then(updateLineResponse => {
           currentLine.value.quantity_ordered = updateLineResponse.quantity_ordered
+          currentLine.value.total_amount_with_tax = updateLineResponse.total_amount_with_tax
           isLoadingQty.value = false
           currentLine.value.isEditQtyEntered = false
         })
@@ -366,6 +370,7 @@ export default defineComponent({
             })
               .then(updateLineResponse => {
                 currentLine.value.discount_rate = updateLineResponse.discount_rate
+                currentLine.value.total_amount_with_tax = updateLineResponse.total_amount_with_tax
                 currentLine.value.isEditDiscount = false
                 isLoadingDiscount.value = false
               })
@@ -387,6 +392,7 @@ export default defineComponent({
       })
         .then(updateLineResponse => {
           currentLine.value.discount_rate = updateLineResponse.discount_rate
+          currentLine.value.total_amount_with_tax = updateLineResponse.total_amount_with_tax
           currentLine.value.isEditDiscount = false
           isLoadingDiscount.value = false
         })