Plumrocket_Order_Status_and_Shipping_Tracking - Version 1.0.3

Version Notes

Fixed bug with displaying Order Status when no tracking numbers were set

Download this release

Release Info

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


Code changes from version 1.0.2 to 1.0.3

Files changed (5) hide show
  1. app/code/community/Plumrocket/ShippingTracking/controllers/IndexController.php +5 -10
  2. app/code/community/Plumrocket/ShippingTracking/etc/config.xml +1 -1
  3. app/design/frontend/base/default/template/shippingtracking/info.phtml +20 -5
  4. app/etc/modules/Plumrocket_ShippingTracking.xml +1 -1
  5. package.xml +5 -5
app/code/community/Plumrocket/ShippingTracking/controllers/IndexController.php CHANGED
@@ -53,9 +53,7 @@ class Plumrocket_ShippingTracking_IndexController extends Mage_Core_Controller_F
53
  $this->_redirect('*/*/');
54
  return;
55
  } else {
56
- //var_dump($orderId);
57
  $order = Mage::getModel('sales/order')->load($orderId, 'increment_id');
58
- //var_dump($order->getId()); exit();
59
  if ($order->getId()) {
60
  $bAddress = $order->getBillingAddress();
61
  $sAddress = $order->getShippingAddress();
@@ -70,12 +68,7 @@ class Plumrocket_ShippingTracking_IndexController extends Mage_Core_Controller_F
70
  $shippingInfoModel->setTrackingInfo($trackingInfo)->setOrderId($order->getId());
71
  Mage::register('current_shipping_info', $shippingInfoModel);
72
 
73
- //var_dump($trackingInfo); exit();
74
-
75
- if (count($trackingInfo) == 0) {
76
- $_session->addError($this->__('Shipping tracking data not found.'));
77
- $this->_redirect('*/*/');
78
- } else if (count($trackingInfo) == 1) {
79
  foreach($trackingInfo as $shipid => $_result) {
80
  if (count($_result) == 1) {
81
  foreach($_result as $key => $track) {
@@ -92,11 +85,13 @@ class Plumrocket_ShippingTracking_IndexController extends Mage_Core_Controller_F
92
  }
93
  }
94
  }
95
- }
 
 
96
 
97
  $this->loadLayout();
98
  if ($head = $this->getLayout()->getBlock('head')) {
99
- $head->setTitle($this->__('Tracking Information'));
100
  }
101
  $this->_initLayoutMessages('customer/session');
102
  $this->renderLayout();
53
  $this->_redirect('*/*/');
54
  return;
55
  } else {
 
56
  $order = Mage::getModel('sales/order')->load($orderId, 'increment_id');
 
57
  if ($order->getId()) {
58
  $bAddress = $order->getBillingAddress();
59
  $sAddress = $order->getShippingAddress();
68
  $shippingInfoModel->setTrackingInfo($trackingInfo)->setOrderId($order->getId());
69
  Mage::register('current_shipping_info', $shippingInfoModel);
70
 
71
+ if (count($trackingInfo) == 1) {
 
 
 
 
 
72
  foreach($trackingInfo as $shipid => $_result) {
73
  if (count($_result) == 1) {
74
  foreach($_result as $key => $track) {
85
  }
86
  }
87
  }
88
+ }
89
+
90
+ Mage::register('current_order', $order);
91
 
92
  $this->loadLayout();
93
  if ($head = $this->getLayout()->getBlock('head')) {
94
+ $head->setTitle($this->__('Order Status'));
95
  }
96
  $this->_initLayoutMessages('customer/session');
97
  $this->renderLayout();
app/code/community/Plumrocket/ShippingTracking/etc/config.xml CHANGED
@@ -19,7 +19,7 @@
19
  <config>
20
  <modules>
21
  <Plumrocket_ShippingTracking>
22
- <version>1.0.2</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.3</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/template/shippingtracking/info.phtml CHANGED
@@ -16,13 +16,27 @@
16
  */
17
  ?>
18
  <?php $_results = $this->getTrackingInfo(); ?>
19
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
20
  <?php if(sizeof($_results)>0): ?>
21
  <?php foreach($_results as $shipid => $_result): ?>
22
  <?php if($shipid): ?>
23
- <div class="page-title title-buttons">
24
- <h1><?php echo $this->__('Tracking Information'); ?> (<?php echo $this->__('Shipment #').$shipid; ?>)</h1>
25
- </div>
26
  <?php endif; ?>
27
  <?php if(sizeof($_result)>0): ?>
28
  <?php $rowCount = sizeof($_result); $counter = 1; ?>
@@ -160,7 +174,8 @@
160
 
161
  <?php endforeach; ?>
162
  <?php else: ?>
163
- <p><?php echo $this->__('There is no tracking available.'); ?></p>
 
164
  <?php endif; ?>
165
  <div class="buttons-set">
166
  <p class="back-link"><a href="<?php echo $this->getUrl('*/', array('order' => $this->getRequest()->getParam('order'))) ?>"><small>« </small><?php echo $this->__('Back') ?></a></p>
16
  */
17
  ?>
18
  <?php $_results = $this->getTrackingInfo(); ?>
19
+ <?php $order = Mage::registry('current_order'); ?>
20
+ <div class="page-title title-buttons">
21
+ <h1><?php echo $this->__('Order Status'); ?></h1>
22
+ </div>
23
+ <br/>
24
+ <div class="fieldset">
25
+ <h2 class="legend"><?php echo $this->__('General Information') ?></h2>
26
+ <ul class="form-list">
27
+ <li class="fields">
28
+ <strong><?php echo $this->__('Order') ?>:</strong> #<?php echo $order->getIncrementId() ?>
29
+ </li>
30
+ <li class="fields">
31
+ <strong><?php echo $this->__('Order Status') ?>:</strong> <?php echo $order->getStatusLabel() ?>
32
+ </li>
33
+ </ul>
34
+ </div>
35
+ <br/>
36
  <?php if(sizeof($_results)>0): ?>
37
  <?php foreach($_results as $shipid => $_result): ?>
38
  <?php if($shipid): ?>
39
+ <h2><?php echo $this->__('Tracking Information'); ?> (<?php echo $this->__('Shipment #').$shipid; ?>)</h2>
 
 
40
  <?php endif; ?>
41
  <?php if(sizeof($_result)>0): ?>
42
  <?php $rowCount = sizeof($_result); $counter = 1; ?>
174
 
175
  <?php endforeach; ?>
176
  <?php else: ?>
177
+ <h2><?php echo $this->__('Tracking Information'); ?></h2>
178
+ <strong><?php echo $this->__('There is no tracking available.'); ?></strong>
179
  <?php endif; ?>
180
  <div class="buttons-set">
181
  <p class="back-link"><a href="<?php echo $this->getUrl('*/', array('order' => $this->getRequest()->getParam('order'))) ?>"><small>« </small><?php echo $this->__('Back') ?></a></p>
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.2</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.3</version>
25
  <name>Plumrocket Order Status &amp; Shipping Tracking</name>
26
  <depends>
27
  <Plumrocket_Base />
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Plumrocket_Order_Status_and_Shipping_Tracking</name>
4
- <version>1.0.2</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>Fix bug with displaying USPS Tracking Info</notes>
12
  <authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
13
- <date>2014-09-02</date>
14
- <time>07:40:32</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="cb01becf5f35aaae9ae98ab523649ab8"/></dir></dir><dir name="System"><dir name="Config"><file name="Version.php" hash="e037e71e13a61e69c96be25d71350fc3"/></dir></dir><file name="Ups.php" hash="44ad4bd3adde41050e2a6ba527fd2da8"/><file name="Usps.php" hash="43533f3022fac06125559ba0dfcf1534"/></dir><dir name="Helper"><file name="Data.php" hash="c7fb979685a80a92b17b7d5a0bba947d"/></dir><dir name="controllers"><file name="IndexController.php" hash="2d000527220ad3aff0498db204db6c59"/></dir><dir name="etc"><file name="config.xml" hash="058990470eee8d780ae56ae1f4589ed1"/><file name="system.xml" hash="da479bacb64778d27b8cdd739f28d281"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Plumrocket_ShippingTracking.xml" hash="8d95bb51e1afdd9d4800e38abb098984"/></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="59cec0c15c782f708c33f46277928303"/><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></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.3</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>Fixed bug with displaying Order Status when no tracking numbers were set</notes>
12
  <authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
13
+ <date>2014-09-19</date>
14
+ <time>13:42:55</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="cb01becf5f35aaae9ae98ab523649ab8"/></dir></dir><dir name="System"><dir name="Config"><file name="Version.php" hash="e037e71e13a61e69c96be25d71350fc3"/></dir></dir><file name="Ups.php" hash="44ad4bd3adde41050e2a6ba527fd2da8"/><file name="Usps.php" hash="43533f3022fac06125559ba0dfcf1534"/></dir><dir name="Helper"><file name="Data.php" hash="c7fb979685a80a92b17b7d5a0bba947d"/></dir><dir name="controllers"><file name="IndexController.php" hash="7ca46b1f89df028ebea41f9d4fe26c3c"/></dir><dir name="etc"><file name="config.xml" hash="a3b8909defcf34766fecb8310cb4fd50"/><file name="system.xml" hash="da479bacb64778d27b8cdd739f28d281"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Plumrocket_ShippingTracking.xml" hash="264ab12d04fbc345fc26ebdbdd045e5c"/></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></min><max></max></package></required></dependencies>
18
  </package>