From 90955acfc704cac83e41f5af68a0344e62d246ff Mon Sep 17 00:00:00 2001 From: elsiosanchez Date: Mon, 23 Aug 2021 19:26:05 -0400 Subject: [PATCH 1/3] show price base the info product --- src/components/ADempiere/Form/VPOS/Order/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ADempiere/Form/VPOS/Order/index.vue b/src/components/ADempiere/Form/VPOS/Order/index.vue index 4738975aec0..04d28148d72 100644 --- a/src/components/ADempiere/Form/VPOS/Order/index.vue +++ b/src/components/ADempiere/Form/VPOS/Order/index.vue @@ -177,7 +177,7 @@
{{ $t('form.productInfo.price') }}: - {{ formatPrice(scope.row.product.priceActual, pointOfSalesCurrency.iSOCode) }} + {{ formatPrice(scope.row.product.priceStandard, pointOfSalesCurrency.iSOCode) }}
{{ $t('form.productInfo.taxAmount') }}: {{ scope.row.taxIndicator }} From 5dbbb7f3ad5523a081ebf12a29252ebfc4f0c513 Mon Sep 17 00:00:00 2001 From: elsiosanchez Date: Mon, 23 Aug 2021 22:14:31 -0400 Subject: [PATCH 2/3] fixe style --- .../ADempiere/Form/VPOS/Order/index.vue | 17 ++++---- .../ADempiere/Form/VPOS/posMixin.js | 42 +++++++++---------- src/lang/ADempiere/en.js | 2 +- src/lang/ADempiere/es.js | 2 +- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/components/ADempiere/Form/VPOS/Order/index.vue b/src/components/ADempiere/Form/VPOS/Order/index.vue index 04d28148d72..e7a47f99b7c 100644 --- a/src/components/ADempiere/Form/VPOS/Order/index.vue +++ b/src/components/ADempiere/Form/VPOS/Order/index.vue @@ -145,13 +145,14 @@ popper-class="el-popper-info" placement="right-start" trigger="click" + width="300" :title="$t('form.productInfo.productInformation')" > - +
@@ -175,12 +176,14 @@ {{ $t('form.productInfo.description') }}: {{ scope.row.product.description }}
-
+
{{ $t('form.productInfo.price') }}: - {{ formatPrice(scope.row.product.priceStandard, pointOfSalesCurrency.iSOCode) }} + {{ formatPrice(scope.row.priceList, pointOfSalesCurrency.iSOCode) }}
- {{ $t('form.productInfo.taxAmount') }}: - {{ scope.row.taxIndicator }} + {{ scope.row.taxRate.name }} +
+ {{ $t('form.productInfo.grandTotal') }}: + {{ formatPrice((scope.row.priceList * scope.row.taxRate.rate / 100) + scope.row.priceList, pointOfSalesCurrency.iSOCode) }}
{{ $t('form.productInfo.quantityAvailable') }}: {{ formatQuantity(scope.row.quantityOrdered) }} @@ -979,7 +982,7 @@ export default { diff --git a/src/components/ADempiere/Form/VPOS/posMixin.js b/src/components/ADempiere/Form/VPOS/posMixin.js index ca244016fbe..5b7dfd75181 100644 --- a/src/components/ADempiere/Form/VPOS/posMixin.js +++ b/src/components/ADempiere/Form/VPOS/posMixin.js @@ -548,31 +548,29 @@ export default { return this.formatPrice(this.currentOrder.grandTotal - this.currentOrder.totalLines, currency) }, deleteOrderLine(lineSelection) { - if (this.isPosRequiredPin) { - if (this.allowsModifyQuantity) { - deleteOrderLine({ - orderLineUuid: lineSelection.uuid + if (this.currentPointOfSales.isAllowsModifyQuantity) { + deleteOrderLine({ + orderLineUuid: lineSelection.uuid + }) + .then(response => { + this.$store.dispatch('reloadOrder', { orderUuid: this.$store.getters.posAttributes.currentPointOfSales.currentOrder.uuid }) }) - .then(response => { - this.$store.dispatch('reloadOrder', { orderUuid: this.$store.getters.posAttributes.currentPointOfSales.currentOrder.uuid }) - }) - .catch(error => { - console.error(error.message) - this.$message({ - type: 'error', - message: error.message, - showClose: true - }) + .catch(error => { + console.error(error.message) + this.$message({ + type: 'error', + message: error.message, + showClose: true }) - } else { - const attributePin = { - ...lineSelection, - type: 'deleteLine', - label: this.$t('form.pos.pinMessage.delete') - } - this.$store.dispatch('changePopoverOverdrawnInvoice', { attributePin, visible: true }) - this.visible = true + }) + } else { + const attributePin = { + ...lineSelection, + type: 'deleteLine', + label: this.$t('form.pos.pinMessage.delete') } + this.$store.dispatch('changePopoverOverdrawnInvoice', { attributePin, visible: true }) + this.visible = true } }, subscribeChanges() { diff --git a/src/lang/ADempiere/en.js b/src/lang/ADempiere/en.js index cb3e3796e8d..e308e541f79 100644 --- a/src/lang/ADempiere/en.js +++ b/src/lang/ADempiere/en.js @@ -548,7 +548,7 @@ export default { taxAmount: 'Tax Amount', grandTotal: 'Grand Total', grandTotalConverted: 'Grand Total Converted', - quantityAvailable: 'Quantity Avalible', + quantityAvailable: 'Quantity', upc: 'UPC / EAN' }, guideSteps: { diff --git a/src/lang/ADempiere/es.js b/src/lang/ADempiere/es.js index 7c701801591..0c67829709d 100644 --- a/src/lang/ADempiere/es.js +++ b/src/lang/ADempiere/es.js @@ -524,7 +524,7 @@ export default { taxAmount: 'Monto de Impuesto', grandTotal: 'Total General', grandTotalConverted: 'Gran Total Convertido', - quantityAvailable: 'Cantidad Disponible', + quantityAvailable: 'Cantidad', upc: 'Código de Barras' }, guideSteps: { From 83730838a329319d7edf25f3ed277a9bbe1122bc Mon Sep 17 00:00:00 2001 From: elsiosanchez Date: Tue, 24 Aug 2021 00:27:07 -0400 Subject: [PATCH 3/3] minimal changes --- src/lang/ADempiere/en.js | 2 +- src/lang/ADempiere/es.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/ADempiere/en.js b/src/lang/ADempiere/en.js index e308e541f79..890e33999f5 100644 --- a/src/lang/ADempiere/en.js +++ b/src/lang/ADempiere/en.js @@ -548,7 +548,7 @@ export default { taxAmount: 'Tax Amount', grandTotal: 'Grand Total', grandTotalConverted: 'Grand Total Converted', - quantityAvailable: 'Quantity', + quantityAvailable: 'Available', upc: 'UPC / EAN' }, guideSteps: { diff --git a/src/lang/ADempiere/es.js b/src/lang/ADempiere/es.js index 0c67829709d..57918408f55 100644 --- a/src/lang/ADempiere/es.js +++ b/src/lang/ADempiere/es.js @@ -524,7 +524,7 @@ export default { taxAmount: 'Monto de Impuesto', grandTotal: 'Total General', grandTotalConverted: 'Gran Total Convertido', - quantityAvailable: 'Cantidad', + quantityAvailable: 'Disponible', upc: 'Código de Barras' }, guideSteps: {