Return-Path: X-Original-To: apmail-ofbiz-commits-archive@www.apache.org Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 28FC2182AF for ; Sat, 19 Dec 2015 13:29:33 +0000 (UTC) Received: (qmail 13086 invoked by uid 500); 19 Dec 2015 13:29:33 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 13044 invoked by uid 500); 19 Dec 2015 13:29:33 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 13035 invoked by uid 99); 19 Dec 2015 13:29:32 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Dec 2015 13:29:32 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 822731A147C for ; Sat, 19 Dec 2015 13:29:32 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.246 X-Spam-Level: * X-Spam-Status: No, score=1.246 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 3q8bYK1GGYPI for ; Sat, 19 Dec 2015 13:29:30 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id A9D1720D7B for ; Sat, 19 Dec 2015 13:29:29 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id C3892E0428 for ; Sat, 19 Dec 2015 13:29:28 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id C17F03A023D for ; Sat, 19 Dec 2015 13:29:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1720916 - in /ofbiz/branches/release14.12/specialpurpose/webpos: config/WebPosUiLabels.xml webapp/webpos/shortcuts/Shortcuts.ftl Date: Sat, 19 Dec 2015 13:29:28 -0000 To: commits@ofbiz.apache.org From: mridulpathak@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151219132928.C17F03A023D@svn01-us-west.apache.org> Author: mridulpathak Date: Sat Dec 19 13:29:28 2015 New Revision: 1720916 URL: http://svn.apache.org/viewvc?rev=1720916&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/release14.12/specialpurpose/webpos/config/WebPosUiLabels.xml ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl Modified: ofbiz/branches/release14.12/specialpurpose/webpos/config/WebPosUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/webpos/config/WebPosUiLabels.xml?rev=1720916&r1=1720915&r2=1720916&view=diff ============================================================================== --- ofbiz/branches/release14.12/specialpurpose/webpos/config/WebPosUiLabels.xml (original) +++ ofbiz/branches/release14.12/specialpurpose/webpos/config/WebPosUiLabels.xml Sat Dec 19 13:29:28 2015 @@ -909,7 +909,7 @@ 键盘快捷键 鍵盤快速鍵 - + PRODUCT SEARCH RICERCA PRODOTTO 製品検索 @@ -917,7 +917,7 @@ 产品搜索 產品搜尋 - + PARTY SEARCH RICERCA SOGGETTO 取引先検索 @@ -925,7 +925,7 @@ 会员搜索 團體搜尋 - + PAY CASH PAGA IN CONTANTI 現金支払 @@ -933,7 +933,7 @@ 付现金 付現金 - + PAY CHECK PAGA CON ASSEGNO 小切手支払 @@ -941,11 +941,11 @@ 付支票 付支票 - + Pay Pin PIN / CHIP - + PAY GIFT CARD PAGA C.REGALO ｷﾞﾌﾄｶｰﾄﾞ支払 @@ -953,7 +953,7 @@ 付礼品卡 付禮物卡 - + PAY BY CC PAGA C.CREDITO ｶｰﾄﾞ支払 @@ -961,35 +961,35 @@ 付信用卡 付信用卡 - + CHECKOUT CHECKOUT ﾁｪｯｸｱｳﾄ 结账 結帳 - + CHANGE QUANTITY CAMBIA QUANTITA' 数量変更 修改数量 修改數量 - + ADD QUANTITY AGGIUNGI QUANTITA' 数量加算 增加数量 增加數量 - + SUBTRACT QUANTITY SOTTRAI QUANTITA' 数量減算 减少数量 減少數量 - + EMPTY CART SVUOTA CARRELLO 空の買い物かご Modified: ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl?rev=1720916&r1=1720915&r2=1720916&view=diff ============================================================================== --- ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl (original) +++ ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl Sat Dec 19 13:29:28 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();