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

fixes asset_url failing if logo is absolute url

This commit is contained in:
Steve Root 2012-05-10 12:37:32 +01:00
parent b4829e75ad
commit e4fe2f9129
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,7 +200,6 @@ module Spree
{ :description => "Goods from #{Spree::Config[:site_name]}", # site details...
#:page_style => "foobar", # merchant account can set named config
:header_image => asset_url(Spree::Config[:logo]),
:background_color => "ffffff", # must be hex only, six chars
:header_background_color => "ffffff",
:header_border_color => "ffffff",
@ -213,6 +212,13 @@ 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