Magemaven_OrderComment - Version 1.0.5

Version Notes

Bugfix release.

Fixed broken paginator in orders grid
Added workaround to resolve conflict with Seamless Delete Order

Download this release

Release Info

Developer Sergey Storchay
Extension Magemaven_OrderComment
Version 1.0.5
Comparing to
See all releases


Code changes from version 1.0.4 to 1.0.5

Files changed (10) hide show
  1. app/code/community/Magemaven/OrderComment/Block/Adminhtml/Sales/Order/Grid.php +80 -60
  2. app/code/community/Magemaven/OrderComment/Block/Checkout/Agreements.php +24 -24
  3. app/code/community/Magemaven/OrderComment/Helper/Data.php +15 -15
  4. app/code/community/Magemaven/OrderComment/Model/Mysql4/Order/Grid/Collection.php +14 -14
  5. app/code/community/Magemaven/OrderComment/Model/Observer.php +33 -33
  6. app/code/community/Magemaven/OrderComment/Model/Resource/Order/Grid/Collection.php +45 -35
  7. app/code/community/Magemaven/OrderComment/etc/config.xml +78 -78
  8. app/design/frontend/base/default/template/ordercomment/checkout/agreements.phtml +50 -50
  9. app/etc/modules/Magemaven_OrderComment.xml +26 -25
  10. package.xml +6 -7
