Merge branch 'master' into Issue#521-send-owner-notification-after-su…

…ccessful-payment
civicrm · Dec 28, 2020 · 923d84b · 923d84b
2 parents d185010 + e4e20a1
commit 923d84b
Show file tree

Hide file tree

Showing 104 changed files with 2,951 additions and 1,529 deletions.
diff --git a/CRM/Activity/Import/Parser/Activity.php b/CRM/Activity/Import/Parser/Activity.php
@@ -271,8 +271,7 @@ public function import($onDuplicate, &$values) {
       }
     }
     // Date-Format part ends.
-    require_once 'CRM/Utils/DeprecatedUtils.php';
-    $formatError = _civicrm_api3_deprecated_activity_formatted_param($params, $params, TRUE);
+    $formatError = $this->deprecated_activity_formatted_param($params, $params, TRUE);
 
     if ($formatError) {
       array_unshift($values, $formatError['error_message']);
@@ -374,4 +373,67 @@ public function import($onDuplicate, &$values) {
     return CRM_Import_Parser::VALID;
   }
 
+  /**
+   * take the input parameter list as specified in the data model and
+   * convert it into the same format that we use in QF and BAO object
+   *
+   * @param array $params
+   *   Associative array of property name/value.
+   *                             pairs to insert in new contact.
+   * @param array $values
+   *   The reformatted properties that we can use internally.
+   *
+   * @param array|bool $create Is the formatted Values array going to
+   *                             be used for CRM_Activity_BAO_Activity::create()
+   *
+   * @return array|CRM_Error
+   */
+  protected function deprecated_activity_formatted_param(&$params, &$values, $create = FALSE) {
+    // copy all the activity fields as is
+    $fields = CRM_Activity_DAO_Activity::fields();
+    _civicrm_api3_store_values($fields, $params, $values);
+
+    require_once 'CRM/Core/OptionGroup.php';
+    $customFields = CRM_Core_BAO_CustomField::getFields('Activity');
+
+    foreach ($params as $key => $value) {
+      // ignore empty values or empty arrays etc
+      if (CRM_Utils_System::isNull($value)) {
+        continue;
+      }
+
+      //Handling Custom Data
+      if ($customFieldID = CRM_Core_BAO_CustomField::getKeyID($key)) {
+        $values[$key] = $value;
+        $type = $customFields[$customFieldID]['html_type'];
+        if (CRM_Core_BAO_CustomField::isSerialized($customFields[$customFieldID])) {
+          $values[$key] = CRM_Import_Parser::unserializeCustomValue($customFieldID, $value, $type);
+        }
+        elseif ($type == 'Select' || $type == 'Radio') {
+          $customOption = CRM_Core_BAO_CustomOption::getCustomOption($customFieldID, TRUE);
+          foreach ($customOption as $customFldID => $customValue) {
+            $val = $customValue['value'] ?? NULL;
+            $label = $customValue['label'] ?? NULL;
+            $label = strtolower($label);
+            $value = strtolower(trim($value));
+            if (($value == $label) || ($value == strtolower($val))) {
+              $values[$key] = $val;
+            }
+          }
+        }
+      }
+
+      if ($key == 'target_contact_id') {
+        if (!CRM_Utils_Rule::integer($value)) {
+          return civicrm_api3_create_error("contact_id not valid: $value");
+        }
+        $contactID = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_contact WHERE id = $value");
+        if (!$contactID) {
+          return civicrm_api3_create_error("Invalid Contact ID: There is no contact record with contact_id = $value.");
+        }
+      }
+    }
+    return NULL;
+  }
+
 }
diff --git a/CRM/Campaign/Form/Survey/Results.php b/CRM/Campaign/Form/Survey/Results.php
@@ -123,12 +123,11 @@ public function buildQuickForm() {
     }
 
     // form fields of Custom Option rows
-    $defaultOption = [];
+    $defaultOptionValues = [];
     $_showHide = new CRM_Core_ShowHideBlocks('', '');
 
     $optionAttributes = CRM_Core_DAO::getAttribute('CRM_Core_DAO_OptionValue');
     $optionAttributes['label']['size'] = $optionAttributes['value']['size'] = 25;
-
     for ($i = 1; $i <= self::NUM_OPTION; $i++) {
       //the show hide blocks
       $showBlocks = 'optionField_' . $i;
@@ -161,11 +160,11 @@ public function buildQuickForm() {
         CRM_Core_DAO::getAttribute('CRM_Campaign_DAO_Survey', 'release_frequency')
       );
 
-      $defaultOption[$i] = $this->createElement('radio', NULL, NULL, NULL, $i);
+      $defaultOptionValues[$i] = NULL;
     }
 
     //default option selection
-    $this->addGroup($defaultOption, 'default_option');
+    $this->addRadio('default_option', '', $defaultOptionValues);
 
     $_showHide->addToTemplate();
 

diff --git a/CRM/Contact/Form/Search/Builder.php b/CRM/Contact/Form/Search/Builder.php
@@ -51,7 +51,9 @@ public function preProcess() {
     // Initialize new form
     if (!$this->_blockCount) {
       $this->_blockCount = 4;
-      $this->set('newBlock', 1);
+      if (!$this->_ssID) {
+        $this->set('newBlock', 1);
+      }
     }
 
     //get the column count