diff --git a/src/api/ADempiere/form/point-of-sales.js b/src/api/ADempiere/form/point-of-sales.js index 8e2effae..f646d142 100644 --- a/src/api/ADempiere/form/point-of-sales.js +++ b/src/api/ADempiere/form/point-of-sales.js @@ -152,8 +152,8 @@ export function requestListOrders({ isProcessed, isAisleSeller, isInvoiced, - dateOrderedFrom, - dateOrderedTo, + // dateOrderedFrom, + // dateOrderedTo, salesRepresentativeUuid, pageSize, pageToken @@ -212,9 +212,9 @@ export function requestListOrders({ is_paid: isPaid, is_processed: isProcessed, is_aisle_seller: isAisleSeller, - is_invoiced: isInvoiced, - date_ordered_from: dateOrderedFrom, - date_ordered_to: dateOrderedTo + is_invoiced: isInvoiced + // date_ordered_from: dateOrderedFrom, + // date_ordered_to: dateOrderedTo }, params: { page_size: pageSize, @@ -223,7 +223,7 @@ export function requestListOrders({ }) .then(evaluateResponse) .then(ordersListResponse => { - const { convertOrder } = require('@/utils/ADempiere/apiConverts/core.js') + const { convertOrder } = require('@/utils/ADempiere/apiConverts/pos.js') return { nextPageToken: ordersListResponse.next_page_token, diff --git a/src/components/ADempiere/Form/VPOS/Options/index.vue b/src/components/ADempiere/Form/VPOS/Options/index.vue index fc8297fb..931f743c 100644 --- a/src/components/ADempiere/Form/VPOS/Options/index.vue +++ b/src/components/ADempiere/Form/VPOS/Options/index.vue @@ -25,13 +25,11 @@


- {{ $t('form.pos.optionsPoinSales.salesOrder.toPrint') }} + {{ $t('form.pos.optionsPoinSales.salesOrder.print') }}

@@ -123,6 +121,18 @@

+ + +

+ +
+ {{ $t('form.pos.optionsPoinSales.salesOrder.cancelOrder') }} +

+
+
@@ -259,7 +269,8 @@ import { requestReverseSalesTransaction, requestCreateWithdrawal, requestCreateNewCustomerReturnOrder, - requestCashClosing + requestCashClosing, + requestDeleteOrder } from '@/api/ADempiere/form/point-of-sales.js' export default { @@ -428,6 +439,12 @@ export default { posId, posUuid }) + }, + deleteOrder() { + requestDeleteOrder({ + orderUuid: this.$route.query.action + }) + this.newOrder() } } } diff --git a/src/components/ADempiere/Form/VPOS/OrderList/index.vue b/src/components/ADempiere/Form/VPOS/OrderList/index.vue index 5208b413..1dab8de7 100644 --- a/src/components/ADempiere/Form/VPOS/OrderList/index.vue +++ b/src/components/ADempiere/Form/VPOS/OrderList/index.vue @@ -188,13 +188,13 @@ export default { } } }, - watch: { - isReadyFromGetData(isToLoad) { - if (isToLoad) { - this.loadOrdersList() - } - } - }, + // watch: { + // isReadyFromGetData(isToLoad) { + // if (isToLoad) { + // this.loadOrdersList() + // } + // } + // }, created() { this.unsubscribe = this.subscribeChanges() @@ -223,7 +223,6 @@ export default { let values = this.$store.getters.getValuesView({ containerUuid: this.metadata.containerUuid }) - values = this.convertValuesToSend(values) this.$store.dispatch('listOrdersFromServer', { @@ -257,7 +256,6 @@ export default { !mutation.payload.columnName.includes('_UUID') && mutation.payload.containerUuid === this.metadata.containerUuid) { clearTimeout(this.timeOut) - this.timeOut = setTimeout(() => { this.loadOrdersList() }, 2000) diff --git a/src/components/ADempiere/Form/VPOS/ProductInfo/index.vue b/src/components/ADempiere/Form/VPOS/ProductInfo/index.vue index 04d790c5..f970813e 100644 --- a/src/components/ADempiere/Form/VPOS/ProductInfo/index.vue +++ b/src/components/ADempiere/Form/VPOS/ProductInfo/index.vue @@ -1,17 +1,13 @@