Packpin_Pptrack - Version 1.1.0

Version Notes

Temporary API key is generated automatically and applied to settings durring first plugin install

Download this release

Release Info

Developer Packpin Packpin
Extension Packpin_Pptrack
Version 1.1.0
Comparing to
See all releases


Code changes from version 1.0.2 to 1.1.0

Files changed (12) hide show
  1. app/code/community/Packpin/Pptrack/Block/Adminhtml/System/Config/Fieldset/Hint.php +53 -0
  2. app/code/community/Packpin/Pptrack/Helper/Data.php +24 -0
  3. app/code/community/Packpin/Pptrack/Model/Api.php +7 -0
  4. app/code/community/Packpin/Pptrack/Model/Carrier.php +3 -6
  5. app/code/community/Packpin/Pptrack/data/pptrack_setup/data-upgrade-0.1.5-1.1.0.php +33 -0
  6. app/code/community/Packpin/Pptrack/etc/config.xml +4 -1
  7. app/code/community/Packpin/Pptrack/etc/system.xml +27 -3
  8. app/design/adminhtml/default/default/template/pptrack/system/config/fieldset/hint-owner.phtml +0 -6
  9. app/design/adminhtml/default/default/template/pptrack/system/config/fieldset/hint.phtml +17 -0
  10. app/etc/modules/Packpin_Pptrack.xml +1 -1
  11. package.xml +5 -5
  12. skin/adminhtml/default/default/pptrack/css/pptrack.css +9 -0
app/code/community/Packpin/Pptrack/Block/Adminhtml/System/Config/Fieldset/Hint.php ADDED
@@ -0,0 +1,53 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class Packpin_Pptrack_Block_Adminhtml_System_Config_Fieldset_Hint
4
+ extends Mage_Adminhtml_Block_Abstract
5
+ implements Varien_Data_Form_Element_Renderer_Interface
6
+ {
7
+ protected $_template = 'pptrack/system/config/fieldset/hint.phtml';
8
+
9
+ /**
10
+ * Render fieldset html
11
+ *
12
+ * @param Varien_Data_Form_Element_Abstract $element
13
+ * @return string
14
+ */
15
+ public function render(Varien_Data_Form_Element_Abstract $element)
16
+ {
17
+ return $this->toHtml();
18
+ }
19
+
20
+ /**
21
+ * Check if user still using temporary key
22
+ *
23
+ * @return bool
24
+ */
25
+ public function haveTempKey()
26
+ {
27
+ $key = Mage::getStoreConfig('pp_section_setttings/settings/api_key');
28
+ $tempKey = Mage::getStoreConfig('pp_section_setttings/settings/temp_api_key');
29
+
30
+ if ($tempKey && $tempKey == $key) {
31
+ return true;
32
+ }
33
+
34
+ return false;
35
+ }
36
+
37
+ /**
38
+ * Get days left till temp key expiration
39
+ *
40
+ * @return string
41
+ */
42
+ public function getDaysLeft()
43
+ {
44
+ $tempKeyInstalled = Mage::getStoreConfig('pp_section_setttings/settings/temp_key_installed');
45
+ $timeDiff = $tempKeyInstalled + (86400 * 7) - time();
46
+ if ($timeDiff > 0) {
47
+ return ceil($timeDiff / 86400);
48
+ }
49
+
50
+ return 0;
51
+ }
52
+ }
53
+
app/code/community/Packpin/Pptrack/Helper/Data.php CHANGED
@@ -22,6 +22,7 @@ class Packpin_Pptrack_Helper_Data extends Mage_Core_Helper_Abstract
22
  const API_PATH_TRACKING_INFO = 'trackings/%s/%s';
23
  const API_PATH_CONNECTORS = 'connectors';
24
  const API_PATH_TEST = 'test/1';
 
25
 
26
 
27
  const API_ROLE_NAME = 'packpin_connection';
