Skip to content

Commit

Permalink
Pull in old png Solidus logo
Browse files Browse the repository at this point in the history
The Solidus admin area was recently changed to use an svg logo
solidusio/solidus#2995
but that is not supported by Prawn so it broke the pdf embed here.

The old png logo is no longer used in Solidus so it's only a matter of
time before someone removes it. As such I have pulled it in for use
in the pdf header, but kept the same name because I figured it less
likely that the png logo ever be updated again in Solidus than maybe
someone customized their Solidus install by overwriting the image
instead of changing the config.

This has the unfortunate affect of no longer automatically following
Solidus admin logo customizations, but I don't think it would be worth
doing fancy svg detection at that point. We have our own config, folks
can use that if needed.
  • Loading branch information
Sinetheta committed Jan 13, 2019
1 parent 1204e9a commit aee03d3
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
Binary file added app/assets/images/logo/solidus_logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/models/spree/print_invoice_configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module Spree
class PrintInvoiceConfiguration < Preferences::Configuration

preference :print_invoice_next_number, :integer, :default => nil
preference :print_invoice_logo_path, :string, :default => Spree::Config[:admin_interface_logo]
preference :print_invoice_logo_path, :string, :default => 'logo/solidus_logo.png'
preference :print_invoice_logo_scale, :integer, :default => 50
preference :print_invoice_font_face, :string, :default => 'Helvetica'
preference :print_buttons, :string, :default => 'invoice'
Expand Down
2 changes: 1 addition & 1 deletion lib/solidus_print_invoice/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Spree
module PrintInvoice
VERSION = "1.0.2".freeze
VERSION = "1.1.2".freeze
end
end

0 comments on commit aee03d3

Please sign in to comment.