Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
fix: The VAT displayed in the orders emails is incorrect
Piotr Milewski4b025155320c
diff --git a/core/app/views/spree/order_mailer/cancel_email.text.erb b/core/app/views/spree/order_mailer/cancel_email.text.erbindex 1fcee1b818..cd6b10466f 100755--- a/core/app/views/spree/order_mailer/cancel_email.text.erb+++ b/core/app/views/spree/order_mailer/cancel_email.text.erb@@ -5,33 +5,7 @@============================================================<%= Spree.t('order_mailer.cancel_email.order_summary_canceled', number: @order.number) %>============================================================-<% @order.line_items.each do |item| %>- <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %>-<% end %>-============================================================-<%= Spree.t('order_mailer.subtotal') %> <%= @order.display_item_total %>-<% if @order.line_item_adjustments.exists? %>- <% if @order.all_adjustments.promotion.eligible.exists? %>- <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>- <%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>- <% end %>- <% end %>-<% end %>--<% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>- <%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>-<% end %>--<% if @order.all_adjustments.eligible.tax.exists? %>- <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>- <%= Spree.t(:tax) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>- <% end %>-<% end %>--<% @order.adjustments.eligible.each do |adjustment| %>- <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>- <%= adjustment.label %> <%= adjustment.display_amount %>-<% end %>+<%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>============================================================<%= Spree.t('order_mailer.total') %> <%= @order.display_total %><%= Spree.t('order_mailer.cancel_email.thanks') %>diff --git a/core/app/views/spree/order_mailer/confirm_email.text.erb b/core/app/views/spree/order_mailer/confirm_email.text.erbindex 6cd6553b0b..a77d74c079 100644--- a/core/app/views/spree/order_mailer/confirm_email.text.erb+++ b/core/app/views/spree/order_mailer/confirm_email.text.erb@@ -5,35 +5,8 @@============================================================<%= Spree.t('order_mailer.confirm_email.order_summary', number: @order.number) %>============================================================-<% @order.line_items.each do |item| %>- <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %>-<% end %>-============================================================-<%= Spree.t('order_mailer.subtotal') %> <%= @order.display_item_total %>-<% if @order.line_item_adjustments.exists? %>- <% if @order.all_adjustments.promotion.eligible.exists? %>- <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>-<%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>- <% end %>- <% end %>-<% end %>--<% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>-<%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>-<% end %>--<% if @order.all_adjustments.eligible.tax.exists? %>- <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>-<%= Spree.t(:tax) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>- <% end %>-<% end %>--<% @order.adjustments.eligible.each do |adjustment| %>- <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>-<%= adjustment.label %> <%= adjustment.display_amount %>-<% end %>+<%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>============================================================<%= Spree.t('order_mailer.total') %> <%= @order.display_total %>-<%= Spree.t('order_mailer.confirm_email.thanks') %><%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>diff --git a/core/app/views/spree/order_mailer/store_owner_notification_email.text.erb b/core/app/views/spree/order_mailer/store_owner_notification_email.text.erbindex 7e06fd7cb7..aafeb72b88 100644--- a/core/app/views/spree/order_mailer/store_owner_notification_email.text.erb+++ b/core/app/views/spree/order_mailer/store_owner_notification_email.text.erb@@ -5,33 +5,7 @@============================================================<%= Spree.t('order_mailer.store_owner_notification_email.order_summary', number: @order.number) %>============================================================-<% @order.line_items.each do |item| %>- <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %>-<% end %>-============================================================-<%= Spree.t('order_mailer.subtotal') %> <%= @order.display_item_total %>-<% if @order.line_item_adjustments.exists? %>- <% if @order.all_adjustments.promotion.eligible.exists? %>- <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>-<%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>- <% end %>- <% end %>-<% end %>--<% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>-<%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>-<% end %>--<% if @order.all_adjustments.eligible.tax.exists? %>- <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>-<%= Spree.t(:tax) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>- <% end %>-<% end %>--<% @order.adjustments.eligible.each do |adjustment| %>- <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>-<%= adjustment.label %> <%= adjustment.display_amount %>-<% end %>+<%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>============================================================<%= Spree.t('order_mailer.total') %> <%= @order.display_total %><%= Spree.t('order_mailer.store_owner_notification_email.thanks') %>diff --git a/core/app/views/spree/shared/_purchased_items_table.html.erb b/core/app/views/spree/shared/_purchased_items_table.html.erbindex 25b4bf5167..9c9374c56d 100644--- a/core/app/views/spree/shared/_purchased_items_table.html.erb+++ b/core/app/views/spree/shared/_purchased_items_table.html.erb@@ -41,25 +41,23 @@</td></tr><% end %>- <% if order.all_adjustments.eligible.tax.exists? %>- <% order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>- <tr>- <td></td>- <td>- <p class="f-fallback purchase_total purchase_total--label">- <%= Spree.t(:tax) %>:- </p>- <p class="f-fallback purchase_total--name purchase_total--label">- <%= label %>- </p>- </td>- <td class="purchase_total-col">- <p class="f-fallback purchase_total">- <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>- </p>- </td>- </tr>- <% end %>+ <% if order.additional_tax_total != 0 %>+ <tr>+ <td></td>+ <td>+ <p class="f-fallback purchase_total purchase_total--label">+ <%= Spree.t(:tax) %>:+ </p>+ <p class="f-fallback purchase_total--name purchase_total--label">+ <%= label %>+ </p>+ </td>+ <td class="purchase_total-col">+ <p class="f-fallback purchase_total">+ <%= order.display_additional_tax_total.to_html %>+ </p>+ </td>+ </tr><% end %><% order.adjustments.eligible.each do |adjustment| %><% next if (adjustment.source_type == 'Spree::TaxRate') || (adjustment.amount == 0) %>diff --git a/core/app/views/spree/shared/_purchased_items_table.text.erb b/core/app/views/spree/shared/_purchased_items_table.text.erbnew file mode 100644index 0000000000..ea606ea8f8--- /dev/null+++ b/core/app/views/spree/shared/_purchased_items_table.text.erb@@ -0,0 +1,25 @@+<% line_items.each do |item| %>+ <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %>+<% end %>+============================================================+<%= Spree.t('order_mailer.subtotal') %> <%= order.display_item_total %>+<% if order.line_item_adjustments.exists? %>+ <% if order.all_adjustments.promotion.eligible.exists? %>+ <% order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>+ <%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>+ <% end %>+ <% end %>+<% end %>++<% order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>+ <%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency) %>+<% end %>++<% if order.additional_tax_total != 0 %>+ <%= Spree.t(:tax) %>: <%= label %> <%= order.display_additional_tax_total.to_html %>+<% end %>++<% order.adjustments.eligible.each do |adjustment| %>+ <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>+ <%= adjustment.label %> <%= adjustment.display_amount %>+<% end %>