diff --git a/src/components/ADempiere/Form/VPOS/Collection/fieldsListCollection.js b/src/components/ADempiere/Form/VPOS/Collection/fieldsListCollection.js index 779d5de4..76f48962 100644 --- a/src/components/ADempiere/Form/VPOS/Collection/fieldsListCollection.js +++ b/src/components/ADempiere/Form/VPOS/Collection/fieldsListCollection.js @@ -4,6 +4,7 @@ export default [ // Amont { tableName, + elementColumnName: 'PayAmt', columnName: 'PayAmt', isFromDictionary: true, overwriteDefinition: { @@ -17,6 +18,7 @@ export default [ // TenderType { tableName, + elementColumnName: 'TenderType', columnName: 'TenderType', isFromDictionary: true, overwriteDefinition: { @@ -32,6 +34,7 @@ export default [ // Bank { tableName, + elementColumnName: 'C_Bank_ID', columnName: 'C_Bank_ID', isFromDictionary: true, overwriteDefinition: { @@ -79,6 +82,7 @@ export default [ // ReferenceNo { tableName: 'HR_Attribute', + elementColumnName: 'ReferenceNo', columnName: 'ReferenceNo', isFromDictionary: true, overwriteDefinition: { @@ -94,7 +98,8 @@ export default [ // type credit card { tableName, - columnName: 'creditcardtype', + elementColumnName: 'CreditCardType', + columnName: 'CreditCardType', isFromDictionary: true, overwriteDefinition: { defaultValue: 'M', @@ -110,7 +115,8 @@ export default [ // number credit card { tableName, - columnName: 'creditcardnumber', + elementColumnName: 'CreditCardNumber', + columnName: 'CreditCardNumber', isFromDictionary: true, overwriteDefinition: { handleActionKeyPerformed: true, @@ -125,7 +131,8 @@ export default [ // accountno { tableName, - columnName: 'accountno', + elementColumnName: 'AccountNo', + columnName: 'AccountNo', isFromDictionary: true, overwriteDefinition: { handleActionKeyPerformed: true, diff --git a/src/components/ADempiere/Form/VPOS/Order/fieldsListOrder.js b/src/components/ADempiere/Form/VPOS/Order/fieldsListOrder.js index e63f3e28..e30b95a1 100644 --- a/src/components/ADempiere/Form/VPOS/Order/fieldsListOrder.js +++ b/src/components/ADempiere/Form/VPOS/Order/fieldsListOrder.js @@ -7,6 +7,7 @@ export default [ overwriteDefinition: { size: 24, sequence: 10, + handleActionPerformed: true, handleActionKeyPerformed: true } }, diff --git a/src/components/ADempiere/Form/VPOS/Order/index.vue b/src/components/ADempiere/Form/VPOS/Order/index.vue index 1ee35977..c9897837 100644 --- a/src/components/ADempiere/Form/VPOS/Order/index.vue +++ b/src/components/ADempiere/Form/VPOS/Order/index.vue @@ -50,12 +50,14 @@ - + {{ formatPrice(order.grandTotal, currencyPoint.iSOCode) }} -

@@ -324,10 +326,16 @@ export default { ], data() { return { - fieldsList: fieldsListOrder + fieldsList: fieldsListOrder, + seeConversion: false } }, computed: { + shortsKey() { + return { + popoverConvet: ['ctrl', 'x'] + } + }, isShowedPOSKeyLayout: { get() { return this.$store.getters.getShowPOSKeyLayout @@ -484,6 +492,11 @@ export default { this.$store.dispatch('listOrderLine', []) }) + }, + open() { + if (!this.seeConversion) { + this.seeConversion = true + } } } } @@ -637,4 +650,11 @@ export default { float: right; padding-left: 9px; } + .transition-box { + z-index: 1; + width: auto; + position: fixed; + bottom: 5%; + right: 5%; + } diff --git a/src/components/ADempiere/Form/VPOS/ProductInfo/fieldsList.js b/src/components/ADempiere/Form/VPOS/ProductInfo/fieldsList.js index b534a725..28a10626 100644 --- a/src/components/ADempiere/Form/VPOS/ProductInfo/fieldsList.js +++ b/src/components/ADempiere/Form/VPOS/ProductInfo/fieldsList.js @@ -6,7 +6,8 @@ export default [ isFromDictionary: true, overwriteDefinition: { size: 24, - sequence: 10 + sequence: 10, + handleActionKeyPerformed: true } } ] diff --git a/src/components/ADempiere/Form/VPOS/ProductInfo/index.vue b/src/components/ADempiere/Form/VPOS/ProductInfo/index.vue index 6d860e22..eca06f85 100644 --- a/src/components/ADempiere/Form/VPOS/ProductInfo/index.vue +++ b/src/components/ADempiere/Form/VPOS/ProductInfo/index.vue @@ -28,6 +28,7 @@ style="width: 100%;" popper-class="custom-field-prodcut-info" :fetch-suggestions="localSearch" + :select-when-unmatched="true" @shortkey.native="shortcutKeyMethod" @select="handleSelect" > @@ -216,7 +217,7 @@ export default { callBack(results) }, handleSelect(elementSelected) { - const valueProduct = elementSelected.product.value + const valueProduct = this.isEmptyValue(elementSelected.product) ? elementSelected.value : elementSelected.product.value this.$store.dispatch('notifyActionKeyPerformed', { containerUuid: 'POS', columnName: 'ProductValue', diff --git a/src/components/ADempiere/Form/VPOS/posMixin.js b/src/components/ADempiere/Form/VPOS/posMixin.js index f54a556e..8a94268b 100644 --- a/src/components/ADempiere/Form/VPOS/posMixin.js +++ b/src/components/ADempiere/Form/VPOS/posMixin.js @@ -2,7 +2,8 @@ import { findProduct, requestCreateOrder, requestGetOrder, - requestUpdateOrder + requestUpdateOrder, + requestUpdateOrderLine } from '@/api/ADempiere/form/point-of-sales.js' import { formatDate, @@ -440,6 +441,64 @@ export default { } } }) + }, + mas() { + this.$refs.linesTable.setCurrentRow(this.listOrderLine[1]) + }, + menos() { + this.$refs.linesTable.setCurrentRow(this.listOrderLine[0]) + }, + shortcutKeyMethod(event) { + console.log(event.srcKey) + switch (event.srcKey) { + // case 'options': + case 'up': + this.arrowTop() + break + case 'popoverConvet': + this.seeConversion = !this.seeConversion + break + case 'down': + this.arrowBottom() + break + case 'plus': + requestUpdateOrderLine({ + orderLineUuid: this.currentOrderLine.uuid, + quantity: this.listOrderLine[this.currentTable].quantity + 1 + }) + .then(response => { + this.fillOrderLine(response) + this.reloadOrder(true) + }) + .catch(error => { + console.error(error.message) + this.$message({ + type: 'error', + message: error.message, + showClose: true + }) + }) + + break + case 'minus': + requestUpdateOrderLine({ + orderLineUuid: this.currentOrderLine.uuid, + quantity: this.listOrderLine[this.currentTable].quantity - 1 + }) + .then(response => { + this.fillOrderLine(response) + this.reloadOrder(true) + }) + .catch(error => { + console.error(error.message) + this.$message({ + type: 'error', + message: error.message, + showClose: true + }) + }) + break + } } } }