| Attached Files |  actionButtons.diff [^] (33,154 bytes) 2017-02-13 16:44 [Show Content] [Hide Content]comparing with https://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal
searching for changes
changeset: 7851:dae0be98a4d3
tag: tip
user: Jorge Wederago <jorge.wederago@openbravo.com>
date: Mon Feb 13 15:40:59 2017 +0100
summary: Hide action buttons
diff --git a/src-db/database/sourcedata/AD_PREFERENCE.xml b/src-db/database/sourcedata/AD_PREFERENCE.xml
--- a/src-db/database/sourcedata/AD_PREFERENCE.xml
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml
@@ -198,6 +198,17 @@
<!--1DFC9BB9A43A4A47B00AA127C3061BFA--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
<!--1DFC9BB9A43A4A47B00AA127C3061BFA--></AD_PREFERENCE>
+<!--1E8C772C19624212A5DE840602D69A94--><AD_PREFERENCE>
+<!--1E8C772C19624212A5DE840602D69A94--> <AD_PREFERENCE_ID><![CDATA[1E8C772C19624212A5DE840602D69A94]]></AD_PREFERENCE_ID>
+<!--1E8C772C19624212A5DE840602D69A94--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1E8C772C19624212A5DE840602D69A94--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1E8C772C19624212A5DE840602D69A94--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1E8C772C19624212A5DE840602D69A94--> <VALUE><![CDATA[Y]]></VALUE>
+<!--1E8C772C19624212A5DE840602D69A94--> <PROPERTY><![CDATA[OBPOS_ActionButtonSplit]]></PROPERTY>
+<!--1E8C772C19624212A5DE840602D69A94--> <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--1E8C772C19624212A5DE840602D69A94--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--1E8C772C19624212A5DE840602D69A94--></AD_PREFERENCE>
+
<!--207B8ACB34474776AC865E5E7C626DFB--><AD_PREFERENCE>
<!--207B8ACB34474776AC865E5E7C626DFB--> <AD_PREFERENCE_ID><![CDATA[207B8ACB34474776AC865E5E7C626DFB]]></AD_PREFERENCE_ID>
<!--207B8ACB34474776AC865E5E7C626DFB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -418,6 +429,17 @@
<!--534EE20B1ACE4E3999838F0C873CDE83--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
<!--534EE20B1ACE4E3999838F0C873CDE83--></AD_PREFERENCE>
+<!--54649FA6BA584B67A9E2115DEE017D40--><AD_PREFERENCE>
+<!--54649FA6BA584B67A9E2115DEE017D40--> <AD_PREFERENCE_ID><![CDATA[54649FA6BA584B67A9E2115DEE017D40]]></AD_PREFERENCE_ID>
+<!--54649FA6BA584B67A9E2115DEE017D40--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--54649FA6BA584B67A9E2115DEE017D40--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--54649FA6BA584B67A9E2115DEE017D40--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--54649FA6BA584B67A9E2115DEE017D40--> <VALUE><![CDATA[Y]]></VALUE>
+<!--54649FA6BA584B67A9E2115DEE017D40--> <PROPERTY><![CDATA[OBPOS_ActionButtonCheckStock]]></PROPERTY>
+<!--54649FA6BA584B67A9E2115DEE017D40--> <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--54649FA6BA584B67A9E2115DEE017D40--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--54649FA6BA584B67A9E2115DEE017D40--></AD_PREFERENCE>
+
<!--551621C5C1774DBB96DF89E52C8D385A--><AD_PREFERENCE>
<!--551621C5C1774DBB96DF89E52C8D385A--> <AD_PREFERENCE_ID><![CDATA[551621C5C1774DBB96DF89E52C8D385A]]></AD_PREFERENCE_ID>
<!--551621C5C1774DBB96DF89E52C8D385A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -572,6 +594,17 @@
<!--79863EBEE77B48B48B507832E32D8A90--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
<!--79863EBEE77B48B48B507832E32D8A90--></AD_PREFERENCE>
+<!--7B29259DECEB4E108200BFA281A94452--><AD_PREFERENCE>
+<!--7B29259DECEB4E108200BFA281A94452--> <AD_PREFERENCE_ID><![CDATA[7B29259DECEB4E108200BFA281A94452]]></AD_PREFERENCE_ID>
+<!--7B29259DECEB4E108200BFA281A94452--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7B29259DECEB4E108200BFA281A94452--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7B29259DECEB4E108200BFA281A94452--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7B29259DECEB4E108200BFA281A94452--> <VALUE><![CDATA[Y]]></VALUE>
+<!--7B29259DECEB4E108200BFA281A94452--> <PROPERTY><![CDATA[OBPOS_ActionButtonDescription]]></PROPERTY>
+<!--7B29259DECEB4E108200BFA281A94452--> <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--7B29259DECEB4E108200BFA281A94452--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--7B29259DECEB4E108200BFA281A94452--></AD_PREFERENCE>
+
<!--7D7874E654BD49DD842EFF25392E1910--><AD_PREFERENCE>
<!--7D7874E654BD49DD842EFF25392E1910--> <AD_PREFERENCE_ID><![CDATA[7D7874E654BD49DD842EFF25392E1910]]></AD_PREFERENCE_ID>
<!--7D7874E654BD49DD842EFF25392E1910--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -649,6 +682,17 @@
<!--86D9FA1641464B0DB09CE966CB6F2835--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
<!--86D9FA1641464B0DB09CE966CB6F2835--></AD_PREFERENCE>
+<!--87CE89EDED7B43288D83AF0E6383B680--><AD_PREFERENCE>
+<!--87CE89EDED7B43288D83AF0E6383B680--> <AD_PREFERENCE_ID><![CDATA[87CE89EDED7B43288D83AF0E6383B680]]></AD_PREFERENCE_ID>
+<!--87CE89EDED7B43288D83AF0E6383B680--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--87CE89EDED7B43288D83AF0E6383B680--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--87CE89EDED7B43288D83AF0E6383B680--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--87CE89EDED7B43288D83AF0E6383B680--> <VALUE><![CDATA[Y]]></VALUE>
+<!--87CE89EDED7B43288D83AF0E6383B680--> <PROPERTY><![CDATA[OBPOS_ActionButtonShowRelatedServices]]></PROPERTY>
+<!--87CE89EDED7B43288D83AF0E6383B680--> <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--87CE89EDED7B43288D83AF0E6383B680--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--87CE89EDED7B43288D83AF0E6383B680--></AD_PREFERENCE>
+
<!--88BFC3793781451DB306A8C3102C2022--><AD_PREFERENCE>
<!--88BFC3793781451DB306A8C3102C2022--> <AD_PREFERENCE_ID><![CDATA[88BFC3793781451DB306A8C3102C2022]]></AD_PREFERENCE_ID>
<!--88BFC3793781451DB306A8C3102C2022--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -880,6 +924,17 @@
<!--B151CF7DFEAC425D96E08371DB0D9402--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
<!--B151CF7DFEAC425D96E08371DB0D9402--></AD_PREFERENCE>
+<!--B1865C4A92A04419897D586FF00792FA--><AD_PREFERENCE>
+<!--B1865C4A92A04419897D586FF00792FA--> <AD_PREFERENCE_ID><![CDATA[B1865C4A92A04419897D586FF00792FA]]></AD_PREFERENCE_ID>
+<!--B1865C4A92A04419897D586FF00792FA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B1865C4A92A04419897D586FF00792FA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B1865C4A92A04419897D586FF00792FA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B1865C4A92A04419897D586FF00792FA--> <VALUE><![CDATA[Y]]></VALUE>
+<!--B1865C4A92A04419897D586FF00792FA--> <PROPERTY><![CDATA[OBPOS_ActionButtonDelete]]></PROPERTY>
+<!--B1865C4A92A04419897D586FF00792FA--> <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--B1865C4A92A04419897D586FF00792FA--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--B1865C4A92A04419897D586FF00792FA--></AD_PREFERENCE>
+
<!--B27C727DE96642DB9AE0C4306FB5B7F0--><AD_PREFERENCE>
<!--B27C727DE96642DB9AE0C4306FB5B7F0--> <AD_PREFERENCE_ID><![CDATA[B27C727DE96642DB9AE0C4306FB5B7F0]]></AD_PREFERENCE_ID>
<!--B27C727DE96642DB9AE0C4306FB5B7F0--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -924,6 +979,17 @@
<!--BD5161AC42EF41B9BF4AC0D1FA8AB7B9--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
<!--BD5161AC42EF41B9BF4AC0D1FA8AB7B9--></AD_PREFERENCE>
+<!--BE5162597B2242CA85A3933F755221EC--><AD_PREFERENCE>
+<!--BE5162597B2242CA85A3933F755221EC--> <AD_PREFERENCE_ID><![CDATA[BE5162597B2242CA85A3933F755221EC]]></AD_PREFERENCE_ID>
+<!--BE5162597B2242CA85A3933F755221EC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BE5162597B2242CA85A3933F755221EC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BE5162597B2242CA85A3933F755221EC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BE5162597B2242CA85A3933F755221EC--> <VALUE><![CDATA[Y]]></VALUE>
+<!--BE5162597B2242CA85A3933F755221EC--> <PROPERTY><![CDATA[OBPOS_ActionButtonRemoveDiscount]]></PROPERTY>
+<!--BE5162597B2242CA85A3933F755221EC--> <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--BE5162597B2242CA85A3933F755221EC--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--BE5162597B2242CA85A3933F755221EC--></AD_PREFERENCE>
+
<!--C4F0E3660F6D49D19DC30CBE53F2BF0D--><AD_PREFERENCE>
<!--C4F0E3660F6D49D19DC30CBE53F2BF0D--> <AD_PREFERENCE_ID><![CDATA[C4F0E3660F6D49D19DC30CBE53F2BF0D]]></AD_PREFERENCE_ID>
<!--C4F0E3660F6D49D19DC30CBE53F2BF0D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -345,6 +345,17 @@
<!--29A2A33C0E1644B5B55F38F07C64CF85--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
<!--29A2A33C0E1644B5B55F38F07C64CF85--></AD_REF_LIST>
+<!--2A7EBB62B86C475687EF8F453A251CB1--><AD_REF_LIST>
+<!--2A7EBB62B86C475687EF8F453A251CB1--> <AD_REF_LIST_ID><![CDATA[2A7EBB62B86C475687EF8F453A251CB1]]></AD_REF_LIST_ID>
+<!--2A7EBB62B86C475687EF8F453A251CB1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2A7EBB62B86C475687EF8F453A251CB1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2A7EBB62B86C475687EF8F453A251CB1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2A7EBB62B86C475687EF8F453A251CB1--> <VALUE><![CDATA[OBPOS_ActionButtonDelete]]></VALUE>
+<!--2A7EBB62B86C475687EF8F453A251CB1--> <NAME><![CDATA[Web POS Show Action Button Delete]]></NAME>
+<!--2A7EBB62B86C475687EF8F453A251CB1--> <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--2A7EBB62B86C475687EF8F453A251CB1--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--2A7EBB62B86C475687EF8F453A251CB1--></AD_REF_LIST>
+
<!--2C15961C145144CFBC37A281678297A7--><AD_REF_LIST>
<!--2C15961C145144CFBC37A281678297A7--> <AD_REF_LIST_ID><![CDATA[2C15961C145144CFBC37A281678297A7]]></AD_REF_LIST_ID>
<!--2C15961C145144CFBC37A281678297A7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -386,7 +397,7 @@
<!--2F9B68257FFC416698B4BE8F1969EB72--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--2F9B68257FFC416698B4BE8F1969EB72--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--2F9B68257FFC416698B4BE8F1969EB72--> <VALUE><![CDATA[OBPOS_ReturnLine]]></VALUE>
-<!--2F9B68257FFC416698B4BE8F1969EB72--> <NAME><![CDATA[Enable switch from positive line to return line]]></NAME>
+<!--2F9B68257FFC416698B4BE8F1969EB72--> <NAME><![CDATA[Web POS Show Action Button Return]]></NAME>
<!--2F9B68257FFC416698B4BE8F1969EB72--> <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
<!--2F9B68257FFC416698B4BE8F1969EB72--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
<!--2F9B68257FFC416698B4BE8F1969EB72--></AD_REF_LIST>
@@ -735,6 +746,17 @@
<!--57F1001CF7734FE3AF23EFB2405E9EA8--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
<!--57F1001CF7734FE3AF23EFB2405E9EA8--></AD_REF_LIST>
+<!--5B9E4C7ED1684FF08BA961B47070EE13--><AD_REF_LIST>
+<!--5B9E4C7ED1684FF08BA961B47070EE13--> <AD_REF_LIST_ID><![CDATA[5B9E4C7ED1684FF08BA961B47070EE13]]></AD_REF_LIST_ID>
+<!--5B9E4C7ED1684FF08BA961B47070EE13--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5B9E4C7ED1684FF08BA961B47070EE13--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5B9E4C7ED1684FF08BA961B47070EE13--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5B9E4C7ED1684FF08BA961B47070EE13--> <VALUE><![CDATA[OBPOS_ActionButtonRemoveDiscount]]></VALUE>
+<!--5B9E4C7ED1684FF08BA961B47070EE13--> <NAME><![CDATA[Web POS Show Action Button Remove Discount]]></NAME>
+<!--5B9E4C7ED1684FF08BA961B47070EE13--> <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--5B9E4C7ED1684FF08BA961B47070EE13--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--5B9E4C7ED1684FF08BA961B47070EE13--></AD_REF_LIST>
+
<!--5BFDB9123CEF4190976681EE980DD912--><AD_REF_LIST>
<!--5BFDB9123CEF4190976681EE980DD912--> <AD_REF_LIST_ID><![CDATA[5BFDB9123CEF4190976681EE980DD912]]></AD_REF_LIST_ID>
<!--5BFDB9123CEF4190976681EE980DD912--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -803,6 +825,17 @@
<!--6602A06C570044EE99A3C3C4117F0340--> <SEQNO><![CDATA[2]]></SEQNO>
<!--6602A06C570044EE99A3C3C4117F0340--></AD_REF_LIST>
+<!--6771D0C343FE494B8C999945C6458CAB--><AD_REF_LIST>
+<!--6771D0C343FE494B8C999945C6458CAB--> <AD_REF_LIST_ID><![CDATA[6771D0C343FE494B8C999945C6458CAB]]></AD_REF_LIST_ID>
+<!--6771D0C343FE494B8C999945C6458CAB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6771D0C343FE494B8C999945C6458CAB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6771D0C343FE494B8C999945C6458CAB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6771D0C343FE494B8C999945C6458CAB--> <VALUE><![CDATA[OBPOS_ActionButtonCheckStock]]></VALUE>
+<!--6771D0C343FE494B8C999945C6458CAB--> <NAME><![CDATA[Web POS Show Action Button Check Stock]]></NAME>
+<!--6771D0C343FE494B8C999945C6458CAB--> <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--6771D0C343FE494B8C999945C6458CAB--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--6771D0C343FE494B8C999945C6458CAB--></AD_REF_LIST>
+
<!--69866AA7260440C0A81D4ADF7BC84EBC--><AD_REF_LIST>
<!--69866AA7260440C0A81D4ADF7BC84EBC--> <AD_REF_LIST_ID><![CDATA[69866AA7260440C0A81D4ADF7BC84EBC]]></AD_REF_LIST_ID>
<!--69866AA7260440C0A81D4ADF7BC84EBC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1416,6 +1449,17 @@
<!--BE088B0A69A641C08F77C7967F714927--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
<!--BE088B0A69A641C08F77C7967F714927--></AD_REF_LIST>
+<!--BE430354A3284789B217653213E1EDC7--><AD_REF_LIST>
+<!--BE430354A3284789B217653213E1EDC7--> <AD_REF_LIST_ID><![CDATA[BE430354A3284789B217653213E1EDC7]]></AD_REF_LIST_ID>
+<!--BE430354A3284789B217653213E1EDC7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BE430354A3284789B217653213E1EDC7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BE430354A3284789B217653213E1EDC7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BE430354A3284789B217653213E1EDC7--> <VALUE><![CDATA[OBPOS_ActionButtonDescription]]></VALUE>
+<!--BE430354A3284789B217653213E1EDC7--> <NAME><![CDATA[Web POS Show Action Button Description]]></NAME>
+<!--BE430354A3284789B217653213E1EDC7--> <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--BE430354A3284789B217653213E1EDC7--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--BE430354A3284789B217653213E1EDC7--></AD_REF_LIST>
+
<!--BFE70DE60D1F49A89265E01A5083FCDB--><AD_REF_LIST>
<!--BFE70DE60D1F49A89265E01A5083FCDB--> <AD_REF_LIST_ID><![CDATA[BFE70DE60D1F49A89265E01A5083FCDB]]></AD_REF_LIST_ID>
<!--BFE70DE60D1F49A89265E01A5083FCDB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1506,6 +1550,17 @@
<!--C91D45BFBBEE486F996CC6FCAAA78D38--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
<!--C91D45BFBBEE486F996CC6FCAAA78D38--></AD_REF_LIST>
+<!--CAC449AB8E684C9E8AC0923C4616E262--><AD_REF_LIST>
+<!--CAC449AB8E684C9E8AC0923C4616E262--> <AD_REF_LIST_ID><![CDATA[CAC449AB8E684C9E8AC0923C4616E262]]></AD_REF_LIST_ID>
+<!--CAC449AB8E684C9E8AC0923C4616E262--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CAC449AB8E684C9E8AC0923C4616E262--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CAC449AB8E684C9E8AC0923C4616E262--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CAC449AB8E684C9E8AC0923C4616E262--> <VALUE><![CDATA[OBPOS_ActionButtonSplit]]></VALUE>
+<!--CAC449AB8E684C9E8AC0923C4616E262--> <NAME><![CDATA[Web POS Show Action Button Split]]></NAME>
+<!--CAC449AB8E684C9E8AC0923C4616E262--> <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--CAC449AB8E684C9E8AC0923C4616E262--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--CAC449AB8E684C9E8AC0923C4616E262--></AD_REF_LIST>
+
<!--CB85FFDE7BF34019BD97F0A2CC2CED54--><AD_REF_LIST>
<!--CB85FFDE7BF34019BD97F0A2CC2CED54--> <AD_REF_LIST_ID><![CDATA[CB85FFDE7BF34019BD97F0A2CC2CED54]]></AD_REF_LIST_ID>
<!--CB85FFDE7BF34019BD97F0A2CC2CED54--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1573,6 +1628,17 @@
<!--D56514BAA9CD492D8EEA8B01956AEA60--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
<!--D56514BAA9CD492D8EEA8B01956AEA60--></AD_REF_LIST>
+<!--D5E9BE9E259F4E47BCEA88BBAA16ADAB--><AD_REF_LIST>
+<!--D5E9BE9E259F4E47BCEA88BBAA16ADAB--> <AD_REF_LIST_ID><![CDATA[D5E9BE9E259F4E47BCEA88BBAA16ADAB]]></AD_REF_LIST_ID>
+<!--D5E9BE9E259F4E47BCEA88BBAA16ADAB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D5E9BE9E259F4E47BCEA88BBAA16ADAB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D5E9BE9E259F4E47BCEA88BBAA16ADAB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D5E9BE9E259F4E47BCEA88BBAA16ADAB--> <VALUE><![CDATA[OBPOS_ActionButtonShowRelatedServices]]></VALUE>
+<!--D5E9BE9E259F4E47BCEA88BBAA16ADAB--> <NAME><![CDATA[Web POS Show Action Button Show Related Services]]></NAME>
+<!--D5E9BE9E259F4E47BCEA88BBAA16ADAB--> <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--D5E9BE9E259F4E47BCEA88BBAA16ADAB--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--D5E9BE9E259F4E47BCEA88BBAA16ADAB--></AD_REF_LIST>
+
<!--D7E5D22E0D33475C95E2AB7A54ED4BE1--><AD_REF_LIST>
<!--D7E5D22E0D33475C95E2AB7A54ED4BE1--> <AD_REF_LIST_ID><![CDATA[D7E5D22E0D33475C95E2AB7A54ED4BE1]]></AD_REF_LIST_ID>
<!--D7E5D22E0D33475C95E2AB7A54ED4BE1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
@@ -199,6 +199,7 @@
name: 'deleteLine',
i18nContent: 'OBPOS_ButtonDelete',
classes: 'btnlink-orange',
+ permission: 'OBPOS_ActionButtonDelete',
tap: function () {
var me = this,
order = this.model.get('order');
@@ -261,6 +262,7 @@
i18nContent: 'OBPOS_LblDescription',
name: 'descriptionButton',
classes: 'btnlink-orange',
+ permission: 'OBPOS_ActionButtonDescription',
tap: function () {
if (this.owner.owner.receipt.get('isQuotation') && this.owner.owner.receipt.get('hasbeenpaid') === 'Y') {
this.owner.owner.doShowPopup({
@@ -451,6 +453,7 @@
i18nContent: 'OBPOS_lblSplit',
showing: false,
classes: 'btnlink-orange',
+ permission: 'OBPOS_ActionButtonSplit',
tap: function () {
this.owner.owner.doShowPopup({
popup: 'OBPOS_modalSplitLine',
@@ -464,6 +467,7 @@
kind: 'OB.UI.SmallButton',
name: 'showRelatedServices',
classes: 'btnlink-orange',
+ permission: 'OBPOS_ActionButtonShowRelatedServices',
style: 'width: 45px; background-repeat: no-repeat; background-position: center; color: rgba(0, 0, 0, 0)',
content: '-',
tap: function (inSender, inEvent) {
@@ -507,6 +511,7 @@
i18nContent: 'OBPOS_LblRemoveDiscount',
showing: false,
classes: 'btnlink-orange',
+ permission: 'OBPOS_ActionButtonRemoveDiscount',
tap: function () {
var linesWithPromotionsLength = 0,
manualPromotions = OB.Model.Discounts.getManualPromotions(),
@@ -538,6 +543,7 @@
}, {
kind: 'OB.OBPOSPointOfSale.UI.EditLine.OpenStockButton',
name: 'checkStockButton',
+ permission: 'OBPOS_ActionButtonCheckStock',
showing: false
}],
published: {
@@ -578,18 +584,22 @@
}
},
hideReturnLineButton: function (inSender, inEvent) {
- if (inEvent.hide || !OB.MobileApp.model.hasPermission(this.$.actionButtonsContainer.$.returnLine.permission, true)) {
- this.$.actionButtonsContainer.$.returnLine.hide();
- } else {
- this.$.actionButtonsContainer.$.returnLine.show();
+ if (this.$.actionButtonsContainer.$.returnLine) {
+ if (inEvent.hide || !OB.MobileApp.model.hasPermission(this.$.actionButtonsContainer.$.returnLine.permission, true)) {
+ this.$.actionButtonsContainer.$.returnLine.hide();
+ } else {
+ this.$.actionButtonsContainer.$.returnLine.show();
+ }
}
},
rearrangeEditButtonBar: function (line) {
- if (OB.MobileApp.model.get('permissions')[this.$.actionButtonsContainer.$.returnLine.permission] && !(this.model.get('order').get('isPaid') === true || this.model.get('order').get('isLayaway') === true || this.model.get('order').get('isQuotation') === true)) {
- this.$.actionButtonsContainer.$.returnLine.show();
- }
- if (this.model.get('order').get('orderType') === 1 || this.model.get('order').get('orderType') === 2) {
- this.$.actionButtonsContainer.$.returnLine.hide();
+ if (this.$.actionButtonsContainer.$.returnLine) {
+ if (OB.MobileApp.model.get('permissions')[this.$.actionButtonsContainer.$.returnLine.permission] && !(this.model.get('order').get('isPaid') === true || this.model.get('order').get('isLayaway') === true || this.model.get('order').get('isQuotation') === true)) {
+ this.$.actionButtonsContainer.$.returnLine.show();
+ }
+ if (this.model.get('order').get('orderType') === 1 || this.model.get('order').get('orderType') === 2) {
+ this.$.actionButtonsContainer.$.returnLine.hide();
+ }
}
if (line) {
if (line && !this.isLineInSelection(line)) {
@@ -605,78 +615,107 @@
}
if (!this.selectedModels || this.selectedModels.length <= 1) {
if (this.model.get('order').get('isEditable')) {
- this.$.actionButtonsContainer.$.descriptionButton.show();
+ if (this.$.actionButtonsContainer.$.descriptionButton) {
+ this.$.actionButtonsContainer.$.descriptionButton.show();
+ }
var showSplitBtn = line && line.get('qty') > 1 && line.get('product').get('productType') !== 'S' && (!line.get('remainingQuantity') || line.get('remainingQuantity') < line.get('qty')) && !_.find(this.model.get('order').get('lines').models, function (l) {
return l.get('relatedLines') && _.find(l.get('relatedLines'), function (rl) {
return rl.orderlineId === line.id;
}) !== undefined;
});
- if (showSplitBtn) {
- var me = this;
- OB.UTIL.HookManager.executeHooks('OBPOS_CheckSplitLine', {
- receipt: me.model.get('order'),
- orderline: line
- }, function (args) {
- if (args && args.cancelOperation) {
- me.$.actionButtonsContainer.$.splitlineButton.hide();
- } else {
- me.$.actionButtonsContainer.$.splitlineButton.show();
- }
- });
- } else {
- this.$.actionButtonsContainer.$.splitlineButton.hide();
+ if (this.$.actionButtonsContainer.$.splitlineButton) {
+ if (showSplitBtn) {
+ var me = this;
+ OB.UTIL.HookManager.executeHooks('OBPOS_CheckSplitLine', {
+ receipt: me.model.get('order'),
+ orderline: line
+ }, function (args) {
+ if (args && args.cancelOperation) {
+ me.$.actionButtonsContainer.$.splitlineButton.hide();
+ } else {
+ me.$.actionButtonsContainer.$.splitlineButton.show();
+ }
+ });
+ } else {
+ this.$.actionButtonsContainer.$.splitlineButton.hide();
+ }
}
}
- if (this.line) {
- if (this.receipt.get('isEditable') && this.line.get('product').get('productType') === 'I' && !this.line.get('product').get('ispack') && OB.MobileApp.model.get('connectedToERP')) {
- this.$.actionButtonsContainer.$.checkStockButton.show();
+ if (this.$.actionButtonsContainer.$.checkStockButton) {
+ if (this.line) {
+ if (this.receipt.get('isEditable') && this.line.get('product').get('productType') === 'I' && !this.line.get('product').get('ispack') && OB.MobileApp.model.get('connectedToERP')) {
+ this.$.actionButtonsContainer.$.checkStockButton.show();
+ } else {
+ this.$.actionButtonsContainer.$.checkStockButton.hide();
+ }
} else {
this.$.actionButtonsContainer.$.checkStockButton.hide();
}
- } else {
+ }
+ } else {
+ if (this.$.actionButtonsContainer.$.checkStockButton) {
this.$.actionButtonsContainer.$.checkStockButton.hide();
}
- } else {
- this.$.actionButtonsContainer.$.checkStockButton.hide();
- this.$.actionButtonsContainer.$.descriptionButton.hide();
- this.$.actionButtonsContainer.$.splitlineButton.hide();
+ if (this.$.actionButtonsContainer.$.descriptionButton) {
+ this.$.actionButtonsContainer.$.descriptionButton.hide();
+ }
+ if (this.$.actionButtonsContainer.$.splitlineButton) {
+ this.$.actionButtonsContainer.$.splitlineButton.hide();
+ }
}
- var promotions = false;
- if (this.selectedModels) {
- _.each(this.selectedModels, function (lineModel) {
- if (lineModel.get('promotions') && lineModel.get('promotions').length > 0) {
- var filtered;
- filtered = _.filter(lineModel.get('promotions'), function (prom) {
- return OB.Model.Discounts.discountRules[prom.discountType].isManual;
- }, this);
- if (filtered.length === lineModel.get('promotions').length) {
- //lines with just discrectionary discounts can be removed.
- promotions = true;
+ if (this.$.actionButtonsContainer.$.removeDiscountButton) {
+ var promotions = false;
+ if (this.selectedModels) {
+ _.each(this.selectedModels, function (lineModel) {
+ if (lineModel.get('promotions') && lineModel.get('promotions').length > 0) {
+ var filtered;
+ filtered = _.filter(lineModel.get('promotions'), function (prom) {
+ return OB.Model.Discounts.discountRules[prom.discountType].isManual;
+ }, this);
+ if (filtered.length === lineModel.get('promotions').length) {
+ //lines with just discrectionary discounts can be removed.
+ promotions = true;
+ }
}
+ });
+ }
+ if (promotions) {
+ this.$.actionButtonsContainer.$.removeDiscountButton.show();
+ } else {
+ this.$.actionButtonsContainer.$.removeDiscountButton.hide();
+ }
+ }
+ if (this.$.actionButtonsContainer.$.returnLine) {
+ if ((!_.isUndefined(line) && !_.isUndefined(line.get('originalOrderLineId'))) || this.model.get('order').get('orderType') === 1 || this.model.get('order').get('orderType') === 2) {
+ this.$.actionButtonsContainer.$.returnLine.hide();
+ } else if (OB.MobileApp.model.get('permissions')[this.$.actionButtonsContainer.$.returnLine.permission] && !(this.model.get('order').get('isPaid') === true || this.model.get('order').get('isLayaway') === true || this.model.get('order').get('isQuotation') === true)) {
+ this.$.actionButtonsContainer.$.returnLine.show();
+ }
+ }
+ if (this.$.actionButtonsContainer.$.showRelatedServices) {
+ if (this.selectedModels && this.selectedModels.length > 0) {
+ var proposedServices, existRelatedServices;
+ existRelatedServices = this.selectedModels.filter(function (line) {
+ return line.get('hasRelatedServices');
+ }).length === this.selectedModels.length;
+ proposedServices = this.selectedModels.filter(function (line) {
+ return !line.get('hasRelatedServices') || line.get('obposServiceProposed');
+ }).length === this.selectedModels.length;
+ if (existRelatedServices) {
+ this.$.actionButtonsContainer.$.showRelatedServices.show();
+ if (proposedServices) {
+ this.$.actionButtonsContainer.$.showRelatedServices.addRemoveClass('iconServices_unreviewed', false);
+ this.$.actionButtonsContainer.$.showRelatedServices.addRemoveClass('iconServices_reviewed', true);
+ } else {
+ this.$.actionButtonsContainer.$.showRelatedServices.addRemoveClass('iconServices_unreviewed', true);
+ this.$.actionButtonsContainer.$.showRelatedServices.addRemoveClass('iconServices_reviewed', false);
+ }
+ } else {
+ this.$.actionButtonsContainer.$.showRelatedServices.hide();
}
- });
- }
- if (promotions) {
- this.$.actionButtonsContainer.$.removeDiscountButton.show();
- } else {
- this.$.actionButtonsContainer.$.removeDiscountButton.hide();
- }
- if ((!_.isUndefined(line) && !_.isUndefined(line.get('originalOrderLineId'))) || this.model.get('order').get('orderType') === 1 || this.model.get('order').get('orderType') === 2) {
- this.$.actionButtonsContainer.$.returnLine.hide();
- } else if (OB.MobileApp.model.get('permissions')[this.$.actionButtonsContainer.$.returnLine.permission] && !(this.model.get('order').get('isPaid') === true || this.model.get('order').get('isLayaway') === true || this.model.get('order').get('isQuotation') === true)) {
- this.$.actionButtonsContainer.$.returnLine.show();
- }
- if (this.selectedModels && this.selectedModels.length > 0) {
- var proposedServices, existRelatedServices;
- existRelatedServices = this.selectedModels.filter(function (line) {
- return line.get('hasRelatedServices');
- }).length === this.selectedModels.length;
- proposedServices = this.selectedModels.filter(function (line) {
- return !line.get('hasRelatedServices') || line.get('obposServiceProposed');
- }).length === this.selectedModels.length;
- if (existRelatedServices) {
+ } else if (this.line && this.line.get('hasRelatedServices')) {
this.$.actionButtonsContainer.$.showRelatedServices.show();
- if (proposedServices) {
+ if (this.line.get('obposServiceProposed')) {
this.$.actionButtonsContainer.$.showRelatedServices.addRemoveClass('iconServices_unreviewed', false);
this.$.actionButtonsContainer.$.showRelatedServices.addRemoveClass('iconServices_reviewed', true);
} else {
@@ -686,17 +725,6 @@
} else {
this.$.actionButtonsContainer.$.showRelatedServices.hide();
}
- } else if (this.line && this.line.get('hasRelatedServices')) {
- this.$.actionButtonsContainer.$.showRelatedServices.show();
- if (this.line.get('obposServiceProposed')) {
- this.$.actionButtonsContainer.$.showRelatedServices.addRemoveClass('iconServices_unreviewed', false);
- this.$.actionButtonsContainer.$.showRelatedServices.addRemoveClass('iconServices_reviewed', true);
- } else {
- this.$.actionButtonsContainer.$.showRelatedServices.addRemoveClass('iconServices_unreviewed', true);
- this.$.actionButtonsContainer.$.showRelatedServices.addRemoveClass('iconServices_reviewed', false);
- }
- } else {
- this.$.actionButtonsContainer.$.showRelatedServices.hide();
}
this.render();
}
@@ -1030,9 +1058,10 @@
enyo.forEach(sortedPropertiesByPosition, function (compToCreate) {
this.$.linePropertiesContainer.createComponent(compToCreate);
}, this);
-
enyo.forEach(this.actionButtons, function (compToCreate) {
- this.$.actionButtonsContainer.createComponent(compToCreate);
+ if (!compToCreate.permission || OB.MobileApp.model.hasPermission(compToCreate.permission, false)) {
+ this.$.actionButtonsContainer.createComponent(compToCreate);
+ }
}, this);
},
init: function (model) {
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
@@ -673,8 +673,10 @@
reactivateQuotation: function () {
this.model.get('order').reactivateQuotation();
this.model.get('orderList').saveCurrent();
- if (this.model.get('order').get('isEditable') && this.model.get('order').get('isQuotation')) {
- this.$.multiColumn.$.rightPanel.$.toolbarpane.$.edit.$.editTabContent.$.actionButtonsContainer.$.descriptionButton.show();
+ if (this.$.multiColumn.$.rightPanel.$.toolbarpane.$.edit.$.editTabContent.$.actionButtonsContainer.$.descriptionButton) {
+ if (this.model.get('order').get('isEditable') && this.model.get('order').get('isQuotation')) {
+ this.$.multiColumn.$.rightPanel.$.toolbarpane.$.edit.$.editTabContent.$.actionButtonsContainer.$.descriptionButton.show();
+ }
}
return true;
},
testActionButtons.diff [^] (11,398 bytes) 2017-07-14 10:59 [Show Content] [Hide Content]diff --git a/src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java b/src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java
@@ -1342,6 +1342,8 @@
"actionButtonsContainer_checkStockButton", EnyoKind.BUTTON); //
public static TestIdConstructor BUTTON_EDIT_DELETEDISCOUNT = new TestIdConstructor(
"actionButtonsContainer_removeDiscountButton", EnyoKind.BUTTON); //
+ public static TestIdConstructor BUTTON_EDIT_DESCRIPTION = new TestIdConstructor(
+ "actionButtonsContainer_descriptionButton", EnyoKind.BUTTON); //
public static TestIdConstructor BUTTON_EDIT_DELETEDISCOUNTDIALOGDELSELECTED = new TestIdConstructor(
"bodyButtons_deleteDiscountDeleteSelected", EnyoKind.BUTTON); //
public static TestIdConstructor LABEL_EDIT_DESCRIPTION = new TestIdConstructor(
diff --git a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/ZHideActionButtons.java b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/ZHideActionButtons.java
new file mode 100644
--- /dev/null
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/ZHideActionButtons.java
@@ -0,0 +1,216 @@
+/*
+ *************************************************************************
+ * 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 S.L.U.
+ * All portions are Copyright (C) 2017 Openbravo S.L.U.
+ * All Rights Reserved.
+ * Contributor(s):
+ ************************************************************************
+ *
+ * @author JWE
+ *
+ */
+
+package org.openbravo.test.mobile.retail.pack.selenium.tests.receipts;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.UUID;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.core.selenium.SeleniumHelper;
+import org.openbravo.test.mobile.core.utils.OBWait;
+import org.openbravo.test.mobile.retail.mobilecore.annotations.TestClassAnnotations;
+import org.openbravo.test.mobile.retail.mobilecore.database.DatabaseHelperInsertUpdateOrDelete;
+import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack;
+import org.openbravo.test.mobile.retail.pack.selenium.terminals.WebPOSTerminalHelper;
+
+@TestClassAnnotations(isHighVolumeCompatible = true)
+public class ZHideActionButtons extends WebPOSTerminalHelper {
+
+ private final String preferenceID = getUUID();
+ private final String adUserId = "3073EDF96A3C42CC86C7069E379522D2";
+ private final String adClientId = "39363B0921BB4293B48383844325E84C";
+ private final String preferenceOrg = "D270A5AC50874F8BA67A88EE977F8E3B";
+
+ @Test
+ public void test() {
+ try {
+ createPermission("OBPOS_ReturnLine");
+ reload();
+ tap(TestIdPack.BUTTON_MENU);
+ tap(TestIdPack.BUTTON_MENU_USER);
+ tap(TestIdPack.BUTTON_USER_PROFILE);
+ verify(TestIdPack.PROFILE_DIALOG_POPUP_TITLE, "Edit Profile");
+ TestIdPack.COMBO_USER_PROFILE_ROLE_LIST.enyoNode().executeExtension(".setSelected(0)");
+ tap(TestIdPack.BUTTON_USER_PROFILE_APPLY);
+ verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+
+ tap(TestIdPack.BUTTON_SEARCH);
+ write(TestIdPack.FIELD_SEARCH_TEXT,
+ TestIdPack.BUTTON_SEARCHPRODUCT_BASECAMPLANTERN.getRowName());
+ tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
+ tap(TestIdPack.BUTTON_SEARCHPRODUCT_BASECAMPLANTERN);
+ tap(TestIdPack.BUTTON_SEARCHPRODUCT_BASECAMPLANTERN);
+ tap(TestIdPack.BUTTON_MENU);
+ tap(TestIdPack.BUTTON_MENU_RECEIPTDISCOUNTS);
+ tap(TestIdPack.BUTTON_RECEIPTDISCOUNTS_CHECKAPPLYALL);
+ tap(TestIdPack.BUTTON_RECEIPTDISCOUNTS_APPLY);
+ verify(TestIdPack.LABEL_TOTALTOPAY, "105.46");
+ tap(TestIdPack.BUTTON_EDIT);
+
+ tap(TestIdPack.BUTTON_EDIT);
+ boolean result = (boolean) SeleniumHelper
+ .executeScriptWithReturn("!OB.UTIL.isNullOrUndefined(document.getElementById('terminal_containerWindow_pointOfSale_multiColumn_rightPanel_toolbarpane_edit_editTabContent_actionButtonsContainer_returnLine'))");
+ assertThat(result, equalTo(false));
+ isVisible(TestIdPack.BUTTON_EDIT_DELETELINE, true);
+ isVisible(TestIdPack.BUTTON_EDIT_SPLITLINE, true);
+ isVisible(TestIdPack.BUTTON_EDIT_CHECKSTOCK, true);
+ isVisible(TestIdPack.BUTTON_EDIT_DELETEDISCOUNT, true);
+ isVisible(TestIdPack.BUTTON_EDIT_DESCRIPTION, true);
+
+ updatePermission("OBPOS_ActionButtonDelete");
+ reload();
+
+ tap(TestIdPack.BUTTON_EDIT);
+ isVisible(TestIdPack.BUTTON_EDIT_RETURNLINE, true);
+ boolean result1 = (boolean) SeleniumHelper
+ .executeScriptWithReturn("!OB.UTIL.isNullOrUndefined(document.getElementById('terminal_containerWindow_pointOfSale_multiColumn_rightPanel_toolbarpane_edit_editTabContent_actionButtonsContainer_deleteLine'))");
+ assertThat(result1, equalTo(false));
+ isVisible(TestIdPack.BUTTON_EDIT_SPLITLINE, true);
+ isVisible(TestIdPack.BUTTON_EDIT_CHECKSTOCK, true);
+ isVisible(TestIdPack.BUTTON_EDIT_DELETEDISCOUNT, true);
+ isVisible(TestIdPack.BUTTON_EDIT_DESCRIPTION, true);
+
+ updatePermission("OBPOS_ActionButtonDescription");
+ reload();
+
+ tap(TestIdPack.BUTTON_EDIT);
+ isVisible(TestIdPack.BUTTON_EDIT_RETURNLINE, true);
+ isVisible(TestIdPack.BUTTON_EDIT_DELETELINE, true);
+ isVisible(TestIdPack.BUTTON_EDIT_SPLITLINE, true);
+ isVisible(TestIdPack.BUTTON_EDIT_CHECKSTOCK, true);
+ isVisible(TestIdPack.BUTTON_EDIT_DELETEDISCOUNT, true);
+ boolean result2 = (boolean) SeleniumHelper
+ .executeScriptWithReturn("!OB.UTIL.isNullOrUndefined(document.getElementById('terminal_containerWindow_pointOfSale_multiColumn_rightPanel_toolbarpane_edit_editTabContent_actionButtonsContainer_descriptionButton'))");
+ assertThat(result2, equalTo(false));
+
+ updatePermission("OBPOS_ActionButtonSplit");
+ reload();
+
+ tap(TestIdPack.BUTTON_EDIT);
+ isVisible(TestIdPack.BUTTON_EDIT_RETURNLINE, true);
+ isVisible(TestIdPack.BUTTON_EDIT_DELETELINE, true);
+ boolean result3 = (boolean) SeleniumHelper
+ .executeScriptWithReturn("!OB.UTIL.isNullOrUndefined(document.getElementById('terminal_containerWindow_pointOfSale_multiColumn_rightPanel_toolbarpane_edit_editTabContent_actionButtonsContainer_splitlineButton'))");
+ assertThat(result3, equalTo(false));
+ isVisible(TestIdPack.BUTTON_EDIT_CHECKSTOCK, true);
+ isVisible(TestIdPack.BUTTON_EDIT_DELETEDISCOUNT, true);
+ isVisible(TestIdPack.BUTTON_EDIT_DESCRIPTION, true);
+
+ updatePermission("OBPOS_ActionButtonCheckStock");
+ reload();
+
+ tap(TestIdPack.BUTTON_EDIT);
+ isVisible(TestIdPack.BUTTON_EDIT_RETURNLINE, true);
+ isVisible(TestIdPack.BUTTON_EDIT_DELETELINE, true);
+ isVisible(TestIdPack.BUTTON_EDIT_SPLITLINE, true);
+ boolean result4 = (boolean) SeleniumHelper
+ .executeScriptWithReturn("!OB.UTIL.isNullOrUndefined(document.getElementById('terminal_containerWindow_pointOfSale_multiColumn_rightPanel_toolbarpane_edit_editTabContent_actionButtonsContainer_checkStockButton'))");
+ assertThat(result4, equalTo(false));
+ isVisible(TestIdPack.BUTTON_EDIT_DELETEDISCOUNT, true);
+ isVisible(TestIdPack.BUTTON_EDIT_DESCRIPTION, true);
+
+ updatePermission("OBPOS_ActionButtonRemoveDiscount");
+ reload();
+
+ tap(TestIdPack.BUTTON_EDIT);
+ isVisible(TestIdPack.BUTTON_EDIT_RETURNLINE, true);
+ isVisible(TestIdPack.BUTTON_EDIT_DELETELINE, true);
+ isVisible(TestIdPack.BUTTON_EDIT_SPLITLINE, true);
+ isVisible(TestIdPack.BUTTON_EDIT_CHECKSTOCK, true);
+ boolean result5 = (boolean) SeleniumHelper
+ .executeScriptWithReturn("!OB.UTIL.isNullOrUndefined(document.getElementById('terminal_containerWindow_pointOfSale_multiColumn_rightPanel_toolbarpane_edit_editTabContent_actionButtonsContainer_removeDiscountButton'))");
+ assertThat(result5, equalTo(false));
+ isVisible(TestIdPack.BUTTON_EDIT_DESCRIPTION, true);
+
+ } finally {
+ deletePermission();
+ reload();
+ tap(TestIdPack.BUTTON_PAY);
+ tap(TestIdPack.BUTTON_PAY_EXACT);
+ tap(TestIdPack.BUTTON_PAY_DONE);
+ verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+ tap(TestIdPack.BUTTON_MENU);
+ tap(TestIdPack.BUTTON_MENU_USER);
+ tap(TestIdPack.BUTTON_USER_PROFILE);
+ verify(TestIdPack.PROFILE_DIALOG_POPUP_TITLE, "Edit Profile");
+ TestIdPack.COMBO_USER_PROFILE_ROLE_LIST.enyoNode().executeExtension(".setSelected(1)");
+ tap(TestIdPack.BUTTON_USER_PROFILE_APPLY);
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ new OBWait() {
+ @Override
+ protected boolean until(int currentIteration) {
+ if (isShowLoadingActive()) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ @Override
+ protected void timeout() {
+ throw new RuntimeException("Loading window has not finished");
+ }
+ };
+ verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+ }
+ }
+
+ private void createPermission(String preferenceProperty) {
+ new DatabaseHelperInsertUpdateOrDelete()
+ .execute(
+ String
+ .format(
+ "insert into ad_preference(ad_preference_id, ad_client_id, ad_org_id, createdby, updatedby, ad_user_id, value, property, ispropertylist) "
+ + "values('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
+ preferenceID, adClientId, preferenceOrg, adUserId, adUserId, adUserId, "N",
+ preferenceProperty, "Y"), 1);
+ }
+
+ private void updatePermission(String preferenceProperty) {
+ new DatabaseHelperInsertUpdateOrDelete().execute(String.format(
+ "update ad_preference set property = '%s' where ad_preference_id = '%s'",
+ preferenceProperty, preferenceID), 1);
+ }
+
+ private void deletePermission() {
+ new DatabaseHelperInsertUpdateOrDelete().execute(
+ String.format("delete from ad_preference where ad_preference_id = '%s'", preferenceID), 1);
+ }
+
+ private String getUUID() {
+ String randomUUID = UUID.randomUUID().toString();
+ randomUUID = randomUUID.toUpperCase();
+ return randomUUID.replace("-", "");
+ }
+
+ private boolean isShowLoadingActive() {
+ return (boolean) SeleniumHelper
+ .executeScriptWithReturn("OB.MobileApp.view.$.containerLoading.showing");
+ }
+}
|
Relationships [ Relation Graph ]
[ Dependency Graph ]
Relationships 