Version Notes
Escoin_Ordermanage ver 0.1.1 stable. added missing files.
Download this release
Release Info
Developer | Tarun Mukherjee |
Extension | escoin_ordermanage |
Version | 0.1.1 |
Comparing to | |
See all releases |
Code changes from version 0.1.0 to 0.1.1
app/design/frontend/base/default/template/escoin_ordermanage/sales/order/history.phtml
ADDED
@@ -0,0 +1,74 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
/**
|
4 |
+
* Escoin_Ordermanage extension
|
5 |
+
*
|
6 |
+
* NOTICE OF LICENSE
|
7 |
+
*
|
8 |
+
* This source file is subject to the MIT License
|
9 |
+
* that is bundled with this package in the file LICENSE.txt.
|
10 |
+
* It is also available through the world-wide-web at this URL:
|
11 |
+
* http://opensource.org/licenses/mit-license.php
|
12 |
+
*
|
13 |
+
* @category Escoin
|
14 |
+
* @package Escoin_Ordermanage
|
15 |
+
* @copyright Copyright (c) 2014
|
16 |
+
* @license http://opensource.org/licenses/mit-license.php MIT License
|
17 |
+
*/
|
18 |
+
|
19 |
+
?>
|
20 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
21 |
+
<?php $_orders = $this->getOrders(); ?>
|
22 |
+
<div class="page-head">
|
23 |
+
<h3><?php echo $this->__('My Orders') ?></h3>
|
24 |
+
</div>
|
25 |
+
<?php echo $this->getPagerHtml(); ?>
|
26 |
+
<?php if($_orders->getSize()): ?>
|
27 |
+
<table cellspacing="0" class="data-table" id="my-orders-table">
|
28 |
+
<thead>
|
29 |
+
<tr>
|
30 |
+
<th><?php echo $this->__('Order #') ?></th>
|
31 |
+
<th><?php echo $this->__('Date') ?></th>
|
32 |
+
<!-- <th><?php echo $this->__('Ship to') ?></th> -->
|
33 |
+
<th><?php echo $this->__('Order Total') ?></th>
|
34 |
+
<th><?php echo $this->__('Order Status') ?></th>
|
35 |
+
<th class="last"> </th>
|
36 |
+
</tr>
|
37 |
+
</thead>
|
38 |
+
<tbody>
|
39 |
+
<?php $_odd = ''; ?>
|
40 |
+
<?php foreach ($_orders as $_order): ?>
|
41 |
+
<tr>
|
42 |
+
<td><?php echo $_order->getRealOrderId() ?></td>
|
43 |
+
<td><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></td>
|
44 |
+
<!-- <td><?php echo $_order->getShippingAddress() ? $this->htmlEscape($_order->getShippingAddress()->getName()) : ' ' ?></td> -->
|
45 |
+
<td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
|
46 |
+
<td><em><?php echo $_order->getStatusLabel() ?></em></td>
|
47 |
+
<td class="a-center"><a href="<?php echo $this->getViewUrl($_order) ?>"><?php echo $this->__('View Order') ?></a>
|
48 |
+
<?php /*<span class="separator">|</span><a href="<?php echo $this->getTrackUrl($_order) ?>"><?php echo $this->__('Track Order') ?></a> */ ?>
|
49 |
+
<?php if ($this->helper('sales/reorder')->canReorder($_order)) : ?>
|
50 |
+
<span class="separator">|</span> <a href="<?php echo $this->getReorderUrl($_order) ?>" style="font-weight: bold; color: #403A3A;"><?php echo $this->__('Reorder') ?></a>
|
51 |
+
<?php endif ?>
|
52 |
+
<?php /* CHANGES STARTS */ ?>
|
53 |
+
<?php if ($_order->canCancel()) { ?>
|
54 |
+
<span class="separator">|</span>
|
55 |
+
<a href="<?php echo $this->getUrl('sales/order/cancel', array('order_id' => $_order->getId())); ?>" class="order-cancel">
|
56 |
+
<?php echo $this->__('Cancel') ?>
|
57 |
+
</a>
|
58 |
+
<?php } else { ?>
|
59 |
+
<!-- Order cancel is not available -->
|
60 |
+
<?php } ?>
|
61 |
+
<?php /* CHANGES ENDS */ ?>
|
62 |
+
</td>
|
63 |
+
</tr>
|
64 |
+
<?php endforeach; ?>
|
65 |
+
</tbody>
|
66 |
+
</table>
|
67 |
+
<script type="text/javascript">decorateTable('my-orders-table')</script>
|
68 |
+
<?php echo $this->getPagerHtml(); ?>
|
69 |
+
<?php else: ?>
|
70 |
+
<p><?php echo $this->__('You have placed no orders.'); ?></p>
|
71 |
+
<?php endif ?>
|
72 |
+
|
73 |
+
|
74 |
+
|
app/design/frontend/base/default/template/escoin_ordermanage/sales/order/recent.phtml
ADDED
@@ -0,0 +1,70 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
/**
|
4 |
+
* Escoin_Ordermanage extension
|
5 |
+
*
|
6 |
+
* NOTICE OF LICENSE
|
7 |
+
*
|
8 |
+
* This source file is subject to the MIT License
|
9 |
+
* that is bundled with this package in the file LICENSE.txt.
|
10 |
+
* It is also available through the world-wide-web at this URL:
|
11 |
+
* http://opensource.org/licenses/mit-license.php
|
12 |
+
*
|
13 |
+
* @category Escoin
|
14 |
+
* @package Escoin_Ordermanage
|
15 |
+
* @copyright Copyright (c) 2014
|
16 |
+
* @license http://opensource.org/licenses/mit-license.php MIT License
|
17 |
+
*/
|
18 |
+
|
19 |
+
?>
|
20 |
+
<div class="account-box ad-orders">
|
21 |
+
<?php $_orders = $this->getOrders(); ?>
|
22 |
+
<div class="head">
|
23 |
+
<h4><?php echo $this->__('Recent Orders') ?></h4>
|
24 |
+
<?php if( sizeof($_orders->getItems()) > 0 ): ?><a href="<?php echo $this->getUrl('sales/order/history') ?>"><?php echo $this->__('View All') ?></a><?php endif; ?>
|
25 |
+
</div>
|
26 |
+
<?php if( sizeof($_orders->getItems()) > 0 ): ?>
|
27 |
+
<table cellspacing="0" class="data-table" id="my-orders-table">
|
28 |
+
<thead>
|
29 |
+
<tr>
|
30 |
+
<th><?php echo $this->__('Order #') ?></th>
|
31 |
+
<th><?php echo $this->__('Date') ?></th>
|
32 |
+
<!-- <th><?php echo $this->__('Ship to') ?></th> -->
|
33 |
+
<th><?php echo $this->__('Order Total') ?></th>
|
34 |
+
<th><?php echo $this->__('Status') ?></th>
|
35 |
+
<th class="last"></th>
|
36 |
+
</tr>
|
37 |
+
</thead>
|
38 |
+
<tbody>
|
39 |
+
<?php $_odd = ''; ?>
|
40 |
+
<?php foreach ($_orders as $_order): ?>
|
41 |
+
<tr class="<?php echo ($_odd = ($_odd ? 'odd' : '')) ?>">
|
42 |
+
<td><?php echo $_order->getRealOrderId() ?> </td>
|
43 |
+
<td><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?> </td>
|
44 |
+
<!-- <td><?php echo $_order->getShippingAddress() ? $this->htmlEscape($_order->getShippingAddress()->getName()) : '' ?> </td> -->
|
45 |
+
<td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?> </td>
|
46 |
+
<td><em><?php echo $_order->getStatusLabel() ?></em> </td>
|
47 |
+
<td class="last a-center"><a href="<?php echo $this->getViewUrl($_order) ?>"><?php echo $this->__('View Order') ?></a>
|
48 |
+
<?php if ($this->helper('sales/reorder')->canReorder($_order)) : ?>
|
49 |
+
<span class="separator">|</span> <a href="<?php echo $this->getReorderUrl($_order) ?>" style="font-weight: bold; color: #403A3A;"><?php echo $this->__('Reorder') ?></a>
|
50 |
+
<?php endif ?>
|
51 |
+
<?php /* CHANGES STARTS */ ?>
|
52 |
+
<?php if ($_order->canCancel()) { ?>
|
53 |
+
<span class="separator">|</span>
|
54 |
+
<a class="order-cancel" href="<?php echo $this->getUrl('sales/order/cancel', array('order_id' => $_order->getId())); ?>">
|
55 |
+
<?php echo $this->__('Cancel') ?>
|
56 |
+
</a>
|
57 |
+
<?php } else { ?>
|
58 |
+
<!-- Order cancel is not aviable -->
|
59 |
+
<?php } ?>
|
60 |
+
<?php /* CHANGES ENDS */ ?>
|
61 |
+
</td>
|
62 |
+
</tr>
|
63 |
+
<?php endforeach; ?>
|
64 |
+
</tbody>
|
65 |
+
</table>
|
66 |
+
<script type="text/javascript">decorateTable('my-orders-table')</script>
|
67 |
+
<?php else: ?>
|
68 |
+
<p><?php echo $this->__('You have placed no orders.'); ?></p>
|
69 |
+
<?php endif; ?>
|
70 |
+
</div>
|
package.xml
CHANGED
@@ -1,18 +1,18 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>escoin_ordermanage</name>
|
4 |
-
<version>0.1.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/mit-license.php">MIT License</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Escoin Ordermanage module to add delete functionality to magento</summary>
|
10 |
<description>Escoin Ordermanage module adds the functionality to delete orders in the admin end and the option for users to cancel their orders in the frontend.</description>
|
11 |
-
<notes>Escoin_Ordermanage ver 0.1.
|
12 |
<authors><author><name>Tarun Mukherjee</name><user>tmukherjee13</user><email>tmukherjee13@gmail.com</email></author></authors>
|
13 |
-
<date>2014-
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir name="Escoin"><dir name="Ordermanage"><dir name="Block"><dir name="Order"><file name="History.php" hash="1e58105669c01604fd57cdca07f0b28c"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Ordermanage"><file name="OrderController.php" hash="faf0708302e8b3529ecc29ab4f3ef525"/></dir></dir><file name="OrderController.php" hash="0084f51a0f19ab279b3f203e58d42e1b"/></dir><dir name="etc"><file name="config.xml" hash="259c642331b79a8c52b0cb28d81124fb"/></dir><dir name="Helper"><file name="Data.php" hash="52dc40aceed28ea0fad8ee885b02385a"/></dir><dir name="Model"><file name="Observer.php" hash="f6f75d978b2faa558840eee1000233ab"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Escoin_Ordermanage.xml" hash="3cdaee218f290b4dff9386cb8fa78c4f"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="escoin_ordermanage.xml" hash="510f38130495a132f6bb211cd289bd56"/></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Escoin_Ordermanage.csv" hash="8c671e41dab92339bfb2e5917bbe3b7a"/></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>escoin_ordermanage</name>
|
4 |
+
<version>0.1.1</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/mit-license.php">MIT License</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Escoin Ordermanage module to add delete functionality to magento</summary>
|
10 |
<description>Escoin Ordermanage module adds the functionality to delete orders in the admin end and the option for users to cancel their orders in the frontend.</description>
|
11 |
+
<notes>Escoin_Ordermanage ver 0.1.1 stable. added missing files.</notes>
|
12 |
<authors><author><name>Tarun Mukherjee</name><user>tmukherjee13</user><email>tmukherjee13@gmail.com</email></author></authors>
|
13 |
+
<date>2014-07-10</date>
|
14 |
+
<time>17:29:54</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="Escoin"><dir name="Ordermanage"><dir name="Block"><dir name="Order"><file name="History.php" hash="1e58105669c01604fd57cdca07f0b28c"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Ordermanage"><file name="OrderController.php" hash="faf0708302e8b3529ecc29ab4f3ef525"/></dir></dir><file name="OrderController.php" hash="0084f51a0f19ab279b3f203e58d42e1b"/></dir><dir name="etc"><file name="config.xml" hash="259c642331b79a8c52b0cb28d81124fb"/></dir><dir name="Helper"><file name="Data.php" hash="52dc40aceed28ea0fad8ee885b02385a"/></dir><dir name="Model"><file name="Observer.php" hash="f6f75d978b2faa558840eee1000233ab"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Escoin_Ordermanage.xml" hash="3cdaee218f290b4dff9386cb8fa78c4f"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="escoin_ordermanage.xml" hash="510f38130495a132f6bb211cd289bd56"/></dir><dir name="template"><dir name="escoin_ordermanage"><dir name="sales"><dir name="order"><file name="history.phtml" hash="7e29c2b9aab96558c7714c852b270455"/><file name="recent.phtml" hash="611199672cf7704f81cc77653a899da3"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Escoin_Ordermanage.csv" hash="8c671e41dab92339bfb2e5917bbe3b7a"/></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|