Skip to content

Commit 05f0181

Browse files
committed
MC-18366: Shipping confirmation email does not have link for order tracking
1 parent 64d4266 commit 05f0181

File tree

2 files changed

+4
-8
lines changed
  • app/code/Magento/Shipping/view/frontend/templates/tracking
  • dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment

2 files changed

+4
-8
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,9 @@ $results = $block->getTrackingInfo();
6565
'jquery',
6666
'prototype'
6767
], function (jQuery) {
68-
var hideActions = function () {
69-
jQuery('.actions button.close').hide();
70-
};
71-
7268
/* hide the close button when the content doesn't open in a modal window */
7369
if (window.opener === null || typeof window.opener === "undefined") {
74-
hideActions();
70+
jQuery('.actions button.close').hide();
7571
}
7672
});
7773
</script>

dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ public function testSendEmailOnShipmentSave(): void
5656
"Your Shipment #{$shipment->getIncrementId()} for Order #{$order->getIncrementId()}"
5757
),
5858
new StringContains(
59-
"some_tracking_title"
59+
'some_tracking_title'
6060
),
6161
new StringContains(
62-
"some_racking_number"
62+
'some_racking_number'
6363
),
6464
new StringContains(
65-
"shipping/tracking/popup?hash="
65+
'shipping/tracking/popup?hash='
6666
)
6767
);
6868

0 commit comments

Comments
 (0)