Plumrocket_Order_Status_and_Shipping_Tracking - Version 1.0.1

Version Notes

Magento UPS integration, Magento FedEx and Magento USPS tracking allows to display UPS, FedEx, USPS tracking information right from your magento store

Admin can enter UPS, USPS and FedEx tracking codes while marking magento order as shipped. These tracking codes will be automatically picked up by this free magento order tracking extension

100% open source magento extension

Download this release

Release Info

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


Code changes from version 1.0.0 to 1.0.1

app/code/community/Plumrocket/ShippingTracking/Block/Abstract.php CHANGED
@@ -18,10 +18,59 @@
18
 
19
  abstract class Plumrocket_ShippingTracking_Block_Abstract extends Mage_Core_Block_Template
20
  {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
 
22
  public function getNumber()
23
  {
24
- return Mage::app()->getRequest()->getParam('number');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
25
  }
26
 
27
  }
18
 
19
  abstract class Plumrocket_ShippingTracking_Block_Abstract extends Mage_Core_Block_Template
20
  {
21
+ protected $_carrierCore = 'none';
22
+
23
+ protected $_number = null;
24
+ protected $_shipmentTrack = null;
25
+ protected $_order = null;
26
+
27
+ /*
28
+ public function getCarrier()
29
+ {
30
+ return $this->_carrierCore;
31
+ }
32
+
33
+ public function setCarrier($carrier)
34
+ {
35
+ $this->_carrierCore = true;
36
+ return $this;
37
+ }
38
+ */
39
 
40
  public function getNumber()
41
  {
42
+ if (is_null($this->_number)) {
43
+ $this->_number = Mage::app()->getRequest()->getParam('number');
44
+ }
45
+ return $this->_number;
46
+ }
47
+
48
+ public function getShipmentTrack()
49
+ {
50
+ if (is_null($this->_shipmentTrack)) {
51
+ $this->_shipmentTrack = Mage::getModel('sales/order_shipment_track');
52
+
53
+ if ($tackNumber = $this->getNumber()) {
54
+ $this->_shipmentTrack = $this->_shipmentTrack->getCollection()
55
+ ->addFieldToFilter('track_number', $tackNumber)
56
+ ->addFieldToFilter('carrier_code', $this->_carrierCore)
57
+ ->setPageSize(1)
58
+ ->getFirstItem();
59
+ }
60
+ }
61
+
62
+ return $this->_shipmentTrack;
63
+ }
64
+
65
+ public function getOrder()
66
+ {
67
+ if (is_null($this->_order)) {
68
+ $this->_order = Mage::getModel('sales/order');
69
+ if ($orderId = $this->getShipmentTrack()->getOrderId()) {
70
+ $this->_order->load($orderId);
71
+ }
72
+ }
73
+ return $this->_order;
74
  }
75
 
76
  }
app/code/community/Plumrocket/ShippingTracking/Block/Fedex.php CHANGED
@@ -19,10 +19,11 @@
19
  class Plumrocket_ShippingTracking_Block_Fedex extends Plumrocket_ShippingTracking_Block_Abstract
