From 7ae94752fff0eb7ecd18cf1aaeb77f9297779f22 Mon Sep 17 00:00:00 2001 From: larssandergreen Date: Tue, 23 May 2023 09:14:11 -0600 Subject: [PATCH] Clean up import forms --- .../CRM/Activity/Import/Form/DataSource.hlp | 24 --------------- templates/CRM/Contact/Import/Form/CSV.tpl | 10 +++---- .../CRM/Contact/Import/Form/DataSource.hlp | 19 ------------ .../CRM/Contribute/Import/Form/DataSource.hlp | 23 ++------------ .../CRM/Event/Import/Form/DataSource.hlp | 30 ++----------------- templates/CRM/Import/Form/DataSource.tpl | 12 ++------ .../CRM/Member/Import/Form/DataSource.hlp | 27 ++--------------- 7 files changed, 15 insertions(+), 130 deletions(-) delete mode 100644 templates/CRM/Activity/Import/Form/DataSource.hlp diff --git a/templates/CRM/Activity/Import/Form/DataSource.hlp b/templates/CRM/Activity/Import/Form/DataSource.hlp deleted file mode 100644 index 635dd52b7c..0000000000 --- a/templates/CRM/Activity/Import/Form/DataSource.hlp +++ /dev/null @@ -1,24 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC. All rights reserved. | - | | - | This work is published under the GNU AGPLv3 license with some | - | permitted exceptions and without any warranty. For full license | - | and copyright information, see https://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} -{htxt id="id-upload-title"} - {ts}Activity Import{/ts} -{/htxt} -{htxt id="id-upload"} -

- {ts}The Activity Import Wizard allows you to easily upload activity from other applications into CiviCRM. Contacts must already exist in your CiviCRM database prior to importing activities for them. Use Import Contacts to create contact records first, if necessary. Then you can match activities to contacts by Email Address, CiviCRM Contact ID, or an External Identifier (see the TIP below).{/ts} -

-

- {ts}Files to be imported must be in the 'comma-separated-values' format (CSV). Most applications will allow you to export records in this format. Consult the documentation for your application if you're not sure how to do this. Save this file to your local hard drive (or an accessible drive on your network) - and you are now ready for step 1 (Upload Data).{/ts} -

-

- {ts}TIP - Matching Activities to Contact Records{/ts}
- {ts}CiviCRM allows you to indicate which contact each activity record belongs to using either the unique CiviCRM-assigned Contact ID, a unique External ID which you assign, OR your configured Unsupervised Duplicate Matching Rule set (which uses email addresses by default). You must include at least one of these values as a column in your import file. If you are synchronizing (or migrating) contacts from another application to CiviCRM, and that application has assigned a unique ID to each contact, you can import that value into CiviCRM's External ID field. Then you can use that unique key as the 'match to contact' value when importing related data such as Activities.{/ts} -

-{/htxt} diff --git a/templates/CRM/Contact/Import/Form/CSV.tpl b/templates/CRM/Contact/Import/Form/CSV.tpl index 18c838740d..344cc4d9b9 100644 --- a/templates/CRM/Contact/Import/Form/CSV.tpl +++ b/templates/CRM/Contact/Import/Form/CSV.tpl @@ -12,15 +12,15 @@ {$form.uploadFile.label} {$form.uploadFile.html}
-

{ts}File format must be comma-separated-values (CSV). File must be UTF8 encoded if it contains special characters (e.g. accented letters, etc.).{/ts}
- {ts 1=$uploadSize}Maximum Upload File Size: %1 MB{/ts} +
+ {ts}File format must be comma-separated-values (CSV). File must be UTF8 encoded if it contains special characters (e.g. accented letters, etc.).{/ts}
+ {ts 1=$uploadSize}Maximum Upload File Size: %1 MB{/ts} +
- {$form.skipColumnHeader.html} {$form.skipColumnHeader.label} -
{ts}Check this box if the first row of your file consists of field names (Example: 'First Name','Last Name','Email'){/ts}
- + {$form.skipColumnHeader.html} {$form.skipColumnHeader.label} {$form.fieldSeparator.label} {help id='id-fieldSeparator' file='CRM/Contact/Import/Form/DataSource'} diff --git a/templates/CRM/Contact/Import/Form/DataSource.hlp b/templates/CRM/Contact/Import/Form/DataSource.hlp index ba8a876a9b..beb310a573 100644 --- a/templates/CRM/Contact/Import/Form/DataSource.hlp +++ b/templates/CRM/Contact/Import/Form/DataSource.hlp @@ -7,25 +7,6 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{capture assign=multiURL}{crmURL p="civicrm/import/custom" q="reset=1"}{/capture} -{htxt id='choose-data-source-intro-title'} - {ts}Import Wizard{/ts} -{/htxt} -{htxt id='choose-data-source-intro'} -

- {ts}The Import Wizard allows you to easily upload contact records from other applications into CiviCRM. For example, if your organization has contacts in MS Access© or Excel©, and you want to start using CiviCRM to store these contacts, you can 'import' them here.{/ts} -

-

