Plumrocket_Order_Status_and_Shipping_Tracking - Version 1.0.5

Version Notes

Updated the integration with the USPS API
Minor fixes

Download this release

Release Info

Developer Plumrocket Team
Extension Plumrocket_Order_Status_and_Shipping_Tracking
Version 1.0.5
Comparing to
See all releases


Code changes from version 1.0.4 to 1.0.5

Files changed (9) hide show
  1. app/code/community/Plumrocket/ShippingTracking/Block/System/Config/Version.php +1 -1
  2. app/code/community/Plumrocket/ShippingTracking/Helper/Data.php +1 -1
  3. app/code/community/Plumrocket/ShippingTracking/Helper/Main.php +3 -96
  4. app/code/community/Plumrocket/ShippingTracking/controllers/IndexController.php +3 -1
  5. app/code/community/Plumrocket/ShippingTracking/etc/config.xml +1 -1
  6. app/design/frontend/base/default/layout/shippingtracking.xml +6 -0
  7. app/design/frontend/base/default/template/shippingtracking/footer.phtml +19 -0
  8. app/etc/modules/Plumrocket_ShippingTracking.xml +1 -1
  9. package.xml +7 -6
app/code/community/Plumrocket/ShippingTracking/Block/System/Config/Version.php CHANGED
@@ -55,7 +55,7 @@ class Plumrocket_ShippingTracking_Block_System_Config_Version extends Mage_Admin
55
 
56
  var iframeDoc = iframe.contentDocument || iframe.contentWindow.document;
57
  iframeDoc.open();
58
- iframeDoc.write("<html><body></body></html>");
59
  iframeDoc.close();
60
  iframeBody = iframeDoc.body;
61
 
55
 
56
  var iframeDoc = iframe.contentDocument || iframe.contentWindow.document;
57
  iframeDoc.open();
58
+ iframeDoc.write("<ht"+"ml><bo"+"dy></bo"+"dy></ht"+"ml>");
59
  iframeDoc.close();
60
  iframeBody = iframeDoc.body;
61
 
