Commit Graph

128 Commits

Author SHA1 Message Date
Bounmy Stephane 287eee48a1 dirty fix store_credit_callback 2012-05-22 23:26:11 +02:00
Bounmy Stephane 9d2c8fda03 update order on paypal checkout 2012-05-21 23:01:52 +02:00
Scott Wagner 09df0aaf4a Update app/controllers/spree/checkout_controller_decorator.rb 2012-05-16 13:02:48 -07:00
Steve Root 1a59c10d19 missing comma 2012-05-12 11:08:09 +01:00
Steve Root 4bc99e2fb7 Reworked based on Radar's directions 2012-05-12 11:00:57 +01:00
Steve Root e4fe2f9129 fixes asset_url failing if logo is absolute url 2012-05-10 12:37:32 +01:00
Ryan Bigg f7b2775b7e Add missing paypalexpressuk partial and clean up the related class some
Fixes #49
2012-05-02 10:50:39 -05:00
Ryan Bigg 7e018fb2d2 Need to call after_complete state callback so that session[:order_id] is nil'd after successful order. Related to #48. 2012-05-02 10:38:51 -05:00
Ryan Bigg 5ab0b9d6be Explicitly set order state to complete + call finalize, rather than jumping through all the states
Previously, the checkout controller decorator here would go through each of the order states and call @order.update! for each state, as well as the order callback.

This is unecessary for PayPal transactions.

All that needs to happen here is that the state is put into the complete state and the order is finalized.

Fixes #48.

Finally.
2012-05-02 10:26:01 -05:00
Ryan Bigg e539e1d5cf Revert "Fix some attr_accessible problems to do with log entries, payments and PaypalAccount"
Already done by Andrew.

This reverts commit 51caa03295.
2012-05-02 07:32:52 -05:00
Ryan Bigg 51caa03295 Fix some attr_accessible problems to do with log entries, payments and PaypalAccount 2012-05-02 07:31:55 -05:00
Andrew Hooker be9e259fdc Mass Assignment Fixes
attr_accessible

