Switching from document type (#987)

* Switching from document type * minimal changes Co-authored-by: elsiosanchez <elsiossanches@gmail.com>
adempiere · Jul 14, 2021 · fe28675 · fe28675
1 parent 80b9e9e
commit fe28675
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 22 deletions.
diff --git a/src/api/ADempiere/form/price-checking.js b/src/api/ADempiere/form/price-checking.js
@@ -27,7 +27,8 @@ export function getProductPrice({
   name,
   posUuid,
   businessPartnerUuid,
-  validFrom
+  validFrom,
+  priceListUuid
 }) {
   return request({
     url: `${config.priceChecking.endpoint}/product-price`,
@@ -39,7 +40,8 @@ export function getProductPrice({
       name,
       pos_uuid: posUuid,
       business_partner_uuid: businessPartnerUuid,
-      valid_from: validFrom
+      valid_from: validFrom,
+      price_list_uuid: priceListUuid
     }
   })
     .then(productPriceResponse => {

diff --git a/src/components/ADempiere/Form/VPOS/Order/index.vue b/src/components/ADempiere/Form/VPOS/Order/index.vue
@@ -54,15 +54,15 @@
             </el-col>
             <el-col :span="5" :style="styleTab">
               <el-form-item>
-                <br>
+                <template slot="label" />
                 <el-dropdown
-                  v-if="!isEmptyValue(currentWarehouse)"
+                  v-if="!isEmptyValue(currentDocumentType)"
                   trigger="click"
-                  class="info-pos"
+                  style="padding-top: 10%;font-size: 15px;color: black;"
                   @command="changeDocumentType"
                 >
                   <span>
-                    <svg-icon icon-class="tree" />
+                    <icon class="el-icon-document" />
                     <b style="cursor: pointer"> {{ currentDocumentType.name }} </b>
                   </span>
                   <el-dropdown-menu slot="dropdown">
@@ -75,7 +75,6 @@
                     </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
-                <br>
               </el-form-item>
             </el-col>
             <el-col :span="isEmptyValue(currentOrder) ? 1 : 4" :style="isShowedPOSKeyLayout ? 'padding: 0px; margin-top: 3.%;' : 'padding: 0px; margin-top: 2.4%;'">

diff --git a/src/components/ADempiere/Form/VPOS/posMixin.js b/src/components/ADempiere/Form/VPOS/posMixin.js
@@ -359,17 +359,6 @@ export default {
             message: error.message,
             showClose: true
           })
-
-          this.$store.commit('updateValueOfField', {
-            containerUuid: 'Products-Price-List',
-            columnName: 'ProductValue',
-            value: `${searchProduct}`
-          })
-
-          this.$store.commit('showListProductPrice', {
-            attribute: 'isShowPopoverField',
-            isShowed: true
-          })
         })
         .finally(() => {
           this.$store.commit('updateValuesOfContainer', {

diff --git a/src/store/modules/ADempiere/pointOfSales/order/actions.js b/src/store/modules/ADempiere/pointOfSales/order/actions.js
@@ -37,13 +37,14 @@ export default {
   createOrder({ commit, dispatch, rootGetters }, {
     posUuid,
     customerUuid,
-    documentTypeUuid
+    documentTypeUuid,
+    warehouseUuid
   }) {
     return createOrder({
       posUuid,
       customerUuid,
-      warehouseUuid: rootGetters.currentWarehouse.uuid,
-      documentTypeUuid
+      documentTypeUuid,
+      warehouseUuid
     })
       .then(order => {
         commit('setOrder', order)
@@ -115,7 +116,13 @@ export default {
   }) {
     createOrderLine({
       orderUuid,
-      productUuid
+      warehouseUuid,
+      productUuid,
+      chargeUuid,
+      description,
+      quantity,
+      price,
+      discountRate
     })
       .then(orderLine => {
         dispatch('updateOrderLines', orderLine)