Commit Graph
17 Commits
Author SHA1 Message Date
Michael Brohl d5731824c2 Implemented: Remove the user login security question.
(OFBIZ-11244)

Thanks Wiebke Pätzold for providing the patch.
2020-03-13 17:35:45 +01:00
Aditya Sharma baabf6b25d Improved: Replace jQuery.bind() with jQuery.on()
(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
2019-01-08 05:08:40 +00:00
Suraj Khurana 6e84e0983f Fixed: Multiple records are shown in search modal in webpos.
(OFBIZ-10314)
Thanks Archana Asthana for reporting and Shikha Jaiswal for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1844957 13f79535-47bb-0310-9956-ffa450edef68
2018-10-27 12:47:45 +00:00
Aditya Sharma 4703e7f373 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.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1841650 13f79535-47bb-0310-9956-ffa450edef68
2018-09-22 05:52:53 +00:00
Deepak Dixit 443411cdf4 Improved: Use application/javascript instead of text/javascript
(OFBIZ-10492)
Replace text/javascript with application/javascript in all the script tag

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1836889 13f79535-47bb-0310-9956-ffa450edef68
2018-07-28 11:50:09 +00:00
Deepak Dixit 1f164336e9 Improved: Remove use of deprecated language attribute from script tag
(OFBIZ-10491)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1836546 13f79535-47bb-0310-9956-ffa450edef68
2018-07-24 11:27:20 +00:00
Arun Patidar 45b2329dc2 Improved: Set autocomplete to off for all the password fields. (OFBIZ-9471)
Thanks Ritesh Kumar for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1801325 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 21:15:25 +00:00
Arun Patidar 93ff2adff5 Improved: Inconsistent String Comparisons (OFBIZ-9254)
Thanks Devanshu Vyas for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1801282 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 12:39:58 +00:00
Jacques Le Roux 008e962b5c Fixed: add item to order cause exception
(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
2017-01-15 07:37:35 +00:00
Deepak Dixit 8f3141cd46 (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Jacques Le Roux 4b8d9a9aed 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

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1746283 13f79535-47bb-0310-9956-ffa450edef68
2016-05-31 14:37:07 +00:00
Pranay Pandey cb040dd7a7 [OFBIZ-7042] Fixed "Forgot your password" process for Web POS. On clicking "Forgot your password" link from Web POS login page, system was navigating to blank page.
Thanks Amardeep Singh Jhajj for reporting the issue and providing patch for the same.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1744041 13f79535-47bb-0310-9956-ffa450edef68
2016-05-16 12:34:36 +00:00
Jacques Le Roux 9d99df86de Fixes "POS login page getting error "FileNotFoundException"." reported by Amardeep Singh Jhajj at https://issues.apache.org/jira/browse/OFBIZ-7007
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
2016-04-16 07:59:10 +00:00
Jacques Le Roux e9818f4a83 After r1737565 for OFBIZ-6837 (webpos) moves back images folder (with only .css and .js files) from template to webapp
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1737566 13f79535-47bb-0310-9956-ffa450edef68
2016-04-03 09:52:33 +00:00
Jacques Le Roux e7be1664a2 Following partial revert of r1736869 for OFBIZ-6837 (webpos), this moves the *.ftl files from webapp to template subfolders
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1737565 13f79535-47bb-0310-9956-ffa450edef68
2016-04-03 09:43:27 +00:00
Jacques Le Roux 6326ca24a4 This partially reverts the changes done by
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
2016-04-03 09:10:47 +00:00
Jacques Le Roux 2b5e4f3c34 A patch from Pierre Smits for <<relocate .ftl files in the wepbpos component>> https://issues.apache.org/jira/browse/OFBIZ-6837
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1736869 13f79535-47bb-0310-9956-ffa450edef68
2016-03-28 11:15:43 +00:00