@@ -295,5 +296,28 @@ class Packpin_Pptrack_Helper_Data extends Mage_Core_Helper_Abstract
295
  return (string) Mage::getConfig()->getNode()->modules->Packpin_Pptrack->version;
296
  }
297
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
298
  }
299
 
22
  const API_PATH_TRACKING_INFO = 'trackings/%s/%s';
23
  const API_PATH_CONNECTORS = 'connectors';
24
  const API_PATH_TEST = 'test/1';
25
+ const API_PATH_GENERATE_TEMP_KEY = 'genkey';
26
 
27
 
28
  const API_ROLE_NAME = 'packpin_connection';
296
  return (string) Mage::getConfig()->getNode()->modules->Packpin_Pptrack->version;
297
  }
298
 
299
+ /**
300
+ * Generates temporary API key for fresh plugin install
301
+ *
302
+ * @return string
303
+ */
304
+ public function generateTempKey()
305
+ {
306
+ $url = self::API_PATH_GENERATE_TEMP_KEY;
307
+ $body = array(
308
+ 'name' => Mage::getStoreConfig('trans_email/ident_general/name'),
309
+ 'email' => Mage::getStoreConfig('trans_email/ident_general/email'),
310
+ );
311
+
312
+ $res = $this->_apiRequest($url, 'POST', $body);
313
+ if ($res) {
314
+ $info = json_decode($res, true);
315
+ if (isset($info['body']['key']))
316
+ return $info['body']['key'];
317
+ }
318
+
319
+ return false;
320
+ }
321
+
322
  }
323
 
app/code/community/Packpin/Pptrack/Model/Api.php CHANGED
@@ -33,6 +33,13 @@ class Packpin_Pptrack_Model_Api extends Mage_Api_Model_Resource_Abstract
33
 
34
  $trackModel = Mage::getModel('pptrack/track')
35
  ->loadByCarrierAndCode($carrierCode, $trackingCode);
 
 
 
 
 
 
 
