diff --git a/src/components/ADempiere/Form/VPOS/Collection/index.vue b/src/components/ADempiere/Form/VPOS/Collection/index.vue index 504fb1ac..81d93e77 100644 --- a/src/components/ADempiere/Form/VPOS/Collection/index.vue +++ b/src/components/ADempiere/Form/VPOS/Collection/index.vue @@ -491,12 +491,12 @@ export default { }) }, currencyUuid(value) { - const alo = this.$store.getters.getConvertionRate.find(currency => { + const listCurrency = this.$store.getters.getConvertionRate.find(currency => { if (currency.uuid === value) { return currency } }) - if (alo === undefined) { + if (listCurrency === undefined) { this.$store.dispatch('conversionDivideRate', { conversionTypeUuid: this.currentPointOfSales.conversionTypeUuid, currencyFromUuid: this.pointOfSalesCurrency.uuid, @@ -536,7 +536,6 @@ export default { } }, created() { - console.log(this.$store.getters.getConvertionRate) this.$store.dispatch('addRateConvertion', this.pointOfSalesCurrency) this.unsubscribe = this.subscribeChanges() this.defaultValueCurrency() diff --git a/src/components/ADempiere/Form/VPOS/OrderList/index.vue b/src/components/ADempiere/Form/VPOS/OrderList/index.vue index d0a7fd83..6338dda2 100644 --- a/src/components/ADempiere/Form/VPOS/OrderList/index.vue +++ b/src/components/ADempiere/Form/VPOS/OrderList/index.vue @@ -248,14 +248,10 @@ export default { } }, loadOrdersList() { - let values = this.$store.getters.getValuesView({ - containerUuid: this.metadata.containerUuid - }) - values = this.convertValuesToSend(values) const point = this.$store.getters.posAttributes.currentPointOfSales.uuid if (!this.isEmptyValue(point)) { this.$store.dispatch('listOrdersFromServer', { - ...values + posUuid: point }) } }, @@ -294,55 +290,6 @@ export default { } }) }, - convertValuesToSend(values) { - const valuesToSend = {} - - values.forEach(element => { - const { value, columnName } = element - - if (this.isEmptyValue(value)) { - return - } - - switch (columnName) { - case 'DocumentNo': - valuesToSend['documentNo'] = value - break - case 'C_BPartner_ID_UUID': - valuesToSend['businessPartnerUuid'] = value - break - case 'GrandTotal': - valuesToSend['grandTotal'] = value - break - case 'OpenAmt': - valuesToSend['openAmount'] = value - break - case 'IsPaid': - valuesToSend['isPaid'] = value - break - case 'Processed': - valuesToSend['isProcessed'] = value - break - case 'IsAisleSeller': - valuesToSend['isAisleSeller'] = value - break - case 'IsInvoiced': - valuesToSend['isInvoiced'] = value - break - case 'DateOrderedFrom': - valuesToSend['dateOrderedFrom'] = value - break - case 'DateOrderedTo': - valuesToSend['dateOrderedTo'] = value - break - case 'SalesRep_ID_UUID': - valuesToSend['salesRepresentativeUuid'] = value - break - } - }) - - return valuesToSend - }, orderPrpcess(row) { const parametersList = [{ columnName: 'C_Order_ID', diff --git a/src/store/modules/ADempiere/pointOfSales/order/actions.js b/src/store/modules/ADempiere/pointOfSales/order/actions.js index 326b75cb..fcfb3ee3 100644 --- a/src/store/modules/ADempiere/pointOfSales/order/actions.js +++ b/src/store/modules/ADempiere/pointOfSales/order/actions.js @@ -21,7 +21,7 @@ import { requestCreateOrderLine, requestListOrders } from '@/api/ADempiere/form/point-of-sales.js' -import { isEmptyValue, extractPagingToken } from '@/utils/ADempiere/valueUtils.js' +import { isEmptyValue, extractPagingToken, convertValuesToSend } from '@/utils/ADempiere/valueUtils.js' import { showMessage } from '@/utils/ADempiere/notification.js' /** @@ -189,18 +189,7 @@ export default { dispatch('listOrdersFromServer', {}) }, listOrdersFromServer({ state, commit, getters }, { - posUuid, - documentNo, - businessPartnerUuid, - grandTotal, - openAmount, - isPaid, - isProcessed, - isAisleSeller, - isInvoiced, - dateOrderedFrom, - dateOrderedTo, - salesRepresentativeUuid + posUuid }) { if (isEmptyValue(posUuid)) { posUuid = getters.posAttributes.currentPointOfSales.uuid @@ -214,6 +203,11 @@ export default { if (!isEmptyValue(token)) { pageToken = token + '-' + pageNumber } + let values = getters.getValuesView({ + containerUuid: 'Orders-List' + }) + values = convertValuesToSend(values) + const { documentNo, businessPartnerUuid, grandTotal, openAmount, isPaid, isProcessed, isAisleSeller, isInvoiced, dateOrderedFrom, dateOrderedTo, salesRepresentativeUuid } = values requestListOrders({ posUuid, documentNo, diff --git a/src/store/modules/ADempiere/pointOfSales/payments/actions.js b/src/store/modules/ADempiere/pointOfSales/payments/actions.js index 0191b2fb..7ff87b38 100644 --- a/src/store/modules/ADempiere/pointOfSales/payments/actions.js +++ b/src/store/modules/ADempiere/pointOfSales/payments/actions.js @@ -112,7 +112,6 @@ export default { payment.splice(0) }, conversionDivideRate({ commit, dispatch }, params) { - console.log('conversionDivideRate') requestGetConversionRate({ conversionTypeUuid: params.conversionTypeUuid, currencyFromUuid: params.currencyFromUuid, diff --git a/src/utils/ADempiere/globalMethods.js b/src/utils/ADempiere/globalMethods.js index df423dc7..99d933a4 100644 --- a/src/utils/ADempiere/globalMethods.js +++ b/src/utils/ADempiere/globalMethods.js @@ -24,5 +24,6 @@ export { currencyFind, tenderTypeFind, formatConversionCurrenty, + convertValuesToSend, typeValue } from '@/utils/ADempiere/valueUtils.js' diff --git a/src/utils/ADempiere/valueUtils.js b/src/utils/ADempiere/valueUtils.js index 7ed18b4e..43a4ed83 100644 --- a/src/utils/ADempiere/valueUtils.js +++ b/src/utils/ADempiere/valueUtils.js @@ -558,3 +558,56 @@ export function formatConversionCurrenty(params) { } return params } +/** + * convert Values To Send + * @param {string, number, boolean, date} values + */ + +export function convertValuesToSend(values) { + const valuesToSend = {} + + values.forEach(element => { + const { value, columnName } = element + + if (isEmptyValue(value)) { + return + } + + switch (columnName) { + case 'DocumentNo': + valuesToSend['documentNo'] = value + break + case 'C_BPartner_ID_UUID': + valuesToSend['businessPartnerUuid'] = value + break + case 'GrandTotal': + valuesToSend['grandTotal'] = value + break + case 'OpenAmt': + valuesToSend['openAmount'] = value + break + case 'IsPaid': + valuesToSend['isPaid'] = value + break + case 'Processed': + valuesToSend['isProcessed'] = value + break + case 'IsAisleSeller': + valuesToSend['isAisleSeller'] = value + break + case 'IsInvoiced': + valuesToSend['isInvoiced'] = value + break + case 'DateOrderedFrom': + valuesToSend['dateOrderedFrom'] = value + break + case 'DateOrderedTo': + valuesToSend['dateOrderedTo'] = value + break + case 'SalesRep_ID_UUID': + valuesToSend['salesRepresentativeUuid'] = value + break + } + }) + return valuesToSend +}