if (!empty($params['target_contact_id']) &&
$params['target_contact_id'] != $targetContactId
) {
- array_unshift($values, 'Mismatch of External identifier :' . $params['external_identifier'] . ' and Contact Id:' . $params['target_contact_id']);
+ array_unshift($values, 'Mismatch of External ID:' . $params['external_identifier'] . ' and Contact Id:' . $params['target_contact_id']);
return CRM_Import_Parser::ERROR;
}
elseif ($targetContactId) {
$params['target_contact_id'] = $targetContactId;
}
else {
- array_unshift($values, 'No Matching Contact for External identifier :' . $params['external_identifier']);
+ array_unshift($values, 'No Matching Contact for External ID:' . $params['external_identifier']);
return CRM_Import_Parser::ERROR;
}
}
$form->add('text', 'street_unit', ts('Street Unit'), $attributes['street_unit']);
$form->add('text', 'street_address', ts('Street Address'), $attributes['street_address']);
$form->add('text', 'city', ts('City'), $attributes['city']);
- $form->add('text', 'postal_code', ts('Zip / Postal Code'), $attributes['postal_code']);
+ $form->add('text', 'postal_code', ts('Postal Code'), $attributes['postal_code']);
//@todo FIXME - using the CRM_Core_DAO::VALUE_SEPARATOR creates invalid html - if you can find the form
// this is loaded onto then replace with something like '__' & test
$name = 'name';
}
- $form->addField("address[$blockId][$name]", array('entity' => 'address'));
+ $params = array('entity' => 'address');
+
+ if ($name == 'postal_code_suffix') {
+ $params['label'] = ts('Suffix');
+ }
+
+ $form->addField("address[$blockId][$name]", $params);
}
$entityId = NULL;
$form->addSelect('preferred_language', array('class' => 'twenty', 'context' => 'search'));
// Phone search
- $form->addElement('text', 'phone_numeric', ts('Phone Number'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_Phone', 'phone'));
+ $form->addElement('text', 'phone_numeric', ts('Phone'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_Phone', 'phone'));
$locationType = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id');
$phoneType = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id');
$form->add('select', 'phone_location_type_id', ts('Phone Location'), array('' => ts('- any -')) + $locationType, FALSE, array('class' => 'crm-select2'));
$elements = array(
'street_address' => array(ts('Street Address'), $attributes['street_address'], NULL, NULL),
'city' => array(ts('City'), $attributes['city'], NULL, NULL),
- 'postal_code' => array(ts('Zip / Postal Code'), $attributes['postal_code'], NULL, NULL),
+ 'postal_code' => array(ts('Postal Code'), $attributes['postal_code'], NULL, NULL),
'country' => array(ts('Country'), $attributes['country_id'], 'country', FALSE),
'state_province' => array(ts('State/Province'), $attributes['state_province_id'], 'stateProvince', TRUE),
'county' => array(ts('County'), $attributes['county_id'], 'county', TRUE),
$checkCid->external_identifier = $paramValues['external_identifier'];
$checkCid->find(TRUE);
if ($checkCid->id != $formatted['contact_id']) {
- array_unshift($values, 'Mismatch of External identifier :' . $paramValues['external_identifier'] . ' and Contact Id:' . $formatted['contact_id']);
+ array_unshift($values, 'Mismatch of External ID:' . $paramValues['external_identifier'] . ' and Contact Id:' . $formatted['contact_id']);
return CRM_Import_Parser::ERROR;
}
}
$checkCid->external_identifier = $formatValues['external_identifier'];
$checkCid->find(TRUE);
if ($checkCid->id != $formatted['contact_id']) {
- array_unshift($values, 'Mismatch of External identifier :' . $formatValues['external_identifier'] . ' and Contact Id:' . $formatted['contact_id']);
+ array_unshift($values, 'Mismatch of External ID:' . $formatValues['external_identifier'] . ' and Contact Id:' . $formatted['contact_id']);
return CRM_Import_Parser::ERROR;
}
}
$checkCid->external_identifier = $formatValues['external_identifier'];
$checkCid->find(TRUE);
if ($checkCid->id != $formatted['contact_id']) {
- array_unshift($values, 'Mismatch of External identifier :' . $formatValues['external_identifier'] . ' and Contact Id:' . $formatted['contact_id']);
+ array_unshift($values, 'Mismatch of External ID:' . $formatValues['external_identifier'] . ' and Contact Id:' . $formatted['contact_id']);
return CRM_Import_Parser::ERROR;
}
}
'source' => array(
'name' => 'source',
'type' => 2,
- 'title' => 'Source of Contact Data',
+ 'title' => 'Contact Source',
'maxlength' => 255,
'size' => 30,
'import' => TRUE,
'{contact.preferred_language}' => 'Preferred Language',
'{contact.preferred_mail_format}' => 'Preferred Mail Format',
'{contact.hash}' => 'Contact Hash',
- '{contact.contact_source}' => 'Source of Contact Data',
+ '{contact.contact_source}' => 'Contact Source',
'{contact.first_name}' => 'First Name',
'{contact.middle_name}' => 'Middle Name',
'{contact.last_name}' => 'Last Name',
{/htxt}
{htxt id="id-internal-id-title"}
- {ts}CiviCRM ID{/ts}
+ {ts}Contact ID{/ts}
{/htxt}
{htxt id="id-internal-id"}
<p>{ts}Every contact in CiviCRM has a unique ID number. This number will never change and is the most accurate way of identifying a contact.{/ts}</p>
</td>
{if $contactId}
<td>
- <label for="internal_identifier_display">{ts}CiviCRM ID{/ts} {help id="id-internal-id"}</label><br />
+ <label for="internal_identifier_display">{ts}Contact ID{/ts} {help id="id-internal-id"}</label><br />
<input id="internal_identifier_display" type="text" class="crm-form-text six" size="6" readonly="readonly" value="{$contactId}">
</td>
{/if}
{if !empty($form.address.$blockId.postal_code)}
<td>
{$form.address.$blockId.postal_code.label}<br />
- {$form.address.$blockId.postal_code.html}
- {if !empty($form.address.$blockId.postal_code_suffix)}
+ {$form.address.$blockId.postal_code.html}
+ </td>
+ {if !empty($form.address.$blockId.postal_code_suffix)}
<td>
- {$form.address.$blockId.postal_code_suffix.label}<br/>
- {$form.address.$blockId.postal_code_suffix.html} {help id="id-postal-code-suffix" file="CRM/Contact/Form/Contact.hlp"}
+ {$form.address.$blockId.postal_code_suffix.label} {help id="id-postal-code-suffix" file="CRM/Contact/Form/Contact.hlp"}<br/>
+ {$form.address.$blockId.postal_code_suffix.html}
<td>
- {/if}
- </td>
+ {/if}
{/if}
<td colspan="2"> </td>
</tr>
</div>
<div class="crm-summary-row">
<div class="crm-label">
- {ts}CiviCRM ID{/ts}{if !empty($userRecordUrl)} / {ts}User ID{/ts}{/if}
+ {ts}Contact ID{/ts}{if !empty($userRecordUrl)} / {ts}User ID{/ts}{/if}
</div>
<div class="crm-content">
<span class="crm-contact-contact_id">{$contactId}</span>
{ts}Importing Multi-value Custom Data{/ts}
{/htxt}
{htxt id="upload"}
- {ts}The import file should contain a row for each set of custom data fields. For example, if you are importing employment history for a group of contacts, each row might contain columns for Employer, Start Date, End Date, and Position. You will also need a column containing the CiviCRM Internal Contact ID which is used to match each row to the corresponding (existing) CiviCRM contact record. NOTE: Contact IDs are included by default when exporting contacts from CiviCRM.{/ts}
+ {ts}The import file should contain a row for each set of custom data fields. For example, if you are importing employment history for a group of contacts, each row might contain columns for Employer, Start Date, End Date, and Position. You will also need a column containing the CiviCRM Contact ID which is used to match each row to the corresponding (existing) CiviCRM contact record. NOTE: Contact IDs are included by default when exporting contacts from CiviCRM.{/ts}
{/htxt}
<div class="crm-footer" id="crm-record-log">
<span class="col1">
{if !empty($external_identifier)}{ts}External ID{/ts}: {$external_identifier}{/if}
- {if $action NEQ 2} {ts}CiviCRM ID{/ts}: {$contactId}{/if}
+ {if $action NEQ 2} {ts}Contact ID{/ts}: {$contactId}{/if}
</span>
{if !empty($lastModified)}
{ts}Last Change by{/ts}: <a href="{crmURL p='civicrm/contact/view' q="action=view&reset=1&cid=`$lastModified.id`"}">{$lastModified.name}</a> ({$lastModified.date|crmDate})
</form>
<ul>
<li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" checked="checked" value="" name="quickSearchField">{ts}Name/Email{/ts}</label></li>
- <li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" value="contact_id" name="quickSearchField">{ts}CiviCRM ID{/ts}</label></li>
+ <li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" value="contact_id" name="quickSearchField">{ts}Contact ID{/ts}</label></li>
<li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" value="external_identifier" name="quickSearchField">{ts}External ID{/ts}</label></li>
<li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" value="first_name" name="quickSearchField">{ts}First Name{/ts}</label></li>
<li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" value="last_name" name="quickSearchField">{ts}Last Name{/ts}</label></li>
$this->click("_qf_Contact_upload_view-bottom");
$this->waitForPageToLoad($this->getTimeoutMsec());
$this->waitForText('crm-notification-container', "Contact Saved");
- $mainId = explode("CiviCRM ID:", trim($this->getText("xpath=//div[@id='crm-record-log']/span[@class='col1']")));
+ $mainId = explode("Contact ID:", trim($this->getText("xpath=//div[@id='crm-record-log']/span[@class='col1']")));
$mainId = trim($mainId[1]);
//Duplicate of above contact.
$this->click("_qf_Contact_upload_duplicate");
$this->waitForPageToLoad($this->getTimeoutMsec());
$this->waitForText('crm-notification-container', "Contact Saved");
- $duplicateId = explode("CiviCRM ID:", trim($this->getText("xpath=//div[@id='crm-record-log']/span[@class='col1']")));
+ $duplicateId = explode("Contact ID:", trim($this->getText("xpath=//div[@id='crm-record-log']/span[@class='col1']")));
$duplicateId = trim($duplicateId[1]);
return array(
$sortName = "adv$firstName, $firstName";
$displayName = "$firstName adv$firstName";
- $this->_searchBuilder("Zip / Postal Code", "100[0-9]", $sortName, "RLIKE");
+ $this->_searchBuilder("Postal Code", "100[0-9]", $sortName, "RLIKE");
}
/**
$this->_createContact('Household', $firstName7, "$firstName7@advsearch.co.in", NULL, $postalCode);
// check if the resultset of search builder and advanced search match for the postal code
- $this->_searchBuilder('Zip / Postal Code', $postalCode, NULL, 'LIKE', '4');
+ $this->_searchBuilder('Postal Code', $postalCode, NULL, 'LIKE', '4');
$this->_advancedSearch($postalCode, NULL, NULL, '4', 'postal_code');
$firstName8 = "abcc" . substr(sha1(rand()), 0, 7);
<field>
<name>id</name>
<type>int unsigned</type>
- <title>Internal Contact ID</title>
+ <title>Contact ID</title>
<import>true</import>
<headerPattern>/internal|contact?|id$/i</headerPattern>
<required>true</required>
</index>
<field>
<name>source</name>
- <title>Source of Contact Data</title>
+ <title>Contact Source</title>
<uniqueName>contact_source</uniqueName>
<type>varchar</type>
<length>255</length>
</html>
<import>true</import>
- <headerPattern>/(S(ource\s)?o(f\s)?C(ontact\s)?Data)$/i</headerPattern>
+ <headerPattern>/(C(ontact\s)?Source)$/i</headerPattern>
<comment>where contact come from, e.g. import, donate module insert...</comment>
<add>1.1</add>
</field>
</foreignKey>
<field>
<name>postal_code_suffix</name>
- <title>Zip / Postal Code Suffix</title>
+ <title>Postal Code Suffix</title>
<type>varchar</type>
<length>12</length>
<import>true</import>
<add>1.1</add>
<html>
<type>Text</type>
+ <size>3</size>
</html>
</field>
<field>
<name>postal_code</name>
- <title>Zip / Postal Code</title>
+ <title>Postal Code</title>
<type>varchar</type>
<length>12</length>
<import>true</import>
<headerPattern>/postal|zip/i</headerPattern>
<dataPattern>/\d?\d{4}(-\d{4})?/</dataPattern>
- <comment>Store both US (zip5) AND international postal codes. App is responsible for country/region appropriate
- validation.
- </comment>
+ <comment>Store both US (zip5) AND international postal codes. App is responsible for country/region appropriate validation.</comment>
<add>1.1</add>
<html>
<type>Text</type>
+ <size>6</size>
</html>
</field>
<field>
(@option_group_id_adOpt, '{ts escape="sql"}Supplemental Address 1{/ts}' , 2, 'supplemental_address_1', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}Supplemental Address 2{/ts}' , 3, 'supplemental_address_2', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}City{/ts}' , 4, 'city' , NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Zip / Postal Code{/ts}' , 5, 'postal_code' , NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL),
+ (@option_group_id_adOpt, '{ts escape="sql"}Postal Code{/ts}' , 5, 'postal_code' , NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}Postal Code Suffix{/ts}', 6, 'postal_code_suffix', NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}County{/ts}' , 7, 'county' , NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}State/Province{/ts}' , 8, 'state_province', NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL),
projects / civicrm-core.git / commitdiff