Prepare for 6.31

bin/zip-plugin.sh

@@ -129,7 +129,8 @@ zip -r $zipname $destination \
 	-x "*/eslint-rules/*" \
 	-x "*/phpcs-sniffs/*" \
 	-x "$source/venv/*" \
-	-x "formidable/resources/*"
+	-x "formidable/resources/*" \
+	-x "formidable-pro/resources/*"
 
 if [ ! -z "$3" ]; then
 	rm -rf $destination

changelog.txt

@@ -1,4 +1,13 @@
 == Changelog ==
+= 6.31 =
+* New: Formidable now supports PayPal Commerce. This is built into the Lite plugin. To get started, go to Global Settings > Payments > PayPal to connect your business account.
+* New: Form action settings have been redesigned.
+* New: Payment actions now use buttons to toggle the selected gateway, and gateway is the top action setting. Note that when custom gateways or Authorize.Net are active, gateways will still revert to the old settings.
+* New: The Collect a Payment action icon is now hidden by default, replaced by individual icons for Stripe, Square, and PayPal Commerce. If other gateways are active, Collect a Payment is still included.
+* New: Border styling rules have been added so autofill fields in Chrome and Safari will appear more consistent with other fields.
+* New: A new frm_after_import_forms action has been added for handling an imported XML after all forms have been imported.
+* Fix: A form would incorrectly try to submit a second time when redirecting and submitting with AJAX.
+
 = 6.30 =
 * New: Product, Quantity, and Total fields are now available in Lite! These are all included in the Pricing Fields section, now located above the Advanced Fields section.
 * New: Global custom CSS is now scoped to only style form previews on admin pages to prevent custom CSS from changing the appearance of other elements on the page.

classes/controllers/FrmAddonsController.php

