Commit Graph
44 Commits
Author SHA1 Message Date
Jacques Le Roux db15bad878 From an error found in error.log on demo server
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766800 13f79535-47bb-0310-9956-ffa450edef68
2009-04-20 19:05:14 +00:00
David E. Jones 70f8da92bb Moved logo and icon images back to images component and removed from everywhere else; all references to these should be to there only now; fixes issue with logo in ecommerce and other little things
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766426 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 06:12:55 +00:00
Ashish Vijaywargiya 82780cedae Applied patch from Jira issue OFBIZ-1901 (Class cast exception on doing survey [ take survey ] on Customer Profile).
Framework part has been committed by Jacopo and here is the code snippet changes in applications & special purpose.

Thanks to Vikas Mayur for working on framework part.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766293 13f79535-47bb-0310-9956-ffa450edef68
2009-04-18 10:40:40 +00:00
Jacques Le Roux 08134723d2 In Controller.xml
path="org/ofbiz/(\w*)/(.*)" (.*) => path="component://$1/script/org/ofbiz/$1/$2" $3
path="org/ofbiz/(\w*)/(.*)" => path="component://$1/script/org/ofbiz/$1/$2"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765798 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 23:07:52 +00:00
Marco Risaliti 157b52c1d2 PayPal IPN use the new Payment Gateway Config features (OFBIZ-2286)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764327 13f79535-47bb-0310-9956-ffa450edef68
2009-04-12 21:11:42 +00:00
Jacques Le Roux 999bd7c577 Fix following Chris Howe's message in dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764195 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 13:00:24 +00:00
Jacques Le Roux 3c94bec42b I finally reverted almost all Ashish Nagar's patch from https://issues.apache.org/jira/browse/OFBIZ-2260 - OFBIZ-2260 that I commited after a review but no tests in r762149.
This because these URLs in FTL file were not calling services, hence, as explained David, did not need any changes
I kept only changes I found by chances (because I got conflicts in them) in 
specialpurpose\ecommerce\webapp\ecommerce\order\orderitems.ftl
specialpurpose\ecommerce\webapp\ecommerce\order\orderheader.ftl
applications/order/webapp/ordermgr/order/ordershippinginfo.ftl 
I also added one secured URLs - createShipment2 - in this last file and there are more to do just below : quickDropShipOrder, createShipment. I think we need more than good will and chance here. We need to define a strategy to spot the URLs calling services in ftl files. This does not sound like impossible to automatize and I firmly think we should do that before freezing R9.04


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764077 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 22:09:23 +00:00
David E. Jones 298fbb94ef Fixed issue with data loading I caused when moving this record from the ecommerce component to the order component; reported on the ml by gil portenseigne
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764074 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 22:03:14 +00:00
David E. Jones bc073306e7 Added/moved some missing WebSite data needed for selecting themes, etc
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763828 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 22:12:11 +00:00
Marco Risaliti a657adadf8 Move payment.properties to PaymentGatewayConfig entities (OFBIZ-2269)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763782 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 19:45:31 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacques Le Roux a5042291f7 1st part of an effort to remove trailing spaces
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Bilgin Ismet Ibryam 9c955458a0 Copied aggregated product ajax request from order manager to ecommerce, as it needs to be called using http (but not https).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762642 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 07:36:20 +00:00
Jacques Le Roux 32ea4ee263 A patch from Ashish Nagar "Secure URLs in Freemarker templates files" https://issues.apache.org/jira/browse/OFBIZ-2260
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762224 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:55:07 +00:00
Jacques Le Roux 76f5ca6638 Secure URLs, we don't need to duplicate in from-field when param-name is the same
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762215 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:25:24 +00:00
Ashish Vijaywargiya a5cd8350bc Very small change.
to --> do :-)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762212 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 05:35:04 +00:00
Jacques Le Roux 61a5c1dcf4 A modified patch from Ashish Nagar "Secure URLs in Freemarker templates files" https://issues.apache.org/jira/browse/OFBIZ-2260
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762149 13f79535-47bb-0310-9956-ffa450edef68
2009-04-05 20:16:46 +00:00
Jacques Le Roux d2e3fa2819 Was missing in previous commit (Eclipse edit trap)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762146 13f79535-47bb-0310-9956-ffa450edef68
2009-04-05 20:09:08 +00:00
Jacques Le Roux c262e7e0c9 Securing URLs, link element in screens and menus : 34th and last set + tabs to 4 spaces
End of non regular formattings and other cases.

