Attached Files | providergroupimage.diff [^] (11,655 bytes) 2020-03-23 09:36 [Show Content] [Hide Content]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 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="OBPOS_PAYMENTGROUP_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
<foreign-key foreignTable="AD_ORG" name="OBPOS_PAYMENTGROUP_ORG">
<reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
</foreign-key>
+ <foreign-key foreignTable="AD_IMAGE" name="OBPOS_PGROUP_AD_IMAGE_ID">
+ <reference local="AD_IMAGE_ID" foreign="AD_IMAGE_ID"/>
+ </foreign-key>
<check name="OBPOS_PAYMENTGROUP_ACTIVE"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
</table>
</database>
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 @@
<!--EEBF29322E9245BB91F5F92E9EA19CB0--> <IS_CHILD_PROPERTY_IN_PARENT><![CDATA[Y]]></IS_CHILD_PROPERTY_IN_PARENT>
<!--EEBF29322E9245BB91F5F92E9EA19CB0--></AD_COLUMN>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--><AD_COLUMN>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <AD_COLUMN_ID><![CDATA[EEC80FF1322E4B8DAC0D17236DFBAD49]]></AD_COLUMN_ID>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <NAME><![CDATA[Image]]></NAME>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <DESCRIPTION><![CDATA[A visual picture used to describe an item.]]></DESCRIPTION>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <HELP><![CDATA[Defines a system image]]></HELP>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <COLUMNNAME><![CDATA[AD_Image_ID]]></COLUMNNAME>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <AD_TABLE_ID><![CDATA[B291D223A3504169BF4DB22E00ECD4AE]]></AD_TABLE_ID>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <AD_REFERENCE_ID><![CDATA[4AA6C3BE9D3B4D84A3B80489505A23E5]]></AD_REFERENCE_ID>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <SEQNO><![CDATA[120]]></SEQNO>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <AD_ELEMENT_ID><![CDATA[1639]]></AD_ELEMENT_ID>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <POSITION><![CDATA[13]]></POSITION>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <IMAGESIZEVALUESACTION><![CDATA[RESIZE_NOASPECTRATIO]]></IMAGESIZEVALUESACTION>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <IMAGEWIDTH><![CDATA[102]]></IMAGEWIDTH>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <IMAGEHEIGHT><![CDATA[64]]></IMAGEHEIGHT>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--> <IS_CHILD_PROPERTY_IN_PARENT><![CDATA[N]]></IS_CHILD_PROPERTY_IN_PARENT>
+<!--EEC80FF1322E4B8DAC0D17236DFBAD49--></AD_COLUMN>
+
<!--F082ABBF40284B3FBCC2C69D710A5C48--><AD_COLUMN>
<!--F082ABBF40284B3FBCC2C69D710A5C48--> <AD_COLUMN_ID><![CDATA[F082ABBF40284B3FBCC2C69D710A5C48]]></AD_COLUMN_ID>
<!--F082ABBF40284B3FBCC2C69D710A5C48--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
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 @@
<!--085B0438729C4E21A12D90F28DC2E77E--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--085B0438729C4E21A12D90F28DC2E77E--></AD_FIELD>
+<!--0863E55802634A5A989E58BCD8F1E073--><AD_FIELD>
+<!--0863E55802634A5A989E58BCD8F1E073--> <AD_FIELD_ID><![CDATA[0863E55802634A5A989E58BCD8F1E073]]></AD_FIELD_ID>
+<!--0863E55802634A5A989E58BCD8F1E073--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0863E55802634A5A989E58BCD8F1E073--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0863E55802634A5A989E58BCD8F1E073--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0863E55802634A5A989E58BCD8F1E073--> <NAME><![CDATA[Image]]></NAME>
+<!--0863E55802634A5A989E58BCD8F1E073--> <DESCRIPTION><![CDATA[A visual picture used to describe an item.]]></DESCRIPTION>
+<!--0863E55802634A5A989E58BCD8F1E073--> <HELP><![CDATA[Defines a system image]]></HELP>
+<!--0863E55802634A5A989E58BCD8F1E073--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0863E55802634A5A989E58BCD8F1E073--> <AD_TAB_ID><![CDATA[743866CDEB4A4769ABDA241AF758EA30]]></AD_TAB_ID>
+<!--0863E55802634A5A989E58BCD8F1E073--> <AD_COLUMN_ID><![CDATA[EEC80FF1322E4B8DAC0D17236DFBAD49]]></AD_COLUMN_ID>
+<!--0863E55802634A5A989E58BCD8F1E073--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--0863E55802634A5A989E58BCD8F1E073--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--0863E55802634A5A989E58BCD8F1E073--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--0863E55802634A5A989E58BCD8F1E073--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--0863E55802634A5A989E58BCD8F1E073--> <SEQNO><![CDATA[60]]></SEQNO>
+<!--0863E55802634A5A989E58BCD8F1E073--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--0863E55802634A5A989E58BCD8F1E073--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--0863E55802634A5A989E58BCD8F1E073--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0863E55802634A5A989E58BCD8F1E073--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--0863E55802634A5A989E58BCD8F1E073--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--0863E55802634A5A989E58BCD8F1E073--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--0863E55802634A5A989E58BCD8F1E073--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--0863E55802634A5A989E58BCD8F1E073--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--0863E55802634A5A989E58BCD8F1E073--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--0863E55802634A5A989E58BCD8F1E073--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--0863E55802634A5A989E58BCD8F1E073--></AD_FIELD>
+
<!--08A032070CBA44AE8D0413C6F3FD3ABD--><AD_FIELD>
<!--08A032070CBA44AE8D0413C6F3FD3ABD--> <AD_FIELD_ID><![CDATA[08A032070CBA44AE8D0413C6F3FD3ABD]]></AD_FIELD_ID>
<!--08A032070CBA44AE8D0413C6F3FD3ABD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
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
|