fixing mass assignment
2012-05-01 21:50:50 -05:00
ochko 2c12f39667 fix for rails 3.2.3 attr protection patch
Fixes #50
2012-04-30 08:58:13 -05:00
Chris Wise 11c8935aac corrected credit amount to always be positive (PayPal does not accept negative credit amount)
Merges #47
2012-04-13 11:07:29 -04:00
Chris Wise f8e239e3c1 corrected a misnamed payment event from fail! to failure! 2012-04-13 10:09:21 -04:00
Chris Wise 6fbc63116a fixed the opts and items hashes that are sent to PayPal to only show eligible promotions and to use existing Order methods for tax and shipping 2012-04-11 11:27:28 -04:00
Bounmy Stephane c1f8854e15 cache payment_method and can now set paypal's landing page by setting allow_guest_checkout 2012-04-11 11:21:40 -04:00
Bounmy Stephane 98f99ab3d2 fixed header_image and locale using I18n.locale set from set_user_language 2012-04-11 11:21:39 -04:00
Bounmy Stephane 4511907f4f cancel_return_url returns to checkout payment instead of edit order url 2012-04-11 11:21:39 -04:00
Bounmy Stephane ba2fc9d8c7 untrack gemfile.lock + fix spree namespacing model 2012-04-11 11:21:39 -04:00
Bounmy Stephane 08d9540bcb using routes helpers instead of manual url 2012-04-11 11:21:39 -04:00
Bounmy Stephane 7eea3edd70 all tests are passing 2012-04-11 11:21:39 -04:00
John Dyer fa57f22a71 [Refs #31] define paypal_express_local_confirm preference 2012-02-21 10:06:22 -05:00
Chris Nighitngale 9a09c4910e made return url's work for spree mounted at different locations 2012-02-20 09:13:56 -05:00
Chris Nighitngale ae33b24d4f fixed namespace error on GatewayError class 2012-02-20 09:13:47 -05:00
Chris Nighitngale e69daa02c6 removed two references to incorrect /spree path 2012-02-20 09:13:37 -05:00
John Dyer c822dd30e4 Fixes return url in checkout controller decorator 2012-02-15 00:05:30 -05:00
John Dyer fd5f2a2b9e Merge pull request #29 from wakeless/rails-3-1-namespace
Fixes to make this more compatible with Rails 3-1
2012-02-14 20:37:16 -08:00
Michael Gall 16ff366534 Fix require directory 2011-12-20 11:13:27 +11:00
Ryan Bigg 1dd014cce1 Move views into app/views/spree 2011-12-17 10:37:10 +11:00
Ryan Bigg 062297a446 Namespace PaypalExpressCallbacksController inside Spree 2011-12-17 10:35:56 +11:00
Ryan Bigg 5ff0bbe4e0 Shorten ppx_auth_response inside paypal_finish 2011-12-17 10:32:00 +11:00
Ryan Bigg 78360afc5c Use bill_address ||= rather than bill_address = val unless bill_address 2011-12-17 10:30:47 +11:00
Ryan Bigg 162107ed0a Fix indentation inside checkout_controller_decorator 2011-12-17 10:30:15 +11:00
Ryan Bigg 04de23853f No space after redirect_to arguments, add bracket for separate args 2011-12-17 10:28:20 +11:00
Ryan Bigg 526cf0a492 Add amount_in_cents method to prevent 'magic number' calculations everywhere 2011-12-17 10:01:28 +11:00
John Dyer 6e6b553313 More namespacing 2011-12-07 17:00:27 -05:00
John Dyer 508461dbc7 Fix broken renders 2011-12-06 12:48:22 -05:00
John Dyer 04ebf6a74c Fix inflection issue 2011-11-17 15:36:27 -05:00
John Dyer 3a1fcf1771 Namespace Updates 2011-11-17 10:53:07 -05:00
Brian Quinn 691d8795ab Merge pull request #3 from jumph4x/e9e73ebc6e161e57d9e4e500b5fe86a541da460f
Updated: Remove forced layout specification
2011-08-08 06:11:39 -07:00
Brian Quinn a08a40b50b Merge pull request #5 from curlyheads/master
Various fixes and improvements for spree_paypal_express
2011-08-08 06:10:59 -07:00
Brian Quinn 8cc1d63464 Merge pull request #7 from vintem/master
Allowing user to choose preferred currency
2011-08-08 06:08:50 -07:00
Josh Starcher 3f84536ee7 fix incompatibility with store credits gem 2011-07-18 11:03:33 -04:00
vintem ec356cf5e8 allow for preferred currency 2011-07-12 22:26:53 -03:00
curlyheads 54db71773e replaced request.protocol with protocol string 2011-06-28 21:22:02 +02:00
curlyheads 228e341e58 fixed correct tax amount display on PayPal site, tax and shipping
displayed seperately
TODO: tax should be set differently
joshnuss: fixed logo image url passed to paypal
joshnuss: logo image should use Spree::Config setting
joshnuss: save bill address during checkout if it is empty
schustafa: Product descriptions can be nil without disrupting
checkout.
2011-04-16 14:37:01 +02:00
Jörg Koch 5b88f63f6e fixed 'The totals of the cart item amounts do not match order amounts.' error with patch http://pastie.org/1731543 2011-03-30 00:30:54 +02:00
Denis 'jumph4x e9e73ebc6e Let the controller dictate the layout, remove inline layout specification 2011-03-27 13:00:08 -04:00
Vincent Charles bb66ed7ce5 Product descriptions can be nil without disrupting checkout 2011-02-27 00:42:34 -08:00
Brian Quinn 927e567bd0 Updated ReadMe and gemspec 2011-01-25 11:30:18 +00:00
Brian Quinn 9086741f52 Refactored and improved support for 0.40.3 and later 2011-01-24 19:56:04 +00:00
Brian Quinn b763f1ad12 Merged r3ap3r2004 2011-01-18 16:11:33 +00:00
Brian Quinn 251f6c20fe Prevent IPN errors on zero amount orders 2011-01-11 13:13:58 +00:00
Brian Quinn db9c160527 Make echeck? method public 2010-12-23 13:46:57 +00:00
reaper 5a03bf228e Removed unecessary files. 2010-11-28 23:43:40 +09:00
reaper b79fb41c4d Modified to work with Spree 0.30.1. 2010-11-28 23:31:31 +09:00
Brian Quinn a6ad630b02 Improved handling of declined echecks 2010-11-24 09:31:31 +00:00
Brian Quinn 1b400a9398 Removed debug 2010-11-22 13:04:46 +00:00
Brian Quinn 038ae315b3 Added IPN support, initially only covers e-checks 2010-11-21 13:42:34 +00:00
Brian Quinn c6ab2c85c0 Fixed issue with credit 2010-05-12 17:06:24 +01:00
Brian Quinn 20bef36f65 Added forms to stop errors when creating orders via the backend 2010-03-18 09:41:01 +00:00
Peter Kordel 2801d39054 Merging PKordel's changes.
cleaned up extension requires, common constants and added no_shipping preference

Handling no shipping option in address options

Handling no shipping option in paypay_confirm

Added locale updates for GB and for no_shipping, paypal_site_opts for customizing site appearance

Added MJM fix

Took out no shipping stuff as too specific

Fixes now in extension

Better fix for Payment#payment_profiles_supported?

Added support for no shipping

Added support for no shipping

Fix for passing currency to payment_detail_item

Added param payment_method_id
2010-03-15 10:39:43 +00:00
Brian Quinn 1e318b6a78 Updated to support source actions 2010-02-25 16:20:15 +00:00
Brian Quinn bad727bf9c Made review configuration option editable via admin ui 2010-02-25 12:32:48 +00:00
Brian Quinn 472321b53d Moved capture method into PaypalAccount 2010-02-25 11:12:15 +00:00
Brian Quinn fb0ac7b629 Updated to supported latest edge PaymentMethods (very edge) 2010-02-24 20:44:08 +00:00
Brian Quinn 0bcbdaa0b2 Added support for refunds 2010-01-28 16:48:01 +00:00
Brian Quinn 69a75ff1a8 Added wrapper for PPX UK gateway 2010-01-25 10:32:08 +00:00
Brian Quinn c14eefa55a Updated to support core Billing Integrations 2010-01-25 10:31:43 +00:00
Brian Quinn 7da2fed7ac Initial fork changes 2010-01-22 16:29:55 +00:00
paulcc 35dffb780b updated to spree 0.9 2009-09-21 14:16:57 +01:00
paulcc fa6d87f465 typo on class test 2009-07-13 08:56:22 +01:00
paulcc bea73e2a0c fixed bug - mentions to old gateway sub-module removed 2009-07-06 12:22:06 +01:00
paulcc ed9771041c Significant changes: add missing AM libs, adapt to spree 0.8.4+,
fix admin interface

1. My modifications of AM files are now included and over-ride the
   installed lib
2. The admin interface now works, including being able to review
   paypal payments and do captures
3. The code works cleanly with the new checkout representation.
2009-07-06 12:03:18 +01:00
paulcc 9182e669b8 cosmetic tweak to button display 2009-05-28 09:45:12 +01:00
paulcc 99f8073fc5 typo! 2009-05-14 11:25:06 +01:00
paulcc 11f88be5c5 Basic support for Paypal Express in Spree
This commit contains enough to do an express checkout authorization (not purchase) from the cart
page, to save all relevant info, and to be able to view some of it in the admin pages. It is very
much work in progress!

Some admin features won't work (eg captures, viewing transactions), since handling of payments
and gateways needs to be generalised first. Also need to get the orders handled like those for
guest checkouts.

It's also tied to GB/UK details at the moment (this will change), and it needs a modified version
of active merchant which will be released/circulated soon.
2009-05-14 11:11:59 +01:00