36
  if ($trackModel->getId()) {
37
  $order = Mage::getModel('sales/order')->load($trackModel->getOrderId());
38
  $store = $order->getStore();
33
 
34
  $trackModel = Mage::getModel('pptrack/track')
35
  ->loadByCarrierAndCode($carrierCode, $trackingCode);
36
+
37
+ //maybe changed to custom by some API's (for older versions)
38
+ if (!$trackModel->getId()) {
39
+ $trackModel = Mage::getModel('pptrack/track')
40
+ ->loadByCarrierAndCode('custom', $trackingCode);
41
+ }
42
+
43
  if ($trackModel->getId()) {
44
  $order = Mage::getModel('sales/order')->load($trackModel->getOrderId());
45
  $store = $order->getStore();
app/code/community/Packpin/Pptrack/Model/Carrier.php CHANGED
@@ -160,13 +160,10 @@ class Packpin_Pptrack_Model_Carrier extends Mage_Core_Model_Abstract
160
 
161
  //try to identify by carrier title
162
  if ($carrierTitle) {
163
- $titles = array();
164
  foreach ($carrierList as $code => $title) {
165
- $titles[$title] = $code;
166
- }
167
- $regStr2 = implode('|', $titles);
168
- if (preg_match("#$regStr2#ui", $carrierTitle, $m)) {
169
- return $titles[$m[0]];
170
  }
171
  }
172
 
160
 
161
  //try to identify by carrier title
162
  if ($carrierTitle) {
 
163
  foreach ($carrierList as $code => $title) {
164
+ if (preg_match("#$carrierTitle#ui", $title, $m)) {
165
+ return $code;
166
+ }
 
 
167
  }
168
  }
169
 
app/code/community/Packpin/Pptrack/data/pptrack_setup/data-upgrade-0.1.5-1.1.0.php ADDED
@@ -0,0 +1,33 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ $installer = $this;
4
+
5
+ $installer->startSetup();
6
+
7
+ //generate temp API key
8
+ $helper = Mage::helper('pptrack');
9
+ $key = Mage::getStoreConfig('pp_section_setttings/settings/api_key');
10
+
11
+ if (!$key) {
12
+ try {
13
+ $newKey = $helper->generateTempKey();
14
+
15
+ if ($newKey) {
16
+ $this->setConfigData('pp_section_setttings/settings/api_key', $newKey);
17
+ $this->setConfigData('pp_section_setttings/settings/temp_api_key', $newKey);
18
+ $this->setConfigData('pp_section_setttings/settings/temp_key_installed', time());
19
+ }
20
+ else {
21
+ $this->setConfigData('pp_section_setttings/settings/status', 0);
22
+ }
23
+ } catch (Exception $e) {
24
+ $this->setConfigData('pp_section_setttings/settings/status', 0);
25
+ }
26
+ }
27
+
28
+ $installer->endSetup();
29
+
30
+
31
+
32
+
33
+
app/code/community/Packpin/Pptrack/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Packpin_Pptrack>
5
- <version>1.0.2</version>
6
  </Packpin_Pptrack>
7
  </modules>
8
  <frontend>
@@ -223,6 +223,9 @@
223
  </adminhtml>
224
  <default>
225
  <pp_section_setttings>
 
 
 
226
  <crosssell>
227
  <cross_sell_page>1</cross_sell_page>
228
  <cross_sell_email>1</cross_sell_email>
2
  <config>
3
  <modules>
4
  <Packpin_Pptrack>
5
+ <version>1.1.0</version>
6
  </Packpin_Pptrack>
7
  </modules>
8
  <frontend>
223
  </adminhtml>
224
  <default>
225
  <pp_section_setttings>
226
+ <settings>
227
+ <status>1</status>
228
+ </settings>
229
  <crosssell>
230
  <cross_sell_page>1</cross_sell_page>
231
  <cross_sell_email>1</cross_sell_email>
app/code/community/Packpin/Pptrack/etc/system.xml CHANGED
@@ -17,6 +17,13 @@
17
  <show_in_website>1</show_in_website>
18
  <show_in_store>1</show_in_store>
19
  <groups>
 
 
 
 
 
 
 
20
  <settings translate="label">
21
  <expanded>1</expanded>
22
  <label>General settings</label>
@@ -38,7 +45,7 @@
38
  <api_key translate="label">
39
  <label><![CDATA[ API key <strong style="color:red">*</strong>]]></label>
40
  <frontend_type>text</frontend_type>
41
- <sort_order>10</sort_order>
42
  <show_in_default>1</show_in_default>
43
  <show_in_website>1</show_in_website>
44
  <show_in_store>0</show_in_store>
@@ -60,6 +67,22 @@
60
  <show_in_website>0</show_in_website>
61
  <show_in_store>0</show_in_store>
62
  </last_carrier_update>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
63
  <upgrade_note>
64
  <label><![CDATA[<strong>How to setup</strong>]]></label>
65
  <frontend_type>note</frontend_type>
@@ -70,11 +93,12 @@
70
  <comment>
71
  <![CDATA[
72
  <ol>
 
 
73
  <li style="margin-bottom:10px !important;">1. Sign up at <a href="https://panel.packpin.com/" target="_blank">panel.packpin.com</a></li>
74
  <li style="margin-bottom:10px !important;">2. Go to <a href="https://panel.packpin.com/api_keys" taget="_blank">"API keys"</a> and generate new key</li>
75
  <li style="margin-bottom:10px !important;">3. Copy API key and paste to the field below</li>
76
- <li style="margin-bottom:10px !important;">4. Change status to "Enabled" and click "Save Config"</li>
77
- <li>5. Now the plugin is active and running</li>
78
  </ol>
79
  ]]>
80
  </comment>
17
  <show_in_website>1</show_in_website>
18
  <show_in_store>1</show_in_store>
19
  <groups>
20
+ <hint>
21
+ <frontend_model>pptrack/adminhtml_system_config_fieldset_hint</frontend_model>
22
+ <sort_order>0</sort_order>
23
+ <show_in_default>1</show_in_default>
24
+ <show_in_website>1</show_in_website>
25
+ <show_in_store>1</show_in_store>
26
+ </hint>
27
  <settings translate="label">
28
  <expanded>1</expanded>
29
  <label>General settings</label>
45
  <api_key translate="label">
46
  <label><![CDATA[ API key <strong style="color:red">*</strong>]]></label>
47
  <frontend_type>text</frontend_type>
48
+ <sort_order>5</sort_order>
49
  <show_in_default>1</show_in_default>
50
  <show_in_website>1</show_in_website>
51
  <show_in_store>0</show_in_store>
67
  <show_in_website>0</show_in_website>
68
  <show_in_store>0</show_in_store>
69
  </last_carrier_update>
70
+ <temp_api_key>
71
+ <label>Is key being used a temporary one</label>
72
+ <frontend_type>text</frontend_type>
73
+ <sort_order>104</sort_order>
74
+ <show_in_default>0</show_in_default>
75
+ <show_in_website>0</show_in_website>
76
+ <show_in_store>0</show_in_store>
77
+ </temp_api_key>
78
+ <temp_key_installed>
79
+ <label>Unix time when temp key has been installed</label>
80
+ <frontend_type>text</frontend_type>
81
+ <sort_order>105</sort_order>
82
+ <show_in_default>0</show_in_default>
83
+ <show_in_website>0</show_in_website>
84
+ <show_in_store>0</show_in_store>
85
+ </temp_key_installed>
86
  <upgrade_note>
87
  <label><![CDATA[<strong>How to setup</strong>]]></label>
88
  <frontend_type>note</frontend_type>
93
  <comment>
94
  <![CDATA[
95
  <ol>
96
+ <li style="margin-bottom:10px !important;"><b>We will generate a temporary API key for you during installation. </b></li>
97
+ <li style="margin-bottom:10px !important;">In order to use all the features, please follow these steps:</li>
98
  <li style="margin-bottom:10px !important;">1. Sign up at <a href="https://panel.packpin.com/" target="_blank">panel.packpin.com</a></li>
99
  <li style="margin-bottom:10px !important;">2. Go to <a href="https://panel.packpin.com/api_keys" taget="_blank">"API keys"</a> and generate new key</li>
100
  <li style="margin-bottom:10px !important;">3. Copy API key and paste to the field below</li>
101
+ <li>4. Now the plugin is active and running</li>
 
102
  </ol>
103
  ]]>
104
  </comment>
app/design/adminhtml/default/default/template/pptrack/system/config/fieldset/hint-owner.phtml DELETED
@@ -1,6 +0,0 @@
1
- <?php
2
- /**
3
- * @see Packpin_Pptrack_Block_Adminhtml_System_Config_Fieldset_Hint
4
- */
5
- ?>
6
- <h4><?php echo Mage::helper('pptrack')->__('Notify shop owner when status changed to') ?></h4>
 
 
 
 
 
 
app/design/adminhtml/default/default/template/pptrack/system/config/fieldset/hint.phtml ADDED
@@ -0,0 +1,17 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * @see Packpin_Pptrack_Block_Adminhtml_System_Config_Fieldset_Hint
4
+ */
5
+ ?>
6
+ <?php if ($this->haveTempKey()) : ?>
7
+ <div class="packpin-notice">
8
+ <h4>
9
+ <?php if (!$this->getDaysLeft()) : ?>
10
+ <span class="packpin-notice-date"><?php echo Mage::helper('pptrack')->__('Your temporary API key has expired!') ?></span>
11
+ <?php else : ?>
12
+ <?php echo Mage::helper('pptrack')->__('Your temporary API key will expire in') ?>
13
+ <span class="packpin-notice-date"><?php echo sprintf(Mage::helper('pptrack')->__('%s days'), $this->getDaysLeft()) ?>!</span>
14
+ <?php endif; ?>
15
+ </h4>
16
+ </div>
17
+ <?php endif; ?>
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.0.2</version>
8
  </Packpin_Pptrack>
9
  </modules>
10
  </config>
4
  <Packpin_Pptrack>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
+ <version>1.1.0</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.0.2</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,11 +18,11 @@ Packpin created shipment tracking and cross selling solution within email notifi
18
  - Shipment tracking button on shipment notification email.&#xD;
19
  - Tracking button in customer order.&#xD;
20
  - Easy 10 minutes installation.</description>
21
- <notes>Added detection for custom carriers (sometimes shipment list is updated through API and carrier codes match only partly)</notes>
22
  <authors><author><name>Packpin Packpin</name><user>packpin</user><email>info@packpin.com</email></author></authors>
23
- <date>2015-05-14</date>
24
- <time>13:19:31</time>
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"/></dir><dir name="Form"><dir name="Fieldset"><file name="Carrier.php" hash="8dcd2c2fbfbd6eb5938f06e537c939e3"/></dir></dir></dir></dir></dir><file name="Crosssell.php" hash="1964eb986f699a500cd445cceed78c1c"/><file name="Index.php" hash="d2d92ae24bad53b4b6f360d04b58f35d"/><file name="Trackings.php" hash="3313a04f6ee29e1a93a940ba52d5af6b"/></dir><dir name="Helper"><file name="Data.php" hash="0c058e325ac9ab27fa7895b7a3bf69c5"/></dir><dir name="Model"><file name="Api.php" hash="457072243c2d681ed9d01470d705cea9"/><file name="Carrier.php" hash="bcff08d1c43bd3643a9f104a79fcdc42"/><file name="EnableNotifications.php" hash="e6417437f94e76370b3ea9d4493ffd01"/><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="etc"><file name="adminhtml.xml" hash="b57c34e9a0ed06573f88bda77f12799d"/><file name="api.xml" hash="5986c3cfd16372143cf2d4d0d3252f38"/><file name="config.xml" hash="dc327ab14bb8cf663d7163b1200c17c7"/><file name="system.xml" hash="0fedaf802a5df88d780436e5020d1472"/></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="1c09bbc830e41dd6072f04bba5798d6f"/></dir><dir name="template"><dir name="pptrack"><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="eae1dc520bd0609387035d68db86813f"/><file name="popup.phtml" hash="f8692aeedd28f2b13c92f626b2f6c6ad"/><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="3925c9e5158320c220381d12fb3a2590"/></dir><dir name="template"><dir name="pptrack"><dir name="system"><dir name="config"><dir name="fieldset"><file name="hint-owner.phtml" hash="33cd6936463c08977363302ff372bbd4"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Packpin_Pptrack.xml" hash="28e229eb510938594fe9436e6a6b1488"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="pptrack.css" hash="9f2f18629bdc2fb7e1fb589068f53698"/></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="70e0bb57247ff48334ec76f994b370ac"/></dir><dir name="images"><file name="pp_logo1.png" hash="1a79f10d0f028271ac0b2646243e39d1"/></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="c3e667a5d92022cfb7a4aedc7628cc53"/><file name="packpin_exception_email.html" hash="edd5a30297a5c00ff92883b0520501f7"/><file name="packpin_failed_attempt_email.html" hash="edd5a30297a5c00ff92883b0520501f7"/><file name="packpin_in_transit_email.html" hash="edd5a30297a5c00ff92883b0520501f7"/><file name="packpin_info_received_email.html" hash="edd5a30297a5c00ff92883b0520501f7"/><file name="packpin_out_for_delivery_email.html" hash="edd5a30297a5c00ff92883b0520501f7"/></dir></dir></dir></dir></target></contents>
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.1.0</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.&#xD;
19
  - Tracking button in customer order.&#xD;
20
  - Easy 10 minutes installation.</description>
21
+ <notes>Temporary API key is generated automatically and applied to settings durring first plugin install</notes>
22
  <authors><author><name>Packpin Packpin</name><user>packpin</user><email>info@packpin.com</email></author></authors>
23
+ <date>2015-05-20</date>
24
+ <time>13:10:59</time>
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"/></dir><dir name="Form"><dir name="Fieldset"><file name="Carrier.php" hash="8dcd2c2fbfbd6eb5938f06e537c939e3"/></dir></dir></dir></dir></dir><file name="Crosssell.php" hash="1964eb986f699a500cd445cceed78c1c"/><file name="Index.php" hash="d2d92ae24bad53b4b6f360d04b58f35d"/><file name="Trackings.php" hash="3313a04f6ee29e1a93a940ba52d5af6b"/></dir><dir name="Helper"><file name="Data.php" hash="af454382ee0d5a99e0d79692c463cba9"/></dir><dir name="Model"><file name="Api.php" hash="9e4836e721ac8677117bec95160f2b64"/><file name="Carrier.php" hash="cc1d7e12e7b8a01768ebebbcebe26c47"/><file name="EnableNotifications.php" hash="e6417437f94e76370b3ea9d4493ffd01"/><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="802070f164e2c66984a8e7c70d819f42"/><file name="system.xml" hash="499f652f605d9fdd8b2042b84f9102a7"/></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="1c09bbc830e41dd6072f04bba5798d6f"/></dir><dir name="template"><dir name="pptrack"><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="eae1dc520bd0609387035d68db86813f"/><file name="popup.phtml" hash="f8692aeedd28f2b13c92f626b2f6c6ad"/><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="3925c9e5158320c220381d12fb3a2590"/></dir><dir name="template"><dir name="pptrack"><dir name="system"><dir name="config"><dir name="fieldset"><file name="hint.phtml" hash="cb1396e7c7f78da4b3d4fe993c37da49"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Packpin_Pptrack.xml" hash="6aa8578e6662b8f245ecc408c42f551e"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="pptrack.css" hash="9f2f18629bdc2fb7e1fb589068f53698"/></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="a6faec3c2c9ebd3968849d39708453e1"/></dir><dir name="images"><file name="pp_logo1.png" hash="1a79f10d0f028271ac0b2646243e39d1"/></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="c3e667a5d92022cfb7a4aedc7628cc53"/><file name="packpin_exception_email.html" hash="edd5a30297a5c00ff92883b0520501f7"/><file name="packpin_failed_attempt_email.html" hash="edd5a30297a5c00ff92883b0520501f7"/><file name="packpin_in_transit_email.html" hash="edd5a30297a5c00ff92883b0520501f7"/><file name="packpin_info_received_email.html" hash="edd5a30297a5c00ff92883b0520501f7"/><file name="packpin_out_for_delivery_email.html" hash="edd5a30297a5c00ff92883b0520501f7"/></dir></dir></dir></dir></target></contents>
26
  <compatible/>
27
  <dependencies><required><php><min>5.2.13</min><max>5.6.6</max></php></required></dependencies>
28
  </package>
skin/adminhtml/default/default/pptrack/css/pptrack.css CHANGED
@@ -10,4 +10,13 @@ ul.tabs a.packpin-settings:hover span {
10
  ul.tabs dd:last-child a.packpin-settings span,
11
  ul.tabs dd:last-child a.packpin-settings:hover span {
12
  border-bottom: none;
 
 
 
 
 
 
 
 
 
13
  }
10
  ul.tabs dd:last-child a.packpin-settings span,
11
  ul.tabs dd:last-child a.packpin-settings:hover span {
12
  border-bottom: none;
13
+ }
14
+ .packpin-notice {
15
+ background: #eaf0ee;
16
+ border: 1px solid #cccccc;
17
+ margin-bottom: 10px;
18
+ padding: 11px 0 0 10px;
19
+ }
20
+ .packpin-notice-date {
21
+ color: red;
22
  }