Skip to content

Commercial destination should not be treated as residential #40307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-devops-reposync-svc merged 11 commits into from
Jan 16, 2026
Merged

Commercial destination should not be treated as residential #40307

Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2b0f515
Resolved an issue with Commercial addresses for the UPS carrier. Empt…
dmytrokaplin Nov 20, 2025
c477ae5
Merge branch '2.4-develop' into 2.4-develop
dmytrokaplin Nov 20, 2025
e562131
Merge branch '2.4-develop' into 2.4-develop
dmytrokaplin Nov 21, 2025
420dde0
Merge branch '2.4-develop' into 2.4-develop
dmytrokaplin Nov 26, 2025
5907980
Merge branch '2.4-develop' into 2.4-develop
engcom-Dash Dec 23, 2025
0553870
Merge branch '2.4-develop' into 2.4-develop
engcom-Dash Jan 2, 2026
a562360
Add integration tests for respective PR changes
engcom-Dash Jan 5, 2026
d051bd7
Merge branch '2.4-develop' into 2.4-develop
engcom-Dash Jan 5, 2026
d2ded14
Fix static test failure
engcom-Dash Jan 6, 2026
51bca7b
Merge branch '2.4-develop' into 2.4-develop
engcom-Bravo Jan 8, 2026
0d3de78
Merge branch '2.4-develop' into 2.4-develop
engcom-Dash Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions app/code/Magento/Ups/Model/Carrier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,8 +1118,7 @@ protected function _getRestQuotes()
"AddressLine" => ["{$params['49_residential']}"],
"StateProvinceCode" => "{$params['destRegionCode']}",
"PostalCode" => "{$params['19_destPostal']}",
"CountryCode" => "{$params['22_destCountry']}",
"ResidentialAddressIndicator" => "{$residentialAddressIndicator}"
"CountryCode" => "{$params['22_destCountry']}"
]
],
"ShipFrom" => [
Expand All @@ -1134,6 +1133,11 @@ protected function _getRestQuotes()
]
];

if ($params['49_residential'] === '01') {
$rateParams['RateRequest']['Shipment']['ShipTo']['Address']['ResidentialAddressIndicator']
= $residentialAddressIndicator;
}

if ($this->getConfigFlag('negotiated_active')) {
$rateParams['RateRequest']['Shipment']['ShipmentRatingOptions']['TPFCNegotiatedRatesIndicator'] = "Y";
$rateParams['RateRequest']['Shipment']['ShipmentRatingOptions']['NegotiatedRatesIndicator'] = "Y";
Expand Down