Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9ef761c
[D8 Port] Start of the d8 port.
Jaesin Aug 16, 2016
df6cf6f
[D8][Composer] Remove the soap library requirement.
Jaesin Aug 16, 2016
44314ff
[D8] Fix the munchkin service test.
Jaesin Aug 16, 2016
aace1d0
[D8] Use an sequence to store available fields.
Jaesin Aug 17, 2016
95eba93
[D8] Add start of contact form integration.
Jaesin Aug 17, 2016
29bcaca
[D8] More drupal 8 development.
Jaesin Aug 19, 2016
2c3985d
[D8] Add lead association and JS tests.
Jaesin Aug 23, 2016
d616d16
[D8] Contact integration is working.
Jaesin Aug 25, 2016
dd5555c
[D8] A little more cleanup.
Jaesin Aug 25, 2016
705f2dc
[D8] Some cleanup and refactoring.
Jaesin Aug 30, 2016
894c120
[D8] The entity operation should have the same title as the menu item.
Jaesin Aug 30, 2016
a4f7991
[D8] Move to tableselect for enabled fields.
Jaesin Aug 31, 2016
f0ee804
[D8] Merge in changes from 7.x-1.x.
Jaesin Sep 1, 2016
d7f7446
[D8] The mma_contact_block module is now using text fields for defaul…
Jaesin Sep 7, 2016
e95cd7c
[D8] Fixes contact block. Use marketo field ids for field mappings.
Jaesin Sep 8, 2016
a372cd7
[D8][Cleanup] Add services to their own folder/namespace.
Jaesin Sep 9, 2016
4e8635a
[D8][Performance] Only show all of the field opitons if retrieving fr…
Jaesin Sep 9, 2016
41cd166
[D8] Adds the start of the marketo ma user module.
Jaesin Sep 9, 2016
7a5ff6a
[D8] Remove exrta table column from the contact mapping form.
Jaesin Sep 9, 2016
c508038
[D8][mma_user] Move login stuff to the mma_user module.
Jaesin Sep 12, 2016
074f8a1
[D8][mma_user] Add menu tasks and implement controllers.
Jaesin Sep 13, 2016
d877912
[Merge] Merge in 8.x-1.x from Jaesin.
Jaesin Sep 13, 2016
40fe739
[D8] Cannot use the same button value twice in a form.
Jaesin Sep 14, 2016
f237747
[D8] Had to rename the mma_user.settings config name.
Jaesin Sep 14, 2016
e2b6fd2
[D8] Fix up one test.
Jaesin Sep 14, 2016
cc2ab41
converting sub-modules from mma to marketo_ma, etc.
Sep 19, 2016
1a1f091
[D8] Small fix. Test are passing.
Jaesin Sep 20, 2016
9f31049
[D8] Make munchkin the default tracking method.
Jaesin Sep 20, 2016
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
6 changes: 0 additions & 6 deletions .gitignore

This file was deleted.

88 changes: 86 additions & 2 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,90 @@
Marketo MA Changelog
---------------------

Marketo MA 8.x-1.x, 2016-08-31
Marketo MA 7.x-1.x, 2016-08-13
------------------------------
- Initial 8.x-1.x version created from 7.x-2.x commit eeb522a40cd083973e360ccb5157fa512911b939
- drush mma-fields now requires drush 6 or higher and allows display of
additional field attributes. See 'drush help mma-fields'.
- #2335897: Hooks added to provide modules an opportunity to modify lead data.
- #2190655: Introduced Marketo Forms 2.0 tracking method for Webforms. Webforms
can now override the default tracking method and when using Forms 2.0 can
specify the Marketo form which should be targeted.
- #2507733: User Integration now allow mapping core user object fields.
- #2567255: Resolved undefined property error when saving user object.
- #2765039: Ensure Marketo javascript is only loaded once.

Marketo MA 7.x-1.5, 2014-08-20
------------------------------
- #2293425: SOAP request/response XML now included in log on syncLead errors
- Cleanup additional variables on uninstall
- Addition of automated testing with Behat and Travis

