From 6268b7cc7ef8222fc2a4dd05157416355b2519fc Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Wed, 18 Nov 2015 10:02:51 +1100
Subject: [PATCH] Printing/sending an invoice uses the same template for
 generating a pdf

---
 .../admin/orders_controller_decorator.rb      |  2 +-
 app/views/spree/admin/orders/print.html.haml  | 19 -------------------
 .../spree/admin/orders_controller_spec.rb     |  2 +-
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 app/views/spree/admin/orders/print.html.haml

diff --git a/app/controllers/spree/admin/orders_controller_decorator.rb b/app/controllers/spree/admin/orders_controller_decorator.rb
index 8a7f509fcb..1fe4458c55 100644
--- a/app/controllers/spree/admin/orders_controller_decorator.rb
+++ b/app/controllers/spree/admin/orders_controller_decorator.rb
@@ -82,7 +82,7 @@ Spree::Admin::OrdersController.class_eval do
   end
 
   def print
-    render pdf: "invoice-#{@order.number}", encoding: "UTF-8"
+    render pdf: "invoice-#{@order.number}", template: "spree/admin/orders/invoice", encoding: "UTF-8"
   end
 
   def update_distribution_charge
diff --git a/app/views/spree/admin/orders/print.html.haml b/app/views/spree/admin/orders/print.html.haml
deleted file mode 100644
index 5a42699c98..0000000000
--- a/app/views/spree/admin/orders/print.html.haml
+++ /dev/null
@@ -1,19 +0,0 @@
-= wicked_pdf_stylesheet_link_tag "mail/all"
-
-
-%table{:width => "100%"}
-  %tbody
-    %tr
-      %td{ :align => "left" }
-        %h4
-          Order confirmation
-          %strong ##{@order.number}
-        %h5
-          #{@order.bill_address.firstname} #{@order.bill_address.lastname}
-          %strong= " <#{@order.email}>" if @order.email
-          = @order.bill_address.phone if @order.bill_address.phone
-        %h5= "Customer Code: #{@order.customer.code}"
-
-= render 'spree/order_mailer/order_summary'
-= render 'spree/order_mailer/payment'
-= render 'spree/order_mailer/shipping'
diff --git a/spec/controllers/spree/admin/orders_controller_spec.rb b/spec/controllers/spree/admin/orders_controller_spec.rb
index a4fbf00432..bcd618972e 100644
--- a/spec/controllers/spree/admin/orders_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders_controller_spec.rb
@@ -219,7 +219,7 @@ describe Spree::Admin::OrdersController do
         before { controller.stub spree_current_user: distributor.owner }
         it "should allow me to send order invoices" do
           spree_get :print, params
-          expect(response).to render_template :print
+          expect(response).to render_template :invoice
         end
       end
     end