Skip to content

Commit

Permalink
Merge branch 'master' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
JurriaanK committed Oct 23, 2024
2 parents 0618a06 + 35175d4 commit b466ffb
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 51 deletions.
Binary file modified .wordpress-org/banner-772x250.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 14 additions & 14 deletions class-gravitywp-connector-mailpoet-gravityforms.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php
/**
* GravityWP_Connector_Mailpoet_Gravityforms
* GravityWP_Connector_MailPoet_GravityForms
*
* @package GravityWP\Connector_Mailpoet_Gravityforms
* @package GravityWP\Connector_MailPoet_GravityForms
*/

namespace GravityWP\Connector_Mailpoet_GravityForms;
namespace GravityWP\Connector_MailPoet_GravityForms;

defined( 'ABSPATH' ) || die();

Expand All @@ -16,15 +16,15 @@


/**
* Class GravityWP_Connector_Mailpoet_Gravityforms
* Class GravityWP_Connector_MailPoet_GravityForms
*
* @author GravityWP
* @since v1.0.0
* @see GFAddOn
*
* @global
*/
class GravityWP_Connector_Mailpoet_Gravityforms extends GFFeedAddOn {
class GravityWP_Connector_MailPoet_GravityForms extends GFFeedAddOn {

/**
* Version of the plugin.
Expand Down Expand Up @@ -66,30 +66,30 @@ class GravityWP_Connector_Mailpoet_Gravityforms extends GFFeedAddOn {
*
* @var string $_title
*/
protected $_title = 'Connector for Mailpoet and Gravity Forms';
protected $_title = 'Connector for MailPoet and Gravity Forms';

/**
* Short plugin title.
*
* @var string $_short_title
*/
protected $_short_title = 'Mailpoet Connector';
protected $_short_title = 'MailPoet Connector';

/**
* Instance of this class.
*
* @var GravityWP_Connector_Mailpoet_Gravityforms $_instance
* @var GravityWP_Connector_MailPoet_GravityForms $_instance
*/
private static $_instance = null;

/**
* Get an instance of this class.
*
* @return GravityWP_Connector_Mailpoet_Gravityforms
* @return GravityWP_Connector_MailPoet_GravityForms
*/
public static function get_instance() {
if ( self::$_instance === null ) {
self::$_instance = new GravityWP_Connector_Mailpoet_Gravityforms();
self::$_instance = new GravityWP_Connector_MailPoet_GravityForms();
}

return self::$_instance;
Expand Down Expand Up @@ -128,7 +128,7 @@ public function feed_settings_fields() {
'name' => 'mappedfields',
'label' => esc_html__( 'Map Fields', 'connector-for-gravityforms-mailpoet' ),
'type' => 'field_map',
'tooltip' => esc_html__( 'Map the Gravity Form fields to the Mailpoet subscriber fields', 'connector-for-gravityforms-mailpoet' ),
'tooltip' => esc_html__( 'Map the Gravity Form fields to the MailPoet subscriber fields', 'connector-for-gravityforms-mailpoet' ),
'field_map' => array(
array(
'name' => 'first_name',
Expand Down Expand Up @@ -172,7 +172,7 @@ public function feed_settings_fields() {


/**
* Returns the Mailpoet lists as settings array.
* Returns the MailPoet lists as settings array.
*
* @since 1.0
*
Expand All @@ -193,7 +193,7 @@ protected function get_mplists_setting_array() {
if ( empty( $choices ) ) {
return array(
'name' => 'no_lists',
'label' => esc_html__( 'Mailpoet Lists', 'connector-for-gravityforms-mailpoet' ),
'label' => esc_html__( 'MailPoet Lists', 'connector-for-gravityforms-mailpoet' ),
'type' => 'html',
'html' => esc_html__( "You don't have any lists set up.", 'connector-for-gravityforms-mailpoet' ),
);
Expand All @@ -202,7 +202,7 @@ protected function get_mplists_setting_array() {
return array(
'name' => 'mailpoet_lists',
'required' => true,
'label' => esc_html__( 'Mailpoet Lists', 'connector-for-gravityforms-mailpoet' ),
'label' => esc_html__( 'MailPoet Lists', 'connector-for-gravityforms-mailpoet' ),
'type' => 'checkbox',
'choices' => $choices,
);
Expand Down
16 changes: 8 additions & 8 deletions connector-for-gravityforms-mailpoet.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php
/**
* Plugin Name: Connector for Gravity Forms and MailPoet
* Plugin URI: https://gravitywp.com/add-on/connector-for-gravityforms-and-mailpoet
* Description: Integrate Gravity Forms with Mailpoet to easily subscribe users to your Mailpoet newsletters upon form submission.
* Version: 1.0
* Plugin URI: https://gravitywp.com/add-on/connector-for-gravityforms-mailpoet
* Description: Integrate Gravity Forms with MailPoet to easily subscribe users to your MailPoet newsletters upon form submission.
* Version: 1.0.1
* Author: GravityWP
* Author URI: https://gravitywp.com
* License: GPL3
Expand All @@ -13,19 +13,19 @@

defined( 'ABSPATH' ) || die();

define( 'GRAVITYWP_MP_GF_VERSION', '1.0' );
define( 'GRAVITYWP_MP_GF_VERSION', '1.0.1' );

add_action( 'gform_loaded', array( 'GravityWP_Connector_Mailpoet_Gravityforms_AddOn_Bootstrap', 'load' ), 5 );
add_action( 'gform_loaded', array( 'GravityWP_Connector_MailPoet_GravityForms_AddOn_Bootstrap', 'load' ), 5 );

/**
* GravityWP_Connector_Mailpoet_Gravityforms_AddOn_Bootstrap.
* GravityWP_Connector_MailPoet_GravityForms_AddOn_Bootstrap.
*
* @author GravityWP
* @since v1.0
*
* @global
*/
class GravityWP_Connector_Mailpoet_Gravityforms_AddOn_Bootstrap {
class GravityWP_Connector_MailPoet_GravityForms_AddOn_Bootstrap {

/**
* Function: load.
Expand All @@ -44,6 +44,6 @@ public static function load() {

require_once 'class-gravitywp-connector-mailpoet-gravityforms.php';

GFFeedAddOn::register( 'GravityWP\Connector_Mailpoet_GravityForms\GravityWP_Connector_Mailpoet_Gravityforms' );
GFFeedAddOn::register( 'GravityWP\Connector_MailPoet_GravityForms\GravityWP_Connector_MailPoet_GravityForms' );
}
}
16 changes: 8 additions & 8 deletions languages/connector-for-gravityforms-mailpoet-nl_NL.po
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ msgid "Map Fields"
msgstr "Velden toewijzen"

#: class-gravitywp-connector-mailpoet-gravityforms.php:131
msgid "Map the Gravity Form fields to the Mailpoet subscriber fields"
msgstr "Wijs de Gravity Form-velden toe aan de velden van de Mailpoet-abonnee"
msgid "Map the Gravity Form fields to the MailPoet subscriber fields"
msgstr "Wijs de Gravity Form-velden toe aan de velden van de MailPoet-abonnee"

#: class-gravitywp-connector-mailpoet-gravityforms.php:135
msgid "First Name"
Expand Down Expand Up @@ -79,8 +79,8 @@ msgstr "Verwerk deze feed als"

#: class-gravitywp-connector-mailpoet-gravityforms.php:196
#: class-gravitywp-connector-mailpoet-gravityforms.php:205
msgid "Mailpoet Lists"
msgstr "Mailpoet Lijsten"
msgid "MailPoet Lists"
msgstr "MailPoet Lijsten"

#: class-gravitywp-connector-mailpoet-gravityforms.php:198
msgid "You don't have any lists set up."
Expand All @@ -96,11 +96,11 @@ msgstr "https://gravitywp.com/add-on/connector-for-gravity-forms-and-mailpoet"

#. Description of the plugin/theme
msgid ""
"Integrate Gravity Forms with Mailpoet to easily subscribe users to your "
"Mailpoet newsletters upon form submission."
"Integrate Gravity Forms with MailPoet to easily subscribe users to your "
"MailPoet newsletters upon form submission."
msgstr ""
"Integreer Gravity Forms met Mailpoet om gebruikers eenvoudig te abonneren op "
"uw Mailpoet-nieuwsbrieven na het indienen van formulieren."
"Integreer Gravity Forms met MailPoet om gebruikers eenvoudig te abonneren op "
"uw MailPoet-nieuwsbrieven na het indienen van formulieren."

#. Author of the plugin/theme
msgid "GravityWP"
Expand Down
8 changes: 4 additions & 4 deletions languages/connector-for-gravityforms-mailpoet.pot
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ msgid "Map Fields"
msgstr ""

#: class-gravitywp-connector-mailpoet-gravityforms.php:131
msgid "Map the Gravity Form fields to the Mailpoet subscriber fields"
msgid "Map the Gravity Form fields to the MailPoet subscriber fields"
msgstr ""

#: class-gravitywp-connector-mailpoet-gravityforms.php:135
Expand Down Expand Up @@ -79,7 +79,7 @@ msgstr ""

#: class-gravitywp-connector-mailpoet-gravityforms.php:196
#: class-gravitywp-connector-mailpoet-gravityforms.php:205
msgid "Mailpoet Lists"
msgid "MailPoet Lists"
msgstr ""

#: class-gravitywp-connector-mailpoet-gravityforms.php:198
Expand All @@ -96,8 +96,8 @@ msgstr ""

#. Description of the plugin/theme
msgid ""
"Integrate Gravity Forms with Mailpoet to easily subscribe users to your "
"Mailpoet newsletters upon form submission."
"Integrate Gravity Forms with MailPoet to easily subscribe users to your "
"MailPoet newsletters upon form submission."
msgstr ""

#. Author of the plugin/theme
Expand Down
39 changes: 22 additions & 17 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,28 @@
Contributors: gravitywp
Tags: gravity forms, mailpoet, newsletter, integration, connector
Requires at least: 5.0
Tested up to: 6.6
Stable tag: 1.0
Tested up to: 6.7
Stable tag: 1.0.1
License: GPLv3 or later
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Integrate Gravity Forms with Mailpoet to easily subscribe users to your Mailpoet newsletters upon form submission.
Integrate Gravity Forms with MailPoet to easily subscribe users to your MailPoet newsletters upon form submission.

== Description ==

The Connector for Gravity Forms and MailPoet plugin allows you to seamlessly integrate your Gravity Forms with the Mailpoet newsletter service. This plugin provides an easy way to add subscribers to your Mailpoet lists when they submit a form on your WordPress website.
The Connector for Gravity Forms and MailPoet plugin allows you to seamlessly integrate your Gravity Forms with the MailPoet newsletter service. This plugin provides an easy way to add subscribers to your MailPoet lists when they submit a form on your WordPress website.

For more details, visit the [Connector for Gravity Forms and MailPoet Add-On](https://gravitywp.com/add-on/connector-for-gravityforms-and-mailpoet/) page on our website.

= Features =
* Map Gravity Form fields to Mailpoet subscriber fields.
* Automatically subscribe users to one or more Mailpoet lists upon form submission.
* Map Gravity Form fields to MailPoet subscriber fields.
* Automatically subscribe users to one or more MailPoet lists upon form submission.
* Optionally update existing subscribers' details.
* Conditional logic support to control when subscriptions are added.

== About GravityWP ==

GravityWP is third party that develops high quality addons for Gravity Forms. We provide additional tools that can be used to build full blown web applications.
GravityWP is a third party that develops high-quality addons for Gravity Forms. We provide additional tools that can be used to build full-blown web applications.

- **Advanced Merge Tags**: Unlock deeper customization by creating dynamic merge tags that allow you to pull in and display specific data from other form entries.
- **JWT Prefill**: Securely prefill your forms with user data using JSON Web Tokens (JWT), making form submissions smoother and more user-friendly, especially for logged-in users.
Expand All @@ -30,39 +32,42 @@ GravityWP is third party that develops high quality addons for Gravity Forms. We
- **Advanced Number Field**: Add powerful number fields to your forms with advanced formatting options, including currency, decimal places, and validation for more precise data handling.
- And many more...

Explore all our add-ons at https://gravitywp.com/add-ons/
Discover our full range of powerful [Add-ons for Gravity Forms](https://gravitywp.com/add-ons/).

== Installation ==

1. Upload the plugin files to the `/wp-content/plugins/connector-for-gravityforms-mailpoet/` directory, or install the plugin through the WordPress plugins screen directly.
2. Activate the plugin through the 'Plugins' screen in WordPress.
3. Create or edit a form and add a Mailpoet feed to start collecting subscribers.
3. Create or edit a form and add a MailPoet feed to start collecting subscribers.

== Frequently Asked Questions ==

= Does this plugin require Gravity Forms? =

Yes, you must have Gravity Forms installed and activated to use this plugin.

= Does this plugin work with the free version of Mailpoet? =
= Does this plugin work with the free version of MailPoet? =

Yes, it works with both the free and premium versions of Mailpoet.
Yes, it works with both the free and premium versions of MailPoet.

= Can I map custom fields from my Gravity Forms to Mailpoet? =
= Can I map custom fields from my Gravity Forms to MailPoet? =

Yes, you can map most form fields to Mailpoet fields using the field mapping settings in the feed configuration.
Yes, you can map most form fields to MailPoet fields using the field mapping settings in the feed configuration.

= How do I set up conditional logic for subscriptions? =

When configuring your Mailpoet feed within a form, you can set conditions under the 'Condition' section to control when the feed is processed.
When configuring your MailPoet feed within a form, you can set conditions under the 'Condition' section to control when the feed is processed.

== Screenshots ==

1. Feed Settings - Configure your Mailpoet feeds within the form editor.
2. Field Mapping - Easily map form fields to Mailpoet subscriber fields.
1. Feed Settings - Configure your MailPoet feeds within the form editor.
2. Field Mapping - Easily map form fields to MailPoet subscriber fields.
3. Conditional Logic - Set conditions for when subscriptions should occur.

== Changelog ==

= 1.0.1 =
* Visual improvements.

= 1.0 =
* Initial release
* Initial release.

0 comments on commit b466ffb

Please sign in to comment.