- {ts}You can import records from a comma-separated-values format (CSV) file, or using a SQL query. See "Choose Data Source" help below for more information.{/ts} -

-

- {ts}After importing contacts, you may also want to import contributions, membership info and/or event participation data for these contacts. If so, first make sure that the corresponding CiviCRM component is enabled from Administer CiviCRM » System Settings » Enable CiviCRM Components. Enable CiviContribute, CiviMember, and/or CiviEvent. Then navigate to the Import option found in each component's menu (e.g. CiviContribute » Import Contributions).{/ts} -

-

- {ts 1=$multiURL}If you need to import Multi-value Custom Data for contacts (such as employment or education history), you will need to do that as a separate step from here.{/ts} -

-{/htxt} - {htxt id='contact-type-title'} {ts}Contact Type{/ts} {/htxt} diff --git a/templates/CRM/Contribute/Import/Form/DataSource.hlp b/templates/CRM/Contribute/Import/Form/DataSource.hlp index d63dd0b0b8..8d46b129bf 100644 --- a/templates/CRM/Contribute/Import/Form/DataSource.hlp +++ b/templates/CRM/Contribute/Import/Form/DataSource.hlp @@ -7,27 +7,10 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{htxt id='upload-title'} - {ts}Import File Format{/ts} +{htxt id="dupes-title"} + {ts}Matching to Contributions for Inserts and Updates{/ts} {/htxt} -{htxt id='upload'} -

{ts}Files to be imported must be in the 'comma-separated-values' format (CSV). Most applications will allow you to export records in CSV format. Consult the documentation for your application if you're not sure how to do this.{/ts}

-

{ts}Contact Records for Contributors{/ts}

-

{ts}Contribution import requires that the Contributors already exist as contact records in your CiviCRM database. If you need to import contributions for contributors who haven't been added to CiviCRM yet, you will do this in 2 steps. First, use Import Contacts to add the contact records. If possible, include a unique 'External ID' for each new contact which you can then use to match contributions to contributors. Then return to this screen and import the contribution records.{/ts}

-

{ts}Matching Contributions to Contributors{/ts}

-

{ts}Contribution import files must contain data needed to match the contribution to the contributor. This 'matching' can be handled in several different ways:{/ts}

- -

{ts}Save the CSV file with your contributions and 'contact matching' data to your local hard drive (or an accessible drive on your network). Now you are ready for step 1 (Upload Data).{/ts}

-{/htxt} - -{htxt id="id-onDuplicate-title"} - {ts}Matching to Contacts for Inserts and Updates{/ts} -{/htxt} -{htxt id="id-onDuplicate"} +{htxt id="dupes"}

{ts}For each import, you can either INSERT new contribution records, or UPDATE existing records. You can not do both types of operations in a single import session.{/ts}

{ts}If you are INSERTING new contributions, you will need to include a column in your data file containing the values used to link the contribution to an existing contact. You can use the 'Internal Contact ID', an 'External Identifier' (if you are using those in your contact records), OR the property defined in your Unsupervised Duplicate Matching rule (which is Email Address by default).{/ts}

{ts}If you are UPDATING existing contributions, you will need to include a unique identifier to match to the existing contribution record. This can be either the CiviCRM-assigned contribution ID, a unique Invoice ID, or a unique Transaction ID.{/ts}

diff --git a/templates/CRM/Event/Import/Form/DataSource.hlp b/templates/CRM/Event/Import/Form/DataSource.hlp index fbaaf261e7..d29a91a07a 100644 --- a/templates/CRM/Event/Import/Form/DataSource.hlp +++ b/templates/CRM/Event/Import/Form/DataSource.hlp @@ -7,36 +7,10 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{htxt id="upload-title"} - {ts}Import File Format{/ts} -{/htxt} -{htxt id="upload"} -

{ts}Files to be imported must be in the 'comma-separated-values' format (CSV). Most applications will allow you to export records in CSV format. Consult the documentation for your application if you're not sure how to do this.{/ts}

-

{ts}Required Participant Data{/ts}

-

{ts}Participant import data MUST include the following columns:{/ts}

- -

{ts}The event's default Participant Role (usually Attendee) will be assigned if you do not include a value for role. Valid values for Status and Role can be found in the CiviEvent section of the Administer CiviCRM screen. You can also import Fee Level, Registration Date and any other standard or custom Participant fields.{/ts}

-

{ts}Contact Records for Event Participants{/ts}

-

{ts}Participant import requires that each person, household or organization already exists as a contact record in your CiviCRM database. If you need to import participant information for contact records which haven't been added to CiviCRM yet - you will do this in 2 steps. First, use Import Contacts to add the contact records. If possible, include a unique 'External ID' for each new contact which you can then use to match participant info such as event registration to the corresponding contact record. Then return to this screen and import the participant records.{/ts}

-

{ts}Matching Participant Data to Contacts{/ts}

-

{ts}Participant import files must contain data needed to match the participant to a contact record in your CiviCRM database. This 'matching' can be handled in several different ways:{/ts}

- -

- {ts}Save the CSV file with your participant data and 'contact matching' data to your local hard drive (or an accessible drive on your network) - and you are now ready for step 1 (Upload Data).{/ts} -