Marketo MA 7.x-1.4, 2014-08-20
------------------------------
- No change. Bad version.

Marketo MA 7.x-1.3, 2014-04-21
------------------------------
- #2137397: Tracking will now be OFF when role visibility is set to
"Only the roles selected below" and no roles are selected
- #2135305: Removed mma-get-activity from drush commands and moved functionality
to improved mma-get-lead command. Activity is now retrieved by adding the
--activity option to mma-get-lead.
- #2139977: Corrected issue related to removal of a mapped field from the field
definition list. When a field is removed, any currently mapped fields will
remain intact and display as an "Undefined Field (fieldname)".
- #2140487: Message is now displayed when webform configuration has been saved.
- #2142243: Permission "administer marketo webform settings" now works properly.
- #2215199: Undefined index no longer returned on webform submissions with
unmapped fields.

Marketo MA 7.x-1.2, 2013-11-14
------------------------------
- Updated README.txt to reflect changes since 7.x-1.1

Marketo MA 7.x-1.2-beta3, 2013-11-13
------------------------------
- #2132635: Improved webform configuration experience
Configuration is now managed on a single page at node/{ID}/webform/marketo
- Performance improvements for Marketo MA Webform module
- #2133163: Corrected method for determining active flag
- #2134953: Fixed undefined variables when SOAP API not configured

Marketo MA 7.x-1.2-beta2, 2013-11-09
------------------------------
- #2127663: Updated default value of user action triggers to be "on"
- #2127679: 0 now displayed in column when no webform components are mapped
- #2127659: Display message when no fields are available to be mapped
- Refactored where constants are defined
- #2130395: Resolved undefined index on webform component sort
- Users with only a single lead activity record and users associated with more
than one lead will now display lead information properly
- #2132165: Remove field from fieldmap on delete

Marketo MA 7.x-1.2-beta1, 2013-11-04
------------------------------
- #2053673: Handle submission structure changes made in Webform 4.x
- #2062165: Added CHANGELOG.txt
- #2062181: Create rule action to retrieve lead data from Marketo
Rule action "Add data to Marketo lead" has been changed
to "Send lead data to Marketo" and underlying function has changed name
from "add_lead" to "marketo_ma_rules_action_add_lead".
- #2066465: Added basic drush support
- #2068255: Added keyType auto-detection when querying Marketo for lead data.
Function "_marketo_ma_get_lead" renamed to "marketo_ma_get_lead", it is safe
to call this function directly.
- #2067857: Variable marketo_ma_webform_fields_soap is now deleted upon uninstall
- #2067861: Added ability to view lead and activity information for a given user
- #2123391: Modified marketo_ma_add_lead function to pass marketoCookie param
_mkto_trk cookie value will now be sent to Marketo when using either of the
SOAP methods and the request to save the lead was made by either an anonymous
visitor or by the lead updating their own data.
- #2126019: Added settings for including or excluding tracking based on user role
- Reorganized admin settings form to use vertical tabs and display more
information related to webform configuration.
- #2123395: Added default rules which can be used as examples or extended to do
something more useful, perhaps adding more data to the list of values being
sent. If using the marketo_ma_user module these three rules should not be used
as they duplicate functionality already in place.
- #2126709: The marketo_ma_user module now allows for mapping user fields to
Marketo fields and defining which events should trigger updates.
25 changes: 15 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,25 @@ This module adds Marketo tracking capability to your Drupal site.

## Requirements

- Drupal 7.x
- An active Marketo account http://www.marketo.com/
- Drupal 8.x
- Composer <https://getcomposer.org/>
- An active Marketo account <http://www.marketo.com/>

## Installation

1. Copy the entire marketo_ma directory the Drupal sites/all/modules directory.
1. Copy the entire `marketo_ma` directory the Drupal `modules` directory. You
can optionally user drush to download with `drush dl marketo_ma`.

