Author: adityasharma
Date: Sat Sep 22 05:58:58 2018
New Revision: 1841651
URL: http://svn.apache.org/viewvc?rev=1841651&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/ofbiz-plugins/branches/release17.12/ (props changed)
ofbiz/ofbiz-plugins/branches/release17.12/webpos/template/shortcuts/Shortcuts.ftl
Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 22 05:58:58 2018
@@ -11,4 +11,4 @@
/ofbiz/branches/multitenant20100310/plugins:921280-927264
/ofbiz/branches/release13.07/plugins:1547657
/ofbiz/ofbiz-framework/trunk:1836107
-/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838816
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838816,1841650
Modified:
ofbiz/ofbiz-plugins/branches/release17.12/webpos/template/shortcuts/Shortcuts.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/webpos/template/shortcuts/Shortcuts.ftl?rev=1841651&r1=1841650&r2=1841651&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/branches/release17.12/webpos/template/shortcuts/Shortcuts.ftl
(original)
+++
ofbiz/ofbiz-plugins/branches/release17.12/webpos/template/shortcuts/Shortcuts.ftl
Sat Sep 22 05:58:58 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();
