Author: jleroux
Date: Tue Nov 3 09:24:26 2009
New Revision: 832358
URL: http://svn.apache.org/viewvc?rev=832358&view=rev
Log:
File names consistency and show right screen at end of payment (I think this
needs a little clean up, will do ASAP)
Added:
ofbiz/trunk/specialpurpose/pos/screens/800x600/includes/promostatusbar.xml
- copied unchanged from r832328,
ofbiz/trunk/specialpurpose/pos/screens/800x600/includes/statusbar.xml
ofbiz/trunk/specialpurpose/pos/screens/default/includes/promostatusbar.xml
- copied unchanged from r832328,
ofbiz/trunk/specialpurpose/pos/screens/default/includes/statusbar.xml
Removed:
ofbiz/trunk/specialpurpose/pos/screens/800x600/includes/statusbar.xml
ofbiz/trunk/specialpurpose/pos/screens/default/includes/statusbar.xml
Modified:
ofbiz/trunk/specialpurpose/pos/screens/800x600/mgrpanel.xml
ofbiz/trunk/specialpurpose/pos/screens/800x600/paypanel.xml
ofbiz/trunk/specialpurpose/pos/screens/800x600/pospanel.xml
ofbiz/trunk/specialpurpose/pos/screens/800x600/promopanel.xml
ofbiz/trunk/specialpurpose/pos/screens/default/mgrpanel.xml
ofbiz/trunk/specialpurpose/pos/screens/default/paypanel.xml
ofbiz/trunk/specialpurpose/pos/screens/default/pospanel.xml
ofbiz/trunk/specialpurpose/pos/screens/default/promopanel.xml
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PromoStatusBar.java
Modified: ofbiz/trunk/specialpurpose/pos/screens/800x600/mgrpanel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/800x600/mgrpanel.xml?rev=832358&r1=832357&r2=832358&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/800x600/mgrpanel.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/800x600/mgrpanel.xml Tue Nov 3
09:24:26 2009
@@ -33,7 +33,7 @@
<Include file="800x600/includes/numeric"/>
</Panel>
<Panel name="statusPanel" x="0" y="580" w="800" h="20"
style="operTitle" border="0">
- <Include file="800x600/includes/statusbar"/>
+ <Include file="800x600/includes/promostatusbar"/>
</Panel>
</Panel>
</Components>
Modified: ofbiz/trunk/specialpurpose/pos/screens/800x600/paypanel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/800x600/paypanel.xml?rev=832358&r1=832357&r2=832358&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/800x600/paypanel.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/800x600/paypanel.xml Tue Nov 3
09:24:26 2009
@@ -33,7 +33,7 @@
<Include file="800x600/includes/numeric"/>
</Panel>
<Panel name="statusPanel" x="0" y="580" w="800" h="20"
style="operTitle" border="0">
- <Include file="800x600/includes/statusbar"/>
+ <Include file="800x600/includes/promostatusbar"/>
</Panel>
</Panel>
</Components>
Modified: ofbiz/trunk/specialpurpose/pos/screens/800x600/pospanel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/800x600/pospanel.xml?rev=832358&r1=832357&r2=832358&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/800x600/pospanel.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/800x600/pospanel.xml Tue Nov 3
09:24:26 2009
@@ -33,7 +33,7 @@
<Include file="800x600/includes/numeric"/>
</Panel>
<Panel name="statusPanel" x="0" y="580" w="800" h="20"
style="operTitle" border="0">
- <Include file="800x600/includes/statusbar"/>
+ <Include file="800x600/includes/promostatusbar"/>
</Panel>
</Panel>
</Components>
Modified: ofbiz/trunk/specialpurpose/pos/screens/800x600/promopanel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/800x600/promopanel.xml?rev=832358&r1=832357&r2=832358&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/800x600/promopanel.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/800x600/promopanel.xml Tue Nov 3
09:24:26 2009
@@ -33,7 +33,7 @@
<Include file="800x600/includes/numeric"/>
</Panel>
<Panel name="statusPanel" x="0" y="580" w="800" h="20"
style="operTitle" border="0">
- <Include file="800x600/includes/statusbar"/>
+ <Include file="800x600/includes/promostatusbar"/>
</Panel>
</Panel>
</Components>
Modified: ofbiz/trunk/specialpurpose/pos/screens/default/mgrpanel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/default/mgrpanel.xml?rev=832358&r1=832357&r2=832358&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/default/mgrpanel.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/default/mgrpanel.xml Tue Nov 3
09:24:26 2009
@@ -33,7 +33,7 @@
<Include file="default/includes/numeric"/>
</Panel>
<Panel name="statusPanel" x="0" y="744" w="1024" h="20"
style="operTitle" border="0">
- <Include file="default/includes/statusbar"/>
+ <Include file="default/includes/promostatusbar"/>
</Panel>
</Panel>
</Components>
Modified: ofbiz/trunk/specialpurpose/pos/screens/default/paypanel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/default/paypanel.xml?rev=832358&r1=832357&r2=832358&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/default/paypanel.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/default/paypanel.xml Tue Nov 3
09:24:26 2009
@@ -33,7 +33,7 @@
<Include file="default/includes/numeric"/>
</Panel>
<Panel name="statusPanel" x="0" y="744" w="1024" h="20"
style="operTitle" border="0">
- <Include file="default/includes/statusbar"/>
+ <Include file="default/includes/promostatusbar"/>
</Panel>
</Panel>
</Components>
Modified: ofbiz/trunk/specialpurpose/pos/screens/default/pospanel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/default/pospanel.xml?rev=832358&r1=832357&r2=832358&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/default/pospanel.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/default/pospanel.xml Tue Nov 3
09:24:26 2009
@@ -33,7 +33,7 @@
<Include file="default/includes/numeric"/>
</Panel>
<Panel name="statusPanel" x="0" y="744" w="1024" h="20"
style="operTitle" border="0">
- <Include file="default/includes/statusbar"/>
+ <Include file="default/includes/promostatusbar"/>
</Panel>
</Panel>
</Components>
Modified: ofbiz/trunk/specialpurpose/pos/screens/default/promopanel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/default/promopanel.xml?rev=832358&r1=832357&r2=832358&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/default/promopanel.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/default/promopanel.xml Tue Nov 3
09:24:26 2009
@@ -33,7 +33,7 @@
<Include file="default/includes/numeric"/>
</Panel>
<Panel name="statusPanel" x="0" y="744" w="1024" h="20"
style="operTitle" border="0">
- <Include file="default/includes/statusbar"/>
+ <Include file="default/includes/promostatusbar"/>
</Panel>
</Panel>
</Components>
Modified:
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PromoStatusBar.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PromoStatusBar.java?rev=832358&r1=832357&r2=832358&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PromoStatusBar.java
(original)
+++
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PromoStatusBar.java
Tue Nov 3 09:24:26 2009
@@ -25,6 +25,7 @@
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.pos.PosTransaction;
+import org.ofbiz.pos.event.NavagationEvents;
import org.ofbiz.pos.screen.PosScreen;
public class PromoStatusBar {
@@ -64,6 +65,7 @@
statusbarPromoCode.setText("");
XEdit statusbarClient = promoStatusBar.getStatusbarClient();
statusbarClient.setText("");
+ m_pos.showPage("paypanel");
} else {
statusbarPromoCode.setText("");
statusbarClient.setText("");
