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
Use Spree::Money instance correctly as argument for money column type (#13924)
Kacper Mękarskia25fc873ea40
diff --git a/spree/admin/app/helpers/spree/admin/table_helper.rb b/spree/admin/app/helpers/spree/admin/table_helper.rbindex 63f92085c3..a4c1701bde 100644--- a/spree/admin/app/helpers/spree/admin/table_helper.rb+++ b/spree/admin/app/helpers/spree/admin/table_helper.rb@@ -79,7 +79,13 @@ module Spreedef render_money_column(value, column)return empty_column_placeholder if value.blank?- value.respond_to?(:display_amount) ? value.display_amount : Spree::Money.new(value, currency: current_currency).to_html+ if value.respond_to?(:display_amount)+ value.display_amount+ elsif value.is_a?(Spree::Money)+ value.to_html+ else+ Spree::Money.new(value, currency: current_currency).to_html+ endend# Render date columndiff --git a/spree/admin/spec/helpers/spree/admin/table_helper_spec.rb b/spree/admin/spec/helpers/spree/admin/table_helper_spec.rbindex c1422f5651..f27b2d9595 100644--- a/spree/admin/spec/helpers/spree/admin/table_helper_spec.rb+++ b/spree/admin/spec/helpers/spree/admin/table_helper_spec.rb@@ -353,6 +353,15 @@ RSpec.describe Spree::Admin::TableHelper, type: :helper doexpect(result).to eq('$25.00')end++ it 'uses Spree::Money instance as argument' do+ gbp_money = Spree::Money.new(72.98, currency: 'GBP')++ result = helper.render_money_column(gbp_money, column)++ expect(result).to include('£')+ expect(result).to include('72.98')+ endenddescribe '#render_date_column' do