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.

Fix: orders CSV export fills Billing State and Shipping State (#14733)

Damian Legawiec55bb09ddf91f
diff --git a/spree/core/app/presenters/spree/csv/order_line_item_presenter.rb b/spree/core/app/presenters/spree/csv/order_line_item_presenter.rb
index 7e2ae367f0..231085e937 100644
--- a/spree/core/app/presenters/spree/csv/order_line_item_presenter.rb
+++ b/spree/core/app/presenters/spree/csv/order_line_item_presenter.rb
@@ -130,7 +130,7 @@ module Spree
index.zero? ? order.bill_address&.company : nil,
index.zero? ? order.bill_address&.city : nil,
index.zero? ? order.bill_address&.postal_code : nil,
- index.zero? ? order.bill_address&.state_name : nil,
+ index.zero? ? order.bill_address&.state_text : nil,
index.zero? ? order.bill_address&.country&.name : nil,
index.zero? ? order.bill_address&.phone : nil,
index.zero? ? order.ship_address&.full_name : nil,
@@ -139,7 +139,7 @@ module Spree
index.zero? ? order.ship_address&.company : nil,
index.zero? ? order.ship_address&.city : nil,
index.zero? ? order.ship_address&.postal_code : nil,
- index.zero? ? order.ship_address&.state_name : nil,
+ index.zero? ? order.ship_address&.state_text : nil,
index.zero? ? order.ship_address&.country&.name : nil,
index.zero? ? order.ship_address&.phone : nil,
index.zero? ? format_date(order.completed_at) : nil,
diff --git a/spree/core/spec/presenters/spree/csv/order_line_items_presenter_spec.rb b/spree/core/spec/presenters/spree/csv/order_line_items_presenter_spec.rb
index ecbb15dff4..e0f5b2f13d 100644
--- a/spree/core/spec/presenters/spree/csv/order_line_items_presenter_spec.rb
+++ b/spree/core/spec/presenters/spree/csv/order_line_items_presenter_spec.rb
@@ -35,6 +35,14 @@ RSpec.describe Spree::CSV::OrderLineItemPresenter do
expect(subject[23]).to eq line_item.total
end
+ it 'exports the state code of the billing and shipping addresses' do
+ expect(order.bill_address.state_code).to be_present
+ expect(order.ship_address.state_code).to be_present
+
+ expect(subject[described_class::HEADERS.index('Billing State')]).to eq order.bill_address.state_code
+ expect(subject[described_class::HEADERS.index('Shipping State')]).to eq order.ship_address.state_code
+ end
+
context 'when index is not zero' do
let(:index) { 1 }