HusseyCoding_CustomOrderGrid - Version 1.1.5

Version Notes

Fixed filtering errors, added customer group column.

Download this release

Release Info

Developer Hussey Coding
Extension HusseyCoding_CustomOrderGrid
Version 1.1.5
Comparing to
See all releases


Code changes from version 1.1.4 to 1.1.5

Files changed (6) hide show
  1. app/code/community/HusseyCoding/CustomOrderGrid/Helper/Data.php +10 -0
  2. app/code/community/HusseyCoding/CustomOrderGrid/Model/Observer.php +12 -2
  3. app/code/community/HusseyCoding/CustomOrderGrid/Model/System/Config/Source/Columns.php +1 -0
  4. app/code/community/HusseyCoding/CustomOrderGrid/Model/System/Config/Source/Sort.php +1 -0
  5. app/code/community/HusseyCoding/CustomOrderGrid/etc/config.xml +1 -1
  6. package.xml +5 -5
app/code/community/HusseyCoding/CustomOrderGrid/Helper/Data.php CHANGED
@@ -49,4 +49,14 @@ class HusseyCoding_CustomOrderGrid_Helper_Data extends Mage_Core_Helper_Abstract
49
 
50
  return $data;
51
  }
 
 
 
 
 
 
 
 
 
 
52
  }
49
 
50
  return $data;
51
  }
52
+
53
+ public function customerGroups()
54
+ {
55
+ $data = array();
56
+ foreach (Mage::getResourceModel('customer/group_collection') as $group):
57
+ $data[$group->getCustomerGroupId()] = $group->getCustomerGroupCode();
58
+ endforeach;
59
+
60
+ return $data;
61
+ }
62
  }
app/code/community/HusseyCoding/CustomOrderGrid/Model/Observer.php CHANGED
@@ -44,6 +44,7 @@ class HusseyCoding_CustomOrderGrid_Model_Observer extends Varien_Event_Observer
44
  $width = empty($columnWidths[$column]) ? null : $columnWidths[$column] . 'px';
45
  $this->_addNewColumn($column, $block, $width);
46
  endforeach;
 
47
  $block->sortColumnsByOrder();
48
  endif;
49
  endif;
@@ -63,7 +64,7 @@ class HusseyCoding_CustomOrderGrid_Model_Observer extends Varien_Event_Observer
63
  ->join(
64
  array('order' => $resource->getTableName('sales/order')),
65
  'main_table.entity_id = order.entity_id',
66
- array('is_virtual', 'shipping_method', 'coupon_code', 'customer_email', 'base_shipping_amount', 'shipping_amount', 'base_subtotal', 'subtotal', 'base_tax_amount', 'tax_amount', 'customer_is_guest', 'total_qty_ordered', 'base_discount_amount', 'total_item_count')
67
  );
68
 
69
  $billing = array('billing_company', 'billing_postcode', 'billing_region', 'billing_country');
@@ -209,7 +210,7 @@ class HusseyCoding_CustomOrderGrid_Model_Observer extends Varien_Event_Observer
209
  $block->addColumnAfter('name', array(
210
  'header' => Mage::helper('sales')->__('Product Name'),
211
  'index' => 'name',
212
- 'filter_index' => 'sku_table.name',
213
  'width' => $width
214
  ), 'real_order_id');
215
  break;
@@ -246,6 +247,15 @@ class HusseyCoding_CustomOrderGrid_Model_Observer extends Varien_Event_Observer
246
  'width' => $width
247
  ), 'real_order_id');
248
  break;
 
 
 
 
 
 
 
 
 
249
  case 'base_shipping_amount':
250
  $block->addColumnAfter('base_shipping_amount', array(
251
  'header' => Mage::helper('sales')->__('Shipping (Base)'),
44
  $width = empty($columnWidths[$column]) ? null : $columnWidths[$column] . 'px';
45
  $this->_addNewColumn($column, $block, $width);
46
  endforeach;
47
+ $block->getColumn('real_order_id')->addData(array('filter_index' => 'main_table.increment_id'));
48
  $block->sortColumnsByOrder();
49
  endif;
50
  endif;
64
  ->join(
65
  array('order' => $resource->getTableName('sales/order')),
66
  'main_table.entity_id = order.entity_id',
67
+ array('is_virtual', 'shipping_method', 'coupon_code', 'customer_email', 'base_shipping_amount', 'shipping_amount', 'base_subtotal', 'subtotal', 'base_tax_amount', 'tax_amount', 'customer_is_guest', 'total_qty_ordered', 'base_discount_amount', 'total_item_count', 'customer_group_id')
68
  );
69
 
70
  $billing = array('billing_company', 'billing_postcode', 'billing_region', 'billing_country');
210
  $block->addColumnAfter('name', array(
211
  'header' => Mage::helper('sales')->__('Product Name'),
212
  'index' => 'name',
213
+ 'filter_index' => 'items.name',
214
  'width' => $width
215
  ), 'real_order_id');
216
  break;
247
  'width' => $width
248
  ), 'real_order_id');
