Author: mridulpathak
Date: Sat Dec 19 13:01:44 2015
New Revision: 1720910
URL: http://svn.apache.org/viewvc?rev=1720910&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.
Modified:
ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl
Modified: ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml?rev=1720910&r1=1720909&r2=1720910&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml Sat Dec 19
13:01:44 2015
@@ -909,7 +909,7 @@
<value xml:lang="zh">é®çå¿«æ·é®</value>
<value xml:lang="zh-TW">éµç¤å¿«ééµ</value>
</property>
- <property key="WebPosShortcutF1">
+ <property key="WebPosProductSearch">
<value xml:lang="en">PRODUCT SEARCH</value>
<value xml:lang="it">RICERCA PRODOTTO</value>
<value xml:lang="ja">製åæ¤ç´¢</value>
@@ -917,7 +917,7 @@
<value xml:lang="zh">产åæç´¢</value>
<value xml:lang="zh-TW">ç¢åæå°</value>
</property>
- <property key="WebPosShortcutF2">
+ <property key="WebPosPartySearch">
<value xml:lang="en">PARTY SEARCH</value>
<value xml:lang="it">RICERCA SOGGETTO</value>
<value xml:lang="ja">åå¼å
æ¤ç´¢</value>
@@ -925,7 +925,7 @@
<value xml:lang="zh">ä¼åæç´¢</value>
<value xml:lang="zh-TW">åé«æå°</value>
</property>
- <property key="WebPosShortcutF3">
+ <property key="WebPosPayCash">
<value xml:lang="en">PAY CASH</value>
<value xml:lang="it">PAGA IN CONTANTI</value>
<value xml:lang="ja">ç¾éæ¯æ</value>
@@ -933,7 +933,7 @@
<value xml:lang="zh">ä»ç°é</value>
<value xml:lang="zh-TW">ä»ç¾é</value>
</property>
- <property key="WebPosShortcutF4">
+ <property key="WebPosPayCheck">
<value xml:lang="en">PAY CHECK</value>
<value xml:lang="it">PAGA CON ASSEGNO</value>
<value xml:lang="ja">å°åææ¯æ</value>
@@ -941,12 +941,12 @@
<value xml:lang="zh">ä»æ¯ç¥¨</value>
<value xml:lang="zh-TW">ä»æ¯ç¥¨</value>
</property>
- <property key="WebPosShortcutF5">
+ <property key="WebPosPayPin">
<value xml:lang="en">Pay Pin</value>
<value xml:lang="nl">PIN / CHIP</value>
<value xml:lang="zh">ä»è¯çå¡</value>
</property>
- <property key="WebPosShortcutF6">
+ <property key="WebPosPayGiftCard">
<value xml:lang="en">PAY GIFT CARD</value>
<value xml:lang="it">PAGA C.REGALO</value>
<value xml:lang="ja">ï½·ï¾ï¾ï¾ï½¶ï½°ï¾ï¾æ¯æ</value>
@@ -954,7 +954,7 @@
<value xml:lang="zh">ä»ç¤¼åå¡</value>
<value xml:lang="zh-TW">ä»ç¦®ç©å¡</value>
</property>
- <property key="WebPosShortcutF7">
+ <property key="WebPosPayByCC">
<value xml:lang="en">PAY BY CC</value>
<value xml:lang="it">PAGA C.CREDITO</value>
<value xml:lang="ja">ｶｰï¾ï¾æ¯æ</value>
@@ -962,35 +962,35 @@
<value xml:lang="zh">ä»ä¿¡ç¨å¡</value>
<value xml:lang="zh-TW">ä»ä¿¡ç¨å¡</value>
</property>
- <property key="WebPosShortcutF8">
+ <property key="WebPosCheckout">
<value xml:lang="en">CHECKOUT</value>
<value xml:lang="it">CHECKOUT</value>
<value xml:lang="ja">ï¾ï½ªï½¯ï½¸ï½±ï½³ï¾</value>
<value xml:lang="zh">ç»è´¦</value>
<value xml:lang="zh-TW">çµå¸³</value>
</property>
- <property key="WebPosShortcutF9">
+ <property key="WebPosChangeQuantity">
<value xml:lang="en">CHANGE QUANTITY</value>
<value xml:lang="it">CAMBIA QUANTITA'</value>
<value xml:lang="ja">æ°éå¤æ´</value>
<value xml:lang="zh">ä¿®æ¹æ°é</value>
<value xml:lang="zh-TW">ä¿®æ¹æ¸é</value>
</property>
- <property key="WebPosShortcutF10">
+ <property key="WebPosAddQuantity">
<value xml:lang="en">ADD QUANTITY</value>
<value xml:lang="it">AGGIUNGI QUANTITA'</value>
<value xml:lang="ja">æ°éå ç®</value>
<value xml:lang="zh">å¢å æ°é</value>
<value xml:lang="zh-TW">å¢å æ¸é</value>
</property>
- <property key="WebPosShortcutF11">
+ <property key="WebPosSubstractQuantity">
<value xml:lang="en">SUBTRACT QUANTITY</value>
<value xml:lang="it">SOTTRAI QUANTITA'</value>
<value xml:lang="ja">æ°éæ¸ç®</value>
<value xml:lang="zh">åå°æ°é</value>
<value xml:lang="zh-TW">æ¸å°æ¸é</value>
</property>
- <property key="WebPosShortcutF12">
+ <property key="WebPosEmptyCart">
<value xml:lang="en">EMPTY CART</value>
<value xml:lang="it">SVUOTA CARRELLO</value>
<value xml:lang="ja">空ã®è²·ãç©ãã</value>
Modified:
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl?rev=1720910&r1=1720909&r2=1720910&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl
(original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl Sat
Dec 19 13:01:44 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.WebPosSubstractQuantity}");
+ 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();
