Commit Graph
47 Commits
Author SHA1 Message Date
Jacques Le Roux c72b29cb1f 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@883549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:41:34 +00:00
Jacques Le Roux 8ae9319710 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.size == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883492 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 20:34:27 +00:00
Jacques Le Roux c5d92b38a9 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@881975 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 22:43:32 +00:00
Ashish Vijaywargiya c8b6576edd 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@834473 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 14:14:52 +00:00
Ashish Vijaywargiya 28f12bc714 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@834385 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 08:37:40 +00:00
Ashish Vijaywargiya 16fe50949c 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@832680 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 08:38:58 +00:00
Ashish Vijaywargiya be2c9f302a 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@832678 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 08:27:44 +00:00
Marco Risaliti a16992350a Some missing italian translations of googlecheckout component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829599 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 15:08:08 +00:00
Adrian Crum a4d68934c9 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@821643 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 00:08:27 +00:00
Ashish Vijaywargiya 2a5926b236 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@820993 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 12:50:54 +00:00
Jacques Le Roux b7a941d4f6 Revert r813307 on Adrian's request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813893 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 16:02:01 +00:00
Jacques Le Roux a7430a2fc2 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@813307 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:41:19 +00:00
Jacques Le Roux 7befd1d25e no tabs but 4 spaces in code files (*.ftl, *.gro*, *.java, *.xml)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804935 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 11:01:25 +00:00
Jacques Le Roux 4c442ee379 Some fusiness
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804895 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 08:20:38 +00:00
Ashish Vijaywargiya d50dddd48c 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@781689 13f79535-47bb-0310-9956-ffa450edef68
2009-06-04 09:14:51 +00:00
Andrew Zeneski e8273906ed 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@781653 13f79535-47bb-0310-9956-ffa450edef68
2009-06-04 05:23:54 +00:00
Andrew Zeneski 32cba7ff09 added google certs to default trust store
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@781502 13f79535-47bb-0310-9956-ffa450edef68
2009-06-03 18:39:44 +00:00
Andrew Zeneski 878bef04a9 implemented returns/refunds in google checkout
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@781109 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 18:11:05 +00:00
Ashish Vijaywargiya 9ea968c619 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@780981 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 09:31:13 +00:00
Ashish Vijaywargiya d28a2d1c71 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@780948 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 06:14:08 +00:00
Andrew Zeneski 23159c5271 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@780725 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 17:02:46 +00:00
Ashish Vijaywargiya daeebc1c8d 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@780501 13f79535-47bb-0310-9956-ffa450edef68
2009-05-31 20:16:04 +00:00
Andrew Zeneski 93407b4598 now sending error message back to google
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@780330 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 21:16:02 +00:00
Ashish Vijaywargiya 05c48de954 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@780310 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 19:13:39 +00:00
Andrew Zeneski 7a75f4c3e6 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@780306 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 17:47:08 +00:00
Andrew Zeneski e4cee797a8 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@780283 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 15:25:04 +00:00
Ashish Vijaywargiya 5ff148c091 Minor change to overcome from NullPointerException.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@780276 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 14:36:38 +00:00
Ashish Vijaywargiya dd6828ddc8 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@780257 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 12:58:05 +00:00
Ashish Vijaywargiya 712547bfbb 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@780226 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 10:04:31 +00:00
Andrew Zeneski 45c6fa6f41 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@780153 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 00:35:09 +00:00
Ashish Vijaywargiya 44a0e60fd7 For now we are providing the option to send cart info to the Google Checkout.
So anonymous user can also do checkout after selecting cart lines items.

No need to secure services for now.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779935 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 11:23:16 +00:00
Ashish Vijaywargiya beb12298fc For now we are enabling link to checkout using Google Checkout.
For using this feature you may need to create Merchant Account in the Google Checkout area.

We can disable this links if anyone think otherwise but the idea of keeping these links on ecommerce is that the End User knows that this feature also exists in OFBiz and could use it accordingly.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779910 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 10:02:35 +00:00
Ashish Vijaywargiya 5ae3c2bc05 Here comes the first pass to create order in OFBiz from the notification message coming from the google checkout server.
For more details please have a look on the jira issue: OFBIZ-2545 (Create Order and Party information using google notification)

