-
+
diff --git a/processors/activity/class-activity-processor.php b/processors/activity/class-activity-processor.php
index 19d2b42..dcd879c 100644
--- a/processors/activity/class-activity-processor.php
+++ b/processors/activity/class-activity-processor.php
@@ -79,6 +79,30 @@ public function processor( $config, $form ) {
// $form_values['activity_date_time'] = $form_values['activity_date_time'];
$create_activity = civicrm_api3( 'Activity', 'create', $form_values );
+
+ if ( ! empty( $config['file_id'] ) ) {
+
+ $transdata['civicrm']['civicrm_files'] = CiviCRM_Caldera_Forms_Helper::get_file_entity_ids();
+
+ if ( is_array( $transdata['data'][$config['file_id']] ) ) {
+
+ // handle multiple upload file 'advanced_file', limit to 3 files
+ $file_ids = $transdata['data'][$config['file_id']];
+ for ( $x = 0; $x < CiviCRM_Caldera_Forms_Helper::get_civicrm_settings( 'max_attachments' ); $x++ ) {
+ CiviCRM_Caldera_Forms_Helper::create_civicrm_entity_file( 'civicrm_activity', $create_activity['id'], $file_ids[$x] );
+ }
+
+ } else {
+ // single file
+ foreach ( $transdata['civicrm']['civicrm_files'] as $field_number => $file ) {
+ if ( $config['file_id'] == $file['field_id'] && ! empty( $file['file_id'] ) ) {
+
+ CiviCRM_Caldera_Forms_Helper::create_civicrm_entity_file( 'civicrm_activity', $create_activity['id'], $file['file_id'] );
+
+ }
+ }
+ }
+ }
}
}
}
diff --git a/processors/case/case_config.php b/processors/case/case_config.php
index 3cd04fc..927ade7 100644
--- a/processors/case/case_config.php
+++ b/processors/case/case_config.php
@@ -77,7 +77,77 @@
+
+
+
+
+{{#script}}
+jQuery( document ).ready( function( $ ){
+ var creator_id = '{{creator_id}}' ? '{{creator_id}}' : null;
+ if ( creator_id ) {
+ $.ajax({
+ url : ajaxurl,
+ type : 'post',
+ data : {
+ contact_id: creator_id,
+ action : 'civicrm_get_contacts',
+ nonce: $('#{{_id}}_creator_id').attr('nonce')
+ },
+ success : function( response ) {
+ var result = JSON.parse(response);
+
+ var data = {
+ id: result[0]['id'],
+ text: result[0]['sort_name']
+ };
+ var default_option = new Option(data.text, data.id, false, false);
+ $('#{{_id}}_creator_id').append(default_option).trigger('change');
+ }
+ });
+ }
+
+ $('#{{_id}}_creator_id').select2();
+
+ $('#{{_id}}_creator_id').select2({
+ ajax: {
+ url: ajaxurl,
+ dataType: 'json',
+ type: 'post',
+ delay: 250,
+ data: function (params) {
+ return {
+ search: params.term,
+ action: 'civicrm_get_contacts',
+ nonce: $('#{{_id}}_creator_id').attr('nonce')
+ };
+ },
+ processResults: function( data ) {
+ var options = [];
+ if ( data ) {
+ $.each( data, function( index, contact ) {
+ options.push( { id: contact['id'], text: contact['sort_name'] } );
+ });
+ }
+ return {
+ results: options
+ };
+ },
+ cache: true
+ },
+ minimumInputLength: 3,
+ allowClear: true,
+ placeholder: 'Search for a Contact',
+ });
+} );
+{{/script}}
+
diff --git a/processors/case/class-case-processor.php b/processors/case/class-case-processor.php
index ff4c4c4..e144c35 100644
--- a/processors/case/class-case-processor.php
+++ b/processors/case/class-case-processor.php
@@ -78,7 +78,7 @@ public function processor( $config, $form ) {
}
$form_values['contact_id'] = $transdata['civicrm']['contact_id_'.$config['contact_link']]; // Contact ID set in Contact Processor
- $form_values['creator_id'] = $transdata['civicrm']['contact_id_'.$config['contact_link']];
+ $form_values['creator_id'] = ! empty( $config['creator_id'] ) ? $config['creator_id'] : $transdata['civicrm']['contact_id_'.$config['contact_link']]; // Case Manager
$form_values['case_type_id'] = $config['case_type_id']; // Case Type ID
$form_values['case_status_id'] = $config['case_status_id']; // Case Status ID
diff --git a/processors/contact/class-contact-processor.php b/processors/contact/class-contact-processor.php
index 21fb167..ff79a8b 100644
--- a/processors/contact/class-contact-processor.php
+++ b/processors/contact/class-contact-processor.php
@@ -162,6 +162,44 @@ public function processor( $config, $form ) {
));
}
+ /**
+ * Hnadle File fields for attachments.
+ * @since 0.4.2
+ */
+ foreach ( $config['civicrm_contact'] as $c_field => $val ) {
+ if ( ! empty( $val ) && substr( $c_field, 0, 7 ) === 'custom_' ) {
+
+ $transdata['civicrm']['civicrm_files'] = CiviCRM_Caldera_Forms_Helper::get_file_entity_ids();
+ // get field config
+ $cf_field = Caldera_Forms::get_field_by_slug(str_replace( '%', '', $val ), $form );
+
+ foreach ( $transdata['civicrm']['civicrm_files'] as $field_number => $file ) {
+
+ if ( $cf_field['ID'] == $file['field_id'] && ! empty( $file['file_id'] ) ) {
+
+ // custom field id
+ $c_field_id = preg_replace('/\D/', '', $c_field);
+
+ $field_type = civicrm_api3( 'CustomField', 'getsingle', array(
+ 'id' => $c_field_id,
+ 'return' => array( 'custom_group_id', 'data_type' ),
+ ));
+
+ if ( $field_type['data_type'] == 'File' ) {
+ // custom group
+ $custom_group = civicrm_api3( 'CustomGroup', 'getsingle', array(
+ 'id' => $field_type['custom_group_id'],
+ 'return' => array( 'table_name' ),
+ ));
+
+ CiviCRM_Caldera_Forms_Helper::create_civicrm_entity_file( $custom_group['table_name'], $custom_group['id'], $file['file_id'] );
+
+ }
+ }
+ }
+ }
+ }
+
/**
* Process enabled entities.
* @since 0.3
@@ -498,6 +536,16 @@ public function pre_render( $form ){
}
foreach ( $form['processors'] as $processor => $pr_id ) {
+ // this would be a good place to set form defaults based on Civi data
+
+ // get and set 'contact_default_language' if the contact doesn't have one set
+ if ( ! empty( $pr_id['config']['civicrm_contact']['preferred_language'] ) ) {
+ $preferred_language = Caldera_Forms::get_field_by_slug(str_replace( '%', '', $pr_id['config']['civicrm_contact']['preferred_language'] ), $form );
+ if ( empty( $preferred_language['config']['default'] ) ) {
+ $form['fields'][$preferred_language['ID']]['config']['default'] = CRM_Core_Config::singleton()->lcMessages;
+ }
+ }
+
if( $pr_id['type'] == $this->key_name && isset( $pr_id['runtimes'] ) ){
if ( isset( $pr_id['config']['auto_pop'] ) && $pr_id['config']['auto_pop'] == 1 && $civicrm_contact_pr[0]['ID'] == $pr_id['ID'] ) {
@@ -555,6 +603,17 @@ public function pre_render( $form ){
$civi_contact,
'civicrm_contact'
);
+
+ // FIXME
+ // add filter hook here for this kind of things
+
+ // get and set 'contact_default_language' if the contact doesn't have one set
+ if ( ! empty( $pr_id['config']['civicrm_contact']['preferred_language'] ) ) {
+ $preferred_language = Caldera_Forms::get_field_by_slug(str_replace( '%', '', $pr_id['config']['civicrm_contact']['preferred_language'] ), $form );
+ if ( empty( $preferred_language['config']['default'] ) ) {
+ $form['fields'][$preferred_language['ID']]['config']['default'] = CRM_Core_Config::singleton()->lcMessages;
+ }
+ }
}
// Clear Contact data
diff --git a/processors/note/class-note-processor.php b/processors/note/class-note-processor.php
index 91c46b0..32d414c 100644
--- a/processors/note/class-note-processor.php
+++ b/processors/note/class-note-processor.php
@@ -73,6 +73,20 @@ public function processor( $config, $form ) {
// Add Note to contact
$note = civicrm_api3( 'Note', 'create', $form_values );
+
+ // handle attachment using CRM_Core_DAO_EntityFile
+ if ( ! empty( $config['note_attachment'] ) ) {
+
+ $transdata['civicrm']['civicrm_files'] = CiviCRM_Caldera_Forms_Helper::get_file_entity_ids();
+
+ foreach ( $transdata['civicrm']['civicrm_files'] as $field_number => $file ) {
+ if ( $config['note_attachment'] == $file['field_id'] && ! empty( $file['file_id'] ) ) {
+
+ CiviCRM_Caldera_Forms_Helper::create_civicrm_entity_file( 'civicrm_note', $note['id'], $file['file_id'] );
+
+ }
+ }
+ }
}
}
}
diff --git a/processors/note/note_config.php b/processors/note/note_config.php
index 890dad1..b969422 100644
--- a/processors/note/note_config.php
+++ b/processors/note/note_config.php
@@ -30,4 +30,11 @@
diff --git a/readme.txt b/readme.txt
index 8333a7a..212181b 100755
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: mecachisenros, needle
Tags: civicrm, caldera, forms, integration
Requires at least: 4.5
Tested up to: 4.6
-Stable tag: 0.4.1
+Stable tag: 0.4.2
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -34,6 +34,12 @@ This plugin is in active development. For feature requests and bug reports (or i
== Changelog ==
+= 0.4.2 =
+* Added support for CiviCRM file uploads, Advanced File field (allowing multiple uploads for Activities) and File field (for custom fields and notes)
+* Added CiviCRM Preferred Language as autopopulate option
+* Added Contact Reference (select2 widget) for the Case Created by field in the Case processor
+* Fixed pre-populate form issue
+
= 0.4.1 =
* Case processor - creates/adds case to contact
* Send Email processor (requires Email API - https://civicrm.org/extensions/e-mail-api)