Merge pull request #13620 from eileenmcnaughton/signuptype

[civicrm-core.git] / CRM / Contribute / Page / Premium.php

diff --git a/CRM/Contribute/Page/Premium.php b/CRM/Contribute/Page/Premium.php
index 3a61d21ed0dc48929179a425479387bdf9014460..a24eb3960cc4648bfdf63821a95c777af0b49911 100644 (file)
--- a/CRM/Contribute/Page/Premium.php
+++ b/CRM/Contribute/Page/Premium.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  */
 
 /**
@@ -130,45 +130,45 @@ class CRM_Contribute_Page_Premium extends CRM_Core_Page_Basic {
     $pageID = CRM_Utils_Request::retrieve('id', 'Positive',
       $this, FALSE, 0
     );
-    $dao = new CRM_Contribute_DAO_Premium();
-    $dao->entity_table = 'civicrm_contribution_page';
-    $dao->entity_id = $pageID;
-    $dao->find(TRUE);
-    $premiumID = $dao->id;
+    $premiumDao = new CRM_Contribute_DAO_Premium();
+    $premiumDao->entity_table = 'civicrm_contribution_page';
+    $premiumDao->entity_id = $pageID;
+    $premiumDao->find(TRUE);
+    $premiumID = $premiumDao->id;
     $this->assign('products', FALSE);
     $this->assign('id', $pageID);
     if (!$premiumID) {
       return;
     }
 
-    $dao = new CRM_Contribute_DAO_PremiumsProduct();
-    $dao->premiums_id = $premiumID;
-    $dao->orderBy('weight');
-    $dao->find();
+    $premiumsProductDao = new CRM_Contribute_DAO_PremiumsProduct();
+    $premiumsProductDao->premiums_id = $premiumID;
+    $premiumsProductDao->orderBy('weight');
+    $premiumsProductDao->find();
 
-    while ($dao->fetch()) {
+    while ($premiumsProductDao->fetch()) {
       $productDAO = new CRM_Contribute_DAO_Product();
-      $productDAO->id = $dao->product_id;
+      $productDAO->id = $premiumsProductDao->product_id;
       $productDAO->is_active = 1;
 
       if ($productDAO->find(TRUE)) {
         $premiums[$productDAO->id] = array();
-        $premiums[$productDAO->id]['weight'] = $dao->weight;
+        $premiums[$productDAO->id]['weight'] = $premiumsProductDao->weight;
         CRM_Core_DAO::storeValues($productDAO, $premiums[$productDAO->id]);
 
         $action = array_sum(array_keys($this->links()));
 
-        $premiums[$dao->product_id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-          array('id' => $pageID, 'pid' => $dao->id),
+        $premiums[$premiumsProductDao->product_id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
+          array('id' => $pageID, 'pid' => $premiumsProductDao->id),
           ts('more'),
           FALSE,
           'premium.contributionpage.row',
           'Premium',
-          $dao->id
+          $premiumsProductDao->id
         );
-        //Financial Type
-        if (!empty($dao->financial_type_id)) {
-          $premiums[$productDAO->id]['financial_type_id'] = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialType', $dao->financial_type_id, 'name');
+        // Financial Type
+        if (!empty($premiumsProductDao->financial_type_id)) {
+          $premiums[$productDAO->id]['financial_type'] = CRM_Core_PseudoConstant::getLabel('CRM_Contribute_BAO_Product', 'financial_type_id', $premiumsProductDao->financial_type_id);
         }
       }
     }