Commit Graph
851 Commits
Author SHA1 Message Date
Jacques Le Roux 32e7ea5781 No functional change, completes r179986 which was framework only, this is for
plugins
================================================================================
While checking there were no other cases like in OFBIZ-9432 
(missing path to class), to be consistent I removed the trailing semicolons in 
groovy scripts and made few formatting

================================================================================

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1800450 13f79535-47bb-0310-9956-ffa450edef68
2017-06-30 18:50:22 +00:00
Jacques Le Roux c4191565d9 Fixed: Error running the simple-method: Error running groovy script
(OFBIZ-9432)

Steps to reproduce the error:
Add producs to cart (i.e. 2 x RoundGizmo) 
-> [Quick Checkout] 
-> Checkout Without Login: Quick Checkout 
-> Basic Information: fill in required fields 
-> Continue 

Error: unable to resolve class CartItemModifyException

jleroux: Groovy needs the complete path to CartItemModifyException
Found the same in CustomerEvents.xml

Thanks: Daniel Coric for report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1799860 13f79535-47bb-0310-9956-ffa450edef68
2017-06-26 08:21:34 +00:00
Jacques Le Roux c3107bff70 Fixed: Error running the simple-method: Error running groovy script
(OFBIZ-9432)

Steps to reproduce the error:
Add producs to cart (i.e. 2 x RoundGizmo) 
-> [Quick Checkout] 
-> Checkout Without Login: Quick Checkout 
-> Basic Information: fill in required fields 
-> Continue 

Error: unable to resolve class CartItemModifyException

jleroux: Groovy needs the complete path to CartItemModifyException
There are 2 cases, I have also removed the trailing semicolons

Thanks: Daniel Coric for report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1799859 13f79535-47bb-0310-9956-ffa450edef68
2017-06-26 08:15:35 +00:00
Deepak Dixit a67c08620e Improved: Replace fields with "id-ne", "id-long-ne" and "id-vlong-ne"
with "id", "id-long" and "id-vlong" respectively which are primary keys
(OFBIZ-9351)
Thanks Aditya Sharma for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1796379 13f79535-47bb-0310-9956-ffa450edef68
2017-05-27 11:28:36 +00:00
Deepak Dixit 18894e6dc0 Improved: Inconsistent String Comparisons, Applied plugins groovy patch from jira issue. (OFBIZ-9254)
I found an inconsistency in the code for string comparison statusId.equals("PRUN_COMPLETED") whereas it should be written as "PRUN_COMPLETED".equals(statusId) cause the former can throw NullPointerException if the variable found to be NULL.

Thanks Devanshu Vyas for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1795344 13f79535-47bb-0310-9956-ffa450edef68
2017-05-16 17:36:32 +00:00
Taher A. Alkhateeb ac3b7c14da Fixed: Remove all dependencies from OFBiz framework to plugins
(OFBIZ-9322)
   
This is related to commit r1793170 from ofbiz-trunk where data is moved from
ecommerce to accounting and party components.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1793171 13f79535-47bb-0310-9956-ffa450edef68
2017-04-29 07:09:20 +00:00
Taher A. Alkhateeb bdea0f6740 Implemented: Remove dependencies from OFBiz framework to plugins
(OFBIZ-9322)

This is related to a commit in ofbiz-framework r1792866 in which data 
that is removed in here is added to the framework. There is one modification
to the DemoPurchasing.xml file in which we added a UserLoginSecurityGroup which
is moved from DemoOrderPeopleData.xml because it has dependencies on security
data in ecommerce. Other than that, all data is simply deleted.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1792867 13f79535-47bb-0310-9956-ffa450edef68
2017-04-27 11:40:59 +00:00
Jacques Le Roux 6fd8a8fac2 Fixed: Ecommerce component showing error screen on searchContent from
showcontenttree page
(OFBIZ-9309)

Steps to reproduce:
1.Go to Ecommerce component https://localhost:8443/ecommerce/control/main
2.Click on any of the Content from "Browse Content" section of left panel. 
  It will be directed to https://localhost:8443/ecommerce/control/showcontenttree?contentId=STORE_POLICIES&nodeTrailCsv=STORE_POLICIES
3. Click on Search, it directs to https://localhost:8443/ecommerce/control/searchContent?siteId=STORE_POLICIES
4. Screen renders with ScreenRenderingException

Problem:
1. "searchContent" request directs to "searchContent" screen in 
  ContentScreens.xml.