-{/htxt} - -{htxt id="id-onDuplicate-title"} +{htxt id="dupes-title"} {ts}Matching to Contacts for Inserts and Updates{/ts} {/htxt} -{htxt id="id-onDuplicate"} +{htxt id="dupes"}

{ts}For each import, you can either INSERT new event registration (participant) records, or UPDATE existing records. You can not do both types of operations in a single import session.{/ts}

{ts}If you are INSERTING new participant records, you will need to include a column in your data file containing the values used to link the event registration to an existing contact. You can use the 'Internal Contact ID', an 'External Identifier' (if you are using those in your contact records), OR the property defined in your Unsupervised Duplicate Matching rule (which is Email Address by default).{/ts}

{ts}If you are UPDATING existing participants, you will need to include a column containing the unique CiviCRM-assigned participant ID to match to the existing participant record.{/ts}

diff --git a/templates/CRM/Import/Form/DataSource.tpl b/templates/CRM/Import/Form/DataSource.tpl index 38366a2dd2..aa85adc053 100644 --- a/templates/CRM/Import/Form/DataSource.tpl +++ b/templates/CRM/Import/Form/DataSource.tpl @@ -20,7 +20,6 @@ {/if}
{ts 1=$importEntity 2= $importEntities}The %1 Import Wizard allows you to easily upload %2 from other applications into CiviCRM.{/ts} - {ts}Files to be imported must be in the 'comma-separated-values' format (CSV) and must contain data needed to match an existing contact in your CiviCRM database.{/ts} {help id='upload'}
{include file="CRM/common/formButtons.tpl" location="top"}
@@ -39,7 +38,7 @@ {/if} {$form.dataSource.label} - {$form.dataSource.html} {help id='data-source-selection'} + {$form.dataSource.html} {help id='data-source-selection' file='CRM/Contact/Import/Form/DataSource'} @@ -53,7 +52,7 @@ {if array_key_exists('contactType', $form)} {$form.contactType.label} - {$form.contactType.html}{help id='contact-type'}
+ {$form.contactType.html} {help id='contact-type' file='CRM/Contact/Import/Form/DataSource'}
{if $importEntity !== 'Contact'} {ts 1=$importEntities}Select 'Individual' if you are importing %1 made by individual persons.{/ts} @@ -89,9 +88,6 @@ {/if} {include file="CRM/Core/Date.tpl"} - - {ts}Select the format that is used for date fields in your import data.{/ts} - {if array_key_exists('doGeocodeAddress', $form)} @@ -115,9 +111,7 @@ {if array_key_exists('savedMapping', $form)} - {$form.savedMapping.html}
- {if !$form.savedMapping.frozen}{ts}If you want to use a previously saved import field mapping - select it here.{/ts}{/if} - + {$form.savedMapping.html} {/if} diff --git a/templates/CRM/Member/Import/Form/DataSource.hlp b/templates/CRM/Member/Import/Form/DataSource.hlp index 6cc9097a92..19cc34dd52 100644 --- a/templates/CRM/Member/Import/Form/DataSource.hlp +++ b/templates/CRM/Member/Import/Form/DataSource.hlp @@ -7,33 +7,10 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{htxt id="upload-title"} - {ts}Import File Format{/ts} -{/htxt} -{htxt id="upload"} -

- {ts}Files to be imported must be in the 'comma-separated-values' format (CSV). Most applications will allow you to export records in CSV format. Consult the documentation for your application if you're not sure how to do this.{/ts} -

-

{ts}Contact Records for Members{/ts}

-

- {ts}Membership import requires that each person, household or organization already exists as a contact record in your CiviCRM database. If you need to import memberships for contact records which haven't been added to CiviCRM yet - you will do this in 2 steps. First, use Import Contacts to add the contact records. If possible, include a unique 'External ID' for each new contact which you can then use to match memberships to contacts. Then return to this screen and import the membership records.{/ts} -

-

{ts}Matching Memberships to Contacts{/ts}

-

{ts}Membership import files must contain data needed to match the membership to the contact record. This 'matching' can be handled in several different ways:{/ts}

- -

- {ts}Save the CSV file with your membership data and 'contact matching' data to your local hard drive (or an accessible drive on your network) - and you are now ready for step 1 (Upload Data).{/ts} -

-{/htxt} - -{htxt id="id-onDuplicate-title"} +{htxt id="dupes-title"} {ts}Matching to Contacts for Inserts and Updates{/ts} {/htxt} -{htxt id="id-onDuplicate"} +{htxt id="dupes"}

{ts}For each import, you can either INSERT new membership records, or UPDATE existing records. You can not do both types of operations in a single import session.{/ts}

{ts}If you are INSERTING new membership records, you will need to include a column in your data file containing the values used to link the membership to an existing contact. You can use the 'Internal Contact ID', an 'External Identifier' (if you are using those in your contact records), OR the property defined in your Unsupervised Duplicate Matching rule (which is Email Address by default).{/ts}

{ts}If you are UPDATING existing memberships, you will need to include a column containing the unique CiviCRM-assigned membership ID to match to the existing membership records.{/ts}

-- 2.25.1