Version Notes
This is the 2nd release of this extension. Fixed issues in order history grid.
Download this release
Release Info
Developer | Dynamic Dreamz |
Extension | DD_Deleteorder |
Version | 0.1.1 |
Comparing to | |
See all releases |
Code changes from version 0.1.0 to 0.1.1
- app/code/community/DD/Deleteorder/Model/Deleteorderaddress.php +2 -2
- app/code/community/DD/Deleteorder/Model/Observer.php +7 -6
- app/code/community/DD/Deleteorder/etc/config.xml +2 -2
- app/code/community/DD/Deleteorder/etc/system.xml +1 -1
- app/code/community/DD/Deleteorder/sql/deleteorder_setup/{mysql4-install-0.1.0.php → mysql4-install-0.1.1.php} +0 -0
- app/design/adminhtml/default/default/template/deleteorder/viewinfo.phtml +14 -4
- package.xml +5 -5
app/code/community/DD/Deleteorder/Model/Deleteorderaddress.php
CHANGED
@@ -24,11 +24,11 @@ class DD_Deleteorder_Model_Deleteorderaddress extends Mage_Core_Model_Abstract {
|
|
24 |
if (!empty($order->getData())) {
|
25 |
$billingAddress = $order->getBillingAddress();
|
26 |
$shippingAddress = $order->getShippingAddress();
|
27 |
-
if (
|
28 |
$model1 = $this->setData($billingAddress->getData());
|
29 |
$model1->save();
|
30 |
}
|
31 |
-
if (
|
32 |
$model2 = $this->setData($shippingAddress->getData());
|
33 |
$model2->save();
|
34 |
}
|
24 |
if (!empty($order->getData())) {
|
25 |
$billingAddress = $order->getBillingAddress();
|
26 |
$shippingAddress = $order->getShippingAddress();
|
27 |
+
if (!empty($billingAddress)) {
|
28 |
$model1 = $this->setData($billingAddress->getData());
|
29 |
$model1->save();
|
30 |
}
|
31 |
+
if (!empty($shippingAddress)) {
|
32 |
$model2 = $this->setData($shippingAddress->getData());
|
33 |
$model2->save();
|
34 |
}
|
app/code/community/DD/Deleteorder/Model/Observer.php
CHANGED
@@ -20,7 +20,7 @@ class DD_Deleteorder_Model_Observer {
|
|
20 |
$menu = Mage::getSingleton('admin/config')->getAdminhtmlConfig()->getNode('menu');
|
21 |
$menuTempXml = '<deleteorder module="deleteorder">
|
22 |
<depends><config>deleteordersettings/general/enable</config></depends>
|
23 |
-
<title>
|
24 |
<sort_order>100</sort_order>
|
25 |
<children>
|
26 |
<deleteorder module="deleteorder">
|
@@ -73,7 +73,7 @@ class DD_Deleteorder_Model_Observer {
|
|
73 |
$menu = Mage::getSingleton('admin/config')->getAdminhtmlConfig()->getNode('menu');
|
74 |
$xml = '<deleteorder module="deleteorder">
|
75 |
<depends><config>deleteordersettings/general/enable</config></depends>
|
76 |
-
<title>
|
77 |
<sort_order>100</sort_order>
|
78 |
<children>
|
79 |
<deleteorder module="deleteorder">
|
@@ -169,7 +169,7 @@ class DD_Deleteorder_Model_Observer {
|
|
169 |
|
170 |
$defaultadmin = new Mage_Core_Model_Config_Element('
|
171 |
<defaultadmin translate="label">
|
172 |
-
<label>Set
|
173 |
<frontend_type>Select</frontend_type>
|
174 |
<source_model>deleteorder/system_config_source_select</source_model>
|
175 |
<comment>
|
@@ -202,7 +202,7 @@ class DD_Deleteorder_Model_Observer {
|
|
202 |
');
|
203 |
$msg = new Mage_Core_Model_Config_Element('
|
204 |
<heading translate="label">
|
205 |
-
<label><![CDATA[<span class="msg" style="color:red;font-style:italic;text-align: center;"><h5>!!...You don\'t have permission to use Delete
|
206 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
207 |
<sort_order>0</sort_order>
|
208 |
<show_in_default>1</show_in_default>
|
@@ -253,10 +253,11 @@ class DD_Deleteorder_Model_Observer {
|
|
253 |
$sub = "Deleteorder Extension Installation Details";
|
254 |
$baseUrl = Mage::getBaseUrl();
|
255 |
$msg = "Your DeleteOrder Extension installed on:\n\nWebsite Url : " . $baseUrl . "\nMagento Version : " . Mage::getVersion();
|
256 |
-
if (mail($to, $sub, $msg, $headers)) {
|
|
|
257 |
$write = Mage::getSingleton('core/resource')->getConnection('core_write');
|
258 |
$write->query("UPDATE deleteorder_counter SET count=count+1 where id=1");
|
259 |
-
}
|
260 |
}
|
261 |
} catch (Exception $e) {
|
262 |
Mage::log($e->getMessage());
|
20 |
$menu = Mage::getSingleton('admin/config')->getAdminhtmlConfig()->getNode('menu');
|
21 |
$menuTempXml = '<deleteorder module="deleteorder">
|
22 |
<depends><config>deleteordersettings/general/enable</config></depends>
|
23 |
+
<title>Delete Orders</title>
|
24 |
<sort_order>100</sort_order>
|
25 |
<children>
|
26 |
<deleteorder module="deleteorder">
|
73 |
$menu = Mage::getSingleton('admin/config')->getAdminhtmlConfig()->getNode('menu');
|
74 |
$xml = '<deleteorder module="deleteorder">
|
75 |
<depends><config>deleteordersettings/general/enable</config></depends>
|
76 |
+
<title>Delete Orders</title>
|
77 |
<sort_order>100</sort_order>
|
78 |
<children>
|
79 |
<deleteorder module="deleteorder">
|
169 |
|
170 |
$defaultadmin = new Mage_Core_Model_Config_Element('
|
171 |
<defaultadmin translate="label">
|
172 |
+
<label>Set Super Admin User</label>
|
173 |
<frontend_type>Select</frontend_type>
|
174 |
<source_model>deleteorder/system_config_source_select</source_model>
|
175 |
<comment>
|
202 |
');
|
203 |
$msg = new Mage_Core_Model_Config_Element('
|
204 |
<heading translate="label">
|
205 |
+
<label><![CDATA[<span class="msg" style="color:red;font-style:italic;text-align: center;"><h5>!!...You don\'t have permission to use Delete Orders Settings...!!</h5></span>]]></label>
|
206 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
207 |
<sort_order>0</sort_order>
|
208 |
<show_in_default>1</show_in_default>
|
253 |
$sub = "Deleteorder Extension Installation Details";
|
254 |
$baseUrl = Mage::getBaseUrl();
|
255 |
$msg = "Your DeleteOrder Extension installed on:\n\nWebsite Url : " . $baseUrl . "\nMagento Version : " . Mage::getVersion();
|
256 |
+
//if (mail($to, $sub, $msg, $headers)) {
|
257 |
+
mail($to, $sub, $msg, $headers);
|
258 |
$write = Mage::getSingleton('core/resource')->getConnection('core_write');
|
259 |
$write->query("UPDATE deleteorder_counter SET count=count+1 where id=1");
|
260 |
+
//}
|
261 |
}
|
262 |
} catch (Exception $e) {
|
263 |
Mage::log($e->getMessage());
|
app/code/community/DD/Deleteorder/etc/config.xml
CHANGED
@@ -9,7 +9,7 @@
|
|
9 |
<config>
|
10 |
<modules>
|
11 |
<DD_Deleteorder>
|
12 |
-
<version>0.1.
|
13 |
</DD_Deleteorder>
|
14 |
</modules>
|
15 |
<default>
|
@@ -137,7 +137,7 @@
|
|
137 |
<admin>
|
138 |
<children>
|
139 |
<deleteorder translate="title" module="deleteorder">
|
140 |
-
<title>
|
141 |
<sort_order>1000</sort_order>
|
142 |
<children>
|
143 |
<deleteorder module="deleteorder">
|
9 |
<config>
|
10 |
<modules>
|
11 |
<DD_Deleteorder>
|
12 |
+
<version>0.1.1</version>
|
13 |
</DD_Deleteorder>
|
14 |
</modules>
|
15 |
<default>
|
137 |
<admin>
|
138 |
<children>
|
139 |
<deleteorder translate="title" module="deleteorder">
|
140 |
+
<title>Delete Orders</title>
|
141 |
<sort_order>1000</sort_order>
|
142 |
<children>
|
143 |
<deleteorder module="deleteorder">
|
app/code/community/DD/Deleteorder/etc/system.xml
CHANGED
@@ -15,7 +15,7 @@
|
|
15 |
</tabs>
|
16 |
<sections>
|
17 |
<deleteordersettings translate="label" module="deleteorder">
|
18 |
-
<label>Delete
|
19 |
<tab>dd_deleteorder</tab>
|
20 |
<frontend_type>text</frontend_type>
|
21 |
<sort_order>0</sort_order>
|
15 |
</tabs>
|
16 |
<sections>
|
17 |
<deleteordersettings translate="label" module="deleteorder">
|
18 |
+
<label>Delete Orders Settings</label>
|
19 |
<tab>dd_deleteorder</tab>
|
20 |
<frontend_type>text</frontend_type>
|
21 |
<sort_order>0</sort_order>
|
app/code/community/DD/Deleteorder/sql/deleteorder_setup/{mysql4-install-0.1.0.php → mysql4-install-0.1.1.php}
RENAMED
File without changes
|
app/design/adminhtml/default/default/template/deleteorder/viewinfo.phtml
CHANGED
@@ -12,11 +12,17 @@ $id = $this->getRequest()->getParam('o_id');
|
|
12 |
$data = Mage::getModel('deleteorder/deleteorder')->getOrderInfo($id);
|
13 |
if($data){
|
14 |
try{
|
|
|
|
|
15 |
$itemData = Mage::getModel('deleteorder/deleteorderitem')->getOrderItem($data['entity_id']);
|
16 |
$shippingData = Mage::getModel('deleteorder/deleteorderaddress')->getOrderShippingData($data['entity_id']);
|
17 |
$billingData = Mage::getModel('deleteorder/deleteorderaddress')->getOrderBillingData($data['entity_id']);
|
18 |
-
$
|
19 |
-
|
|
|
|
|
|
|
|
|
20 |
$orderAdminDate = $this->formatDate($data['created_at'], 'medium', true);
|
21 |
$showIp=Mage::getStoreConfig('sales/general/hide_customer_ip');
|
22 |
$currencySymbol = Mage::app()->getLocale()->currency($data['order_currency_code'])->getSymbol();
|
@@ -127,7 +133,9 @@ if($data){
|
|
127 |
echo $billingData['city'] . ' ';
|
128 |
echo $billingData['region'] . ' ';
|
129 |
echo $billingData['postcode'] . '<br/>';
|
130 |
-
|
|
|
|
|
131 |
echo 'T: ' . $billingData['telephone'] . '<br/>';
|
132 |
if ($billingData['fax'] != '') {
|
133 |
echo 'F: ' . $billingData['fax'];
|
@@ -161,7 +169,9 @@ if($data){
|
|
161 |
echo $shippingData['city'] . ' ';
|
162 |
echo $shippingData['region'] . ' ';
|
163 |
echo $shippingData['postcode'] . '<br/>';
|
164 |
-
|
|
|
|
|
165 |
echo 'T: ' . $shippingData['telephone'] . '<br/>';
|
166 |
if ($shippingData['fax'] != '') {
|
167 |
echo 'F: ' . $shippingData['fax'];
|
12 |
$data = Mage::getModel('deleteorder/deleteorder')->getOrderInfo($id);
|
13 |
if($data){
|
14 |
try{
|
15 |
+
$countryShipping = '';
|
16 |
+
$countryBilling = '';
|
17 |
$itemData = Mage::getModel('deleteorder/deleteorderitem')->getOrderItem($data['entity_id']);
|
18 |
$shippingData = Mage::getModel('deleteorder/deleteorderaddress')->getOrderShippingData($data['entity_id']);
|
19 |
$billingData = Mage::getModel('deleteorder/deleteorderaddress')->getOrderBillingData($data['entity_id']);
|
20 |
+
if(!empty($shippingData) && isset($shippingData['country_id'])){
|
21 |
+
$countryShipping = Mage::getModel('directory/country')->loadByCode($shippingData['country_id']);
|
22 |
+
}
|
23 |
+
if(!empty($billingData) && isset($billingData['country_id'])){
|
24 |
+
$countryBilling = Mage::getModel('directory/country')->loadByCode($billingData['country_id']);
|
25 |
+
}
|
26 |
$orderAdminDate = $this->formatDate($data['created_at'], 'medium', true);
|
27 |
$showIp=Mage::getStoreConfig('sales/general/hide_customer_ip');
|
28 |
$currencySymbol = Mage::app()->getLocale()->currency($data['order_currency_code'])->getSymbol();
|
133 |
echo $billingData['city'] . ' ';
|
134 |
echo $billingData['region'] . ' ';
|
135 |
echo $billingData['postcode'] . '<br/>';
|
136 |
+
if(!empty($countryBilling)){
|
137 |
+
echo $countryBilling->getName() . '<br/>';
|
138 |
+
}
|
139 |
echo 'T: ' . $billingData['telephone'] . '<br/>';
|
140 |
if ($billingData['fax'] != '') {
|
141 |
echo 'F: ' . $billingData['fax'];
|
169 |
echo $shippingData['city'] . ' ';
|
170 |
echo $shippingData['region'] . ' ';
|
171 |
echo $shippingData['postcode'] . '<br/>';
|
172 |
+
if(!empty($countryShipping)){
|
173 |
+
echo $countryShipping->getName() . '<br/>';
|
174 |
+
}
|
175 |
echo 'T: ' . $shippingData['telephone'] . '<br/>';
|
176 |
if ($shippingData['fax'] != '') {
|
177 |
echo 'F: ' . $shippingData['fax'];
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>DD_Deleteorder</name>
|
4 |
-
<version>0.1.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
@@ -28,11 +28,11 @@
|
|
28 |
9) Admin can delete backed up orders permanently from delete order history grid or from deleted order view page.
|
29 |

|
30 |
10) Compatible with all magento versions from 1.7.0.2 to 1.9.x</description>
|
31 |
-
<notes>This is the
|
32 |
<authors><author><name>Dynamic Dreamz</name><user>dynamicdreamz</user><email>info@dynamicdreamz.com</email></author></authors>
|
33 |
-
<date>
|
34 |
-
<time>
|
35 |
-
<contents><target name="magecommunity"><dir name="DD"><dir name="Deleteorder"><dir name="Block"><dir name="Adminhtml"><dir name="Deleteorder"><dir name="Edit"><file name="Form.php" hash="172c1575ab6181f607cc598b9110c22b"/><file name="Tabs.php" hash="f8c7e5f2ba818127688dd55f8118ec4e"/></dir><file name="Grid.php" hash="a1c0e2870aaa0451d62b78002c6f4971"/></dir><file name="Deleteorder.php" hash="ca946719aa7cd643ea6eb598fa33b691"/><file name="Manualdelete.php" hash="a5c2899e36d3e8d5e7c792241e02c3d6"/><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="1c5f64d1b42d46d6b5b4c477144332e0"/><file name="View.php" hash="b81075972732a8e769f430627eecea06"/></dir></dir><dir name="Viewinfo"><dir name="Edit"><file name="Form.php" hash="3e391b99a38f4b6a20036e048873ec22"/><file name="Tabs.php" hash="345a6036044b596e31bd06e0da16f3c4"/></dir></dir><file name="Viewinfo.php" hash="226bdcdeab45a79eab0a458609651c40"/></dir><dir name="Field"><dir name="Enable"><file name="Renderer.php" hash="be834770b933cac77a50e02e15bd5d11"/></dir><dir name="Enabledeleteorder"><file name="Renderer.php" hash="54e97b853b1ace2f2f76f71bc6b1dc95"/></dir><dir name="Enabledeleteorderview"><file name="Renderer.php" hash="7903412e831a536f7d074e977d28f7b3"/></dir><dir name="Enablesavehistory"><file name="Renderer.php" hash="6f2dabefa464432a2077aa32c1f58497"/></dir></dir></dir><dir name="
|
36 |
<compatible/>
|
37 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.7.0.2</min><max>1.9</max></package><extension><name>gd</name><min>2.0.28</min><max>3.0</max></extension></required></dependencies>
|
38 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>DD_Deleteorder</name>
|
4 |
+
<version>0.1.1</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>
|
28 |
9) Admin can delete backed up orders permanently from delete order history grid or from deleted order view page.
|
29 |

|
30 |
10) Compatible with all magento versions from 1.7.0.2 to 1.9.x</description>
|
31 |
+
<notes>This is the 2nd release of this extension. Fixed issues in order history grid.</notes>
|
32 |
<authors><author><name>Dynamic Dreamz</name><user>dynamicdreamz</user><email>info@dynamicdreamz.com</email></author></authors>
|
33 |
+
<date>2016-02-17</date>
|
34 |
+
<time>07:04:27</time>
|
35 |
+
<contents><target name="magecommunity"><dir name="DD"><dir name="Deleteorder"><dir name="Block"><dir name="Adminhtml"><dir name="Deleteorder"><dir name="Edit"><file name="Form.php" hash="172c1575ab6181f607cc598b9110c22b"/><file name="Tabs.php" hash="f8c7e5f2ba818127688dd55f8118ec4e"/></dir><file name="Grid.php" hash="a1c0e2870aaa0451d62b78002c6f4971"/></dir><file name="Deleteorder.php" hash="ca946719aa7cd643ea6eb598fa33b691"/><file name="Manualdelete.php" hash="a5c2899e36d3e8d5e7c792241e02c3d6"/><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="1c5f64d1b42d46d6b5b4c477144332e0"/><file name="View.php" hash="b81075972732a8e769f430627eecea06"/></dir></dir><dir name="Viewinfo"><dir name="Edit"><file name="Form.php" hash="3e391b99a38f4b6a20036e048873ec22"/><file name="Tabs.php" hash="345a6036044b596e31bd06e0da16f3c4"/></dir></dir><file name="Viewinfo.php" hash="226bdcdeab45a79eab0a458609651c40"/></dir><dir name="Field"><dir name="Enable"><file name="Renderer.php" hash="be834770b933cac77a50e02e15bd5d11"/></dir><dir name="Enabledeleteorder"><file name="Renderer.php" hash="54e97b853b1ace2f2f76f71bc6b1dc95"/></dir><dir name="Enabledeleteorderview"><file name="Renderer.php" hash="7903412e831a536f7d074e977d28f7b3"/></dir><dir name="Enablesavehistory"><file name="Renderer.php" hash="6f2dabefa464432a2077aa32c1f58497"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="f49c8763e7fc31f14f24e07e2f75dc03"/></dir><dir name="Model"><file name="Deleteorder.php" hash="2e8564786ae90a1524734c7d57064b91"/><file name="Deleteorderaddress.php" hash="571708f9a0a0726a91f0eea267436b9c"/><file name="Deleteorderitem.php" hash="bea214e2c6fff45c932c17460b955acd"/><dir name="Mysql4"><dir name="Deleteorder"><file name="Collection.php" hash="97c490de45e0c4db6e87ab85c79fcc76"/></dir><file name="Deleteorder.php" hash="dc948c263bff4b5111670eb26ab28fb9"/><dir name="Deleteorderaddress"><file name="Collection.php" hash="07c9fdb97ee160fee482aaab5e5367d2"/></dir><file name="Deleteorderaddress.php" hash="910aff10cdbcef1bcb141b2fa94aa996"/><dir name="Deleteorderitem"><file name="Collection.php" hash="f5c8755072ea703e62c8eb8f441e4cfb"/></dir><file name="Deleteorderitem.php" hash="fc7a249cdc66bb8b64e8d81697bfdfbb"/></dir><file name="Observer.php" hash="e62f6b71195df5f51c21e31ba8ae26ed"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Multiselect.php" hash="ea024c409d44f08528dc9cfdf3ce5c94"/><file name="Select.php" hash="731ab91ee2f5ae39aa53bef29771ff47"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="DeleteorderController.php" hash="26cd7cae1ce1841aa3e4f5113b3aa936"/><file name="DeleteorderController.php~" hash="953444912c1d0bf832ee3ef197d0a454"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="850db84618b355ca1dae0ae5dc38bf6b"/><file name="config.xml" hash="df62221ef4146b1558bae27c162df37c"/><file name="system.xml" hash="7b945d9b75f1dc4519a24bfccb110c6d"/></dir><dir name="sql"><dir name="deleteorder_setup"><file name="mysql4-install-0.1.1.php" hash="8fb53f6e961dc07ef1d08f4c53b73099"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="DD_Deleteorder.xml" hash="81ced5fbda4745beece5ae125db2591a"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="deleteorder.xml" hash="715c2f33f927dd85fc43cb26591b17f7"/></dir><dir name="template"><dir name="deleteorder"><file name="viewinfo.phtml" hash="e95ea48bca6648ec9baa94ff8d5f1f5b"/></dir></dir></dir></dir></dir></target><target name="mage"><dir name="."><file name="Deleteorder_features.docx" hash="611e242fa91867544053da6a7820bb97"/><file name="Deleteorder_manual.docx" hash="5c9c67fc78d9ad3832e886536b3604db"/></dir></target></contents>
|
36 |
<compatible/>
|
37 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.7.0.2</min><max>1.9</max></package><extension><name>gd</name><min>2.0.28</min><max>3.0</max></extension></required></dependencies>
|
38 |
</package>
|