2. On searchContent screen, "/ecommerce/groovyScripts/content/Search.groovy" 
  script prepares and hits a search query to Lucene.
3. "BooleanQuery" class is used to match documents with other boolean query 
  combinations.
4. BooleanQuery object is initialised with Its default constructor.
5. With Lucene 5.4.0, this constructor is deprecated.
OFBiz migrated to Lucene 6.3.1: OFBIZ-8316

Solution:
From Lucene 5.4.0 default constructor is deprecated and a new inner class 
  Builder is created for queries. Refer OFBIZ-9301 for detailed explanation.

Thanks: Aditya

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1790810 13f79535-47bb-0310-9956-ffa450edef68
2017-04-10 12:05:36 +00:00
Jacques Le Roux 5cd12b29fc Fixed: Missing file results in error
(OFBIZ-9198)

When accessing a file/image in ecomseo (only seo version) that is physically 
missing or the dataresource attribute isPublic=="N" the request results 
in a loop.

jleroux: to break the loop in case or error, I simply decided to return a 
response of type none. I also added the same for io-error which can be returned
by the DataEvents class, also in ecommerce controller

Thanks: Ingo Wolfmayr for report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/plugins@1781662 13f79535-47bb-0310-9956-ffa450edef68
2017-02-04 12:20:41 +00:00
Jacques Le Roux fc3e1db4f6 No functional changes
At http://markmail.org/message/ffmyw773p65fndey I wrote:

I'd like to follow the suggestion I made in the last message of the linked 
thread.
In other words, use
http://subversion.apache.org/docs/release-notes/1.8.html#repos-dictated-config
http://blogs.collab.net/subversion/the-road-to-repository-dictated-configuration-day-2-autoprops
Then this problem would be over. No longer need to check from time to time that
concerned files, have svn:eol-style=native property set
This imply that all OFBiz users use svn > 1.7, but we can inform them, et voilà

Then at markmail.org/message/h3q2yvj4db544ro7 I wrote:

Actually, since we get new committers now and then and their are able to create
new files I have a warning every 6 months which says "Check Java 
files, have all svn:eol-style=native" (I totally forgot that because I assume
the machine knows it and warns me ;))
I could extend that to all files (at least the most prominent types), I'll
see...

This does what the last sentence said for Groovy, XML and few new Birt 
Java files.

I'll see if I can implement the svn 1.8 repos-dictated-config ASAP!




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/plugins@1781219 13f79535-47bb-0310-9956-ffa450edef68
2017-02-01 10:58:46 +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
Jacques Le Roux b6a23201c9 Improved: Demo data for serialized and non-serialised product
(OFBIZ-7766)

Currently, InventoryItemTypeId attribute is empty for all Product entity's demo 
data. In real cases, there are products that are purely serialised 
(like equipments) or purely non-serialised (like liquid). 

Thanks: James Yong

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1775989 13f79535-47bb-0310-9956-ffa450edef68
2016-12-24 19:53:51 +00:00
Jacopo Cappellato c4d4e9d870 Improved: moved the logic/implementation of OFBiz legacy authentication
tokens from the LoginWorker class to a new class named ExternalLoginKeysManager.

Improved Javadocs in the new class.
 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1775807 13f79535-47bb-0310-9956-ffa450edef68
2016-12-23 09:35:26 +00:00
Deepak Dixit 15bc40e491 Reverted: Minilang code readability and consistency improvements done at r#1768222, this commit reversed key and description of drop-down in the code.
(OFBIZ-9114)

Thanks  Wei Zhang for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1772880 13f79535-47bb-0310-9956-ffa450edef68
2016-12-06 12:37:42 +00:00
Christian Geisert cb64e2d4c0 Fixed: Corrected typo which caused calcTaxForDisplay service call to fail (problem with Ecommerce frontend when using showPricesWithVatTax)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1772354 13f79535-47bb-0310-9956-ffa450edef68
2016-12-02 14:30:30 +00:00
Deepak Dixit e914407838 Fixed: Fixed typo introduced in r1768219
Thanks Suraj Khurana for reporting the issue. 



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768662 13f79535-47bb-0310-9956-ffa450edef68
2016-11-08 11:27:13 +00:00
Divesh Dutta ce8d7e1ccc Improvement: Minilang code readability and consistency improvements.
(OFBIZ-8926) (OFBIZ-8927)

