Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Admin Order page: Improve Summary and Tax Rates

Damian Legawiec8cbcc52648b0
diff --git a/admin/app/presenters/spree/admin/order_summary_presenter.rb b/admin/app/presenters/spree/admin/order_summary_presenter.rb
new file mode 100644
index 0000000000..aa0c1952d0
--- /dev/null
+++ b/admin/app/presenters/spree/admin/order_summary_presenter.rb
@@ -0,0 +1,190 @@
+module Spree
+ module Admin
+ class OrderSummaryPresenter
+ SPREE_ADJUSTMENT_SOURCE_TYPES = ['Spree::PromotionAction', 'Spree::TaxRate'].freeze
+
+ attr_reader :order
+
+ def initialize(order)
+ @order = order
+ end
+
+ def rows
+ [
+ *metadata_rows,
+ :separator,
+ currency_row,
+ subtotal_row,
+ shipping_row,
+ promo_row,
+ manual_adjustments_row,
+ *custom_adjustment_rows,
+ included_tax_row,
+ additional_tax_row,
+ total_row,
+ :separator,
+ payment_total_row,
+ outstanding_balance_row
+ ].compact
+ end
+
+ def metadata_rows
+ rows = []
+
+ if order.created_by.present?
+ rows << {
+ label: Spree.t(:created_by),
+ value: order.created_by.name,
+ link: Spree::Core::Engine.routes.url_helpers.admin_admin_user_path(order.created_by)
+ }
+ end
+
+ rows << {
+ label: Spree.t(:created_at),
+ value: order.created_at,
+ type: :datetime
+ }
+
+ if order.completed_at.present?
+ rows << {
+ label: I18n.t('activerecord.attributes.spree/order.completed_at'),
+ value: order.completed_at,
+ type: :datetime
+ }
+ end
+
+ if order.canceled? && order.canceled_at.present?
+ rows << {
+ label: Spree.t(:canceled_at),
+ value: order.canceled_at,
+ type: :datetime
+ }
+
+ if order.canceler.present?
+ rows << {
+ label: Spree.t(:canceler),
+ value: order.canceler.name
+ }
+ end
+ end
+
+ rows
+ end
+
+ def currency_row
+ {
+ label: Spree.t(:currency),
+ value: order.currency,
+ id: 'currency',
+ type: :code
+ }
+ end
+
+ def subtotal_row
+ {
+ label: Spree.t(:subtotal),
+ value: order.display_item_total,
+ id: 'item_total'
+ }
+ end
+
+ def shipping_row
+ return nil unless order.checkout_steps.include?('delivery') && order.ship_total > 0
+
+ {
+ label: Spree.t(:ship_total),
+ value: order.display_ship_total,
+ id: 'ship_total'
+ }
+ end
+
+ def promo_row
+ return nil if order.promo_total.zero?
+
+ {
+ label: Spree.t(:discount_amount),
+ value: order.display_promo_total,
+ id: 'promo_total'
+ }
+ end
+
+ def manual_adjustments_row
+ manual_adjustments = order.all_adjustments.eligible.where(source_type: nil)
+ total = manual_adjustments.sum(:amount)
+ return nil if total.zero?
+
+ {
+ label: Spree.t(:manual_adjustments),
+ value: Spree::Money.new(total, currency: order.currency),
+ id: 'manual_adjustments_total'
+ }
+ end
+
+ def custom_adjustment_rows
+ custom_adjustments = order.all_adjustments.eligible.where.not(source_type: [nil, *SPREE_ADJUSTMENT_SOURCE_TYPES])
+
+ custom_adjustments.group_by(&:source_type).map do |source_type, adjustments|
+ total = adjustments.sum(&:amount)
+ next nil if total.zero?
+
+ {
+ label: translate_source_type(source_type),
+ value: Spree::Money.new(total, currency: order.currency),
+ id: source_type.demodulize.underscore
+ }
+ end.compact
+ end
+
+ def included_tax_row
+ {
+ label: Spree.t(:tax_included),
+ value: order.display_included_tax_total,
+ id: 'included_tax_total'
+ }
+ end
+
+ def additional_tax_row
+ {
+ label: Spree.t(:tax),
+ value: order.display_additional_tax_total,
+ id: 'additional_tax_total'
+ }
+ end
+
+ def total_row
+ {
+ label: Spree.t(:total),
+ value: order.display_total,
+ id: 'order_total',
+ bold: true
+ }
+ end
+
+ def payment_total_row
+ {
+ label: Spree.t(:payment_total),
+ value: order.display_payment_total,
+ id: 'payment_total',
+ highlight: true
+ }
+ end
+
+ def outstanding_balance_row
+ {
+ label: Spree.t(:outstanding_balance),
+ value: order.display_outstanding_balance,
+ id: 'outstanding_balance',
+ highlight: true,
+ danger: order.outstanding_balance > 0
+ }
+ end
+
+ private
+
+ def translate_source_type(source_type)
+ key = source_type.demodulize.underscore
+ Spree.t(key, default: key.humanize)
+ end
+ end
+ end
+end
diff --git a/admin/app/views/spree/admin/orders/_summary.html.erb b/admin/app/views/spree/admin/orders/_summary.html.erb
index f86b0f5d9f..b74bf43c32 100644
--- a/admin/app/views/spree/admin/orders/_summary.html.erb
+++ b/admin/app/views/spree/admin/orders/_summary.html.erb
@@ -1,135 +1,33 @@
+<% presenter = Spree::Admin::OrderSummaryPresenter.new(@order) %>
+
<div class="card mb-6" id="order_tab_summary">
<div class="card-header">
<h5 class="card-title"><%= Spree.t(:summary) %></h5>
</div>
<ul class="list-group list-group-flush">
- <% if @order.created_by %>
- <li class="list-group-item flex justify-between items-center border-0 rounded-none">
- <span><%= Spree.t(:created_by) %></span>
- <span class="text-rightfont-bold">
- <%= link_to @order.created_by.name, spree.admin_admin_user_path(@order.created_by), data: { turbo_frame: '_top' } %>
- </span>
- </li>
- <% end %>
-
-
- <li class="list-group-item flex justify-between items-center border-0 rounded-none">
- <span><%= Spree.t(:created_at) %></span>
- <span class="text-rightfont-bold">
- <%= spree_time(@order.created_at) %>
- </span>
- </li>
-
- <% if @order.completed_at %>
- <li class="list-group-item flex justify-between items-center border-0">
- <span><%= I18n.t('activerecord.attributes.spree/order.completed_at') %></span>
- <span class="text-rightfont-bold">
- <%= spree_time(@order.completed_at) %>
- </span>
- </li>
- <% end %>
-
- <% if @order.canceled? && @order.canceled_at %>
- <li class="list-group-item flex justify-between items-center border-0">
- <span><%= Spree.t(:canceled_at) %></span>
- <span class="text-rightfont-bold">
- <%= spree_time(@order.canceled_at) %>
- </span>
- </li>
- <% if @order.canceler.present? %>
- <li class="list-group-item flex justify-between items-center border-0">
- <span><%= Spree.t(:canceler) %></span>
- <span class="text-rightfont-bold">
- <%= @order.canceler.name %>
+ <% presenter.rows.each do |row| %>
+ <% if row == :separator %>
+ <hr class="border-gray-100" />
+ <% else %>
+ <li class="list-group-item flex justify-between items-center border-0 <%= 'bg-gray-25' if row[:highlight] %>">
+ <span><%= row[:label] %></span>
+ <span class="<%= 'font-bold' if row[:bold] %> <%= 'text-danger' if row[:danger] %>" <%= "id=#{row[:id]}".html_safe if row[:id] %>>
+ <% if row[:link] %>
+ <%= link_to row[:value], row[:link], data: { turbo_frame: '_top' } %>
+ <% elsif row[:type] == :datetime %>
+ <%= spree_time(row[:value]) %>
+ <% elsif row[:type] == :code %>
+ <code><%= row[:value] %></code>
+ <% elsif row[:value].respond_to?(:to_html) %>
+ <%= row[:value].to_html %>
+ <% else %>
+ <%= row[:value] %>
+ <% end %>
</span>
</li>
<% end %>
<% end %>
- <hr class="border-gray-100" />
-
- <li class="list-group-item flex justify-between items-center border-0">
- <span><%= Spree.t(:currency) %></span>
- <code id='currency'>
- <%= @order.currency %>
- </code>
- </li>
-
- <li class="list-group-item flex justify-between items-center border-0">
- <span data-hook='admin_order_tab_subtotal_title'><%= Spree.t(:subtotal) %></span>
- <span id='item_total'>
- <%= @order.display_item_total.to_html %>
- </span>
- </li>
-
- <% if @order.promo_total != 0 %>
- <li class="list-group-item flex justify-between items-center border-0">
- <span><%= Spree.t(:discount_amount) %></span>
- <span class="text-right" id='promo_total'>
- <%= @order.display_promo_total.to_html %>
- </span>
- </li>
- <% end %>
-
- <% other_adjustments = @order.all_adjustments.eligible.where.not(source_type: ['Spree::PromotionAction', 'Spree::TaxRate']) %>
- <% if other_adjustments.any? %>
- <% other_adjustment_total = other_adjustments.sum(:amount) %>
- <li class="list-group-item flex justify-between items-center border-0">
- <span><%= Spree.t(:adjustments) %></span>
- <span class="text-right" id='other_adjustment_total'>
- <%= Spree::Money.new(other_adjustment_total, currency: @order.currency).to_html %>
- </span>
- </li>
- <% end %>
-
- <% if @order.checkout_steps.include?("delivery") && @order.ship_total > 0 %>
- <li class="list-group-item flex justify-between items-center border-0">
- <span data-hook='admin_order_tab_ship_total_title'>
- <%= Spree.t(:ship_total) %>
- </span>
- <span id='ship_total'>
- <%= @order.display_ship_total.to_html %>
- </span>
- </li>
- <% end %>
-
- <li class="list-group-item flex justify-between items-center border-0">
- <span data-hook='admin_order_tab_included_tax_title'><%= Spree.t(:tax_included) %></span>
- <span id='included_tax_total'>
- <%= @order.display_included_tax_total.to_html %>
- </span>
- </li>
-
- <li class="list-group-item border-0" data-controller="reveal">
- <span class="flex justify-between items-center">
- <span><%= Spree.t(:tax) %></span>
- <span id="additional_tax_total">
- <%= @order.display_additional_tax_total.to_html %>
- </span>
- </span>
- </li>
-
<%= render_admin_partials(:order_page_summary_partials, order: @order) %>
-
- <li class="list-group-item flex justify-between items-center border-0">
- <span data-hook='admin_order_tab_total_title'><%= Spree.t(:total) %></span>
- <span class="font-bold capitalize" id='order_total'>
- <%= @order.display_total.to_html %>
- </span>
- </li>
-
- <li class="list-group-item flex justify-between items-center border-t bg-gray-25">
- <span data-hook='admin_order_tab_payment_total_title'><%= Spree.t(:payment_total) %></span>
- <span id='payment_total'>
- <%= @order.display_payment_total.to_html %>
- </span>
- </li>
-
- <li class="list-group-item flex justify-between items-center bg-gray-25">
- <span data-hook='admin_order_tab_outstanding_balance_title'><%= Spree.t(:outstanding_balance) %></span>
- <span id='outstanding_balance' class="text-danger">
- <%= @order.display_outstanding_balance.to_html %>
- </span>
- </li>
</ul>
</div>
diff --git a/admin/app/views/spree/admin/orders/_taxes.html.erb b/admin/app/views/spree/admin/orders/_tax_rates.html.erb
similarity index 70%
rename from admin/app/views/spree/admin/orders/_taxes.html.erb
rename to admin/app/views/spree/admin/orders/_tax_rates.html.erb
index 8a80f48f98..eb7d3a0ac9 100644
--- a/admin/app/views/spree/admin/orders/_taxes.html.erb
+++ b/admin/app/views/spree/admin/orders/_tax_rates.html.erb
@@ -27,23 +27,34 @@
<% tax_rate = adjustment.source %>
<tr>
<td>
- <div class="font-medium"><%= adjustment.label %></div>
- <% if tax_rate.present? %>
- <div class="text-sm text-gray-500">
- <%= link_to tax_rate.zone&.name || Spree.t(:all), spree.edit_admin_tax_rate_path(tax_rate), class: "text-blue-600 hover:underline" %>
- </div>
+ <% if tax_rate.present? && can?(:manage, tax_rate) %>
+ <%= link_to tax_rate.name, spree.edit_admin_tax_rate_path(tax_rate), data: { turbo_frame: '_top' }, class: 'font-semibold' %>
+ <% else %>
+ <%= adjustment.label %>
<% end %>
</td>
<td class="text-sm text-gray-600">
<% if adjustment.adjustable.is_a?(Spree::LineItem) %>
- <%= icon('shopping-cart') %>
- <%= Spree.t(:line_item) %> - <%= adjustment.adjustable.name %>
+ <span class="badge badge-light">
+ <%= icon('box') %>
+ <%= Spree.t(:line_item) %>
+ </span>
+
+ <%= adjustment.adjustable.name %>
<% elsif adjustment.adjustable.is_a?(Spree::Shipment) %>
- <%= icon('truck') %>
- <%= Spree.t(:shipment) %> #<%= adjustment.adjustable.number %>
+ <span class="badge badge-info">
+ <%= icon('truck') %>
+ <%= Spree.t(:shipment) %>
+ </span>
+
+ #<%= adjustment.adjustable.number %>
<% elsif adjustment.adjustable.is_a?(Spree::Order) %>
- <%= icon('receipt') %>
- <%= Spree.t(:order) %>
+ <span class="badge badge-primary">
+ <%= icon('shopping-cart') %>
+ <%= Spree.t(:order) %>
+ </span>
+
+ #<%= adjustment.adjustable.number %>
<% end %>
</td>
<td>
@@ -53,7 +64,7 @@
<%= adjustment.adjustable.display_pre_tax_amount if adjustment.adjustable.respond_to?(:display_pre_tax_amount) %>
<td>
<% if tax_rate.present? %>
- <%= number_to_percentage(tax_rate.amount * 100, precision: 2) %>
+ <%= number_to_percentage(tax_rate.amount * 100, precision: 2, strip_insignificant_zeros: true) %>
<% else %>
-
<% end %>
diff --git a/admin/app/views/spree/admin/orders/show.html.erb b/admin/app/views/spree/admin/orders/show.html.erb
index ae38edbf30..eb99ab1b80 100644
--- a/admin/app/views/spree/admin/orders/show.html.erb
+++ b/admin/app/views/spree/admin/orders/show.html.erb
@@ -7,7 +7,7 @@
<%= render 'shipments' %>
<%= render 'promotions' %>
<%= render 'adjustments' %>
- <%= render 'taxes' %>
+ <%= render 'tax_rates' %>
<%= render 'payments' %>
<%= render 'refunds' %>
<%= render 'customer_returns' %>
diff --git a/admin/spec/controllers/spree/admin/orders/adjustments_controller_spec.rb b/admin/spec/controllers/spree/admin/orders/adjustments_controller_spec.rb
index e4c6aec6e5..ae2e9c63c6 100644
--- a/admin/spec/controllers/spree/admin/orders/adjustments_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/orders/adjustments_controller_spec.rb
@@ -20,59 +20,6 @@ RSpec.describe Spree::Admin::Orders::AdjustmentsController do
describe '#create' do
let(:adjustment_params) { { label: 'Test Adjustment', amount: -10.00 } }
- context 'with HTML format' do
- subject { post :create, params: { order_id: order.number, adjustment: adjustment_params } }
-
- it 'creates a new adjustment on order' do
- expect { subject }.to change { order.adjustments.reload.count }.by(1)
- end
-
- it 'redirects to order edit page' do
- subject
- expect(response).to redirect_to(spree.edit_admin_order_path(order))
- expect(flash[:success]).to be_present
- end
-
- it 'sets the adjustment as closed' do
- subject
- order.reload
- adjustment = order.adjustments.find_by(label: 'Test Adjustment')
- expect(adjustment.state).to eq('closed')
- end
-
- context 'with positive amount' do
- let(:adjustment_params) { { label: 'Surcharge', amount: 5.00 } }
-
- it 'creates a charge adjustment' do
- subject
- order.reload
- adjustment = order.adjustments.find_by(label: 'Surcharge')
- expect(adjustment.amount).to eq(5.00)
- end
- end
-
- context 'with missing label' do
- let(:adjustment_params) { { amount: -10.00 } }
-
- it 'uses default manual adjustment label' do
- subject
- order.reload
- adjustment = order.adjustments.find_by(amount: -10.00)
- expect(adjustment.label).to eq(Spree.t(:manual_adjustment))
- end
- end
-
- context 'with invalid params' do
- let(:adjustment_params) { { label: 'Test', amount: nil } }
-
- it 'renders new template with error' do
- subject
- expect(response).to have_http_status(:unprocessable_content)
- expect(response).to render_template(:new)
- end
- end
- end
-
context 'with turbo_stream format' do
subject { post :create, params: { order_id: order.number, adjustment: adjustment_params }, format: :turbo_stream }
@@ -103,34 +50,6 @@ RSpec.describe Spree::Admin::Orders::AdjustmentsController do
let(:adjustment) { create(:adjustment, adjustable: order, order: order, label: 'Manual', amount: -5, state: 'open') }
let(:update_params) { { label: 'Updated Label', amount: -15.00 } }
- context 'with HTML format' do
- subject { put :update, params: { order_id: order.number, id: adjustment.id, adjustment: update_params } }
-
- it 'updates the adjustment' do
- subject
- adjustment.reload
- expect(adjustment.label).to eq('Updated Label')
- expect(adjustment.amount).to eq(-15.00)
- end
-
- it 'closes the adjustment after update' do
- subject
- adjustment.reload
- expect(adjustment.state).to eq('closed')
- end
-
- it 'redirects to order edit page' do
- subject
- expect(response).to redirect_to(spree.edit_admin_order_path(order))
- end
-
- it 'updates order totals' do
- subject
- order.reload
- expect(order.all_adjustments.find(adjustment.id).amount).to eq(-15.00)
- end
- end
-
context 'with turbo_stream format' do
subject { put :update, params: { order_id: order.number, id: adjustment.id, adjustment: update_params }, format: :turbo_stream }
@@ -150,24 +69,6 @@ RSpec.describe Spree::Admin::Orders::AdjustmentsController do
describe '#destroy' do
let!(:adjustment) { create(:adjustment, adjustable: order, order: order, label: 'Manual', amount: -5) }
- context 'with HTML format' do
- subject { delete :destroy, params: { order_id: order.number, id: adjustment.id } }
-
- it 'destroys the adjustment' do
- expect { subject }.to change { Spree::Adjustment.count }.by(-1)
- end
-
- it 'redirects to order edit page' do
- subject
- expect(response).to redirect_to(spree.edit_admin_order_path(order))
- end
-
- it 'removes the adjustment from order' do
- subject
- expect(Spree::Adjustment.where(id: adjustment.id)).to be_empty
- end
- end
-
context 'with turbo_stream format' do
subject { delete :destroy, params: { order_id: order.number, id: adjustment.id }, format: :turbo_stream }
diff --git a/admin/spec/presenters/spree/admin/order_summary_presenter_spec.rb b/admin/spec/presenters/spree/admin/order_summary_presenter_spec.rb
new file mode 100644
index 0000000000..b6fd9fa076
--- /dev/null
+++ b/admin/spec/presenters/spree/admin/order_summary_presenter_spec.rb
@@ -0,0 +1,323 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Admin::OrderSummaryPresenter do
+ let(:store) { @default_store }
+ let(:order) { create(:order_with_line_items, store: store) }
+ let(:presenter) { described_class.new(order) }
+
+ describe '#rows' do
+ subject { presenter.rows }
+
+ it 'returns an array of rows' do
+ expect(subject).to be_an(Array)
+ end
+
+ it 'includes separators' do
+ expect(subject).to include(:separator)
+ end
+
+ it 'includes required rows' do
+ row_ids = subject.reject { |r| r == :separator }.map { |r| r[:id] }.compact
+
+ expect(row_ids).to include('currency')
+ expect(row_ids).to include('item_total')
+ expect(row_ids).to include('order_total')
+ expect(row_ids).to include('payment_total')
+ expect(row_ids).to include('outstanding_balance')
+ end
+ end
+
+ describe '#metadata_rows' do
+ subject { presenter.metadata_rows }
+
+ it 'includes created_at' do
+ row = subject.find { |r| r[:label] == Spree.t(:created_at) }
+ expect(row).to be_present
+ expect(row[:type]).to eq(:datetime)
+ end
+
+ context 'when order has created_by' do
+ let(:admin_user) { create(:admin_user) }
+ let(:order) { create(:order_with_line_items, store: store, created_by: admin_user) }
+
+ it 'includes created_by with link' do
+ row = subject.find { |r| r[:label] == Spree.t(:created_by) }
+ expect(row).to be_present
+ expect(row[:value]).to eq(admin_user.name)
+ expect(row[:link]).to be_present
+ end
+ end
+
+ context 'when order is completed' do
+ let(:order) { create(:completed_order_with_totals, store: store) }
+
+ it 'includes completed_at' do
+ row = subject.find { |r| r[:label] == I18n.t('activerecord.attributes.spree/order.completed_at') }
+ expect(row).to be_present
+ expect(row[:type]).to eq(:datetime)
+ end
+ end
+
+ context 'when order is canceled' do
+ let(:order) { create(:completed_order_with_totals, store: store) }
+ let(:admin_user) { create(:admin_user) }
+
+ before do
+ order.canceled_by(admin_user)
+ end
+
+ it 'includes canceled_at' do
+ row = subject.find { |r| r[:label] == Spree.t(:canceled_at) }
+ expect(row).to be_present
+ end
+
+ it 'includes canceler' do
+ row = subject.find { |r| r[:label] == Spree.t(:canceler) }
+ expect(row).to be_present
+ expect(row[:value]).to eq(admin_user.name)
+ end
+ end
+ end
+
+ describe '#currency_row' do
+ subject { presenter.currency_row }
+
+ it 'returns currency info' do
+ expect(subject[:label]).to eq(Spree.t(:currency))
+ expect(subject[:value]).to eq(order.currency)
+ expect(subject[:type]).to eq(:code)
+ expect(subject[:id]).to eq('currency')
+ end
+ end
+
+ describe '#subtotal_row' do
+ subject { presenter.subtotal_row }
+
+ it 'returns subtotal info' do
+ expect(subject[:label]).to eq(Spree.t(:subtotal))
+ expect(subject[:value]).to eq(order.display_item_total)
+ expect(subject[:id]).to eq('item_total')
+ end
+ end
+
+ describe '#shipping_row' do
+ subject { presenter.shipping_row }
+
+ context 'when order has shipping' do
+ let(:order) { create(:completed_order_with_totals, store: store) }
+
+ it 'returns shipping info' do
+ expect(subject[:label]).to eq(Spree.t(:ship_total))
+ expect(subject[:value]).to eq(order.display_ship_total)
+ expect(subject[:id]).to eq('ship_total')
+ end
+ end
+
+ context 'when order has no shipping' do
+ let(:order) { create(:order_with_line_items, store: store) }
+
+ before do
+ order.shipments.destroy_all
+ allow(order).to receive(:checkout_steps).and_return([])
+ end
+
+ it 'returns nil' do
+ expect(subject).to be_nil
+ end
+ end
+ end
+
+ describe '#promo_row' do
+ subject { presenter.promo_row }
+
+ context 'when order has promo total' do
+ before do
+ allow(order).to receive(:promo_total).and_return(-10.0)
+ allow(order).to receive(:display_promo_total).and_return(Spree::Money.new(-10, currency: order.currency))
+ end
+
+ it 'returns promo info' do
+ expect(subject[:label]).to eq(Spree.t(:discount_amount))
+ expect(subject[:id]).to eq('promo_total')
+ end
+ end
+
+ context 'when order has no promo' do
+ before do
+ allow(order).to receive(:promo_total).and_return(0)
+ end
+
+ it 'returns nil' do
+ expect(subject).to be_nil
+ end
+ end
+ end
+
+ describe '#manual_adjustments_row' do
+ subject { presenter.manual_adjustments_row }
+
+ context 'when order has no manual adjustments' do
+ it 'returns nil' do
+ expect(subject).to be_nil
+ end
+ end
+
+ context 'when order has manual adjustments' do
+ before do
+ create(:adjustment,
+ adjustable: order,
+ order: order,
+ source_type: nil,
+ amount: -10.0,
+ eligible: true,
+ label: 'Manual Discount')
+ end
+
+ it 'returns manual adjustments info' do
+ expect(subject[:label]).to eq(Spree.t(:manual_adjustments))
+ expect(subject[:id]).to eq('manual_adjustments_total')
+ expect(subject[:value]).to eq(Spree::Money.new(-10, currency: order.currency))
+ end
+ end
+
+ context 'when manual adjustments sum to zero' do
+ before do
+ create(:adjustment,
+ adjustable: order,
+ order: order,
+ source_type: nil,
+ amount: -10.0,
+ eligible: true,
+ label: 'Discount')
+ create(:adjustment,
+ adjustable: order,
+ order: order,
+ source_type: nil,
+ amount: 10.0,
+ eligible: true,
+ label: 'Surcharge')
+ end
+
+ it 'returns nil' do
+ expect(subject).to be_nil
+ end
+ end
+ end
+
+ describe '#custom_adjustment_rows' do
+ subject { presenter.custom_adjustment_rows }
+
+ context 'when order has no custom adjustments' do
+ it 'returns empty array' do
+ expect(subject).to eq([])
+ end
+ end
+
+ context 'when order has custom adjustments' do
+ before do
+ create(:adjustment,
+ adjustable: order,
+ order: order,
+ source_type: 'Spree::SalesCommission',
+ amount: -5.0,
+ eligible: true,
+ label: 'Sales Commission')
+ end
+
+ it 'returns grouped custom adjustment rows' do
+ expect(subject.length).to eq(1)
+ expect(subject.first[:label]).to eq('Sales commission')
+ expect(subject.first[:id]).to eq('sales_commission')
+ end
+ end
+
+ context 'when order has multiple custom adjustment types' do
+ before do
+ create(:adjustment,
+ adjustable: order,
+ order: order,
+ source_type: 'Spree::SalesCommission',
+ amount: -5.0,
+ eligible: true,
+ label: 'Sales Commission')
+ create(:adjustment,
+ adjustable: order,
+ order: order,
+ source_type: 'Spree::LoyaltyDiscount',
+ amount: -3.0,
+ eligible: true,
+ label: 'Loyalty Discount')
+ end
+
+ it 'returns a row for each source type' do
+ expect(subject.length).to eq(2)
+ labels = subject.map { |r| r[:label] }
+ expect(labels).to include('Sales commission')
+ expect(labels).to include('Loyalty discount')
+ end
+ end
+
+ it 'excludes standard Spree adjustments' do
+ # Create promotion adjustment
+ promotion = create(:promotion, :with_order_adjustment, stores: [store])
+ order.coupon_code = promotion.code
+ Spree::PromotionHandler::Coupon.new(order).apply
+ order.reload
+
+ expect(subject).to eq([])
+ end
+ end
+
+ describe '#total_row' do
+ subject { presenter.total_row }
+
+ it 'returns total info with bold styling' do
+ expect(subject[:label]).to eq(Spree.t(:total))
+ expect(subject[:value]).to eq(order.display_total)
+ expect(subject[:id]).to eq('order_total')
+ expect(subject[:bold]).to be true
+ end
+ end
+
+ describe '#payment_total_row' do
+ subject { presenter.payment_total_row }
+
+ it 'returns payment total info with highlight' do
+ expect(subject[:label]).to eq(Spree.t(:payment_total))
+ expect(subject[:value]).to eq(order.display_payment_total)
+ expect(subject[:id]).to eq('payment_total')
+ expect(subject[:highlight]).to be true
+ end
+ end
+
+ describe '#outstanding_balance_row' do
+ subject { presenter.outstanding_balance_row }
+
+ it 'returns outstanding balance info' do
+ expect(subject[:label]).to eq(Spree.t(:outstanding_balance))
+ expect(subject[:value]).to eq(order.display_outstanding_balance)
+ expect(subject[:id]).to eq('outstanding_balance')
+ expect(subject[:highlight]).to be true
+ end
+
+ context 'when balance is positive' do
+ before do
+ allow(order).to receive(:outstanding_balance).and_return(10.0)
+ end
+
+ it 'has danger styling' do
+ expect(subject[:danger]).to be true
+ end
+ end
+
+ context 'when balance is zero or negative' do
+ before do
+ allow(order).to receive(:outstanding_balance).and_return(0)
+ end
+
+ it 'does not have danger styling' do
+ expect(subject[:danger]).to be_falsey
+ end
+ end
+ end
+end
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 466d39945b..8ca169cddd 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -696,14 +696,14 @@ en:
addresses: Addresses
adjustable: Adjustable
adjustment: Adjustment
- adjustment_closed_description: The adjustment is closed, and will not be recalculated.
- adjustment_open_description: The adjustment is open, and will be recalculated.
adjustment_amount: Amount
adjustment_amount_help: Positive values are charges, negative values are credits.
+ adjustment_closed_description: The adjustment is closed, and will not be recalculated.
adjustment_labels:
tax_rates:
excluding_tax: "%{name}%{amount}"
including_tax: "%{name}%{amount} (Included in Price)"
+ adjustment_open_description: The adjustment is open, and will be recalculated.
adjustment_successfully_closed: Adjustment has been successfully closed!
adjustment_successfully_opened: Adjustment has been successfully opened!
adjustment_total: Adjustment Total
@@ -858,9 +858,9 @@ en:
click_and_drag_on_the_products_to_sort_them: Click and drag on the products to sort them.
clone: Clone
close: Close
- closed: Closed
close_all_adjustments: Close All Adjustments
close_sidebar: Close sidebar
+ closed: Closed
code: Code
colors: Colors
company: Company
@@ -1321,6 +1321,7 @@ en:
manage_variants: Manage Variants
manual: Manual
manual_adjustment: Manual Adjustment
+ manual_adjustments: Manual Adjustments
manual_intervention_required: Manual intervention required
mark_as_default: Mark as default
master: Master