Commit Graph
67 Commits
Author SHA1 Message Date
Sascha Rodekamp 02e1dc0cd0 Update - Update the jQuery library to version 1.5.1. A few changes were necessary for this step. I updated the jQuery flot library to the current release, because the old one doesn't work with the new jQuery version, i also updated the jsTree Plugin to make it work with the new jQuery Version.
Note in jQuery 1.5 the implementation of the ajax function has been changed.

For more Information have a look at: http://blog.jquery.com/2011/01/31/jquery-15-released/


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1082916 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 13:37:29 +00:00
Marco Risaliti 2edf34dd98 Remove all compilation warnings of ShoppingCart/ShoppingCartItem and related invoked methods (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1068103 13f79535-47bb-0310-9956-ffa450edef68
2011-02-07 20:29:21 +00:00
Marco Risaliti 573f9b2a30 Internationalization of java services for googlebase/googlecheckout components (OFBIZ-4091)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1063423 13f79535-47bb-0310-9956-ffa450edef68
2011-01-25 19:43:17 +00:00
Adam Heath 5b3b7e0c99 Finally created a script to find and fix tons of missing final newlines.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@982870 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 04:46:48 +00:00
Scott Gray 485787acac Replace usage of deprecated method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@982144 13f79535-47bb-0310-9956-ffa450edef68
2010-08-04 07:28:25 +00:00
Adam Heath 0f8f2093e3 Fix a bunch of no final newline issues.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@965918 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:21 +00:00
Jacques Le Roux e263a69b74 A patch from BJ Freeman "complete web.xml for error reporting" (https://issues.apache.org/jira/browse/OFBIZ-3820) - OFBIZ-3820
BJ: when there is an error, the control servlet looks for an error path in <param-name>allowedPaths</param-name>
it does not find one throwing an exception which buries the orginal error.
instead of changing the code it is just easier to add the /error: path.
then the real error gets reported correctly.

JLR: This will maybe help to better understand some errors on demo servers, and can't hurt

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@954135 13f79535-47bb-0310-9956-ffa450edef68
2010-06-12 20:47:08 +00:00
Jacques Le Roux 0d6f2776e4 <author>None</author> is totally useless and we don't need an author OOTB
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@949101 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28 05:41:23 +00:00
Jacques Le Roux be88f832a2 Not sure why, but my regexp S/R in the commit r948846 boke some formatting. I also removed some useless other stuff in this commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@948852 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:45:59 +00:00
Jacques Le Roux ef2a1c044c We don't need
<copyright>Copyright 2001-.* The Apache Software Foundation</copyright>
<copyright><year>.*</year><holder>Apache Foundation</holder></copyright>
<copyright><year>.*</year><holder>Apache Foundation.</holder></copyright>
<owner>Copyright 2001-.* The Apache Software Foundation</owner>

Less to update every year!

Thanks to BJ 1st effort at "update files from 2009 to 2010" (https://issues.apache.org/jira/browse/OFBIZ-3783) - OFBIZ-3783

Note: there are been a lot of efforts in 2009: there are plenty of data dated from this year!

I hope I did not broke anything (should not, but of course I did not try all changes...) Anyway, this can be easily reverted...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@948846 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:23:22 +00:00
Vikas Mayur e1710daef2 Fixed a bug in vendor return. The service getReturnableItems returns a map containing the returable quantity corresponding to an item along with
certain other things. Earlier this service was returning an empty map for a purchase order and a vendor return. On order detail page action 
block there is a check on this map and if the map comes out to be empty the system does not show the options to create return for the 
purchase order. Similary if you create a vendor return directly from the Return Header screen and try to add items on the Return Item screen
using an order Id, this display a message "No returnable items found for order" 

Also the method sendItemsShipped in the service sendGoogleShipRequest was throwing a NPE because the code try to pull a product through
ItemIssuance > OrderItem > Product

In the vendor return of type refund the items are issued to the return shipment and a purchase return invoice is generated and hence the process
is not linked to any Order. Adding a condition on the ECA so that this service is not invoked.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@940851 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 13:35:19 +00:00
Jacques Le Roux a7b8bf52d9 A patch from Bob Morley "Resolve java warnings exposed in Eclipse (googlebase & googlecheckout part of OFBIZ-3100)" https://issues.apache.org/jira/browse/OFBIZ-3597 - OFBIZ-3597
I just replaced a few tabs



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@932855 13f79535-47bb-0310-9956-ffa450edef68
2010-04-11 09:06:03 +00:00
Scott Gray f2d920cfaa Correct some wrong location paths
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@931789 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 05:52:43 +00:00
Vikas Mayur ab3dfaf2a5 Special Purpose application should not have OFBTOOLS permission in the component base permission set. Not sure of shark component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@930839 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 11:14:54 +00:00
Adam Heath 585863454b Fix trailing whitespace, and mixed tab/space at the beginning of lines.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@899812 13f79535-47bb-0310-9956-ffa450edef68
2010-01-15 21:00:23 +00:00
Adam Heath 59dabfc7e6 Remove most docs targets, they are all the same anyways.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@894031 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:28:48 +00:00
Adam Heath 79268b7635 Convert all javadoc calls to use fileset instead of sourcepath; this
allows excludes to be processed correctly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@894030 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:24:20 +00:00
Adam Heath e98eaeed80 Add a classes target to common.xml, and switch most build.xml to use it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@894024 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:16:56 +00:00
Adam Heath aff93c1ef4 Switch all javac15 to javac16.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@894022 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:12:04 +00:00
Jacques Le Roux d4be6c5659 Some easy documentation (cwiki) links changes following r888510
I have found a way to fix tinylinks :D http://confluence.atlassian.com/pages/viewpage.action?pageId=162988142

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@888559 13f79535-47bb-0310-9956-ffa450edef68
2009-12-08 20:23:23 +00:00
Jacques Le Roux 0698881e24 Use UtilValidate.isNotEmpty methods instead of (obj != null) || (obj.length > 0) and (obj != null) || (obj.size > 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@883549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:41:34 +00:00
Jacques Le Roux 960fcda57d Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.size == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@883492 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 20:34:27 +00:00
Jacques Le Roux f9d1d10b3c A patch from Erwan de FERRIERES "showHelp missing in oagis and googlecheckout components" (https://issues.apache.org/jira/browse/OFBIZ-3221) - OFBIZ-3221
Last showHelps calls missing, I think that are the lasts ones.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@881975 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 22:43:32 +00:00
Ashish Vijaywargiya e4ce2bcc17 Applied fix from jira issue OFBIZ-3158 - Send item shipped request from OFBiz to Google in a collection instead of sending multiple request for each item shipped.
The last implementation was blocking Quick Ship Entire order processing.
Thanks Ratnesh for reporting the bug and Arun for quick fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@834473 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 14:14:52 +00:00
Ashish Vijaywargiya ae8e76a291 Applied patch from jira issue OFBIZ-3158 - Send item shipped request from OFBiz to Google in a collection instead of sending multiple request for each item shipped.
Following points are covered in this implementation:

1) Send item shipped request from OFBiz to Google in a collection instead of sending multiple request for each item shipped.
2) Also show limitation messages for Google orders, while updating manual adjustments from order detail page.

Thanks Pranay / Arun  for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@834385 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 08:37:40 +00:00
Ashish Vijaywargiya abead6215f Applied patch from jira issue - OFBIZ-3139 - Correct refunded amount does not go to Google Checkout when we returns more than 1 qty of a item.
When we creates return for orders placed through Google Checkout then correct refunded amount does not go to Google Checkout.

Thanks Pranay / Arun for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@832680 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 08:38:58 +00:00
Ashish Vijaywargiya 72979ec5c3 Applied patch from jira issue - OFBIZ-3140 - Process payment notification from Google Checkout in ofbiz.
Process payment notification of Authorization, Capture and Refund from Google Checkout in ofbiz.

Thanks Pranay / Arun for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@832678 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 08:27:44 +00:00
Marco Risaliti 07cd66feae Some missing italian translations of googlecheckout component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@829599 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 15:08:08 +00:00
Adrian Crum acfba61db1 Converted GenericDelegator concrete class references to Delegator interface references.
This commit requires ant clean. Also, external libraries that reference GenericDelegator will need to be updated.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@821643 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 00:08:27 +00:00
Ashish Vijaywargiya c012499cf9 Based on Pranay's Proposal on Dev Mailing list for changing shipmentMethodName field type from "id-ne" to "id-long-ne".
I saw five +1 vote on thread "Proposal for change in entity "GoogleCoShippingMethod"" and considering that this entity was recently introduced so this change will not create any problem.

Thanks Pranay for raising this issue as a proposal infront of community.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@820993 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 12:50:54 +00:00
Jacques Le Roux 908f1a521f Revert r813307 on Adrian's request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@813893 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 16:02:01 +00:00
Jacques Le Roux 3585b3ea94 A modified patch from Erwan de FERRIERES '"Automatic" sortable table headers" (https://issues.apache.org/jira/browse/OFBIZ-2921) - OFBIZ-2921
I was planning to wait longer, but I can't wait more. I have added a lot of small trivial changes in this patch and they are blocking me to go further on other issues...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@813307 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:41:19 +00:00
Jacques Le Roux f85e998f2c no tabs but 4 spaces in code files (*.ftl, *.gro*, *.java, *.xml)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@804935 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 11:01:25 +00:00
Jacques Le Roux eae9d2668f Some fusiness
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@804895 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 08:20:38 +00:00
Ashish Vijaywargiya 57b30f153a Changed the name of entities as it was exceeding the maximum length i.e 30.
Reported by Hans on Dev mailing list. Thanks Hans.

There are two reason of choosing "Co" pattern for the entities.

1) I haven't seen any such pattern in OFBiz to define entity in which you have three or more capital letter coming in b/w.
Like for General Ledger, GlAccount is used OOTB.

2) In database it will split the table name to Google_C_O_Shipping_Method if we keep the name GoogleCOShippingMethod.
So it looks like you have some new word starting with "C" and another new word starting with "O"
But if we keep the name GoogleCoShippingMethod then it will split the name into "Google_Co_Shipping_Method"





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@781689 13f79535-47bb-0310-9956-ffa450edef68
2009-06-04 09:14:51 +00:00
Andrew Zeneski c5ce98937e only run the cancel item event if a single item is cancelled, if all items are cancelled the order status change will run instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@781653 13f79535-47bb-0310-9956-ffa450edef68
2009-06-04 05:23:54 +00:00
Andrew Zeneski 2691a4d143 added google certs to default trust store
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@781502 13f79535-47bb-0310-9956-ffa450edef68
2009-06-03 18:39:44 +00:00
Andrew Zeneski 5325baa3b3 implemented returns/refunds in google checkout
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@781109 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 18:11:05 +00:00
Ashish Vijaywargiya 1a46331d4c Instead of fetching values from cart for the grand total we should fetch the value from the info object.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@780981 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 09:31:13 +00:00
Ashish Vijaywargiya 4ee3adb754 For now we are sending only Cart Info to google and on completion of order in Google area user can return back to the owner website to purchase some other products. So we should empty the old cart first and then will navigate user to main page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@780948 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 06:14:08 +00:00
Andrew Zeneski 33144a7019 fixed bug when tracking numbers are null (causing a rollback of quickship); added status vs oldstatus condition check to ecas
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@780725 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 17:02:46 +00:00
Ashish Vijaywargiya d64ff1b743 Following things are included in this commit.
1) Added the UI's for the configuration entities introduced in previous commit.
This will help to avoid the restarting of server. (Previously values were maintained in the property files) 

