Skip to content

Commit 2c5b4c5

Browse files
committed
MAGETWO-63215: FedEx Shipment Tracking fails for valid tracking number
- Updated template
1 parent 0c2836a commit 2c5b4c5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ $fields = [
1919
'Service Type' => 'getService',
2020
'Weight' => 'getWeight',
2121
];
22+
$number = is_object($track) ? $track->getTracking() : $track['number'];
2223
?>
23-
<table class="data table order tracking" id="tracking-table-popup-<?php /* @noEscape */ echo $track->getTracking(); ?>">
24+
<table class="data table order tracking" id="tracking-table-popup-<?php /* @noEscape */ echo $number; ?>">
2425
<caption class="table-caption"><?php echo $block->escapeHtml(__('Order tracking')); ?></caption>
2526
<tbody>
2627
<?php if (is_object($track)): ?>
2728
<tr>
2829
<th class="col label" scope="row"><?php echo $block->escapeHtml(__('Tracking Number:')); ?></th>
29-
<td class="col value"><?php echo $block->escapeHtml($track->getTracking()); ?></td>
30+
<td class="col value"><?php echo $block->escapeHtml($number); ?></td>
3031
</tr>
3132
<?php if ($track->getCarrierTitle()): ?>
3233
<tr>

app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $results = $block->getTrackingInfo();
3131
?>
3232
<?php /* @noEscape */ echo $block->getChildHtml('shipping.tracking.details.' . $counter); ?>
3333
</div>
34-
<?php if (!empty($track->getProgressdetail())): ?>
34+
<?php if (is_object($track) && !empty($track->getProgressdetail())): ?>
3535
<?php
3636
$block->addChild('shipping.tracking.progress.'. $counter, Template::class, [
3737
'track' => $track,

0 commit comments

Comments
 (0)