"; - return FALSE; - } - $recur = &$objects['contributionRecur']; // make sure the invoice ids match @@ -245,7 +237,19 @@ public function recur(&$input, &$ids, &$objects, $first) { $recur->start_date = $now; } else { - $recur->modified_date = $now; + $input['invoice_id'] = md5(uniqid(rand(), TRUE)); + $input['original_contribution_id'] = $ids['contribution']; + $input['contribution_recur_id'] = $ids['contributionRecur']; + + if ($input['paymentStatus'] != 'Completed') { + throw new CRM_Core_Exception("Ignore all IPN payments that are not completed"); + } + // In future moving to create pending & then complete, but this OK for now. + // Also consider accepting 'Failed' like other processors. + $input['contribution_status_id'] = 1; + + civicrm_api3('Contribution', 'repeattransaction', $input); + return; } //contribution installment is completed @@ -310,6 +314,7 @@ public function recur(&$input, &$ids, &$objects, $first) { $contribution->amount_level = $objects['contribution']->amount_level; $contribution->campaign_id = $objects['contribution']->campaign_id; $objects['contribution'] = &$contribution; + $contribution->invoice_id = md5(uniqid(rand(), TRUE)); } // CRM-13737 - am not aware of any reason why payment_date would not be set - this if is a belt & braces $objects['contribution']->receive_date = !empty($input['payment_date']) ? date('YmdHis', strtotime($input['payment_date'])) : $now; @@ -356,9 +361,6 @@ public function single(&$input, &$ids, &$objects, $recur = FALSE, $first = FALSE $transaction = new CRM_Core_Transaction(); - $participant = &$objects['participant']; - $membership = &$objects['membership']; - $status = $input['paymentStatus']; if ($status == 'Denied' || $status == 'Failed' || $status == 'Voided') { return $this->failed($objects, $transaction); diff --git a/CRM/Financial/BAO/FinancialTypeAccount.php b/CRM/Financial/BAO/FinancialTypeAccount.php index 828ba43ffd21..f26a3d9351d2 100644 --- a/CRM/Financial/BAO/FinancialTypeAccount.php +++ b/CRM/Financial/BAO/FinancialTypeAccount.php @@ -257,6 +257,7 @@ public static function createDefaultFinancialAccounts($financialType) { * * @param obj $financialTypeAccount of CRM_Financial_DAO_EntityFinancialAccount * + * @throws CRM_Core_Exception */ public static function validateRelationship($financialTypeAccount) { $financialAccountLinks = CRM_Financial_BAO_FinancialAccount::getfinancialAccountRelations(); @@ -266,7 +267,7 @@ public static function validateRelationship($financialTypeAccount) { $params = array( 1 => $accountRelationships[$financialTypeAccount->account_relationship], ); - throw new Exception(ts("This financial account cannot have '%1' relationship.", $params)); + throw new CRM_Core_Exception(ts("This financial account cannot have '%1' relationship.", $params)); } } diff --git a/CRM/Financial/Form/FinancialTypeAccount.php b/CRM/Financial/Form/FinancialTypeAccount.php index 7e63f87058ae..2055f5007975 100644 --- a/CRM/Financial/Form/FinancialTypeAccount.php +++ b/CRM/Financial/Form/FinancialTypeAccount.php @@ -300,8 +300,13 @@ public function postProcess() { if ($this->_action & CRM_Core_Action::ADD) { $params['entity_id'] = $this->_aid; } - $financialTypeAccount = CRM_Financial_BAO_FinancialTypeAccount::add($params, $ids); - CRM_Core_Session::setStatus(ts('The financial type Account has been saved.')); + try { + $financialTypeAccount = CRM_Financial_BAO_FinancialTypeAccount::add($params, $ids); + CRM_Core_Session::setStatus(ts('The financial type Account has been saved.'), ts('Saved'), 'success'); + } + catch (CRM_Core_Exception $e) { + CRM_Core_Error::statusBounce($e->getMessage()); + } } $buttonName = $this->controller->getButtonName(); diff --git a/CRM/Utils/DeprecatedUtils.php b/CRM/Utils/DeprecatedUtils.php index 934a175d1f9e..d720fb1ffec9 100644 --- a/CRM/Utils/DeprecatedUtils.php +++ b/CRM/Utils/DeprecatedUtils.php @@ -484,7 +484,9 @@ function _civicrm_api3_deprecated_check_contact_dedupe($params) { if ($field == NULL || $field === '') { continue; } - if (is_array($field)) { + // CRM-17040, Considering only primary contact when importing contributions. So contribution inserts into primary contact + // instead of soft credit contact. + if (is_array($field) && $key != "soft_credit") { foreach ($field as $value) { $break = FALSE; if (is_array($value)) { diff --git a/CRM/Utils/System/Backdrop.php b/CRM/Utils/System/Backdrop.php index a55dd9b126ed..ee79b0071f89 100644 --- a/CRM/Utils/System/Backdrop.php +++ b/CRM/Utils/System/Backdrop.php @@ -73,12 +73,12 @@ public function createUser(&$params, $mail) { // we also need to redirect b $config->inCiviCRM = TRUE; - $form = drupal_retrieve_form('user_register_form', $form_state); + $form = backdrop_retrieve_form('user_register_form', $form_state); $form_state['process_input'] = 1; $form_state['submitted'] = 1; $form['#array_parents'] = array(); $form['#tree'] = FALSE; - drupal_process_form('user_register_form', $form, $form_state); + backdrop_process_form('user_register_form', $form, $form_state); $config->inCiviCRM = FALSE; @@ -103,7 +103,7 @@ public function updateCMSName($ufID, $email) { } /** - * Check if username and email exists in the drupal db. + * Check if username and email exists in the Backdrop db. * * @param array $params * Array of name and mail values. @@ -115,7 +115,7 @@ public function updateCMSName($ufID, $email) { public static function checkUserNameEmailExists(&$params, &$errors, $emailName = 'email') { $errors = form_get_errors(); if ($errors) { - // unset drupal messages to avoid twice display of errors + // unset Backdrop messages to avoid twice display of errors unset($_SESSION['messages']); } @@ -164,7 +164,7 @@ public function setTitle($title, $pageTitle = NULL) { $pageTitle = $title; } - drupal_set_title($pageTitle, PASS_THROUGH); + backdrop_set_title($pageTitle, PASS_THROUGH); } } @@ -172,7 +172,7 @@ public function setTitle($title, $pageTitle = NULL) { * @inheritDoc */ public function appendBreadCrumb($breadCrumbs) { - $breadCrumb = drupal_get_breadcrumb(); + $breadCrumb = backdrop_get_breadcrumb(); if (is_array($breadCrumbs)) { foreach ($breadCrumbs as $crumbs) { @@ -190,7 +190,7 @@ public function appendBreadCrumb($breadCrumbs) { $breadCrumb[] = "{$crumbs['title']}"; } } - drupal_set_breadcrumb($breadCrumb); + backdrop_set_breadcrumb($breadCrumb); } /** @@ -198,7 +198,7 @@ public function appendBreadCrumb($breadCrumbs) { */ public function resetBreadCrumb() { $bc = array(); - drupal_set_breadcrumb($bc); + backdrop_set_breadcrumb($bc); } /** @@ -212,7 +212,7 @@ public function addHTMLHead($header) { '#type' => 'markup', '#markup' => $header, ); - drupal_add_html_head($data, $key); + backdrop_add_html_head($data, $key); } } @@ -230,9 +230,9 @@ public function addScriptUrl($url, $region) { default: return FALSE; } - // If the path is within the drupal directory we can use the more efficient 'file' setting + // If the path is within the Backdrop directory we can use the more efficient 'file' setting $params['type'] = $this->formatResourceUrl($url) ? 'file' : 'external'; - drupal_add_js($url, $params); + backdrop_add_js($url, $params); return TRUE; } @@ -250,7 +250,7 @@ public function addScript($code, $region) { default: return FALSE; } - drupal_add_js($code, $params); + backdrop_add_js($code, $params); return TRUE; } @@ -262,9 +262,9 @@ public function addStyleUrl($url, $region) { return FALSE; } $params = array(); - // If the path is within the drupal directory we can use the more efficient 'file' setting + // If the path is within the Backdrop directory we can use the more efficient 'file' setting $params['type'] = $this->formatResourceUrl($url) ? 'file' : 'external'; - drupal_add_css($url, $params); + backdrop_add_css($url, $params); return TRUE; } @@ -276,7 +276,7 @@ public function addStyle($code, $region) { return FALSE; } $params = array('type' => 'inline'); - drupal_add_css($code, $params); + backdrop_add_css($code, $params); return TRUE; } @@ -331,7 +331,7 @@ public function authenticate($name, $password, $loadCMSBootstrap = FALSE, $realP } else { // CRM-8638 - // SOAP cannot load drupal bootstrap and hence we do it the old way + // SOAP cannot load Backdrop bootstrap and hence we do it the old way // Contact CiviSMTP folks if we run into issues with this :) $cmsPath = $this->cmsRootPath(); @@ -414,8 +414,8 @@ public function userLoginFinalize($params = array()) { * @inheritDoc */ public function getUFLocale() { - // return CiviCRM’s xx_YY locale that either matches Drupal’s Chinese locale - // (for CRM-6281), Drupal’s xx_YY or is retrieved based on Drupal’s xx + // return CiviCRM’s xx_YY locale that either matches Backdrop’s Chinese locale + // (for CRM-6281), Backdrop’s xx_YY or is retrieved based on Backdrop’s xx // sometimes for CLI based on order called, this might not be set and/or empty global $language; @@ -515,11 +515,11 @@ public function loadBootStrap($params = array(), $loadUser = TRUE, $throwError = } return FALSE; } - // load drupal bootstrap + // load Backdrop bootstrap chdir($cmsPath); define('BACKDROP_ROOT', $cmsPath); - // For drupal multi-site CRM-11313 + // For Backdrop multi-site CRM-11313 if ($realPath && strpos($realPath, 'sites/all/modules/') === FALSE) { preg_match('@sites/([^/]*)/modules@s', $realPath, $matches); if (!empty($matches[1])) { @@ -890,4 +890,130 @@ public function permissionEmails($permissionName) { return array(); } + /** + * @inheritdoc + */ + public function getDefaultFileStorage() { + $config = CRM_Core_Config::singleton(); + $baseURL = CRM_Utils_System::languageNegotiationURL($config->userFrameworkBaseURL, FALSE, TRUE); + + $siteName = $this->parseBackdropSiteNameFromRequest('/files/civicrm'); + if ($siteName) { + $filesURL = $baseURL . "sites/$siteName/files/civicrm/"; + } + else { + $filesURL = $baseURL . "files/civicrm/"; + } + + return array( + 'url' => $filesURL, + 'path' => CRM_Utils_File::baseFilePath(), + ); + } + + /** + * Check if a resource url is within the Backdrop directory and format appropriately. + * + * @param $url (reference) + * + * @return bool + * TRUE for internal paths, FALSE for external. The backdrop_add_js fn is able to add js more + * efficiently if it is known to be in the Backdrop site + */ + public function formatResourceUrl(&$url) { + $internal = FALSE; + $base = CRM_Core_Config::singleton()->resourceBase; + global $base_url; + // Handle absolute urls + // compares $url (which is some unknown/untrusted value from a third-party dev) to the CMS's base url (which is independent of civi's url) + // to see if the url is within our Backdrop dir, if it is we are able to treated it as an internal url + if (strpos($url, $base_url) === 0) { + $file = trim(str_replace($base_url, '', $url), '/'); + // CRM-18130: Custom CSS URL not working if aliased or rewritten + if (file_exists(BACKDROP_ROOT . $file)) { + $url = $file; + $internal = TRUE; + } + } + // Handle relative urls that are within the CiviCRM module directory + elseif (strpos($url, $base) === 0) { + $internal = TRUE; + $url = $this->appendCoreDirectoryToResourceBase(dirname(backdrop_get_path('module', 'civicrm')) . '/') . trim(substr($url, strlen($base)), '/'); + } + // Strip query string + $q = strpos($url, '?'); + if ($q && $internal) { + $url = substr($url, 0, $q); + } + return $internal; + } + + /** + * @inheritDoc + */ + public function setMessage($message) { + backdrop_set_message($message); + } + + /** + * @inheritDoc + */ + public function permissionDenied() { + backdrop_access_denied(); + } + + /** + * @inheritDoc + */ + public function flush() { + backdrop_flush_all_caches(); + } + + /** + * Determine if Backdrop multi-site applies to the current request -- and, + * specifically, determine the name of the multisite folder. + * + * @param string $flagFile + * Check if $flagFile exists inside the site dir. + * @return null|string + * string, e.g. `bar.example.com` if using multisite. + * NULL if using the default site. + */ + private function parseBackdropSiteNameFromRequest($flagFile = '') { + $phpSelf = array_key_exists('PHP_SELF', $_SERVER) ? $_SERVER['PHP_SELF'] : ''; + $httpHost = array_key_exists('HTTP_HOST', $_SERVER) ? $_SERVER['HTTP_HOST'] : ''; + if (empty($httpHost)) { + $httpHost = parse_url(CIVICRM_UF_BASEURL, PHP_URL_HOST); + if (parse_url(CIVICRM_UF_BASEURL, PHP_URL_PORT)) { + $httpHost .= ':' . parse_url(CIVICRM_UF_BASEURL, PHP_URL_PORT); + } + } + + $confdir = $this->cmsRootPath() . '/sites'; + + if (file_exists($confdir . "/sites.php")) { + include $confdir . "/sites.php"; + } + else { + $sites = array(); + } + + $uri = explode('/', $phpSelf); + $server = explode('.', implode('.', array_reverse(explode(':', rtrim($httpHost, '.'))))); + for ($i = count($uri) - 1; $i > 0; $i--) { + for ($j = count($server); $j > 0; $j--) { + $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i)); + if (file_exists("$confdir/$dir" . $flagFile)) { + \Civi::$statics[__CLASS__]['drupalSiteName'] = $dir; + return \Civi::$statics[__CLASS__]['drupalSiteName']; + } + // check for alias + if (isset($sites[$dir]) && file_exists("$confdir/{$sites[$dir]}" . $flagFile)) { + \Civi::$statics[__CLASS__]['drupalSiteName'] = $sites[$dir]; + return \Civi::$statics[__CLASS__]['drupalSiteName']; + } + } + } + } + } diff --git a/Civi/Core/SettingsStack.php b/Civi/Core/SettingsStack.php index 79e2f22d7a84..434c8371e6b6 100644 --- a/Civi/Core/SettingsStack.php +++ b/Civi/Core/SettingsStack.php @@ -4,7 +4,12 @@ /** * Class SettingsStack * - * The settings stack allows you to temporarily apply settings. + * The settings stack allows you to temporarily change (then restore) settings. It's intended + * primarily for use in testing. + * + * Like the global `$civicrm_setting` variable, it works best with typical inert settings that + * do not trigger extra activation logic. A handful of settings (such as `enable_components` + * and ~5 others) * * @package Civi\Core */ diff --git a/ang/crmMailing/Recipients.js b/ang/crmMailing/Recipients.js index d9714d48e696..dfb70b349314 100644 --- a/ang/crmMailing/Recipients.js +++ b/ang/crmMailing/Recipients.js @@ -8,7 +8,6 @@ scope: { ngRequired: '@' }, - templateUrl: '~/crmMailing/Recipients.html', link: function(scope, element, attrs, ngModel) { scope.recips = ngModel.$viewValue; scope.groups = scope.$parent.$eval(attrs.crmAvailGroups); diff --git a/api/v3/RelationshipType.php b/api/v3/RelationshipType.php index 30f238692a1e..4260edc42cac 100644 --- a/api/v3/RelationshipType.php +++ b/api/v3/RelationshipType.php @@ -77,8 +77,6 @@ function civicrm_api3_relationship_type_create($params) { * Array of parameters determined by getfields. */ function _civicrm_api3_relationship_type_create_spec(&$params) { - $params['contact_type_a']['api.required'] = 1; - $params['contact_type_b']['api.required'] = 1; $params['name_a_b']['api.required'] = 1; $params['name_b_a']['api.required'] = 1; $params['is_active']['api.default'] = 1; diff --git a/api/v3/examples/Setting/GetFields.php b/api/v3/examples/Setting/GetFields.php index 739f9d4814c1..3d2c08eaf8b3 100644 --- a/api/v3/examples/Setting/GetFields.php +++ b/api/v3/examples/Setting/GetFields.php @@ -40,7 +40,7 @@ function setting_getfields_expectedresult() { $expectedResult = array( 'is_error' => 0, 'version' => 3, - 'count' => 151, + 'count' => 157, 'values' => array( 'address_standardization_provider' => array( 'group_name' => 'Address Preferences', @@ -127,6 +127,63 @@ function setting_getfields_expectedresult() { 'description' => '', 'help_text' => 'If set, new contacts that are created when signing a petition are assigned a tag of this name.', ), + 'civicaseRedactActivityEmail' => array( + 'group_name' => 'CiviCRM Preferences', + 'group' => 'core', + 'name' => 'civicaseRedactActivityEmail', + 'type' => 'String', + 'quick_form_type' => 'Select', + 'html_type' => 'Select', + 'html_attributes' => array(), + 'default' => 'default', + 'add' => '4.7', + 'title' => 'Redact Activity Email', + 'is_domain' => 1, + 'is_contact' => 0, + 'pseudoconstant' => array( + 'callback' => 'CRM_Case_Info::getRedactOptions', + ), + 'description' => 'Should activity emails be redacted? (Set \"Default\" to load setting from the legacy \"Settings.xml\" file.)', + 'help_text' => '', + ), + 'civicaseAllowMultipleClients' => array( + 'group_name' => 'CiviCRM Preferences', + 'group' => 'core', + 'name' => 'civicaseAllowMultipleClients', + 'type' => 'String', + 'quick_form_type' => 'Select', + 'html_type' => 'Select', + 'html_attributes' => array(), + 'default' => 'default', + 'add' => '4.7', + 'title' => 'Allow Multiple Case Clients', + 'is_domain' => 1, + 'is_contact' => 0, + 'pseudoconstant' => array( + 'callback' => 'CRM_Case_Info::getMultiClientOptions', + ), + 'description' => 'How many clients may be associated with a given case? (Set \"Default\" to load setting from the legacy \"Settings.xml\" file.)', + 'help_text' => '', + ), + 'civicaseNaturalActivityTypeSort' => array( + 'group_name' => 'CiviCRM Preferences', + 'group' => 'core', + 'name' => 'civicaseNaturalActivityTypeSort', + 'type' => 'String', + 'quick_form_type' => 'Select', + 'html_type' => 'Select', + 'html_attributes' => array(), + 'default' => 'default', + 'add' => '4.7', + 'title' => 'Activity Type Sorting', + 'is_domain' => 1, + 'is_contact' => 0, + 'pseudoconstant' => array( + 'callback' => 'CRM_Case_Info::getSortOptions', + ), + 'description' => 'How to sort activity-types on the \"Manage Case\" screen? (Set \"Default\" to load setting from the legacy \"Settings.xml\" file.)', + 'help_text' => '', + ), 'cvv_backoffice_required' => array( 'group_name' => 'Contribute Preferences', 'group' => 'contribute', @@ -667,6 +724,27 @@ function setting_getfields_expectedresult() { 'description' => 'If enabled, CiviCRM sends PDF receipt as an attachment during event signup or online contribution.', 'help_text' => '', ), + 'recordGeneratedLetters' => array( + 'group_name' => 'CiviCRM Preferences', + 'group' => 'core', + 'name' => 'recordGeneratedLetters', + 'type' => 'String', + 'quick_form_type' => 'Select', + 'html_type' => 'Select', + 'html_attributes' => array( + 'class' => 'crm-select2', + ), + 'default' => 'multiple', + 'add' => '4.7', + 'title' => 'Record generated letters', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => 'When generating a letter (PDF/Word) via mail-merge, how should the letter be recorded?', + 'help_text' => '', + 'pseudoconstant' => array( + 'callback' => 'CRM_Contact_Form_Task_PDFLetterCommon::getLoggingOptions', + ), + ), 'wkhtmltopdfPath' => array( 'group_name' => 'CiviCRM Preferences', 'group' => 'core', @@ -1162,6 +1240,39 @@ function setting_getfields_expectedresult() { 'description' => 'If enabled, then CMS email id will be syncronised with CiviCRM contacts\'s primary email.', 'help_text' => '', ), + 'preserve_activity_tab_filter' => array( + 'group_name' => 'CiviCRM Preferences', + 'group' => 'core', + 'name' => 'preserve_activity_tab_filter', + 'type' => 'String', + 'html_type' => 'Text', + 'default' => 0, + 'add' => '4.7', + 'title' => 'Preserve activity filters as a user preference', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => 'When enabled, any filter settings a user selects on the contact\'s Activity tab will be remembered as they visit other contacts', + 'help_text' => '', + ), + 'assetCache' => array( + 'group_name' => 'Developer Preferences', + 'group' => 'developer', + 'name' => 'assetCache', + 'type' => 'String', + 'quick_form_type' => 'Select', + 'html_type' => 'Select', + 'html_attributes' => array(), + 'default' => 'auto', + 'add' => '4.7', + 'title' => 'Asset Caching', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => 'Store computed JS/CSS content in cache files? (Note: In \"Auto\" mode, the \"Debug\" setting will determine whether to activate the cache.)', + 'help_text' => '', + 'pseudoconstant' => array( + 'callback' => '\Civi\Core\AssetBuilder::getCacheModes', + ), + ), 'userFrameworkLogging' => array( 'group_name' => 'Developer Preferences', 'group' => 'developer', @@ -1467,6 +1578,9 @@ function setting_getfields_expectedresult() { 'pseudoconstant' => array( 'callback' => 'CRM_Admin_Form_Setting_Localization::getCurrencySymbols', ), + 'on_change' => array( + '0' => 'CRM_Admin_Form_Setting_Localization::onChangeDefaultCurrency', + ), ), 'defaultContactCountry' => array( 'group_name' => 'Localization Preferences', @@ -2143,6 +2257,24 @@ function setting_getfields_expectedresult() { 'description' => '', 'help_text' => '', ), + 'simple_mail_limit' => array( + 'group_name' => 'Mailing Preferences', + 'group' => 'mailing', + 'name' => 'simple_mail_limit', + 'type' => 'Integer', + 'quick_form_type' => 'Element', + 'html_type' => 'text', + 'html_attributes' => array( + 'size' => 4, + 'maxlength' => 8, + ), + 'default' => 50, + 'title' => 'Simple mail limit', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => 'The number of emails sendable via simple mail. Make sure you understand the implications for your spam reputation and legal requirements for bulk emails before editing. As there is some risk both to your spam reputation and the products if this is misused it is a hidden setting', + 'help_text' => 'CiviCRM forces users sending more than this number of mails to use CiviMails. CiviMails have additional precautions: not sending to contacts who do not want bulk mail, adding domain name and opt out links. You should familiarise yourself with the law relevant to you on bulk mailings if changing this setting. For the US https://en.wikipedia.org/wiki/CAN-SPAM_Act_of_2003 is a good place to start.', + ), 'geoAPIKey' => array( 'add' => '4.7', 'help_text' => '', @@ -2456,6 +2588,20 @@ function setting_getfields_expectedresult() { 'description' => 'If set, this will be the default profile used for contact search.', 'help_text' => '', ), + 'searchPrimaryDetailsOnly' => array( + 'group_name' => 'Search Preferences', + 'group' => 'Search Preferences', + 'name' => 'searchPrimaryDetailsOnly', + 'type' => 'Boolean', + 'quick_form_type' => 'YesNo', + 'default' => 1, + 'add' => '4.7', + 'title' => 'Search Primary Details Only', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => 'If enabled, only primary details (eg contact\'s primary email, phone, etc) will be included in Basic and Advanced Search results. Disabling this feature will allow users to match contacts using any email, phone etc detail.', + 'help_text' => '', + ), 'userFrameworkResourceURL' => array( 'bootstrap_comment' => 'This is a boot setting which may be loaded during bootstrap. Defaults are loaded via SettingsBag::getSystemDefaults().', 'group' => 'url', diff --git a/settings/Mailing.setting.php b/settings/Mailing.setting.php index 056122f764bc..1969df133aea 100644 --- a/settings/Mailing.setting.php +++ b/settings/Mailing.setting.php @@ -315,4 +315,22 @@ 'description' => NULL, 'help_text' => NULL, ), + 'simple_mail_limit' => array( + 'group_name' => 'Mailing Preferences', + 'group' => 'mailing', + 'name' => 'simple_mail_limit', + 'type' => 'Integer', + 'quick_form_type' => 'Element', + 'html_type' => 'text', + 'html_attributes' => array( + 'size' => 4, + 'maxlength' => 8, + ), + 'default' => 50, + 'title' => 'Simple mail limit', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => 'The number of emails sendable via simple mail. Make sure you understand the implications for your spam reputation and legal requirements for bulk emails before editing. As there is some risk both to your spam reputation and the products if this is misused it is a hidden setting', + 'help_text' => 'CiviCRM forces users sending more than this number of mails to use CiviMails. CiviMails have additional precautions: not sending to contacts who do not want bulk mail, adding domain name and opt out links. You should familiarise yourself with the law relevant to you on bulk mailings if changing this setting. For the US https://en.wikipedia.org/wiki/CAN-SPAM_Act_of_2003 is a good place to start.', + ), ); diff --git a/tests/phpunit/CRM/Contribute/Import/Parser/ContributionTest.php b/tests/phpunit/CRM/Contribute/Import/Parser/ContributionTest.php new file mode 100644 index 000000000000..303bdd11138e --- /dev/null +++ b/tests/phpunit/CRM/Contribute/Import/Parser/ContributionTest.php @@ -0,0 +1,85 @@ + 'Contact', + 'last_name' => 'One', + 'external_identifier' => 'ext-1', + 'contact_type' => 'Individual', + ); + $contact2Params = array( + 'first_name' => 'Contact', + 'last_name' => 'Two', + 'external_identifier' => 'ext-2', + 'contact_type' => 'Individual', + ); + $contact1Id = $this->individualCreate($contact1Params); + $contact2Id = $this->individualCreate($contact2Params); + $values = array( + "total_amount" => 10, + "financial_type" => "Donation", + "external_identifier" => "ext-1", + "soft_credit" => "ext-2", + ); + $mapperSoftCredit = array(NULL, NULL, NULL, "external_identifier"); + $mapperSoftCreditType = array(NULL, NULL, NULL, "1"); + $this->runImport($values, CRM_Import_Parser::DUPLICATE_UPDATE, CRM_Contribute_Import_Parser::SOFT_CREDIT, $mapperSoftCredit, NULL, $mapperSoftCreditType); + $params = array( + "contact_id" => $contact1Id, + ); + $values = array(); + $contributionsOfMainContact = CRM_Contribute_BAO_Contribution::retrieve($params, $values, $values); + $params["contact_id"] = $contact2Id; + $contributionsOfSoftContact = CRM_Contribute_BAO_ContributionSoft::retrieve($params, $values); + $this->assertEquals(1, count($contributionsOfMainContact), 'Contribution not added for primary contact'); + $this->assertEquals(1, count($contributionsOfSoftContact), 'Soft Contribution not added for secondary contact'); + } + /** + * Run the import parser. + * + * @param array $originalValues + * + * @param int $onDuplicateAction + * @param int $expectedResult + * @param array|null $mapperSoftCredit + * @param array|null $mapperPhoneType + * @param array|null $mapperSoftCreditType + * @param array|null $fields + * Array of field names. Will be calculated from $originalValues if not passed in. + */ + protected function runImport($originalValues, $onDuplicateAction, $expectedResult, $mapperSoftCredit = NULL, $mapperPhoneType = NULL, $mapperSoftCreditType = NULL, $fields = NULL) { + if (!$fields) { + $fields = array_keys($originalValues); + } + $values = array_values($originalValues); + $parser = new CRM_Contribute_Import_Parser_Contribution($fields, $mapperSoftCredit, $mapperPhoneType, $mapperSoftCreditType); + $parser->_contactType = 'Individual'; + $parser->init(); + $this->assertEquals($expectedResult, $parser->import($onDuplicateAction, $values), 'Return code from parser import was not as expected'); + } + +} diff --git a/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php b/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php index e51ff0141ac1..786557a97266 100644 --- a/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php +++ b/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php @@ -95,6 +95,7 @@ public function testIPNPaymentRecurSuccess() { )); $this->assertEquals(2, $contribution['count']); $this->assertEquals('secondone', $contribution['values'][1]['trxn_id']); + $this->assertEquals('Debit Card', $contribution['values'][1]['payment_instrument']); } /** diff --git a/tests/phpunit/Civi/Core/SettingsStackTest.php b/tests/phpunit/Civi/Core/SettingsStackTest.php new file mode 100644 index 000000000000..ac4cee90567b --- /dev/null +++ b/tests/phpunit/Civi/Core/SettingsStackTest.php @@ -0,0 +1,33 @@ +useTransaction(TRUE); + } + + public function tearDown() { + parent::tearDown(); + } + + /** + * Temporarily modify -- then restore -- settings. + */ + public function testStack() { + $origVal = \Civi::settings()->get('show_events'); + + $settingsStack = new \Civi\Core\SettingsStack(); + + $settingsStack->push('show_events', 9); + $this->assertEquals(9, \Civi::settings()->get('show_events')); + + $settingsStack->push('show_events', 8); + $this->assertEquals(8, \Civi::settings()->get('show_events')); + + $settingsStack->popAll(); + $this->assertEquals($origVal, \Civi::settings()->get('show_events')); + } + +} diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php index 1e059b076b21..13d56d020d3e 100644 --- a/tests/phpunit/api/v3/ContributionPageTest.php +++ b/tests/phpunit/api/v3/ContributionPageTest.php @@ -1202,14 +1202,50 @@ public function testSubmitMembershipPriceSetPaymentPaymentProcessorRecurDelayed( $this->assertEquals(2, $recurringContribution['contribution_status_id']); } + /** + * Test non-recur contribution with membership payment + */ + public function testSubmitMembershipIsSeparatePaymentNotRecur() { + //Create recur contribution page. + $this->setUpMembershipContributionPage(TRUE, TRUE); + $dummyPP = Civi\Payment\System::singleton()->getByProcessor($this->_paymentProcessor); + $dummyPP->setDoDirectPaymentResult(array('payment_status_id' => 1, 'trxn_id' => 'create_first_success')); + + //Sumbit payment with recur disabled. + $submitParams = array( + 'price_' . $this->_ids['price_field'][0] => reset($this->_ids['price_field_value']), + 'id' => (int) $this->_ids['contribution_page'], + 'amount' => 10, + 'frequency_interval' => 1, + 'frequency_unit' => 'month', + 'billing_first_name' => 'Billy', + 'billing_middle_name' => 'Goat', + 'billing_last_name' => 'Gruff', + 'email' => 'billy@goat.gruff', + 'selectMembership' => $this->_ids['membership_type'], + 'payment_processor_id' => 1, + 'credit_card_number' => '4111111111111111', + 'credit_card_type' => 'Visa', + 'credit_card_exp_date' => array('M' => 9, 'Y' => 2040), + 'cvv2' => 123, + ); + + //Assert if recur contribution is created. + $this->callAPISuccess('contribution_page', 'submit', $submitParams); + $recur = $this->callAPISuccess('contribution_recur', 'get', array()); + $this->assertEmpty($recur['count']); + } + + /** * Set up membership contribution page. * @param bool $isSeparatePayment + * @param bool $isRecur */ - public function setUpMembershipContributionPage($isSeparatePayment = FALSE) { + public function setUpMembershipContributionPage($isSeparatePayment = FALSE, $isRecur = FALSE) { $this->setUpMembershipBlockPriceSet(); $this->setupPaymentProcessor(); - $this->setUpContributionPage(); + $this->setUpContributionPage($isRecur); $this->callAPISuccess('membership_block', 'create', array( 'entity_id' => $this->_ids['contribution_page'], @@ -1334,8 +1370,13 @@ public function addOtherAmountFieldToMembershipPriceSet() { /** * Help function to set up contribution page with some defaults. + * @param bool $isRecur */ - public function setUpContributionPage() { + public function setUpContributionPage($isRecur = FALSE) { + if ($isRecur) { + $this->params['is_recur'] = 1; + $this->params['recur_frequency_unit'] = 'month'; + } $contributionPageResult = $this->callAPISuccess($this->_entity, 'create', $this->params); if (empty($this->_ids['price_set'])) { $priceSet = $this->callAPISuccess('price_set', 'create', $this->_priceSetParams); diff --git a/tests/phpunit/api/v3/RelationshipTypeTest.php b/tests/phpunit/api/v3/RelationshipTypeTest.php index 24e44e109de5..1b6ad286e4cb 100644 --- a/tests/phpunit/api/v3/RelationshipTypeTest.php +++ b/tests/phpunit/api/v3/RelationshipTypeTest.php @@ -93,19 +93,6 @@ public function testRelationshipTypeCreateWithoutName() { ); } - /** - * Check with no contact type. - */ - public function testRelationshipTypeCreateWithoutContactType() { - $relTypeParams = array( - 'name_a_b' => 'Relation 1 without contact type', - 'name_b_a' => 'Relation 2 without contact type', - ); - $result = $this->callAPIFailure('relationship_type', 'create', $relTypeParams, - 'Mandatory key(s) missing from params array: contact_type_a, contact_type_b' - ); - } - /** * Create relationship type. */ @@ -190,7 +177,7 @@ public function testRelationshipTypeDelete() { public function testRelationshipTypeUpdateEmpty() { $params = array(); $result = $this->callAPIFailure('relationship_type', 'create', $params); - $this->assertEquals($result['error_message'], 'Mandatory key(s) missing from params array: name_a_b, name_b_a, contact_type_a, contact_type_b'); + $this->assertEquals($result['error_message'], 'Mandatory key(s) missing from params array: name_a_b, name_b_a'); } /** diff --git a/xml/schema/Contact/Contact.xml b/xml/schema/Contact/Contact.xml index 4b2aab12f81b..428dc40b55ad 100644 --- a/xml/schema/Contact/Contact.xml +++ b/xml/schema/Contact/Contact.xml @@ -534,6 +534,9 @@