Version 1.6.1 - update quote model to allow zero price custom rate

bippo · Aug 12, 2019 · 086c02c · 086c02c
1 parent f336c87
commit 086c02c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ The extension is based on code found in this thread: http://www.magentocommerce.
 Thanks go out to szotyi for getting this started and to everyone else that helped test this.
 
 ## Version history
+* 1.6.1 - update quote model to allow zero price custom rate, added by [adpeate](https://github.com/adpeate/customshippingrate-magento/commit/e9503353b2187b838b9d021a4c9d9b7e7fb291cf) on 5 September 2017
 * 1.6.0 - Complete module rework for Magento 1.9 by [ThomasNegeli](https://github.com/ThomasNegeli/customshippingrate-magento/commit/7aa8bd62fb82e587ee050bdeb31274431561c348) on 5 September 2017
 * 1.5.3 - Portuguese localization added by [MaWoScha](https://github.com/MaWoScha) on 24 September 2015
 * 1.5.2 - Spanish localization added by [MaWoScha](https://github.com/MaWoScha) on 11 November 2014

diff --git a/app/code/community/Indust/CustomShippingRate/Model/Quote/Address/Total/Shipping.php b/app/code/community/Indust/CustomShippingRate/Model/Quote/Address/Total/Shipping.php
@@ -32,12 +32,12 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
         if ($address->getShippingMethod() == 'customshippingrate_customshippingrate') {
             $address->setCollectShippingRates(true);         // force magento to recollect shipping rates because our form input from backend should be saved
 
-            if ($address->getBaseShippingAmount() > 0) {     // when data is entered in backend order create
+            if ($address->getBaseShippingAmount() >= 0) {    // when data is entered in backend order create
                 Mage::register(Indust_CustomShippingRate_Model_Carrier_Customshippingrate::BASE_SHIPPING_AMOUNT, $address->getBaseShippingAmount(), true);
             } else {                                         // when order is submitted in backend
                 Mage::register(Indust_CustomShippingRate_Model_Carrier_Customshippingrate::BASE_SHIPPING_AMOUNT, $address->getOrigData('base_shipping_amount'), true);
             }
-            if ($address->getShippingAmount() > 0) {         // when data is entered in backend order create
+            if ($address->getShippingAmount() >= 0) {        // when data is entered in backend order create
                 Mage::register(Indust_CustomShippingRate_Model_Carrier_Customshippingrate::SHIPPING_AMOUNT, $address->getShippingAmount(), true);
             } else {                                         // when order is submitted in backend
                 Mage::register(Indust_CustomShippingRate_Model_Carrier_Customshippingrate::SHIPPING_AMOUNT, $address->getOrigData('shipping_amount'), true);

diff --git a/app/code/community/Indust/CustomShippingRate/etc/config.xml b/app/code/community/Indust/CustomShippingRate/etc/config.xml
@@ -33,7 +33,7 @@
 <config>
     <modules>
         <Indust_CustomShippingRate>
-            <version>1.6.0</version>
+            <version>1.6.1</version>
             <depends>
                 <Mage_Shipping />
             </depends>

diff --git a/var/connect/Indust_CustomShippingRate.xml b/var/connect/Indust_CustomShippingRate.xml
@@ -10,7 +10,7 @@
    <description>Adds ability to specify a custom shipping rate and title when creating a new order in backend.</description>
    <license>OSL v3.0</license>
    <license_uri>http://www.opensource.org/licenses/osl-3.0.php</license_uri>
-   <version>1.6.0</version>
+   <version>1.6.1</version>
    <stability>beta</stability>
    <notes>1.6.0 - Complete module rework for Magento 1.9