@@ -474,7 +474,7 @@ protected static function get_pro_from_addons( $addons ) {
 
 	/**
 	 * @since 4.06
-	 * @since x.x Added the $force_type param.
+	 * @since 6.31 Added the $force_type param.
 	 *
 	 * @param bool $force_type Whether to resolve grandfathered licenses to their real license type.
 	 *
@@ -493,7 +493,7 @@ public static function license_type( $force_type = false ) {
 	 *
 	 * Mirrors the API's determine_status_from_license_details logic.
 	 *
-	 * @since x.x
+	 * @since 6.31
 	 *
 	 * @return string 'active', 'expired', or 'free'.
 	 */

classes/controllers/FrmAppController.php

@@ -940,7 +940,7 @@ public static function admin_enqueue_scripts() {
 	/**
 	 * Enqueue legacy PayPal action settings styles when the PayPal add-on is active.
 	 *
-	 * @since x.x
+	 * @since 6.31
 	 *
 	 * @return void
 	 */

classes/controllers/FrmFormActionsController.php

@@ -104,7 +104,7 @@ public static function register_actions() {
 	 *
 	 * Keeps the description when an add-on replaces a base action class without its own.
 	 *
-	 * @since x.x
+	 * @since 6.31
 	 *
 	 * @return void
 	 */
@@ -304,7 +304,7 @@ public static function form_action_groups() {
 	/**
 	 * Get the actions that are currently available (active) for My Actions section.
 	 *
-	 * @since x.x
+	 * @since 6.31
 	 *
 	 * @param array $action_controls The registered action controls.
 	 *
@@ -333,7 +333,7 @@ private static function get_available_my_actions( $action_controls ) {
 	/**
 	 * Get the actions to include in the Misc section.
 	 *
-	 * @since x.x
+	 * @since 6.31
 	 *
 	 * @param array $action_controls The registered action controls.
 	 *
@@ -480,7 +480,7 @@ public static function show_action_icon_link( $action_control, $allowed ) {
 	/**
 	 * Get the HTML attributes for the action icon.
 	 *
-	 * @since x.x
+	 * @since 6.31
 	 *
 	 * @param object $action_control
 	 *
@@ -669,7 +669,7 @@ public static function add_form_action() {
 	/**
 	 * Returns the first available title not in $existing_titles, appending " (2)", " (3)", etc. if needed.
 	 *
-	 * @since x.x
+	 * @since 6.31
 	 *
 	 * @param string   $base_title      Default action title from the action type.
 	 * @param string[] $existing_titles Titles currently visible in the form editor.
@@ -1024,7 +1024,7 @@ public static function prevent_wpml_translations( $null, $post_type ) {
 	 * If Pro is not connected, hook a filter that will force all non-Lite
 	 * actions to inactive so the upgrade popup is shown instead.
 	 *
-	 * @since x.x
+	 * @since 6.31
 	 *
 	 * @return void
 	 */
@@ -1044,7 +1044,7 @@ private static function maybe_setup_unlicensed_action_gate() {
 	 * so the per-key option filters are in place before the class constructors
 	 * run in the foreach loop that follows.
 	 *
-	 * @since x.x
+	 * @since 6.31
 	 *
 	 * @param array $actions Map of action_key => class_name.
 	 *
@@ -1078,7 +1078,7 @@ function ( $options ) {
 	/**
 	 * Get action keys that are available in Lite without a Pro license.
 	 *
-	 * @since x.x
+	 * @since 6.31
 	 *
 	 * @return string[]
 	 */
@@ -1093,7 +1093,7 @@ public static function get_lite_actions() {
 	 * Slugs without '/' are KB doc slugs (knowledgebase/ prefix is added).
 	 * Slugs with '/' are direct paths (e.g. features/) used as-is.
 	 *
-	 * @since x.x
+	 * @since 6.31
 	 *
 	 * @return array<string,string> Map of action_key => URL slug.
 	 */
@@ -1124,7 +1124,7 @@ public static function get_action_learn_more_links() {
 	/**
 	 * Look up the learn-more doc slug for a given action key.
 	 *
-	 * @since x.x
+	 * @since 6.31
 	 *
 	 * @param string $action_key Action identifier (e.g. 'register').
 	 *

classes/helpers/FrmAppHelper.php

@@ -29,7 +29,7 @@ class FrmAppHelper {
 	 *
 	 * @var string
 	 */
-	public static $plug_version = '6.30';
+	public static $plug_version = '6.31';
 
 	/**
 	 * @var bool

classes/helpers/FrmXMLHelper.php

@@ -303,7 +303,7 @@ public static function import_xml_forms( $forms, $imported ) {
 		 * imported later. Use this action for cross-form fix-ups that require
 		 * the fully populated `$frm_duplicate_ids` map.
 		 *
-		 * @since x.x
+		 * @since 6.31
 		 *
 		 * @param array $imported Summary of imported items, including
 		 *                        'forms' => array( old_form_id => new_form_id ).

classes/models/FrmFormAction.php

@@ -144,7 +144,7 @@ public function __construct( $id_base, $name, $action_options = array(), $contro
 		$this->id_base = strtolower( $id_base );
 
 		/**
-		 * @since x.x
+		 * @since 6.31
 		 *
 		 * @param string $name
 		 */

classes/models/fields/FrmFieldType.php

@@ -972,7 +972,7 @@ public function get_options( $values ) {
 	 */
 	public function show_field( $args ) {
 		/**
-		 * @since x.x Added $field parameter.
+		 * @since 6.31 Added $field parameter.
 		 *
 		 * @param bool   $show_normal_field_type
 		 * @param string $type

classes/views/frm-fields/back-end/upsell/ai-upsell-button.php

@@ -4,7 +4,7 @@
  *
  * @package Formidable
  *
- * @since x.x
+ * @since 6.31
  */
 
 if ( ! defined( 'ABSPATH' ) ) {

classes/views/frm-forms/add_field_links.php

@@ -231,7 +231,7 @@
 						 * Used along with frm_extra_form_instruction_tabs which is used to
 						 * include the tabs.
 						 *
-						 * @since x.x
+						 * @since 6.31
 						 *
 						 * @param stdClass $form The form object.
 						 */

formidable.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Formidable Forms
  * Description: Quickly and easily create drag-and-drop forms
- * Version: 6.30
+ * Version: 6.31
  * Plugin URI: https://formidableforms.com/
  * Author URI: https://formidableforms.com/
  * Author: Strategy11 Form Builder Team