Imedia_SalesOrder - Version 1.0.2

Version Notes

2nd Stable Release

Download this release

Release Info

Developer iMediaDesigns
Extension Imedia_SalesOrder
Version 1.0.2
Comparing to
See all releases


Code changes from version 1.0.1 to 1.0.2

Files changed (5) hide show
  1. app/code/community/Imedia/SalesOrder/Block/Sales/Order/Grid.php +24 -24
  2. app/code/community/Imedia/SalesOrder/etc/adminhtml.xml +1 -2
  3. app/code/community/Imedia/SalesOrder/etc/config.xml +1 -1
  4. app/code/community/Imedia/SalesOrder/etc/system.xml +10 -3
  5. package.xml +10 -10
app/code/community/Imedia/SalesOrder/Block/Sales/Order/Grid.php CHANGED
@@ -35,7 +35,7 @@ class Imedia_SalesOrder_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Widg
35
  {
36
 
37
  $this->addColumn('real_order_id', array(
38
- 'header'=> Mage::helper('sales')->__('Order #'),
39
  'width' => '80px',
40
  'type' => 'text',
41
  'index' => 'increment_id',
@@ -44,7 +44,7 @@ class Imedia_SalesOrder_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Widg
44
 
45
  if (!Mage::app()->isSingleStoreMode()) {
46
  $this->addColumn('store_id', array(
47
- 'header' => Mage::helper('sales')->__('Purchased From (Store)'),
48
  'index' => 'store_id',
49
  'filter_index' => 'im.store_id',
50
  'type' => 'store',
@@ -54,7 +54,7 @@ class Imedia_SalesOrder_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Widg
54
  }
55
 
56
  $this->addColumn('created_at', array(
57
- 'header' => Mage::helper('sales')->__('Purchased On'),
58
  'index' => 'created_at',
59
  'filter_index' => 'im.created_at',
60
  'width'=>'100px',
@@ -62,19 +62,19 @@ class Imedia_SalesOrder_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Widg
62
  ));
63
 
64
  $this->addColumn('billing_name', array(
65
- 'header' => Mage::helper('sales')->__('Bill to Name'),
66
  'index' => 'billing_name',
67
  ));
68
 
69
  $this->addColumn('shipping_name', array(
70
- 'header' => Mage::helper('sales')->__('Ship to Name'),
71
  'index' => 'shipping_name',
72
  ));
73
 
74
  $productName = Mage::getStoreConfig('salesorder/grid_options/show_product_name',Mage::app()->getStore());
75
  if($productName == 1){
76
  $this->addColumn('product_name', array(
77
- 'header' => Mage::helper('Sales')->__('Product Name'),
78
  'type' => 'text',
79
  'index' => 'product_name',
80
  'filter_index' => 'im_item.name',
@@ -85,7 +85,7 @@ class Imedia_SalesOrder_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Widg
85
  $productSku = Mage::getStoreConfig('salesorder/grid_options/show_product_sku',Mage::app()->getStore());
86
  if($productSku == 1){
87
  $this->addColumn('product_sku', array(
88
- 'header' => Mage::helper('Sales')->__('SKU'),
89
  'type' => 'text',
90
  'index' => 'product_sku',
91
  'filter_index' => 'im_item.sku',
@@ -95,7 +95,7 @@ class Imedia_SalesOrder_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Widg
95
  $emailValue = Mage::getStoreConfig('salesorder/grid_options/show_customer_email',Mage::app()->getStore());
96
  if($emailValue == 1){
97
  $this->addColumn('customer_email', array(
98
- 'header' => Mage::helper('sales')->__('Customer Email'),
99
  'index' => 'customer_email',
100
  'type' => 'text',
101
  'filter_index' => 'im.customer_email',
@@ -103,7 +103,7 @@ class Imedia_SalesOrder_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Widg
103
  }
104
 
105
  $this->addColumn('base_grand_total', array(
106
- 'header' => Mage::helper('sales')->__('G.T. (Base)'),
107
  'index' => 'base_grand_total',
108
  'filter_index' => 'im.base_grand_total',
109
  'type' => 'currency',
@@ -111,7 +111,7 @@ class Imedia_SalesOrder_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Widg
111
  ));
112
 
113
  $this->addColumn('grand_total', array(
114
- 'header' => Mage::helper('sales')->__('G.T. (Purchased)'),
115
  'index' => 'grand_total',
116
  'filter_index' => 'im.grand_total',
117
  'type' => 'currency',
@@ -120,7 +120,7 @@ class Imedia_SalesOrder_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Widg
120
 
121
 
122
  $this->addColumn('status', array(
123
- 'header' => Mage::helper('sales')->__('Status'),
124
  'index' => 'status',
125
  'filter_index' => 'im.status',
126
  'type' => 'options',
@@ -131,13 +131,13 @@ class Imedia_SalesOrder_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Widg
131
  if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/view')) {
132
  $this->addColumn('action',
133
  array(
134
- 'header' => Mage::helper('sales')->__('Action'),
135
  'width' => '50px',
136
  'type' => 'action',
137
  'getter' => 'getId',
138
  'actions' => array(
139
  array(
140
- 'caption' => Mage::helper('sales')->__('View'),
141
  'url' => array('base'=>'*/sales_order/view'),
142
  'field' => 'order_id'
143
  )
@@ -148,10 +148,10 @@ class Imedia_SalesOrder_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Widg
148
  'is_system' => true,
149
  ));
150
  }
151
- $this->addRssList('rss/order/new', Mage::helper('sales')->__('New Order RSS'));
152
 
153
- $this->addExportType('*/*/exportCsv', Mage::helper('sales')->__('CSV'));
154
- $this->addExportType('*/*/exportExcel', Mage::helper('sales')->__('Excel XML'));
155
 
156
  return parent::_prepareColumns();
157
  }
@@ -164,47 +164,47 @@ class Imedia_SalesOrder_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Widg
164
 
165
  if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/cancel')) {
166
  $this->getMassactionBlock()->addItem('cancel_order', array(
167
- 'label'=> Mage::helper('sales')->__('Cancel'),
168
  'url' => $this->getUrl('*/sales_order/massCancel'),
169
  ));
170
  }
171
 
172
  if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/hold')) {
173
  $this->getMassactionBlock()->addItem('hold_order', array(
174
- 'label'=> Mage::helper('sales')->__('Hold'),
175
  'url' => $this->getUrl('*/sales_order/massHold'),
176
  ));
177
  }
178
 
179
  if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/unhold')) {
180
  $this->getMassactionBlock()->addItem('unhold_order', array(
181
- 'label'=> Mage::helper('sales')->__('Unhold'),
182
  'url' => $this->getUrl('*/sales_order/massUnhold'),
183
  ));
184
  }
185
 
186
  $this->getMassactionBlock()->addItem('pdfinvoices_order', array(
187
- 'label'=> Mage::helper('sales')->__('Print Invoices'),
188
  'url' => $this->getUrl('*/sales_order/pdfinvoices'),
189
  ));
190
 
191
  $this->getMassactionBlock()->addItem('pdfshipments_order', array(
192
- 'label'=> Mage::helper('sales')->__('Print Packingslips'),
193
  'url' => $this->getUrl('*/sales_order/pdfshipments'),
194
  ));
195
 
196
  $this->getMassactionBlock()->addItem('pdfcreditmemos_order', array(
197
- 'label'=> Mage::helper('sales')->__('Print Credit Memos'),
198
  'url' => $this->getUrl('*/sales_order/pdfcreditmemos'),
199
  ));
200
 
201
  $this->getMassactionBlock()->addItem('pdfdocs_order', array(
202
- 'label'=> Mage::helper('sales')->__('Print All'),
203
  'url' => $this->getUrl('*/sales_order/pdfdocs'),
204
  ));
205
 
206
  $this->getMassactionBlock()->addItem('print_shipping_label', array(
207
- 'label'=> Mage::helper('sales')->__('Print Shipping Labels'),
208
  'url' => $this->getUrl('*/sales_order_shipment/massPrintShippingLabel'),
209
  ));
210
 
35
  {
36
 
37
  $this->addColumn('real_order_id', array(
38
+ 'header'=> Mage::helper('salesorder')->__('Order #'),
39
  'width' => '80px',
40
  'type' => 'text',
41
  'index' => 'increment_id',
44
 
45
  if (!Mage::app()->isSingleStoreMode()) {
46
  $this->addColumn('store_id', array(
47
+ 'header' => Mage::helper('salesorder')->__('Purchased From (Store)'),
48
  'index' => 'store_id',
49
  'filter_index' => 'im.store_id',
50
  'type' => 'store',
54
  }
55
 
56
  $this->addColumn('created_at', array(
57
+ 'header' => Mage::helper('salesorder')->__('Purchased On'),
58
  'index' => 'created_at',
59
  'filter_index' => 'im.created_at',
60
  'width'=>'100px',
62
  ));
63
 
64
  $this->addColumn('billing_name', array(
65
+ 'header' => Mage::helper('salesorder')->__('Bill to Name'),
66
  'index' => 'billing_name',
67
  ));
68
 
69
  $this->addColumn('shipping_name', array(
70
+ 'header' => Mage::helper('salesorder')->__('Ship to Name'),
71
  'index' => 'shipping_name',
72
  ));
73
 
74
  $productName = Mage::getStoreConfig('salesorder/grid_options/show_product_name',Mage::app()->getStore());
75
  if($productName == 1){
76
  $this->addColumn('product_name', array(
77
+ 'header' => Mage::helper('salesorder')->__('Product Name'),
78
  'type' => 'text',
79
  'index' => 'product_name',
80
  'filter_index' => 'im_item.name',
85
  $productSku = Mage::getStoreConfig('salesorder/grid_options/show_product_sku',Mage::app()->getStore());
86
  if($productSku == 1){
87
  $this->addColumn('product_sku', array(
88
+ 'header' => Mage::helper('salesorder')->__('SKU'),
89
  'type' => 'text',
90
  'index' => 'product_sku',
91
  'filter_index' => 'im_item.sku',
95
  $emailValue = Mage::getStoreConfig('salesorder/grid_options/show_customer_email',Mage::app()->getStore());
96
  if($emailValue == 1){
97
  $this->addColumn('customer_email', array(
98
+ 'header' => Mage::helper('salesorder')->__('Customer Email'),
99
  'index' => 'customer_email',
100
  'type' => 'text',
101
  'filter_index' => 'im.customer_email',
103
  }
104
 
105
  $this->addColumn('base_grand_total', array(
106
+ 'header' => Mage::helper('salesorder')->__('G.T. (Base)'),
107
  'index' => 'base_grand_total',
108
  'filter_index' => 'im.base_grand_total',
109
  'type' => 'currency',
111
  ));
112
 
113
  $this->addColumn('grand_total', array(
114
+ 'header' => Mage::helper('salesorder')->__('G.T. (Purchased)'),
115
  'index' => 'grand_total',
116
  'filter_index' => 'im.grand_total',
117
  'type' => 'currency',
120
 
121
 
122
  $this->addColumn('status', array(
123
+ 'header' => Mage::helper('salesorder')->__('Status'),
124
  'index' => 'status',
125
  'filter_index' => 'im.status',
126
  'type' => 'options',
131
  if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/view')) {
132
  $this->addColumn('action',
133
  array(
134
+ 'header' => Mage::helper('salesorder')->__('Action'),
135
  'width' => '50px',
136
  'type' => 'action',
137
  'getter' => 'getId',
138
  'actions' => array(
139
  array(
140
+ 'caption' => Mage::helper('salesorder')->__('View'),
141
  'url' => array('base'=>'*/sales_order/view'),
142
  'field' => 'order_id'
143
  )
148
  'is_system' => true,
149
  ));
150
  }
151
+ $this->addRssList('rss/order/new', Mage::helper('salesorder')->__('New Order RSS'));
152
 
153
+ $this->addExportType('*/*/exportCsv', Mage::helper('salesorder')->__('CSV'));
154
+ $this->addExportType('*/*/exportExcel', Mage::helper('salesorder')->__('Excel XML'));
155
 
156
  return parent::_prepareColumns();
157
  }
164
 
165
  if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/cancel')) {
166
  $this->getMassactionBlock()->addItem('cancel_order', array(
167
+ 'label'=> Mage::helper('salesorder')->__('Cancel'),
168
  'url' => $this->getUrl('*/sales_order/massCancel'),
169
  ));
170
  }
171
 
172
  if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/hold')) {
173
  $this->getMassactionBlock()->addItem('hold_order', array(
174
+ 'label'=> Mage::helper('salesorder')->__('Hold'),
175
  'url' => $this->getUrl('*/sales_order/massHold'),
176
  ));
177
  }
178
 
179
  if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/unhold')) {
180
  $this->getMassactionBlock()->addItem('unhold_order', array(
181
+ 'label'=> Mage::helper('salesorder')->__('Unhold'),
182
  'url' => $this->getUrl('*/sales_order/massUnhold'),
183
  ));
184
  }
185
 
186
  $this->getMassactionBlock()->addItem('pdfinvoices_order', array(
187
+ 'label'=> Mage::helper('salesorder')->__('Print Invoices'),
188
  'url' => $this->getUrl('*/sales_order/pdfinvoices'),
189
  ));
190
 
191
  $this->getMassactionBlock()->addItem('pdfshipments_order', array(
192
+ 'label'=> Mage::helper('salesorder')->__('Print Packingslips'),
193
  'url' => $this->getUrl('*/sales_order/pdfshipments'),
194
  ));
195
 
196
  $this->getMassactionBlock()->addItem('pdfcreditmemos_order', array(
197
+ 'label'=> Mage::helper('salesorder')->__('Print Credit Memos'),
198
  'url' => $this->getUrl('*/sales_order/pdfcreditmemos'),
199
  ));
200
 
201
  $this->getMassactionBlock()->addItem('pdfdocs_order', array(
202
+ 'label'=> Mage::helper('salesorder')->__('Print All'),
203
  'url' => $this->getUrl('*/sales_order/pdfdocs'),
204
  ));
205
 
206
  $this->getMassactionBlock()->addItem('print_shipping_label', array(
207
+ 'label'=> Mage::helper('salesorder')->__('Print Shipping Labels'),
208
  'url' => $this->getUrl('*/sales_order_shipment/massPrintShippingLabel'),
209
  ));
210
 
app/code/community/Imedia/SalesOrder/etc/adminhtml.xml CHANGED
@@ -12,8 +12,7 @@
12
  <config>
13
  <children>
14
  <salesorder translate="title">
15
- <title>Sales Order</title>
16
- <sort_order>200</sort_order>
17
  </salesorder>
18
  </children>
19
  </config>
12
  <config>
13
  <children>
14
  <salesorder translate="title">
15
+ <title>Sales Order Grid</title>
 
16
  </salesorder>
17
  </children>
18
  </config>
app/code/community/Imedia/SalesOrder/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Imedia_SalesOrder>
5
- <version>1.0.0</version>
6
  </Imedia_SalesOrder>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Imedia_SalesOrder>
5
+ <version>1.0.2</version>
6
  </Imedia_SalesOrder>
7
  </modules>
8
  <global>
app/code/community/Imedia/SalesOrder/etc/system.xml CHANGED
@@ -1,11 +1,18 @@
1
  <?xml version="1.0"?>
2
  <config>
 
 
 
 
 
 
 
3
  <sections>
4
  <salesorder translate="label">
5
- <label>Imedia Sales Order Grid</label>
6
- <tab>general</tab>
7
  <frontend_type>text</frontend_type>
8
- <sort_order>1000</sort_order>
9
  <show_in_default>1</show_in_default>
10
  <show_in_website>1</show_in_website>
11
  <show_in_store>1</show_in_store>
1
  <?xml version="1.0"?>
2
  <config>
3
+ <tabs>
4
+ <imedia translate="label" module="salesorder">
5
+ <label>Imedia Extentions</label>
6
+ <sort_order>10</sort_order>
7
+ </imedia>
8
+ </tabs>
9
+
10
  <sections>
11
  <salesorder translate="label">
12
+ <label>Sales Order Grid</label>
13
+ <tab>imedia</tab>
14
  <frontend_type>text</frontend_type>
15
+ <sort_order>10</sort_order>
16
  <show_in_default>1</show_in_default>
17
  <show_in_website>1</show_in_website>
18
  <show_in_store>1</show_in_store>
package.xml CHANGED
@@ -1,21 +1,21 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Imedia_SalesOrder</name>
4
- <version>1.0.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Enhance sales order grid options</summary>
10
- <description>With this module you can show following options in sales order Grid&#xD;
11
- 1. Show Product Name&#xD;
12
- 2. Show Product SKU&#xD;
13
- 3. Show Customer Email</description>
14
- <notes>First Stable Release</notes>
15
  <authors><author><name>iMediaDesigns</name><user>imediadesigns</user><email>info@imediadesigns.org</email></author></authors>
16
- <date>2014-04-26</date>
17
- <time>11:54:35</time>
18
- <contents><target name="magecommunity"><dir name="Imedia"><dir name="SalesOrder"><dir name="Block"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="f5c7009c05fd6ad34e2c12822d212429"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="acfbe4ccedec3b0224637d5bd799428a"/></dir><dir name="etc"><file name="adminhtml.xml" hash="5e31103eb3e2dec25f31de455d3fb643"/><file name="config.xml" hash="016ec4612e05845ccf51fd7f246eaf14"/><file name="system.xml" hash="fe11cd11743df6f1c4bca253d3411beb"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Imedia_SalesOrder.xml" hash="85a5c0d609dd0a830a50113acadb6c5f"/></dir></target></contents>
19
  <compatible/>
20
- <dependencies><required><php><min>5.0.0</min><max>7.0.0</max></php></required></dependencies>
21
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Imedia_SalesOrder</name>
4
+ <version>1.0.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Enhance sales order grid options</summary>
10
+ <description>Enhance sales order grid options&#xD;
11
+ 1. Display Product Name&#xD;
12
+ 2. Display Product SKU&#xD;
13
+ 3. Display Customer Email</description>
14
+ <notes>2nd Stable Release</notes>
15
  <authors><author><name>iMediaDesigns</name><user>imediadesigns</user><email>info@imediadesigns.org</email></author></authors>
16
+ <date>2014-05-30</date>
17
+ <time>13:46:32</time>
18
+ <contents><target name="magecommunity"><dir name="Imedia"><dir name="SalesOrder"><dir name="Block"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="27d53a0083b55a807b08730c200f6d38"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="acfbe4ccedec3b0224637d5bd799428a"/></dir><dir name="etc"><file name="adminhtml.xml" hash="fcf5ee2ecbe69b744c3cde93970f22f5"/><file name="config.xml" hash="5afd9fb832c2d9f137608586ec119dda"/><file name="system.xml" hash="2fac1aaaf74d2129afcd6c04b382d07f"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Imedia_SalesOrder.xml" hash="85a5c0d609dd0a830a50113acadb6c5f"/></dir></target></contents>
19
  <compatible/>
20
+ <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
21
  </package>