249
  break;
250
+ case 'customer_group_id':
251
+ $block->addColumnAfter('customer_group_id', array(
252
+ 'header' => Mage::helper('sales')->__('Customer Group'),
253
+ 'index' => 'customer_group_id',
254
+ 'width' => $width,
255
+ 'type' => 'options',
256
+ 'options' => Mage::helper('customordergrid')->customerGroups()
257
+ ), 'real_order_id');
258
+ break;
259
  case 'base_shipping_amount':
260
  $block->addColumnAfter('base_shipping_amount', array(
261
  'header' => Mage::helper('sales')->__('Shipping (Base)'),
app/code/community/HusseyCoding/CustomOrderGrid/Model/System/Config/Source/Columns.php CHANGED
@@ -58,6 +58,7 @@ class HusseyCoding_CustomOrderGrid_Model_System_Config_Source_Columns
58
  array('value' => 'billing_country', 'label' => Mage::helper('adminhtml')->__('Billing Country')),
59
  array('value' => 'shipping_country', 'label' => Mage::helper('adminhtml')->__('Ship to Country')),
60
  array('value' => 'customer_email', 'label' => Mage::helper('adminhtml')->__('Customer Email')),
 
61
  array('value' => 'customer_is_guest', 'label' => Mage::helper('adminhtml')->__('Guest Checkout'))
62
  )
63
  )
58
  array('value' => 'billing_country', 'label' => Mage::helper('adminhtml')->__('Billing Country')),
59
  array('value' => 'shipping_country', 'label' => Mage::helper('adminhtml')->__('Ship to Country')),
60
  array('value' => 'customer_email', 'label' => Mage::helper('adminhtml')->__('Customer Email')),
61
+ array('value' => 'customer_group_id', 'label' => Mage::helper('adminhtml')->__('Customer Group')),
62
  array('value' => 'customer_is_guest', 'label' => Mage::helper('adminhtml')->__('Guest Checkout'))
63
  )
64
  )
app/code/community/HusseyCoding/CustomOrderGrid/Model/System/Config/Source/Sort.php CHANGED
@@ -41,6 +41,7 @@ class HusseyCoding_CustomOrderGrid_Model_System_Config_Source_Sort
41
  array('value' => 'billing_country', 'label' => Mage::helper('adminhtml')->__('Billing Country')),
42
  array('value' => 'shipping_country', 'label' => Mage::helper('adminhtml')->__('Ship to Country')),
43
  array('value' => 'customer_email', 'label' => Mage::helper('adminhtml')->__('Customer Email')),
 
44
  array('value' => 'customer_is_guest', 'label' => Mage::helper('adminhtml')->__('Guest Checkout'))
45
  );
46
  }
41
  array('value' => 'billing_country', 'label' => Mage::helper('adminhtml')->__('Billing Country')),
42
  array('value' => 'shipping_country', 'label' => Mage::helper('adminhtml')->__('Ship to Country')),
43
  array('value' => 'customer_email', 'label' => Mage::helper('adminhtml')->__('Customer Email')),
44
+ array('value' => 'customer_group_id', 'label' => Mage::helper('adminhtml')->__('Customer Group')),
45
  array('value' => 'customer_is_guest', 'label' => Mage::helper('adminhtml')->__('Guest Checkout'))
46
  );
47
  }
app/code/community/HusseyCoding/CustomOrderGrid/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <HusseyCoding_CustomOrderGrid>
5
- <version>1.1.4</version>
6
  </HusseyCoding_CustomOrderGrid>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <HusseyCoding_CustomOrderGrid>
5
+ <version>1.1.5</version>
6
  </HusseyCoding_CustomOrderGrid>
7
  </modules>
8
  <global>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>HusseyCoding_CustomOrderGrid</name>
4
- <version>1.1.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -10,11 +10,11 @@
10
  <description>Fully customise your Magento admin order grid with Custom Order Grid.&#xD;
11
  &#xD;
12
  This extension allows you to fully customise and sort the order of columns displayed in the admin order grid. It also gives full sorting and filtering capability for all of these columns.</description>
