Rack_SelfDelete - Version 0.4.1

Version Notes

0.1.1 Initial release
0.1.2 fix locale data
0.2.0 add cancel order
0.3.0 fix bug
0.4.0 change theme files path & fix bug
0.4.1 fix bug

Download this release

Release Info

Developer Hirokazu Nishi
Extension Rack_SelfDelete
Version 0.4.1
Comparing to
See all releases


Code changes from version 0.4.0 to 0.4.1

Files changed (3) hide show
  1. app/code/community/Rack/SelfDelete/Block/Order/View.php +6 -4
  2. app/code/community/Rack/SelfDelete/etc/config.xml +1 -1
  3. package.xml +7 -6
app/code/community/Rack/SelfDelete/Block/Order/View.php CHANGED
@@ -1,14 +1,15 @@
1
  <?php
2
  class Rack_SelfDelete_Block_Order_View extends Mage_Sales_Block_Order_View
3
  {
4
- protected $_secret_key = null;
5
  protected function _construct()
6
  {
7
  parent::_construct();
8
  $_session = Mage::getSingleton("selfdelete/session");
9
  $_secretkey = Mage::helper('selfdelete')->getSecretKey();
10
- $_session->setSecretKey($_secretkey);
11
- $this->setSecretKey($_secretkey);
 
 
12
 
13
  $this->setTemplate('selfdelete/order/view.phtml');
14
  }
@@ -18,7 +19,8 @@ class Rack_SelfDelete_Block_Order_View extends Mage_Sales_Block_Order_View
18
  if ($this->getOrder()->canCancel() &&
19
  $this->getOrder()->getState() === Mage_Sales_Model_Order::STATE_NEW) {
20
  $param = array ('order_id' => $this->getOrder()->getId());
21
- return Mage::getUrl('selfdelete/order/cancel', $param) . "key/" . Mage::getSingleton("selfdelete/session")->getSecretKey() . "/";
 
22
  }
23
  }
24
 
1
  <?php
2
  class Rack_SelfDelete_Block_Order_View extends Mage_Sales_Block_Order_View
3
  {
 
4
  protected function _construct()
5
  {
6
  parent::_construct();
7
  $_session = Mage::getSingleton("selfdelete/session");
8
  $_secretkey = Mage::helper('selfdelete')->getSecretKey();
9
+
10
+ if(!$_session->getSecretKey()) {
11
+ $_session->setSecretKey($_secretkey);
12
+ }
13
 
14
  $this->setTemplate('selfdelete/order/view.phtml');
15
  }
19
  if ($this->getOrder()->canCancel() &&
20
  $this->getOrder()->getState() === Mage_Sales_Model_Order::STATE_NEW) {
21
  $param = array ('order_id' => $this->getOrder()->getId());
22
+
23
+ return Mage::getUrl('selfdelete/order/cancel', $param) . "key/" . Mage::getSingleton('selfdelete/session')->getSecretKey() . "/";
24
  }
25
  }
26
 
app/code/community/Rack/SelfDelete/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Rack_SelfDelete>
5
- <version>0.4.0</version>
6
  </Rack_SelfDelete>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Rack_SelfDelete>
5
+ <version>0.4.1</version>
6
  </Rack_SelfDelete>
7
  </modules>
8
  <global>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Rack_SelfDelete</name>
4
- <version>0.4.0</version>
5
  <stability>stable</stability>
6
  <license>OSL v3.0</license>
7
  <channel>community</channel>
@@ -14,11 +14,12 @@ And also customers can cancel their own order when status is "new".</description
14
  0.1.2 fix locale data&#xD;
15
  0.2.0 add cancel order&#xD;
16
  0.3.0 fix bug&#xD;
17
- 0.4.0 change theme files path &amp; fix bug</notes>
 
18
  <authors><author><name>Hirokazu Nishi</name><user>hirokazu_n</user><email>nishi@principle-works.jp</email></author></authors>
