Commit Graph

208 Commits

Author SHA1 Message Date
Bounmy Stephane b5322c9765 translation symlink 2012-05-25 19:21:22 +02:00
Bounmy Stephane bf00623328 fixed paypal_confirm order state 2012-05-24 23:02:15 +02:00
Bounmy Stephane 4b8dbdbfeb start adding integration tests 2012-05-24 22:33:17 +02:00
Bounmy Stephane 7dfa8bf45a cleaned up dependencies
removed cucumber
2012-05-24 21:30:24 +02:00
Bounmy Stephane 06a81e1c64 rendering view in controller specs improved paypal confirm template 2012-05-24 21:15:02 +02:00
Bounmy Stephane f544581f76 fixed namespace partial 2012-05-24 00:59:07 +02:00
Bounmy Stephane 63b2c21438 private method! 2012-05-24 00:48:31 +02:00
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
Andrew Hooker fb852bc1b2 Merge pull request #60 from scottwagner/patch-1
Fixing process_coupon_code on master
2012-05-16 13:06:49 -07:00
Scott Wagner 09df0aaf4a Update app/controllers/spree/checkout_controller_decorator.rb 2012-05-16 13:02:48 -07:00
Brian Quinn 1a5111c10d Merge pull request #57 from steveroot/iss52fix-v2
fixes asset_url failing if logo is absolute url (Iss52fix v2)
2012-05-14 06:33:33 -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 b4829e75ad Clean up README, move installation steps to first billing 2012-05-02 11:01:18 -05: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
Ryan Bigg b24354dba5 Update Versionfile to reference branches for 1.0 and 1.1 2012-04-17 09:11:03 -04: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 128d203141 removing debugger and awesome_print from gemfile 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 e672f08265 Updated README 2012-02-21 10:49:17 -05:00
John Dyer 04331a9369 gemspec updated for Spree 1.0.0 2012-02-21 10:49:08 -05:00
John Dyer fa57f22a71 [Refs #31] define paypal_express_local_confirm preference 2012-02-21 10:06:22 -05:00
Joshua Jacobs f33dad629d Added a bit more clarity to selecting the correct version. Previously it was possible tell what was wrong, but no what was correct! 2012-02-21 00:02:01 -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
Chris Nighitngale 5fc2b565d3 Added initializers to load ActiveMerchant Paypal Express gateway.
[fixes #32]
2012-02-15 00:24:49 -05:00
John Dyer be1f95ca00 Simplecov instead of rcov 2012-02-15 00:09:47 -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
John Dyer 5a5a1b4321 Added install generator
Added an install generator

Typo in migration
2012-01-17 13:27:37 -05:00
John Dyer 800bd305e9 Make sure decorators are being loaded 2012-01-17 12:40:46 -05:00
Ryan Bigg 5f381f1466 Correct Versionfile
master contains namespacing changes that don't work with 0.70.x. Need to 'revert' to October 8 for this to work

Closes #30
2012-01-04 09:09:12 +11: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