svn commit: r825444 - in /ofbiz/trunk: framework/guiapp/src/org/ofbiz/guiapp/xui/ specialpurpose/pos/config/ specialpurpose/pos/src/org/ofbiz/pos/screen/

Author: jleroux
Date: Thu Oct 15 09:19:40 2009
New Revision: 825444

URL: http://svn.apache.org/viewvc?rev=825444&view=rev
Log:
New swipWithCard property in parameters.properties, only used in ClientProfile.java for card number field for now
+
* Suppress serial warning
* Better French translation
* replace ShowKeyboardInSaveSale by showKeyboardInSaveSale in Java code

Modified:
    ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java
    ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml
    ofbiz/trunk/specialpurpose/pos/config/parameters.properties
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java

Modified: ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java?rev=825444&r1=825443&r2=825444&view=diff
==============================================================================
--- ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java (original)
+++ ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java Thu Oct 15 09:19:40 2009
@@ -131,6 +131,7 @@
         return xuiSession;
     }
 
+    @SuppressWarnings("serial")
     class XuiScreen extends XApplet {
         protected String startupProperties = "";
 

Modified: ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml?rev=825444&r1=825443&r2=825444&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml Thu Oct 15 09:19:40 2009
@@ -98,7 +98,7 @@
     <property key="PosCredNo">
         <value xml:lang="en">Enter Card Number:</value>
         <value xml:lang="es">Ingrese número de tarjeta :</value>
-        <value xml:lang="fr">Entrez le n° de la carte :</value>
+        <value xml:lang="fr">Entrez le n° de carte :</value>
         <value xml:lang="it">Inserire Numero Carta:</value>
         <value xml:lang="ro">Introduceti Numarul Cartii:</value>
         <value xml:lang="zh">输入卡号:</value>

Modified: ofbiz/trunk/specialpurpose/pos/config/parameters.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/parameters.properties?rev=825444&r1=825443&r2=825444&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/config/parameters.properties (original)
+++ ofbiz/trunk/specialpurpose/pos/config/parameters.properties Thu Oct 15 09:19:40 2009
@@ -18,6 +18,9 @@
 #
 ### Miscellaneous parameters
 
-# Used with a touch screen to allow showing vituals keyboards (alpha and keypad).
+# Used with a touch screen to allow showing vituals keyboards (alpha and keypad). True by default
 # For now this properties is used with both. Maybe at some point we will need both in the same screen.
-ShowKeyboardInSaveSale=Y
\ No newline at end of file
+ShowKeyboardInSaveSale=Y
+# Used with MSR to allow to force swiping from card when showKeyboardInSaveSale is also true
+# For instance the card number in Client Profile screen. False by default
+SwipWithCard=N

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java?rev=825444&r1=825443&r2=825444&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java Thu Oct 15 09:19:40 2009
@@ -77,7 +77,8 @@
     protected static PosTransaction m_trans = null;
     protected String m_type = null;
     protected boolean cancelled = false;
-    private static boolean ShowKeyboardInSaveSale = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y");
+    private static boolean showKeyboardInSaveSale = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y");
+    private static boolean swipWithCard = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "SwipWithCard", "N");    
     private static Locale locale = Locale.getDefault();
     private String m_partyId = null;
 
@@ -160,7 +161,7 @@
     }
 
     public synchronized void editName() {
-        if (wasMouseClicked() && ShowKeyboardInSaveSale) {
+        if (wasMouseClicked() && showKeyboardInSaveSale) {
             try {
                 Keyboard keyboard = new Keyboard(m_pos);
                 keyboard.setText(m_nameEdit.getText());
@@ -174,7 +175,7 @@
     }
 
     public synchronized void editEmail() {
-        if (wasMouseClicked() && ShowKeyboardInSaveSale) {
+        if (wasMouseClicked() && showKeyboardInSaveSale) {
             try {
                 Keyboard keyboard = new Keyboard(m_pos);
                 keyboard.setText(m_emailEdit.getText());
@@ -188,7 +189,7 @@
     }
 
     public synchronized void editPhone() {
-        if (wasMouseClicked() && ShowKeyboardInSaveSale) {
+        if (wasMouseClicked() && showKeyboardInSaveSale) {
             try {
                 NumericKeypad numericKeypad = new NumericKeypad(m_pos);
                 numericKeypad.setMinus(true);
@@ -203,7 +204,7 @@
     }
 
     public synchronized void editCard() {
-        if (wasMouseClicked() && ShowKeyboardInSaveSale) {
+        if (wasMouseClicked() && showKeyboardInSaveSale && !swipWithCard) {
             try {
                 NumericKeypad numericKeypad = new NumericKeypad(m_pos);
                 numericKeypad.setMinus(true);

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java?rev=825444&r1=825443&r2=825444&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java Thu Oct 15 09:19:40 2009
@@ -65,7 +65,7 @@
     protected static PosTransaction m_trans = null;
     protected String m_type = null;
     protected boolean cancelled = false;
-    private static boolean ShowKeyboardInSaveSale = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y");
+    private static boolean showKeyboardInSaveSale = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y");
 
     //TODO : make getter and setter for members (ie m_*) if needed (extern calls). For that in Eclipse use Source/Generate Getters and setters
 
@@ -146,7 +146,7 @@
     }
 
     public synchronized void editAmount() {
-        if (wasMouseClicked() && ShowKeyboardInSaveSale) {
+        if (wasMouseClicked() && showKeyboardInSaveSale) {
             try {
                 NumericKeypad numericKeypad = new NumericKeypad(m_pos);
                 numericKeypad.setMinus(true);

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java?rev=825444&r1=825443&r2=825444&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java Thu Oct 15 09:19:40 2009
@@ -53,7 +53,7 @@
     //protected XButton m_saveAndPrint = null; //FIXME : button does not exist yet
     protected static PosTransaction m_trans = null;
     public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage(PosTransaction.resource,"PosDateTimeFormat",Locale.getDefault()));
-    private static boolean ShowKeyboardInSaveSale = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y");
+    private static boolean showKeyboardInSaveSale = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y");
 
     //TODO : make getter and setter for members (ie m_*) if needed (extern calls).  For that in Eclipse use Source/Generate Getters and setters
 
@@ -128,7 +128,7 @@
     }
 
     public synchronized void editSaleName() {
-        if (wasMouseClicked() && ShowKeyboardInSaveSale) {
+        if (wasMouseClicked() && showKeyboardInSaveSale) {
             try {
                 Keyboard keyboard = new Keyboard(m_pos);
                 keyboard.setText(m_saleName.getText());