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
SD-1255 Display correct currency for customer return's pre-tax total (#11150)
Tomek Urban54bb7c5b61fb
diff --git a/core/app/models/spree/customer_return.rb b/core/app/models/spree/customer_return.rbindex 80214c8279..a9007987d4 100644--- a/core/app/models/spree/customer_return.rb+++ b/core/app/models/spree/customer_return.rb@@ -17,7 +17,7 @@ module Spreeaccepts_nested_attributes_for :return_itemsextend DisplayMoney- money_methods pre_tax_total: { currency: Spree::Config[:currency] }+ money_methods :pre_tax_totalself.whitelisted_ransackable_attributes = ['number']@@ -31,6 +31,10 @@ module Spreecompletely_decided? && return_items.accepted.includes(:reimbursement).all? { |return_item| return_item.reimbursement.try(:reimbursed?) }end+ def currency+ order&.currency+ end+# Temporarily tie a customer_return to one orderdef orderreturn nil if return_items.blank?diff --git a/core/spec/models/spree/customer_return_spec.rb b/core/spec/models/spree/customer_return_spec.rbindex 44a6a37750..7702abc85e 100644--- a/core/spec/models/spree/customer_return_spec.rb+++ b/core/spec/models/spree/customer_return_spec.rb@@ -83,6 +83,19 @@ describe Spree::CustomerReturn, type: :model doit { expect(Spree::CustomerReturn.whitelisted_ransackable_attributes).to eq(%w(number)) }end+ describe '#display_pre_tax_total' do+ subject { customer_return.display_pre_tax_total.to_s }++ let(:pre_tax_amount) { 15.0 }+ let(:customer_return) { create(:customer_return, line_items_count: 2) }++ before do+ Spree::ReturnItem.where(customer_return_id: customer_return.id).update_all(pre_tax_amount: pre_tax_amount)+ end++ it { is_expected.to eq '$30.00' }+ end+describe '#pre_tax_total' dosubject { customer_return.pre_tax_total }@@ -107,6 +120,19 @@ describe Spree::CustomerReturn, type: :model doendend+ describe '#currency' do+ subject { customer_return.currency }++ let(:return_item) { create(:return_item) }+ let(:customer_return) { build(:customer_return, return_items: [return_item]) }+ let(:order) { create(:order, currency: test_currency) }+ let(:test_currency) { 'EUR' }++ before { return_item.inventory_unit.update(order: order)}++ it { is_expected.to eq test_currency }+ end+describe '#order' dosubject { customer_return.order }