Brian Quinn
dde1bb709d
Cleanup testing config
2012-07-20 12:16:04 +01:00
Brian Quinn
8ca407b1e4
Updated to work with 1-1 proper
2012-07-20 11:23:01 +01:00
Brian Quinn
042e013be7
Merge remote-tracking branch 'sbounmy/custom'
...
Conflicts:
Gemfile
2012-07-17 12:58:42 +01:00
edslocomb
ce3d71193f
ActiveMerchant::PaypalExpressGateway does nothing with item[:sku], instead we should set the confusingly-named item[:number] from the underlying Paypal api: https://cms.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_ECCustomizing
2012-07-17 10:01:35 +10:00
Josh Shupack
d9873ff63f
fixed bug where state not found is Paypal returns state abbr in lowercase
...
Fixes #71
2012-07-16 13:34:49 +10:00
Ryan Bigg
5faeb703f6
Update gem dependencies
2012-07-13 12:54:08 +10:00
Bounmy Stephane
7417b80456
Merge branch 'master' of github.com:spree/spree_paypal_express into custom
...
Conflicts:
app/views/spree/shared/paypal_express_confirm.html.erb
2012-06-01 19:42:20 +02:00
Bounmy Stephane
e11a8e4d5f
fixed credit when no payment_profiles_supported
2012-06-01 00:36:42 +02:00
Bounmy Stephane
b11a9dd9f2
fixed capture and credit due to spree 1.1 changes cf payment processing
2012-06-01 00:06:16 +02:00
Bounmy Stephane
26da577090
using a base class for paypal express
2012-05-31 08:54:05 +02:00
Ryan Bigg
d48f464950
Add paypalexpress partials to source_forms and source_views
2012-05-30 12:45:30 +10:00
Andrew Hooker
925613dbe2
Merge pull request #65 from jsqu99/fix-incorrect-partial-path
...
[Fixes 64] Fixes missing leading 'spree/' in partial name
2012-05-29 09:13:00 -07:00
Jeff Squires
6079fc97ca
[Fixes 64] Fixes missing leading 'spree/' in partial name
2012-05-29 12:07:44 -04:00
Bounmy Stephane
3d5af5bdaf
set completed_at
2012-05-25 21:26:19 +02:00
Bounmy Stephane
4b1def8643
fixed consume_users_credit call
2012-05-25 20:44:20 +02:00
Bounmy Stephane
84f0c159da
fixed margin
2012-05-25 20:03:23 +02:00
Bounmy Stephane
4ee142bc7f
fixed css and respond_to?
2012-05-25 19:50:05 +02:00
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