X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContribute%2FForm%2FSearch.php;h=295ff79b39f99e3d95ad41435f0a4d87ebf0d24d;hb=af028bfa606d5d8db62150656fe8241722521bb5;hp=6923169fe6b902cc1ba28a44347e1ea7cdcdd59d;hpb=6b5dfd14377463ae9a2cce380113be72cdbd00e8;p=civicrm-core.git diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php index 6923169fe6..295ff79b39 100644 --- a/CRM/Contribute/Form/Search.php +++ b/CRM/Contribute/Form/Search.php @@ -1,34 +1,18 @@ _done = FALSE; - $this->loadStandardSearchOptionsFromUrl(); - - $this->_formValues = $this->getFormValues(); + parent::preProcess(); //membership ID $memberShipId = CRM_Utils_Request::retrieve('memberId', 'Positive', $this); @@ -98,17 +80,6 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { $this->_formValues['contribution_participant_id'] = $participantId; } - if ($this->_force) { - $this->handleForcedSearch(); - } - - $sortID = NULL; - if ($this->get(CRM_Utils_Sort::SORT_ID)) { - $sortID = CRM_Utils_Sort::sortIDValue($this->get(CRM_Utils_Sort::SORT_ID), - $this->get(CRM_Utils_Sort::SORT_DIRECTION) - ); - } - $this->_queryParams = CRM_Contact_BAO_Query::convertFormValues($this->_formValues); $selector = new CRM_Contribute_Selector_Search($this->_queryParams, $this->_action, @@ -127,7 +98,7 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { $controller = new CRM_Core_Selector_Controller($selector, $this->get(CRM_Utils_Pager::PAGE_ID), - $sortID, + $this->getSortID(), CRM_Core_Action::VIEW, $this, CRM_Core_Selector_Controller::TRANSFER, @@ -147,16 +118,7 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { * @throws \Exception */ public function setDefaultValues() { - $lowReceiveDate = CRM_Utils_Request::retrieve('start', 'Timestamp'); - if (!empty($lowReceiveDate)) { - $this->_formValues['receive_date_low'] = date('Y-m-d H:i:s', strtotime($lowReceiveDate)); - CRM_Core_Error::deprecatedFunctionWarning('pass receive_date_low not start'); - } - $highReceiveDate = CRM_Utils_Request::retrieve('end', 'Timestamp'); - if (!empty($highReceiveDate)) { - $this->_formValues['receive_date_high'] = date('Y-m-d H:i:s', strtotime($highReceiveDate)); - CRM_Core_Error::deprecatedFunctionWarning('pass receive_date_high not end'); - } + $this->setDeprecatedDefaults(); $this->_defaults = parent::setDefaultValues(); $this->_defaults = array_merge($this->getEntityDefaults('ContributionRecur'), $this->_defaults); @@ -277,10 +239,12 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { $this->_done = TRUE; $this->setFormValues(); + // @todo - stop changing formValues - respect submitted form values, change a working array. $this->fixFormValues(); // We don't show test records in summaries or dashboards if (empty($this->_formValues['contribution_test']) && $this->_force && !empty($this->_context) && $this->_context == 'dashboard') { + // @todo - stop changing formValues - respect submitted form values, change a working array. $this->_formValues["contribution_test"] = 0; } @@ -289,27 +253,29 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { 'contribution_amount_high', ] as $f) { if (isset($this->_formValues[$f])) { + // @todo - stop changing formValues - respect submitted form values, change a working array. $this->_formValues[$f] = CRM_Utils_Rule::cleanMoney($this->_formValues[$f]); } } - $config = CRM_Core_Config::singleton(); if (!empty($_POST)) { $specialParams = [ 'financial_type_id', 'contribution_soft_credit_type_id', 'contribution_status_id', 'contribution_trxn_id', - 'contribution_page_id', 'contribution_product_id', 'invoice_id', 'payment_instrument_id', 'contribution_batch_id', ]; + // @todo - stop changing formValues - respect submitted form values, change a working array. CRM_Contact_BAO_Query::processSpecialFormValue($this->_formValues, $specialParams); + // @todo - stop changing formValues - respect submitted form values, change a working array. $tags = CRM_Utils_Array::value('contact_tags', $this->_formValues); if ($tags && !is_array($tags)) { + // @todo - stop changing formValues - respect submitted form values, change a working array. unset($this->_formValues['contact_tags']); $this->_formValues['contact_tags'][$tags] = 1; } @@ -317,12 +283,14 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { if ($tags && is_array($tags)) { unset($this->_formValues['contact_tags']); foreach ($tags as $notImportant => $tagID) { + // @todo - stop changing formValues - respect submitted form values, change a working array. $this->_formValues['contact_tags'][$tagID] = 1; } } $group = CRM_Utils_Array::value('group', $this->_formValues); if ($group && !is_array($group)) { + // @todo - stop changing formValues - respect submitted form values, change a working array. unset($this->_formValues['group']); $this->_formValues['group'][$group] = 1; } @@ -330,16 +298,18 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { if ($group && is_array($group)) { unset($this->_formValues['group']); foreach ($group as $groupID) { + // @todo - stop changing formValues - respect submitted form values, change a working array. $this->_formValues['group'][$groupID] = 1; } } } + // @todo - stop changing formValues - respect submitted form values, change a working array. CRM_Core_BAO_CustomValue::fixCustomFieldValue($this->_formValues); + // @todo - stop changing formValues - respect submitted form values, change a working array. $this->_queryParams = CRM_Contact_BAO_Query::convertFormValues($this->_formValues); - $this->set('formValues', $this->_formValues); $this->set('queryParams', $this->_queryParams); $buttonName = $this->controller->getButtonName(); @@ -353,13 +323,6 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { return; } - $sortID = NULL; - if ($this->get(CRM_Utils_Sort::SORT_ID)) { - $sortID = CRM_Utils_Sort::sortIDValue($this->get(CRM_Utils_Sort::SORT_ID), - $this->get(CRM_Utils_Sort::SORT_DIRECTION) - ); - } - $this->_queryParams = CRM_Contact_BAO_Query::convertFormValues($this->_formValues); $selector = new CRM_Contribute_Selector_Search($this->_queryParams, $this->_action, @@ -377,7 +340,7 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { $controller = new CRM_Core_Selector_Controller($selector, $this->get(CRM_Utils_Pager::PAGE_ID), - $sortID, + $this->getSortID(), CRM_Core_Action::VIEW, $this, CRM_Core_Selector_Controller::SESSION, @@ -456,9 +419,6 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { if ($contribPageId) { $this->_formValues['contribution_page_id'] = $contribPageId; } - - //give values to default. - $this->_defaults = $this->_formValues; } /** @@ -480,4 +440,28 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { $this->addSearchFieldMetadata(['ContributionRecur' => CRM_Contribute_BAO_ContributionRecur::getContributionRecurSearchFieldMetadata()]); } + /** + * Handling for url params that are deprecated. + * + * @throws \CRM_Core_Exception + */ + protected function setDeprecatedDefaults() { + $lowReceiveDate = CRM_Utils_Request::retrieve('start', 'Timestamp'); + if (!empty($lowReceiveDate)) { + $this->_formValues['receive_date_low'] = date('Y-m-d H:i:s', strtotime($lowReceiveDate)); + CRM_Core_Error::deprecatedFunctionWarning('pass receive_date_low not start'); + } + $highReceiveDate = CRM_Utils_Request::retrieve('end', 'Timestamp'); + if (!empty($highReceiveDate)) { + $this->_formValues['receive_date_high'] = date('Y-m-d H:i:s', strtotime($highReceiveDate)); + CRM_Core_Error::deprecatedFunctionWarning('pass receive_date_high not end'); + } + //check for contribution page id. + $contribPageId = CRM_Utils_Request::retrieve('pid', 'Positive', $this); + if ($contribPageId) { + CRM_Core_Error::deprecatedFunctionWarning('pass contribution_page_id'); + $this->_formValues['contribution_page_id'] = $contribPageId; + } + } + }