From f8df2dfd8a99202b52480428618f4c33966a7ba1 Mon Sep 17 00:00:00 2001
From: NazarKlovanych <nazarn96@gmail.com>
Date: Wed, 26 Dec 2018 15:57:44 +0200
Subject: [PATCH 1/2] Fix issue 19887 creating new shipment: getting all
 trackers.

---
 .../Sales/view/frontend/templates/email/shipment/track.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
index 9f7146ab084df..46566c2773f45 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
@@ -19,7 +19,7 @@
         </tr>
     </thead>
     <tbody>
-    <?php foreach ($_shipment->getAllTracks() as $_item): ?>
+    <?php foreach ($_order->getTracksCollection($_shipment->getId()) as $_item): ?>
         <tr>
             <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
             <td><?= $block->escapeHtml($_item->getNumber()) ?></td>

From 8b59fc0a3870b5af87256e83353f65e8d676986a Mon Sep 17 00:00:00 2001
From: NazarKlovanych <nazarn96@gmail.com>
Date: Wed, 26 Dec 2018 16:26:02 +0200
Subject: [PATCH 2/2] Refactoring

---
 .../templates/email/shipment/track.phtml      | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
index 46566c2773f45..f1cd5f2b99865 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
@@ -9,22 +9,23 @@
 ?>
 <?php $_shipment = $block->getShipment() ?>
 <?php $_order = $block->getOrder() ?>
-<?php if ($_shipment && $_order && $_shipment->getAllTracks()): ?>
-<br />
-<table class="shipment-track">
-    <thead>
+<?php $trackCollection = $_order->getTracksCollection($_shipment->getId()) ?>
+<?php if ($_shipment && $_order && $trackCollection): ?>
+    <br />
+    <table class="shipment-track">
+        <thead>
         <tr>
             <th><?= /* @escapeNotVerified */  __('Shipped By') ?></th>
             <th><?= /* @escapeNotVerified */  __('Tracking Number') ?></th>
         </tr>
-    </thead>
-    <tbody>
-    <?php foreach ($_order->getTracksCollection($_shipment->getId()) as $_item): ?>
-        <tr>
-            <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
-            <td><?= $block->escapeHtml($_item->getNumber()) ?></td>
-        </tr>
-    <?php endforeach ?>
-    </tbody>
-</table>
+        </thead>
+        <tbody>
+        <?php foreach ($trackCollection as $_item): ?>
+            <tr>
+                <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
+                <td><?= $block->escapeHtml($_item->getNumber()) ?></td>
+            </tr>
+        <?php endforeach ?>
+        </tbody>
+    </table>
 <?php endif; ?>