MSP_CashOnDelivery - Version 1.2.5

Version Notes

Enjoy it ;)

Download this release

Release Info

Developer Riccardo Tempesta
Extension MSP_CashOnDelivery
Version 1.2.5
Comparing to
See all releases


Code changes from version 1.2.3 to 1.2.5

Files changed (5) hide show
  1. app/code/community/MSP/CashOnDelivery/CHANGELOG.txt +7 -1
  2. app/code/community/MSP/CashOnDelivery/Model/Cashondelivery.php +2 -0
  3. app/code/community/MSP/CashOnDelivery/Model/Quote/Tax.php +2 -1
  4. app/code/community/MSP/CashOnDelivery/etc/config.xml +1 -1
  5. package.xml +4 -4
app/code/community/MSP/CashOnDelivery/CHANGELOG.txt CHANGED
@@ -20,4 +20,10 @@ Corrected recursion bug
20
  Corrected backend COD display
21
 
22
  1.2.3
23
- Corrected tax calculation error when are present multiple tax rates
 
 
 
 
 
 
20
  Corrected backend COD display
21
 
22
  1.2.3
23
+ Corrected tax calculation error when are present multiple tax rates
24
+
25
+ 1.2.4
26
+ Bugfix for tax calculation with empty cart
27
+
28
+ 1.2.5
29
+ Bugfix for tax calculation for backend created orders
app/code/community/MSP/CashOnDelivery/Model/Cashondelivery.php CHANGED
@@ -49,6 +49,8 @@ class MSP_CashOnDelivery_Model_Cashondelivery extends Mage_Payment_Model_Method_
49
  $_helper = Mage::helper('msp_cashondelivery');
50
  $_quote = $_helper->getQuote();
51
 
 
 
52
  $_subTotal = $_quote->getShippingAddress()->getSubtotal();
53
  $_shippingAmount = $_quote->getShippingAddress()->getBaseShippingAmount();
54
 
49
  $_helper = Mage::helper('msp_cashondelivery');
50
  $_quote = $_helper->getQuote();
51
 
52
+ if (!count($_quote->getAllItems())) return 0;
53
+
54
  $_subTotal = $_quote->getShippingAddress()->getSubtotal();
55
  $_shippingAmount = $_quote->getShippingAddress()->getBaseShippingAmount();
56
 
app/code/community/MSP/CashOnDelivery/Model/Quote/Tax.php CHANGED
@@ -24,7 +24,8 @@ class MSP_CashOnDelivery_Model_Quote_Tax extends Mage_Sales_Model_Quote_Address_
24
 
25
  public function collect(Mage_Sales_Model_Quote_Address $address)
