diff --git a/app/helpers/admin/orders_helper.rb b/app/helpers/admin/orders_helper.rb new file mode 100644 index 0000000000..743b86ab6f --- /dev/null +++ b/app/helpers/admin/orders_helper.rb @@ -0,0 +1,7 @@ +module Admin + module OrdersHelper + def order_adjustments(order) + order.adjustments.eligible + end + end +end diff --git a/app/views/spree/admin/orders/_form.html.haml b/app/views/spree/admin/orders/_form.html.haml index 6fac842902..72d43900fd 100644 --- a/app/views/spree/admin/orders/_form.html.haml +++ b/app/views/spree/admin/orders/_form.html.haml @@ -5,7 +5,7 @@ = render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => order } = render :partial => "spree/admin/orders/_form/adjustments", :locals => { :adjustments => @order.price_adjustments, :title => Spree.t(:line_item_adjustments)} - = render :partial => "spree/admin/orders/_form/adjustments", :locals => { :adjustments => @order.adjustments.eligible, :title => Spree.t(:order_adjustments)} + = render :partial => "spree/admin/orders/_form/adjustments", :locals => { :adjustments => order_adjustments(@order), :title => Spree.t(:order_adjustments)} - if order.line_items.exists? %fieldset#order-total.no-border-bottom{"data-hook" => "order_details_total"}