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
Fixed `ShippingRate#display_price` when `TaxRate#show_rate_in_label` is set to false
Damian Legawiec1cf2fddde46e
diff --git a/core/app/models/spree/shipping_rate.rb b/core/app/models/spree/shipping_rate.rbindex 536e948ff6..c02f5da105 100644--- a/core/app/models/spree/shipping_rate.rb+++ b/core/app/models/spree/shipping_rate.rb@@ -14,7 +14,7 @@ module Spreedef display_priceprice = display_base_price.to_s- return price if tax_rate.nil? || tax_amount.zero?+ return price if tax_rate.nil? || tax_amount.zero? || !tax_rate.show_rate_in_labelSpree.t(tax_rate.included_in_price? ? :including_tax : :excluding_tax,diff --git a/core/spec/models/spree/shipping_rate_spec.rb b/core/spec/models/spree/shipping_rate_spec.rbindex bdab736fe6..38ee81805f 100644--- a/core/spec/models/spree/shipping_rate_spec.rb+++ b/core/spec/models/spree/shipping_rate_spec.rb@@ -99,6 +99,16 @@ describe Spree::ShippingRate, type: :model doexpect(shipping_rate.display_price.to_s).to eq('¥205')endend++ context 'when tax rate is not shown in label' do+ let(:tax_rate) { create(:tax_rate, name: 'Sales Tax', amount: 0.1, show_rate_in_label: false) }++ before { shipping_rate.tax_rate = tax_rate }++ it 'shows no tax amount' do+ expect(shipping_rate.display_price.to_s).to eq('$10.00')+ end+ endend# Regression test for #3829