26
  {
27
- if (!Mage::getSingleton('checkout/session')->getQuoteId()) return $this;
 
28
 
29
  $_helper = Mage::helper('msp_cashondelivery');
30
  $_model = Mage::getModel('msp_cashondelivery/cashondelivery');
24
 
25
  public function collect(Mage_Sales_Model_Quote_Address $address)
26
  {
27
+ $_helper = Mage::helper('msp_cashondelivery');
28
+ if (!$_helper->getSession()->getQuoteId()) return $this;
29
 
30
  $_helper = Mage::helper('msp_cashondelivery');
31
  $_model = Mage::getModel('msp_cashondelivery/cashondelivery');
app/code/community/MSP/CashOnDelivery/etc/config.xml CHANGED
@@ -22,7 +22,7 @@
22
  <config>
23
  <modules>
24
  <MSP_CashOnDelivery>
25
- <version>1.2.3</version>
26
  </MSP_CashOnDelivery>
27
  </modules>
28
 
22
  <config>
23
  <modules>
24
  <MSP_CashOnDelivery>
25
+ <version>1.2.5</version>
26
  </MSP_CashOnDelivery>
27
  </modules>
28
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>MSP_CashOnDelivery</name>
4
- <version>1.2.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>An easy to use module to add a fully configurable Cash On Delivery payment mode in your Magento store.</description>
11
  <notes>Enjoy it ;)</notes>
12
  <authors><author><name>Riccardo Tempesta</name><user>idealiagroup</user><email>tempesta@idealiagroup.com</email></author><author><name>Paolo Vecchiocattivi</name><user>idealiagroup</user><email>vecchiocattivi@idealiagroup.com</email></author></authors>
13
- <date>2014-04-17</date>
14
- <time>15:25:12</time>
15
- <contents><target name="magecommunity"><dir name="MSP"><dir name="CashOnDelivery"><dir name="Block"><dir name="Admin"><dir name="Rule"><dir name="Edit"><file name="Form.php" hash="73f7bb7cc579a9ea6576b84faef04ebb"/></dir><file name="Edit.php" hash="efc1fc2e70a5af0dd9a3f6fc0caa7458"/><file name="Grid.php" hash="c9685890801f118b9beda295985d5538"/></dir><file name="Rule.php" hash="8a132be439dffae5381bff113a5cffb9"/></dir><file name="Form.php" hash="bc5f4f3dfea92dfa79f0ebd1ef66eee3"/><dir name="Sales"><dir name="Order"><file name="Total.php" hash="ab95f0056a97282e85f4c901022286dc"/></dir></dir></dir><file name="CHANGELOG.txt" hash="5828e91d409723e2451a329fd7ce2195"/><file name="COMPATIBILITY.txt" hash="b120e5821ccb687741d038f63cbd76c7"/><dir name="Helper"><file name="Data.php" hash="434226264e7bc681e27b9532a2fbfc07"/></dir><file name="LICENSE.txt" hash="43d8581f57722664f478fccb6e71f99b"/><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Taxclass.php" hash="2db9e0e301fc350228559ef226eaab24"/></dir></dir></dir></dir><file name="Cashondelivery.php" hash="5d47cbce4e7b829dfc08dca7bb15439c"/><dir name="Creditmemo"><file name="Tax.php" hash="8a92cb51d358d8ad5759ec9304c62f42"/><file name="Total.php" hash="002dbc8acbd0c872abe54f2318cc506b"/></dir><file name="Foreign.php" hash="d1686b318f4072f59f191c38edb02206"/><dir name="Invoice"><file name="Total.php" hash="b5acbf2dfab5a08732d4e8c6af7ba965"/></dir><file name="Local.php" hash="0519e951803e32898cb4783448695a58"/><dir name="Mysql4"><dir name="Foreign"><file name="Collection.php" hash="3f776f389ae30a51695308b1528f8dc8"/></dir><file name="Foreign.php" hash="9fa9c40cfb6c17ba4a7ceb638c8f8b0c"/><dir name="Local"><file name="Collection.php" hash="12644d7308afd9e0c555d628a2285c52"/></dir><file name="Local.php" hash="09473d2b243b111b88d81f27e4dc6d3d"/></dir><dir name="Order"><dir name="Pdf"><dir name="Total"><file name="Default.php" hash="29d8c1667a5fb6e6e60f71f1b0495853"/></dir></dir><file name="Tax.php" hash="cb5b3b290f0139ad29fa6ea8164c7a91"/><file name="Total.php" hash="f8d72c004956575b4a7034dbb851cfb6"/></dir><dir name="Quote"><file name="Tax.php" hash="a36ffe6a3cdb382ae8a41e38470ca887"/><file name="Total.php" hash="12e0df09959fa189109ef9e1409ec8b1"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Cashondelivery"><file name="ForeignController.php" hash="a85a9b3785c3991e8b1b525193db0e0a"/><file name="LocalController.php" hash="b454b0c9ad0d22bac2bf9d282135ff49"/></dir><file name="CashondeliveryController.php" hash="927cda111ae8e620ec22e58388a54fa5"/></dir></dir><dir name="etc"><file name="config.xml" hash="0346886cac0fe387f7d863d81e72dae5"/><file name="system.xml" hash="070bb9e38b0eb30039de0f6204fee04e"/></dir><dir name="sql"><dir name="msp_cashondelivery_setup"><file name="mysql4-install-1.0.0.php" hash="741e3c5ab304d98acd2cfeecd7c636b6"/><file name="mysql4-install-1.1.0.php" hash="647fb3f0c4cd26035324d980ef0c855c"/><file name="mysql4-upgrade-1.0.0-1.1.0.php" hash="ab81f3ad7a554bc0cab43d82979e04a3"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="msp_cashondelivery"><file name="form.phtml" hash="7085ccee4d932846fcc7aa99faf7319f"/></dir></dir><dir name="layout"><file name="msp_cashondelivery.xml" hash="1639e2df536b6fbb8066d9b59bc0c058"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="msp_cashondelivery"><file name="form.phtml" hash="bf2572fa6aa4e190f90c6e8205920b39"/></dir></dir><dir name="layout"><file name="msp_cashondelivery.xml" hash="9e0c45c81a9ccd35d1b12aa897eacfcf"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="MSP_CashOnDelivery.xml" hash="d64644f02358bdbb7715c0bfab466582"/></dir></target><target name="magelocale"><dir name="it_IT"><file name="MSP_CashOnDelivery.csv" hash="9437f81dfd1425fc1b9f43f4e23ab040"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>MSP_Common</name><channel>community</channel><min>1.0.0</min><max/></package></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>MSP_CashOnDelivery</name>
4
+ <version>1.2.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL</license>
7
  <channel>community</channel>
10
  <description>An easy to use module to add a fully configurable Cash On Delivery payment mode in your Magento store.</description>
11
  <notes>Enjoy it ;)</notes>
12
  <authors><author><name>Riccardo Tempesta</name><user>idealiagroup</user><email>tempesta@idealiagroup.com</email></author><author><name>Paolo Vecchiocattivi</name><user>idealiagroup</user><email>vecchiocattivi@idealiagroup.com</email></author></authors>
