UPSTREAM FIX

magento2-40497: Adds the country to the shipping and billing address columns of the order grid

Community fix magento2-40497 merged into magento/magento2 on 2026-03-25, released in 2.4.9; applies cleanly to 33 releases from 2.4.6 to 2.4.8-p5.

Adds the country to the shipping and billing address columns of the order grid edited

Pull request title: Sales->Orders grid "shipping address" column is missing country
Pull request: magento/magento2#40497
Issues: #40403 human
Author: @lbajsarowicz
Merged: 2026-03-25
Fixed in: 2.4.9
Reported on: 2.4.7-p8
Categories: Order/Checkout
Components: magento/module-sales

Labels

Area: Order
Component: Order grid
Priority: P2
Severity: —
Reported on (labels): 2.4.7-P8

Issue

Title and steps come from the upstream issue and pull request.

Description

Address includes only street and city

Steps to reproduce

For orders delivered to other countries then the one the shop is in,
the column "shipping address" in the admin "Salers->Orders" grid doesn't show the country.

This makes it difficult to find orders from the last time that country was shipped to.
e.g. to use the correct codes from the last pDDP customs declaration for Trump's tariffs.

Expected result

Address includes a country

Actual result

Address includes only street and city

Taken from the upstream issue.

Code match per tag

Each tag was checked with git apply --check against that tag's files. A clean match means the change applies; it is not a test result. Tags that already contain the fix are marked.

Line	Code match per tag	Tests
2.4.6	2.4.6 clean 2.4.6-p1 clean 2.4.6-p2 clean 2.4.6-p3 clean 2.4.6-p4 clean 2.4.6-p5 clean 2.4.6-p6 clean 2.4.6-p7 clean 2.4.6-p8 clean 2.4.6-p9 clean 2.4.6-p10 clean 2.4.6-p11 clean 2.4.6-p12 clean 2.4.6-p13 clean 2.4.6-p14 clean 2.4.6-p15 clean	2.4.6: no test data 2.4.6-p1: no test data 2.4.6-p2: no test data 2.4.6-p3: no test data 2.4.6-p4: no test data 2.4.6-p5: no test data 2.4.6-p6: no test data 2.4.6-p7: no test data 2.4.6-p8: no test data 2.4.6-p9: no test data 2.4.6-p10: no test data 2.4.6-p11: no test data 2.4.6-p12: no test data 2.4.6-p13: no test data 2.4.6-p14: no test data 2.4.6-p15: no test data
2.4.7	2.4.7 clean 2.4.7-p1 clean 2.4.7-p2 clean 2.4.7-p3 clean 2.4.7-p4 clean 2.4.7-p5 clean 2.4.7-p6 clean 2.4.7-p7 clean 2.4.7-p8 clean 2.4.7-p9 clean 2.4.7-p10 clean	2.4.7: no test data 2.4.7-p1: no test data 2.4.7-p2: no test data 2.4.7-p3: no test data 2.4.7-p4: no test data 2.4.7-p5: no test data 2.4.7-p6: no test data 2.4.7-p7: no test data 2.4.7-p8: no test data 2.4.7-p9: no test data 2.4.7-p10: no test data
2.4.8	2.4.8 clean 2.4.8-p1 clean 2.4.8-p2 clean 2.4.8-p3 clean 2.4.8-p4 clean 2.4.8-p5 clean	2.4.8: no test data 2.4.8-p1: no test data 2.4.8-p2: no test data 2.4.8-p3: no test data 2.4.8-p4: no test data 2.4.8-p5: no test data
2.4.9	2.4.9 conflictcontains the fix	2.4.9: no test data

Triage

Model @cf/cloudflare/clef. Probability this is a bug fix: 96.7%. Probability it is security relevant: 0.8%.

Show the model's answers and probabilities

Question	Answer	Probabilities	Confidence
Change kind	bugfix	bugfix 90.0%, feature 4.5%, refactor 2.4%, dependency 1.4%, tests_only 1.0%, docs_only 0.8%	77.6%
Area	admin	admin 84.4%, framework 5.7%, checkout 4.9%	67.9%
Reported version	2.4.7-p8	2.4.7-p8 62.2%, 2.4.7 3.5%, 2.4.7-p9 1.6%	38.2%
Scope	0.42 of 2	0 66.9%, 1 24.3%, 2 8.8%	27.2%
Risk	0.30 of 2	0 76.1%, 1 18.2%, 2 5.7%	42.4%
Worth backporting	1.25 of 2	2 46.5%, 1 31.5%, 0 22.0%	4.6%

Download

For cweagans/composer-patches, choose a version below and download the bundle. Copy its magento2-40497/ folder into patches/composer/, merge composer.patches.json into composer.json, then run composer install. Test files are always removed; paths are relative to each package root, using the default -p1 level.

Bundle README (what the ZIP ships)

# magento2-40497

Community fix merged upstream into magento/magento2, adapted by magento.watch.
This is not a patch published by Adobe.

Pull request: https://github.com/magento/magento2/pull/40497
Issue: https://github.com/magento/magento2/issues/40403
Author: @lbajsarowicz
Source commit: 64dd9426c7f93509a194dc069f2f098ac3239880
Modifications: test files and documentation removed, paths rewritten relative to each Composer package.
Licence: OSL-3.0 / AFL-3.0, as the original Magento Open Source code.
Maintainer: Łukasz Bajsarowicz (@lbajsarowicz)

Licence: Magento Open Source code under OSL-3.0 and AFL-3.0. The bundle carries the original author, source commit and the list of modifications.