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
@@ -149,12 +149,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/model/tables/OBPOS_PAY_METHOD_CATEGORY.xml b/src-db/database/model/tables/OBPOS_PAY_METHOD_CATEGORY.xml
new file mode 100644
--- /dev/null
+++ b/src-db/database/model/tables/OBPOS_PAY_METHOD_CATEGORY.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
@@ -1172,6 +1172,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1484,6 +1521,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2646,6 +2719,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2717,6 +2825,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2996,6 +3137,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3170,6 +3344,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4629,6 +4838,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5155,6 +5399,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5616,6 +5898,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7740,6 +8058,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -8203,6 +8557,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
@@ -742,6 +742,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1190,6 +1202,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
@@ -620,6 +620,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -705,6 +733,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -787,6 +845,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1099,6 +1185,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1973,6 +2084,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2227,6 +2364,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2856,6 +3021,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_MENU.xml b/src-db/database/sourcedata/AD_MENU.xml
--- a/src-db/database/sourcedata/AD_MENU.xml
+++ b/src-db/database/sourcedata/AD_MENU.xml
@@ -28,6 +28,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
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
@@ -2305,6 +2305,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2557,6 +2569,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5583,6 +5607,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_TAB.xml b/src-db/database/sourcedata/AD_TAB.xml
--- a/src-db/database/sourcedata/AD_TAB.xml
+++ b/src-db/database/sourcedata/AD_TAB.xml
@@ -29,6 +29,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_TABLE.xml b/src-db/database/sourcedata/AD_TABLE.xml
--- a/src-db/database/sourcedata/AD_TABLE.xml
+++ b/src-db/database/sourcedata/AD_TABLE.xml
@@ -1,5 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_TREENODE.xml b/src-db/database/sourcedata/AD_TREENODE.xml
--- a/src-db/database/sourcedata/AD_TREENODE.xml
+++ b/src-db/database/sourcedata/AD_TREENODE.xml
@@ -33,6 +33,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_WINDOW.xml b/src-db/database/sourcedata/AD_WINDOW.xml
--- a/src-db/database/sourcedata/AD_WINDOW.xml
+++ b/src-db/database/sourcedata/AD_WINDOW.xml
@@ -34,6 +34,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java b/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
--- a/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
+++ b/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2013 Openbravo SLU
+ * All portions are Copyright (C) 2013-2015 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -198,6 +198,7 @@
"pointofsale/view/modals/modalstockinstore",
"pointofsale/view/modals/modalstockinstoreclickable",
"pointofsale/view/modals/modalstockinotherstore",
+ "pointofsale/view/modals/modalpayments",
"pointofsale/view/modals/modalproductcannotbegroup",
"pointofsale/view/modals/modalwarehousesrequired",
"pointofsale/view/modals/modalcreditsales",
diff --git a/src/org/openbravo/retail/posterminal/term/Payments.java b/src/org/openbravo/retail/posterminal/term/Payments.java
--- a/src/org/openbravo/retail/posterminal/term/Payments.java
+++ b/src/org/openbravo/retail/posterminal/term/Payments.java
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2012-2014 Openbravo S.L.U.
+ * Copyright (C) 2012-2015 Openbravo S.L.U.
* Licensed under the Openbravo Commercial License version 1.0
* You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
* or in the legal folder of this module distribution.
@@ -12,6 +12,7 @@
import javax.servlet.ServletException;
+import org.apache.commons.codec.binary.Base64;
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
@@ -43,8 +44,10 @@
+ "p.financialAccount.currency.iSOCode as isocode, "
+ "p.financialAccount.currency.symbol as symbol, p.financialAccount.currency.currencySymbolAtTheRight as currencySymbolAtTheRight, "
+ "p.financialAccount.currentBalance as currentBalance, "
- + "p.financialAccount.currency.obposPosprecision as obposPosprecision "
- + "from OBPOS_App_Payment as p where p.obposApplications.id=? "
+ + "p.financialAccount.currency.obposPosprecision as obposPosprecision, "
+ + "img.bindaryData as image, img.mimetype as mimetype "
+ + "from OBPOS_App_Payment as p left outer join p.paymentMethod as pm "
+ + "left outer join pm.image as img where p.obposApplications.id=? "
+ "and p.$readableSimpleCriteria and p.$activeCriteria order by p.line, p.commercialName";
SimpleQueryBuilder querybuilder = new SimpleQueryBuilder(hqlPayments, OBContext
@@ -78,6 +81,15 @@
payment.put("currencySymbolAtTheRight", objPayment[6]);
payment.put("currentBalance", objPayment[7]);
payment.put("obposPosprecision", objPayment[8]);
+ if (objPayment[9] != null && objPayment[10] != null) {
+ payment.put(
+ "image",
+ "data:" + objPayment[10] + ";base64,"
+ + Base64.encodeBase64String((byte[]) objPayment[9]));
+ } else {
+ payment.put("image", objPayment[9]);
+ }
+
respArray.put(payment);
}
diff --git a/web/org.openbravo.retail.posterminal/css/obpos-main.css b/web/org.openbravo.retail.posterminal/css/obpos-main.css
--- a/web/org.openbravo.retail.posterminal/css/obpos-main.css
+++ b/web/org.openbravo.retail.posterminal/css/obpos-main.css
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2013 Openbravo S.L.U.
+ * Copyright (C) 2013-2014 Openbravo S.L.U.
* Licensed under the Openbravo Commercial License version 1.0
* You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
* or in the legal folder of this module distribution.
@@ -14,4 +14,46 @@
.stockinstorelines:active {
background-color: #cccccc;
-}
\ No newline at end of file
+}
+
+.paymentmethoditems {
+ position: relative;
+ float: left;
+ width: 120px;
+ min-width: 25%;
+ color: #666666;
+ text-align: center;
+ cursor: pointer;
+}
+
+@media all and (max-width: 800px) {
+ .paymentmethoditems {
+ min-width: 33%;
+ }
+}
+
+.paymentmethoditemstext {
+ font-family: 'Helvetica Neue', 'Nimbus Sans L', Arial, sans-serif;
+ font-size: 16px;
+ height: 40px;
+ text-align: center;
+ padding: 2px 0px 0px 0px;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+}
+
+.paymentmethoditemsimage {
+ width: 102px;
+ margin: 0 auto;
+}
+
+.paymentmethodnotitems {
+ width: 100%;
+ height: 80px;
+ padding-top: 30px;
+ color: #666666;
+ text-align: center;
+ font-size: 20px;
+ font-weight:bold;
+}
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
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2013 Openbravo S.L.U.
+ * Copyright (C) 2013-2015 Openbravo S.L.U.
* Licensed under the Openbravo Commercial License version 1.0
* You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
* or in the legal folder of this module distribution.
@@ -57,7 +57,8 @@
},
handlers: {
onShowAllButtons: 'showAllButtons',
- onCloseAllPopups: 'closeAllPopups'
+ onCloseAllPopups: 'closeAllPopups',
+ onButtonPaymentChanged: 'paymentChanged'
},
components: [{
kind: 'OB.OBPOSPointOfSale.UI.PaymentMethods',
@@ -161,22 +162,85 @@
}
};
},
+ addPaymentButton: function (btncomponent, countbuttons, paymentsbuttons, dialogbuttons, payment) {
+ if (btncomponent !== null) {
+ if (countbuttons < paymentsbuttons) {
+ this.createComponent(btncomponent);
+ } else {
+ OB.OBPOSPointOfSale.UI.PaymentMethods.prototype.sideButtons.push(btncomponent);
+ dialogbuttons[payment.payment.searchKey] = payment.payment._identifier;
+ }
+ }
+ },
initComponents: function () {
//TODO: modal payments
var i, max, payments, paymentsdialog, paymentsbuttons, countbuttons, btncomponent, Btn, inst, cont, exactdefault, cashdefault, allpayments = {},
me = this,
+ paymentCategories = [],
dialogbuttons = {};
this.inherited(arguments);
payments = OB.MobileApp.model.get('payments');
+ // Count payment buttons checking payment method category
+ countbuttons = 0;
+ enyo.forEach(payments, function (payment) {
+ if (payment.paymentMethod.paymentMethodCategory) {
+ var paymentCategory = null;
+ paymentCategories.every(function (category) {
+ if (category.id === payment.paymentMethod.paymentMethodCategory) {
+ paymentCategory = category;
+ return false;
+ }
+ return true;
+ });
+ if (paymentCategory === null) {
+ countbuttons++;
+ paymentCategories.push({
+ id: payment.paymentMethod.paymentMethodCategory,
+ name: payment.paymentMethod.paymentMethodCategory$_identifier
+ });
+ }
+ } else {
+ countbuttons++;
+ }
+ });
- paymentsdialog = payments.length + this.sideButtons.length > 5;
+ paymentsdialog = countbuttons + this.sideButtons.length > 5;
paymentsbuttons = paymentsdialog ? 4 : 5;
countbuttons = 0;
+ // Add buttons for payment method categories
+ enyo.forEach(paymentCategories, function (category) {
+ btncomponent = me.getButtonComponent({
+ command: 'paymentMethodCategory.showitems.' + category.id,
+ label: category.name,
+ stateless: false,
+ action: function (keyboard, txt) {
+ if (me.currentPayment) {
+ var options = {};
+ if (_.last(txt) === '%') {
+ options.percentaje = true;
+ }
+ var amount = OB.DEC.number(OB.I18N.parseNumber(txt));
+ if (_.isNaN(amount)) {
+ OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_NotValidNumber', [txt]));
+ return;
+ }
+ me.pay(amount, me.currentPayment.payment.searchKey, me.currentPayment.payment._identifier, me.currentPayment.paymentMethod, me.currentPayment.rate, me.currentPayment.mulrate, me.currentPayment.isocode, options);
+ }
+ }
+ });
+ me.addPaymentButton(btncomponent, countbuttons++, paymentsbuttons, dialogbuttons, {
+ payment: {
+ searchKey: 'paymentMethodCategory.showitems.' + category.id,
+ _identifier: category.name
+ }
+ });
+ });
+
enyo.forEach(payments, function (payment) {
if (payment.paymentMethod.id === OB.MobileApp.model.get('terminal').terminalType.paymentMethod) {
exactdefault = payment;
@@ -186,30 +250,32 @@
}
allpayments[payment.payment.searchKey] = payment;
- btncomponent = this.getButtonComponent({
- command: payment.payment.searchKey,
- label: payment.payment._identifier,
- permission: payment.payment.searchKey,
- stateless: false,
- action: function (keyboard, txt) {
- var options = {};
- if (_.last(txt) === '%') {
- options.percentaje = true;
+ // Check for payment method category
+ if (payment.paymentMethod.paymentMethodCategory) {
+ btncomponent = null;
+ } else {
+ btncomponent = this.getButtonComponent({
+ command: payment.payment.searchKey,
+ label: payment.payment._identifier + (payment.paymentMethod.paymentMethodCategory ? '*' : ''),
+ permission: payment.payment.searchKey,
+ stateless: false,
+ action: function (keyboard, txt) {
+ var options = {};
+ if (_.last(txt) === '%') {
+ options.percentaje = true;
+ }
+ var amount = OB.DEC.number(OB.I18N.parseNumber(txt));
+ if (_.isNaN(amount)) {
+ OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_NotValidNumber', [txt]));
+ return;
+ }
+ me.pay(amount, payment.payment.searchKey, payment.payment._identifier, payment.paymentMethod, payment.rate, payment.mulrate, payment.isocode, options);
}
- var amount = OB.DEC.number(OB.I18N.parseNumber(txt));
- if (_.isNaN(amount)) {
- OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_NotValidNumber', [txt]));
- return;
- }
- me.pay(amount, payment.payment.searchKey, payment.payment._identifier, payment.paymentMethod, payment.rate, payment.mulrate, payment.isocode, options);
- }
- });
+ });
+ }
- if (countbuttons++ < paymentsbuttons) {
- this.createComponent(btncomponent);
- } else {
- OB.OBPOSPointOfSale.UI.PaymentMethods.prototype.sideButtons.push(btncomponent);
- dialogbuttons[payment.payment.searchKey] = payment.payment._identifier;
+ if (btncomponent !== null) {
+ me.addPaymentButton(btncomponent, countbuttons++, paymentsbuttons, dialogbuttons, payment);
}
}, this);
@@ -249,12 +315,13 @@
this.owner.owner.addCommand('cashexact', {
action: function (keyboard, txt) {
- if (keyboard.status && !allpayments[keyboard.status]) {
+ var status = keyboard.status.indexOf('paymentMethodCategory.showitems.') === 0 && me.currentPayment ? me.currentPayment.payment.searchKey : keyboard.status;
+ if (status && !allpayments[status]) {
// Is not a payment, so continue with the default path...
- keyboard.execCommand(keyboard.status, null);
+ keyboard.execCommand(status, null);
} else {
// It is a payment...
- var exactpayment = allpayments[keyboard.status] || exactdefault,
+ var exactpayment = allpayments[status] || exactdefault,
amount = me.model.getPending();
if (exactpayment.rate && exactpayment.rate !== '1') {
amount = OB.DEC.div(me.model.getPending(), exactpayment.rate);
@@ -273,6 +340,10 @@
closeAllPopups: function () {
this.$.OBPOS_UI_PaymentMethods.hide();
},
+ paymentChanged: function (inSender, inEvent) {
+ this.currentPayment = inEvent.payment;
+ },
+
shown: function () {
var me = this,
i, max, p, keyboard = this.owner.owner;
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalpayments.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalpayments.js
new file mode 100644
--- /dev/null
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalpayments.js
@@ -0,0 +1,142 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.0 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2015 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ************************************************************************
+ */
+
+/*global enyo, Backbone, */
+
+enyo.kind({
+ kind: 'OB.UI.Modal',
+ topPosition: '75px',
+ name: 'OB.OBPOSPointOfSale.UI.Modals.modalPaymentsSelect',
+ events: {
+ onHideThisPopup: ''
+ },
+ handlers: {
+ onSearchAction: 'searchAction'
+ },
+ body: {
+ components: [{
+ style: 'padding: 10px 10px 5px 10px;',
+ components: [{
+ style: 'display: table; width: 100%;',
+ components: [{
+ style: 'display: table-cell; width: 100%;',
+ components: [{
+ kind: 'OB.UI.SearchInputAutoFilter',
+ name: 'paymentname',
+ style: 'width: 100%;'
+ }]
+ }, {
+ style: 'display: table-cell;',
+ components: [{
+ kind: 'OB.UI.SmallButton',
+ classes: 'btnlink-gray btn-icon-small btn-icon-clear',
+ style: 'width: 80px; margin: 0px 5px 8px 19px;',
+ tap: function () {
+ this.owner.$.paymentname.setValue('');
+ this.bubble('onSearchAction');
+ }
+ }]
+ }, {
+ style: 'display: table-cell;',
+ components: [{
+ kind: 'OB.UI.SmallButton',
+ classes: 'btnlink-yellow btn-icon-small btn-icon-search',
+ style: 'width: 80px; margin: 0px 0px 8px 5px;',
+ tap: function () {
+ this.bubble('onSearchAction');
+ }
+ }]
+ }]
+ }, {
+ style: 'margin: 5px 0px 5px 0px; width: 100%; border-bottom: 1px solid #cccccc;'
+ }, {
+ name: 'paymentMethods',
+ kind: 'Scroller',
+ horizontal: 'hidden',
+ maxHeight: '330px',
+ setItems: function (items) {
+ var i = 0,
+ components = this.getComponents();
+ while (i < components.length) {
+ if (components[i].name !== 'strategy') {
+ components[i++].destroy();
+ } else {
+ i++;
+ }
+ }
+ items.forEach(function (item) {
+ this.createComponent({
+ classes: 'paymentmethoditems',
+ tag: 'div',
+ allowHtml: true,
+ content: '
' + item.name + '
',
+ payment: item.payment,
+ tap: function () {
+ var dialog = this.owner.owner.owner;
+ dialog.bubble('onStatusChanged', {
+ payment: this.payment,
+ status: this.payment.payment.searchKey
+ });
+ dialog.bubble('onPaymentChanged', {
+ payment: this.payment,
+ status: this.payment.payment.searchKey
+ });
+ dialog.doHideThisPopup();
+ }
+ });
+ }, this);
+ if (items.length === 0) {
+ this.createComponent({
+ tag: 'div',
+ classes: 'paymentmethodnotitems',
+ content: OB.I18N.getLabel('OBPOS_PaymentsNoItems')
+ });
+ }
+ this.render();
+ }
+ }]
+ }]
+ },
+ searchAction: function () {
+ var items = [],
+ payments = OB.POS.modelterminal.get('payments'),
+ filterBy = this.$.body.$.paymentname.getValue().toUpperCase();
+ enyo.forEach(payments, function (payment) {
+ if (payment.paymentMethod.paymentMethodCategory && payment.paymentMethod.paymentMethodCategory === this.args.idCategory) {
+ if (filterBy === '' || payment.paymentMethod._identifier.toUpperCase().indexOf(filterBy) >= 0) {
+ items.push({
+ name: payment.paymentMethod._identifier,
+ image: payment.image,
+ payment: payment
+ });
+ }
+ }
+ }, this);
+ this.$.body.$.paymentMethods.setItems(items);
+ var me = this;
+ setTimeout(function () {
+ me.$.body.$.paymentMethods.render();
+ }, 1);
+ },
+ executeOnShow: function () {
+ this.setHeader(OB.I18N.getLabel('OBPOS_PaymentsSelectCaption'));
+ //this.$.body.$.paymentname.setValue('');
+ this.searchAction();
+ }
+});
\ No newline at end of file
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
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2013-2014 Openbravo S.L.U.
+ * Copyright (C) 2013-2015 Openbravo S.L.U.
* Licensed under the Openbravo Commercial License version 1.0
* You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
* or in the legal folder of this module distribution.
@@ -14,9 +14,13 @@
published: {
receipt: null
},
+ events: {
+ onShowPopup: ''
+ },
handlers: {
onButtonStatusChanged: 'buttonStatusChanged',
- onMaxLimitAmountError: 'maxLimitAmountError'
+ onMaxLimitAmountError: 'maxLimitAmountError',
+ onButtonPaymentChanged: 'paymentChanged'
},
getSelectedPayment: function () {
if (this.receipt && this.receipt.selectedPayment) {
@@ -25,42 +29,81 @@
return null;
},
buttonStatusChanged: function (inSender, inEvent) {
- var payment, amt, change, pending, isMultiOrders, paymentstatus;
- payment = inEvent.value.payment || OB.MobileApp.model.paymentnames[OB.MobileApp.model.get('paymentcash')];
- if (_.isUndefined(payment)) {
- return true;
+ this.$.paymentMethodSelect.setContent('');
+ var maxHeight = 150;
+ // 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;
}
- // 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: ''
+ 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);
+ if (inEvent.value.status && inEvent.value.status.indexOf('paymentMethodCategory.showitems.') === 0) {
+ this.doShowPopup({
+ popup: 'modalPaymentsSelect',
+ args: {
+ idCategory: inEvent.value.status.substring(inEvent.value.status.lastIndexOf('.') + 1)
+ }
});
+ } else {
+ var payment, amt, change, pending, isMultiOrders, paymentstatus;
+ payment = inEvent.value.payment || OB.MobileApp.model.paymentnames[OB.MobileApp.model.get('paymentcash')];
+ 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();
+ if (!isMultiOrders) {
+ if (!_.isNull(this.receipt)) {
+ this.receipt.selectedPayment = payment.payment.searchKey;
+ paymentstatus = this.receipt.getPaymentStatus();
+ }
+ } else {
+ this.model.get('multiOrders').set('selectedPayment', payment.payment.searchKey);
+ paymentstatus = this.model.get('multiOrders').getPaymentStatus();
+ }
+
+ if (!_.isNull(change) && change) {
+ this.$.change.setContent(OB.I18N.formatCurrencyWithSymbol(OB.DEC.mul(change, payment.mulrate), payment.symbol, payment.currencySymbolAtTheRight));
+ OB.MobileApp.model.set('changeReceipt', OB.I18N.formatCurrencyWithSymbol(OB.DEC.mul(change, payment.mulrate), payment.symbol, payment.currencySymbolAtTheRight));
+ } else if (!_.isNull(pending) && pending) {
+ this.$.totalpending.setContent(OB.I18N.formatCurrencyWithSymbol(OB.DEC.mul(pending, payment.mulrate), payment.symbol, payment.currencySymbolAtTheRight));
+ }
+ this.checkEnoughCashAvailable(paymentstatus, payment);
+ if (!_.isNull(this.receipt) && this.receipt.get('isLayaway')) {
+ this.$.layawayaction.updateVisibility(true);
+ }
}
- isMultiOrders = this.model.isValidMultiOrderState();
- change = this.model.getChange();
- pending = this.model.getPending();
- if (!isMultiOrders) {
- if (!_.isNull(this.receipt)) {
- this.receipt.selectedPayment = payment.payment.searchKey;
- paymentstatus = this.receipt.getPaymentStatus();
- }
- } else {
- this.model.get('multiOrders').set('selectedPayment', payment.payment.searchKey);
- paymentstatus = this.model.get('multiOrders').getPaymentStatus();
+ },
+ paymentChanged: function (inSender, inEvent) {
+ var maxHeight = 115;
+ // 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;
}
-
- if (!_.isNull(change) && change) {
- this.$.change.setContent(OB.I18N.formatCurrencyWithSymbol(OB.DEC.mul(change, payment.mulrate), payment.symbol, payment.currencySymbolAtTheRight));
- OB.MobileApp.model.set('changeReceipt', OB.I18N.formatCurrencyWithSymbol(OB.DEC.mul(change, payment.mulrate), payment.symbol, payment.currencySymbolAtTheRight));
- } else if (!_.isNull(pending) && pending) {
- this.$.totalpending.setContent(OB.I18N.formatCurrencyWithSymbol(OB.DEC.mul(pending, payment.mulrate), payment.symbol, payment.currencySymbolAtTheRight));
- }
- this.checkEnoughCashAvailable(paymentstatus, payment);
- if (!_.isNull(this.receipt) && this.receipt.get('isLayaway')) {
- this.$.layawayaction.updateVisibility(true);
- }
+ 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);
+ this.$.paymentMethodSelect.setContent(OB.I18N.getLabel('OBPOS_PaymentsSelectedMethod', [inEvent.payment.payment._identifier]));
},
maxLimitAmountError: function (inSender, inEvent) {
var maxHeight;
@@ -178,7 +221,12 @@
showing: false
}]
}]
-
+ }, {
+ classes: 'span12',
+ components: [{
+ name: 'paymentMethodSelect',
+ style: 'color: orange; padding-left: 1em'
+ }]
}, {
classes: 'span12',
components: [{
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
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2013 Openbravo S.L.U.
+ * Copyright (C) 2013-2014 Openbravo S.L.U.
* Licensed under the Openbravo Commercial License version 1.0
* You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
* or in the legal folder of this module distribution.
@@ -62,6 +62,7 @@
onSetDiscountQty: 'discountQtyChanged',
onLineChecked: 'checkedLine',
onStatusChanged: 'statusChanged',
+ onPaymentChanged: 'paymentChanged',
onLayaways: 'layaways',
onChangeSalesRepresentative: 'changeSalesRepresentative',
onMaxLimitAmountError: 'maxLimitAmountError',
@@ -191,6 +192,9 @@
}, {
kind: 'OB.UI.ModalSearchFilterBuilder',
name: 'modalsearchfilterbuilder'
+ }, {
+ kind: 'OB.OBPOSPointOfSale.UI.Modals.modalPaymentsSelect',
+ name: 'modalPaymentsSelect'
}]
}, {
name: 'mainSubWindow',
@@ -836,6 +840,10 @@
value: inEvent
});
},
+ paymentChanged: function (inSender, inEvent) {
+ // sending the event to the components bellow this one
+ this.waterfall('onButtonPaymentChanged', inEvent);
+ },
layaways: function (inSender, inEvent) {
this.$.modalPaidReceipts.setParams({
isLayaway: true
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-right.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-right.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-right.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-right.js
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2012-2014 Openbravo S.L.U.
+ * Copyright (C) 2012-2015 Openbravo S.L.U.
* Licensed under the Openbravo Commercial License version 1.0
* You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
* or in the legal folder of this module distribution.