You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/02/08 09:31:47 UTC

svn commit: r1729098 - in /ofbiz/branches/release15.12/specialpurpose/webpos: config/WebPosUiLabels.xml webapp/webpos/shortcuts/Shortcuts.ftl

Author: jleroux
Date: Mon Feb  8 08:31:46 2016
New Revision: 1729098

URL: http://svn.apache.org/viewvc?rev=1729098&view=rev
Log:
Reverts r1720910 was for "Webpos F4-F11 label mismatch" - https://issues.apache.org/jira/browse/OFBIZ-6226
I forgot this was committed before R15.12 creation, so it needs to be reverted there also

Modified:
    ofbiz/branches/release15.12/specialpurpose/webpos/config/WebPosUiLabels.xml
    ofbiz/branches/release15.12/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl

Modified: ofbiz/branches/release15.12/specialpurpose/webpos/config/WebPosUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/webpos/config/WebPosUiLabels.xml?rev=1729098&r1=1729097&r2=1729098&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/webpos/config/WebPosUiLabels.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/webpos/config/WebPosUiLabels.xml Mon Feb  8 08:31:46 2016
@@ -909,7 +909,7 @@
         <value xml:lang="zh">键盘快捷键</value>
         <value xml:lang="zh-TW">鍵盤快速鍵</value>
     </property>
-    <property key="WebPosProductSearch">
+    <property key="WebPosShortcutF1">
         <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="WebPosPartySearch">
+    <property key="WebPosShortcutF2">
         <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="WebPosPayCash">
+    <property key="WebPosShortcutF3">
         <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="WebPosPayCheck">
+    <property key="WebPosShortcutF4">
         <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="WebPosPayPin">
+    <property key="WebPosShortcutF5">
         <value xml:lang="en">Pay Pin</value>
         <value xml:lang="nl">PIN / CHIP</value>
         <value xml:lang="zh">付芯片卡</value>
     </property>
-    <property key="WebPosPayGiftCard">
+    <property key="WebPosShortcutF6">
         <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="WebPosPayByCC">
+    <property key="WebPosShortcutF7">
         <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="WebPosCheckout">
+    <property key="WebPosShortcutF8">
         <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="WebPosChangeQuantity">
+    <property key="WebPosShortcutF9">
         <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="WebPosAddQuantity">
+    <property key="WebPosShortcutF10">
         <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="WebPosSubstractQuantity">
+    <property key="WebPosShortcutF11">
         <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="WebPosEmptyCart">
+    <property key="WebPosShortcutF12">
         <value xml:lang="en">EMPTY CART</value>
         <value xml:lang="it">SVUOTA CARRELLO</value>
         <value xml:lang="ja">空の買い物かご</value>

Modified: ofbiz/branches/release15.12/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl?rev=1729098&r1=1729097&r2=1729098&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl (original)
+++ ofbiz/branches/release15.12/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl Mon Feb  8 08:31:46 2016
@@ -74,17 +74,17 @@ under the License.
         e.preventDefault();
         return false;
     });
-    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", "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", "up", keyUp, "keyUp()", "${uiLabelMap.WebPosShortcutKeyUp}");
     WebPosHotkeys.bind("keydown", "down", keyDown, "keyDown()", "${uiLabelMap.WebPosShortcutKeyDown}");
     updateHotKeys();