13
- <notes>Logic fix for installs using table prefix.</notes>
14
  <authors><author><name>Hussey Coding</name><user>husseycoding</user><email>info@husseycoding.co.uk</email></author></authors>
15
- <date>2016-02-23</date>
16
- <time>09:54:00</time>
17
- <contents><target name="magecommunity"><dir name="HusseyCoding"><dir name="CustomOrderGrid"><dir name="Block"><dir name="Sales"><dir name="Order"><dir name="Grid"><dir name="Renderer"><file name="TrackingNumber.php" hash="563be82efb84dd74f6e81ca4cb1ef831"/></dir></dir></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="d396189f4d2de7db2e93919693b12f48"/><file name="config.xml" hash="278e1223f17daaafe946c302b86a0560"/><file name="system.xml" hash="5a39bb373b18c81ffcede9da2d28a9f1"/></dir><dir name="Helper"><file name="Data.php" hash="9c4c8447a849b4c23e70f8a492a4dd18"/></dir><dir name="Model"><file name="Observer.php" hash="1cc495286c3cd5e99aac13c2a0c757e5"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Columns.php" hash="431aa07c84b5bb8bea9b4e4f738d2ddd"/><file name="Direction.php" hash="c0e3e328ac9960f9e6d53a8447a24ce2"/><file name="Sort.php" hash="065b1a959eeaa73da03f6794c783e549"/></dir></dir></dir></dir></dir><dir name="Common"><dir name="etc"><file name="system.xml" hash="6c9ba9f227b9adfc9abf97f17b46fdbf"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="HusseyCoding_CustomOrderGrid.xml" hash="89294e8741d10cfcc680a4a1e7ed4e56"/><file name="HusseyCoding_Common.xml" hash="31e82d3d9b3179c2fa9e002f9669da47"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="customordergrid.xml" hash="5210c598b88e2dc6975eaa2936b1c08a"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="customordergrid"><dir name="js"><file name="customordergrid.js" hash="f02aad55b3a3e46e86149c4c09ee6f7e"/></dir></dir></dir></dir></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>HusseyCoding_CustomOrderGrid</name>
4
+ <version>1.1.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
10
  <description>Fully customise your Magento admin order grid with Custom Order Grid.&#xD;
11
  &#xD;
12
  This extension allows you to fully customise and sort the order of columns displayed in the admin order grid. It also gives full sorting and filtering capability for all of these columns.</description>
13
+ <notes>Fixed filtering errors, added customer group column.</notes>
14
  <authors><author><name>Hussey Coding</name><user>husseycoding</user><email>info@husseycoding.co.uk</email></author></authors>
15
+ <date>2016-04-12</date>
16
+ <time>12:31:57</time>
17
+ <contents><target name="magecommunity"><dir name="HusseyCoding"><dir name="CustomOrderGrid"><dir name="Block"><dir name="Sales"><dir name="Order"><dir name="Grid"><dir name="Renderer"><file name="TrackingNumber.php" hash="563be82efb84dd74f6e81ca4cb1ef831"/></dir></dir></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="d396189f4d2de7db2e93919693b12f48"/><file name="config.xml" hash="74e09d919f2d7a1911e3418107e0bb33"/><file name="system.xml" hash="5a39bb373b18c81ffcede9da2d28a9f1"/></dir><dir name="Helper"><file name="Data.php" hash="062ba9e538978a5f95bbba83a88fe969"/></dir><dir name="Model"><file name="Observer.php" hash="71785f76b164444fb4e5241a444774c2"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Columns.php" hash="539609cd408e0507580b2126c5e9bc38"/><file name="Direction.php" hash="c0e3e328ac9960f9e6d53a8447a24ce2"/><file name="Sort.php" hash="8fea7b4dc22576af6ccdcf505d5d0b58"/></dir></dir></dir></dir></dir><dir name="Common"><dir name="etc"><file name="system.xml" hash="6c9ba9f227b9adfc9abf97f17b46fdbf"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="HusseyCoding_CustomOrderGrid.xml" hash="89294e8741d10cfcc680a4a1e7ed4e56"/><file name="HusseyCoding_Common.xml" hash="31e82d3d9b3179c2fa9e002f9669da47"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="customordergrid.xml" hash="5210c598b88e2dc6975eaa2936b1c08a"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="customordergrid"><dir name="js"><file name="customordergrid.js" hash="f02aad55b3a3e46e86149c4c09ee6f7e"/></dir></dir></dir></dir></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>