app/code/community/Plumrocket/ShippingTracking/Helper/Data.php CHANGED
@@ -137,7 +137,7 @@ class Plumrocket_ShippingTracking_Helper_Data extends Plumrocket_ShippingTrackin
137
  if (!isset($this->_trackingInfo[$number])) {
138
 
139
  $xml = urlencode('<TrackRequest USERID="'.urlencode($this->_getDecryptedConfig('usps_api/user_id')).'"><TrackID ID="'.$number.'"></TrackID></TrackRequest>');
140
- $response = file_get_contents($url = 'http://production.shippingapis.com/ShippingAPITest.dll?API=TrackV2&XML='.$xml);
141
 
142
  $this->_trackingInfo[$number] = @simplexml_load_string($response);
143
 
137
  if (!isset($this->_trackingInfo[$number])) {
138
 
139
  $xml = urlencode('<TrackRequest USERID="'.urlencode($this->_getDecryptedConfig('usps_api/user_id')).'"><TrackID ID="'.$number.'"></TrackID></TrackRequest>');
140
+ $response = file_get_contents($url = 'http://production.shippingapis.com/ShippingAPI.dll?API=TrackV2&XML='.$xml);
141
 
142
  $this->_trackingInfo[$number] = @simplexml_load_string($response);
143
 
app/code/community/Plumrocket/ShippingTracking/Helper/Main.php CHANGED
@@ -7,10 +7,10 @@
7
  * This source file is subject to the End-user License Agreement
8
  * that is available through the world-wide-web at this URL:
9
  * http://wiki.plumrocket.net/wiki/EULA
10
- * If you are unable to obtain it through the world-wide-web, please
11
  * send an email to support@plumrocket.com so we can send you a copy immediately.
12
  *
13
- * @package Plumrocket_ShippingTracking
14
  * @copyright Copyright (c) 2015 Plumrocket Inc. (http://www.plumrocket.com)
15
  * @license http://wiki.plumrocket.net/wiki/EULA End-user License Agreement
16
  */
@@ -19,97 +19,4 @@
19
  class Plumrocket_ShippingTracking_Helper_Main extends Mage_Core_Helper_Abstract
20
  {
21
 
22
- public function getAjaxUrl($route, $params = array())
23
- {
24
- $url = Mage::getUrl($route, $params);
25
- if (Mage::app()->getStore()->isCurrentlySecure()) {
26
- $url = str_replace('http://', 'https://', $url);
27
- } else {
28
- $url = str_replace('https://', 'http://', $url);
29
- }
30
-
31
- return $url;
32
- }
33
-
34
-
35
- protected function __addProduct($product, $request = null)
36
- {
37
- return $this->addProductAdvanced(
38
- $product,
39
- $request,
40
- Mage_Catalog_Model_Product_Type_Abstract::PROCESS_MODE_FULL
41
- );
42
- }
43
-
44
-
45
- protected function __initOrder($orderIncrementId)
46
- {
47
- $order = Mage::getModel('sales/order');
48
-
49
- $order->loadByIncrementId($orderIncrementId);
50
-
51
- if (!$order->getId()) {
52
- $this->_fault('not_exists');
53
- }
54
-
55
- return $order;
56
- }
57
-
58
-
59
- public function __setOrder(Mage_Sales_Model_Order $order)
60
- {
61
- $this->_order = $order;
62
- $this->setOrderId($order->getId())
63
- ->setStoreId($order->getStoreId());
64
- return $this;
65
- }
66
-
67
-
68
- final public function getCustomerKey()
69
- {
70
- return implode('', array_map(strrev('rhc'
71
- ), explode('.', '53.51.50.52.49.51.50.50.49.51.102.100.50.57.55.54.101.54.56.51.51.57.102.55.53.102.49.57.100.54.49.98.51.51.49.56.99.53.57.48.57.49')
72
- ));
73
- }
74
-
75
-
76
- protected function __hold($orderIncrementId)
77
- {
78
- $order = $this->_initOrder($orderIncrementId);
79
-
80
- try {
81
- $order->hold();
82
- $order->save();
83
- } catch (Mage_Core_Exception $e) {
84
- $this->_fault('status_not_changed', $e->getMessage());
85
- }
86
-
87
- return true;
88
- }
89
-
90
-
91
- protected function __deleteItem($item)
92
- {
93
- if ($item->getId()) {
94
- $this->removeItem($item->getId());
95
- } else {
96
- $quoteItems = $this->getItemsCollection();
97
- $items = array($item);
98
- if ($item->getHasChildren()) {
99
- foreach ($item->getChildren() as $child) {
100
- $items[] = $child;
101
- }
102
- }
103
- foreach ($quoteItems as $key => $quoteItem) {
104
- foreach ($items as $item) {
105
- if ($quoteItem->compare($item)) {
106
- $quoteItems->removeItemByKey($key);
107
- }
108
- }
109
- }
110
- }
111
-
112
- return $this;
113
- }
114
-
115
- };
7
  * This source file is subject to the End-user License Agreement
8
  * that is available through the world-wide-web at this URL:
9
  * http://wiki.plumrocket.net/wiki/EULA
10
+ * If you are unable to obtain it through the world-wide-web, please
11
  * send an email to support@plumrocket.com so we can send you a copy immediately.
12
  *
13
+ * @package Plumrocket_Shipping_Tracking
14
  * @copyright Copyright (c) 2015 Plumrocket Inc. (http://www.plumrocket.com)
15
  * @license http://wiki.plumrocket.net/wiki/EULA End-user License Agreement
16
  */
19
  class Plumrocket_ShippingTracking_Helper_Main extends Mage_Core_Helper_Abstract
20
  {
21
 
22
+ }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Plumrocket/ShippingTracking/controllers/IndexController.php CHANGED
@@ -72,7 +72,9 @@ class Plumrocket_ShippingTracking_IndexController extends Mage_Core_Controller_F
72
  foreach($trackingInfo as $shipid => $_result) {
73
  if (count($_result) == 1) {
74
  foreach($_result as $key => $track) {
75
-
 
 
76
  $carrier = $track->getCarrier();
77
  if (Mage::getStoreConfig('shippingtracking/'.$carrier.'_api/enabled')) {
78
  $this->_redirect('*/*/'.$carrier, array(
72
  foreach($trackingInfo as $shipid => $_result) {
73
  if (count($_result) == 1) {
74
  foreach($_result as $key => $track) {
75
+ if (!is_object($track)) {
76
+ continue;
77
+ }
78
  $carrier = $track->getCarrier();
79
  if (Mage::getStoreConfig('shippingtracking/'.$carrier.'_api/enabled')) {
80
  $this->_redirect('*/*/'.$carrier, array(
app/code/community/Plumrocket/ShippingTracking/etc/config.xml CHANGED
@@ -19,7 +19,7 @@
19
  <config>
20
  <modules>
21
  <Plumrocket_ShippingTracking>
22
- <version>1.0.4</version>
23
  <wiki>http://wiki.plumrocket.com/wiki/Magento_Order_Status_and_Shipping_Tracking_v1.x_Extension</wiki>
24
  </Plumrocket_ShippingTracking>
25
  </modules>
19
  <config>
20
  <modules>
21
  <Plumrocket_ShippingTracking>
22
+ <version>1.0.5</version>
23
  <wiki>http://wiki.plumrocket.com/wiki/Magento_Order_Status_and_Shipping_Tracking_v1.x_Extension</wiki>
24
  </Plumrocket_ShippingTracking>
25
  </modules>
app/design/frontend/base/default/layout/shippingtracking.xml CHANGED
@@ -31,6 +31,9 @@
31
  <reference name="content">
32
  <block type="core/template" name="shippingTracking.main" template="shippingtracking/main.phtml"/>
33
  </reference>
 
 
 
34
  </shippingtracking_index_index>
35
 
36
  <shippingtracking_index_info>
@@ -40,6 +43,9 @@
40
  <reference name="content">
41
  <block type="shippingtracking/shipping_tracking_popup" name="shippingTracking.info" template="shippingtracking/info.phtml"/>
42
  </reference>
 
 
 
43
  </shippingtracking_index_info>
44
 
45
  <shipping_tracking_popup translate="label">
31
  <reference name="content">
32
  <block type="core/template" name="shippingTracking.main" template="shippingtracking/main.phtml"/>
33
  </reference>
34
+ <reference name="before_body_end">
35
+ <block type="core/template" template="shippingtracking/footer.phtml" />
36
+ </reference>
37
  </shippingtracking_index_index>
38
 
39
  <shippingtracking_index_info>
43
  <reference name="content">
44
  <block type="shippingtracking/shipping_tracking_popup" name="shippingTracking.info" template="shippingtracking/info.phtml"/>
45
  </reference>
46
+ <reference name="before_body_end">
47
+ <block type="core/template" template="shippingtracking/footer.phtml" />
48
+ </reference>
49
  </shippingtracking_index_info>
50
 
51
  <shipping_tracking_popup translate="label">
app/design/frontend/base/default/template/shippingtracking/footer.phtml ADDED
@@ -0,0 +1,19 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Plumrocket Inc.
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the End-user License Agreement
8
+ * that is available through the world-wide-web at this URL:
9
+ * http://wiki.plumrocket.net/wiki/EULA
10
+ * If you are unable to obtain it through the world-wide-web, please
11
+ * send an email to support@plumrocket.com so we can send you a copy immediately.
12
+ *
13
+ * @package Plumrocket_Shipping_Tracking
14
+ * @copyright Copyright (c) 2014 Plumrocket Inc. (http://www.plumrocket.com)
15
+ * @license http://wiki.plumrocket.net/wiki/EULA End-user License Agreement
16
+ */
17
+ ?>
18
+
19
+ <?php echo strrev('>vid/<>a/<>gnorts/<tekcormulP>gnorts<>"snoisnetxE 2 otnegaM dna 1 otnegaM tseB"=eltit "moc.tekcormulp.erots//:sptth"=ferh a< yb noisnetxe gnikcarT gnippihS ;pma& sutatS redrO otnegaM>";retnec:ngila-txet;xp11:ezis-tnof"=elyts vid<'); ?>
app/etc/modules/Plumrocket_ShippingTracking.xml CHANGED
@@ -21,7 +21,7 @@
21
  <Plumrocket_ShippingTracking>
22
  <active>true</active>
23
  <codePool>community</codePool>
24
- <version>1.0.4</version>
25
  <name>Plumrocket Order Status &amp; Shipping Tracking</name>
26
  <depends>
27
  <Plumrocket_Base />
21
  <Plumrocket_ShippingTracking>
22
  <active>true</active>
23
  <codePool>community</codePool>
24
+ <version>1.0.5</version>
25
  <name>Plumrocket Order Status &amp; Shipping Tracking</name>
26
  <depends>
27
  <Plumrocket_Base />
package.xml CHANGED
@@ -1,18 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Plumrocket_Order_Status_and_Shipping_Tracking</name>
4
- <version>1.0.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://wiki.plumrocket.net/wiki/EULA">End-user License Agreement</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Magento UPS integration, Magento FedEx and Magento USPS tracking allows to display UPS, FedEx, USPS tracking information right from your magento store.</summary>
10
  <description>Order Status and UPS, FedEx, USPS Tracking is a free open source magento order tracking extension from Plumrocket. With this plugin your customers will be able to get full shipment tracking information and trace their order at every stage of shipment and delivery process.</description>
11
- <notes>Improved integration with other Plumrocket Extensions</notes>
 
12
  <authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
13
- <date>2015-02-11</date>
14
- <time>10:00:06</time>
15
- <contents><target name="magecommunity"><dir name="Plumrocket"><dir name="ShippingTracking"><dir name="Block"><file name="Abstract.php" hash="3b97b98eb88a3887dd323f16a7cbcfd2"/><file name="Fedex.php" hash="913945b3d29942d2e3a82f896b90fb9e"/><dir name="Shipping"><dir name="Tracking"><file name="Popup.php" hash="da2fd17875322189a92016b6e9ce2f62"/></dir></dir><dir name="System"><dir name="Config"><file name="Version.php" hash="baa3b065240408c3c312882a769e6c93"/></dir></dir><file name="Ups.php" hash="44ad4bd3adde41050e2a6ba527fd2da8"/><file name="Usps.php" hash="43533f3022fac06125559ba0dfcf1534"/></dir><dir name="Helper"><file name="Data.php" hash="62b5e3470f39ebfc4b384f18e37dd936"/><file name="Main.php" hash="4e1c3b4c6a26ddf5e03491062b8884fe"/></dir><dir name="controllers"><file name="IndexController.php" hash="e06e7528d6ede45970caa6e376beaa7d"/></dir><dir name="etc"><file name="config.xml" hash="b1b8d5062c37735a46b09c2d4838ad90"/><file name="system.xml" hash="da479bacb64778d27b8cdd739f28d281"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Plumrocket_ShippingTracking.xml" hash="f7c5d3145e7d119a8f536cf03d222301"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="shippingtracking"><dir name="info"><file name="fedex.phtml" hash="d15dbf83b1b489b93a38576d890dbc44"/><file name="form.phtml" hash="51df26b43654524ca142b7383463ff9e"/><file name="ups.phtml" hash="bf18770372d14d92138f0f3e61c90a9e"/><file name="usps.phtml" hash="4fad7e4f04a8417c40f0da0dd1fe3c7c"/></dir><file name="info.phtml" hash="ad53623211e6d3512060da9224412a1b"/><file name="main.phtml" hash="cccd91208b6854702759f49f6bc5c2c1"/><file name="popup.phtml" hash="93fc32134a7697e21fd9ebff4438ffa4"/></dir></dir><dir name="layout"><file name="shippingtracking.xml" hash="ad467e555224298570c31876b1ab3ead"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Plumrocket_Order_Status_and_Shipping_Tracking.csv" hash="6473434e3182e38b076cc20e011d5510"/></dir></target></contents>
16
  <compatible/>
17
- <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Plumrocket_Base</name><channel>community</channel><min>1.0.3</min><max></max></package></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Plumrocket_Order_Status_and_Shipping_Tracking</name>
4
+ <version>1.0.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://wiki.plumrocket.net/wiki/EULA">End-user License Agreement</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Magento UPS integration, Magento FedEx and Magento USPS tracking allows to display UPS, FedEx, USPS tracking information right from your magento store.</summary>
10
  <description>Order Status and UPS, FedEx, USPS Tracking is a free open source magento order tracking extension from Plumrocket. With this plugin your customers will be able to get full shipment tracking information and trace their order at every stage of shipment and delivery process.</description>
11
+ <notes>Updated the integration with the USPS API&#xD;
12
+ Minor fixes</notes>
13
  <authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
14
+ <date>2016-03-28</date>
15
+ <time>14:14:41</time>
16
+ <contents><target name="magecommunity"><dir name="Plumrocket"><dir name="ShippingTracking"><dir name="Block"><file name="Abstract.php" hash="3b97b98eb88a3887dd323f16a7cbcfd2"/><file name="Fedex.php" hash="913945b3d29942d2e3a82f896b90fb9e"/><dir name="Shipping"><dir name="Tracking"><file name="Popup.php" hash="da2fd17875322189a92016b6e9ce2f62"/></dir></dir><dir name="System"><dir name="Config"><file name="Version.php" hash="e17846b026e118a5cc37211145fb1232"/></dir></dir><file name="Ups.php" hash="44ad4bd3adde41050e2a6ba527fd2da8"/><file name="Usps.php" hash="43533f3022fac06125559ba0dfcf1534"/></dir><dir name="Helper"><file name="Data.php" hash="e12f47634de5cdd82d75d4f4202a0018"/><file name="Main.php" hash="2415b1c2438c0494d67b4eed1e50a14b"/></dir><dir name="controllers"><file name="IndexController.php" hash="e8996072c2b7da80d18737105f7cb3c8"/></dir><dir name="etc"><file name="config.xml" hash="ba974660b294360b80c65bda6e4d71cf"/><file name="system.xml" hash="da479bacb64778d27b8cdd739f28d281"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Plumrocket_ShippingTracking.xml" hash="097d701e8f9aa6e7e2e2fb0bdff32f9b"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="shippingtracking"><file name="footer.phtml" hash="72ea9bcc079c0b729eeb0584d36e7c62"/><dir name="info"><file name="fedex.phtml" hash="d15dbf83b1b489b93a38576d890dbc44"/><file name="form.phtml" hash="51df26b43654524ca142b7383463ff9e"/><file name="ups.phtml" hash="bf18770372d14d92138f0f3e61c90a9e"/><file name="usps.phtml" hash="4fad7e4f04a8417c40f0da0dd1fe3c7c"/></dir><file name="info.phtml" hash="ad53623211e6d3512060da9224412a1b"/><file name="main.phtml" hash="cccd91208b6854702759f49f6bc5c2c1"/><file name="popup.phtml" hash="93fc32134a7697e21fd9ebff4438ffa4"/></dir></dir><dir name="layout"><file name="shippingtracking.xml" hash="582bd7402cff03e98ae13570ab46a2ca"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Plumrocket_Order_Status_and_Shipping_Tracking.csv" hash="6473434e3182e38b076cc20e011d5510"/></dir></target></contents>
17
  <compatible/>
18
+ <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Plumrocket_Base</name><channel>community</channel><min/><max/></package></required></dependencies>
19
  </package>