HusseyCoding_CustomOrderGrid - Version 1.1.6

Version Notes

Fixed export error, corrected product count rendering.

Download this release

Release Info

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


Code changes from version 1.1.5 to 1.1.6

Files changed (3) hide show
  1. app/code/community/HusseyCoding/CustomOrderGrid/Model/Observer.php +5 -3
  2. app/code/community/HusseyCoding/CustomOrderGrid/etc/config.xml +1 -1
  3. package.xml +5 -5
app/code/community/HusseyCoding/CustomOrderGrid/Model/Observer.php CHANGED
@@ -4,7 +4,9 @@ class HusseyCoding_CustomOrderGrid_Model_Observer extends Varien_Event_Observer
4
  public function adminhtmlCoreBlockAbstractPrepareLayoutBefore($observer)
5
  {
6
  if ($observer->getBlock()->getType() == 'adminhtml/widget_grid_massaction'):
7
- if ($block = Mage::app()->getLayout()->getBlock('sales_order.grid')):
 
 
8
  if ($this->_isEnabled() && $block->getColumns()):
9
  $sort = Mage::getStoreConfig('customordergrid/configure/columnsort');
10
  if (!$sort || $sort == 'tracking_number'):
@@ -359,7 +361,7 @@ class HusseyCoding_CustomOrderGrid_Model_Observer extends Varien_Event_Observer
359
  'header' => Mage::helper('sales')->__('Product Count'),
360
  'index' => 'total_item_count',
361
  'filter_index' => 'order.total_item_count',
362
- 'type' => 'currency',
363
  'width' => $width
364
  ), 'real_order_id');
365
  break;
@@ -368,7 +370,7 @@ class HusseyCoding_CustomOrderGrid_Model_Observer extends Varien_Event_Observer
368
  'header' => Mage::helper('sales')->__('Product Quantity'),
369
  'index' => 'total_qty_ordered',
370
  'filter_index' => 'order.total_qty_ordered',
371
- 'type' => 'currency',
372
  'width' => $width
373
  ), 'real_order_id');
374
  break;
4
  public function adminhtmlCoreBlockAbstractPrepareLayoutBefore($observer)
5
  {
6
  if ($observer->getBlock()->getType() == 'adminhtml/widget_grid_massaction'):
7
+ $action = Mage::app()->getRequest()->getActionName();
8
+ $block = strpos($action, 'export') !== false && Mage::app()->getLayout()->getBlock('ANONYMOUS_0') ? Mage::app()->getLayout()->getBlock('ANONYMOUS_0') : Mage::app()->getLayout()->getBlock('sales_order.grid');
9
+ if ($block):
10
  if ($this->_isEnabled() && $block->getColumns()):
11
  $sort = Mage::getStoreConfig('customordergrid/configure/columnsort');
12
  if (!$sort || $sort == 'tracking_number'):
361
  'header' => Mage::helper('sales')->__('Product Count'),
362
  'index' => 'total_item_count',
363
  'filter_index' => 'order.total_item_count',
364
+ 'type' => 'number',
365
  'width' => $width
366
  ), 'real_order_id');
367
  break;
370
  'header' => Mage::helper('sales')->__('Product Quantity'),
371
  'index' => 'total_qty_ordered',
372
  'filter_index' => 'order.total_qty_ordered',
373
+ 'type' => 'number',
374
  'width' => $width
375
  ), 'real_order_id');
376
  break;
app/code/community/HusseyCoding/CustomOrderGrid/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <HusseyCoding_CustomOrderGrid>
5
- <version>1.1.5</version>
6
  </HusseyCoding_CustomOrderGrid>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <HusseyCoding_CustomOrderGrid>
5
+ <version>1.1.6</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.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,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>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>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>HusseyCoding_CustomOrderGrid</name>
4
+ <version>1.1.6</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 export error, corrected product count rendering.</notes>
14
  <authors><author><name>Hussey Coding</name><user>husseycoding</user><email>info@husseycoding.co.uk</email></author></authors>
15
+ <date>2016-07-11</date>
16
+ <time>08:31:05</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="2ea535c7ad8d88da4f8ed2e22d06928c"/><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="baa55cbe0fd0f499c5edb52fc52e2e57"/><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>