Thanks: Ankush Upadhyay for the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768235 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 16:11:36 +00:00
Divesh Dutta a4567c2486 Improvement: Minilang code readability and consistency improvements.
(OFBIZ-8929) (OFBIZ-8930) (OFBIZ-8953) (OFBIZ-8965) (OFBIZ-8972) (OFBIZ-8986) (OFBIZ-8991) 

Thanks: Ankush Upadhyay, Anuj Jain, Abhijeet for your patches. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768222 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:34:00 +00:00
Divesh Dutta 77af05bc8e Improvement: Miniland code readability and consistency improvements
(OFBIZ-8744) (OFBIZ-8745) (OFBIZ-8746) (OFBIZ-8748) (OFBIZ-8829) (OFBIZ-8830) (OFBIZ-8907) (OFBIZ-8908) (OFBIZ-8924) (OFBIZ-8925) 

Thanks: Ankush Upadhyay , Sega patidar , Abhijeet Ashapure for your patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768219 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:14:04 +00:00
Divesh Dutta 3a17676024 Improvement: Minilang code readibility and conistency improvements
(OFBIZ-8445) (OFBIZ-8447) (OFBIZ-8448) (OFBIZ-8450) ( OFBIZ-8451) (OFBIZ-8653) (OFBIZ-8740) (OFBIZ-8741) (OFBIZ-8742) (OFBIZ-8743)

Thanks: Devanshu Vyas, Anuj Jain, Sega Patidar, Abhijeet Ashapure for your patches

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768209 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 12:41:35 +00:00
Divesh Dutta bef0bc4eb3 Improvement: Generic value is null or not should be checked using native checks. Utility method isEmpty or isNotEmpty is not needed to check if generic value is null or not because generic values can never be empty. They can be null or not nulls. So made changes accordingly all over the places.
(OFBIZ-8471)

Thanks: Ratnesh Upadhyay for reporting the improvement and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768192 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 11:27:46 +00:00
Arun Patidar 8bb8f78872 Improved: Removed semicolon from all Groovy files of all components.
(OFBIZ-8652)

Thanks: Rohit Koushal, Jacques Le Roux and Rishi Solanki for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1767764 13f79535-47bb-0310-9956-ffa450edef68
2016-11-02 19:09:13 +00:00
Jacques Le Roux 3e4ba02b0b Improved: demo data cleanup
(OFBIZ-8623)

There was a duplicate entry for product
specialpurpose/ecommerce/data/DemoRentalProduct.xml

Thanks: Wai for report and patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1766663 13f79535-47bb-0310-9956-ffa450edef68
2016-10-26 10:55:09 +00:00
Jacques Le Roux 2a2187a872 Fixed: popup calendar fails for ecomseo et ecommerce
(OFBIZ-8345)

go to https://localhost:8443/ecomseo/editShoppingList
create a new shopping list
make changes to "Shopping List Reorder" pane by clicking on date icon.
nothing happens

This was due to a regression introduced with r1721092

Fixed by reverting and removing useless input of type="text

Thanks: Wai for report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1765055 13f79535-47bb-0310-9956-ffa450edef68
2016-10-15 13:05:47 +00:00
Jacques Le Roux 0a53a9176f Fixed: deleteCustomerTaxAuthInfo page called from /ecommerce/control/viewprofile
(OFBIZ-4106)

Completes previous commits at r1764158/76: removes createCustomerTaxAuthInfo and
 updateCustomerTaxAuthInfo requests which are now useless



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1764178 13f79535-47bb-0310-9956-ffa450edef68
2016-10-10 20:26:56 +00:00
Jacques Le Roux 197327f52f Fixed: deleteCustomerTaxAuthInfo page called from /ecommerce/control/viewprofile
(OFBIZ-4106)

Completes previous commit at r1764158: moves deleteCustomerTaxAuthInfo request 
from ecommerce to order where it's only used


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1764176 13f79535-47bb-0310-9956-ffa450edef68
2016-10-10 20:16:46 +00:00
Jacques Le Roux 08272c1843 Fixed: deleteCustomerTaxAuthInfo page called from /ecommerce/control/viewprofile
(OFBIZ-4106)

As explained on dev ML, I prefers to remove the possibility of creating "Tax 
Identifications and Exemptions". Because users would actually need to have the 
ACCOUNTING_CREATE or ACCOUNTING_ADMIN permissions to do so (or higher admin 
permissions) and opening the accounting (or total) admin right to a customer 
seems not secure to me.

