diff --git a/CHANGELOG.md b/CHANGELOG.md index ff577f0..6d50645 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,3 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [1.0.0] - 2018-02-23 ### Added - Initial release + +## [1.0.1] - 2018-03-01 +### Added +- M2-59 update to tracking email template diff --git a/README.md b/README.md index 1763474..0c0cb11 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ For up-to-date installation instructions, along with troubleshooting steps, plea Support ------- -For further information on using Tracker, please refer to our [online documentation](http://wiki.webshopapps.com/extensions/generic-tracker). +For further information on using Tracker, please refer to our [online documentation](http://support.webshopapps.com/shippingtracker). If you have any issues with this extension, open an issue on [GitHub](https://github.com/shipperhq/module-shipping-tracker/issues). Contribution diff --git a/composer.json b/composer.json index f92f614..430843c 100755 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "AFL-3.0" ], - "version": "1.0.0", + "version": "1.0.1", "authors": [ { diff --git a/src/composer.json b/src/composer.json index dca1188..2fea548 100755 --- a/src/composer.json +++ b/src/composer.json @@ -8,7 +8,7 @@ "AFL-3.0" ], - "version": "1.0.0", + "version": "1.0.1", "authors": [ { diff --git a/src/view/frontend/templates/email/shipment/track.phtml b/src/view/frontend/templates/email/shipment/track.phtml index eff6d94..f8b7e8b 100644 --- a/src/view/frontend/templates/email/shipment/track.phtml +++ b/src/view/frontend/templates/email/shipment/track.phtml @@ -3,36 +3,35 @@ * Copyright © 2016 Magento. All rights reserved. * See COPYING.txt for license details. */ - +use ShipperHQ\Tracker\Helper\Track; // @codingStandardsIgnoreFile - -?> -getShipment() ?> -getOrder() ?> - ''); -$string = ""; +$_shipment = $block->getShipment(); +$_order = $block->getOrder(); +$rplChars = array(' ' => ''); +$string = ''; if ($this->getOrder()) { $string = $this->getOrder()->getShippingAddress()->getPostcode(); } -$zipcode = strtr($string,$rplChars);?> +$zipCode = strtr($string, $rplChars); +?> getAllTracks()): ?> -
+
- - + + getAllTracks() as $_item): ?> - helper('ShipperHQ\Tracker\Helper\Track')->getTrackUrl($_item->getTitle(),$_item->getNumber(), $zipcode) ?> + helper(Track::class)->getTrackUrl($_item->getTitle(), + $_item->getNumber(), $zipCode) ?> - - + + @@ -40,4 +39,4 @@ $zipcode = strtr($string,$rplChars);?>
escapeHtml($_item->getTitle()) ?>:escapeHtml($_item->getNumber()) ?>escapeHtml($_item->getNumber()) ?> escapeHtml($_item->getNumber()) ?>
- + \ No newline at end of file