Author: adityasharma
Date: Sat Sep 22 06:47:14 2018 New Revision: 1841655 URL: http://svn.apache.org/viewvc?rev=1841655&view=rev Log: Applied fix from trunk for revision: 1841650 === Fixed: Webpos Keyboard Shortcut keys does not work correctly (OFBIZ-7945) Updated wrong function calls in switch case of activateHotKeys(). As support for Pin Payment transactions is still to be added under OFBIZ-5241. Commented code for Pin payment transaction and updated other shortcuts accordingly. Modified: ofbiz/branches/release16.11/specialpurpose/webpos/template/shortcuts/Shortcuts.ftl Modified: ofbiz/branches/release16.11/specialpurpose/webpos/template/shortcuts/Shortcuts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/webpos/template/shortcuts/Shortcuts.ftl?rev=1841655&r1=1841654&r2=1841655&view=diff ============================================================================== --- ofbiz/branches/release16.11/specialpurpose/webpos/template/shortcuts/Shortcuts.ftl (original) +++ ofbiz/branches/release16.11/specialpurpose/webpos/template/shortcuts/Shortcuts.ftl Sat Sep 22 06:47:14 2018 @@ -43,24 +43,27 @@ under the License. payCheck(); break; case 116: - payGiftCard(); + //TODO: To be implemented with OFBIZ-5241 break; case 117: - payCreditCard(); + payGiftCard(); break; case 118: - payFinish(); + payCreditCard(); break; case 119: - itemQuantityFocus(); + payFinish(); break; case 120: - incrementItemQuantity(); + itemQuantityFocus(); break; case 121: - decrementItemQuantity(); + incrementItemQuantity(); break; case 122: + decrementItemQuantity(); + break; + case 123: emptyCart(); break; case 38: @@ -78,13 +81,15 @@ under the License. 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}"); + <!--TODO: To be implemented with OFBIZ-5241--> + <!--WebPosHotkeys.bind("keydown", "f5", payPin, "", "${uiLabelMap.WebPosShortcutF5}");--> + WebPosHotkeys.bind("keydown", "f6", payGiftCard, "payGiftCard()", "${uiLabelMap.WebPosShortcutF6}"); + WebPosHotkeys.bind("keydown", "f7", payCreditCard, "payCreditCard()", "${uiLabelMap.WebPosShortcutF7}"); + WebPosHotkeys.bind("keydown", "f8", payFinish, "payFinish()", "${uiLabelMap.WebPosShortcutF8}"); + WebPosHotkeys.bind("keydown", "f9", itemQuantityFocus, "itemQuantityFocus()", "${uiLabelMap.WebPosShortcutF9}"); + WebPosHotkeys.bind("keydown", "f10", incrementItemQuantity, "incrementItemQuantity()", "${uiLabelMap.WebPosShortcutF10}"); + WebPosHotkeys.bind("keydown", "f11", decrementItemQuantity, "decrementItemQuantity()", "${uiLabelMap.WebPosShortcutF11}"); + WebPosHotkeys.bind("keydown", "f12", emptyCart, "emptyCart()", "${uiLabelMap.WebPosShortcutF12}"); WebPosHotkeys.bind("keydown", "up", keyUp, "keyUp()", "${uiLabelMap.WebPosShortcutKeyUp}"); WebPosHotkeys.bind("keydown", "down", keyDown, "keyDown()", "${uiLabelMap.WebPosShortcutKeyDown}"); updateHotKeys(); |
Free forum by Nabble | Edit this page |