diff --git a/src/api/ADempiere/form/price-checking.js b/src/api/ADempiere/form/price-checking.js index bc74aace..e313ec18 100644 --- 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 index c83a353b..035bbc9a 100644 --- a/src/components/ADempiere/Form/VPOS/Order/index.vue +++ b/src/components/ADempiere/Form/VPOS/Order/index.vue @@ -54,15 +54,17 @@ -
+ - + {{ currentDocumentType.name }} @@ -75,7 +77,6 @@ -
diff --git a/src/components/ADempiere/Form/VPOS/posMixin.js b/src/components/ADempiere/Form/VPOS/posMixin.js index 29d5f9a8..d515933b 100644 --- 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 index 2d94eb65..e97b92a8 100644 --- 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)