13
+ <date>2014-07-21</date>
14
+ <time>10:32:45</time>
15
+ <contents><target name="magecommunity"><dir name="MSP"><dir name="CashOnDelivery"><dir name="Block"><dir name="Admin"><dir name="Rule"><dir name="Edit"><file name="Form.php" hash="73f7bb7cc579a9ea6576b84faef04ebb"/></dir><file name="Edit.php" hash="efc1fc2e70a5af0dd9a3f6fc0caa7458"/><file name="Grid.php" hash="c9685890801f118b9beda295985d5538"/></dir><file name="Rule.php" hash="8a132be439dffae5381bff113a5cffb9"/></dir><file name="Form.php" hash="bc5f4f3dfea92dfa79f0ebd1ef66eee3"/><dir name="Sales"><dir name="Order"><file name="Total.php" hash="ab95f0056a97282e85f4c901022286dc"/></dir></dir></dir><file name="CHANGELOG.txt" hash="081564bd58e1d5ce0a2fcdb3eaa60619"/><file name="COMPATIBILITY.txt" hash="b120e5821ccb687741d038f63cbd76c7"/><dir name="Helper"><file name="Data.php" hash="434226264e7bc681e27b9532a2fbfc07"/></dir><file name="LICENSE.txt" hash="43d8581f57722664f478fccb6e71f99b"/><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Taxclass.php" hash="2db9e0e301fc350228559ef226eaab24"/></dir></dir></dir></dir><file name="Cashondelivery.php" hash="f816435bdf2ff2ee1f0db62a11d40b5d"/><dir name="Creditmemo"><file name="Tax.php" hash="8a92cb51d358d8ad5759ec9304c62f42"/><file name="Total.php" hash="002dbc8acbd0c872abe54f2318cc506b"/></dir><file name="Foreign.php" hash="d1686b318f4072f59f191c38edb02206"/><dir name="Invoice"><file name="Total.php" hash="b5acbf2dfab5a08732d4e8c6af7ba965"/></dir><file name="Local.php" hash="0519e951803e32898cb4783448695a58"/><dir name="Mysql4"><dir name="Foreign"><file name="Collection.php" hash="3f776f389ae30a51695308b1528f8dc8"/></dir><file name="Foreign.php" hash="9fa9c40cfb6c17ba4a7ceb638c8f8b0c"/><dir name="Local"><file name="Collection.php" hash="12644d7308afd9e0c555d628a2285c52"/></dir><file name="Local.php" hash="09473d2b243b111b88d81f27e4dc6d3d"/></dir><dir name="Order"><dir name="Pdf"><dir name="Total"><file name="Default.php" hash="29d8c1667a5fb6e6e60f71f1b0495853"/></dir></dir><file name="Tax.php" hash="cb5b3b290f0139ad29fa6ea8164c7a91"/><file name="Total.php" hash="f8d72c004956575b4a7034dbb851cfb6"/></dir><dir name="Quote"><file name="Tax.php" hash="cc35ac29ed006df829f50bf8ff3d6de8"/><file name="Total.php" hash="12e0df09959fa189109ef9e1409ec8b1"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Cashondelivery"><file name="ForeignController.php" hash="a85a9b3785c3991e8b1b525193db0e0a"/><file name="LocalController.php" hash="b454b0c9ad0d22bac2bf9d282135ff49"/></dir><file name="CashondeliveryController.php" hash="927cda111ae8e620ec22e58388a54fa5"/></dir></dir><dir name="etc"><file name="config.xml" hash="f628d52feab7ac7a22117ace24a912b7"/><file name="system.xml" hash="070bb9e38b0eb30039de0f6204fee04e"/></dir><dir name="sql"><dir name="msp_cashondelivery_setup"><file name="mysql4-install-1.0.0.php" hash="741e3c5ab304d98acd2cfeecd7c636b6"/><file name="mysql4-install-1.1.0.php" hash="647fb3f0c4cd26035324d980ef0c855c"/><file name="mysql4-upgrade-1.0.0-1.1.0.php" hash="ab81f3ad7a554bc0cab43d82979e04a3"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="msp_cashondelivery"><file name="form.phtml" hash="7085ccee4d932846fcc7aa99faf7319f"/></dir></dir><dir name="layout"><file name="msp_cashondelivery.xml" hash="1639e2df536b6fbb8066d9b59bc0c058"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="msp_cashondelivery"><file name="form.phtml" hash="bf2572fa6aa4e190f90c6e8205920b39"/></dir></dir><dir name="layout"><file name="msp_cashondelivery.xml" hash="9e0c45c81a9ccd35d1b12aa897eacfcf"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="MSP_CashOnDelivery.xml" hash="d64644f02358bdbb7715c0bfab466582"/></dir></target><target name="magelocale"><dir name="it_IT"><file name="MSP_CashOnDelivery.csv" hash="9437f81dfd1425fc1b9f43f4e23ab040"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>MSP_Common</name><channel>community</channel><min>1.0.0</min><max/></package></required></dependencies>
18
  </package>