diff --git a/app/models/invoice/data_presenter/line_item.rb b/app/models/invoice/data_presenter/line_item.rb index 40a0353d4b..3a330153a8 100644 --- a/app/models/invoice/data_presenter/line_item.rb +++ b/app/models/invoice/data_presenter/line_item.rb @@ -4,7 +4,7 @@ class Invoice class DataPresenter class LineItem < Invoice::DataPresenter::Base attributes :added_tax, :currency, :included_tax, :price_with_adjustments, :quantity, - :variant_id, :unit_price_price_and_unit + :variant_id, :unit_price_price_and_unit, :unit_presentation attributes_with_presenter :variant array_attribute :tax_rates, class_name: 'TaxRate' invoice_generation_attributes :added_tax, :included_tax, :price_with_adjustments, diff --git a/app/serializers/invoice/line_item_serializer.rb b/app/serializers/invoice/line_item_serializer.rb index 3fba186bf3..f3c5aa83a1 100644 --- a/app/serializers/invoice/line_item_serializer.rb +++ b/app/serializers/invoice/line_item_serializer.rb @@ -3,7 +3,7 @@ class Invoice class LineItemSerializer < ActiveModel::Serializer attributes :id, :added_tax, :currency, :included_tax, :price_with_adjustments, :quantity, - :variant_id, :unit_price_price_and_unit + :variant_id, :unit_price_price_and_unit, :unit_presentation has_one :variant, serializer: Invoice::VariantSerializer has_many :tax_rates, serializer: Invoice::TaxRateSerializer end diff --git a/app/views/spree/admin/orders/_invoice_table4.html.haml b/app/views/spree/admin/orders/_invoice_table4.html.haml index 653600e098..fee847825f 100644 --- a/app/views/spree/admin/orders/_invoice_table4.html.haml +++ b/app/views/spree/admin/orders/_invoice_table4.html.haml @@ -5,6 +5,8 @@ %h5= t(:invoice_column_item) %th{:align => "right", :width => "15%"} %h5= t(:invoice_column_qty) + %th{:align => "right", :width => "15%"} + %h5= t(:invoice_column_weight_volume) %th{:align => "right", :width => "15%"} %h5= @order.has_taxes_included ? t(:invoice_column_unit_price_with_taxes) : t(:invoice_column_unit_price_without_taxes) - if @order.total_tax > 0 @@ -22,6 +24,8 @@ %em= raw(item.variant.product.supplier.name) %td{:align => "right"} = item.quantity + %td{:align => "right"} + = item.unit_presentation %td{:align => "right"} = item.single_display_amount_with_adjustments - if @order.total_tax > 0 diff --git a/config/locales/en.yml b/config/locales/en.yml index 2e9842a73f..0eeaeda622 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1875,6 +1875,7 @@ en: invoice_column_price: "Price" invoice_column_item: "Item" invoice_column_qty: "Qty" + invoice_column_weight_volume: "Weight / VOL." invoice_column_unit_price_with_taxes: "Unit price (Incl. tax)" invoice_column_unit_price_without_taxes: "Unit price (Excl. tax)" invoice_column_price_with_taxes: "Total price (Incl. tax)"