v3.0.5

Prevent discount warnings from displaying when no deals are present.

Author: mikejestes

app/code/community/PriceWaiter/NYPWidget/Model/Total/Quote.php

@@ -31,11 +31,18 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
     {
         parent::collect($address);
 
-        if (!$this->shouldCollectAddress($address)) {
+        $deals = $this->getPriceWaiterDeals();
+
+        // shouldCollectAddress adds session notices about discounts
+        // if we are not eligible due to coupon codes or card discounts
+        // avoid showing those notices if there are no deals
+        if (!count($deals)) {
             return $this;
         }
 
-        $deals = $this->getPriceWaiterDeals();
+        if (!$this->shouldCollectAddress($address)) {
+            return $this;
+        }
 
         // In case of collision, favor more recent deals over less recent.
         usort($deals, array(__CLASS__, 'sortDealsRecentFirst'));
@@ -433,7 +440,8 @@ protected function shouldCollectAddress(Mage_Sales_Model_Quote_Address $addr)
         $quote = $addr->getQuote();
 
         // (1) Don't allow when there is a coupon code
-        $hasCouponCode = !empty($quote->getCouponCode());
+        $couponCode = $quote->getCouponCode();
+        $hasCouponCode = !empty($couponCode);
         if ($hasCouponCode) {
             Mage::getSingleton('core/session')->addNotice(
                 'Your offer discount could not be applied because there is a coupon code in use.'
@@ -459,6 +467,24 @@ protected function shouldCollectAddress(Mage_Sales_Model_Quote_Address $addr)
             }
         }
 
+        // (2) Don't allow if the sales rule applies to _more than shipping only_
+        $ruleIds = $quote->getAppliedRuleIds();
+        if (!empty($ruleIds)) {
+            $helper = Mage::helper('nypwidget/rule');
+            $ruleCollection = Mage::getModel('salesrule/rule')
+                ->getCollection()
+                ->addFieldToFilter('rule_id', array('in' => $ruleIds));
+
+            foreach ($ruleCollection as $rule) {
+                if (!$helper->ruleAppliesToShippingOnly($rule)) {
+                    Mage::getSingleton('core/session')->addNotice(
+                        'Your offer discount could not be applied because of an existing promotion.'
+                    );
+                    return false;
+                }
+            }
+        }
+
         return true;
     }
 

app/code/community/PriceWaiter/NYPWidget/etc/config.xml

@@ -3,7 +3,7 @@
 
     <modules>
         <PriceWaiter_NYPWidget>
-            <version>3.0.4</version>
+            <version>3.0.5</version>
         </PriceWaiter_NYPWidget>
     </modules>
 

package.template.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <package>
     <name>nypwidget</name>
-    <version>3.0.4</version>
+    <version>3.0.5</version>
     <stability>stable</stability>
     <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</license>
     <channel>community</channel>
     <extends/>
     <summary>PriceWaiter lets buyers make offers on your products that you can easily accept, counter offer or reject.</summary>
     <description>Sell more, immediately, with PriceWaiter. Convert comparison shoppers you might have lost, increase sales and conversions, and stop "minimum advertised price" from preventing sales before they even start.&#xD;&#xD; PriceWaiter lets customers make offers on products you sell-- offers you can accept, reject or counter. The widget embeds a simple Name Your Price button on any product page or category that you choose. Simply install the extension and you'll have full control over PriceWaiter in your Magento admin control panel.</description>
-    <notes>Support checkout of deals with free shipping rules.</notes>
+    <notes>Prevent discount warnings from displaying when no deals are present.</notes>
     <authors>
         <author>
             <name>PriceWaiter</name>