Moreover the same exists in party and it needs admin rights in both places, 
so does not make sense in ecommerce IMO. 

Sharan : The only case I can think of is that a customer may want to manage 
their own tax info. For example if I know my VAT number or Tax number 
- do I add it to my profile, or do I have to wait for it be verified and 
completed by the accounting administrator?
Generally I think companies would want an accounting administrator to take 
control of this type of tax and exemption information (rather than leave it up 
to the customer themselves) as they will need to be responsible for it 
and report on it to their tax authorities so they need to make sure it is correct.

Thanks: Michał Cukierman for report and Sharan for functional confirmation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1764158 13f79535-47bb-0310-9956-ffa450edef68
2016-10-10 17:57:38 +00:00
Jacques Le Roux 494eb5a613 Fixed: cannot edit shopping list for ecommerce and ecomseo
(OFBIZ-8348)

This was previously fixed with r1763686 by Pawan Verma which was correct.
But Scott reported on dev ML that he was surprised by this bare solution. 
We could have kept it because it's js and works, but since we use jQuery and 
for consistencey reason Amardeep suggested to rather 
$('#selectShoppingList').submit()

This reverts r1763686 and applies Amardeep's solution.

It also removes pending work related with OFBIZ-4106. I have asked a question 
about it yesterday and forgot to remove the related change in this unrelated 
commit.

Thanks: Scott for report, Amardeep for patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1763754 13f79535-47bb-0310-9956-ffa450edef68
2016-10-07 12:17:50 +00:00
Jacques Le Roux 917892d7c2 Fixed: cannot edit shopping list for ecommerce and ecomseo
(OFBIZ-8348)

go to https://localhost:8443/ecomseo
login as DemoCustomer
go to https://localhost:8443/ecomseo/editShoppingList
create 2 shopping lists
ofbiz shows the 2 shopping list. but you cannot select the first shopping list 
for editing

Thanks: Wai for report, Pawan Verma for patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1763686 13f79535-47bb-0310-9956-ffa450edef68
2016-10-07 07:29:58 +00:00
Jacques Le Roux 48fa5e42d7 Fixes: Bursted Layout in screen "orderstatus" of ecommerce
(OFBIZ-8265)

Found an issue due to changes at r1761431. We should only show the 
addCommonToCartForm when in status mode, ie when maySelectItems="y"


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1763013 13f79535-47bb-0310-9956-ffa450edef68
2016-10-01 13:54:39 +00:00
Jacques Le Roux 345fc1d6f1 Reverts: Maximise the utilisation of common labels in various applications
(OFBIZ-8102) (OFBIZ-8130)
Reverts r1758774 for OFBIZ-8102 w/o reverting changes which slipped in
Reverts r1761687 for OFBIZ-8130
 
We decided this is not a good way, we prefer to keep the FormFieldTitle_ way


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761923 13f79535-47bb-0310-9956-ffa450edef68
2016-09-22 12:19:46 +00:00
Jacques Le Roux 43c0899000 Fixes: Bursted Layout in screen "orderstatus" of ecommerce
(OFBIZ-8265)

The layout of screen "order status" of application "ecommerce"  is busted .

I save the html of the screen into my local file, and It works fine. I don't know the reason exactly, but the patch attached by me works correctly.

jleroux: after review I agree it's the right way to fix it. OrderStatus.ftl indirectly calls OrderItems.ftl through the orderitems screen so nothing is lost when the addCommonToCartForm is moved from OrderStatus.ftl to OrderItems.ft, it's only a rearrangement which fixes the issue.

Thanks: fumiyoshi.to





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761431 13f79535-47bb-0310-9956-ffa450edef68
2016-09-19 13:06:30 +00:00
Jacques Le Roux ab2ff27084 Improves:E-commerce : FTL formatting
(OFBIZ-7949)

Fixes a typo introduced by r1761135 



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761316 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 10:29:49 +00:00
Jacques Le Roux 34102ee451 Fixes: Bursted Layout in screen "orderstatus" of ecommerce
(OFBIZ-8265)

Reverts r1761305, after testing more I found you can no longer submit an order. I have an idea of the problem but I prefer to revert all for now


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761308 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 08:56:07 +00:00
Jacques Le Roux 43146cbaef Fixes: Bursted Layout in screen "orderstatus" of ecommerce
(OFBIZ-8265)

The layout of screen "order status" of application "ecommerce"  is busted .

