X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=api%2Fv3%2FMembershipType.php;h=2bffc3fe5d2d38f72fd3aabdb76bddb443fd7a43;hb=174dbdd5a5f09823e8cfd6383d3ff4e7ba742f76;hp=b29899383e522be6a53782691e5fa8d88b1fd1af;hpb=1c0f1b28a78453078dc0b6ddc6bee27323aa5ecc;p=civicrm-core.git diff --git a/api/v3/MembershipType.php b/api/v3/MembershipType.php index b29899383e..2bffc3fe5d 100644 --- a/api/v3/MembershipType.php +++ b/api/v3/MembershipType.php @@ -2,7 +2,7 @@ /* +--------------------------------------------------------------------+ - | CiviCRM version 4.3 | + | CiviCRM version 4.4 | +--------------------------------------------------------------------+ | Copyright CiviCRM LLC (c) 2004-2013 | +--------------------------------------------------------------------+ @@ -47,18 +47,16 @@ * {getfields MembershipType_get} */ function civicrm_api3_membership_type_create($params) { + $ids['membershipType'] = CRM_Utils_Array::value('id', $params); + $ids['memberOfContact'] = CRM_Utils_Array::value('member_of_contact_id', $params); + $ids['contributionType'] = CRM_Utils_Array::value('financial_type_id', $params); - $values = $params; - civicrm_api3_verify_mandatory($values, 'CRM_Member_DAO_MembershipType'); - - $ids['membershipType'] = CRM_Utils_Array::value('id', $values); - $ids['memberOfContact'] = CRM_Utils_Array::value('member_of_contact_id', $values); - $ids['contributionType'] = CRM_Utils_Array::value('financial_type_id', $values); - - $membershipTypeBAO = CRM_Member_BAO_MembershipType::add($values, $ids); + $membershipTypeBAO = CRM_Member_BAO_MembershipType::add($params, $ids); $membershipType = array(); _civicrm_api3_object_to_array($membershipTypeBAO, $membershipType[$membershipTypeBAO->id]); CRM_Member_PseudoConstant::membershipType(NULL, TRUE); + civicrm_api3('membership', 'getfields', array('cache_clear' => 1, 'fieldname' => 'membership_type_id')); + civicrm_api3('profile', 'getfields', array('action' => 'submit', 'cache_clear' => 1)); return civicrm_api3_create_success($membershipType, $params, 'membership_type', 'create', $membershipTypeBAO); } @@ -90,7 +88,6 @@ function _civicrm_api3_membership_type_create_spec(&$params) { * @access public */ function civicrm_api3_membership_type_get($params) { - return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params); } @@ -107,9 +104,6 @@ function civicrm_api3_membership_type_get($params) { * {getfields MembershipType_delete} */ function civicrm_api3_membership_type_delete($params) { - - - $memberDelete = CRM_Member_BAO_MembershipType::del($params['id'], 1); - return $memberDelete ? civicrm_api3_create_success($memberDelete) : civicrm_api3_create_error('Error while deleting membership type. id : ' . $params['id']); + return _civicrm_api3_basic_delete(_civicrm_api3_get_BAO(__FUNCTION__), $params); }