2. Login as an administrator. Enable the Marketo MA module in
2. Add the SOAP API library to drupal using `composer require
dchesterton/marketo-rest-api:dev-master`.

3. Login as an administrator. Enable the Marketo MA module in
"Administer" -> "Modules"

3. (Optional) Enable the Marketo MA User module in
4. (Optional) Enable the Marketo MA User module in
"Administer" -> "Modules"

4. (Optional) Enable the Marketo MA Webform module in
5. (Optional) Enable the Marketo MA Webform module in
"Administer" -> "Modules"


Expand Down Expand Up @@ -103,7 +108,7 @@ and [Export a List of All Marketo API Field Names](http://community.marketo.com/
**Marketo Fields**
This section should contain a pipe "|" delimited list of the fields in the format
"[Field API Name]|[Friendly Label]". Example:

FirstName|First Name
LastName|Last Name
Email|Email Address
Expand Down Expand Up @@ -176,13 +181,13 @@ attached to it and provides an overview of each item's current state.

- **Title**
The title of the webform.

- **Tracking Enabled**
A Yes/No value indicating if tracking is currently enabled for this webform.

- **Components Mapped**
The number of form components that have been mapped to a Marketo field.

- **Manage**
A direct link to the Marketo component mapping page for this webform.

Expand Down
23 changes: 23 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "drupal/marketo_ma",
"type": "drupal-module",
"description": "Integration with Marketo marketing automation software.",
"keywords": ["Drupal"],
"license": "GPL-2.0+",
"homepage": "https://www.drupal.org/project/marketo_ma",
"minimum-stability": "dev",
"support": {
"issues": "https://www.drupal.org/project/issues/marketo_ma",
"source": "http://cgit.drupalcode.org/marketo_ma"
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/Jaesin/marketo-rest-api"
Copy link

@RoloDMonkey RoloDMonkey Sep 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will need to update URL to the real repository.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The repositories section can be removed once an 8.x-1.x branch gets pushed to d.o.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, my mistake. that is there until my pull request is accepted: dchesterton/marketo-rest-api#34

}
],
"require": {
"php": ">=5.5.9",
"dchesterton/marketo-rest-api" : "dev-master"
}
}
22 changes: 22 additions & 0 deletions config/install/marketo_ma.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
instance_host: null
logging: 0
tracking_method: munchkin
munchkin:
javascript_library: '//munchkin.marketo.net/munchkin.js'
api_private_key: null
partition: Default
lead_source: null
account_id: null
rest:
batch_requests: 0
client_id: ''
client_secret: ''
field:
enabled_fields: {}
tracking:
request_path:
negate: 1
pages: "/admin\r\n/admin/*\r\n/batch\r\n/node/add*\r\n/node/*/*\r\n/user/*/*"
roles:
authenticated: authenticated
anonymous: anonymous
65 changes: 65 additions & 0 deletions config/schema/marketo_ma.settings.schema.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Schema for the marketo_ma.settings configuration.
marketo_ma.settings:
type: config_object
label: 'Marketo MA configuration'
mapping:
instance_host:
type: string
label: 'Marketo Instance Host'
logging:
type: integer
tracking_method:
type: string
munchkin:
type: config_object
label: 'Munchkin Javascript API'
mapping:
javascript_library:
type: string
api_private_key:
type: string
partition:
type: string
lead_source:
type: string
account_id:
type: string
rest:
type: config_object
label: 'REST API config'
mapping:
batch_requests:
type: integer
client_id:
type: string
client_secret:
type: string
field:
type: config_object
label: 'Field Definition config'
mapping:
enabled_fields:
type: sequence
label: 'Enabled marketo fields'
sequence:
type: integer
label: 'Marketo field ID'
tracking:
type: config_object
label: 'Field Definition config'
mapping:
request_path:
type: config_object
mapping:
negate:
type: integer
label: 'Negate page paths'
pages:
type: string
label: 'Pages'
roles:
type: sequence
label: 'Roles'
sequence:
type: string
label: 'Role ID'
Loading