Skip to content
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

Fixed UPS Rest API bugs #3976

Merged
merged 11 commits into from
May 12, 2024
Merged

Fixed UPS Rest API bugs #3976

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fbbb0ce
Fixed UPS Rest API bugs
fballiano May 7, 2024
3d6a16a
Fixed UPS Rest API bugs
fballiano May 7, 2024
ebab931
Fixed UPS Rest API bugs
fballiano May 7, 2024
54b2830
revert part of the checks
fballiano May 7, 2024
354b1d3
fixed URL of the live API endpoints
fballiano May 7, 2024
4d931a7
Update adminhtml form field description for UPS param. (#25)
ragnese May 7, 2024
e2de2f7
unit of measurment
fballiano May 7, 2024
1a2e8df
whitespace
fballiano May 7, 2024
840bedb
reverted if activitytags
fballiano May 8, 2024
9a0093f
whitespace
fballiano May 8, 2024
e4794fa
global __ function is deprecated
fballiano May 9, 2024
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
4 changes: 2 additions & 2 deletions app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,7 @@ protected function _parseRestTrackingResponse($trackingValue, $jsonResponse)
if ($jsonResponse) {
$responseData = json_decode($jsonResponse, true);

if ($responseData['trackResponse']['shipment']) {
if (isset($responseData['trackResponse']['shipment'])) {
fballiano marked this conversation as resolved.
Show resolved Hide resolved
$activityTags = $responseData['trackResponse']['shipment'][0]['package'][0]['activity'] ?? [];
if ($activityTags) {
fballiano marked this conversation as resolved.
Show resolved Hide resolved
$index = 1;
Expand Down Expand Up @@ -1256,7 +1256,7 @@ protected function _parseRestTrackingResponse($trackingValue, $jsonResponse)
$resultArr['progressdetail'] = $packageProgress;
}
} else {
$errorTitle = $responseData['errors']['message'];
$errorTitle = $responseData['response']['errors'][0]['message'];
}
}

Expand Down
Loading