svn commit: r1720930 - in /ofbiz/branches/release12.04/specialpurpose/webpos: config/WebPosUiLabels.xml webapp/webpos/shortcuts/Shortcuts.ftl

[Mridul Pathak-5]

Author: mridulpathak
Date: Sat Dec 19 14:17:41 2015
New Revision: 1720930

URL: http://svn.apache.org/viewvc?rev=1720930&view=rev
Log:
[OFBIZ-6226] Webpos F4-F11 label mismatch. Applying patch from OFBIZ-6226. Thanks Christian Carlow for reporting the issue and providing the initial patch. Thanks Suraj Khurana for providing the improved patch. Applying fix from trunk r1720910.

Modified:
    ofbiz/branches/release12.04/specialpurpose/webpos/config/WebPosUiLabels.xml
    ofbiz/branches/release12.04/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl

Modified: ofbiz/branches/release12.04/specialpurpose/webpos/config/WebPosUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/webpos/config/WebPosUiLabels.xml?rev=1720930&r1=1720929&r2=1720930&view=diff
==============================================================================
--- ofbiz/branches/release12.04/specialpurpose/webpos/config/WebPosUiLabels.xml (original)
+++ ofbiz/branches/release12.04/specialpurpose/webpos/config/WebPosUiLabels.xml Sat Dec 19 14:17:41 2015
@@ -648,47 +648,47 @@
         <value xml:lang="en">Keyboard Shortcuts</value>
         <value xml:lang="it">Tasti funzione</value>
     </property>
-    <property key="WebPosShortcutF1">
+    <property key="WebPosProductSearch">
         <value xml:lang="en">PRODUCT SEARCH</value>
         <value xml:lang="it">RICERCA PRODOTTO</value>
     </property>
-    <property key="WebPosShortcutF2">
+    <property key="WebPosPartySearch">
         <value xml:lang="en">PARTY SEARCH</value>
         <value xml:lang="it">RICERCA SOGGETTO</value>
     </property>
-    <property key="WebPosShortcutF3">
+    <property key="WebPosPayCash">
         <value xml:lang="en">PAY CASH</value>
         <value xml:lang="it">PAGA IN CONTANTI</value>
     </property>
-    <property key="WebPosShortcutF4">
+    <property key="WebPosPayCheck">
         <value xml:lang="en">PAY CHECK</value>
         <value xml:lang="it">PAGA CON ASSEGNO</value>
     </property>
-    <property key="WebPosShortcutF5">
+    <property key="WebPosPayGiftCard">
         <value xml:lang="en">PAY GIFT CARD</value>
         <value xml:lang="it">PAGA C.REGALO</value>
     </property>
-    <property key="WebPosShortcutF6">
+    <property key="WebPosPayByCC">
         <value xml:lang="en">PAY BY CC</value>
         <value xml:lang="it">PAGA C.CREDITO</value>
     </property>
-    <property key="WebPosShortcutF7">
+    <property key="WebPosCheckout">
         <value xml:lang="en">CHECKOUT</value>
         <value xml:lang="it">CHECKOUT</value>
     </property>
-    <property key="WebPosShortcutF8">
+    <property key="WebPosChangeQuantity">
         <value xml:lang="en">CHANGE QUANTITY</value>
         <value xml:lang="it">CAMBIA QUANTITA'</value>
     </property>
-    <property key="WebPosShortcutF9">
+    <property key="WebPosAddQuantity">
         <value xml:lang="en">ADD QUANTITY</value>
         <value xml:lang="it">AGGIUNGI QUANTITA'</value>
     </property>
-    <property key="WebPosShortcutF10">
+    <property key="WebPosSubtractQuantity">
         <value xml:lang="en">SUBTRACT QUANTITY</value>
         <value xml:lang="it">SOTTRAI QUANTITA'</value>
     </property>
-    <property key="WebPosShortcutF11">
+    <property key="WebPosEmptyCart">
         <value xml:lang="en">EMPTY CART</value>
         <value xml:lang="it">SVUOTA CARRELLO</value>
     </property>

