(OFBIZ-10758)
As of jQuery 3.0, .bind() has been deprecated. It was superseded by the .on() method for attaching event handlers to a document.
Additional change:
Improved boolean returns with single statement, replacing if blocks with explicit boolean return.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1850712 13f79535-47bb-0310-9956-ffa450edef68
(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.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1841650 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-9167)
-go to https://localhost:8443/ordermgr/control/orderentry
-create order for DemoCustomer
-add an item
console output...
java.lang.NullPointerException
at org.apache.ofbiz.content.content.ContentWorker.
renderContentAsText(ContentWorker.java:368) ~[ofbiz.jar:?]
[...]
While at it I also found issues with cartLine.getName() in ftl files. It was
also missing the dispatcher.
This was broken by OFBIZ-9164
Thanks: Wai
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/plugins@1778889 13f79535-47bb-0310-9956-ffa450edef68
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
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1746283 13f79535-47bb-0310-9956-ffa450edef68
WebPos login page getting error "FileNotFoundException" at latest trunk. Here is the error:
Error rendering included template at location [component://webpos/template/Login.ftl]: java.io.FileNotFoundException:
This issue is due to the change done in r1736869. "Login.ftl" was not moved but its reference was changed in "specialpurpose/webpos/widget/CommonScreens.xml ". I found one more file which was not moved "RequirePasswordChange.ftl".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1739427 13f79535-47bb-0310-9956-ffa450edef68
r1736866 for OFBIZ-6816 (humanres)
r1736867 for OFBIZ-6817 (manufacturing)
r1736868 for OFBIZ-6819 (order)
r1736869 for OFBIZ-6837 (webpos)
r1736870 for OFBIZ-6860 (myportal)
r1736876 for OFBIZ-6812 (project)
Partially because I did not revert the changes in screens files and I already restored the *.ftl files (+ ShowProductionRun.groovy) deleted in r1736867 in their initial locations.
I noticed there is another groovy file: OrderReportPrepare.groovy. It's not used OOTB (events in relation with JasperReport commented out in order controller)
Both groovy files will need to be moved to a right location before we move groovy files also.
They might not be the only ones in this case (wrong initial locations)...
Actually I did not review these patches enough when I committed them.
Apart r1736867 (manufacturing), the ftl files were not moved but simply copied from their initial locations to the templates components sub-folders.
In r1736867 the files were not moved but deleted and copied (this maybe a patch effect, not sure we can move files using patches, I'll try)
images
So this simply deletes the templates components sub-folders and their contents
I'll soon properly move the file, in the meantime the trunk will be in an inconsistent state (because of the the changes in screens files not reverted).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1737557 13f79535-47bb-0310-9956-ffa450edef68