Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-19464 Make 'Supplemental Address 3' usable #9857

Merged
merged 1 commit into from
Apr 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CRM/Contact/BAO/Contact/Location.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ public static function &getMapInfo($ids, $locationTypeID = NULL, $imageUrlOnly =
civicrm_address.street_address as street_address,
civicrm_address.supplemental_address_1 as supplemental_address_1,
civicrm_address.supplemental_address_2 as supplemental_address_2,
civicrm_address.supplemental_address_3 as supplemental_address_3,
civicrm_address.city as city,
civicrm_address.postal_code as postal_code,
civicrm_address.postal_code_suffix as postal_code_suffix,
Expand Down Expand Up @@ -180,6 +181,7 @@ public static function &getMapInfo($ids, $locationTypeID = NULL, $imageUrlOnly =
$dao->street_address,
$dao->supplemental_address_1,
$dao->supplemental_address_2,
$dao->supplemental_address_3,
$dao->city,
)
);
Expand Down
3 changes: 3 additions & 0 deletions CRM/Contact/BAO/Query.php
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ class CRM_Contact_BAO_Query {
'street_unit',
'supplemental_address_1',
'supplemental_address_2',
'supplemental_address_3',
'city',
'postal_code',
'postal_code_suffix',
Expand Down Expand Up @@ -2382,6 +2383,7 @@ public static function getLocationTableName(&$where, &$locType) {
'street_unit',
'supplemental_address_1',
'supplemental_address_2',
'supplemental_address_3',
'city',
'postal_code',
'postal_code_suffix',
Expand Down Expand Up @@ -4238,6 +4240,7 @@ public static function &defaultReturnProperties($mode = 1) {
'street_address' => 1,
'supplemental_address_1' => 1,
'supplemental_address_2' => 1,
'supplemental_address_3' => 1,
'city' => 1,
'postal_code' => 1,
'postal_code_suffix' => 1,
Expand Down
1 change: 1 addition & 0 deletions CRM/Contact/Form/Edit/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public static function buildQuickForm(&$form, $addressBlockCount = NULL, $sharin
'street_address',
'supplemental_address_1',
'supplemental_address_2',
'supplemental_address_3',
'city',
'postal_code',
'postal_code_suffix',
Expand Down
1 change: 1 addition & 0 deletions CRM/Contact/Form/Search/Criteria.php
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ public static function location(&$form) {
'street_address' => array(ts('Street Address'), $attributes['street_address'], NULL, NULL),
'supplemental_address_1' => array(ts('Supplemental Address 1'), $attributes['supplemental_address_1'], NULL, NULL),
'supplemental_address_2' => array(ts('Supplemental Address 2'), $attributes['supplemental_address_2'], NULL, NULL),
'supplemental_address_3' => array(ts('Supplemental Address 3'), $attributes['supplemental_address_3'], NULL, NULL),
'city' => array(ts('City'), $attributes['city'], NULL, NULL),
'postal_code' => array(ts('Postal Code'), $attributes['postal_code'], NULL, NULL),
'country' => array(ts('Country'), $attributes['country_id'], 'country', FALSE),
Expand Down
3 changes: 3 additions & 0 deletions CRM/Contact/Page/View/Vcard.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ public function run() {
if (!empty($location['supplemental_address_2'])) {
$extend .= ', ' . $location['supplemental_address_2'];
}
if (!empty($location['supplemental_address_3'])) {
$extend .= ', ' . $location['supplemental_address_3'];
}
$street = CRM_Utils_Array::value('street_address', $location);
$locality = CRM_Utils_Array::value('city', $location);
$region = NULL;
Expand Down
2 changes: 2 additions & 0 deletions CRM/Contribute/Form/Task/Invoice.php
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,7 @@ public static function printPDF($contribIDs, &$params, $contactIds) {
'street_address' => CRM_Utils_Array::value('street_address', CRM_Utils_Array::value($contribution->contact_id, $billingAddress)),
'supplemental_address_1' => CRM_Utils_Array::value('supplemental_address_1', CRM_Utils_Array::value($contribution->contact_id, $billingAddress)),
'supplemental_address_2' => CRM_Utils_Array::value('supplemental_address_2', CRM_Utils_Array::value($contribution->contact_id, $billingAddress)),
'supplemental_address_3' => CRM_Utils_Array::value('supplemental_address_3', CRM_Utils_Array::value($contribution->contact_id, $billingAddress)),
'city' => CRM_Utils_Array::value('city', CRM_Utils_Array::value($contribution->contact_id, $billingAddress)),
'stateProvinceAbbreviation' => $stateProvinceAbbreviation,
'postal_code' => CRM_Utils_Array::value('postal_code', CRM_Utils_Array::value($contribution->contact_id, $billingAddress)),
Expand All @@ -443,6 +444,7 @@ public static function printPDF($contribIDs, &$params, $contactIds) {
'domain_street_address' => CRM_Utils_Array::value('street_address', CRM_Utils_Array::value('1', $locationDefaults['address'])),
'domain_supplemental_address_1' => CRM_Utils_Array::value('supplemental_address_1', CRM_Utils_Array::value('1', $locationDefaults['address'])),
'domain_supplemental_address_2' => CRM_Utils_Array::value('supplemental_address_2', CRM_Utils_Array::value('1', $locationDefaults['address'])),
'domain_supplemental_address_3' => CRM_Utils_Array::value('supplemental_address_3', CRM_Utils_Array::value('1', $locationDefaults['address'])),
'domain_city' => CRM_Utils_Array::value('city', CRM_Utils_Array::value('1', $locationDefaults['address'])),
'domain_postal_code' => CRM_Utils_Array::value('postal_code', CRM_Utils_Array::value('1', $locationDefaults['address'])),
'domain_state' => $stateProvinceAbbreviationDomain,
Expand Down
2 changes: 2 additions & 0 deletions CRM/Core/BAO/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@ public function addDisplay($microformat = FALSE) {
'street_address' => $this->street_address,
'supplemental_address_1' => $this->supplemental_address_1,
'supplemental_address_2' => $this->supplemental_address_2,
'supplemental_address_3' => $this->supplemental_address_3,
'city' => $this->city,
'state_province_name' => isset($this->state_name) ? $this->state_name : "",
'state_province' => isset($this->state) ? $this->state : "",
Expand Down Expand Up @@ -971,6 +972,7 @@ public static function checkContactSharedAddressFields(&$fields, $contactId) {
'postal_code_suffix',
'supplemental_address_1',
'supplemental_address_2',
'supplemental_address_3',
);

foreach ($fields as $name => & $values) {
Expand Down
1 change: 1 addition & 0 deletions CRM/Core/BAO/Mapping.php
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,7 @@ public static function buildMappingForm(&$form, $mappingType, $mappingId, $colum
'street_address',
'supplemental_address_1',
'supplemental_address_2',
'supplemental_address_3',
'city',
'postal_code',
'postal_code_suffix',
Expand Down
1 change: 1 addition & 0 deletions CRM/Core/BAO/UFGroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,7 @@ public static function getLocationFields() {
'street_address',
'supplemental_address_1',
'supplemental_address_2',
'supplemental_address_3',
'city',
'postal_code',
'postal_code_suffix',
Expand Down
7 changes: 6 additions & 1 deletion CRM/Core/DAO/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* Generated from xml/schema/CRM/Core/Address.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:459fcbe817baa776e55ab44e3818b8eb)
* (GenCodeChecksum:472057d193d1e875a14e7719a2d6a2ee)
*/
require_once 'CRM/Core/DAO.php';
require_once 'CRM/Utils/Type.php';
Expand Down Expand Up @@ -514,6 +514,11 @@ static function &fields() {
'description' => 'Supplemental Address Information, Line 3',
'maxlength' => 96,
'size' => CRM_Utils_Type::HUGE,
'import' => true,
'where' => 'civicrm_address.supplemental_address_3',
'headerPattern' => '/(supplemental(\s)?)?address(\s\d+)?/i',
'dataPattern' => '/unit|ap(ar)?t(ment)?\s(\d|\w)+/i',
'export' => true,
'table_name' => 'civicrm_address',
'entity' => 'Address',
'bao' => 'CRM_Core_BAO_Address',
Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/DAO/AllCoreTables.data.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/
// (GenCodeChecksum:de6dc96f4442bc90970f8e8c26b1c802)
// (GenCodeChecksum:2d196ddd274c6e0e1847af66fcc7101d)
return array(
'CRM_Core_DAO_AddressFormat' => array(
'name' => 'AddressFormat',
Expand Down
1 change: 1 addition & 0 deletions CRM/Core/Page/AJAX/Location.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ public static function getPermissionedLocation() {
'street_address',
'supplemental_address_1',
'supplemental_address_2',
'supplemental_address_3',
'city',
'postal_code',
'county',
Expand Down
4 changes: 3 additions & 1 deletion CRM/Event/BAO/Event.php
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,7 @@ public static function &getCompleteInfo(
civicrm_address.street_address as street_address,
civicrm_address.supplemental_address_1 as supplemental_address_1,
civicrm_address.supplemental_address_2 as supplemental_address_2,
civicrm_address.supplemental_address_3 as supplemental_address_3,
civicrm_address.city as city,
civicrm_address.postal_code as postal_code,
civicrm_address.postal_code_suffix as postal_code_suffix,
Expand Down Expand Up @@ -872,6 +873,7 @@ public static function &getCompleteInfo(
'street_address' => $dao->street_address,
'supplemental_address_1' => $dao->supplemental_address_1,
'supplemental_address_2' => $dao->supplemental_address_2,
'supplemental_address_3' => $dao->supplemental_address_3,
'city' => $dao->city,
'state_province' => $dao->state,
'postal_code' => $dao->postal_code,
Expand Down Expand Up @@ -1877,7 +1879,7 @@ public static function getLocationEvents() {
$events = array();

$query = "
SELECT CONCAT_WS(' :: ' , ca.name, ca.street_address, ca.city, sp.name, ca.supplemental_address_1, ca.supplemental_address_2) title, ce.loc_block_id
SELECT CONCAT_WS(' :: ' , ca.name, ca.street_address, ca.city, sp.name, ca.supplemental_address_1, ca.supplemental_address_2, ca.supplemental_address_3) title, ce.loc_block_id
FROM civicrm_event ce
INNER JOIN civicrm_loc_block lb ON ce.loc_block_id = lb.id
INNER JOIN civicrm_address ca ON lb.address_id = ca.id
Expand Down
1 change: 1 addition & 0 deletions CRM/Export/BAO/Export.php
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ public static function exportComponents(
'street_address',
'supplemental_address_1',
'supplemental_address_2',
'supplemental_address_3',
'city',
'postal_code',
'postal_code_suffix',
Expand Down
1 change: 1 addition & 0 deletions CRM/Report/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -4047,6 +4047,7 @@ public function addAddressFields($groupBy = TRUE, $orderBy = FALSE, $filters = T
'street_address' => ts('Street Address'),
'supplemental_address_1' => ts('Supplementary Address Field 1'),
'supplemental_address_2' => ts('Supplementary Address Field 2'),
'supplemental_address_3' => ts('Supplementary Address Field 3'),
'street_number' => ts('Street Number'),
'street_name' => ts('Street Name'),
'street_unit' => ts('Street Unit'),
Expand Down
6 changes: 6 additions & 0 deletions CRM/Report/Form/Extended.php
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,12 @@ public function getAddressColumns($options = array()) {
'default' => CRM_Utils_Array::value('supplemental_address_2', $options['defaults'], FALSE),
'name' => 'supplemental_address_2',
),
$options['prefix'] . 'supplemental_address_3' => array(
'title' => ts($options['prefix_label'] .
'Supplementary Address Field 3'),
'default' => CRM_Utils_Array::value('supplemental_address_3', $options['defaults'], FALSE),
'name' => 'supplemental_address_3',
),
$options['prefix'] . 'street_number' => array(
'name' => 'street_number',
'title' => ts($options['prefix_label'] . 'Street Number'),
Expand Down
1 change: 1 addition & 0 deletions CRM/UF/Form/Preview.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public function preProcess() {
'street_address',
'supplemental_address_1',
'supplemental_address_2',
'supplemental_address_3',
'city',
'postal_code',
'postal_code_suffix',
Expand Down
4 changes: 4 additions & 0 deletions CRM/Utils/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public static function format(
$emptyFields = array(
'supplemental_address_1',
'supplemental_address_2',
'supplemental_address_3',
'state_province_name',
'county',
);
Expand Down Expand Up @@ -142,6 +143,7 @@ public static function format(
'contact.street_address' => CRM_Utils_Array::value('street_address', $fields),
'contact.supplemental_address_1' => CRM_Utils_Array::value('supplemental_address_1', $fields),
'contact.supplemental_address_2' => CRM_Utils_Array::value('supplemental_address_2', $fields),
'contact.supplemental_address_3' => CRM_Utils_Array::value('supplemental_address_3', $fields),
'contact.city' => CRM_Utils_Array::value('city', $fields),
'contact.state_province_name' => CRM_Utils_Array::value('state_province_name', $fields),
'contact.county' => CRM_Utils_Array::value('county', $fields),
Expand Down Expand Up @@ -186,6 +188,7 @@ public static function format(
'contact.street_address' => "<span class=\"street-address\">" . $fields['street_address'] . "</span>",
'contact.supplemental_address_1' => "<span class=\"extended-address\">" . $fields['supplemental_address_1'] . "</span>",
'contact.supplemental_address_2' => $fields['supplemental_address_2'],
'contact.supplemental_address_3' => $fields['supplemental_address_3'],
'contact.city' => "<span class=\"locality\">" . $fields['city'] . "</span>",
'contact.state_province_name' => "<span class=\"region\">" . $fields['state_province_name'] . "</span>",
'contact.county' => "<span class=\"region\">" . $fields['county'],
Expand Down Expand Up @@ -304,6 +307,7 @@ public static function sequence($format) {
'street_address',
'supplemental_address_1',
'supplemental_address_2',
'supplemental_address_3',
'city',
'county',
'state_province',
Expand Down
1 change: 1 addition & 0 deletions CRM/Utils/DeprecatedUtils.php
Original file line number Diff line number Diff line change
Expand Up @@ -1133,6 +1133,7 @@ function _civicrm_api3_deprecated_add_formatted_location_blocks(&$values, &$para
'state_province',
'supplemental_address_1',
'supplemental_address_2',
'supplemental_address_3',
'StateProvince.name',
);

Expand Down
4 changes: 4 additions & 0 deletions api/v3/Contact.php
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ function _civicrm_api3_contact_get_spec(&$params) {
'title' => 'Primary Address Supplemental Address 2',
'type' => CRM_Utils_Type::T_STRING,
);
$params['supplemental_address_3'] = array(
'title' => 'Primary Address Supplemental Address 3',
'type' => CRM_Utils_Type::T_STRING,
);
$params['current_employer'] = array(
'title' => 'Current Employer',
'type' => CRM_Utils_Type::T_STRING,
Expand Down
2 changes: 1 addition & 1 deletion api/v3/Domain.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function civicrm_api3_domain_get($params) {
);
$values['location'] = CRM_Core_BAO_Location::getValues($locparams, TRUE);
$address_array = array(
'street_address', 'supplemental_address_1', 'supplemental_address_2',
'street_address', 'supplemental_address_1', 'supplemental_address_2', 'supplemental_address_3',
'city', 'state_province_id', 'postal_code', 'country_id',
'geo_code_1', 'geo_code_2',
);
Expand Down
1 change: 1 addition & 0 deletions api/v3/examples/Activity/ReturnAssigneeContact.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ function activity_get_expectedresult() {
'street_address' => '',
'supplemental_address_1' => '',
'supplemental_address_2' => '',
'supplemental_address_3' => '',
'city' => '',
'postal_code_suffix' => '',
'postal_code' => '',
Expand Down
1 change: 1 addition & 0 deletions api/v3/examples/Contact/APIChainedArray.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ function contact_get_expectedresult() {
'street_address' => '',
'supplemental_address_1' => '',
'supplemental_address_2' => '',
'supplemental_address_3' => '',
'city' => '',
'postal_code_suffix' => '',
'postal_code' => '',
Expand Down
1 change: 1 addition & 0 deletions api/v3/examples/Contact/APIChainedArrayFormats.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ function contact_get_expectedresult() {
'street_address' => '',
'supplemental_address_1' => '',
'supplemental_address_2' => '',
'supplemental_address_3' => '',
'city' => '',
'postal_code_suffix' => '',
'postal_code' => '',
Expand Down
1 change: 1 addition & 0 deletions api/v3/examples/Contact/APIChainedArrayMultipleCustom.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ function contact_get_expectedresult() {
'street_address' => '',
'supplemental_address_1' => '',
'supplemental_address_2' => '',
'supplemental_address_3' => '',
'city' => '',
'postal_code_suffix' => '',
'postal_code' => '',
Expand Down
1 change: 1 addition & 0 deletions api/v3/examples/Contact/Get.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ function contact_get_expectedresult() {
'street_address' => '',
'supplemental_address_1' => '',
'supplemental_address_2' => '',
'supplemental_address_3' => '',
'city' => '',
'postal_code_suffix' => '',
'postal_code' => '',
Expand Down
1 change: 1 addition & 0 deletions api/v3/examples/Contact/GetSingleContact.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ function contact_getsingle_expectedresult() {
'street_address' => '',
'supplemental_address_1' => '',
'supplemental_address_2' => '',
'supplemental_address_3' => '',
'city' => '',
'postal_code_suffix' => '',
'postal_code' => '',
Expand Down
1 change: 1 addition & 0 deletions api/v3/examples/Contact/GroupFilterUsingContactAPI.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ function contact_get_expectedresult() {
'street_address' => '',
'supplemental_address_1' => '',
'supplemental_address_2' => '',
'supplemental_address_3' => '',
'city' => '',
'postal_code_suffix' => '',
'postal_code' => '',
Expand Down
1 change: 1 addition & 0 deletions api/v3/examples/Contact/NestedReplaceEmail.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ function contact_get_expectedresult() {
'street_address' => '',
'supplemental_address_1' => '',
'supplemental_address_2' => '',
'supplemental_address_3' => '',
'city' => '',
'postal_code_suffix' => '',
'postal_code' => '',
Expand Down
2 changes: 2 additions & 0 deletions api/v3/examples/Domain/Get.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ function domain_get_expectedresult() {
'street_address' => '45 Penny Lane',
'supplemental_address_1' => '',
'supplemental_address_2' => '',
'supplemental_address_3' => '',
'city' => '',
'state_province_id' => '',
'postal_code' => '',
Expand All @@ -82,6 +83,7 @@ function domain_get_expectedresult() {
'street_address' => '15 Main St',
'supplemental_address_1' => '',
'supplemental_address_2' => '',
'supplemental_address_3' => '',
'city' => 'Collinsville',
'state_province_id' => '1006',
'postal_code' => '6022',
Expand Down
1 change: 1 addition & 0 deletions api/v3/examples/Mailing/GetTokens.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ function mailing_gettokens_expectedresult() {
'{contact.street_unit}' => 'Street Unit',
'{contact.supplemental_address_1}' => 'Supplemental Address 1',
'{contact.supplemental_address_2}' => 'Supplemental Address 2',
'{contact.supplemental_address_3}' => 'Supplemental Address 3',
'{contact.city}' => 'City',
'{contact.postal_code_suffix}' => 'Postal Code Suffix',
'{contact.postal_code}' => 'Postal Code',
Expand Down
1 change: 1 addition & 0 deletions api/v3/examples/Setting/GetDefaults.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ function setting_getdefaults_expectedresult() {
{contact.street_address}
{contact.supplemental_address_1}
{contact.supplemental_address_2}
{contact.supplemental_address_3}
{contact.city}{, }{contact.state_province}{ }{contact.postal_code}
{contact.country}',
),
Expand Down
2 changes: 2 additions & 0 deletions api/v3/examples/Setting/GetFields.php
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ function setting_getfields_expectedresult() {
{contact.street_address}
{contact.supplemental_address_1}
{contact.supplemental_address_2}
{contact.supplemental_address_3}
{contact.city}{, }{contact.state_province}{ }{contact.postal_code}
{contact.country}',
'add' => '4.1',
Expand All @@ -353,6 +354,7 @@ function setting_getfields_expectedresult() {
{contact.street_address}
{contact.supplemental_address_1}
{contact.supplemental_address_2}
{contact.supplemental_address_3}
{contact.city}{, }{contact.state_province}{ }{contact.postal_code}
{contact.country}',
'add' => '4.1',
Expand Down
1 change: 1 addition & 0 deletions api/v3/examples/Setting/Revert.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ function setting_revert_expectedresult() {
{contact.street_address}
{contact.supplemental_address_1}
{contact.supplemental_address_2}
{contact.supplemental_address_3}
{contact.city}{, }{contact.state_province}{ }{contact.postal_code}
{contact.country}',
),
Expand Down
Loading