19
- <date>2012-05-07</date>
20
- <time>14:46:30</time>
21
- <contents><target name="magecommunity"><dir name="Rack"><dir name="SelfDelete"><dir name="Block"><dir name="Customer"><file name="Form.php" hash="d421b375440ed3d8d50e7a673240552f"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="Order"><file name="View.php" hash="8a1b572fe9fcf1fbb420cd11c8282ff1"/></dir><file name="Success.php" hash="ecf779b60e10a9251aaedfe935afc5a6"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="Helper"><file name="Data.php" hash="9d969b83f7d32e6707425f645c4a2777"/></dir><dir name="Model"><file name="SelfDelete.php" hash="8f9ad2d574c158c0f9daa148c1e82d37"/><file name="Session.php" hash="d1be26e8896492f6257f662ec997ad75"/><dir name="System"><file name="Config.php" hash="84c5a199ae5a3133bc229b17815a40ea"/></dir><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="controllers"><file name="CustomerController.php" hash="ced73c9a2a48bb631b5545a4887a8588"/><file name="OrderController.php" hash="1e0610f6bcda05ebb8ccd38e89579ea3"/></dir><dir name="etc"><file name="config.xml" hash="c1dccfb3e827a26e2e6984dfd6515e17"/><file name="system.xml" hash="a3e3ca859f1c1f498aba964f14942f49"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="rack_selfdelete.xml" hash="b1571009adace4b68f2e360613bd5252"/></dir><dir name="template"><dir name="selfdelete"><file name="form.phtml" hash="dfc9b019e705a4f3dd7466c16c741c91"/><dir name="order"><file name="cancel.phtml" hash="4c850c5b3b2756e67a91bad8e046ddac"/><file name="view.phtml" hash="27c5e8acd468c8870c52bf6b68fd5428"/></dir><file name="success.phtml" hash="6ab227cb04492e6553e2ea291b8352f2"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Rack_SelfDelete.xml" hash="77568659c9b88f99648817d4a12eb9b9"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Rack_SelfDelete.csv" hash=""/></dir><dir name="ja_JP"><file name="Rack_SelfDelete.csv" hash="568cac17309230a01f25757d3f7c89c3"/></dir></target></contents>
22
  <compatible/>
23
- <dependencies><required><php><min>5.2.0</min><max>5.3.99</max></php></required></dependencies>
24
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Rack_SelfDelete</name>
4
+ <version>0.4.1</version>
5
  <stability>stable</stability>
6
  <license>OSL v3.0</license>
7
  <channel>community</channel>
14
  0.1.2 fix locale data&#xD;
15
  0.2.0 add cancel order&#xD;
16
  0.3.0 fix bug&#xD;
17
+ 0.4.0 change theme files path &amp; fix bug&#xD;
18
+ 0.4.1 fix bug</notes>
19
  <authors><author><name>Hirokazu Nishi</name><user>hirokazu_n</user><email>nishi@principle-works.jp</email></author></authors>
20
+ <date>2014-01-29</date>
21
+ <time>01:09:51</time>
22
+ <contents><target name="magecommunity"><dir name="Rack"><dir name="SelfDelete"><dir name="Block"><dir name="Customer"><file name="Form.php" hash="d421b375440ed3d8d50e7a673240552f"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="Order"><file name="View.php" hash="a3d323f61e296f8f38d481ce227711fe"/></dir><file name="Success.php" hash="ecf779b60e10a9251aaedfe935afc5a6"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="Helper"><file name="Data.php" hash="9d969b83f7d32e6707425f645c4a2777"/></dir><dir name="Model"><file name="SelfDelete.php" hash="8f9ad2d574c158c0f9daa148c1e82d37"/><file name="Session.php" hash="d1be26e8896492f6257f662ec997ad75"/><dir name="System"><file name="Config.php" hash="84c5a199ae5a3133bc229b17815a40ea"/></dir><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="controllers"><file name="CustomerController.php" hash="ced73c9a2a48bb631b5545a4887a8588"/><file name="OrderController.php" hash="1e0610f6bcda05ebb8ccd38e89579ea3"/></dir><dir name="etc"><file name="config.xml" hash="df60036b000c1bb93dcc290edb7b70e7"/><file name="system.xml" hash="a3e3ca859f1c1f498aba964f14942f49"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="rack_selfdelete.xml" hash="b1571009adace4b68f2e360613bd5252"/></dir><dir name="template"><dir name="selfdelete"><file name="form.phtml" hash="dfc9b019e705a4f3dd7466c16c741c91"/><dir name="order"><file name="cancel.phtml" hash="4c850c5b3b2756e67a91bad8e046ddac"/><file name="view.phtml" hash="27c5e8acd468c8870c52bf6b68fd5428"/></dir><file name="success.phtml" hash="6ab227cb04492e6553e2ea291b8352f2"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Rack_SelfDelete.xml" hash="77568659c9b88f99648817d4a12eb9b9"/></dir></target><target name="magelocale"><dir name="ja_JP"><file name="Rack_SelfDelete.csv" hash="568cac17309230a01f25757d3f7c89c3"/></dir></target></contents>
23
  <compatible/>
24
+ <dependencies><required><php><min>5.2.0</min><max>5.5.99</max></php></required></dependencies>
25
  </package>