Merge branch 'release/2.5.3'

meanbee · Apr 11, 2013 · 283b3f0 · 283b3f0
2 parents c45d10c + 282e18b
commit 283b3f0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/...e/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalsignedfor.php b/...e/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalsignedfor.php
@@ -20,6 +20,20 @@
 class Meanbee_Royalmail_Model_Shipping_Carrier_Royalmail_Internationalsignedfor
     extends Meanbee_Royalmail_Model_Shipping_Carrier_Royalmail_Airmail {
 
+    protected function getRates() {
+        $rates = parent::getRates();
+
+        if ($rates == null) {
+            return null;
+        }
+
+        for ($i = 0; $i < count($rates); $i++) {
+            $rates[$i]['cost'] += $this->_getExtraCharge();
+        }
+
+        return $rates;
+    }
+
     protected function _getExtraCharge() {
         return 5.30;
     }

diff --git a/app/code/community/Meanbee/Royalmail/etc/config.xml b/app/code/community/Meanbee/Royalmail/etc/config.xml
@@ -22,7 +22,7 @@
 <config>
     <modules>
         <Meanbee_Royalmail>
-            <version>2.5.2</version>
+            <version>2.5.3</version>
             <depends>
                 <Mage_Shipping />
             </depends>

diff --git a/package.xml b/package.xml
@@ -10,9 +10,9 @@
    <description>Automatically calculated Royal Mail delivery methods.</description>
    <license>Open Software License v3.0 (OSL-3.0)</license>
    <license_uri>http://www.opensource.org/licenses/osl-3.0.php</license_uri>
-   <version>2.5.2</version>
+   <version>2.5.3</version>
    <stability>stable</stability>
-   <notes>* Updated world zone definitions and made international signed for a variant of airmail, not aisure</notes>
+   <notes>* Bug Fix: International Signed For was not calculated correctly.</notes>
    <authors>
       <name>
          <name>Meanbee</name>