Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'lilleyt/1-3-stable'

  • Loading branch information...
commit c2729a8ac78bbb7c440f151e8bd8d018822ed128 2 parents b283eeb + b6d7ba6
@linrock authored
View
3  Versionfile
@@ -1,4 +1,5 @@
-"1.2.x" => { :branch => "master" }
+"1.3.x" => { :branch => "1-3-stable" }
+"1.2.x" => { :branch => "1-2-stable" }
"1.1.x" => { :branch => "1-1-stable" }
"1.0.x" => { :branch => "1-0-stable" }
"0.60.x" => { :branch => "0-60-stable" }
View
5 app/overrides/admin_order_edit_print_buttons_decorator.rb
@@ -1,5 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/admin/orders/edit",
- :name => "print_buttons",
- :insert_bottom => "[data-hook='admin_order_edit_buttons'], #admin_order_edit_buttons[data-hook]",
- :partial => "spree/admin/orders/print_buttons",
- :disabled => false)
View
5 app/overrides/admin_order_show_print_buttons_decorator.rb
@@ -1,5 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/admin/orders/show",
- :name => "print_buttons",
- :insert_bottom => "[data-hook='admin_order_show_buttons'], #admin_order_show_buttons[data-hook]",
- :partial => "spree/admin/orders/print_buttons",
- :disabled => false)
View
5 app/overrides/layouts_admin_print_buttons_decorator.rb
@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "spree/layouts/admin",
+ :name => "print_buttons",
+ :insert_top => "[data-hook='toolbar']>ul",
+ :partial => "spree/admin/orders/print_buttons",
+ :disabled => false)
View
4 app/views/spree/admin/orders/_print_buttons.html.erb
@@ -1,7 +1,7 @@
-<% if @order.completed_at? %>
+<% if @order and @order.completed_at? %>
<% buttons = Spree::PrintInvoice::Config[:print_buttons]
buttons = buttons.split(",").collect{|b| b.strip } %>
<% buttons.each do |button| %>
- <%= button_link_to(t(button.to_s + "_print"), spree.admin_order_path(@order, :pdf , :template => button)) %>
+ <li><%= button_link_to(t(button.to_s + "_print"), spree.admin_order_path(@order, :pdf , :template => button)) %></li>
<% end %>
<% end %>
View
2  spree-print-invoice.gemspec
@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
s.authors = 'Spree Community'
s.add_dependency('prawn', '0.8.4')
- s.add_dependency('spree_core', '~> 1.2.0')
+ s.add_dependency('spree_core', '~> 1.3.0')
end
Please sign in to comment.
Something went wrong with that request. Please try again.