0049162: Store extraProperties field as a json object in the Orderline offer entity

diff --git a/src-db/database/model/modifiedTables/C_ORDERLINE_OFFER.xml b/src-db/database/model/modifiedTables/C_ORDERLINE_OFFER.xml index af1853e4e90a30dc6fd717c2874ab8cf51a0957c..b22ced6501362172c0856f51d1703f6e7ed0043b 100644 --- a/src-db/database/model/modifiedTables/C_ORDERLINE_OFFER.xml +++ b/src-db/database/model/modifiedTables/C_ORDERLINE_OFFER.xml @@ -5,5 +5,9 @@ <default/> <onCreateDefault/> </column> + <column name="EM_OBPOS_EXTRAPROPERTIES" primaryKey="false" required="false" type="CLOB" size="4000" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> </table> </database> diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml index 6929ee418a934a5dd8f0f86a659c694264645cfa..ffbd0d2fad44b3ea63380fd14047225bd2e51b5d 100644 --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -5604,7 +5604,7 @@ If selected, there is no need of identification of the customer (i.e. Informatio  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> - <POSITION><![CDATA[20]]></POSITION> + <POSITION><![CDATA[19]]></POSITION>  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -17755,6 +17755,44 @@ In case this value is not set, it will be defaulted to the one defined in Openbr  <IS_CHILD_PROPERTY_IN_PARENT><![CDATA[Y]]></IS_CHILD_PROPERTY_IN_PARENT> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[AC2B3441371A4EFDBD8E568E027ED169]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[EM_Obpos_Extraproperties]]></NAME> + <HELP><![CDATA[Extra properties field stored in the promotions associated to the order line]]></HELP> + <COLUMNNAME><![CDATA[EM_Obpos_Extraproperties]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[800185]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID> + <FIELDLENGTH><![CDATA[1000000]]></FIELDLENGTH> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[N]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[220]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[27605AD6161A40A4B5EB9F0C4FC9FBFF]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <POSITION><![CDATA[21]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> + <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> + <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> + <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> + <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> + <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> + <IS_CHILD_PROPERTY_IN_PARENT><![CDATA[N]]></IS_CHILD_PROPERTY_IN_PARENT> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[ACC9C17623824D23BDD52CC999BAA042]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml index 8ee3bd8b2a0983ab6ffa1fc5d4c2c567b04879cd..b910749fdcfa54769e318244ea7807cf61bad8cc 100644 --- a/src-db/database/sourcedata/AD_ELEMENT.xml +++ b/src-db/database/sourcedata/AD_ELEMENT.xml @@ -471,6 +471,19 @@ Document Types determine document sequence and processing rules.]]></HELP>  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> </AD_ELEMENT> +<AD_ELEMENT> + <AD_ELEMENT_ID><![CDATA[27605AD6161A40A4B5EB9F0C4FC9FBFF]]></AD_ELEMENT_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <COLUMNNAME><![CDATA[EM_Obpos_Extraproperties]]></COLUMNNAME> + <NAME><![CDATA[Extra Properties]]></NAME> + <PRINTNAME><![CDATA[Extra Properties]]></PRINTNAME> + <HELP><![CDATA[Extra properties field stored in the promotions associated to the order line]]></HELP> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +</AD_ELEMENT> + <AD_ELEMENT>  <AD_ELEMENT_ID><![CDATA[28B958B6156D435A90B27A4FB6B0AD9F]]></AD_ELEMENT_ID>  <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 index b98ddec2ae5187ba886fc0df1bcb88bdbed26a85..bfef24f81bbc5bc24edde9001a129f86564a1947 100644 --- a/src-db/database/sourcedata/AD_FIELD.xml +++ b/src-db/database/sourcedata/AD_FIELD.xml @@ -5841,6 +5841,34 @@ Usually, company's internal identifiers for various records (products, customers  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> +<AD_FIELD> + <AD_FIELD_ID><![CDATA[536E98848F9A4BE3A54151A43A24B9AC]]></AD_FIELD_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Extra Properties]]></NAME> + <HELP><![CDATA[Extra properties field stored in the promotions associated to the order line]]></HELP> + <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> + <AD_TAB_ID><![CDATA[800222]]></AD_TAB_ID> + <AD_COLUMN_ID><![CDATA[AC2B3441371A4EFDBD8E568E027ED169]]></AD_COLUMN_ID> + <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> + <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> + <DISPLAYLENGTH><![CDATA[1000000]]></DISPLAYLENGTH> + <ISREADONLY><![CDATA[Y]]></ISREADONLY> + <SEQNO><![CDATA[100]]></SEQNO> + <ISSAMELINE><![CDATA[N]]></ISSAMELINE> + <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> + <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO> + <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> + <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> + <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> + <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +</AD_FIELD> + <AD_FIELD>  <AD_FIELD_ID><![CDATA[538964B1480A47A3AECFF1C0FA0AB558]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src/org/openbravo/retail/posterminal/OrderLoader.java b/src/org/openbravo/retail/posterminal/OrderLoader.java index 46daddb97ee45eeaa6f47e9e8a24bfe86399b233..149b504678d6d250e8f5c675fdda77abe73f3c50 100644 --- a/src/org/openbravo/retail/posterminal/OrderLoader.java +++ b/src/org/openbravo/retail/posterminal/OrderLoader.java @@ -949,6 +949,18 @@ public class OrderLoader extends POSDataSynchronizationProcess String discountinstance = jsonPromotion.getString("discountinstance"); promotion.setObposDiscountinstance(discountinstance); } + if (jsonPromotion.has("extraProperties") + && jsonPromotion.getString("extraProperties").length() > 0 + && !("null".equals(jsonPromotion.getString("extraProperties")))) { + // ensure that it is a valid JSON Object prior to save it + try { + JSONObject jsonExtraProperties = jsonPromotion.getJSONObject("extraProperties"); + promotion.setObposExtraproperties(jsonExtraProperties.toString()); + } catch (Exception e) { + throw new OBException("extraProperties attached to promotion " + + promotion.getIdentifier() + " is not a valid JSON."); + } + } if (promotion.getDisplayedTotalAmount() == null && promotion.getTotalAmount().compareTo(BigDecimal.ZERO) == 0) { promotion.setDisplayedTotalAmount(BigDecimal.ZERO); diff --git a/src/org/openbravo/retail/posterminal/PaidReceipts.java b/src/org/openbravo/retail/posterminal/PaidReceipts.java index d1f0fc71babaa3e0d1ea58e021a4d5d928f2aa83..961952f056624bdb861719e1e18f46918eea5981 100644 --- a/src/org/openbravo/retail/posterminal/PaidReceipts.java +++ b/src/org/openbravo/retail/posterminal/PaidReceipts.java @@ -286,6 +286,9 @@ public class PaidReceipts extends JSONProcessSimple { if (promotion.getObdiscQtyoffer() != null) { jsonPromo.put("obdiscQtyoffer", promotion.getObdiscQtyoffer()); } + if (promotion.getObposExtraproperties() != null) { + jsonPromo.put("extraProperties", new JSONObject(promotion.getObposExtraproperties())); + } promotions.put(jsonPromo); hasPromotions = true; }