This is collaborative effort from Andrew Zeneski, Vivek Mishra, Arun Patidar, Anurag Singh Sengar & Me.
Thanks guys for giving a good head start to this feature.

More exciting features are coming soon in this area, so please stay tuned.
Thanks !

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779907 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 09:43:39 +00:00
Andrew Zeneski ac47c0d2ef added google checkout lib for notification implementation which is in progress (OFBIZ-2520)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779837 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 04:33:17 +00:00
Ashish Vijaywargiya 8c70045416 Added new service connectToGoogleCheckoutServer.
For more details please see jira issue: OFBIZ-2538 (Create a service to establish a connection with Google Checkout server)

Thanks Anurag for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779514 13f79535-47bb-0310-9956-ffa450edef68
2009-05-28 09:53:06 +00:00
Ashish Vijaywargiya 565ecdcc1d Now in the event we can fetch the productStoreId from ProductStoreWorker.getProductStoreId(request)
I have tested it and working fine ... this enhancement will help us to process order coming as the notification from Google Checkout.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779141 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 12:24:56 +00:00
Ashish Vijaywargiya eb6fbff60b For processing of external order we were in the need of productStoreId to create shopping cart object.
Added the WebSite entity record and associated the productStoreId with it.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779132 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 12:06:09 +00:00
Ashish Vijaywargiya 2b4843d7cd Renaming the google folder to googlecheckout for keeping consistency as that of other component.
webapp name as "google" creates confusion
Also changed the reference.

 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779116 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 11:34:41 +00:00
Ashish Vijaywargiya 3f9e98f839 Adding Seed data for Google Checkout. New Sales Channel and New PaymentMethodType introduced.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779078 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 10:15:08 +00:00
Ashish Vijaywargiya 0ea3e54f4e Missing license added.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778608 13f79535-47bb-0310-9956-ffa450edef68
2009-05-26 08:08:17 +00:00
Ashish Vijaywargiya e8860bff40 Adding few more files in the googlecheckout so that developer can easily sync up in the development of java code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778561 13f79535-47bb-0310-9956-ffa450edef68
2009-05-26 05:13:42 +00:00
Ashish Vijaywargiya 5aba4ad196 Adding URL for OrderProcessing API, functionality will be implemented soon.
With the help of this URL we can send request of cancel-order, refund-order, charge-order etc to the Google Checkout server.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777639 13f79535-47bb-0310-9956-ffa450edef68
2009-05-22 17:55:37 +00:00
Ashish Vijaywargiya 5417d84de4 Updated comment as per Vikas's Wish.
More verbose details provided for the user.

Thanks Vikas for your nice thought on this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777405 13f79535-47bb-0310-9956-ffa450edef68
2009-05-22 06:56:47 +00:00
Ashish Vijaywargiya 008c97bdab Added one comment to understand what is present in OFBiz for now.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777391 13f79535-47bb-0310-9956-ffa450edef68
2009-05-22 06:24:54 +00:00
Ashish Vijaywargiya c5b6d45500 You should use the following two lines only in case of troubleshooting.
<property-to-field resource="googleCheckout" property="request" field="request"/>
or 
<property-to-field resource="googleCheckout" property="diagnose" field="diagnose"/>

While fetching the response from sandbox or production server (for redirecting cart) you should not suffix any of the above value. Only complete URL is required and that's all we need to navigate to Google Checkout area.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777010 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 08:41:18 +00:00
Ashish Vijaywargiya db94eddc76 The sandbox & production URL changed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776285 13f79535-47bb-0310-9956-ffa450edef68
2009-05-19 11:53:54 +00:00
Ashish Vijaywargiya 5570c330a5 For keeping the folder name consistent I am renaming googleCheckout to googlecheckout.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776254 13f79535-47bb-0310-9956-ffa450edef68
2009-05-19 09:55:24 +00:00