diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml index 855e4b45da..7f710521f3 100644 --- a/app/views/spree/admin/orders/bulk_management.html.haml +++ b/app/views/spree/admin/orders/bulk_management.html.haml @@ -14,8 +14,10 @@ %th.email Email %th.date Order Date %th.producer Producer + %th.variant Product (Unit): Var %tr.line_item{ 'ng-repeat' => 'line_item in lineItems', 'ng-class-even' => "'even'", 'ng-class-odd' => "'odd'" } %td.id {{ line_item.id }} %td.email {{ line_item.order.email }} %td.date {{ line_item.order.completed_at }} - %td.producer {{ line_item.supplier.name }} \ No newline at end of file + %td.producer {{ line_item.supplier.name }} + %td.variant {{ line_item.variant_unit_text }} \ No newline at end of file diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb index d9e63dd0e6..724fbfd866 100644 --- a/spec/features/admin/bulk_order_management_spec.rb +++ b/spec/features/admin/bulk_order_management_spec.rb @@ -62,6 +62,12 @@ feature %q{ page.should have_selector "td.producer", text: li1.product.supplier.name, :visible => true page.should have_selector "td.producer", text: li2.product.supplier.name, :visible => true end + + it "displays a column for variant description" do + page.should have_selector "th.variant", text: "PRODUCT (UNIT): VAR", :visible => true + page.should have_selector "td.variant", text: li1.product.name, :visible => true + page.should have_selector "td.variant", text: li2.product.name, :visible => true + end end end end \ No newline at end of file