From 87bbc876f9beea306c4aa4b9b4fc9e09e68c58b4 Mon Sep 17 00:00:00 2001 From: eileen Date: Wed, 17 Jul 2013 16:34:12 +1200 Subject: [PATCH] CRM-13067 code tidy up - remove repetitive code --- CRM/Member/Import/Parser/Membership.php | 30 ++++++------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/CRM/Member/Import/Parser/Membership.php b/CRM/Member/Import/Parser/Membership.php index f90fbddbdb..bafe8e31ea 100644 --- a/CRM/Member/Import/Parser/Membership.php +++ b/CRM/Member/Import/Parser/Membership.php @@ -279,40 +279,24 @@ class CRM_Member_Import_Parser_Membership extends CRM_Member_Import_Parser { // don't add to recent items, CRM-4399 $formatted['skipRecentView'] = TRUE; - + $dateLabels = array( + 'join_date' => ts('Member Since'), + 'membership_start_date' => ts('Start Date'), + 'membership_end_date' => ts('End Date'), + ); foreach ($params as $key => $val) { if ($val) { switch ($key) { case 'join_date': - if (CRM_Utils_Date::convertToDefaultDate($params, $dateType, $key)) { - if (!CRM_Utils_Rule::date($params[$key])) { - CRM_Contact_Import_Parser_Contact::addToErrorMsg('Member Since', $errorMessage); - } - } - else { - CRM_Contact_Import_Parser_Contact::addToErrorMsg('Member Since', $errorMessage); - } - break; - case 'membership_start_date': - if (CRM_Utils_Date::convertToDefaultDate($params, $dateType, $key)) { - if (!CRM_Utils_Rule::date($params[$key])) { - CRM_Contact_Import_Parser_Contact::addToErrorMsg('Start Date', $errorMessage); - } - } - else { - CRM_Contact_Import_Parser_Contact::addToErrorMsg('Start Date', $errorMessage); - } - break; - case 'membership_end_date': if (CRM_Utils_Date::convertToDefaultDate($params, $dateType, $key)) { if (!CRM_Utils_Rule::date($params[$key])) { - CRM_Contact_Import_Parser_Contact::addToErrorMsg('End Date', $errorMessage); + CRM_Contact_Import_Parser_Contact::addToErrorMsg($dateLabels[$key], $errorMessage); } } else { - CRM_Contact_Import_Parser_Contact::addToErrorMsg('End Date', $errorMessage); + CRM_Contact_Import_Parser_Contact::addToErrorMsg($dateLabels[$key], $errorMessage); } break; -- 2.25.1