File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed
app/code/Magento/Shipping/view/frontend/templates/tracking Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -19,14 +19,15 @@ $fields = [
19
19
'Service Type ' => 'getService ' ,
20
20
'Weight ' => 'getWeight ' ,
21
21
];
22
+ $ number = is_object ($ track ) ? $ track ->getTracking () : $ track ['number ' ];
22
23
?>
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 ; ?> ">
24
25
<caption class="table-caption"><?php echo $ block ->escapeHtml (__ ('Order tracking ' )); ?> </caption>
25
26
<tbody>
26
27
<?php if (is_object ($ track )): ?>
27
28
<tr>
28
29
<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>
30
31
</tr>
31
32
<?php if ($ track ->getCarrierTitle ()): ?>
32
33
<tr>
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ $results = $block->getTrackingInfo();
31
31
?>
32
32
<?php /* @noEscape */ echo $ block ->getChildHtml ('shipping.tracking.details. ' . $ counter ); ?>
33
33
</div>
34
- <?php if (!empty ($ track ->getProgressdetail ())): ?>
34
+ <?php if (is_object ( $ track ) && !empty ($ track ->getProgressdetail ())): ?>
35
35
<?php
36
36
$ block ->addChild ('shipping.tracking.progress. ' . $ counter , Template::class, [
37
37
'track ' => $ track ,
You can’t perform that action at this time.
0 commit comments