I save the html of the screen into my local file, and It works fine.
I don't know the reason exactly, but the patch attached by me works correctly. 

jleroux: after a quick check it seems this does not introduce regression

Thanks: fumiyoshi.to

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761305 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 08:42:42 +00:00
Jacopo Cappellato 96b22285f4 Implemented: removed the "controller" related logic, that is now provided by the
new ControlFilter, from the ContextFilter; modified existing applications to use 
the two filters in a chain; removed from the other specialized filters all the 
logic that was duplicated or extended from ContextFilter.

A web application, in order to leverage the OFBiz framework, requires that a 
series of objects are in its contexts (servlet context, session and request) 
such as "delegator", "delegatorName", "dispatcher", "security" etc. etc...
This setup is performed by the logic contained in the servlet filter implemented 
by the ContextFilter class.
The execution of this logic is required for the application to run properly.
However, before this commit, in the ContextFilter there was other logic, related 
to access control and redirection rules (some of them performed in coordination 
with the ControlServlet), making it difficult to deploy this filter in all the 
web applications, especially the ones that implement special handling of paths.
In fact, this filter was deployed in most but not all the web application in the 
OFBiz codebase: specifically it was not deployed in web applications that 
require the execution of other filters (e.g. CatalogUrlFilter, etc...) like the 
ones in the "ecommerce" and "solr" components.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761304 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 08:08:30 +00:00
Jacopo Cappellato d81dedb9e2 Improved: removed the "ecomclone" web application from the "ecommerce"
component.

This web application was created to provide an example of how to leverage the 
mechanism to extend another web application: since then the mechanism has been 
adopted by most of the other OFBiz applications, making this example no more 
useful.  


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761301 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 06:23:55 +00:00
Jacques Le Roux 40513322ea Fixes: jquery.jgrowl.min.css is linked twice in html page
(OFBIZ-7758)

I am running on trunk rev 1751489 on tomahawk theme. 
In the browser, right-click and view the page source. 
There is duplicate linking of jquery.jgrowl.min.css i.e.

<link rel="stylesheet" href="/images/jquery/plugins/jquery-jgrowl/1.4.1/jquery.jgrowl.min.css" type="text/css"/>

The solution is to remove a hack for JPublish in fex Java classes 
and related changes (mostly "page." in ftl and xml files)

Thanks: Rohit Koushal for the path and James Yong the report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761235 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 13:43:16 +00:00
Pranay Pandey b714fbb6bb Improved: Ecommerce, Ebay - inline js for toggleAll, checkToggle and selectAll calling from ftls
(OFBIZ-7931)

Removed inline js for toggleAll, checkToggle and selectAll calling from ftls in Ecommerce and Ebay component. Add class="selectAll" on parent checkbox element for select all functionality.

Thanks: Amardeep Singh Jhajj for reporting and providing the patch.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761195 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 11:04:58 +00:00
Pranay Pandey 06caedf26a Improved: E-commerce : FTL formatting.
(OFBIZ-7949)

For improved FTL code readability. Here is the first patch for the effort. There are still files which are required to be formatted. 

Thanks: Vaibhav Jain for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761135 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 07:17:15 +00:00
Michael Brohl cebf4c5e5c Improved: Ecommerce: Consistent form name.
(OFBIZ-8105)

Change all form names to upper camel case for consistency.

Thanks: Tanmay Muley for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761108 13f79535-47bb-0310-9956-ffa450edef68
2016-09-16 22:29:26 +00:00
Jacopo Cappellato ec90de6afc Improved: modified classes to use the FORWARDED_FROM_SERVLET constant
defined in the new ControlFilter class.

The old constant defined in ContextFilter will soon be removed together with the 
debug field, that is not currently used.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1760949 13f79535-47bb-0310-9956-ffa450edef68
2016-09-15 15:35:05 +00:00
Jacques Le Roux 2c2a7beb0b Fixes: Display of State/Province for non US entities in the customer's profile of ecommerce
(OFBIZ-8231)

When I access url https://localhost:8443/ecommerce/control/viewprofile for my profile, State/Province display in addresses shows the geo-id, which is fine for US entities where the GeoID is the state code, but for non-us entities, the GeoID is often something like CountryCode-StateCode, which isn't very nice.

Thanks: fumiyoshi.to for report and patch

