From 8b1e0a834501294c3366746467b82e86ffdae60b Mon Sep 17 00:00:00 2001 From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com> Date: Tue, 24 Aug 2021 11:06:07 -0400 Subject: [PATCH] change the tender type service (#1113) * change the tender type service * display of the fields Co-authored-by: elsiosanchez --- src/api/ADempiere/form/point-of-sales.js | 2 +- .../VPOS/Collection/fieldsListCollection.js | 18 ++- .../Collection/overdrawnInvoice/index.vue | 110 +++++++++++++----- .../paymentTypeChange/ACH/fieldsListACH.js | 12 +- .../paymentTypeChange/ACH/index.vue | 3 +- .../paymentTypeChange/Cash/index.vue | 1 + .../MobilePayment/fieldsListMobilePayment.js | 8 +- .../paymentTypeChange/MobilePayment/index.vue | 1 + .../ADempiere/Form/VPOS/Order/index.vue | 8 +- .../ADempiere/Form/VPOS/posMixin.js | 2 + .../ADempiere/pos/typePayment/Mobile.jpg | Bin 0 -> 209526 bytes src/lang/ADempiere/en.js | 3 +- src/lang/ADempiere/es.js | 3 +- 13 files changed, 123 insertions(+), 48 deletions(-) create mode 100644 src/image/ADempiere/pos/typePayment/Mobile.jpg diff --git a/src/api/ADempiere/form/point-of-sales.js b/src/api/ADempiere/form/point-of-sales.js index b11c8e9b..121c96c5 100644 --- a/src/api/ADempiere/form/point-of-sales.js +++ b/src/api/ADempiere/form/point-of-sales.js @@ -910,7 +910,7 @@ export function listTenderTypes({ posUuid }) { return request({ - url: `${config.pointOfSales.endpoint}/available-tender-types`, + url: `${config.pointOfSales.endpoint}/available-payment-methods`, method: 'get', params: { pos_uuid: posUuid diff --git a/src/components/ADempiere/Form/VPOS/Collection/fieldsListCollection.js b/src/components/ADempiere/Form/VPOS/Collection/fieldsListCollection.js index 10a3d38a..68877aaa 100644 --- a/src/components/ADempiere/Form/VPOS/Collection/fieldsListCollection.js +++ b/src/components/ADempiere/Form/VPOS/Collection/fieldsListCollection.js @@ -61,7 +61,7 @@ export default [ handleActionKeyPerformed: true, handleActionPerformed: true, handleContentSelection: true, - displayLogic: `@TenderType@<>'X'`, + displayLogic: `@TenderType@<>'X'&@TenderType@<>'Z'`, size: 24, isActiveLogics: true, isMandatory: true @@ -168,5 +168,21 @@ export default [ isActiveLogics: true, isMandatory: true } + }, + { + elementColumnName: 'EMail', + columnName: 'EMail', + tableName: 'AD_user', + isFromDictionary: true, + overwriteDefinition: { + sequence: 4, + handleActionKeyPerformed: true, + handleContentSelection: true, + handleActionPerformed: true, + size: 24, + displayLogic: `@TenderType@=='Z'`, + isActiveLogics: true, + isMandatory: true + } } ] diff --git a/src/components/ADempiere/Form/VPOS/Collection/overdrawnInvoice/index.vue b/src/components/ADempiere/Form/VPOS/Collection/overdrawnInvoice/index.vue index ef19712a..f1a32172 100644 --- a/src/components/ADempiere/Form/VPOS/Collection/overdrawnInvoice/index.vue +++ b/src/components/ADempiere/Form/VPOS/Collection/overdrawnInvoice/index.vue @@ -32,6 +32,52 @@ {{ $t('form.pos.collect.overdrawnInvoice.adjustDocument') }} + +
+ {{ $t('form.pos.collect.overdrawnInvoice.above') }} + +
+
+ + +
+ +
+ + {{ payment.name }}
+ +
+
+ +
+ +
+ + +
+
+ +
+ + +
{{ $t('form.pos.collect.overdrawnInvoice.above') }} @@ -72,7 +118,7 @@
-
+
@@ -84,7 +130,7 @@
@@ -128,32 +174,17 @@
- - @@ -222,7 +253,7 @@ export default { computed: { componentRender() { let typePay - switch (this.selectionTypeRefund.key) { + switch (this.selectionTypeRefund.tender_type) { case 'P': typePay = () => import('./paymentTypeChange/MobilePayment/index') break @@ -243,7 +274,7 @@ export default { }, renderComponentContainer() { let container - switch (this.selectionTypeRefund.key) { + switch (this.selectionTypeRefund.tender_type) { case 'P': container = 'MobilePayment' break @@ -328,12 +359,20 @@ export default { return this.$store.getters.getFieldsListEmptyMandatory({ containerUuid: 'OverdrawnInvoice', formatReturn: 'name' }) }, paymentTypeList() { + return this.$store.getters.getPaymentTypeList.filter(type => type.is_allowed_to_refund_open) + }, + paymentTypeListRefund() { return this.$store.getters.getPaymentTypeList.filter(type => type.is_allowed_to_refund) }, refundLoaded() { return this.$store.getters.getRefundLoaded } }, + watch: { + option(value) { + this.selectionTypeRefund = {} + } + }, mounted() { this.selectionTypeRefund = {} }, @@ -342,9 +381,12 @@ export default { imageCard(typeRefund) { let image switch (typeRefund) { - case 'P': + case 'D': image = 'MobilePayment.jpg' break + case 'P': + image = 'Mobile.jpg' + break case 'X': image = 'Cash.jpg' break @@ -396,6 +438,7 @@ export default { }) this.$store.dispatch('addRefundLoaded', values) this.selectionTypeRefund = {} + this.success() }, success() { const customerDetails = [] @@ -458,13 +501,6 @@ export default { showClose: true }) }) - .catch(error => { - this.$message({ - type: 'error', - message: error.message, - showClose: true - }) - }) this.$store.commit('dialogoInvoce', { show: false, success: true }) } else { this.$message({ @@ -476,8 +512,22 @@ export default { } break default: - this.completePreparedOrder(posUuid, orderUuid, payments) - this.$store.commit('dialogoInvoce', { show: false, success: true }) + console.log(this.$store.getters.posAttributes.currentPointOfSales.isPosRequiredPin) + if (this.$store.getters.posAttributes.currentPointOfSales.isPosRequiredPin) { + const attributePin = { + posUuid, + orderUuid, + payments, + action: 'openBalanceInvoice', + type: 'actionPos', + label: this.$t('form.pos.pinMessage.invoiceOpen') + } + this.visible = true + this.$store.dispatch('changePopoverOverdrawnInvoice', { attributePin, visible: true }) + } else { + this.completePreparedOrder(posUuid, orderUuid, payments) + this.$store.commit('dialogoInvoce', { show: false, success: true }) + } break } }, diff --git a/src/components/ADempiere/Form/VPOS/Collection/overdrawnInvoice/paymentTypeChange/ACH/fieldsListACH.js b/src/components/ADempiere/Form/VPOS/Collection/overdrawnInvoice/paymentTypeChange/ACH/fieldsListACH.js index c783a33b..0e0eaca0 100644 --- a/src/components/ADempiere/Form/VPOS/Collection/overdrawnInvoice/paymentTypeChange/ACH/fieldsListACH.js +++ b/src/components/ADempiere/Form/VPOS/Collection/overdrawnInvoice/paymentTypeChange/ACH/fieldsListACH.js @@ -25,7 +25,7 @@ export default [ tabindex: '1', isFromDictionary: true, overwriteDefinition: { - sequence: 0, + sequence: 1, isCustomField: true, size: 24, isMandatory: true @@ -38,7 +38,7 @@ export default [ isFromDictionary: true, tabindex: '0', overwriteDefinition: { - sequence: 1, + sequence: 0, isCustomField: true, size: 24, isMandatory: true @@ -50,7 +50,7 @@ export default [ columnName: 'C_Bank_ID', isFromDictionary: true, overwriteDefinition: { - sequence: 6, + sequence: 3, handleActionKeyPerformed: true, handleActionPerformed: true, handleContentSelection: true, @@ -66,7 +66,7 @@ export default [ columnName: 'AccountNo', isFromDictionary: true, overwriteDefinition: { - sequence: 8, + sequence: 4, handleActionKeyPerformed: true, handleContentSelection: true, handleActionPerformed: true, @@ -81,7 +81,7 @@ export default [ tableName: 'AD_user', isFromDictionary: true, overwriteDefinition: { - sequence: 9, + sequence: 2, handleActionKeyPerformed: true, handleContentSelection: true, handleActionPerformed: true, @@ -96,7 +96,7 @@ export default [ columnName: 'PayAmt', isFromDictionary: true, overwriteDefinition: { - sequence: 3, + sequence: 6, handleContentSelection: true, handleActionPerformed: true, size: 24, diff --git a/src/components/ADempiere/Form/VPOS/Collection/overdrawnInvoice/paymentTypeChange/ACH/index.vue b/src/components/ADempiere/Form/VPOS/Collection/overdrawnInvoice/paymentTypeChange/ACH/index.vue index ceb58a29..2621dc9d 100644 --- a/src/components/ADempiere/Form/VPOS/Collection/overdrawnInvoice/paymentTypeChange/ACH/index.vue +++ b/src/components/ADempiere/Form/VPOS/Collection/overdrawnInvoice/paymentTypeChange/ACH/index.vue @@ -32,10 +32,11 @@ :metadata-field="field" /> - + - + - +