bugfix, removed collectTotals(), replaced $quote->getSubtotal() with …

…$request->getPackageValueWithDiscount()
bastianccm · Mar 16, 2012 · dfc6536 · dfc6536
1 parent 6a19956
commit dfc6536
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/app/code/community/Thebod/Shippingrates/Model/Carrier.php b/src/app/code/community/Thebod/Shippingrates/Model/Carrier.php
@@ -82,16 +82,14 @@ public function checkRate(array $rate, Mage_Shipping_Model_Rate_Request $request
                     break;
 
                 case 'min_subtotal':
-                    Mage::getSingleton('checkout/session')->getQuote()->collectTotals();
-                    $subtotal = Mage::getSingleton('checkout/session')->getQuote()->getSubtotal();
+                    $subtotal = $request->getPackageValueWithDiscount();
                     if($subtotal < $value) {
                         $passed = false;
                     }
                     break;
 
                 case 'max_subtotal':
-                    Mage::getSingleton('checkout/session')->getQuote()->collectTotals();
-                    $subtotal = Mage::getSingleton('checkout/session')->getQuote()->getSubtotal();
+                    $subtotal = $request->getPackageValueWithDiscount();
                     if($subtotal > $value) {
                         $passed = false;
                     }
@@ -119,8 +117,7 @@ public function checkRate(array $rate, Mage_Shipping_Model_Rate_Request $request
      * @param Mage_Shipping_Model_Rate_Request $request
      * @return Mage_Shipping_Model_Rate_Result
      */
-    public function collectRates(Mage_Shipping_Model_Rate_Request $request)
-    {
+    public function collectRates(Mage_Shipping_Model_Rate_Request $request) {
         if(!$this->getConfigFlag('active')) {
             return false;
         }