From d5a67ede691d575fe042ae7b3a0309d5c03d7ef2 Mon Sep 17 00:00:00 2001 From: Ner Atillo Date: Wed, 25 Nov 2015 19:46:47 +0800 Subject: [PATCH 1/4] Add compatibility support for SUPEE-6788 --- .../Mgt/DeleteOrders/Model/Observer.php | 24 +++++++++---------- .../Deleteorders}/IndexController.php | 2 +- .../community/Mgt/DeleteOrders/etc/config.xml | 10 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) rename htdocs/app/code/community/Mgt/DeleteOrders/controllers/{ => Adminhtml/Deleteorders}/IndexController.php (96%) mode change 100755 => 100644 diff --git a/htdocs/app/code/community/Mgt/DeleteOrders/Model/Observer.php b/htdocs/app/code/community/Mgt/DeleteOrders/Model/Observer.php index 1456cb4..024a933 100755 --- a/htdocs/app/code/community/Mgt/DeleteOrders/Model/Observer.php +++ b/htdocs/app/code/community/Mgt/DeleteOrders/Model/Observer.php @@ -31,23 +31,23 @@ public function addOptionToSelect($observer) if ($massBlock) { $massBlock->addItem('mgt_delete_orders', array( 'label'=> Mage::helper('core')->__('Delete'), - 'url' => Mage::getUrl('mgt_delete_orders', array('_secure'=>true)), + 'url' => Mage::getUrl('adminhtml/deleteorders_index/index', array('_secure'=>true)), 'confirm' => Mage::helper('core')->__('Are you sure to delete the selected orders?'), )); } } } - public function deleteOrderFromGrid($observer) - { - // This is actually not needed for databases with working foreign keys but some databases are corrupt :( - $order = $observer->getOrder(); - if ($order->getId()) { - $coreResource = Mage::getSingleton('core/resource'); - $writeConnection = $coreResource->getConnection('core_write'); - $salesOrderGridTable = $coreResource->getTableName('sales_flat_order_grid'); - $query = sprintf('Delete from %s where entity_id = %s', $salesOrderGridTable, (int)$order->getId()); - $writeConnection->raw_query($query); - } + public function deleteOrderFromGrid($observer) + { + // This is actually not needed for databases with working foreign keys but some databases are corrupt :( + $order = $observer->getOrder(); + if ($order->getId()) { + $coreResource = Mage::getSingleton('core/resource'); + $writeConnection = $coreResource->getConnection('core_write'); + $salesOrderGridTable = $coreResource->getTableName('sales_flat_order_grid'); + $query = sprintf('Delete from %s where entity_id = %s', $salesOrderGridTable, (int)$order->getId()); + $writeConnection->raw_query($query); + } } } diff --git a/htdocs/app/code/community/Mgt/DeleteOrders/controllers/IndexController.php b/htdocs/app/code/community/Mgt/DeleteOrders/controllers/Adminhtml/Deleteorders/IndexController.php old mode 100755 new mode 100644 similarity index 96% rename from htdocs/app/code/community/Mgt/DeleteOrders/controllers/IndexController.php rename to htdocs/app/code/community/Mgt/DeleteOrders/controllers/Adminhtml/Deleteorders/IndexController.php index 2dff48f..de13690 --- a/htdocs/app/code/community/Mgt/DeleteOrders/controllers/IndexController.php +++ b/htdocs/app/code/community/Mgt/DeleteOrders/controllers/Adminhtml/Deleteorders/IndexController.php @@ -22,7 +22,7 @@ require_once 'Mage/Adminhtml/controllers/Sales/OrderController.php'; -class Mgt_DeleteOrders_IndexController extends Mage_Adminhtml_Sales_OrderController +class Mgt_DeleteOrders_Adminhtml_Deleteorders_IndexController extends Mage_Adminhtml_Sales_OrderController { public function indexAction() { diff --git a/htdocs/app/code/community/Mgt/DeleteOrders/etc/config.xml b/htdocs/app/code/community/Mgt/DeleteOrders/etc/config.xml index 16727d0..72cb5a5 100755 --- a/htdocs/app/code/community/Mgt/DeleteOrders/etc/config.xml +++ b/htdocs/app/code/community/Mgt/DeleteOrders/etc/config.xml @@ -19,13 +19,13 @@ - - admin + - Mgt_DeleteOrders - mgt_delete_orders + + Mgt_DeleteOrders_Adminhtml + - + From a44143a8baefc6dd34e770f19cefe59e5e053726 Mon Sep 17 00:00:00 2001 From: Ner Atillo Date: Wed, 25 Nov 2015 20:00:54 +0800 Subject: [PATCH 2/4] update modman --- modman | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modman b/modman index 89879bc..407b5b0 100644 --- a/modman +++ b/modman @@ -1,4 +1,4 @@ -htdocs/app/code/community/Mgt/DeleteOrders/controllers/IndexController.php app/code/community/Mgt/DeleteOrders/controllers/IndexController.php +htdocs/app/code/community/Mgt/DeleteOrders/controllers/Adminhtml/Deleteorders/IndexController.php app/code/community/Mgt/DeleteOrders/controllers/Adminhtml/Deleteorders/IndexController.php htdocs/app/code/community/Mgt/DeleteOrders/etc/config.xml app/code/community/Mgt/DeleteOrders/etc/config.xml htdocs/app/code/community/Mgt/DeleteOrders/Helper/Data.php app/code/community/Mgt/DeleteOrders/Helper/Data.php htdocs/app/code/community/Mgt/DeleteOrders/Model/Observer.php app/code/community/Mgt/DeleteOrders/Model/Observer.php From 0ff5ee4f5206ff2674deb17277735bc993c7bca1 Mon Sep 17 00:00:00 2001 From: Ner Atillo Date: Wed, 25 Nov 2015 20:02:24 +0800 Subject: [PATCH 3/4] add change log for 1.0.6 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 03ef410..0778ed1 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,8 @@ Our free extension gives you this functionality. ## CHANGELOG - +1.0.6 +* Add compatibility support for SUPEE-6788 1.0.5 * add installation and license file From 94cfe8677fe8ef319585b99631edf0e5e5b95746 Mon Sep 17 00:00:00 2001 From: Ner Atillo Date: Wed, 25 Nov 2015 20:04:40 +0800 Subject: [PATCH 4/4] update Mgt_DeleteOrders version to 1.0.6 --- htdocs/app/code/community/Mgt/DeleteOrders/etc/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/app/code/community/Mgt/DeleteOrders/etc/config.xml b/htdocs/app/code/community/Mgt/DeleteOrders/etc/config.xml index 72cb5a5..74260f5 100755 --- a/htdocs/app/code/community/Mgt/DeleteOrders/etc/config.xml +++ b/htdocs/app/code/community/Mgt/DeleteOrders/etc/config.xml @@ -2,7 +2,7 @@ - 1.0.5 + 1.0.6