20
  {
21
 
 
 
22
  public function getInfo()
23
  {
24
- $number = $this->getNumber();
25
- return $this->helper('shippingtracking')->getFedexTrackingInfo($number);
26
  }
27
 
28
 
19
  class Plumrocket_ShippingTracking_Block_Fedex extends Plumrocket_ShippingTracking_Block_Abstract
20
  {
21
 
22
+ protected $_carrierCore = 'fedex';
23
+
24
  public function getInfo()
25
  {
26
+ return $this->helper('shippingtracking')->getFedexTrackingInfo($this->getNumber());
 
27
  }
28
 
29
 
app/code/community/Plumrocket/ShippingTracking/Block/Shipping/Tracking/Popup.php CHANGED
@@ -22,7 +22,7 @@ class Plumrocket_ShippingTracking_Block_Shipping_Tracking_Popup extends Mage_Shi
22
  {
23
  $_results = parent::getTrackingInfo();
24
 
25
- $order = Mage::getModel('sales/order')->load(Mage::registry('current_shipping_info')->getOrderId());
26
 
27
  if (Mage::getStoreConfig('shippingtracking/general/enabled')) {
28
  foreach($_results as $shipid => $_result) {
@@ -35,7 +35,7 @@ class Plumrocket_ShippingTracking_Block_Shipping_Tracking_Popup extends Mage_Shi
35
  ->setErrorMessage(null)
36
  ->setUrl($this->getUrl('shippingtracking/index/'.$carrier, array(
37
  'number' => $track->getTracking(),
38
- 'order' => $order->getIncrementId(), //Mage::app()->getRequest()->getParam('order'),
39
  )));
40
  }
41
 
22
  {
23
  $_results = parent::getTrackingInfo();
24
 
25
+ //$order = Mage::getModel('sales/order')->load(Mage::registry('current_shipping_info')->getOrderId());
26
 
27
  if (Mage::getStoreConfig('shippingtracking/general/enabled')) {
28
  foreach($_results as $shipid => $_result) {
35
  ->setErrorMessage(null)
36
  ->setUrl($this->getUrl('shippingtracking/index/'.$carrier, array(
37
  'number' => $track->getTracking(),
38
+ //'order' => $order->getIncrementId(), //Mage::app()->getRequest()->getParam('order'),
39
  )));
40
  }
41
 
app/code/community/Plumrocket/ShippingTracking/Block/Ups.php CHANGED
@@ -17,12 +17,12 @@
17
 
18
 
19
  class Plumrocket_ShippingTracking_Block_Ups extends Plumrocket_ShippingTracking_Block_Abstract
20
- {
 
21
 
22
  public function getInfo()
23
  {
24
- $number = $this->getNumber();
25
- return $this->helper('shippingtracking')->getUpsTrackingInfo($number);
26
  }
27
 
28
  public function getTimeFromStr($str)
17
 
18
 
19
  class Plumrocket_ShippingTracking_Block_Ups extends Plumrocket_ShippingTracking_Block_Abstract
20
+ {
21
+ protected $_carrierCore = 'ups';
22
 
23
  public function getInfo()
24
  {
25
+ return $this->helper('shippingtracking')->getUpsTrackingInfo($this->getNumber());
 
26
  }
27
 
28
  public function getTimeFromStr($str)
app/code/community/Plumrocket/ShippingTracking/Block/Usps.php CHANGED
@@ -18,11 +18,11 @@
18
 
19
  class Plumrocket_ShippingTracking_Block_Usps extends Plumrocket_ShippingTracking_Block_Abstract
20
  {
 
21
 
22
  public function getInfo()
23
  {
24
- $number = $this->getNumber();
25
- return $this->helper('shippingtracking')->getUspsTrackingInfo($number);
26
  }
27
 
28
  }
18
 
19
  class Plumrocket_ShippingTracking_Block_Usps extends Plumrocket_ShippingTracking_Block_Abstract
20
  {
21
+ protected $_carrierCore = 'usps';
22
 
23
  public function getInfo()
24
  {
25
+ return $this->helper('shippingtracking')->getUspsTrackingInfo($this->getNumber());
 
26
  }
27
 
28
  }
app/code/community/Plumrocket/ShippingTracking/Helper/Data.php CHANGED
@@ -21,6 +21,12 @@ class Plumrocket_ShippingTracking_Helper_Data extends Mage_Core_Helper_Abstract
21
  protected $_trackingInfo = array();
22
 
23
 
 
 
 
 
 
 
24
  protected function _getDecryptedConfig($key)
25
  {
26
  if (empty($key)) {
21
  protected $_trackingInfo = array();
22
 
23
 
24
+ public function getShippingTrackingUrl()
25
+ {
26
+ return Mage::getUrl('shippingtracking');
27
+ }
28
+
29
+
30
  protected function _getDecryptedConfig($key)
31
  {
32
  if (empty($key)) {
app/code/community/Plumrocket/ShippingTracking/controllers/IndexController.php CHANGED
@@ -23,6 +23,7 @@ class Plumrocket_ShippingTracking_IndexController extends Mage_Core_Controller_F
23
  {
24
  if (!Mage::getStoreConfig('shippingtracking/general/enabled')) {
25
  $this->_forward('noRoute');
 
26
  }
27
 
28
  $this->loadLayout();
@@ -35,6 +36,11 @@ class Plumrocket_ShippingTracking_IndexController extends Mage_Core_Controller_F
35
 
36
  public function infoAction()
37
  {
 
 
 
 
 
38
  $_request = $this->getRequest();
39
  $_session = Mage::getSingleton('customer/session');
40
 
@@ -43,7 +49,7 @@ class Plumrocket_ShippingTracking_IndexController extends Mage_Core_Controller_F
43
 
44
 
45
  if (empty($info) || empty($orderId)) {
46
- $_session->addError($this->__('Make sure that you have entered the Order Number and phone number (or email address).'));
47
  $this->_redirect('*/*/');
48
  return;
49
  } else {
@@ -78,7 +84,7 @@ class Plumrocket_ShippingTracking_IndexController extends Mage_Core_Controller_F
78
  if (Mage::getStoreConfig('shippingtracking/'.$carrier.'_api/enabled')) {
79
  $this->_redirect('*/*/'.$carrier, array(
80
  'number' => $track->getTracking(),
81
- 'order' => $order->getIncrementId(),
82
  ));
83
  return;
84
  }
@@ -100,7 +106,7 @@ class Plumrocket_ShippingTracking_IndexController extends Mage_Core_Controller_F
100
  }
101
  }
102
 
103
- $_session->addError($this->__('Data combination is not valid. Please check order number and phone number (or email address).'));
104
  $this->_redirect('*/*/index', array(
105
  'order' => $orderId,
106
  'info' => $info,
@@ -149,8 +155,16 @@ class Plumrocket_ShippingTracking_IndexController extends Mage_Core_Controller_F
149
 
150
  protected function _processTrackingAction($carrier, $pageTitle)
151
  {
 
 
 
 
 
 
 
152
  if (!Mage::getStoreConfig('shippingtracking/general/enabled') || !Mage::getStoreConfig('shippingtracking/'.$carrier.'_api/enabled')) {
153
  $this->_forward('noRoute');
 
154
  }
155
 
156
  $this->loadLayout();
23
  {
24
  if (!Mage::getStoreConfig('shippingtracking/general/enabled')) {
25
  $this->_forward('noRoute');
26
+ return;
27
  }
28
 
29
  $this->loadLayout();
36
 
37
  public function infoAction()
38
  {
39
+ if (!Mage::getStoreConfig('shippingtracking/general/enabled')) {
40
+ $this->_forward('noRoute');
41
+ return;
42
+ }
43
+
44
  $_request = $this->getRequest();
45
  $_session = Mage::getSingleton('customer/session');
46
 
49
 
50
 
51
  if (empty($info) || empty($orderId)) {
52
+ $_session->addError($this->__('Make sure that you have entered the Order Number and phone number (or email address) correctly.'));
53
  $this->_redirect('*/*/');
54
  return;
55
  } else {
84
  if (Mage::getStoreConfig('shippingtracking/'.$carrier.'_api/enabled')) {
85
  $this->_redirect('*/*/'.$carrier, array(
86
  'number' => $track->getTracking(),
87
+ //'order' => $order->getIncrementId(),
88
  ));
89
  return;
90
  }
106
  }
107
  }
108
 
109
+ $_session->addError($this->__('Make sure that you have entered the Order Number and phone number (or email address) correctly.'));
110
  $this->_redirect('*/*/index', array(
111
  'order' => $orderId,
112
  'info' => $info,
155
 
156
  protected function _processTrackingAction($carrier, $pageTitle)
157
  {
158
+ $rCarrier = $this->getRequest()->getParam('carrier');
159
+ //if ($rCarrier && $carrier != $rCarrier) {
160
+ if ($rCarrier) {
161
+ $this->_redirect('*/*/'.strtolower($rCarrier), array('number' => $this->getRequest()->getParam('number')));
162
+ return;
163
+ }
164
+
165
  if (!Mage::getStoreConfig('shippingtracking/general/enabled') || !Mage::getStoreConfig('shippingtracking/'.$carrier.'_api/enabled')) {
166
  $this->_forward('noRoute');
167
+ return;
168
  }
169
 
170
  $this->loadLayout();
app/code/community/Plumrocket/ShippingTracking/etc/config.xml CHANGED
@@ -19,7 +19,7 @@
19
  <config>
20
  <modules>
21
  <Plumrocket_ShippingTracking>
22
- <version>1.0.0</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.1</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
@@ -18,6 +18,12 @@
18
  -->
19
  <layout version="1.0.0">
20
 
 
 
 
 
 
 
21
  <shippingtracking_index_index>
22
  <reference name="root">
23
  <action method="setTemplate"><template>page/2columns-right.phtml</template></action>
@@ -50,7 +56,9 @@
50
  </reference>
51
  <reference name="content">
52
  <block type="shippingtracking/ups" name="shippingTracking.ups" template="shippingtracking/info/ups.phtml"/>
53
- <block type="core/template" name="shippingTracking.form" template="shippingtracking/info/form.phtml"/>
 
 
54
  </reference>
55
  </shippingtracking_index_ups>
56
 
@@ -60,7 +68,9 @@
60
  </reference>
61
  <reference name="content">
62
  <block type="shippingtracking/fedex" name="shippingTracking.fedex" template="shippingtracking/info/fedex.phtml"/>
63
- <block type="core/template" name="shippingTracking.form" template="shippingtracking/info/form.phtml"/>
 
 
64
  </reference>
65
  </shippingtracking_index_fedex>
66
 
@@ -70,9 +80,11 @@
70
  </reference>
71
  <reference name="content">
72
  <block type="shippingtracking/usps" name="shippingTracking.usps" template="shippingtracking/info/usps.phtml"/>
73
- <block type="core/template" name="shippingTracking.form" template="shippingtracking/info/form.phtml"/>
 
 
74
  </reference>
75
  </shippingtracking_index_usps>
76
 
77
  </layout>
78
-
18
  -->
19
  <layout version="1.0.0">
20
 
21
+ <default>
22
+ <reference name="footer_links">
23
+ <action method="addLink" translate="label title" module="shippingtracking" ifconfig="shippingtracking/general/enabled"><label>Check Order Status</label><url helper="shippingtracking/getShippingTrackingUrl" /><title>Check Order Status</title></action>
24
+ </reference>
25
+ </default>
26
+
27
  <shippingtracking_index_index>
28
  <reference name="root">
29
  <action method="setTemplate"><template>page/2columns-right.phtml</template></action>
56
  </reference>
57
  <reference name="content">
58
  <block type="shippingtracking/ups" name="shippingTracking.ups" template="shippingtracking/info/ups.phtml"/>
59
+ <block type="core/template" name="shippingTracking.form" template="shippingtracking/info/form.phtml">
60
+ <action method="setCarrier"><carrier>ups</carrier></action>
61
+ </block>
62
  </reference>
63
  </shippingtracking_index_ups>
64
 
68
  </reference>
69
  <reference name="content">
70
  <block type="shippingtracking/fedex" name="shippingTracking.fedex" template="shippingtracking/info/fedex.phtml"/>
71
+ <block type="core/template" name="shippingTracking.form" template="shippingtracking/info/form.phtml">
72
+ <action method="setCarrier"><carrier>fedex</carrier></action>
73
+ </block>
74
  </reference>
75
  </shippingtracking_index_fedex>
76
 
80
  </reference>
81
  <reference name="content">
82
  <block type="shippingtracking/usps" name="shippingTracking.usps" template="shippingtracking/info/usps.phtml"/>
83
+ <block type="core/template" name="shippingTracking.form" template="shippingtracking/info/form.phtml">
84
+ <action method="setCarrier"><carrier>usps</carrier></action>
85
+ </block>
86
  </reference>
87
  </shippingtracking_index_usps>
88
 
89
  </layout>
90
+
app/design/frontend/base/default/template/shippingtracking/info/fedex.phtml CHANGED
@@ -16,25 +16,37 @@
16
  */
17
  ?>
18
 
19
- <?php
20
- $info = $this->getInfo();
21
-
22
- $_dateFormat = $this->__('m/d/Y');
23
- $_timeFormat = $this->__('g:i a');
24
- ?>
25
-
26
  <div class="page-title">
27
  <h1>
28
  <?php echo $this->__('FedEx Tracking Number %s', ( $this->getNumber() ? '('.$this->htmlEscape($this->getNumber()).')' : '' )) ?>
29
- <?php if ($order = $this->getRequest()->getParam('order')) { echo ' - '.$this->__('Order').' #'.$this->escapeHtml($order); } ?>
30
  </h1>
31
  </div>
32
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33
 
34
- <?php if ($this->getNumber()) { ?>
 
35
  <br/>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
36
  <?php if (!$info || $info->HighestSeverity != 'SUCCESS') { ?>
 
 
37
  <strong><?php echo $this->__('Tracking information is not available at this time. Please check back later or double-check the tracking number entered and try again.'); ?></strong>
 
38
  <?php } else { ?>
39
  <div class="fieldset">
40
  <h2 class="legend"><?php echo $this->__('Shipment Progress') ?></h2>
@@ -112,4 +124,9 @@
112
  </div>
113
  <?php } ?>
114
  <br/><br/>
 
 
 
 
 
115
  <?php } ?>
16
  */
17
  ?>
18
 
 
 
 
 
 
 
 
19
  <div class="page-title">
20
  <h1>
21
  <?php echo $this->__('FedEx Tracking Number %s', ( $this->getNumber() ? '('.$this->htmlEscape($this->getNumber()).')' : '' )) ?>
 
22
  </h1>
23
  </div>
24
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
25
 
26
+ <?php $order = $this->getOrder(); ?>
27
+ <?php if ($order->getId()) { ?>
28
  <br/>
29
+ <?php
30
+ $info = $this->getInfo();
31
+ $_dateFormat = $this->__('m/d/Y');
32
+ $_timeFormat = $this->__('g:i a');
33
+ ?>
34
+ <div class="fieldset">
35
+ <h2 class="legend"><?php echo $this->__('General Information') ?></h2>
36
+ <ul class="form-list">
37
+ <li class="fields">
38
+ <strong><?php echo $this->__('Order') ?>:</strong> #<?php echo $order->getIncrementId() ?>
39
+ </li>
40
+ <li class="fields">
41
+ <strong><?php echo $this->__('Order Status') ?>:</strong> <?php echo $order->getStatusLabel() ?>
42
+ </li>
43
+ </ul>
44
+ </div>
45
  <?php if (!$info || $info->HighestSeverity != 'SUCCESS') { ?>
46
+ <div class="fieldset">
47
+ <br/>
48
  <strong><?php echo $this->__('Tracking information is not available at this time. Please check back later or double-check the tracking number entered and try again.'); ?></strong>
49
+ </div>
50
  <?php } else { ?>
51
  <div class="fieldset">
52
  <h2 class="legend"><?php echo $this->__('Shipment Progress') ?></h2>
124
  </div>
125
  <?php } ?>
126
  <br/><br/>
127
+ <?php } else { ?>
128
+ <div class="fieldset">
129
+ <strong><?php echo $this->__('Tracking number is not associated with any order at our store.'); ?></strong>
130
+ <br/><br/>
131
+ </div>
132
  <?php } ?>
app/design/frontend/base/default/template/shippingtracking/info/form.phtml CHANGED
@@ -18,26 +18,48 @@
18
 
19
  <div style="background:#f7f7f7; padding:12px;">
20
  <form action="<?php echo $this->getUrl('*/*/*') ?>" id="tracking-number" >
21
- <div class="block-content">
22
- <h6>Enter Tracking number</h6>
23
- <div class="input-box" >
24
- <input type="text" autocapitalize="off" autocorrect="off" spellcheck="false" name="number" class="input-text required-entry">
25
- </div>
26
- <div class="buttons-set">
27
- <button type="submit" title="Track" class="button"><span><span>Track</span></span></button>
28
- </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
29
  </div>
30
  </form>
31
  </div>
32
 
33
 
34
- <div class="buttons-set">
35
- <p class="back-link"><a href="<?php echo $this->getUrl('*/', array('order' => $this->getRequest()->getParam('order'))) ?>"><small>« </small><?php echo $this->__('Back') ?></a></p>
36
- <?php echo $this->__('Postal Services:') ?>
37
- <?php if (Mage::getStoreConfig('shippingtracking/ups_api/enabled')) { ?><a href="<?php echo $this->getUrl('*/*/ups') ?>">UPS</a> | <?php } ?>
38
- <?php if (Mage::getStoreConfig('shippingtracking/fedex_api/enabled')) { ?><a href="<?php echo $this->getUrl('*/*/fedex') ?>">FedEx</a> | <?php } ?>
39
- <?php if (Mage::getStoreConfig('shippingtracking/usps_api/enabled')) { ?><a href="<?php echo $this->getUrl('*/*/usps') ?>">USPS</a> | <?php } ?>
40
- </div>
41
 
42
  <script type="text/javascript">
43
  //<![CDATA[
18
 
19
  <div style="background:#f7f7f7; padding:12px;">
20
  <form action="<?php echo $this->getUrl('*/*/*') ?>" id="tracking-number" >
21
+ <div class="fieldset">
22
+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
23
+ <ul class="form-list">
24
+ <li class="fields">
25
+ <div class="customer-name">
26
+ <div class="field name-firstname">
27
+ <label for="firstname" class="required"><em>*</em><?php echo $this->__('Enter Tracking number') ?></label>
28
+ <div class="input-box">
29
+ <input type="text" autocapitalize="off" autocorrect="off" spellcheck="false" name="number" class="input-text required-entry">
30
+ </div>
31
+ </div>
32
+ <div class="field name-lastname">
33
+ <label for="lastname" class="required"><em>*</em><?php echo $this->__('Postal Services') ?></label>
34
+ <div class="input-box">
35
+ <select id="carrier" name="carrier" title="<?php echo $this->__('Carrier') ?>" class="required-entry">
36
+ <?php foreach( array('ups' => 'UPS', 'fedex' => 'FedEx', 'usps' => 'USPS') as $carrier => $title) { ?>
37
+ <?php if (Mage::getStoreConfig('shippingtracking/'.$carrier.'_api/enabled')) { ?>
38
+ <option value="<?php echo $carrier ?>" <?php if ($this->getCarrier() == $carrier) echo 'selected="selected"' ?>><?php echo $title ?></option>
39
+ <?php } ?>
40
+ <?php } ?>
41
+ </select>
42
+ </div>
43
+ </div>
44
+ </div>
45
+ </li>
46
+ </ul>
47
+ </div>
48
+ <div class="buttons-set">
49
+ <p class="back-link">
50
+ <a href="<?php echo $this->getUrl('*/', array('order' => $this->getRequest()->getParam('order'))) ?>">
51
+ <small>« </small>
52
+ <?php echo $this->__('Back') ?>
53
+ </a>
54
+ </p>
55
+ <button type="submit" title="<?php echo $this->__('Track') ?>" class="button">
56
+ <span><span><?php echo $this->__('Track') ?></span></span>
57
+ </button>
58
  </div>
59
  </form>
60
  </div>
61
 
62
 
 
 
 
 
 
 
 
63
 
64
  <script type="text/javascript">
65
  //<![CDATA[
app/design/frontend/base/default/template/shippingtracking/info/ups.phtml CHANGED
@@ -16,23 +16,21 @@
16
  */
17
  ?>
18
 
19
- <?php
20
- $info = $this->getInfo();
21
- $_dateFormat = $this->__('m/d/Y');
22
- $_timeFormat = $this->__('g:i a');
23
- ?>
24
-
25
  <div class="page-title">
26
  <h1>
27
  <?php echo $this->__('UPS Tracking Number %s', ( $this->getNumber() ? '('.$this->htmlEscape($this->getNumber()).')' : '' )) ?>
28
- <?php if ($order = $this->getRequest()->getParam('order')) { echo ' - '.$this->__('Order').' #'.$this->escapeHtml($order); } ?>
29
  </h1>
30
  </div>
31
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
32
- <?php if ($this->getNumber()) { ?>
33
 
 
 
34
  <br/>
35
-
 
 
 
 
36
  <?php if ($info->Response->ResponseStatusDescription != 'Success') { ?>
37
  <strong><?php echo $this->escapeHtml($info->Response->Error->ErrorDescription); ?></strong>
38
  <?php } else { ?>
@@ -41,6 +39,12 @@
41
  <div class="fieldset">
42
  <h2 class="legend"><?php echo $this->__('General Information') ?></h2>
43
  <ul class="form-list">
 
 
 
 
 
 
44
  <?php $delivered = $lastAction->Status->StatusType->Code == 'D'; ?>
45
  <li class="fields">
46
  <label for="company"><?php echo $this->__('Delivered On:') ?></label>
@@ -127,4 +131,6 @@
127
  <?php } ?>
128
  <?php } ?>
129
  <br/><br/>
 
 
130
  <?php } ?>
16
  */
17
  ?>
18
 
 
 
 
 
 
 
19
  <div class="page-title">
20
  <h1>
21
  <?php echo $this->__('UPS Tracking Number %s', ( $this->getNumber() ? '('.$this->htmlEscape($this->getNumber()).')' : '' )) ?>
 
22
  </h1>
23
  </div>
24
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
 
25
 
26
+ <?php $order = $this->getOrder(); ?>
27
+ <?php if ($order->getId()) { ?>
28
  <br/>
29
+ <?php
30
+ $info = $this->getInfo();
31
+ $_dateFormat = $this->__('m/d/Y');
32
+ $_timeFormat = $this->__('g:i a');
33
+ ?>
34
  <?php if ($info->Response->ResponseStatusDescription != 'Success') { ?>
35
  <strong><?php echo $this->escapeHtml($info->Response->Error->ErrorDescription); ?></strong>
36
  <?php } else { ?>
39
  <div class="fieldset">
40
  <h2 class="legend"><?php echo $this->__('General Information') ?></h2>
41
  <ul class="form-list">
42
+ <li class="fields">
43
+ <strong><?php echo $this->__('Order') ?>:</strong> #<?php echo $order->getIncrementId() ?>
44
+ </li>
45
+ <li class="fields">
46
+ <strong><?php echo $this->__('Order Status') ?>:</strong> <?php echo $order->getStatusLabel() ?>
47
+ </li>
48
  <?php $delivered = $lastAction->Status->StatusType->Code == 'D'; ?>
49
  <li class="fields">
50
  <label for="company"><?php echo $this->__('Delivered On:') ?></label>
131
  <?php } ?>
132
  <?php } ?>
133
  <br/><br/>
134
+ <?php } else { ?>
135
+ <strong><?php echo $this->__('Tracking number is not associated with any order on our store.'); ?></strong>
136
  <?php } ?>
app/design/frontend/base/default/template/shippingtracking/info/usps.phtml CHANGED
@@ -16,23 +16,21 @@
16
  */
17
  ?>
18
 
19
- <?php
20
- $info = $this->getInfo();
21
- $_dateFormat = $this->__('m/d/Y');
22
- $_timeFormat = $this->__('g:i a');
23
- ?>
24
-
25
  <div class="page-title">
26
  <h1>
27
  <?php echo $this->__('USPS Tracking Number %s', ( $this->getNumber() ? '('.$this->htmlEscape($this->getNumber()).')' : '' )) ?>
28
- <?php if ($order = $this->getRequest()->getParam('order')) { echo ' - '.$this->__('Order').' #'.$this->escapeHtml($order); } ?>
29
  </h1>
30
  </div>
31
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
32
- <?php if ($this->getNumber()) { ?>
33
 
 
 
34
  <br/>
35
-
 
 
 
 
36
  <?php if (!$info || !$info->TrackInfo) { ?>
37
  <strong><?php echo $this->__('Tracking information is not available at this time. Please check back later or double-check the tracking number entered and try again.'); ?></strong>
38
  <?php } else {
@@ -43,6 +41,14 @@
43
 
44
  <?php if ($trackInfo->TrackSummary) { ?>
45
  <h2 class="legend"><?php echo $this->__('General Information') ?></h2>
 
 
 
 
 
 
 
 
46
  <?php foreach($trackInfo->TrackSummary as $info) { ?>
47
  <div class="fieldset">
48
  <div>
@@ -104,4 +110,6 @@
104
  <?php } ?>
105
  <?php } ?>
106
  <br/><br/>
 
 
107
  <?php } ?>
16
  */
17
  ?>
18
 
 
 
 
 
 
 
19
  <div class="page-title">
20
  <h1>
21
  <?php echo $this->__('USPS Tracking Number %s', ( $this->getNumber() ? '('.$this->htmlEscape($this->getNumber()).')' : '' )) ?>
 
22
  </h1>
23
  </div>
24
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
 
25
 
26
+ <?php $order = $this->getOrder(); ?>
27
+ <?php if ($order->getId()) { ?>
28
  <br/>
29
+ <?php
30
+ $info = $this->getInfo();
31
+ $_dateFormat = $this->__('m/d/Y');
32
+ $_timeFormat = $this->__('g:i a');
33
+ ?>
34
  <?php if (!$info || !$info->TrackInfo) { ?>
35
  <strong><?php echo $this->__('Tracking information is not available at this time. Please check back later or double-check the tracking number entered and try again.'); ?></strong>
36
  <?php } else {
41
 
42
  <?php if ($trackInfo->TrackSummary) { ?>
43
  <h2 class="legend"><?php echo $this->__('General Information') ?></h2>
44
+ <ul class="form-list">
45
+ <li class="fields">
46
+ <strong><?php echo $this->__('Order') ?>:</strong> #<?php echo $order->getIncrementId() ?>
47
+ </li>
48
+ <li class="fields">
49
+ <strong><?php echo $this->__('Order Status') ?>:</strong> <?php echo $order->getStatusLabel() ?>
50
+ </li>
51
+ </ul>
52
  <?php foreach($trackInfo->TrackSummary as $info) { ?>
53
  <div class="fieldset">
54
  <div>
110
  <?php } ?>
111
  <?php } ?>
112
  <br/><br/>
113
+ <?php } else { ?>
114
+ <strong><?php echo $this->__('Tracking number is not associated with any order on our store.'); ?></strong>
115
  <?php } ?>
app/design/frontend/base/default/template/shippingtracking/main.phtml CHANGED
@@ -24,7 +24,7 @@
24
  $_request = Mage::app()->getRequest();
25
  ?>
26
  <p>
27
- <?php echo $this->__('Please enter the order number and phone number (or email address) from your customer agreement for shipping tracking.'); ?>
28
  </p>
29
  <br/>
30
  <form action="<?php echo $this->getUrl('*/*/info') ?>" method="post" autocomplete="off" id="shipping-tracking" class="scaffold-form" enctype="multipart/form-data">
@@ -52,6 +52,11 @@
52
  </div>
53
  <div class="buttons-set">
54
  <?php /* <p class="back-link"><a href="http://dev2.plumserver.com/index.php/customer/account/index/"><small>« </small>Back</a></p> */ ?>
55
- <button type="submit" title="<?php echo $this->__('Track') ?>" class="button"><span><span><?php echo $this->__('Track') ?></span></span></button>
56
  </div>
57
- </form>
 
 
 
 
 
24
  $_request = Mage::app()->getRequest();
25
  ?>
26
  <p>
27
+ <?php echo $this->__('Please enter the required information below to check your order status.'); ?>
28
  </p>
29
  <br/>
30
  <form action="<?php echo $this->getUrl('*/*/info') ?>" method="post" autocomplete="off" id="shipping-tracking" class="scaffold-form" enctype="multipart/form-data">
52
  </div>
53
  <div class="buttons-set">
54
  <?php /* <p class="back-link"><a href="http://dev2.plumserver.com/index.php/customer/account/index/"><small>« </small>Back</a></p> */ ?>
55
+ <button type="submit" title="<?php echo $this->__('Track') ?>" class="button"><span><span><?php echo $this->__('Track Order') ?></span></span></button>
56
  </div>
57
+ </form>
58
+ <script type="text/javascript">
59
+ //<![CDATA[
60
+ var dataForm = new VarienForm('shipping-tracking', true);
61
+ //]]>
62
+ </script>
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.0</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.1</version>
25
  <name>Plumrocket Order Status &amp; Shipping Tracking</name>
26
  <depends>
27
  <Plumrocket_Base />
app/locale/en_US/Plumrocket_Order_Status_and_Shipping_Tracking.csv CHANGED
@@ -1,13 +1,12 @@
1
  "Order Status &amp; Shipping Tracking", "Order Status &amp; Shipping Tracking"
2
  "Check Order Status","Check Order Status"
3
  "Tracking Information","Tracking Information"
4
- "Make sure that you have entered the Order Number and phone number (or email address).","Make sure that you have entered the Order Number and phone number (or email address)."
5
  "Shipping tracking data not found.","Shipping tracking data not found."
6
- "Data combination is not valid. Please check order number and phone number (or email address).","Data combination is not valid. Please check order number and phone number (or email address)."
7
  "UPS Tracking Number","UPS Tracking Number"
8
  "FedEx Tracking Number","FedEx Tracking Number"
9
  "USPS Tracking Number","USPS Tracking Number"
10
- "'Please enter the order number and phone number (or email address) from your customer agreement for shipping tracking.","'Please enter the order number and phone number (or email address) from your customer agreement for shipping tracking."
11
  "Order Number","Order Number"
12
  "Phone number or email address","Phone number or email address"
13
  "Track","Track"
@@ -15,6 +14,7 @@
15
  "m/d/Y","m/d/Y"
16
  "g:i a","g:i a"
17
  "Tracking information is not available at this time. Please check back later or double-check the tracking number entered and try again.","Tracking information is not available at this time. Please check back later or double-check the tracking number entered and try again."
 
18
  "Location","Location"
19
  "Date","Date"
20
  "Time","Time"
@@ -28,4 +28,6 @@
28
  "Additional Information","Additional Information"
29
  "Shipped/Billed On:","Shipped/Billed On:"
30
  "Type:","Type:"
31
- "Package","Package"
 
 
1
  "Order Status &amp; Shipping Tracking", "Order Status &amp; Shipping Tracking"
2
  "Check Order Status","Check Order Status"
3
  "Tracking Information","Tracking Information"
4
+ "Make sure that you have entered the Order Number and phone number (or email address) correctly.","Make sure that you have entered the Order Number and phone number (or email address) correctly."
5
  "Shipping tracking data not found.","Shipping tracking data not found."
 
6
  "UPS Tracking Number","UPS Tracking Number"
7
  "FedEx Tracking Number","FedEx Tracking Number"
8
  "USPS Tracking Number","USPS Tracking Number"
9
+ "Please enter the required information below to check your order status.","Please enter the required information below to check your order status."
10
  "Order Number","Order Number"
11
  "Phone number or email address","Phone number or email address"
12
  "Track","Track"
14
  "m/d/Y","m/d/Y"
15
  "g:i a","g:i a"
16
  "Tracking information is not available at this time. Please check back later or double-check the tracking number entered and try again.","Tracking information is not available at this time. Please check back later or double-check the tracking number entered and try again."
17
+ "Tracking number is not associated with any order at our store.","Tracking number is not associated with any order at our store."
18
  "Location","Location"
19
  "Date","Date"
20
  "Time","Time"
28
  "Additional Information","Additional Information"
29
  "Shipped/Billed On:","Shipped/Billed On:"
30
  "Type:","Type:"
31
+ "Package","Package"
32
+ "Postal Services", "Postal Services"
33
+ "Enter Tracking numbe","Enter Tracking numbe"
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Plumrocket_Order_Status_and_Shipping_Tracking</name>
4
- <version>1.0.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://wiki.plumrocket.net/wiki/EULA">End-user License Agreement</license>
7
  <channel>community</channel>
@@ -14,9 +14,9 @@ Admin can enter UPS, USPS and FedEx tracking codes while marking magento order a
14
  &#xD;
15
  100% open source magento extension</notes>
16
  <authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
17
- <date>2014-07-31</date>
18
- <time>13:10:39</time>
19
- <contents><target name="magecommunity"><dir name="Plumrocket"><dir name="ShippingTracking"><dir name="Block"><file name="Abstract.php" hash="1635152e554caa918fbb0144b6f9d225"/><file name="Fedex.php" hash="615c00bc91d477b3950c55ef678c544e"/><dir name="Shipping"><dir name="Tracking"><file name="Popup.php" hash="dbff310a33bbfcaf383bb07949214d82"/></dir></dir><dir name="System"><dir name="Config"><file name="Version.php" hash="e037e71e13a61e69c96be25d71350fc3"/></dir></dir><file name="Ups.php" hash="38fa1ddca61ec5cf312a8cd8379ced60"/><file name="Usps.php" hash="773c04c5a1e4de604bede10af8a301df"/></dir><dir name="Helper"><file name="Data.php" hash="4026cc0c2ad4f655891e38d277bd8b32"/></dir><dir name="controllers"><file name="IndexController.php" hash="279da8ee00305e8431ca81d481660541"/></dir><dir name="etc"><file name="config.xml" hash="e870bd2f6d2509809670f5284c832830"/><file name="system.xml" hash="da479bacb64778d27b8cdd739f28d281"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Plumrocket_ShippingTracking.xml" hash="32975534b8d336b9111b47c21f5b5f16"/></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="f7fb679136fba5e550aed2ac1a305885"/><file name="form.phtml" hash="24388d5d83b6e7ef7bc4091649e82c9b"/><file name="ups.phtml" hash="ff73e84256d5ead0f5b86d9521d85e58"/><file name="usps.phtml" hash="ba96649891b943fc2951fbbf591f298c"/></dir><file name="info.phtml" hash="59cec0c15c782f708c33f46277928303"/><file name="main.phtml" hash="bf30f2e3895d9e527532195bd746dd76"/><file name="popup.phtml" hash="93fc32134a7697e21fd9ebff4438ffa4"/></dir></dir><dir name="layout"><file name="shippingtracking.xml" hash="98a7dffa36cab9d54f3bc03754db3410"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Plumrocket_Order_Status_and_Shipping_Tracking.csv" hash="efd95c78ef4738816ba08e2ced311493"/></dir></target></contents>
20
  <compatible/>
21
  <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>
22
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Plumrocket_Order_Status_and_Shipping_Tracking</name>
4
+ <version>1.0.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://wiki.plumrocket.net/wiki/EULA">End-user License Agreement</license>
7
  <channel>community</channel>
14
  &#xD;
15
  100% open source magento extension</notes>
16
  <authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
17
+ <date>2014-08-08</date>
18
+ <time>12:04:29</time>
19
+ <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="fc6af78ad9bde4069c43546d213467d4"/></dir><dir name="etc"><file name="config.xml" hash="a88f730d9ec55ec48eb24d34a91d3587"/><file name="system.xml" hash="da479bacb64778d27b8cdd739f28d281"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Plumrocket_ShippingTracking.xml" hash="8fe9ebe10aa377362f0e359b0ee51250"/></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>
20
  <compatible/>
21
  <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>
22
  </package>