2) Renamed those two configuration entities to more closely follow the GoogleCheckout naming pattern.
The idea behind renaming of entity is that in future we can have other feature coming from Google so at that time GoogleConfiguration entity will be bit confusing.IMO this entities are introduced before few days(1 or 2 days) and I am sure no one is using these entities in Production so we will be safe by this change in the initial phase of google checkout.

Thanks to myself :)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@780501 13f79535-47bb-0310-9956-ffa450edef68
2009-05-31 20:16:04 +00:00
Andrew Zeneski 10ec51bebf now sending error message back to google
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@780330 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 21:16:02 +00:00
Ashish Vijaywargiya c87f1ddc6e For testing new entity GoogleConfiguration providing new seed data.
GUI should be provided very soon to update the configurations.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@780310 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 19:13:39 +00:00
Andrew Zeneski c39e163fcc implemented data driven configuration for google checkout; basic configuration now is configured using the GoogleConfiguration entity. Allowing each product store to have completely different settings. Moved the the static URLs to a new properties file which will remain if/when the old code is deprecated.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@780306 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 17:47:08 +00:00
Andrew Zeneski 7e03940ab4 fixed package name and description; added intial pass of db based configuration (commented out until its implemetned and tested)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@780283 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 15:25:04 +00:00
Ashish Vijaywargiya 00ef62e0e6 Minor change to overcome from NullPointerException.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@780276 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 14:36:38 +00:00
Ashish Vijaywargiya d14fc74b12 productStoreId is not required in service definition. It can be fetched from ShoppingCart object.
Also remove the redundant code and fetched base price instead of itemSubTotal.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@780257 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 12:58:05 +00:00
Ashish Vijaywargiya 4686fbfe5f Minor fix.
Field name used was wrong.

Thanks Ratnesh for reporting this bug off the list.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@780226 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 10:04:31 +00:00
Andrew Zeneski 5de5e8f437 1. re-implemented google checkout (send shopping cart) using the java API
2. enhanced the create order code
3. finished implementation of cancel, capture and ship notifications (Order Processing API to Google)
4. implemented order state change notification
5. added place holders for other notification messages
6. added controller event for processing incoming messages (/googlecheckout/control/handleMessage)
7. added new entity to map shipping methods to support w/ google and link them to internal shipping methods
8. added ecas to prevent certain order changes which cannot be support by Google (adding items, changng quanities)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@780153 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 00:35:09 +00:00