diff --git a/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml b/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml
--- a/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml
+++ b/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml
@@ -137,6 +137,10 @@
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -2305,6 +2305,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -851,6 +851,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ b/src-db/database/sourcedata/AD_FIELD.xml
@@ -3484,6 +3484,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -4623,6 +4623,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/org.openbravo.retail.posterminal/js/components/keypadcoins.js b/web/org.openbravo.retail.posterminal/js/components/keypadcoins.js
--- a/web/org.openbravo.retail.posterminal/js/components/keypadcoins.js
+++ b/web/org.openbravo.retail.posterminal/js/components/keypadcoins.js
@@ -219,18 +219,45 @@
break;
}
}
- myWindowModel.addPayment(new OB.Model.PaymentLine({
- kind: me.paymenttype,
- name: OB.POS.modelterminal.getPaymentName(me.paymenttype),
- amount: OB.DEC.number(me.amount),
- rate: p.rate,
- mulrate: p.mulrate,
- isocode: p.isocode,
- isCash: isCash,
- allowOpenDrawer: allowOpenDrawer,
- openDrawer: openDrawer,
- printtwice: printtwice
- }));
+ // Calculate total amount to pay with selected PaymentMethod
+ var amountToPay = me.amount;
+ var receiptToPay = myWindowModel.isValidMultiOrderState() ? multiOrders : receipt;
+ if (receiptToPay.get("payments").length > 0) {
+ receiptToPay.get("payments").each(function (item) {
+ if (item.get("kind") === me.paymenttype) {
+ amountToPay += item.get("amount");
+ }
+ });
+ }
+ // Check Max. Limit Amount
+ var paymentMethod = OB.POS.terminal.terminal.paymentnames[this.paymenttype].paymentMethod;
+ if (paymentMethod.maxLimitAmount && amountToPay > paymentMethod.maxLimitAmount) {
+ // Show error and abort payment
+ this.bubble('onMaxLimitAmountError', {
+ show: true,
+ maxLimitAmount: paymentMethod.maxLimitAmount,
+ currency: paymentMethod.currency$_identifier === 'EUR' ? '€' : paymentMethod.currency$_identifier
+ });
+ } else {
+ // Hide error and process payment
+ this.bubble('onMaxLimitAmountError', {
+ show: false,
+ maxLimitAmount: 0,
+ currency: ''
+ });
+ myWindowModel.addPayment(new OB.Model.PaymentLine({
+ kind: me.paymenttype,
+ name: OB.POS.modelterminal.getPaymentName(me.paymenttype),
+ amount: OB.DEC.number(me.amount),
+ rate: p.rate,
+ mulrate: p.mulrate,
+ isocode: p.isocode,
+ isCash: isCash,
+ allowOpenDrawer: allowOpenDrawer,
+ openDrawer: openDrawer,
+ printtwice: printtwice
+ }));
+ }
}
}
});
\ No newline at end of file
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js
@@ -109,18 +109,43 @@
}
});
} else {
- this.model.addPayment(new OB.Model.PaymentLine({
- 'kind': key,
- 'name': name,
- 'amount': amount,
- 'rate': rate,
- 'mulrate': mulrate,
- 'isocode': isocode,
- 'allowOpenDrawer': paymentMethod.allowopendrawer,
- 'isCash': paymentMethod.iscash,
- 'openDrawer': paymentMethod.openDrawer,
- 'printtwice': paymentMethod.printtwice
- }));
+ // Calculate total amount to pay with selected PaymentMethod
+ var amountToPay = amount;
+ if (receiptToPay.get("payments").length > 0) {
+ receiptToPay.get("payments").each(function (item) {
+ if (item.get("kind") === key) {
+ amountToPay += item.get("amount");
+ }
+ });
+ }
+ // Check Max. Limit Amount
+ if (paymentMethod.maxLimitAmount && amountToPay > paymentMethod.maxLimitAmount) {
+ // Show error and abort payment
+ this.bubble('onMaxLimitAmountError', {
+ show: true,
+ maxLimitAmount: paymentMethod.maxLimitAmount,
+ currency: paymentMethod.currency$_identifier === 'EUR' ? '€' : paymentMethod.currency$_identifier
+ });
+ } else {
+ // Hide error and process payment
+ this.bubble('onMaxLimitAmountError', {
+ show: false,
+ maxLimitAmount: 0,
+ currency: ''
+ });
+ this.model.addPayment(new OB.Model.PaymentLine({
+ 'kind': key,
+ 'name': name,
+ 'amount': amount,
+ 'rate': rate,
+ 'mulrate': mulrate,
+ 'isocode': isocode,
+ 'allowOpenDrawer': paymentMethod.allowopendrawer,
+ 'isCash': paymentMethod.iscash,
+ 'openDrawer': paymentMethod.openDrawer,
+ 'printtwice': paymentMethod.printtwice
+ }));
+ }
}
}
},
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
@@ -15,7 +15,8 @@
receipt: null
},
handlers: {
- onButtonStatusChanged: 'buttonStatusChanged'
+ onButtonStatusChanged: 'buttonStatusChanged',
+ onMaxLimitAmountError: 'maxLimitAmountError'
},
getSelectedPayment: function () {
if (this.receipt && this.receipt.selectedPayment) {
@@ -29,6 +30,14 @@
if (_.isUndefined(payment)) {
return true;
}
+ // Clear limit amount error when click on PaymentMethod button
+ if (OB.POS.terminal.terminal.paymentnames[inEvent.value.status]) {
+ this.bubble('onMaxLimitAmountError', {
+ show: false,
+ maxLimitAmount: 0,
+ currency: ''
+ });
+ }
isMultiOrders = this.model.isValidMultiOrderState();
change = this.model.getChange();
pending = this.model.getPending();
@@ -48,6 +57,28 @@
}
this.checkEnoughCashAvailable(paymentstatus, payment);
},
+ maxLimitAmountError: function (inSender, inEvent) {
+ var maxHeight;
+ if (inEvent.show) {
+ maxHeight = 115;
+ this.$.errorMaxlimitamount.setContent(OB.I18N.getLabel('OBPOS_PaymentMaxLimitAmount', [inEvent.maxLimitAmount, inEvent.currency]));
+ } else {
+ maxHeight = 150;
+ this.$.errorMaxlimitamount.setContent('');
+ }
+ // Resize scroll area to fix parent panel
+ var component = this.model.isValidMultiOrderState() ? this.$.multiPayments : this.$.payments;
+ if (component.$.tempty.getShowing()) {
+ maxHeight -= component.$.tempty.getBounds().height;
+ }
+ component.$.scrollArea.setStyle("height: " + maxHeight + "px");
+ // Scroll to bottom
+ var height = 0;
+ component.$.tbody.children.forEach(function (line) {
+ height += line.getBounds().height;
+ });
+ component.$.scrollArea.setScrollTop(height - maxHeight);
+ },
components: [{
style: 'background-color: #363636; color: white; height: 200px; margin: 5px; padding: 5px; position: relative;',
components: [{
@@ -143,6 +174,12 @@
}]
}]
+ }, {
+ classes: 'span12',
+ components: [{
+ name: 'errorMaxlimitamount',
+ style: 'color: red'
+ }]
}]
}],
@@ -641,7 +678,11 @@
this.deleting = true;
this.removeClass('btn-icon-clearPayment');
this.addClass('btn-icon-loading');
-
+ this.bubble('onMaxLimitAmountError', {
+ show: false,
+ maxLimitAmount: 0,
+ currency: ''
+ });
this.doRemovePayment({
payment: this.owner.model,
removeCallback: function () {
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js
@@ -64,6 +64,7 @@
onStatusChanged: 'statusChanged',
onLayaways: 'layaways',
onChangeSalesRepresentative: 'changeSalesRepresentative',
+ onMaxLimitAmountError: 'maxLimitAmountError',
onMultiOrders: 'multiOrders',
onSelectMultiOrders: 'selectMultiOrders',
onRemoveMultiOrders: 'removeMultiOrders',
@@ -817,6 +818,10 @@
});
return true;
},
+ maxLimitAmountError: function (inSender, inEvent) {
+ this.waterfallDown('onMaxLimitAmountError', inEvent);
+ return true;
+ },
selectBrand: function (inSender, inEvent) {
this.waterfall('onUpdateBrandFilter', {
value: inEvent