add "Weight/VOL." column to the invoice

This commit is contained in:
Mohamed ABDELLANI
2023-10-18 10:30:01 +01:00
parent b64058a71d
commit 30537f7743
4 changed files with 7 additions and 2 deletions

View File

@@ -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,

View File

@@ -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

View File

@@ -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

View File

@@ -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)"