spreecommerce
/
spree_paypal_express
1
0
Fork 0
Code Pull Requests Releases Activity

Reworked based on Radar's directions

This commit is contained in:
Steve Root 2012-05-12 11:00:57 +01:00
parent e4fe2f9129
commit 4bc99e2fb7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/spree/checkout_controller_decorator.rb
View File

@ -195,14 +195,22 @@ module Spree
else
user_action = Spree::PaypalExpress::Config[:paypal_express_local_confirm] == "t" ? "continue" : "commit"
end
#asset_url doesn't like Spree::Config[:logo] being an absolute url
#if statement didn't work within hash
if URI.parse(Spree::Config[:logo]).absolute?
chosen_image = Spree::Config[:logo]
else
chosen_image = asset_url(Spree::Config[:logo])
end
{ :description => "Goods from #{Spree::Config[:site_name]}", # site details...
#:page_style => "foobar", # merchant account can set named config
:background_color => "ffffff", # must be hex only, six chars
:header_background_color => "ffffff",
:header_border_color => "ffffff",
:header_image => chosen_image
:allow_note => true,
:locale => user_locale,
:req_confirm_shipping => false, # for security, might make an option later
@ -212,13 +220,6 @@ module Spree
# they've not been tested and may trigger some paypal bugs, eg not showing order
# see http://www.pdncommunity.com/t5/PayPal-Developer-Blog/Displaying-Order-Details-in-Express-Checkout/bc-p/92902#C851
}
#asset_url doesn't like Spree::Config[:logo] being an absolute url
#if statement didn't work within hash
if URI.parse(Spree::Config[:logo]).absolute?
{:header_image => Spree::Config[:logo]}
else
{:header_image => asset_url(Spree::Config[:logo])}
end
end
def user_locale