Version Notes
No notes
Download this release
Release Info
Developer | Yireo |
Extension | Yireo_VmOrder |
Version | 0.10.17 |
Comparing to | |
See all releases |
Code changes from version 0.10.7 to 0.10.17
- app/code/community/Yireo/VmOrder/Block/Adminhtml/Tab.php +95 -0
- app/code/community/Yireo/VmOrder/Block/Customer/Order/View.php +1 -1
- app/code/community/Yireo/VmOrder/Block/Customer/Orders/List.php +1 -1
- app/code/community/Yireo/VmOrder/Block/Order/View.php +1 -1
- app/code/community/Yireo/VmOrder/Block/Overview/Grid.php +24 -3
- app/code/community/Yireo/VmOrder/Helper/Data.php +1 -1
- app/code/community/Yireo/VmOrder/Model/Mysql4/Order.php +1 -1
- app/code/community/Yireo/VmOrder/Model/Mysql4/Order/Collection.php +1 -1
- app/code/community/Yireo/VmOrder/Model/Mysql4/Order/Item.php +1 -1
- app/code/community/Yireo/VmOrder/Model/Mysql4/Order/Item/Collection.php +1 -1
- app/code/community/Yireo/VmOrder/Model/Order.php +1 -1
- app/code/community/Yireo/VmOrder/Model/Order/Item.php +1 -1
- app/code/community/Yireo/VmOrder/etc/adminhtml.xml +1 -1
- app/code/community/Yireo/VmOrder/etc/config.xml +12 -2
- app/code/community/Yireo/VmOrder/sql/vmorder_setup/mysql4-install-0.5.4.php +1 -1
- app/design/adminhtml/default/default/layout/vmorder.xml +19 -0
- app/design/adminhtml/default/default/template/vmorder/overview.phtml +3 -3
- app/design/adminhtml/default/default/template/vmorder/tab.phtml +49 -0
- app/design/frontend/base/default/template/vmorder/customer/orders/list.phtml +9 -9
- package.xml +1 -1
app/code/community/Yireo/VmOrder/Block/Adminhtml/Tab.php
ADDED
@@ -0,0 +1,95 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Yireo VmOrder for Magento
|
4 |
+
*
|
5 |
+
* @package Yireo_VmOrder
|
6 |
+
* @author Yireo (http://www.yireo.com/)
|
7 |
+
* @copyright Copyright 2015 Yireo (http://www.yireo.com/)
|
8 |
+
* @license Open Source License (OSL v3)
|
9 |
+
*/
|
10 |
+
|
11 |
+
/**
|
12 |
+
* VmOrder tab-block
|
13 |
+
*/
|
14 |
+
class Yireo_VmOrder_Block_Adminhtml_Tab extends Mage_Adminhtml_Block_Template
|
15 |
+
implements Mage_Adminhtml_Block_Widget_Tab_Interface
|
16 |
+
{
|
17 |
+
|
18 |
+
public function __construct()
|
19 |
+
{
|
20 |
+
$this->setTemplate('vmorder/tab.phtml');
|
21 |
+
|
22 |
+
}
|
23 |
+
|
24 |
+
public function getCustomtabInfo(){
|
25 |
+
|
26 |
+
$customer = Mage::registry('current_customer');
|
27 |
+
return null;
|
28 |
+
}
|
29 |
+
|
30 |
+
/**
|
31 |
+
* Return Tab label
|
32 |
+
*
|
33 |
+
* @return string
|
34 |
+
*/
|
35 |
+
public function getTabLabel()
|
36 |
+
{
|
37 |
+
return $this->__('VirtueMart Orders');
|
38 |
+
}
|
39 |
+
|
40 |
+
/**
|
41 |
+
* Return Tab title
|
42 |
+
*
|
43 |
+
* @return string
|
44 |
+
*/
|
45 |
+
public function getTabTitle()
|
46 |
+
{
|
47 |
+
return $this->__('VirtueMart Orders');
|
48 |
+
}
|
49 |
+
|
50 |
+
/**
|
51 |
+
* Can show tab in tabs
|
52 |
+
*
|
53 |
+
* @return boolean
|
54 |
+
*/
|
55 |
+
public function canShowTab()
|
56 |
+
{
|
57 |
+
$customer = Mage::registry('current_customer');
|
58 |
+
return (bool)$customer->getId();
|
59 |
+
}
|
60 |
+
|
61 |
+
/**
|
62 |
+
* Tab is hidden
|
63 |
+
*
|
64 |
+
* @return boolean
|
65 |
+
*/
|
66 |
+
public function isHidden()
|
67 |
+
{
|
68 |
+
return false;
|
69 |
+
}
|
70 |
+
|
71 |
+
/**
|
72 |
+
* Defines after which tab, this tab should be rendered
|
73 |
+
*
|
74 |
+
* @return string
|
75 |
+
*/
|
76 |
+
public function getAfter()
|
77 |
+
{
|
78 |
+
return 'tags';
|
79 |
+
}
|
80 |
+
|
81 |
+
public function getCustomer()
|
82 |
+
{
|
83 |
+
$customerId = Mage::app()->getRequest()->getParam('id');
|
84 |
+
$customer = Mage::getModel('customer/customer')->load($customerId);
|
85 |
+
return $customer;
|
86 |
+
}
|
87 |
+
|
88 |
+
public function getCustomerOrders()
|
89 |
+
{
|
90 |
+
$collection = Mage::getModel('vmorder/order')->getCollection();
|
91 |
+
$collection->addFieldToFilter('customer_id', $this->getCustomer()->getId());
|
92 |
+
|
93 |
+
return $collection;
|
94 |
+
}
|
95 |
+
}
|
app/code/community/Yireo/VmOrder/Block/Customer/Order/View.php
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
-
* @copyright Copyright
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
+
* @copyright Copyright 2014
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
app/code/community/Yireo/VmOrder/Block/Customer/Orders/List.php
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
-
* @copyright Copyright
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
+
* @copyright Copyright 2014
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
app/code/community/Yireo/VmOrder/Block/Order/View.php
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
-
* @copyright Copyright
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
+
* @copyright Copyright 2014
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
app/code/community/Yireo/VmOrder/Block/Overview/Grid.php
CHANGED
@@ -24,17 +24,17 @@ class Yireo_VmOrder_Block_Overview_Grid extends Mage_Adminhtml_Block_Widget_Grid
|
|
24 |
protected function _prepareCollection()
|
25 |
{
|
26 |
$collection = Mage::getModel('vmorder/order')->getCollection();
|
|
|
27 |
$this->setCollection($collection);
|
28 |
parent::_prepareCollection();
|
29 |
|
30 |
$collection = $this->getCollection();
|
31 |
foreach($collection as $item) {
|
32 |
|
33 |
-
//$item->setOrderNumber('#'.Mage::helper('vmorder')->getOrderNumber($item));
|
34 |
$item->setOrderNumber(strtoupper($item->getOrderNumber()));
|
35 |
|
36 |
$customer = Mage::getModel('customer/customer')->load($item->getCustomerId());
|
37 |
-
$item->
|
38 |
|
39 |
$item->setOrderTotal(Mage::helper('core')->currency($item->getOrderTotal()));
|
40 |
$item->setCreateDate(date('d M Y H:i:s', $item->getCreateDate()));
|
@@ -63,7 +63,7 @@ class Yireo_VmOrder_Block_Overview_Grid extends Mage_Adminhtml_Block_Widget_Grid
|
|
63 |
|
64 |
$this->addColumn('customer_id', array(
|
65 |
'header'=> Mage::helper('vmorder')->__('Customer'),
|
66 |
-
'index' => '
|
67 |
));
|
68 |
|
69 |
$this->addColumn('order_total', array(
|
@@ -97,4 +97,25 @@ class Yireo_VmOrder_Block_Overview_Grid extends Mage_Adminhtml_Block_Widget_Grid
|
|
97 |
{
|
98 |
return $this->getUrl('adminhtml/vmorder/view', array('id'=>$row->getId()));
|
99 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
100 |
}
|
24 |
protected function _prepareCollection()
|
25 |
{
|
26 |
$collection = Mage::getModel('vmorder/order')->getCollection();
|
27 |
+
|
28 |
$this->setCollection($collection);
|
29 |
parent::_prepareCollection();
|
30 |
|
31 |
$collection = $this->getCollection();
|
32 |
foreach($collection as $item) {
|
33 |
|
|
|
34 |
$item->setOrderNumber(strtoupper($item->getOrderNumber()));
|
35 |
|
36 |
$customer = Mage::getModel('customer/customer')->load($item->getCustomerId());
|
37 |
+
$item->setCustomerId($customer->getName());
|
38 |
|
39 |
$item->setOrderTotal(Mage::helper('core')->currency($item->getOrderTotal()));
|
40 |
$item->setCreateDate(date('d M Y H:i:s', $item->getCreateDate()));
|
63 |
|
64 |
$this->addColumn('customer_id', array(
|
65 |
'header'=> Mage::helper('vmorder')->__('Customer'),
|
66 |
+
'index' => 'customer_id',
|
67 |
));
|
68 |
|
69 |
$this->addColumn('order_total', array(
|
97 |
{
|
98 |
return $this->getUrl('adminhtml/vmorder/view', array('id'=>$row->getId()));
|
99 |
}
|
100 |
+
|
101 |
+
protected function _addColumnFilterToCollection($column)
|
102 |
+
{
|
103 |
+
if ($column->getId() === 'customer_id' && $column->getFilter()->getValue()) {
|
104 |
+
$value = $column->getFilter()->getValue();
|
105 |
+
$customerIds = $this->filterCustomerIds($value);
|
106 |
+
$this->getCollection()->addFieldToFilter('customer_id' , array('IN', $customerIds));
|
107 |
+
|
108 |
+
} else {
|
109 |
+
parent::_addColumnFilterToCollection($column);
|
110 |
+
}
|
111 |
+
|
112 |
+
return $this;
|
113 |
+
}
|
114 |
+
|
115 |
+
protected function filterCustomerIds($search)
|
116 |
+
{
|
117 |
+
$collection = Mage::getModel('customer/customer')->getCollection();
|
118 |
+
$collection->addAttributeToFilter('firstname', array('like' => '%'.$search.'%'));
|
119 |
+
return $collection->getAllIds();
|
120 |
+
}
|
121 |
}
|
app/code/community/Yireo/VmOrder/Helper/Data.php
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
-
* @copyright Copyright
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
+
* @copyright Copyright 2014
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
app/code/community/Yireo/VmOrder/Model/Mysql4/Order.php
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
-
* @copyright Copyright
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
+
* @copyright Copyright 2014
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
app/code/community/Yireo/VmOrder/Model/Mysql4/Order/Collection.php
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
-
* @copyright Copyright
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
+
* @copyright Copyright 2014
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
app/code/community/Yireo/VmOrder/Model/Mysql4/Order/Item.php
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
-
* @copyright Copyright
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
+
* @copyright Copyright 2014
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
app/code/community/Yireo/VmOrder/Model/Mysql4/Order/Item/Collection.php
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
-
* @copyright Copyright
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
+
* @copyright Copyright 2014
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
app/code/community/Yireo/VmOrder/Model/Order.php
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
-
* @copyright Copyright
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
+
* @copyright Copyright 2014
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
app/code/community/Yireo/VmOrder/Model/Order/Item.php
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
-
* @copyright Copyright
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
+
* @copyright Copyright 2014
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
app/code/community/Yireo/VmOrder/etc/adminhtml.xml
CHANGED
@@ -5,7 +5,7 @@
|
|
5 |
*
|
6 |
* @author Yireo
|
7 |
* @package VmOrder
|
8 |
-
* @copyright Copyright
|
9 |
* @license Open Source License
|
10 |
* @link http://www.yireo.com
|
11 |
*/
|
5 |
*
|
6 |
* @author Yireo
|
7 |
* @package VmOrder
|
8 |
+
* @copyright Copyright 2014
|
9 |
* @license Open Source License
|
10 |
* @link http://www.yireo.com
|
11 |
*/
|
app/code/community/Yireo/VmOrder/etc/config.xml
CHANGED
@@ -5,7 +5,7 @@
|
|
5 |
*
|
6 |
* @author Yireo
|
7 |
* @package VmOrder
|
8 |
-
* @copyright Copyright
|
9 |
* @license Open Source License
|
10 |
* @link http://www.yireo.com
|
11 |
*/
|
@@ -14,7 +14,7 @@
|
|
14 |
|
15 |
<modules>
|
16 |
<Yireo_VmOrder>
|
17 |
-
<version>0.10.
|
18 |
</Yireo_VmOrder>
|
19 |
</modules>
|
20 |
|
@@ -108,4 +108,14 @@
|
|
108 |
</layout>
|
109 |
|
110 |
</frontend>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
111 |
</config>
|
5 |
*
|
6 |
* @author Yireo
|
7 |
* @package VmOrder
|
8 |
+
* @copyright Copyright 2015
|
9 |
* @license Open Source License
|
10 |
* @link http://www.yireo.com
|
11 |
*/
|
14 |
|
15 |
<modules>
|
16 |
<Yireo_VmOrder>
|
17 |
+
<version>0.10.17</version>
|
18 |
</Yireo_VmOrder>
|
19 |
</modules>
|
20 |
|
108 |
</layout>
|
109 |
|
110 |
</frontend>
|
111 |
+
|
112 |
+
<adminhtml>
|
113 |
+
<layout>
|
114 |
+
<updates>
|
115 |
+
<vmorder module="Yireo_VmOrder">
|
116 |
+
<file>vmorder.xml</file>
|
117 |
+
</vmorder>
|
118 |
+
</updates>
|
119 |
+
</layout>
|
120 |
+
</adminhtml>
|
121 |
</config>
|
app/code/community/Yireo/VmOrder/sql/vmorder_setup/mysql4-install-0.5.4.php
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
-
* @copyright Copyright
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
4 |
*
|
5 |
* @author Yireo
|
6 |
* @package VmOrder
|
7 |
+
* @copyright Copyright 2014
|
8 |
* @license Open Source License
|
9 |
* @link http://www.yireo.com
|
10 |
*/
|
app/design/adminhtml/default/default/layout/vmorder.xml
ADDED
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<!--
|
3 |
+
/**
|
4 |
+
* Yireo VmOrder
|
5 |
+
*
|
6 |
+
* @package Yireo_VmOrder
|
7 |
+
* @author Yireo (http://www.yireo.com/)
|
8 |
+
* @copyright Copyright 2015 Yireo (http://www.yireo.com/)
|
9 |
+
* @license Open Software License
|
10 |
+
*/
|
11 |
+
-->
|
12 |
+
<layout>
|
13 |
+
<adminhtml_customer_edit>
|
14 |
+
<reference name="customer_edit_tabs">
|
15 |
+
<block type="vmorder/adminhtml_tab" name="vmorder_tab" template="vmorder/tab.phtml" />
|
16 |
+
<action method="addTab"><name>vmorder_tab</name><block>vmorder_tab</block></action>
|
17 |
+
</reference>
|
18 |
+
</adminhtml_customer_edit>
|
19 |
+
</layout>
|
app/design/adminhtml/default/default/template/vmorder/overview.phtml
CHANGED
@@ -1,11 +1,11 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
*
|
4 |
*
|
5 |
* @package Yireo_VmOrder
|
6 |
* @author Yireo (http://www.yireo.com/)
|
7 |
-
* @copyright Copyright (c)
|
8 |
-
* @license
|
9 |
*/
|
10 |
?>
|
11 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* VmOrder extension for Magento
|
4 |
*
|
5 |
* @package Yireo_VmOrder
|
6 |
* @author Yireo (http://www.yireo.com/)
|
7 |
+
* @copyright Copyright (c) 2015 Yireo
|
8 |
+
* @license OSL v3
|
9 |
*/
|
10 |
?>
|
11 |
|
app/design/adminhtml/default/default/template/vmorder/tab.phtml
ADDED
@@ -0,0 +1,49 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* VmOrder extension for Magento
|
4 |
+
*
|
5 |
+
* @package Yireo_VmOrder
|
6 |
+
* @author Yireo (http://www.yireo.com/)
|
7 |
+
* @copyright Copyright (c) 2015 Yireo
|
8 |
+
* @license OSL v3
|
9 |
+
*/
|
10 |
+
?>
|
11 |
+
|
12 |
+
<div class="content-header">
|
13 |
+
<table cellspacing="0">
|
14 |
+
<tr>
|
15 |
+
<td style="width:80%;"><h3 class="icon-head head-tag"><?php echo $this->getHeader('VirtueMart Orders'); ?></h3></td>
|
16 |
+
</tr>
|
17 |
+
</table>
|
18 |
+
</div>
|
19 |
+
|
20 |
+
<div class="vmorder-orders grid">
|
21 |
+
<?php if($this->getCustomerOrders()->count() > 0): ?>
|
22 |
+
<table class="data">
|
23 |
+
<thead>
|
24 |
+
<tr class="headings">
|
25 |
+
<th><?php echo $this->__('Order ID'); ?></th>
|
26 |
+
<th><?php echo $this->__('Order Number'); ?></th>
|
27 |
+
<th><?php echo $this->__('Order Total'); ?></th>
|
28 |
+
<th><?php echo $this->__('Shipping'); ?></th>
|
29 |
+
<th><?php echo $this->__('Payment'); ?></th>
|
30 |
+
<th><?php echo $this->__('Creation Date'); ?></th>
|
31 |
+
</tr>
|
32 |
+
</thead>
|
33 |
+
<tbody>
|
34 |
+
<?php foreach($this->getCustomerOrders() as $order): ?>
|
35 |
+
<tr class="even">
|
36 |
+
<td><?php echo $order->getOrderId(); ?></td>
|
37 |
+
<td><?php echo $order->getOrderNumber(); ?></td>
|
38 |
+
<td><?php echo $order->getOrderTotal(); ?></td>
|
39 |
+
<td><?php echo $order->getShipMethodId(); ?></td>
|
40 |
+
<td><?php echo $order->getPaymentMethod(); ?></td>
|
41 |
+
<td><?php echo $order->getCreateDate(); ?></td>
|
42 |
+
</tr>
|
43 |
+
<?php endforeach; ?>
|
44 |
+
</tbody>
|
45 |
+
</table>
|
46 |
+
<?php else: ?>
|
47 |
+
<p><?php echo $this->__('No orders found'); ?></p>
|
48 |
+
<?php endif; ?>
|
49 |
+
</div>
|
app/design/frontend/base/default/template/vmorder/customer/orders/list.phtml
CHANGED
@@ -14,9 +14,11 @@ $orders = $this->getOrders();
|
|
14 |
|
15 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
16 |
<div class="page-head">
|
17 |
-
<h3><?php echo $this->__('
|
18 |
</div>
|
19 |
|
|
|
|
|
20 |
<p><?php echo $this->__('These are orders originating from our old website'); ?></p>
|
21 |
|
22 |
<?php echo $this->getPagerHtml(); ?>
|
@@ -34,22 +36,20 @@ $orders = $this->getOrders();
|
|
34 |
</tr>
|
35 |
</thead>
|
36 |
<tbody>
|
37 |
-
<?php
|
38 |
-
<?php foreach($orders as $order) { ?>
|
39 |
<tr>
|
40 |
<td><?php echo strftime('%d %B %Y', $order->getCreateDate()); ?></td>
|
41 |
<td><a href="<?php echo $this->getOrderLink($order); ?>"><?php echo $this->getOrderNumber($order); ?></a></td>
|
42 |
<td><?php echo $this->getFormattedPrice($order); ?></td>
|
43 |
<td><?php echo $order->getOrderStatusName(); ?></td>
|
44 |
</tr>
|
45 |
-
|
46 |
-
<?php } else { ?>
|
47 |
-
<tr>
|
48 |
-
<td colspan="5"><?php echo $this->__('Not available'); ?></td>
|
49 |
-
</tr>
|
50 |
-
<?php } ?>
|
51 |
</tbody>
|
52 |
</table>
|
53 |
|
54 |
<script type="text/javascript">decorateTable('vm-orders-table')</script>
|
55 |
<?php echo $this->getPagerHtml(); ?>
|
|
|
|
|
|
|
|
14 |
|
15 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
16 |
<div class="page-head">
|
17 |
+
<h3><?php echo $this->__('My Previous Orders') ?></h3>
|
18 |
</div>
|
19 |
|
20 |
+
<?php if(!empty($orders) && $orders->getSize() > 0) : ?>
|
21 |
+
|
22 |
<p><?php echo $this->__('These are orders originating from our old website'); ?></p>
|
23 |
|
24 |
<?php echo $this->getPagerHtml(); ?>
|
36 |
</tr>
|
37 |
</thead>
|
38 |
<tbody>
|
39 |
+
<?php foreach($orders as $order) : ?>
|
|
|
40 |
<tr>
|
41 |
<td><?php echo strftime('%d %B %Y', $order->getCreateDate()); ?></td>
|
42 |
<td><a href="<?php echo $this->getOrderLink($order); ?>"><?php echo $this->getOrderNumber($order); ?></a></td>
|
43 |
<td><?php echo $this->getFormattedPrice($order); ?></td>
|
44 |
<td><?php echo $order->getOrderStatusName(); ?></td>
|
45 |
</tr>
|
46 |
+
<?php endforeach; ?>
|
|
|
|
|
|
|
|
|
|
|
47 |
</tbody>
|
48 |
</table>
|
49 |
|
50 |
<script type="text/javascript">decorateTable('vm-orders-table')</script>
|
51 |
<?php echo $this->getPagerHtml(); ?>
|
52 |
+
|
53 |
+
<?php else : ?>
|
54 |
+
<p><?php echo $this->__('No previous orders available'); ?></p>
|
55 |
+
<?php endif; ?>
|
package.xml
CHANGED
@@ -1,2 +1,2 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
-
<package><name>Yireo_VmOrder</name><version>0.10.
|
1 |
<?xml version="1.0"?>
|
2 |
+
<package><name>Yireo_VmOrder</name><version>0.10.17</version><stability>stable</stability><license>Open Source License</license><channel>community</channel><extends></extends><summary>No summary</summary><description>No description</description><notes>No notes</notes><authors><author><name>Yireo</name><user>yireo</user><email>info@yireo.com</email></author></authors><date>2015-08-20</date><time>12:25:35</time><compatible></compatible><dependencies><required><php><min>5.4.0</min><max>6.0.0</max></php></required></dependencies><contents><target name="mage"><dir name="app"><dir name="etc"><dir name="modules"><file name="Yireo_VmOrder.xml" hash="db8f1f19b440a2d8989675f73388fb42"/></dir></dir><dir name="design"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="vmorder"><dir name="customer"><dir name="orders"><file name="list.phtml" hash="d8596eae7b83484c78c7cad431c8f487"/></dir><dir name="order"><file name="view.phtml" hash="db9157c243d749b7c7993d7376384544"/></dir></dir></dir></dir><dir name="layout"><file name="vmorder.xml" hash="c534452bba6a39628a7b0ad04e0871d3"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="vmorder"><file name="overview.phtml" hash="bedd2eed5dfcc9f02ad40537ad446a66"/><file name="tab.phtml" hash="07913a23cb3aa6bf9f4b6af3676eaa53"/><dir name="order"><file name="view.phtml" hash="096f5268d14b319856c9142e3bbb34fd"/></dir></dir></dir><dir name="layout"><file name="vmorder.xml" hash="a89e7c559ea44cfcaa63a38862f4811b"/></dir></dir></dir></dir></dir><dir name="code"><dir name="community"><dir name="Yireo"><dir name="VmOrder"><dir name="sql"><dir name="vmorder_setup"><file name="mysql4-install-0.5.4.php" hash="8f4970a31f8a3383e066a31a322074e8"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="b0b1c105c939754600e7d298f668e1d4"/><file name="config.xml" hash="d551ab9cb8ec1aa34b834423c04dd16d"/></dir><dir name="controllers"><file name="CustomerController.php" hash="ed94e1b303295130b37e4ca43986c8d7"/><file name="VmorderController.php" hash="0a221e5ed7516f76cce04e8887955afa"/></dir><dir name="Model"><file name="Order.php" hash="755b0cc715edfc201e3513e62f5e57a3"/><dir name="Order"><file name="Item.php" hash="5b35835865f395724b1c06513de0d48b"/></dir><dir name="Mysql4"><file name="Order.php" hash="29b832455cb0bc330752586ebe62f65f"/><dir name="Order"><file name="Collection.php" hash="bb856442a08d79e57b32f9d2be1cab2e"/><file name="Item.php" hash="61f72ce3b2f7351d3f4cb136fe5f6aa1"/><dir name="Item"><file name="Collection.php" hash="e1e2011cc2739451f9fd8e1a1ce337b1"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="0f81dd4aaef8c848e3ffcaa384514914"/></dir><dir name="Block"><file name="Overview.php" hash="b1ae579a1475bf27e673dd0fcf3fff99"/><dir name="Overview"><file name="Grid.php" hash="05eb8ec23e8ac3305664918133cc5bc0"/></dir><dir name="Order"><file name="View.php" hash="7b69479088fa9b15d0f71b93d4511151"/></dir><dir name="Customer"><dir name="Orders"><file name="List.php" hash="d5e961240a63f9b1ba0f6d05e6c0ca0b"/></dir><dir name="Order"><file name="View.php" hash="7c1aa4fe87646374394421c88b63228a"/></dir></dir><dir name="Adminhtml"><file name="Tab.php" hash="9b0cf086a40bd3f824598b5a483c4406"/></dir></dir></dir></dir></dir></dir></dir></target></contents></package>
|