diff --git a/app/views/spree/admin/orders/_invoice_table.html.haml b/app/views/spree/admin/orders/_invoice_table.html.haml index 4bd9917eb0..9375f9bb68 100644 --- a/app/views/spree/admin/orders/_invoice_table.html.haml +++ b/app/views/spree/admin/orders/_invoice_table.html.haml @@ -33,17 +33,17 @@ %tfoot %tr %td{:align => "right", :colspan => "2"} - %strong GST Total: + %strong= t(:invoice_tax_total) %td{:align => "right", :colspan => "2"} %strong= display_checkout_tax_total(@order) %tr %td{:align => "right", :colspan => "2"} - %strong Total (Excl. GST): + %strong= t(:total_excl_tax) %td{:align => "right", :colspan => "2"} %strong= display_checkout_total_less_tax(@order) %tr %td{:align => "right", :colspan => "2"} - %strong Total (Incl. GST): + %strong= t(:total_incl_tax) %td{:align => "right", :colspan => "2"} %strong= @order.display_total %p diff --git a/app/views/spree/admin/orders/invoice.html.haml b/app/views/spree/admin/orders/invoice.html.haml index 7ae12f8e79..8c359d19da 100644 --- a/app/views/spree/admin/orders/invoice.html.haml +++ b/app/views/spree/admin/orders/invoice.html.haml @@ -4,7 +4,9 @@ %tbody %tr{ valign: "top" } %td{ :align => "left", colspan: 3 } - %h6= "#{t('.issued_on')}: #{Time.zone.now.strftime("%F")}" + %h6 + = "#{t('.issued_on')}: " + = l Time.zone.now.to_date %tr{ valign: "top" } %td{ :align => "left" } %h4 diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 221a7b05e3..5c716a9a2f 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -205,6 +205,12 @@ en-GB: max_fulfilled_units: "Max Fulfilled Units" order_error: "Some errors must be resolved before you can update orders.\nAny fields with red borders contain errors." variants_without_unit_value: "WARNING: Some variants do not have a unit value" + invoice: + issued_on: Issued on + tax_invoice: TAX INVOICE + code: Code + from: From + to: To order_cycles: edit: choose_products_from: 'Choose Products From:' @@ -250,10 +256,20 @@ en-GB: require_customer_login: "This shop is for customers only." require_login_html: "Please %{login} if you have an account already. Otherwise, %{register} to become a customer." require_customer_html: "Please %{contact} %{enterprise} to become a customer." - invoice_column_item: "Item" - invoice_column_qty: "Qty" invoice_column_tax: "VAT" invoice_column_price: "Price" + invoice_column_item: "Item" + invoice_column_qty: "Qty" + 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)" + invoice_column_price_without_taxes: "Total price (Excl. tax)" + invoice_column_tax_rate: "Tax rate" + tax_invoice: "INVOICE" + tax_total: "Total tax (%{rate}):" + total_excl_tax: "Total (Excl. tax):" + total_incl_tax: "Total (Incl. tax):" + invoice_tax_total: "VAT Total:" logo: "Logo (640x130)" logo_mobile: "Mobile logo (75x26)" logo_mobile_svg: "Mobile logo (SVG)" @@ -1020,6 +1036,14 @@ en-GB: validation_msg_tax_category_cant_be_blank: "^Tax Category can't be blank" validation_msg_is_associated_with_an_exising_customer: "is associated with an existing customer" spree: + admin: + orders: + invoice: + issued_on: Issued on + tax_invoice: INVOICE + code: Code + from: From + to: To zipcode: Postcode shipment_states: backorder: backorder diff --git a/config/locales/en.yml b/config/locales/en.yml index 37057cfa6a..d06d854490 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -759,6 +759,7 @@ en: invoice_column_price_with_taxes: "Total price (Incl. tax)" invoice_column_price_without_taxes: "Total price (Excl. tax)" invoice_column_tax_rate: "Tax rate" + invoice_tax_total: "GST Total:" tax_invoice: "TAX INVOICE" tax_total: "Total tax (%{rate}):" total_excl_tax: "Total (Excl. tax):" @@ -2095,9 +2096,6 @@ Please follow the instructions there to make your enterprise visible on the Open resumed: resumed returned: returned skrill: skrill - orders: - invoice: - tax_invoice: "TAX INVOICE: " payment_states: balance_due: balance due completed: completed