From 910f649d70f39c88df3d223384e6b5478b6b76b1 Mon Sep 17 00:00:00 2001
From: Angel Perez <iAngel.p93@gmail.com>
Date: Thu, 7 Feb 2019 13:41:39 -0400
Subject: [PATCH] Fix unrecognized image format error when rendering invoice
 logo

solidusio/solidus#2995 replaced Solidus' .png logo with a .svg version,
a format that Prawn does not support. This patch re-introduces the former
logo and uses it if no custom configuration is provided.
---
 app/assets/images/logo/solidus_logo.png         | Bin 0 -> 3097 bytes
 app/models/spree/print_invoice_configuration.rb |   3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 app/assets/images/logo/solidus_logo.png

diff --git a/app/assets/images/logo/solidus_logo.png b/app/assets/images/logo/solidus_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a73a7861a1ad510129374db0170c0d2f57add36b
GIT binary patch
literal 3097
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
P`&q{u5pkKvoG$zuqW;)a

literal 0
HcmV?d00001

diff --git a/app/models/spree/print_invoice_configuration.rb b/app/models/spree/print_invoice_configuration.rb
index afd5ebd..454f52b 100644
--- a/app/models/spree/print_invoice_configuration.rb
+++ b/app/models/spree/print_invoice_configuration.rb
@@ -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 => Spree::Config[:admin_interface_logo].end_with?('.svg') ? 'logo/solidus_logo.png' : Spree::Config[:admin_interface_logo]
     preference :print_invoice_logo_scale, :integer, :default => 50
     preference :print_invoice_font_face, :string, :default => 'Helvetica'
     preference :print_buttons, :string, :default => 'invoice'
@@ -17,6 +17,5 @@ def increase_invoice_number
       set_preference(:print_invoice_next_number, current_invoice_number + 1)
       current_invoice_number
     end
-
   end
 end