jleroux: I have slightly changed the patch for 2 reasons:
* check for null exceptions
* use not deprecated version of getRelatedOne()

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1760406 13f79535-47bb-0310-9956-ffa450edef68
2016-09-12 16:47:53 +00:00
Michael Brohl ea40ea08bd Improved: Consistent menu names
(OFBIZ-8118)(OFBIZ-8122)(OFBIZ-8123)(OFBIZ-8124)(OFBIZ-8125)(OFBIZ-8126)(OFBIZ-8127)(OFBIZ-8128)(OFBIZ-8129)

Menu names should be in camel case to maintain consistency. I've slightly modified the provided patch to eliminate names with "-" or all lower case also.

Thanks: Tanmay Muley for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1760059 13f79535-47bb-0310-9956-ffa450edef68
2016-09-09 16:11:55 +00:00
Jacques Le Roux f0b3a97ea5 A patch from Pierre Smits for "Maximise the utilisation of the Label CommonStatus in various ecommerce forms" https://issues.apache.org/jira/browse/OFBIZ-8102
There are forms in the ecommerce component referencing the status. This issue is about applying the CommonLabel label where it is possible in these forms.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1758774 13f79535-47bb-0310-9956-ffa450edef68
2016-09-01 13:34:17 +00:00
Jacques Le Roux 354e809e29 A modified patch from Pierre Smits for "Remove legal statement from existing readme files" https://issues.apache.org/jira/browse/OFBIZ-8085
After commit, please rename readme files of components
manufacturing
assetmaint
birt
ecommerce
lucene
myportal
passport
projectmgr
scrum
solr

jleroux: Due to content I guess Pierre meant to add the .md suffix
I have also removed the useless ASL2 header of example/lib/README file

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1758702 13f79535-47bb-0310-9956-ffa450edef68
2016-09-01 05:11:45 +00:00
Jacques Le Roux 856de5ec8e A modified patch from Pierre Smits for "Remove legal statement from existing readme files" https://issues.apache.org/jira/browse/OFBIZ-8085
Legal statements are not required in readme files, as per consensus in dev mail thread with title 'Shorter ASL2 header in short files'. The mail thread started here: http://ofbiz.markmail.org/message/pc5bzrsiupef7xjt

jleroux: 
I modified 
  the accounting/lib/README file
  the example/lib/README file
Formatted the Birt README file



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1758700 13f79535-47bb-0310-9956-ffa450edef68
2016-09-01 04:53:40 +00:00
Pranay Pandey e44ba95d72 [OFBIZ-7311] - Applied the patch from the ticket. Removing the unused references of the maincss.css from source code, following is done-
1) Removed 'maincss.css' entry from 'allowedPaths' param of from web.xml
Reason: Since, there is no file like 'maincss.css' exist under any includes directory. 
2) Removed the unused references of maincss.css from FTLs, code
<link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/> 
has been removed.
Reason: This is an interesting thing, these FTLs were using the maincss.css located under the images directory.
When I look the history of these files, following were my findings,
The 'maincss.css' file under the 'images' directory exist in release4.0 
http://svn.apache.org/repos/asf/ofbiz/branches/release4.0/framework/images/webapp/images/
after this release, this files no longer exist there.
3) Also, I have updated one file 'InventoryNoticeEmail.ftl' and used the basic HTML code to style, instead of using style defined in 'maincss.css' which were exist in release-4.0
4) Updated some references from 'maincss.css' to style.css in comments.
5) Also removed the entry of including '/images/maincss.css' and '/images/mainrtl.css' in SimpleDecorator
Since, these files no longer exist after release-4.0.

Thanks Wai for reviewing the work and thanks Swapnil M Mane for the contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1758389 13f79535-47bb-0310-9956-ffa450edef68
2016-08-30 13:37:27 +00:00
Jacques Le Roux 9179f9c8ba Fixes "Remove warnings regarding missing component lib folders" - https://issues.apache.org/jira/browse/OFBIZ-7776 - by cleaning/clearing the references to non existent/empty dirs.
Notes: 
* Also removes empty framework/base/lib/scripting and useless applications\content\lib\uno\README (miss doc in wiki)
* When jpim-0.1.jar will be (hopefully) replaced we can drop lib ref in framework/base/ofbiz-component.xml
* I wonder if we should let the geronimo component alone with only 2 classes, could we not put that in entity or entityext?
 
    



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1755306 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 12:27:21 +00:00
Mridul Pathak d50b5b7c6f [OFBIZ-7902] Remove system generated fields from data files of ecommerce component. Thanks Suraj Khurana for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1755304 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 12:08:28 +00:00