This is the end of the process, we just have to wait for typos and such now... Hopefully not too much, at least I tried my best.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762022 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 22:12:23 +00:00
Jacques Le Roux ef0137f95b Securing URLs, link element in screens and menus : 26th set + tabs to 4 spaces
We continue to approach the end... But for some exceptions, more than the 2 I found before. I will write a compilation on dev ML at end

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761261 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 12:14:18 +00:00
Jacques Le Roux c414afde0f Securing URLs, link element in screens and menus : 23th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761223 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 10:02:34 +00:00
Bilgin Ismet Ibryam 7e7c1f375a Added an optional "name" attribute to event element in controller.xml This attribute is used only (also required) in events inside
firstvisit, after-login, before-logout, preprocessor and postprocessor elements. Events with same name will be overridden and only the last one will be executed. Overriding works also in cases when a controller.xml includes other controller files.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761220 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 09:47:48 +00:00
Hans Bakker cbbe02a1d8 many cleanups, moved customer requests back into order, fixed the edit contactmech in portal as reported in the mailing list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761186 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:57:09 +00:00
Jacques Le Roux c894ce4036 Securing URLs, link element in screens and menus : 13th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760815 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 08:41:00 +00:00
Jacques Le Roux ca876f93ce Securing URLs, link element in screens and menus : 11th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760789 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 06:16:07 +00:00
Jacques Le Roux 96144462be Securing URLs, link element in screens and menus : 7th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760609 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 20:53:06 +00:00
Jacques Le Roux 9420d30413 Securing URLs, link element in screens and menus : 6th set
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760595 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 20:31:15 +00:00
Jacques Le Roux 9b1837ee68 Securing URLs, link element in screens and menus : 4th set
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760587 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 20:25:15 +00:00
Jacques Le Roux 3fe66ef254 tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759574 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 20:13:03 +00:00
Jacques Le Roux 2f9c37bd22 13th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759564 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 19:56:49 +00:00
Jacques Le Roux efd4862041 10th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
Some hyperlink tag are still not well indented (3 spaces instead of 4), I gave up :/



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759515 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 17:36:08 +00:00
Adam Heath 41d79749f6 Fix lines that *only* have whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759259 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 17:02:05 +00:00
Jacques Le Roux a54a1f2c3c I18n and L10n of promotions details in eCommerce
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@758562 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 08:55:05 +00:00
Adam Heath 5489cff6b1 Fix purely empty whitespace lines, and remove trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757095 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 23:47:19 +00:00
Jacques Le Roux 42cbb5765d 1st set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
Note that some hyperlinks here are commented out and should maybe dropped

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756025 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 14:34:33 +00:00
Vikas Mayur a131758b9e Another new feature from Pranay and Co.
Now Order reservation can be changed manually by setting priority (new field priority on OrderHeader and OrderItemShipGrpInvRes) for the order. This way few orders can be
fulfilled while waiting for sufficient inventory to fulfill large orders.

Applied patch from OFBIZ-2224 (https://issues.apache.org/jira/browse/OFBIZ-2224).
Thanks Pratik Khera and Pranay Pandey.

i18n Note: This commit has three new labels (IMO, they can be moved to common component with names something like CommonHigh, CommonLow etc.)

Pratik, I have done minor changes in the service and they are
1) Used <if-empty field=""> instead of <if> <condition> <if-empty> as this makes the logic more clearer.
2) Removed <condition-list> because their is only one expression in the <entity-condition>
3) Added <clear-field> in the iteration, to make sure that always a new value will be set in the map that is passed to a service and <store-value>  



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756001 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 13:58:08 +00:00
Ashish Vijaywargiya e0b9c086a7 Followed best practice.
Changed location="org/ofbiz/......... to location="component:// in the call-map-processor tag.

Will remove the entries in other files ASAP.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755826 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 04:17:41 +00:00
Jacques Le Roux 0e0519e802 All tabs to 4 spaces in *.groovy, *.java, *.xml
Done with Eclipse S/R "\t"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755696 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 18:43:49 +00:00
Ashish Vijaywargiya 63ff30537f Applied patch from Jira Issue OFBIZ-2242 (Small typos in ecommerce & webpos components)
Thanks Ashish Nagar for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755157 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 09:03:28 +00:00
Marco Risaliti 80f390b7c3 A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755005 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 21:08:21 +00:00
Ashish Vijaywargiya 8f142d1976 Applying patch from OFBIZ-2212 (If subject of verification mail does not exists then also functionality should not be broken.)
Thanks Ashish Nagar for your contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@754837 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 08:11:47 +00:00
David E. Jones d74c5b12eb Fixed a few remaining references to applications/ecommerce, changed to use component://
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@754574 13f79535-47bb-0310-9956-ffa450edef68
2009-03-15 01:23:04 +00:00
David E. Jones f3a4873431 Changed SurveyWrapper to support rendering from a flexible location, ie component://, and changed DemoSurvey data to use component://; fixes issue with ecommerce now that it is in specialpurpose instead of applications
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@754536 13f79535-47bb-0310-9956-ffa450edef68
2009-03-14 21:53:00 +00:00
David E. Jones 80858bb5c1 Moved ecommerce from applications to specialpurpose, as discussed on the dev mailing list; component and build files updates, tested clean build/install/run
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@754529 13f79535-47bb-0310-9956-ffa450edef68
2009-03-14 21:32:16 +00:00