MC-18366: Shipping confirmation email does not have link for order tracking

serhii-balko · serhii-balko · commit 51996a128081 · 2019-07-23T16:05:30.000+03:00
diff --git a/app/code/Magento/Sales/Block/Email/Shipment/Track.php b/app/code/Magento/Sales/Block/Email/Shipment/Track.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Block\Email\Shipment;
+
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Sales\Model\Order\Shipment\Track as TrackModel;
+use Magento\Shipping\Helper\Data as ShippingHelper;
+
+/**
+ * Shipment track info for email
+ */
+class Track extends Template
+{
+    /**
+     * @var ShippingHelper
+     */
+    private $helper;
+
+    /**
+     * @param Context $context
+     * @param ShippingHelper $helper
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        ShippingHelper $helper,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->helper = $helper;
+    }
+
+    /**
+     * Get Shipping tracking URL
+     *
+     * @param TrackModel $track
+     * @return string
+     */
+    public function getTrackingUrl(TrackModel $track): string
+    {
+        return $this->helper->getTrackingPopupUrlBySalesModel($track);
+    }
+
+    /**
+     * Get Shipping tracking URL escaped
+     *
+     * @param TrackModel $track
+     * @return string
+     */
+    public function getTrackingUrlEscaped(TrackModel $track): string
+    {
+        return $this->escapeUrl($this->getTrackingUrl($track));
+    }
+}
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
@@ -8,6 +8,6 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="sales_email_order_shipment_renderers"/>
     <body>
-        <block class="Magento\Framework\View\Element\Template" name="sales.order.email.shipment.track" template="Magento_Sales::email/shipment/track.phtml"/>
+        <block class="Magento\Sales\Block\Email\Shipment\Track" name="sales.order.email.shipment.track" template="Magento_Sales::email/shipment/track.phtml"/>
     </body>
 </page>
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
@@ -3,8 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 ?>
+<?php /* @var \Magento\Sales\Block\Email\Shipment\Track $block */ ?>
 <?php $_shipment = $block->getShipment() ?>
 <?php
 /* @var \Magento\Sales\Model\Order $_order */
@@ -24,7 +24,11 @@ $_order = $block->getOrder() ?>
             <?php foreach ($trackCollection as $_item) : ?>
                 <tr>
                     <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
-                    <td><?= $block->escapeHtml($_item->getNumber()) ?></td>
+                    <td>
+                        <a href="<?= $block->getTrackingUrlEscaped($_item) ?>" target="_blank">
+                            <?= $block->escapeHtml($_item->getNumber()) ?>
+                        </a>
+                    </td>
                 </tr>
             <?php endforeach ?>
             </tbody>
