Version Notes
Tracking page remade:
- track all order shipments on one page
- client can request other order info with form
Download this release
Release Info
Developer | Packpin Packpin |
Extension | Packpin_Pptrack |
Version | 1.5.0 |
Comparing to | |
See all releases |
Code changes from version 1.4.2 to 1.5.0
- app/code/community/Packpin/Pptrack/Block/Index.php +95 -2
- app/code/community/Packpin/Pptrack/Model/Track.php +8 -1
- app/code/community/Packpin/Pptrack/controllers/IndexController.php +0 -9
- app/code/community/Packpin/Pptrack/etc/config.xml +1 -1
- app/design/frontend/base/default/layout/pptrack.xml +1 -1
- app/design/frontend/base/default/template/pptrack/index.phtml +7 -0
- app/design/frontend/base/default/template/pptrack/index_new.phtml +195 -0
- app/etc/modules/Packpin_Pptrack.xml +1 -1
- package.xml +7 -5
- skin/frontend/base/default/css/pptrack.css +48 -0
app/code/community/Packpin/Pptrack/Block/Index.php
CHANGED
@@ -1,5 +1,98 @@
|
|
1 |
-
<?php
|
2 |
-
class Packpin_Pptrack_Block_Index extends Mage_Core_Block_Template{
|
3 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
4 |
|
5 |
}
|
1 |
+
<?php
|
|
|
2 |
|
3 |
+
class Packpin_Pptrack_Block_Index extends Mage_Core_Block_Template
|
4 |
+
{
|
5 |
+
public $newTemplate = false;
|
6 |
+
|
7 |
+
public $email = null;
|
8 |
+
public $orderNumber = null;
|
9 |
+
public $msg = null;
|
10 |
+
|
11 |
+
// public $model = null;
|
12 |
+
public $trackModels = array();
|
13 |
+
|
14 |
+
|
15 |
+
protected function _construct()
|
16 |
+
{
|
17 |
+
parent::_construct();
|
18 |
+
|
19 |
+
$model = Mage::getModel('pptrack/track');
|
20 |
+
|
21 |
+
$hash = Mage::app()->getRequest()->getParam('h');
|
22 |
+
$adminHash = Mage::app()->getRequest()->getParam('hash');
|
23 |
+
if ($hash) {
|
24 |
+
$model->loadInfoByHash($hash);
|
25 |
+
$this->model = $model;
|
26 |
+
}
|
27 |
+
elseif ($adminHash) {
|
28 |
+
|
29 |
+
}
|
30 |
+
else {
|
31 |
+
$this->newTemplate = true;
|
32 |
+
|
33 |
+
$this->email = Mage::app()->getRequest()->getParam('email');
|
34 |
+
$this->orderNumber = Mage::app()->getRequest()->getParam('order');
|
35 |
+
//get track models
|
36 |
+
if ($this->email && $this->orderNumber) {
|
37 |
+
$order = Mage::getModel('sales/order')->loadByIncrementId($this->orderNumber);
|
38 |
+
if (!$order) {
|
39 |
+
$this->msg = Mage::helper('pptrack')->__('Order not found');
|
40 |
+
}
|
41 |
+
elseif ($order->customer_email != $this->email) {
|
42 |
+
$this->msg = Mage::helper('pptrack')->__('Incorrect email');
|
43 |
+
}
|
44 |
+
else {
|
45 |
+
$shipments = $order->getShipmentsCollection();
|
46 |
+
if ($shipments && $shipments->count()) {
|
47 |
+
foreach ($shipments as $shipment) {
|
48 |
+
$tracks = $shipment->getAllTracks();
|
49 |
+
if (!$tracks)
|
50 |
+
continue;
|
51 |
+
foreach ($tracks as $track) {
|
52 |
+
$collection = Mage::getModel('pptrack/track')
|
53 |
+
->getCollection()
|
54 |
+
->addFieldToFilter('shipment_id', array('eq' => $track->getId()));
|
55 |
+
$trackModel = $collection->getFirstItem();
|
56 |
+
|
57 |
+
if (!$trackModel->getId()) {
|
58 |
+
try {
|
59 |
+
$carrierTitle = $track->title ? trim($track->title) : null;
|
60 |
+
$carrierCode = Mage::getModel('pptrack/carrier')
|
61 |
+
->detectCarrier($track->carrier_code, $carrierTitle);
|
62 |
+
|
63 |
+
$trackingCode = $track->track_number ? trim($track->track_number) : trim($track->number);
|
64 |
+
$addressData = $order->getShippingAddress()->getData();
|
65 |
+
|
66 |
+
$trackModel->setOrderId($order->getId());
|
67 |
+
$trackModel->setShipmentId($track->getId());
|
68 |
+
$trackModel->setCode($trackingCode);
|
69 |
+
$trackModel->setCarrierCode($carrierCode);
|
70 |
+
$trackModel->setCarrierName($carrierTitle);
|
71 |
+
$trackModel->setEmail($order->customer_email);
|
72 |
+
|
73 |
+
//tracking attributes
|
74 |
+
$trackModel->setPostalCode($addressData['postcode']);
|
75 |
+
$trackModel->setDestinationCountry($addressData['country_id']);
|
76 |
+
|
77 |
+
$trackModel->setStatus(Packpin_Pptrack_Model_Track::STATUS_PENDING);
|
78 |
+
$trackModel->save();
|
79 |
+
$trackModel->updateApi();
|
80 |
+
}
|
81 |
+
catch (Exception $e) {
|
82 |
+
continue;
|
83 |
+
}
|
84 |
+
}
|
85 |
+
$trackModel->updateApiData();
|
86 |
+
|
87 |
+
$this->trackModels[] = $trackModel;
|
88 |
+
}
|
89 |
+
}
|
90 |
+
}
|
91 |
+
}
|
92 |
+
|
93 |
+
}
|
94 |
+
}
|
95 |
+
|
96 |
+
}
|
97 |
|
98 |
}
|
app/code/community/Packpin/Pptrack/Model/Track.php
CHANGED
@@ -168,6 +168,11 @@ class Packpin_Pptrack_Model_Track extends Mage_Core_Model_Abstract
|
|
168 |
}
|
169 |
}
|
170 |
|
|
|
|
|
|
|
|
|
|
|
171 |
/**
|
172 |
* Update Track info
|
173 |
*
|
@@ -292,7 +297,9 @@ class Packpin_Pptrack_Model_Track extends Mage_Core_Model_Abstract
|
|
292 |
*/
|
293 |
public function getDetailsUrl()
|
294 |
{
|
295 |
-
$
|
|
|
|
|
296 |
|
297 |
return $url;
|
298 |
}
|
168 |
}
|
169 |
}
|
170 |
|
171 |
+
public function updateApiData()
|
172 |
+
{
|
173 |
+
$this->_fetchData();
|
174 |
+
}
|
175 |
+
|
176 |
/**
|
177 |
* Update Track info
|
178 |
*
|
297 |
*/
|
298 |
public function getDetailsUrl()
|
299 |
{
|
300 |
+
$order = Mage::getModel('sales/order')->load($this->order_id);
|
301 |
+
|
302 |
+
$url = Mage::getUrl('pptrack') . '?email=' . $order->customer_email . '&order=' . $order->getIncrementId();
|
303 |
|
304 |
return $url;
|
305 |
}
|
app/code/community/Packpin/Pptrack/controllers/IndexController.php
CHANGED
@@ -4,15 +4,6 @@ class Packpin_Pptrack_IndexController extends Mage_Core_Controller_Front_Action
|
|
4 |
{
|
5 |
public function indexAction()
|
6 |
{
|
7 |
-
$model = Mage::getModel('pptrack/track');
|
8 |
-
|
9 |
-
$hash = Mage::app()->getRequest()->getParam('h');
|
10 |
-
if ($hash) {
|
11 |
-
$model->loadInfoByHash($hash);
|
12 |
-
}
|
13 |
-
|
14 |
-
Mage::register('model', $model);
|
15 |
-
|
16 |
$this->loadLayout();
|
17 |
$this->getLayout()->getBlock("head")->setTitle(Mage::helper('pptrack')->__("Shipment status"));
|
18 |
$breadcrumbs = $this->getLayout()->getBlock("breadcrumbs");
|
4 |
{
|
5 |
public function indexAction()
|
6 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
7 |
$this->loadLayout();
|
8 |
$this->getLayout()->getBlock("head")->setTitle(Mage::helper('pptrack')->__("Shipment status"));
|
9 |
$breadcrumbs = $this->getLayout()->getBlock("breadcrumbs");
|
app/code/community/Packpin/Pptrack/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Packpin_Pptrack>
|
5 |
-
<version>1.
|
6 |
</Packpin_Pptrack>
|
7 |
</modules>
|
8 |
<frontend>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Packpin_Pptrack>
|
5 |
+
<version>1.5.0</version>
|
6 |
</Packpin_Pptrack>
|
7 |
</modules>
|
8 |
<frontend>
|
app/design/frontend/base/default/layout/pptrack.xml
CHANGED
@@ -1,5 +1,5 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
-
<layout version="1.
|
3 |
<pptrack_index_index>
|
4 |
<reference name="root">
|
5 |
<action method="setTemplate">
|
1 |
<?xml version="1.0"?>
|
2 |
+
<layout version="1.5.0">
|
3 |
<pptrack_index_index>
|
4 |
<reference name="root">
|
5 |
<action method="setTemplate">
|
app/design/frontend/base/default/template/pptrack/index.phtml
CHANGED
@@ -1,4 +1,11 @@
|
|
1 |
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2 |
if ($this->model)
|
3 |
$model = $this->model;
|
4 |
else
|
1 |
<?php
|
2 |
+
if ($this->newTemplate) {
|
3 |
+
echo $this->setTemplate('pptrack/index_new.phtml')->toHtml();
|
4 |
+
|
5 |
+
return false;
|
6 |
+
}
|
7 |
+
|
8 |
+
|
9 |
if ($this->model)
|
10 |
$model = $this->model;
|
11 |
else
|
app/design/frontend/base/default/template/pptrack/index_new.phtml
ADDED
@@ -0,0 +1,195 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
$_helper = $this->helper('catalog/output');
|
3 |
+
?>
|
4 |
+
|
5 |
+
<?php
|
6 |
+
if (Mage::getStoreConfig('pp_section_setttings/crosssell/cross_sell_page')) {
|
7 |
+
if (in_array(Mage::getStoreConfig('pp_section_setttings/crosssell/cross_sell_page_type'), array('script'))) {
|
8 |
+
$child = $this->getChild("pptrack_script");
|
9 |
+
if ($child) {
|
10 |
+
echo $this->getChildHtml('pptrack_script');
|
11 |
+
}
|
12 |
+
}
|
13 |
+
if (in_array(Mage::getStoreConfig('pp_section_setttings/crosssell/cross_sell_page_type'), array('ads', 'both'))) {
|
14 |
+
$child = $this->getChild("pptrack_ads");
|
15 |
+
if ($child) {
|
16 |
+
echo $this->getChildHtml('pptrack_ads');
|
17 |
+
}
|
18 |
+
}
|
19 |
+
if (in_array(Mage::getStoreConfig('pp_section_setttings/crosssell/cross_sell_page_type'), array('products', 'both'))) {
|
20 |
+
$child = $this->getChild("pptrack_crosssell");
|
21 |
+
if ($child) {
|
22 |
+
$child->setData("orderId", $model->getOrderId());
|
23 |
+
echo $this->getChildHtml('pptrack_crosssell');
|
24 |
+
}
|
25 |
+
}
|
26 |
+
}
|
27 |
+
?>
|
28 |
+
|
29 |
+
<div class="clearfix"></div>
|
30 |
+
<h2><?php echo Mage::helper('pptrack')->__('Track your order'); ?></h2>
|
31 |
+
<div class="clearfix"></div>
|
32 |
+
<form method="get" action="">
|
33 |
+
<div class="pptrack-row">
|
34 |
+
<div class="pptrack-form-controls">
|
35 |
+
<label class="pptrack-label" for="pp_email"><?php echo Mage::helper('pptrack')->__('Your email'); ?></label>
|
36 |
+
<input value="<?php echo $this->email ?>" id="pp_email" class="pptrack-input" name="email" type="text" required>
|
37 |
+
</div>
|
38 |
+
<div class="pptrack-form-controls">
|
39 |
+
<label class="pptrack-label" for="pp_order"><?php echo Mage::helper('pptrack')->__('Order number'); ?></label>
|
40 |
+
<input value="<?php echo $this->orderNumber ?>" id="pp_order" class="pptrack-input" name="order"
|
41 |
+
type="text" required>
|
42 |
+
</div>
|
43 |
+
</div>
|
44 |
+
<button class="btn button pptrack-btn" type="submit"><?php echo Mage::helper('pptrack')->__('Submit'); ?></button>
|
45 |
+
</form>
|
46 |
+
<?php if ($this->msg) : ?>
|
47 |
+
<div class="pptrack-info">
|
48 |
+
<?php echo $this->msg ?>
|
49 |
+
</div>
|
50 |
+
<?php endif; ?>
|
51 |
+
|
52 |
+
<?php foreach($this->trackModels as $model) : ?>
|
53 |
+
<?php
|
54 |
+
$shippingInfo = $model->getShippingInfo();
|
55 |
+
?>
|
56 |
+
<br>
|
57 |
+
<div class="clearfix"></div>
|
58 |
+
<?php if (!$model->getStatus()): ?>
|
59 |
+
<br>
|
60 |
+
<br>
|
61 |
+
<h2><?php echo Mage::helper('pptrack')->__('No tracking info!'); ?></h2>
|
62 |
+
<br>
|
63 |
+
<?php else: ?>
|
64 |
+
|
65 |
+
<div class="pptrack-wrapper clearfix">
|
66 |
+
<h2><?php echo count($this->trackModels) == 1 ? Mage::helper('pptrack')->__('Shipment Information') : Mage::helper('pptrack')->__('Package:') . ' ' . strtoupper($model->code); ?></h2>
|
67 |
+
<br/>
|
68 |
+
|
69 |
+
<div id="#<?php echo strtoupper($model->code) ?>" class="pptrack-progress">
|
70 |
+
<div class="pptrack-progress-bar-wrapper">
|
71 |
+
<div class="pptrack-progress-bar-wrapper">
|
72 |
+
<ul class="pptrack-progress-bar <?php if ($model->getStatus() == 'delivered') echo "pptrack-progress-bar-done"; ?>">
|
73 |
+
<li class="<?php echo $model->getStatusClass(Packpin_Pptrack_Model_Track::STATUS_PENDING) ?>">
|
74 |
+
<div
|
75 |
+
class="pptrack-tracking-progress-bar-label"><?php echo Mage::helper('pptrack')->__('Dispatched'); ?></div>
|
76 |
+
<span class="pptrack-progress-bubble"></span>
|
77 |
+
</li>
|
78 |
+
<li class="<?php echo $model->getStatusClass(Packpin_Pptrack_Model_Track::STATUS_IN_TRANSIT) ?>">
|
79 |
+
<div
|
80 |
+
class="pptrack-tracking-progress-bar-label"><?php echo Mage::helper('pptrack')->__('In Transit'); ?></div>
|
81 |
+
<span class="pptrack-progress-bubble"></span>
|
82 |
+
</li>
|
83 |
+
<li class="<?php echo $model->getStatusClass(Packpin_Pptrack_Model_Track::STATUS_OUT_FOR_DELIVERY) ?>">
|
84 |
+
<div
|
85 |
+
class="pptrack-tracking-progress-bar-label"><?php echo Mage::helper('pptrack')->__('Out for delivery'); ?></div>
|
86 |
+
<span class="pptrack-progress-bubble"></span>
|
87 |
+
</li>
|
88 |
+
<li class="<?php echo $model->getStatusClass(Packpin_Pptrack_Model_Track::STATUS_DELIVERED) ?>">
|
89 |
+
<div class="pptrack-tracking-progress-bar-label"><?php echo Mage::helper('pptrack')->__('Delivered'); ?></div>
|
90 |
+
<span class="pptrack-progress-bubble"></span>
|
91 |
+
</li>
|
92 |
+
</ul>
|
93 |
+
</div>
|
94 |
+
</div>
|
95 |
+
</div>
|
96 |
+
<br/>
|
97 |
+
<br/>
|
98 |
+
|
99 |
+
<div class="pptrack-tracking-info">
|
100 |
+
<h2><?php echo Mage::helper('pptrack')->__('Tracking Info'); ?></h2>
|
101 |
+
|
102 |
+
<div class="pptrack-tracking-info-details">
|
103 |
+
<?php $details = $model->getDetails(); ?>
|
104 |
+
<?php if (!$details) : ?>
|
105 |
+
<div class="pptrack-info-row">
|
106 |
+
<div class="pptrack-info-row-date"><?php echo date("Y-m-d", $model->created_at) ?>
|
107 |
+
<br/><?php echo date("H:i:s", $model->created_at) ?></div>
|
108 |
+
<div class="pptrack-info-row-details-wrapper">
|
109 |
+
<div class="pptrack-info-row-details">
|
110 |
+
<?php if ($model->status == Packpin_Pptrack_Model_Track::STATUS_PENDING) : ?>
|
111 |
+
<?php echo Mage::helper('pptrack')->__("Package status pending"); ?>
|
112 |
+
<?php else : ?>
|
113 |
+
<?php echo Mage::helper('pptrack')->__("Package prepared for dispatch"); ?>
|
114 |
+
<?php endif; ?>
|
115 |
+
</div>
|
116 |
+
</div>
|
117 |
+
<div style="clear:both;display:table;"></div>
|
118 |
+
</div>
|
119 |
+
<?php else : ?>
|
120 |
+
<?php foreach ($details as $detail): ?>
|
121 |
+
<div class="pptrack-info-row">
|
122 |
+
<div>
|
123 |
+
<div class="pptrack-info-row-date"><?php echo $detail->getEventDate(); ?>
|
124 |
+
<br/><?php echo $detail->getEventTime(); ?></div>
|
125 |
+
<div class="pptrack-info-row-details-wrapper">
|
126 |
+
<div class="pptrack-info-row-details">
|
127 |
+
<?php echo Mage::helper('pptrack')->__($detail->getStatusString()); ?>
|
128 |
+
<div
|
129 |
+
class="pptrack-info-row-details-location"><?php echo $detail->getLocation() ?></div>
|
130 |
+
</div>
|
131 |
+
</div>
|
132 |
+
<div style="clear:both;display:table;"></div>
|
133 |
+
</div>
|
134 |
+
</div>
|
135 |
+
<?php endforeach; ?>
|
136 |
+
<?php endif; ?>
|
137 |
+
</div>
|
138 |
+
</div>
|
139 |
+
<div class="pptrack-tracking-general-info">
|
140 |
+
<h2>Info</h2>
|
141 |
+
|
142 |
+
<div class="pptrack-tracking-general-info-details">
|
143 |
+
<div class="pptrack-tracking-row">
|
144 |
+
<span class="pptrack-tracking-general-info-label"><?php echo Mage::helper('pptrack')->__('Order number'); ?></span>
|
145 |
+
<span class="pptrack-tracking-general-info-value"><?php echo $model->getOrderNumber(); ?></span>
|
146 |
+
<br style="clear: both;"/>
|
147 |
+
</div>
|
148 |
+
<div class="pptrack-tracking-row">
|
149 |
+
<span class="pptrack-tracking-general-info-label"><?php echo Mage::helper('pptrack')->__('Tracking code'); ?></span>
|
150 |
+
<span class="pptrack-tracking-general-info-value"><?php echo $model->getCode(); ?></span>
|
151 |
+
<br style="clear: both;"/>
|
152 |
+
</div>
|
153 |
+
<div class="pptrack-tracking-row">
|
154 |
+
<span class="pptrack-tracking-general-info-label"><?php echo Mage::helper('pptrack')->__('Shipped on'); ?></span>
|
155 |
+
<span class="pptrack-tracking-general-info-value"><?php echo $model->getShippingDate(); ?></span>
|
156 |
+
<br style="clear: both;"/>
|
157 |
+
</div>
|
158 |
+
<div class="pptrack-tracking-row">
|
159 |
+
<span class="pptrack-tracking-general-info-label"><?php echo Mage::helper('pptrack')->__('Ships to'); ?></span>
|
160 |
+
<span
|
161 |
+
class="pptrack-tracking-general-info-value"><?php echo $shippingInfo['firstname'] . ' ' . $shippingInfo['lastname']; ?>
|
162 |
+
<br/><?php echo $shippingInfo['street'] . ', ' . $shippingInfo['city']; ?>
|
163 |
+
<br/><?php echo $shippingInfo['region'] ? $shippingInfo['region'] . '<br />' : ''; ?><?php echo $shippingInfo['postcode']; ?> <?php echo Mage::app()->getLocale()->getCountryTranslation($shippingInfo['country_id']); ?></span>
|
164 |
+
<br style="clear: both;"/>
|
165 |
+
</div>
|
166 |
+
|
167 |
+
<br/>
|
168 |
+
|
169 |
+
<div class="pptrack-tracking-carrier-info-wrapper">
|
170 |
+
<span><?php echo Mage::helper('pptrack')->__('For questions regarding your shipment contact carrier directly'); ?></span><br/>
|
171 |
+
<br/>
|
172 |
+
|
173 |
+
<div class="pptrack-tracking-courier-logo">
|
174 |
+
<img src="<?php echo $model->getCarrierIcon() ?>"/>
|
175 |
+
</div>
|
176 |
+
<div class="pptrack-tracking-courier-info">
|
177 |
+
<h3><?php echo $model->getCarrierName() ?></h3>
|
178 |
+
<?php
|
179 |
+
$phone = $model->getCarrierPhone();
|
180 |
+
$homepage = $model->getCarrierHomepage();
|
181 |
+
?>
|
182 |
+
<?php if ($phone) : ?>
|
183 |
+
<span><?php echo $phone ?></span><br/>
|
184 |
+
<?php endif; ?>
|
185 |
+
<?php if ($homepage) : ?>
|
186 |
+
<a href="<?php echo $homepage ?>"><?php echo $homepage ?></a>
|
187 |
+
<?php endif; ?>
|
188 |
+
</div>
|
189 |
+
<div style="clear:both;"></div>
|
190 |
+
</div>
|
191 |
+
</div>
|
192 |
+
</div>
|
193 |
+
</div>
|
194 |
+
<?php endif; ?>
|
195 |
+
<?php endforeach; ?>
|
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.
|
8 |
</Packpin_Pptrack>
|
9 |
</modules>
|
10 |
</config>
|
4 |
<Packpin_Pptrack>
|
5 |
<active>true</active>
|
6 |
<codePool>community</codePool>
|
7 |
+
<version>1.5.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.
|
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,13 @@ Packpin created shipment tracking and cross selling solution within email notifi
|
|
18 |
- Shipment tracking button on shipment notification email.
|
19 |
- Tracking button in customer order.
|
20 |
- Easy 10 minutes installation.</description>
|
21 |
-
<notes>
|
|
|
|
|
22 |
<authors><author><name>Packpin Packpin</name><user>packpin</user><email>info@packpin.com</email></author></authors>
|
23 |
-
<date>2015-
|
24 |
-
<time>
|
25 |
-
<contents><target name="magecommunity"><dir name="Packpin"><dir name="Pptrack"><dir name="Block"><dir name="Adminhtml"><file name="Dashboard.php" hash="2bb42734856a0dae87be8e8105d2f62c"/><dir name="Sales"><dir name="Order"><dir name="Shipment"><dir name="Create"><file name="Tracking.php" hash="1b38e83ca0aee989764fe3a7d0cf1bac"/></dir><dir name="View"><file name="Tracking.php" hash="401f134f83a17d7d6cf9f0d8ede13ec8"/></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint-owner.php" hash="3f3029efceb1d0e1c8f37f08aa21a371"/><file name="Hint.php" hash="c961a7b4cd0ce5d7b8024a2996262028"/><file name="Scripts.php" hash="79d629b135d51296ee0ba3e3a805ba5f"/></dir><dir name="Form"><dir name="Fieldset"><file name="Carrier.php" hash="8dcd2c2fbfbd6eb5938f06e537c939e3"/></dir></dir></dir></dir><dir name="Tracks"><dir name="Edit"><file name="Form.php" hash="556852017b6608fef3997cea97c069df"/></dir><file name="Edit.php" hash="b623cd711954618b9cc6d26af85791b3"/><file name="Grid.php" hash="663ffc50c29fa8cc8ca34bfbb10928da"/></dir><file name="Tracks.php" hash="b0f5a7507dfb3e1425ca9a85d262cf5f"/></dir><file name="Ads.php" hash="aa56b07b8771fb94b9bd11a95aa4e872"/><file name="Crosssell.php" hash="1964eb986f699a500cd445cceed78c1c"/><file name="Index.php" hash="
|
26 |
<compatible/>
|
27 |
<dependencies><required><php><min>5.2.13</min><max>5.7.0</max></php></required></dependencies>
|
28 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Packpin_Pptrack</name>
|
4 |
+
<version>1.5.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.
|
19 |
- Tracking button in customer order.
|
20 |
- Easy 10 minutes installation.</description>
|
21 |
+
<notes>Tracking page remade:
|
22 |
+
- track all order shipments on one page
|
23 |
+
- client can request other order info with form</notes>
|
24 |
<authors><author><name>Packpin Packpin</name><user>packpin</user><email>info@packpin.com</email></author></authors>
|
25 |
+
<date>2015-10-05</date>
|
26 |
+
<time>09:31:59</time>
|
27 |
+
<contents><target name="magecommunity"><dir name="Packpin"><dir name="Pptrack"><dir name="Block"><dir name="Adminhtml"><file name="Dashboard.php" hash="2bb42734856a0dae87be8e8105d2f62c"/><dir name="Sales"><dir name="Order"><dir name="Shipment"><dir name="Create"><file name="Tracking.php" hash="1b38e83ca0aee989764fe3a7d0cf1bac"/></dir><dir name="View"><file name="Tracking.php" hash="401f134f83a17d7d6cf9f0d8ede13ec8"/></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint-owner.php" hash="3f3029efceb1d0e1c8f37f08aa21a371"/><file name="Hint.php" hash="c961a7b4cd0ce5d7b8024a2996262028"/><file name="Scripts.php" hash="79d629b135d51296ee0ba3e3a805ba5f"/></dir><dir name="Form"><dir name="Fieldset"><file name="Carrier.php" hash="8dcd2c2fbfbd6eb5938f06e537c939e3"/></dir></dir></dir></dir><dir name="Tracks"><dir name="Edit"><file name="Form.php" hash="556852017b6608fef3997cea97c069df"/></dir><file name="Edit.php" hash="b623cd711954618b9cc6d26af85791b3"/><file name="Grid.php" hash="663ffc50c29fa8cc8ca34bfbb10928da"/></dir><file name="Tracks.php" hash="b0f5a7507dfb3e1425ca9a85d262cf5f"/></dir><file name="Ads.php" hash="aa56b07b8771fb94b9bd11a95aa4e872"/><file name="Crosssell.php" hash="1964eb986f699a500cd445cceed78c1c"/><file name="Index.php" hash="51ffb98f367944f2cfb81afcfb529bd3"/><file name="Script.php" hash="f7f9d2f660f958e4e4448f88c860d91c"/><file name="Trackings.php" hash="3313a04f6ee29e1a93a940ba52d5af6b"/></dir><dir name="Helper"><file name="Data.php" hash="e5baef3fad12750718bbb4e8171bfca5"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Crossviews.php" hash="2f353f1eca123be3d5d6628cd6fec9bc"/><file name="Crossviewspage.php" hash="c28db6e0df790fd0f0cd521d31340618"/></dir></dir></dir></dir><file name="Api.php" hash="88d205736602d9f9cf839d3cf487be5c"/><file name="Carrier.php" hash="f225aa0fe6e7c2761131b15b7c803c03"/><file name="EnableNotifications.php" hash="989324234904a700f3bd0c529d35789e"/><file name="Observer.php" hash="37505428605032a5336af84f6b282ce1"/><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 name="Visit"><file name="Collection.php" hash="69c7a74f615ca0a833ea8e9d31c95ae1"/></dir><file name="Visit.php" hash="db8e9038a1b941a8ef403715d99327e0"/></dir><file name="Setting.php" hash="1f7b781d526211dcb29c78cb498033a2"/><file name="Track.php" hash="e1395d494eb10a15ccd741a27ecf6822"/><file name="Trackdetail.php" hash="5a30f656c2e02258722edb5763d69f9b"/><file name="Trackunsubscribed.php" hash="47770b68d49a554c7e18250578ecddfc"/><file name="Translate.php" hash="dd80869c7e8dec6c0c3260db5cff3ccd"/><file name="Visit.php" hash="260383440fcde030413a650cf44010c6"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="PackpintracksController.php" hash="858bc6389e9e255e0a1dcc40b711601b"/><file name="PpnotificationsController.php" hash="3f7422b0c1a272ad9a8948b8ee076054"/></dir><file name="IndexController.php" hash="c471a3fd5738a09100f3e80c04066871"/><file name="UnsubscribeController.php" hash="76fb169f4e2dd8c23504899276ae9152"/></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="d940f0fddfc4410080890cf7072c1284"/><file name="api.xml" hash="5986c3cfd16372143cf2d4d0d3252f38"/><file name="config.xml" hash="34da33f32a8b4c497b10efecab53220b"/><file name="system.xml" hash="a65b05e6517bef6be0c9ee556d0a2e82"/></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"/><file name="mysql4-upgrade-0.1.5-1.3.0.php" hash="c149678902df0b2df795b5eddc0cf696"/></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="afc73c29e80a3b9f39552e4f2b9c9b36"/></dir><dir name="template"><dir name="pptrack"><file name="ads.phtml" hash="c96197f43506ae6b5cd88c832fa88d1a"/><file name="ads_email.phtml" hash="962207b6baf56c12716b4727e6849444"/><file name="crosssell.phtml" hash="8ab02a9bda48c988dba66e633cb65c76"/><file name="crosssell_email.phtml" hash="84a09283849c332a9a65c60f2a69c6e8"/><dir name="email"><dir name="order"><dir name="shipment"><file name="track.phtml" hash="8b072e5dc5ec2007b344641b805e4a76"/></dir></dir></dir><file name="index.phtml" hash="484383b5ac261e5b8b86ed183fac4f8a"/><file name="index_new.phtml" hash="0f5093e98bc9796ca117bbe4c4179bb3"/><file name="popup.phtml" hash="f8692aeedd28f2b13c92f626b2f6c6ad"/><file name="script.phtml" hash="213e0fc610eb4d66f3ec67cfa82a63a4"/><file name="unsubscribe.phtml" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="pptrack.xml" hash="8e9588311bebd12448389b8af68f20fc"/></dir><dir name="template"><dir name="pptrack"><dir name="dashboard"><file name="index.phtml" hash="950540d4e17ee56be117b665585fc7a1"/><file name="packpin.phtml" hash="5471f95ed5f17669265762c7814b7dde"/></dir><dir name="system"><dir name="config"><dir name="fieldset"><file name="hint.phtml" hash="cb1396e7c7f78da4b3d4fe993c37da49"/><file name="scripts.phtml" hash="f83f4bcfddf754e16107b41cf447c493"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Packpin_Pptrack.xml" hash="31b8cb91f6650e26539d2ebd0a8ec7fe"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="pptrack.css" hash="586f98f4c51e853b882c63b665cb7fb5"/></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="dashboard.css" hash="b6b60f1fca6cafc98cf4483c3299ab4d"/><file name="pptrack.css" hash="b4c42edf3884eb62617f2347f1740b3f"/></dir><dir name="images"><file name="pp_logo1.png" hash="1a79f10d0f028271ac0b2646243e39d1"/></dir><dir name="js"><file name="dashboard.js" hash="1a4bd65a41a4c5d4d7ba6d4f94fe4955"/><file name="pptrack.js" hash="7bc0ee636b3b83484fc3b9348863bd22"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><dir name="template"><dir name="email"><dir name="packpin"><file name="packpin_delivered_email.html" hash="11d00272d82b3607068429ea494f08f3"/><file name="packpin_exception_email.html" hash="483af61fd9c1fbbca098d1bfcee0ad75"/><file name="packpin_failed_attempt_email.html" hash="483af61fd9c1fbbca098d1bfcee0ad75"/><file name="packpin_in_transit_email.html" hash="483af61fd9c1fbbca098d1bfcee0ad75"/><file name="packpin_info_received_email.html" hash="483af61fd9c1fbbca098d1bfcee0ad75"/><file name="packpin_out_for_delivery_email.html" hash="483af61fd9c1fbbca098d1bfcee0ad75"/></dir></dir></dir><file name="Packpin_Pptrack.csv" hash="582366fe3cf0fc6e79bdf1a09d6922ab"/></dir><dir name="es_ES"><file name="Packpin_Pptrack.csv" hash="b181ac70f3ac3d59a07b3c31ff3c34fe"/></dir><dir name="de_DE"><file name="Packpin_Pptrack.csv" hash="25ca5c6bb882bb2b9f3bfc5342fa76d1"/></dir><dir name="nl_NL"><file name="Packpin_Pptrack.csv" hash="df991ddd35ed4835a29b37b457bf3981"/></dir><dir name="pt_PT"><file name="Packpin_Pptrack.csv" hash="e3c8561588c07affcb0d509940301685"/></dir></target></contents>
|
28 |
<compatible/>
|
29 |
<dependencies><required><php><min>5.2.13</min><max>5.7.0</max></php></required></dependencies>
|
30 |
</package>
|
skin/frontend/base/default/css/pptrack.css
CHANGED
@@ -5,6 +5,7 @@
|
|
5 |
.pptrack-wrapper {
|
6 |
-webkit-font-smoothing: antialiased;
|
7 |
color: #676669;
|
|
|
8 |
}
|
9 |
.pptrack-wrapper h3 {
|
10 |
color: #676669;
|
@@ -376,4 +377,51 @@ ul.pptrack-products-grid > li img {
|
|
376 |
}
|
377 |
@media (max-width: 480px) {
|
378 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
379 |
}
|
5 |
.pptrack-wrapper {
|
6 |
-webkit-font-smoothing: antialiased;
|
7 |
color: #676669;
|
8 |
+
margin-bottom: 20px;
|
9 |
}
|
10 |
.pptrack-wrapper h3 {
|
11 |
color: #676669;
|
377 |
}
|
378 |
@media (max-width: 480px) {
|
379 |
|
380 |
+
}
|
381 |
+
.pptrack-row {
|
382 |
+
margin-right: -15px;
|
383 |
+
margin-left: -15px;
|
384 |
+
}
|
385 |
+
|
386 |
+
.pptrack-row:before,
|
387 |
+
.pptrack-row:after {
|
388 |
+
display: table;
|
389 |
+
content: " ";
|
390 |
+
}
|
391 |
+
|
392 |
+
.pptrack-row:after {
|
393 |
+
clear: both;
|
394 |
+
}
|
395 |
+
|
396 |
+
.pptrack-form-controls {
|
397 |
+
position: relative;
|
398 |
+
min-height: 1px;
|
399 |
+
padding-right: 15px;
|
400 |
+
padding-left: 15px;
|
401 |
+
margin-bottom: 15px;
|
402 |
+
}
|
403 |
+
|
404 |
+
@media (min-width: 768px) {
|
405 |
+
.pptrack-form-controls {
|
406 |
+
float: left;
|
407 |
+
width: 50%;
|
408 |
+
}
|
409 |
+
}
|
410 |
+
|
411 |
+
.pptrack-label {
|
412 |
+
display: block;
|
413 |
+
}
|
414 |
+
.pptrack-input {
|
415 |
+
display: block;
|
416 |
+
width: 100% !important;
|
417 |
+
}
|
418 |
+
|
419 |
+
.pptrack-info {
|
420 |
+
padding: 15px;
|
421 |
+
margin-top: 20px;
|
422 |
+
margin-bottom: 20px;
|
423 |
+
border-radius: 4px;
|
424 |
+
color: #a94442;
|
425 |
+
background-color: #f2dede;
|
426 |
+
border-color: #ebccd1;
|
427 |
}
|