Notes
(0137048) hgbot (developer) 2022-05-06 15:53	Merge Request created: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.posterminal/-/merge_requests/790 [^]

(0137798) hgbot (developer) 2022-05-27 07:57	Directly closing issue as related merge request is already approved. Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.posterminal [^] Changeset: 871605c5f6c891f1cf27480ef7ebf75344df8186 Author: Rafael Queralta <rafaelcuba81@gmail.com> Date: 27-05-2022 05:57:01 URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.posterminal/-/commit/871605c5f6c891f1cf27480ef7ebf75344df8186 [^] Fixed BUG-49162: Store extraProperties field as a json object in the Orderline offer entity --- M src-db/database/model/modifiedTables/C_ORDERLINE_OFFER.xml M src-db/database/sourcedata/AD_COLUMN.xml M src-db/database/sourcedata/AD_ELEMENT.xml M src-db/database/sourcedata/AD_FIELD.xml M src/org/openbravo/retail/posterminal/OrderLoader.java M src/org/openbravo/retail/posterminal/PaidReceipts.java ---

(0137799) hgbot (developer) 2022-05-27 07:57	Merge request merged: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.posterminal/-/merge_requests/790 [^]

(0137804) hgbot (developer) 2022-05-27 08:32	Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.posterminal [^] Changeset: e5be4cf95cd884618a7b1402dd60f059ff9f4475 Author: Antonio Moreno <antonio.moreno@openbravo.com> Date: 27-05-2022 08:32:11 URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.posterminal/-/commit/e5be4cf95cd884618a7b1402dd60f059ff9f4475 [^] Related to ISSUE-49162: fix dbconsistency problem --- M src-db/database/sourcedata/AD_ELEMENT.xml ---

(0137805) hgbot (developer) 2022-05-27 08:33	Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.posterminal [^] Changeset: ca58877da8d99e4f587aaf901261495b63712285 Author: Antonio Moreno <antonio.moreno@openbravo.com> Date: 27-05-2022 08:32:58 URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.posterminal/-/commit/ca58877da8d99e4f587aaf901261495b63712285 [^] Related to ISSUE-49162: fix dbconsistency problem --- M src-db/database/sourcedata/AD_FIELD.xml ---

Issue History
Date Modified	Username	Field	Change
2022-04-28 11:40	nicola_uva	New Issue
2022-04-28 11:40	nicola_uva	Assigned To	=> Retail
2022-04-28 11:40	nicola_uva	File Added: deeb8d1af1563fd2374f4019c53935bc83aebeaf.diff
2022-04-28 11:40	nicola_uva	OBNetwork customer	=> No
2022-04-28 11:40	nicola_uva	Triggers an Emergency Pack	=> No
2022-04-28 11:41	nicola_uva	Summary	Store extraProperties field as a json object in the Orderline offer entities => Store extraProperties field as a json object in the Orderline offer entity
2022-04-28 16:11	marvintm	Type	feature request => defect
2022-04-28 16:11	marvintm	OBNetwork customer	No => OBPS
2022-05-04 14:58	rqueralta	Assigned To	Retail => rqueralta
2022-05-04 14:59	rqueralta	Status	new => scheduled
2022-05-06 15:53	hgbot	Merge Request Status	=> open
2022-05-06 15:53	hgbot	Note Added: 0137048
2022-05-27 07:57	hgbot	Merge Request Status	open => approved
2022-05-27 07:57	hgbot	Resolution	open => fixed
2022-05-27 07:57	hgbot	Status	scheduled => closed
2022-05-27 07:57	hgbot	Fixed in Version	=> RR22Q3
2022-05-27 07:57	hgbot	Note Added: 0137798
2022-05-27 07:57	hgbot	Note Added: 0137799
2022-05-27 08:32	hgbot	Note Added: 0137804
2022-05-27 08:33	hgbot	Note Added: 0137805

Relationships [ Relation Graph ] [ Dependency Graph ]