Author: jleroux
Date: Tue May 31 14:37:07 2016
New Revision: 1746283
URL: http://svn.apache.org/viewvc?rev=1746283&view=rev
Log:
Patches from Amardeep Singh Jhajj for "Missing UiLabels for shortcuts in
webpos" https://issues.apache.org/jira/browse/OFBIZ-7144
I found missing UiLabels for shortcuts in webpos in trunk and Release 14.12, it
was committed in Release 15.12 at -r1729098. I think you somehow missed to
commit it in trunk and Release 14.12. Please have a look on patches attached
and commit it in their respective branches.
jleroux:
I was curious about that so I checked and it's "a bit" more complicated. This
is related with OFBIZ-6226 where Mridul Pathak committed in
Trunk - r1720910
14.12 - r1720916
12.04 - r1720930
But there was duplicated labels so I partially reverted (only the duplicated
labels) at
Trunk - r1726529
14.12 - r1726539
12.04 - r1726540
Later I noticed r1720910 was committed in Trunk before R15.12 creation, so I
reverted there also at revision: 1729098, but not partially hence the
inconsistency. But actually I should have reverted all everywhere!
Remains that Mridul and Suraj were somewhere right. Like them I don't like the
names of the labels, I believe that (eg) WebPosCheckout is far better than
WebPosShortcutF7. So they were partiallly wrong at OFBIZ-6226, they duplicated
labels but the names would be better if they were not refering to keyboard keys
numbers...
I did not take care of R12.04
Modified:
ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl
ofbiz/trunk/specialpurpose/webpos/template/shortcuts/Shortcuts.ftl
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=1746283&r1=1746282&r2=1746283&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
Tue May 31 14:37:07 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();
Modified: ofbiz/trunk/specialpurpose/webpos/template/shortcuts/Shortcuts.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/template/shortcuts/Shortcuts.ftl?rev=1746283&r1=1746282&r2=1746283&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/template/shortcuts/Shortcuts.ftl
(original)
+++ ofbiz/trunk/specialpurpose/webpos/template/shortcuts/Shortcuts.ftl Tue May
31 14:37:07 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();