Modified: ofbiz/branches/release12.04/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl?rev=1720930&r1=1720929&r2=1720930&view=diff
==============================================================================
--- ofbiz/branches/release12.04/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl (original)
+++ ofbiz/branches/release12.04/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl Sat Dec 19 14:17:41 2015
@@ -74,17 +74,17 @@ under the License.
         e.preventDefault();
         return false;
     });
-    WebPosHotkeys.bind("keydown", "f1", productToSearchFocus, "productToSearchFocus()", "${uiLabelMap.WebPosShortcutF1}");
-    WebPosHotkeys.bind("keydown", "f2", partyToSearchFocus, "partyToSearchFocus()", "${uiLabelMap.WebPosShortcutF2}");
-    WebPosHotkeys.bind("keydown", "f3", payCash, "payCash()", "${uiLabelMap.WebPosShortcutF3}");
-    WebPosHotkeys.bind("keydown", "f4", payCheck, "payCheck()", "${uiLabelMap.WebPosShortcutF4}");
-    WebPosHotkeys.bind("keydown", "f5", payGiftCard, "payGiftCard()", "${uiLabelMap.WebPosShortcutF5}");
-    WebPosHotkeys.bind("keydown", "f6", payCreditCard, "payCreditCard()", "${uiLabelMap.WebPosShortcutF6}");
-    WebPosHotkeys.bind("keydown", "f7", payFinish, "payFinish()", "${uiLabelMap.WebPosShortcutF7}");
-    WebPosHotkeys.bind("keydown", "f8", itemQuantityFocus, "itemQuantityFocus()", "${uiLabelMap.WebPosShortcutF8}");
-    WebPosHotkeys.bind("keydown", "f9", incrementItemQuantity, "incrementItemQuantity()", "${uiLabelMap.WebPosShortcutF9}");
-    WebPosHotkeys.bind("keydown", "f10", decrementItemQuantity, "decrementItemQuantity()", "${uiLabelMap.WebPosShortcutF10}");
-    WebPosHotkeys.bind("keydown", "f11", emptyCart, "emptyCart()", "${uiLabelMap.WebPosShortcutF11}");
+    WebPosHotkeys.bind("keydown", "f1", productToSearchFocus, "productToSearchFocus()", "${uiLabelMap.WebPosProductSearch}");
+    WebPosHotkeys.bind("keydown", "f2", partyToSearchFocus, "partyToSearchFocus()", "${uiLabelMap.WebPosPartySearch}");
+    WebPosHotkeys.bind("keydown", "f3", payCash, "payCash()", "${uiLabelMap.WebPosPayCash}");
+    WebPosHotkeys.bind("keydown", "f4", payCheck, "payCheck()", "${uiLabelMap.WebPosPayCheck}");
+    WebPosHotkeys.bind("keydown", "f5", payGiftCard, "payGiftCard()", "${uiLabelMap.WebPosPayGiftCard}");
+    WebPosHotkeys.bind("keydown", "f6", payCreditCard, "payCreditCard()", "${uiLabelMap.WebPosPayByCC}");
+    WebPosHotkeys.bind("keydown", "f7", payFinish, "payFinish()", "${uiLabelMap.WebPosCheckout}");
+    WebPosHotkeys.bind("keydown", "f8", itemQuantityFocus, "itemQuantityFocus()", "${uiLabelMap.WebPosChangeQuantity}");
+    WebPosHotkeys.bind("keydown", "f9", incrementItemQuantity, "incrementItemQuantity()", "${uiLabelMap.WebPosAddQuantity}");
+    WebPosHotkeys.bind("keydown", "f10", decrementItemQuantity, "decrementItemQuantity()", "${uiLabelMap.WebPosSubtractQuantity}");
+    WebPosHotkeys.bind("keydown", "f11", emptyCart, "emptyCart()", "${uiLabelMap.WebPosEmptyCart}");
     WebPosHotkeys.bind("keydown", "up", keyUp, "keyUp()", "${uiLabelMap.WebPosShortcutKeyUp}");
     WebPosHotkeys.bind("keydown", "down", keyDown, "keyDown()", "${uiLabelMap.WebPosShortcutKeyDown}");
     updateHotKeys();