app/code/community/Magemaven/OrderComment/Block/Adminhtml/Sales/Order/Grid.php CHANGED
@@ -1,60 +1,80 @@
1
- <?php
2
- /**
3
- * This source file is subject to the Academic Free License (AFL 3.0)
4
- * that is bundled with this package in the file LICENSE_AFL.txt.
5
- * It is also available through the world-wide-web at this URL:
6
- * http://opensource.org/licenses/afl-3.0.php
7
- *
8
- * @category Magemaven
9
- * @package Magemaven_OrderComment
10
- * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
- */
13
- class Magemaven_OrderComment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_Block_Sales_Order_Grid
14
- {
15
- /**
16
- * Columns, that become ambiguous after join
17
- *
18
- * @var array
19
- */
20
- protected $_ambiguousColumns = array(
21
- 'status',
22
- 'created_at',
23
- );
24
-
25
- /**
26
- * Retrieve collection class
27
- *
28
- * @return string
29
- */
30
- protected function _getCollectionClass()
31
- {
32
- return 'ordercomment/order_grid_collection';
33
- }
34
-
35
- /**
36
- * Prepare grid columns
37
- *
38
- * @return Magemaven_OrderComment_Block_Adminhtml_Sales_Order_Grid
39
- */
40
- protected function _prepareColumns()
41
- {
42
- parent::_prepareColumns();
43
-
44
- // Add order comment to grid
45
- $this->addColumn('ordercomment', array(
46
- 'header' => Mage::helper('ordercomment')->__('Order Comment'),
47
- 'index' => 'ordercomment',
48
- 'filter_index' => 'ordercomment_table.comment',
49
- ));
50
-
51
- // Fix integrity constraint violation in SELECT
52
- foreach ($this->_ambiguousColumns as $index) {
53
- if (isset($this->_columns[$index])) {
54
- $this->_columns[$index]->setFilterIndex('main_table.' . $index);
55
- }
56
- }
57
-
58
- return $this;
59
- }
60
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * This source file is subject to the Academic Free License (AFL 3.0)
4
+ * that is bundled with this package in the file LICENSE_AFL.txt.
5
+ * It is also available through the world-wide-web at this URL:
6
+ * http://opensource.org/licenses/afl-3.0.php
7
+ *
8
+ * @category Magemaven
9
+ * @package Magemaven_OrderComment
10
+ * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
+ */
13
+ class Magemaven_OrderComment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_Block_Sales_Order_Grid
14
+ {
15
+ /**
16
+ * Columns, that become ambiguous after join
17
+ *
18
+ * @var array
19
+ */
20
+ protected $_ambiguousColumns = array(
21
+ 'status',
22
+ 'created_at',
23
+ );
24
+
25
+ /**
26
+ * Retrieve collection class
27
+ *
28
+ * @return string
29
+ */
30
+ protected function _getCollectionClass()
31
+ {
32
+ return 'ordercomment/order_grid_collection';
33
+ }
34
+
35
+ /**
36
+ * Prepare grid columns
37
+ *
38
+ * @return Magemaven_OrderComment_Block_Adminhtml_Sales_Order_Grid
39
+ */
40
+ protected function _prepareColumns()
41
+ {
42
+ parent::_prepareColumns();
43
+
44
+ // Add order comment to grid
45
+ $this->addColumn('ordercomment', array(
46
+ 'header' => Mage::helper('ordercomment')->__('Order Comment'),
47
+ 'index' => 'ordercomment',
48
+ 'filter_index' => 'ordercomment_table.comment',
49
+ ));
50
+
51
+ // Fix integrity constraint violation in SELECT
52
+ foreach ($this->_ambiguousColumns as $index) {
53
+ if (isset($this->_columns[$index])) {
54
+ $this->_columns[$index]->setFilterIndex('main_table.' . $index);
55
+ }
56
+ }
57
+
58
+ return $this;
59
+ }
60
+
61
+ /**
62
+ * Prepare grid massactions
63
+ *
64
+ * @return Magemaven_OrderComment_Block_Adminhtml_Sales_Order_Grid
65
+ */
66
+ protected function _prepareMassaction()
67
+ {
68
+ parent::_prepareMassaction();
69
+
70
+ // VERY dirty hack to resolve conflict with Seamless Delete Order
71
+ $modules = (array)Mage::getConfig()->getNode('modules')->children();
72
+ if (isset($modules['EM_DeleteOrder']) && $modules['EM_DeleteOrder']->is('active')) {
73
+ $this->getMassactionBlock()->addItem('delete_order', array(
74
+ 'label'=> Mage::helper('sales')->__('Delete order'),
75
+ 'url' => $this->getUrl('*/sales_order/deleteorder'),
76
+ ));
77
+ }
78
+ return $this;
79
+ }
80
+ }
app/code/community/Magemaven/OrderComment/Block/Checkout/Agreements.php CHANGED
@@ -1,25 +1,25 @@
1
- <?php
2
- /**
3
- * This source file is subject to the Academic Free License (AFL 3.0)
4
- * that is bundled with this package in the file LICENSE_AFL.txt.
5
- * It is also available through the world-wide-web at this URL:
6
- * http://opensource.org/licenses/afl-3.0.php
7
- *
8
- * @category Magemaven
9
- * @package Magemaven_OrderComment
10
- * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
- */
13
- class Magemaven_OrderComment_Block_Checkout_Agreements extends Mage_Checkout_Block_Agreements
14
- {
15
- /**
16
- * Override block template
17
- *
18
- * @return string
19
- */
20
- protected function _toHtml()
21
- {
22
- $this->setTemplate('ordercomment/checkout/agreements.phtml');
23
- return parent::_toHtml();
24
- }
25
  }
1
+ <?php
2
+ /**
3
+ * This source file is subject to the Academic Free License (AFL 3.0)
4
+ * that is bundled with this package in the file LICENSE_AFL.txt.
5
+ * It is also available through the world-wide-web at this URL:
6
+ * http://opensource.org/licenses/afl-3.0.php
7
+ *
8
+ * @category Magemaven
9
+ * @package Magemaven_OrderComment
10
+ * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
+ */
13
+ class Magemaven_OrderComment_Block_Checkout_Agreements extends Mage_Checkout_Block_Agreements
14
+ {
15
+ /**
16
+ * Override block template
17
+ *
18
+ * @return string
19
+ */
20
+ protected function _toHtml()
21
+ {
22
+ $this->setTemplate('ordercomment/checkout/agreements.phtml');
23
+ return parent::_toHtml();
24
+ }
25
  }
app/code/community/Magemaven/OrderComment/Helper/Data.php CHANGED
@@ -1,16 +1,16 @@
1
- <?php
2
- /**
3
- * This source file is subject to the Academic Free License (AFL 3.0)
4
- * that is bundled with this package in the file LICENSE_AFL.txt.
5
- * It is also available through the world-wide-web at this URL:
6
- * http://opensource.org/licenses/afl-3.0.php
7
- *
8
- * @category Magemaven
9
- * @package Magemaven_OrderComment
10
- * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
- */
13
- class Magemaven_OrderComment_Helper_Data extends Mage_Core_Helper_Abstract
14
- {
15
-
16
  }
1
+ <?php
2
+ /**
3
+ * This source file is subject to the Academic Free License (AFL 3.0)
4
+ * that is bundled with this package in the file LICENSE_AFL.txt.
5
+ * It is also available through the world-wide-web at this URL:
6
+ * http://opensource.org/licenses/afl-3.0.php
7
+ *
8
+ * @category Magemaven
9
+ * @package Magemaven_OrderComment
10
+ * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
+ */
13
+ class Magemaven_OrderComment_Helper_Data extends Mage_Core_Helper_Abstract
14
+ {
15
+
16
  }
app/code/community/Magemaven/OrderComment/Model/Mysql4/Order/Grid/Collection.php CHANGED
@@ -1,15 +1,15 @@
1
- <?php
2
- /**
3
- * This source file is subject to the Academic Free License (AFL 3.0)
4
- * that is bundled with this package in the file LICENSE_AFL.txt.
5
- * It is also available through the world-wide-web at this URL:
6
- * http://opensource.org/licenses/afl-3.0.php
7
- *
8
- * @category Magemaven
9
- * @package Magemaven_OrderComment
10
- * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
- */
13
- class Magemaven_OrderComment_Model_Mysql4_Order_Grid_Collection extends Mage_Sales_Model_Resource_Order_Grid_Collection
14
- {
15
  }
1
+ <?php
2
+ /**
3
+ * This source file is subject to the Academic Free License (AFL 3.0)
4
+ * that is bundled with this package in the file LICENSE_AFL.txt.
5
+ * It is also available through the world-wide-web at this URL:
6
+ * http://opensource.org/licenses/afl-3.0.php
7
+ *
8
+ * @category Magemaven
9
+ * @package Magemaven_OrderComment
10
+ * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
+ */
13
+ class Magemaven_OrderComment_Model_Mysql4_Order_Grid_Collection extends Mage_Sales_Model_Resource_Order_Grid_Collection
14
+ {
15
  }
app/code/community/Magemaven/OrderComment/Model/Observer.php CHANGED
@@ -1,34 +1,34 @@
1
- <?php
2
- /**
3
- * This source file is subject to the Academic Free License (AFL 3.0)
4
- * that is bundled with this package in the file LICENSE_AFL.txt.
5
- * It is also available through the world-wide-web at this URL:
6
- * http://opensource.org/licenses/afl-3.0.php
7
- *
8
- * @category Magemaven
9
- * @package Magemaven_OrderComment
10
- * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
- */
13
- class Magemaven_OrderComment_Model_Observer extends Varien_Object
14
- {
15
- /**
16
- * Save comment from agreement form to order
17
- *
18
- * @param $observer
19
- */
20
- public function saveOrderComment($observer)
21
- {
22
- $orderComment = Mage::app()->getRequest()->getPost('ordercomment');
23
- if (is_array($orderComment) && isset($orderComment['comment'])) {
24
- $comment = trim($orderComment['comment']);
25
-
26
- if (!empty($comment)) {
27
- $order = $observer->getEvent()->getOrder();
28
- $order->setCustomerComment($comment);
29
- $order->setCustomerNoteNotify(true);
30
- $order->setCustomerNote($comment);
31
- }
32
- }
33
- }
34
  }
1
+ <?php
2
+ /**
3
+ * This source file is subject to the Academic Free License (AFL 3.0)
4
+ * that is bundled with this package in the file LICENSE_AFL.txt.
5
+ * It is also available through the world-wide-web at this URL:
6
+ * http://opensource.org/licenses/afl-3.0.php
7
+ *
8
+ * @category Magemaven
9
+ * @package Magemaven_OrderComment
10
+ * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
+ */
13
+ class Magemaven_OrderComment_Model_Observer extends Varien_Object
14
+ {
15
+ /**
16
+ * Save comment from agreement form to order
17
+ *
18
+ * @param $observer
19
+ */
20
+ public function saveOrderComment($observer)
21
+ {
22
+ $orderComment = Mage::app()->getRequest()->getPost('ordercomment');
23
+ if (is_array($orderComment) && isset($orderComment['comment'])) {
24
+ $comment = trim($orderComment['comment']);
25
+
26
+ if (!empty($comment)) {
27
+ $order = $observer->getEvent()->getOrder();
28
+ $order->setCustomerComment($comment);
29
+ $order->setCustomerNoteNotify(true);
30
+ $order->setCustomerNote($comment);
31
+ }
32
+ }
33
+ }
34
  }
app/code/community/Magemaven/OrderComment/Model/Resource/Order/Grid/Collection.php CHANGED
@@ -1,35 +1,45 @@
1
- <?php
2
- /**
3
- * This source file is subject to the Academic Free License (AFL 3.0)
4
- * that is bundled with this package in the file LICENSE_AFL.txt.
5
- * It is also available through the world-wide-web at this URL:
6
- * http://opensource.org/licenses/afl-3.0.php
7
- *
8
- * @category Magemaven
9
- * @package Magemaven_OrderComment
10
- * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
- */
13
- class Magemaven_OrderComment_Model_Resource_Order_Grid_Collection extends Mage_Sales_Model_Mysql4_Order_Grid_Collection
14
- {
15
- /**
16
- * Init collection select
17
- *
18
- * @return Mage_Core_Model_Resource_Db_Collection_Abstract
19
- */
20
- protected function _initSelect()
21
- {
22
- parent::_initSelect();
23
-
24
- // Join order comment
25
- $this->getSelect()->joinLeft(
26
- array('ordercomment_table' => $this->getTable('sales/order_status_history')),
27
- 'main_table.entity_id = ordercomment_table.parent_id AND ordercomment_table.comment IS NOT NULL',
28
- array(
29
- 'ordercomment' => 'ordercomment_table.comment',
30
- )
31
- )->group('main_table.entity_id');
32
-
33
- return $this;
34
- }
35
- }
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * This source file is subject to the Academic Free License (AFL 3.0)
4
+ * that is bundled with this package in the file LICENSE_AFL.txt.
5
+ * It is also available through the world-wide-web at this URL:
6
+ * http://opensource.org/licenses/afl-3.0.php
7
+ *
8
+ * @category Magemaven
9
+ * @package Magemaven_OrderComment
10
+ * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
+ */
13
+ class Magemaven_OrderComment_Model_Resource_Order_Grid_Collection extends Mage_Sales_Model_Mysql4_Order_Grid_Collection
14
+ {
15
+ /**
16
+ * Init collection select
17
+ *
18
+ * @return Mage_Core_Model_Resource_Db_Collection_Abstract
19
+ */
20
+ protected function _initSelect()
21
+ {
22
+ parent::_initSelect();
23
+
24
+ // Join order comment
25
+ $this->getSelect()->joinLeft(
26
+ array('ordercomment_table' => $this->getTable('sales/order_status_history')),
27
+ 'main_table.entity_id = ordercomment_table.parent_id AND ordercomment_table.comment IS NOT NULL',
28
+ array(
29
+ 'ordercomment' => 'ordercomment_table.comment',
30
+ )
31
+ )->group('main_table.entity_id');
32
+
33
+ return $this;
34
+ }
35
+
36
+ /**
37
+ * Init collection count select
38
+ *
39
+ * @return Varien_Db_Select
40
+ */
41
+ public function getSelectCountSql()
42
+ {
43
+ return parent::getSelectCountSql()->reset(Zend_Db_Select::GROUP);
44
+ }
45
+ }
app/code/community/Magemaven/OrderComment/etc/config.xml CHANGED
@@ -1,78 +1,78 @@
1
- <?xml version="1.0"?>
2
- <!--
3
- /**
4
- * This source file is subject to the Academic Free License (AFL 3.0)
5
- * that is bundled with this package in the file LICENSE_AFL.txt.
6
- * It is also available through the world-wide-web at this URL:
7
- * http://opensource.org/licenses/afl-3.0.php
8
- *
9
- * @category Magemaven
10
- * @package Magemaven_OrderComment
11
- * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
12
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
13
- */
14
- -->
15
- <config>
16
- <modules>
17
- <Magemaven_OrderComment>
18
- <version>1.0.4.0</version>
19
- </Magemaven_OrderComment>
20
- </modules>
21
- <global>
22
- <models>
23
- <ordercomment>
24
- <class>Magemaven_OrderComment_Model</class>
25
- <resourceModel>ordercomment_resource</resourceModel>
26
- </ordercomment>
27
- <ordercomment_resource>
28
- <class>Magemaven_OrderComment_Model_Resource</class>
29
- <deprecatedNode>ordercomment_mysql4</deprecatedNode>
30
- </ordercomment_resource>
31
- <sales_resource>
32
- <rewrite>
33
- <order_grid_collection>Magemaven_OrderComment_Model_Mysql4_Order_Grid_Collection</order_grid_collection>
34
- </rewrite>
35
- </sales_resource>
36
- </models>
37
- <helpers>
38
- <ordercomment>
39
- <class>Magemaven_OrderComment_Helper</class>
40
- </ordercomment>
41
- </helpers>
42
- <blocks>
43
- <ordercomment>
44
- <class>Magemaven_OrderComment_Block</class>
45
- </ordercomment>
46
- <checkout>
47
- <rewrite>
48
- <agreements>Magemaven_OrderComment_Block_Checkout_Agreements</agreements>
49
- </rewrite>
50
- </checkout>
51
- <adminhtml>
52
- <rewrite>
53
- <sales_order_grid>Magemaven_OrderComment_Block_Adminhtml_Sales_Order_Grid</sales_order_grid>
54
- </rewrite>
55
- </adminhtml>
56
- </blocks>
57
- </global>
58
- <frontend>
59
- <events>
60
- <checkout_type_onepage_save_order>
61
- <observers>
62
- <saveCustomerComment>
63
- <class>Magemaven_OrderComment_Model_Observer</class>
64
- <method>saveOrderComment</method>
65
- </saveCustomerComment>
66
- </observers>
67
- </checkout_type_onepage_save_order>
68
- <checkout_type_multishipping_create_orders_single>
69
- <observers>
70
- <saveCustomerComment>
71
- <class>Magemaven_OrderComment_Model_Observer</class>
72
- <method>saveOrderComment</method>
73
- </saveCustomerComment>
74
- </observers>
75
- </checkout_type_multishipping_create_orders_single>
76
- </events>
77
- </frontend>
78
- </config>
1
+ <?xml version="1.0"?>
2
+ <!--
3
+ /**
4
+ * This source file is subject to the Academic Free License (AFL 3.0)
5
+ * that is bundled with this package in the file LICENSE_AFL.txt.
6
+ * It is also available through the world-wide-web at this URL:
7
+ * http://opensource.org/licenses/afl-3.0.php
8
+ *
9
+ * @category Magemaven
10
+ * @package Magemaven_OrderComment
11
+ * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
12
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
13
+ */
14
+ -->
15
+ <config>
16
+ <modules>
17
+ <Magemaven_OrderComment>
18
+ <version>1.0.5.0</version>
19
+ </Magemaven_OrderComment>
20
+ </modules>
21
+ <global>
22
+ <models>
23
+ <ordercomment>
24
+ <class>Magemaven_OrderComment_Model</class>
25
+ <resourceModel>ordercomment_resource</resourceModel>
26
+ </ordercomment>
27
+ <ordercomment_resource>
28
+ <class>Magemaven_OrderComment_Model_Resource</class>
29
+ <deprecatedNode>ordercomment_mysql4</deprecatedNode>
30
+ </ordercomment_resource>
31
+ <sales_resource>
32
+ <rewrite>
33
+ <order_grid_collection>Magemaven_OrderComment_Model_Mysql4_Order_Grid_Collection</order_grid_collection>
34
+ </rewrite>
35
+ </sales_resource>
36
+ </models>
37
+ <helpers>
38
+ <ordercomment>
39
+ <class>Magemaven_OrderComment_Helper</class>
40
+ </ordercomment>
41
+ </helpers>
42
+ <blocks>
43
+ <ordercomment>
44
+ <class>Magemaven_OrderComment_Block</class>
45
+ </ordercomment>
46
+ <checkout>
47
+ <rewrite>
48
+ <agreements>Magemaven_OrderComment_Block_Checkout_Agreements</agreements>
49
+ </rewrite>
50
+ </checkout>
51
+ <adminhtml>
52
+ <rewrite>
53
+ <sales_order_grid>Magemaven_OrderComment_Block_Adminhtml_Sales_Order_Grid</sales_order_grid>
54
+ </rewrite>
55
+ </adminhtml>
56
+ </blocks>
57
+ </global>
58
+ <frontend>
59
+ <events>
60
+ <checkout_type_onepage_save_order>
61
+ <observers>
62
+ <saveCustomerComment>
63
+ <class>Magemaven_OrderComment_Model_Observer</class>
64
+ <method>saveOrderComment</method>
65
+ </saveCustomerComment>
66
+ </observers>
67
+ </checkout_type_onepage_save_order>
68
+ <checkout_type_multishipping_create_orders_single>
69
+ <observers>
70
+ <saveCustomerComment>
71
+ <class>Magemaven_OrderComment_Model_Observer</class>
72
+ <method>saveOrderComment</method>
73
+ </saveCustomerComment>
74
+ </observers>
75
+ </checkout_type_multishipping_create_orders_single>
76
+ </events>
77
+ </frontend>
78
+ </config>
app/design/frontend/base/default/template/ordercomment/checkout/agreements.phtml CHANGED
@@ -1,50 +1,50 @@
1
- <?php
2
- /**
3
- * This source file is subject to the Academic Free License (AFL 3.0)
4
- * that is bundled with this package in the file LICENSE_AFL.txt.
5
- * It is also available through the world-wide-web at this URL:
6
- * http://opensource.org/licenses/afl-3.0.php
7
- *
8
- * @category design
9
- * @package base_default
10
- * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
- */
13
- ?>
14
- <form action="" id="checkout-agreements" onsubmit="return false;">
15
- <div class="buttons-set">
16
- <ul class="form-list">
17
- <li>
18
- <fieldset>
19
- <ul>
20
- <li class="wide">
21
- <label for="ordercomment-comment"><?php echo Mage::helper('ordercomment')->__('Order Comment') ?></label>
22
- <div class="input-box">
23
- <textarea id="ordercomment-comment" class="input-text validation-passed" name="ordercomment[comment]" title="<?php echo $this->__('Order Comment') ?>" rows="5" cols="10"></textarea>
24
- </div>
25
- </li>
26
- </ul>
27
- </fieldset>
28
- </li>
29
- </ul>
30
- </div>
31
-
32
- <?php if ($this->getAgreements()): ?>
33
- <ol class="checkout-agreements">
34
- <?php foreach ($this->getAgreements() as $_a): ?>
35
- <li>
36
- <div class="agreement-content"<?php echo ($_a->getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>>
37
- <?php if ($_a->getIsHtml()):?>
38
- <?php echo $_a->getContent() ?>
39
- <?php else:?>
40
- <?php echo nl2br($this->htmlEscape($_a->getContent())) ?>
41
- <?php endif; ?>
42
- </div>
43
- <p class="agree">
44
- <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->htmlEscape($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->htmlEscape($_a->getCheckboxText()) ?></label>
45
- </p>
46
- </li>
47
- <?php endforeach ?>
48
- </ol>
49
- <?php endif; ?>
50
- </form>
1
+ <?php
2
+ /**
3
+ * This source file is subject to the Academic Free License (AFL 3.0)
4
+ * that is bundled with this package in the file LICENSE_AFL.txt.
5
+ * It is also available through the world-wide-web at this URL:
6
+ * http://opensource.org/licenses/afl-3.0.php
7
+ *
8
+ * @category design
9
+ * @package base_default
10
+ * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
11
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
12
+ */
13
+ ?>
14
+ <form action="" id="checkout-agreements" onsubmit="return false;">
15
+ <div class="buttons-set">
16
+ <ul class="form-list">
17
+ <li>
18
+ <fieldset>
19
+ <ul>
20
+ <li class="wide">
21
+ <label for="ordercomment-comment"><?php echo Mage::helper('ordercomment')->__('Order Comment') ?></label>
22
+ <div class="input-box">
23
+ <textarea id="ordercomment-comment" class="input-text validation-passed" name="ordercomment[comment]" title="<?php echo $this->__('Order Comment') ?>" rows="5" cols="10"></textarea>
24
+ </div>
25
+ </li>
26
+ </ul>
27
+ </fieldset>
28
+ </li>
29
+ </ul>
30
+ </div>
31
+
32
+ <?php if ($this->getAgreements()): ?>
33
+ <ol class="checkout-agreements">
34
+ <?php foreach ($this->getAgreements() as $_a): ?>
35
+ <li>
36
+ <div class="agreement-content"<?php echo ($_a->getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>>
37
+ <?php if ($_a->getIsHtml()):?>
38
+ <?php echo $_a->getContent() ?>
39
+ <?php else:?>
40
+ <?php echo nl2br($this->htmlEscape($_a->getContent())) ?>
41
+ <?php endif; ?>
42
+ </div>
43
+ <p class="agree">
44
+ <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->htmlEscape($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->htmlEscape($_a->getCheckboxText()) ?></label>
45
+ </p>
46
+ </li>
47
+ <?php endforeach ?>
48
+ </ol>
49
+ <?php endif; ?>
50
+ </form>
app/etc/modules/Magemaven_OrderComment.xml CHANGED
@@ -1,25 +1,26 @@
1
- <?xml version="1.0"?>
2
- <!--
3
- /**
4
- * This source file is subject to the Academic Free License (AFL 3.0)
5
- * that is bundled with this package in the file LICENSE_AFL.txt.
6
- * It is also available through the world-wide-web at this URL:
7
- * http://opensource.org/licenses/afl-3.0.php
8
- *
9
- * @category Magemaven
10
- * @package Magemaven_OrderComment
11
- * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
12
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
13
- */
14
- -->
15
- <config>
16
- <modules>
17
- <Magemaven_OrderComment>
18
- <active>true</active>
19
- <codePool>community</codePool>
20
- <depends>
21
- <Mage_Checkout />
22
- </depends>
23
- </Magemaven_OrderComment>
24
- </modules>
25
- </config>
 
1
+ <?xml version="1.0"?>
2
+ <!--
3
+ /**
4
+ * This source file is subject to the Academic Free License (AFL 3.0)
5
+ * that is bundled with this package in the file LICENSE_AFL.txt.
6
+ * It is also available through the world-wide-web at this URL:
7
+ * http://opensource.org/licenses/afl-3.0.php
8
+ *
9
+ * @category Magemaven
10
+ * @package Magemaven_OrderComment
11
+ * @copyright Copyright (c) 2011-2012 Sergey Storchay <r8@r8.com.ua>
12
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
13
+ */
14
+ -->
15
+ <config>
16
+ <modules>
17
+ <Magemaven_OrderComment>
18
+ <active>true</active>
19
+ <codePool>community</codePool>
20
+ <depends>
21
+ <Mage_Checkout />
22
+ <Mage_Sales />
23
+ </depends>
24
+ </Magemaven_OrderComment>
25
+ </modules>
26
+ </config>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magemaven_OrderComment</name>
4
- <version>1.0.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/academic.php">AFL 3.0</license>
7
  <channel>community</channel>
@@ -10,13 +10,12 @@
10
  <description>Allows customer to specify optional comment during order placing.</description>
11
  <notes>Bugfix release.&#xD;
12
  &#xD;
13
- Fixed No orders in magento backend error&#xD;
14
- Fixed integrity constraint violation error while filtering&#xD;
15
- Fixed fatal error in Orders tab of customer edit screen</notes>
16
  <authors><author><name>Sergey Storchay</name><user>magemaven</user><email>r8@r8.com.ua</email></author></authors>
17
- <date>2012-03-11</date>
18
- <time>08:35:33</time>
19
- <contents><target name="mageetc"><dir name="modules"><file name="Magemaven_OrderComment.xml" hash="1722cb37ea9d60fcd2d540f705cf5dfb"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="ordercomment"><dir name="checkout"><file name="agreements.phtml" hash="19c7a999d95179511b43855993c7e224"/></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Magemaven"><dir name="OrderComment"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="785cc0f1a74978d9b1f6b9015ac1bd20"/></dir></dir></dir><dir name="Checkout"><file name="Agreements.php" hash="eb070d363d8d2e95681925d05f0730a7"/></dir></dir><dir name="Helper"><file name="Data.php" hash="210fa2d4d4c47dc41d0dc8c9d9a64a3e"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Order"><dir name="Grid"><file name="Collection.php" hash="d9cd9897fa42c4075b41d139b64892e4"/></dir></dir></dir><file name="Observer.php" hash="7dccb4842a7b9ac6b22c1622f78ab5e4"/><dir name="Resource"><dir name="Order"><dir name="Grid"><file name="Collection.php" hash="2cb24e5003b67ab377cda26b178ff087"/></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="0ccad17dc85ced4b48ac12d9806139ca"/></dir></dir></dir></target></contents>
20
  <compatible/>
21
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
22
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magemaven_OrderComment</name>
4
+ <version>1.0.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/academic.php">AFL 3.0</license>
7
  <channel>community</channel>
10
  <description>Allows customer to specify optional comment during order placing.</description>
11
  <notes>Bugfix release.&#xD;
12
  &#xD;
13
+ Fixed broken paginator in orders grid&#xD;
14
+ Added workaround to resolve conflict with Seamless Delete Order</notes>
 
15
  <authors><author><name>Sergey Storchay</name><user>magemaven</user><email>r8@r8.com.ua</email></author></authors>
16
+ <date>2012-06-09</date>
17
+ <time>08:26:12</time>
18
+ <contents><target name="mageetc"><dir name="modules"><file name="Magemaven_OrderComment.xml" hash="878a9262e6d855cb2624591c46555ec4"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="ordercomment"><dir name="checkout"><file name="agreements.phtml" hash="f4f205e21f78d9250bc8c846d94a4924"/></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Magemaven"><dir name="OrderComment"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="7eeda93e100cc9f674978a7d173fe861"/></dir></dir></dir><dir name="Checkout"><file name="Agreements.php" hash="60527197f00214c2dd09815e0c0e24da"/></dir></dir><dir name="Helper"><file name="Data.php" hash="21bdf034ce4e73b86ac1abb5fd2c95e7"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Order"><dir name="Grid"><file name="Collection.php" hash="7b734d707fea6e038d3359eeefe4b473"/></dir></dir></dir><file name="Observer.php" hash="ea382dc1a765eca4f9944632a97fe9f4"/><dir name="Resource"><dir name="Order"><dir name="Grid"><file name="Collection.php" hash="414c5da53ec8a50b174a0502512c2139"/></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="f097313427d90f2e74af98f0503067e9"/></dir></dir></dir></target></contents>
19
  <compatible/>
20
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
21
  </package>