Merge pull request #5929 from magpieuk/solidus-order-index-fix

Display the store's currency in the Admin Order Index Component

Author: tvdeyen

admin/app/components/solidus_admin/orders/index/component.rb

@@ -153,7 +153,7 @@ def total_column
     {
       header: :total,
       data: ->(order) do
-        content_tag :div, number_to_currency(order.total)
+        content_tag :div, order.display_total
       end
     }
   end

admin/app/components/solidus_admin/orders/show/summary/component.html.erb

@@ -2,12 +2,12 @@
   <%= render component('ui/panel').new(title: t('.summary')) do %>
     <%= render component('ui/details_list').new(
       items: [
-        { label: t('.subtotal'), value: number_to_currency(@order.item_total), class: 'font-semibold' },
-        { label: t('.taxes'), value: number_to_currency(@order.additional_tax_total) },
-        { label: t('.shipping'), value: number_to_currency(@order.shipment_total) },
-        { label: link_to(t('.add_promo_code'), '#', class: "body-link"), value: number_to_currency(@order.promo_total) },
-        { label: link_to(t('.adjustments'), solidus_admin.order_adjustments_path(@order), class: "body-link"), value: number_to_currency(@order.adjustment_total) },
-        { label: t('.total'), value: number_to_currency(@order.total), class: 'font-semibold' }
+        { label: t('.subtotal'), value: @order.display_item_total, class: 'font-semibold' },
+        { label: t('.taxes'), value: @order.display_additional_tax_total },
+        { label: t('.shipping'), value: @order.display_shipment_total },
+        { label: link_to(t('.add_promo_code'), '#', class: "body-link"), value: @order.display_promo_total },
+        { label: link_to(t('.adjustments'), solidus_admin.order_adjustments_path(@order), class: "body-link"), value: @order.display_adjustment_total },
+        { label: t('.total'), value: @order.display_total, class: 'font-semibold' }
       ]
     ) %>
   <% end %>

admin/app/components/solidus_admin/users/orders/component.rb

@@ -106,7 +106,7 @@ def total_column
     {
       header: :total,
       data: ->(order) do
-        content_tag :div, number_to_currency(order.total)
+        content_tag :div, order.display_total
       end
     }
   end

admin/spec/features/orders/index_spec.rb

@@ -17,6 +17,23 @@
     expect(page).to be_axe_clean
   end
 
+  context 'with different currency' do
+    around do |example|
+      currency_was = Spree::Config.currency
+      Spree::Config.currency = 'EUR'
+      example.run
+      Spree::Config.currency = currency_was
+    end
+
+    it 'displays correct currency' do
+      create(:order, total: 19.99)
+      visit "/admin/orders"
+      click_on "In Progress"
+
+      expect(page).to have_content("€19.99")
+    end
+  end
+
   context "with multiple stores", :js do
     let!(:order_in_default_store) { create :order }
     let(:another_store) { create :store, name: "Another Store" }

admin/spec/features/orders/show_spec.rb

@@ -137,6 +137,33 @@
     end
   end
 
+  describe 'summary panel' do
+    shared_examples_for 'summary panel' do
+      let!(:order) { create(:order, number: "R123456789", total: 4.99, currency:) }
+      let(:currency) { 'USD' }
+
+      it 'displays order summary correctly' do
+        visit "/admin/orders/R123456789"
+
+        expect(page).to have_content("Summary")
+        expect(page).to have_content(/Subtotal\s#{Regexp.escape(order.display_item_total.to_s)}/)
+        expect(page).to have_content(/Taxes\s#{Regexp.escape(order.display_additional_tax_total.to_s)}/)
+        expect(page).to have_content(/Shipping\s#{Regexp.escape(order.display_shipment_total.to_s)}/)
+        expect(page).to have_content(/Add Promo Code\s#{Regexp.escape(order.display_promo_total.to_s)}/)
+        expect(page).to have_content(/Adjustments\s#{Regexp.escape(order.display_adjustment_total.to_s)}/)
+        expect(page).to have_content(/Total\s#{Regexp.escape(order.display_total.to_s)}/)
+      end
+    end
+
+    include_examples "summary panel"
+
+    context 'with different currency' do
+      include_examples "summary panel" do
+        let(:currency) { 'EUR' }
+      end
+    end
+  end
+
   private
 
   def open_customer_menu

admin/spec/features/users_spec.rb

@@ -184,8 +184,9 @@
     end
 
     context "when a user has ordered before" do
+      let!(:user) { create(:user, :with_orders, email: "[email protected]") }
+
       before do
-        create(:user, :with_orders, email: "[email protected]")
         visit "/admin/users"
         find_row("[email protected]").click
         click_on "Order History"
@@ -204,6 +205,19 @@
         expect(page).to have_content("Payment")
         expect(page).not_to have_content("No Orders found.")
       end
+
+      context 'with a different currency' do
+        around do |example|
+          currency_was = Spree::Config.currency
+          Spree::Config.currency = 'EUR'
+          example.run
+          Spree::Config.currency = currency_was
+        end
+
+        it 'displays correct currency' do
+          page.assert_selector('section table td:last-child', exact_text: /€\d\.\d{2}/, count: user.orders.count)
+        end
+      end
     end
   end
 

core/app/models/spree/order.rb

@@ -52,7 +52,8 @@ class CannotRebuildShipments < StandardError; end
       :total_available_store_credit,
       :item_total_before_tax,
       :shipment_total_before_tax,
-      :item_total_excluding_vat
+      :item_total_excluding_vat,
+      :promo_total
     )
     alias :display_ship_total :display_shipment_total
 

core/spec/models/spree/order_spec.rb

@@ -358,6 +358,13 @@
     end
   end
 
+  describe "#promo_total" do
+    it "returns the value as a spree money" do
+      order.promo_total = 10.55
+      expect(order.display_promo_total).to eq(Spree::Money.new(10.55))
+    end
+  end
+
   context "#currency" do
     context "when object currency is ABC" do
       before { order.currency = "ABC" }