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

serhii-balko · serhii-balko · commit 4e22c63169cb · 2019-07-24T16:31:50.000+03:00
diff --git a/app/code/Magento/Sales/Block/DataProviders/Email/Shipment/TrackingUrl.php b/app/code/Magento/Sales/Block/DataProviders/Email/Shipment/TrackingUrl.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Block\DataProviders\Email\Shipment;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Sales\Model\Order\Shipment\Track;
+use Magento\Shipping\Helper\Data as ShippingHelper;
+
+/**
+ * Shipment track info for email
+ */
+class TrackingUrl implements ArgumentInterface
+{
+    /**
+     * @var ShippingHelper
+     */
+    private $helper;
+
+    /**
+     * @param ShippingHelper $helper
+     */
+    public function __construct(ShippingHelper $helper)
+    {
+        $this->helper = $helper;
+    }
+
+    /**
+     * Get Shipping tracking URL
+     *
+     * @param Track $track
+     * @return string
+     */
+    public function getUrl(Track $track): string
+    {
+        return $this->helper->getTrackingPopupUrlBySalesModel($track);
+    }
+}
diff --git a/app/code/Magento/Sales/Block/Email/Shipment/Track.php b/app/code/Magento/Sales/Block/Email/Shipment/Track.php
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,10 @@
 <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\Sales\Block\Email\Shipment\Track" name="sales.order.email.shipment.track" template="Magento_Sales::email/shipment/track.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="sales.order.email.shipment.track" template="Magento_Sales::email/shipment/track.phtml">
+            <arguments>
+                <argument name="tracking_url" xsi:type="object">Magento\Sales\Block\DataProviders\Email\Shipment\TrackingUrl</argument>
+            </arguments>
+        </block>
     </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
@@ -25,7 +25,7 @@ $_order = $block->getOrder() ?>
                 <tr>
                     <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
                     <td>
-                        <a href="<?= $block->getTrackingUrlEscaped($_item) ?>" target="_blank">
+                        <a href="<?= $block->escapeUrl($block->getTrackingUrl()->getUrl($_item)) ?>" target="_blank">
                             <?= $block->escapeHtml($_item->getNumber()) ?>
                         </a>
                     </td>
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php
@@ -28,7 +28,14 @@ class SaveTest extends AbstractShipmentControllerTest
      */
     public function testSendEmailOnShipmentSave(): void
     {
-        $order = $this->prepareRequest(['shipment' => ['send_email' => true]]);
+        $tracking = [
+            [
+                'number' => 'some_racking_number',
+                'title' => 'some_tracking_title',
+                'carrier_code' => 'carrier_code'
+            ]
+        ];
+        $order = $this->prepareRequest(['shipment' => ['send_email' => true], 'tracking' => $tracking]);
         $this->dispatch('backend/admin/order_shipment/save');
 
         $this->assertSessionMessages(
@@ -47,6 +54,15 @@ public function testSendEmailOnShipmentSave(): void
             ),
             new StringContains(
                 "Your Shipment #{$shipment->getIncrementId()} for Order #{$order->getIncrementId()}"
+            ),
+            new StringContains(
+                "some_tracking_title"
+            ),
+            new StringContains(
+                "some_racking_number"
+            ),
+            new StringContains(
+                "shipping/tracking/popup?hash="
             )
         );
 
