Version Notes
Fixed banner block function naming.
Email banner image and url are taken from correct config parameter.
Download this release
Release Info
Developer | Packpin Packpin |
Extension | Packpin_Pptrack |
Version | 1.2.1 |
Comparing to | |
See all releases |
Code changes from version 1.2.0 to 1.2.1
- app/code/community/Packpin/Pptrack/Block/Ads.php +19 -1
- app/code/community/Packpin/Pptrack/Model/Api.php +1 -1
- app/code/community/Packpin/Pptrack/etc/config.xml +1 -1
- app/design/adminhtml/default/default/layout/pptrack.xml +1 -1
- app/design/frontend/base/default/layout/pptrack.xml +1 -1
- app/design/frontend/base/default/template/pptrack/ads.phtml +1 -1
- app/design/frontend/base/default/template/pptrack/ads_email.phtml +2 -2
- app/etc/modules/Packpin_Pptrack.xml +1 -1
- package.xml +5 -4
app/code/community/Packpin/Pptrack/Block/Ads.php
CHANGED
@@ -12,10 +12,28 @@ class Packpin_Pptrack_Block_Ads extends Mage_Catalog_Block_Product_Abstract
|
|
12 |
return false;
|
13 |
}
|
14 |
|
15 |
-
public function
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
16 |
{
|
17 |
$url = Mage::getStoreConfig('pp_section_setttings/crosssell/cross_sell_page_image_url');
|
18 |
|
19 |
return $url;
|
20 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
21 |
}
|
12 |
return false;
|
13 |
}
|
14 |
|
15 |
+
public function getEmailImage()
|
16 |
+
{
|
17 |
+
$image = Mage::getStoreConfig('pp_section_setttings/crosssell/cross_sell_email_image');
|
18 |
+
|
19 |
+
if ($image) {
|
20 |
+
return Mage::getBaseUrl('media') . 'theme' . DIRECTORY_SEPARATOR . $image;
|
21 |
+
}
|
22 |
+
|
23 |
+
return false;
|
24 |
+
}
|
25 |
+
|
26 |
+
public function getImageUrl()
|
27 |
{
|
28 |
$url = Mage::getStoreConfig('pp_section_setttings/crosssell/cross_sell_page_image_url');
|
29 |
|
30 |
return $url;
|
31 |
}
|
32 |
+
|
33 |
+
public function getEmailImageUrl()
|
34 |
+
{
|
35 |
+
$url = Mage::getStoreConfig('pp_section_setttings/crosssell/cross_sell_email_image_url');
|
36 |
+
|
37 |
+
return $url;
|
38 |
+
}
|
39 |
}
|
app/code/community/Packpin/Pptrack/Model/Api.php
CHANGED
@@ -98,7 +98,7 @@ class Packpin_Pptrack_Model_Api extends Mage_Api_Model_Resource_Abstract
|
|
98 |
$banner = '';
|
99 |
if (Mage::getStoreConfig('pp_section_setttings/crosssell/cross_sell_email')) {
|
100 |
if (in_array(Mage::getStoreConfig('pp_section_setttings/crosssell/cross_sell_email_type'), array('ads'))) {
|
101 |
-
$banner = Mage::app()->getLayout()->createBlock('pptrack/ads')->
|
102 |
}
|
103 |
else {
|
104 |
$crossSell = Mage::app()->getLayout()->createBlock('pptrack/crosssell')->setData(array('orderId' => $trackModel->getOrderId()))->setTemplate('pptrack/crosssell_email.phtml')->toHtml();
|
98 |
$banner = '';
|
99 |
if (Mage::getStoreConfig('pp_section_setttings/crosssell/cross_sell_email')) {
|
100 |
if (in_array(Mage::getStoreConfig('pp_section_setttings/crosssell/cross_sell_email_type'), array('ads'))) {
|
101 |
+
$banner = Mage::app()->getLayout()->createBlock('pptrack/ads')->setTemplate('pptrack/ads_email.phtml')->toHtml();
|
102 |
}
|
103 |
else {
|
104 |
$crossSell = Mage::app()->getLayout()->createBlock('pptrack/crosssell')->setData(array('orderId' => $trackModel->getOrderId()))->setTemplate('pptrack/crosssell_email.phtml')->toHtml();
|
app/code/community/Packpin/Pptrack/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Packpin_Pptrack>
|
5 |
-
<version>1.2.
|
6 |
</Packpin_Pptrack>
|
7 |
</modules>
|
8 |
<frontend>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Packpin_Pptrack>
|
5 |
+
<version>1.2.1</version>
|
6 |
</Packpin_Pptrack>
|
7 |
</modules>
|
8 |
<frontend>
|
app/design/adminhtml/default/default/layout/pptrack.xml
CHANGED
@@ -1,5 +1,5 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
-
<layout version="1.2.
|
3 |
<adminhtml_system_config_edit>
|
4 |
<reference name="head">
|
5 |
<action method="addCss">
|
1 |
<?xml version="1.0"?>
|
2 |
+
<layout version="1.2.1">
|
3 |
<adminhtml_system_config_edit>
|
4 |
<reference name="head">
|
5 |
<action method="addCss">
|
app/design/frontend/base/default/layout/pptrack.xml
CHANGED
@@ -1,5 +1,5 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
-
<layout version="1.2.
|
3 |
<pptrack_index_index>
|
4 |
<reference name="root">
|
5 |
<action method="setTemplate">
|
1 |
<?xml version="1.0"?>
|
2 |
+
<layout version="1.2.1">
|
3 |
<pptrack_index_index>
|
4 |
<reference name="root">
|
5 |
<action method="setTemplate">
|
app/design/frontend/base/default/template/pptrack/ads.phtml
CHANGED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
$image = $this->getImage();
|
3 |
-
$url = $this->
|
4 |
?>
|
5 |
<?php if ($image) : ?>
|
6 |
<div class="pptrack-top-image">
|
1 |
<?php
|
2 |
$image = $this->getImage();
|
3 |
+
$url = $this->getImageUrl();
|
4 |
?>
|
5 |
<?php if ($image) : ?>
|
6 |
<div class="pptrack-top-image">
|
app/design/frontend/base/default/template/pptrack/ads_email.phtml
CHANGED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
-
$image = $this->
|
3 |
-
$url = $this->
|
4 |
?>
|
5 |
<?php if ($image) : ?>
|
6 |
<div class="pptrack-top-image" style="margin-top:5px;text-align:center;width:100%;">
|
1 |
<?php
|
2 |
+
$image = $this->getEmailImage();
|
3 |
+
$url = $this->getEmailImageUrl();
|
4 |
?>
|
5 |
<?php if ($image) : ?>
|
6 |
<div class="pptrack-top-image" style="margin-top:5px;text-align:center;width:100%;">
|
app/etc/modules/Packpin_Pptrack.xml
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
<Packpin_Pptrack>
|
5 |
<active>true</active>
|
6 |
<codePool>community</codePool>
|
7 |
-
<version>1.2.
|
8 |
</Packpin_Pptrack>
|
9 |
</modules>
|
10 |
</config>
|
4 |
<Packpin_Pptrack>
|
5 |
<active>true</active>
|
6 |
<codePool>community</codePool>
|
7 |
+
<version>1.2.1</version>
|
8 |
</Packpin_Pptrack>
|
9 |
</modules>
|
10 |
</config>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Packpin_Pptrack</name>
|
4 |
-
<version>1.2.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/gpl-license.php">GNU General Public License (GPL)</license>
|
7 |
<channel>community</channel>
|
@@ -18,11 +18,12 @@ Packpin created shipment tracking and cross selling solution within email notifi
|
|
18 |
- Shipment tracking button on shipment notification email.
|
19 |
- Tracking button in customer order.
|
20 |
- Easy 10 minutes installation.</description>
|
21 |
-
<notes>
|
|
|
22 |
<authors><author><name>Packpin Packpin</name><user>packpin</user><email>info@packpin.com</email></author></authors>
|
23 |
<date>2015-05-26</date>
|
24 |
-
<time>14:
|
25 |
-
<contents><target name="magecommunity"><dir name="Packpin"><dir name="Pptrack"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Shipment"><dir name="Create"><file name="Tracking.php" hash="4a791af6ab6580a2485daf02b2df852e"/></dir><dir name="View"><file name="Tracking.php" hash="b8fb4c70f98fd1565685b1aaaf50989d"/></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint-owner.php" hash="3f3029efceb1d0e1c8f37f08aa21a371"/><file name="Hint.php" hash="c961a7b4cd0ce5d7b8024a2996262028"/><file name="Scripts.php" hash="79d629b135d51296ee0ba3e3a805ba5f"/></dir><dir name="Form"><dir name="Fieldset"><file name="Carrier.php" hash="8dcd2c2fbfbd6eb5938f06e537c939e3"/></dir></dir></dir></dir></dir><file name="Ads.php" hash="
|
26 |
<compatible/>
|
27 |
<dependencies><required><php><min>5.2.13</min><max>5.6.6</max></php></required></dependencies>
|
28 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Packpin_Pptrack</name>
|
4 |
+
<version>1.2.1</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/gpl-license.php">GNU General Public License (GPL)</license>
|
7 |
<channel>community</channel>
|
18 |
- Shipment tracking button on shipment notification email.
|
19 |
- Tracking button in customer order.
|
20 |
- Easy 10 minutes installation.</description>
|
21 |
+
<notes>Fixed banner block function naming.
|
22 |
+
Email banner image and url are taken from correct config parameter.</notes>
|
23 |
<authors><author><name>Packpin Packpin</name><user>packpin</user><email>info@packpin.com</email></author></authors>
|
24 |
<date>2015-05-26</date>
|
25 |
+
<time>14:56:43</time>
|
26 |
+
<contents><target name="magecommunity"><dir name="Packpin"><dir name="Pptrack"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Shipment"><dir name="Create"><file name="Tracking.php" hash="4a791af6ab6580a2485daf02b2df852e"/></dir><dir name="View"><file name="Tracking.php" hash="b8fb4c70f98fd1565685b1aaaf50989d"/></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint-owner.php" hash="3f3029efceb1d0e1c8f37f08aa21a371"/><file name="Hint.php" hash="c961a7b4cd0ce5d7b8024a2996262028"/><file name="Scripts.php" hash="79d629b135d51296ee0ba3e3a805ba5f"/></dir><dir name="Form"><dir name="Fieldset"><file name="Carrier.php" hash="8dcd2c2fbfbd6eb5938f06e537c939e3"/></dir></dir></dir></dir></dir><file name="Ads.php" hash="aa56b07b8771fb94b9bd11a95aa4e872"/><file name="Crosssell.php" hash="1964eb986f699a500cd445cceed78c1c"/><file name="Index.php" hash="d2d92ae24bad53b4b6f360d04b58f35d"/><file name="Script.php" hash="f7f9d2f660f958e4e4448f88c860d91c"/><file name="Trackings.php" hash="3313a04f6ee29e1a93a940ba52d5af6b"/></dir><dir name="Helper"><file name="Data.php" hash="af454382ee0d5a99e0d79692c463cba9"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Crossviews.php" hash="2f353f1eca123be3d5d6628cd6fec9bc"/><file name="Crossviewspage.php" hash="c28db6e0df790fd0f0cd521d31340618"/></dir></dir></dir></dir><file name="Api.php" hash="88d205736602d9f9cf839d3cf487be5c"/><file name="Carrier.php" hash="cc1d7e12e7b8a01768ebebbcebe26c47"/><file name="EnableNotifications.php" hash="cd6b75203e32b4cc8b5a44c179efd1cc"/><file name="Observer.php" hash="ad5352f45180121691500d32bd1da85b"/><dir name="Order"><file name="Shipment.php" hash="97b3f6ad711842e3066300db6dc8a2c5"/></dir><dir name="Resource"><dir name="Carrier"><file name="Collection.php" hash="03005aa1067c8df71710d1224b9eb838"/></dir><file name="Carrier.php" hash="353d1d39c03e23dbbeacc181c1eb7ce9"/><dir name="Setting"><file name="Collection.php" hash="aa4e67bcd7016180fc6febf974533c93"/></dir><file name="Setting.php" hash="3eeee7198164abc0885e3c938b7d8bb4"/><dir name="Track"><file name="Collection.php" hash="cc6adf831c0248a202394e36d458b623"/></dir><file name="Track.php" hash="3f1d555d29f49ef8f6d2f6967d355ee8"/><dir name="Trackdetail"><file name="Collection.php" hash="941c6277814680ec85eb12c51ecf89d4"/></dir><file name="Trackdetail.php" hash="aedb43bb11215a694251e49ad9425eb6"/><dir name="Trackunsubscribed"><file name="Collection.php" hash="33f9820631af51c4e3aa62f34b5a7a3c"/></dir><file name="Trackunsubscribed.php" hash="038ffa7b345e528c808b03932baaf99c"/></dir><file name="Setting.php" hash="1f7b781d526211dcb29c78cb498033a2"/><file name="Track.php" hash="6d10a2d0f2b988198f937a78b072bc34"/><file name="Trackdetail.php" hash="3c73ff2978792c755758b35865b54467"/><file name="Trackunsubscribed.php" hash="47770b68d49a554c7e18250578ecddfc"/><file name="Translate.php" hash="dd80869c7e8dec6c0c3260db5cff3ccd"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="PpnotificationsController.php" hash="eb07f8257c9f13854e48c638bfe5e5c5"/></dir><file name="IndexController.php" hash="e8efcec6bf578d58bfe53bb6dadfb357"/><file name="UnsubscribeController.php" hash="635e1f44908436801b4e7b4c1222fcc5"/></dir><dir name="data"><dir name="pptrack_setup"><file name="data-upgrade-0.1.5-1.1.0.php" hash="412052d61996b3b32ab4608bf1d1dffc"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="b57c34e9a0ed06573f88bda77f12799d"/><file name="api.xml" hash="5986c3cfd16372143cf2d4d0d3252f38"/><file name="config.xml" hash="eb32dd9c61c2cb4097808c3d4a98a0ce"/><file name="system.xml" hash="9a5152829866b693435346ea2ff82bdc"/></dir><dir name="sql"><dir name="pptrack_setup"><file name="mysql4-install-0.1.2.php" hash="41ddf13aef299e050bd4586c4473eb66"/><file name="mysql4-upgrade-0.1.2-0.1.5.php" hash="edfc436309165f115aeacf29df9d3398"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="pptrack.xml" hash="19b46a548f87e55d52a41898e907859f"/></dir><dir name="template"><dir name="pptrack"><file name="ads.phtml" hash="c96197f43506ae6b5cd88c832fa88d1a"/><file name="ads_email.phtml" hash="962207b6baf56c12716b4727e6849444"/><file name="crosssell.phtml" hash="a9f57ccf4e28b7dd75a65d93a5de2ad9"/><file name="crosssell_email.phtml" hash="84a09283849c332a9a65c60f2a69c6e8"/><dir name="email"><dir name="order"><dir name="shipment"><file name="track.phtml" hash="86d49d54129bd81cb785a7a477d17359"/></dir></dir></dir><file name="index.phtml" hash="2418c918bf206333c68b58d1cb34f4cf"/><file name="popup.phtml" hash="f8692aeedd28f2b13c92f626b2f6c6ad"/><file name="script.phtml" hash="213e0fc610eb4d66f3ec67cfa82a63a4"/><file name="unsubscribe.phtml" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="pptrack.xml" hash="71038e921d229914bf6ccd81d7927fdd"/></dir><dir name="template"><dir name="pptrack"><dir name="system"><dir name="config"><dir name="fieldset"><file name="hint.phtml" hash="cb1396e7c7f78da4b3d4fe993c37da49"/><file name="scripts.phtml" hash="0a19ed021cb1edeeecd85aa28286151c"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Packpin_Pptrack.xml" hash="7eb8863e71cd5b9355bb3fa8dd78cf1a"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="pptrack.css" hash="3415b5e34a6c18f24d03b81a9b98effb"/></dir><dir name="images"><dir name="pptrack"><file name="bulletIcon.png" hash="15f6fd65c7a62f940b7d17b9186a2b35"/><file name="checkedIcon.png" hash="cef38265bdd7675a0497a2296f5b7332"/><file name="postnlLogo.png" hash="3b4595ba4262c574c1147ed39e862092"/><file name="trackingStatus.png" hash="6dcf522f4e22b69bb25c3b3c199bb464"/><file name="truck.png" hash="3eb50f750a0fefa1903613e0bc26a2ee"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="pptrack"><dir name="css"><file name="pptrack.css" hash="b4c42edf3884eb62617f2347f1740b3f"/></dir><dir name="images"><file name="pp_logo1.png" hash="1a79f10d0f028271ac0b2646243e39d1"/></dir><dir name="js"><file name="pptrack.js" hash="7bc0ee636b3b83484fc3b9348863bd22"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><dir name="template"><dir name="email"><dir name="packpin"><file name="packpin_delivered_email.html" hash="11d00272d82b3607068429ea494f08f3"/><file name="packpin_exception_email.html" hash="483af61fd9c1fbbca098d1bfcee0ad75"/><file name="packpin_failed_attempt_email.html" hash="483af61fd9c1fbbca098d1bfcee0ad75"/><file name="packpin_in_transit_email.html" hash="483af61fd9c1fbbca098d1bfcee0ad75"/><file name="packpin_info_received_email.html" hash="483af61fd9c1fbbca098d1bfcee0ad75"/><file name="packpin_out_for_delivery_email.html" hash="483af61fd9c1fbbca098d1bfcee0ad75"/></dir></dir></dir></dir></target></contents>
|
27 |
<compatible/>
|
28 |
<dependencies><required><php><min>5.2.13</min><max>5.6.6</max></php></required></dependencies>
|
29 |
</package>
|