FIX: #126 - corrected detail page campagins +

identifier usage (record identifier is different from the one for request parameter preparation)
flagbit · May 13, 2016 · 1692116 · 1692116
1 parent 25fda20
commit 1692116
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/app/code/community/FACTFinder/Campaigns/Model/Handler/Abstract.php b/src/app/code/community/FACTFinder/Campaigns/Model/Handler/Abstract.php
@@ -139,7 +139,7 @@ public function getActiveAdvisorQuestions()
      */
     public function getCampaigns()
     {
-        if ($this->_featureAvailable && $this->_campaigns === null && !empty($this->_productIds)) {
+        if ($this->_featureAvailable && $this->_campaigns === null) {
             $this->_campaigns = $this->_getFacade()->getProductCampaigns();
         }
 

diff --git a/src/app/code/community/FACTFinder/Campaigns/Model/Handler/Product.php b/src/app/code/community/FACTFinder/Campaigns/Model/Handler/Product.php
@@ -56,7 +56,9 @@ protected function _getProductNumberParam()
      */
     public function getCampaigns()
     {
-        $this->_getFacade()->getProductCampaignAdapter()->makeProductCampaign();
+        if (!empty($this->_productIds)) {
+            $this->_getFacade()->getProductCampaignAdapter()->makeProductCampaign();
+        }
 
         return parent::getCampaigns();
     }

diff --git a/src/app/code/community/FACTFinder/Campaigns/Model/Resource/Pushedproducts/Collection.php b/src/app/code/community/FACTFinder/Campaigns/Model/Resource/Pushedproducts/Collection.php
@@ -109,7 +109,7 @@ public function _loadEntities($printQuery = false, $logQuery = false)
             );
         }
 
-        $idFieldName = Mage::helper('factfinder_campaigns')->getIdFieldName();
+        $idFieldName = Mage::helper('factfinder/search')->getIdFieldName();
 
         if (!empty($productIds)) {
             // add Filter to Query