diff --git a/src-db/database/model/tables/OBPOS_PAYMENTGROUP.xml b/src-db/database/model/tables/OBPOS_PAYMENTGROUP.xml
--- a/src-db/database/model/tables/OBPOS_PAYMENTGROUP.xml
+++ b/src-db/database/model/tables/OBPOS_PAYMENTGROUP.xml
@@ -45,12 +45,19 @@
+
+
+
+
+
+
+
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
@@ -22511,6 +22511,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
@@ -652,6 +652,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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-2018 Openbravo S.L.U.
+ * Copyright (C) 2012-2020 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.
@@ -47,10 +47,12 @@
+ "coalesce(c.symbol, pmc.symbol) as symbol, coalesce(c.currencySymbolAtTheRight, pmc.currencySymbolAtTheRight) as currencySymbolAtTheRight, "
+ "coalesce(f.currentBalance, 0) as currentBalance, "
+ "coalesce(p.paymentMethod.currency.obposPosprecision, p.paymentMethod.currency.pricePrecision) as obposPosprecision, "
- + "img.bindaryData as image, img.mimetype as mimetype, " + "providerGroup, paymentType "
+ + "img.bindaryData as image, img.mimetype as mimetype, providerGroup, providerGroupImage.bindaryData as pgimage, providerGroupImage.mimetype as pgmimetype, paymentType "
+ "from OBPOS_App_Payment as p left join p.financialAccount as f left join f.currency as c "
+ "left outer join p.paymentMethod as pm left outer join pm.image as img left outer join pm.currency as pmc "
- + "left outer join pm.obposPaymentgroup as providerGroup left outer join pm.obposPaymentmethodType as paymentType "
+ + "left outer join pm.obposPaymentgroup as providerGroup "
+ + "left outer join providerGroup.image as providerGroupImage "
+ + "left outer join pm.obposPaymentmethodType as paymentType "
+ "where p.obposApplications.id = :posID "
+ "and p.$readableSimpleCriteria and p.$activeCriteria and pm.$activeCriteria"
+ "order by p.line, p.commercialName";
@@ -121,12 +123,19 @@
payment.put("image", objPayment[9]);
}
if (objPayment[11] != null) {
- payment.put("providerGroup", converter.toJsonObject((BaseOBObject) objPayment[11],
- DataResolvingMode.FULL_TRANSLATABLE));
+ JSONObject providerGroup = converter.toJsonObject((BaseOBObject) objPayment[11],
+ DataResolvingMode.FULL_TRANSLATABLE);
+ if (objPayment[12] != null && objPayment[13] != null) {
+ providerGroup.put("image", "data:" + objPayment[13] + ";base64,"
+ + Base64.encodeBase64String((byte[]) objPayment[12]));
+ } else {
+ providerGroup.put("image", objPayment[12]);
+ }
+ payment.put("providerGroup", providerGroup);
}
- if (objPayment[12] != null) {
+ if (objPayment[14] != null) {
payment.put("paymentType",
- converter.toJsonObject((BaseOBObject) objPayment[12], DataResolvingMode.FULL));
+ converter.toJsonObject((BaseOBObject) objPayment[14], DataResolvingMode.FULL));
}
// If the Payment Method is cash, load the rounding properties of the currency