Form actions refresh plus paypal

_typos.toml

@@ -39,6 +39,12 @@ Ags = "Ags"
 unmergable = "unmergable"
 # This is detected in our Stripe publishable key.
 iz = "iz"
+# `BA` is the ISO country code for Bosnia and Herzegovina in PayPal country lists.
+BA = "BA"
+# `PN` is the ISO country code for Pitcairn Islands in PayPal country lists.
+PN = "PN"
+# `Ot` is a substring in a PayPal sandbox token.
+Ot = "Ot"
 # This is used in a Sniff to reference a PHP function that does exist.
 writeable = "writeable"
 

bin/zip-plugin.sh

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

classes/controllers/FrmFormActionsController.php

@@ -11,7 +11,7 @@ class FrmFormActionsController {
 	public static $action_post_type = 'frm_form_actions';
 
 	/**
-	 * @var array|null
+	 * @var Frm_Form_Action_Factory|null
 	 */
 	public static $registered_actions;
 
@@ -57,10 +57,13 @@ public static function register_actions() {
 			'email'             => 'FrmEmailAction',
 			'wppost'            => 'FrmDefPostAction',
 			'register'          => 'FrmDefRegAction',
+			'stripe'            => 'FrmStripeLiteAction',
+			'square'            => 'FrmSquareAction',
+			'paypal'            => 'FrmPayPalLiteAction',
+			'paypal-legacy'     => 'FrmDefPayPalLegacyAction',
+			'payment'           => 'FrmTransLiteAction',
 			'quiz'              => 'FrmDefQuizAction',
 			'quiz_outcome'      => 'FrmDefQuizOutcomeAction',
-			'paypal'            => 'FrmDefPayPalAction',
-			'payment'           => 'FrmTransLiteAction',
 			'api'               => 'FrmDefApiAction',
 			'mailchimp'         => 'FrmDefMlcmpAction',
 			'activecampaign'    => 'FrmDefActiveCampaignAction',
@@ -84,6 +87,11 @@ public static function register_actions() {
 		include_once FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/email_action.php';
 		include_once FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/default_actions.php';
 
+		// This needs to be called after we include default_actions.php or FrmDefPayPalLegacyAction will never exist.
+		if ( 'FrmPayPalLiteAction' === $action_classes['paypal'] || ! class_exists( 'FrmPaymentAction' ) || ! class_exists( 'FrmDefPayPalLegacyAction' ) ) {
+			unset( $action_classes['paypal-legacy'] );
+		}
+
 		foreach ( $action_classes as $action_class ) {
 			self::$registered_actions->register( $action_class );
 		}
@@ -107,6 +115,8 @@ private static function apply_default_action_descriptions() {
 			'wppost'            => __( 'Content publishing', 'formidable' ),
 			'register'          => __( 'Account creation', 'formidable' ),
 			'payment'           => __( 'Transaction alerts', 'formidable' ),
+			'stripe'            => __( 'Payment gateway', 'formidable' ),
+			'square'            => __( 'Payment gateway', 'formidable' ),
 			'paypal'            => __( 'Payment gateway', 'formidable' ),
 			'quiz'              => __( 'Automated grading', 'formidable' ),
 			'quiz_outcome'      => __( 'Result logic', 'formidable' ),
@@ -210,6 +220,18 @@ private static function maybe_add_action_to_group( $action_controls, &$groups )
 	 * @return array
 	 */
 	public static function form_action_groups() {
+		$payment_actions = array(
+			'paypal',
+			'paypal-legacy',
+			'stripe',
+			'square',
+			'payment',
+		);
+
+		if ( ! class_exists( 'FrmPaymentsController' ) ) {
+			$payment_actions = array_diff( $payment_actions, array( 'paypal-legacy' ) );
+		}
+
 		$groups = array(
 			'misc'      => array(
 				'name'    => '',
@@ -229,10 +251,7 @@ public static function form_action_groups() {
 			'payment'   => array(
 				'name'    => __( 'E-Commerce', 'formidable' ),
 				'icon'    => 'frmfont frm_credit_card_alt_icon',
-				'actions' => array(
-					'paypal',
-					'payment',
-				),
+				'actions' => $payment_actions,
 			),
 			'marketing' => array(
 				'name'    => __( 'Marketing', 'formidable' ),
@@ -524,6 +543,7 @@ public static function add_form_action() {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 
+		$action_key   = FrmAppHelper::get_param( 'list_id', '', 'post', 'absint' );
 		$action_type  = FrmAppHelper::get_param( 'type', '', 'post', 'sanitize_text_field' );
 		$lite_actions = array_fill_keys( self::get_lite_actions(), true );
 
@@ -533,8 +553,6 @@ public static function add_form_action() {
 
 		global $frm_vars;
 
-		$action_key = FrmAppHelper::get_param( 'list_id', '', 'post', 'absint' );
-
 		/**
 		 * @var FrmFormAction
 		 */

classes/controllers/FrmHooksController.php

@@ -115,6 +115,7 @@ public static function load_hooks() {
 		FrmTransLiteHooksController::load_hooks();
 		FrmStrpLiteHooksController::load_hooks();
 		FrmSquareLiteHooksController::load_hooks();
+		FrmPayPalLiteHooksController::load_hooks();
 
 		// GDPR
 		add_filter( 'frm_is_field_required', 'FrmFieldGdpr::force_required_field', 10, 2 );
@@ -219,6 +220,7 @@ public static function load_admin_hooks() {
 		FrmTransLiteHooksController::load_admin_hooks();
 		FrmStrpLiteHooksController::load_admin_hooks();
 		FrmSquareLiteHooksController::load_admin_hooks();
+		FrmPayPalLiteHooksController::load_admin_hooks();
 		FrmSMTPController::load_hooks();
 		FrmOnboardingWizardController::load_admin_hooks();
 		FrmAddonsController::load_admin_hooks();

classes/helpers/FrmAppHelper.php

@@ -4010,7 +4010,8 @@ private static function add_form_builder_modal_data( &$admin_script_strings ) {
 
 		$stripe_connected      = FrmStrpLiteConnectHelper::at_least_one_mode_is_setup();
 		$square_connected      = FrmSquareLiteConnectHelper::at_least_one_mode_is_setup();
-		$gateway_connected     = $stripe_connected || $square_connected;
+		$paypal_connected      = FrmPayPalLiteConnectHelper::at_least_one_mode_is_setup();
+		$gateway_connected     = $stripe_connected || $square_connected || $paypal_connected;
 		$payments_settings_url = FrmStrpLiteAppController::get_payments_settings_url();
 
 		if ( ! $gateway_connected ) {

classes/helpers/FrmTipsHelper.php

@@ -238,22 +238,6 @@ public static function get_form_action_tip() {
 				'tip'  => __( 'Send leads to Mailchimp for instant email follow-up.', 'formidable' ),
 				'call' => self::cta_label(),
 			),
-			array(
-				'link' => array(
-					'content' => 'paypal-revenue',
-					'page'    => 'paypal-increase-revenue-tip',
-				),
-				'tip'  => __( 'Accept PayPal payments and grow your sales.', 'formidable' ),
-				'call' => self::cta_label(),
-			),
-			array(
-				'link' => array(
-					'content' => 'paypal-fast',
-					'page'    => 'paypal-save-time-tip',
-				),
-				'tip'  => __( 'Accept payments now with PayPal integration.', 'formidable' ),
-				'call' => self::cta_label(),
-			),
 			array(
 				'link' => array(
 					'content' => 'registration',

classes/models/FrmFormAction.php

@@ -141,7 +141,15 @@ public function __construct( $id_base, $name, $action_options = array(), $contro
 			die( 'You are not allowed to call this page directly.' );
 		}
 
-		$this->id_base     = strtolower( $id_base );
+		$this->id_base = strtolower( $id_base );
+
+		/**
+		 * @since x.x
+		 *
+		 * @param string $name
+		 */
+		$name = apply_filters( 'frm_' . $id_base . '_action_name', $name );
+
 		$this->name        = $name;
 		$this->option_name = 'frm_' . $this->id_base . '_action';
 

classes/models/fields/FrmFieldType.php

@@ -971,7 +971,14 @@ public function get_options( $values ) {
 	 * @return void
 	 */
 	public function show_field( $args ) {
-		if ( apply_filters( 'frm_show_normal_field_type', $this->normal_field, $this->type ) ) {
+		/**
+		 * @since x.x Added $field parameter.
+		 *
+		 * @param bool   $show_normal_field_type
+		 * @param string $type
+		 * @param array  $field
+		 */
+		if ( apply_filters( 'frm_show_normal_field_type', $this->normal_field, $this->type, $this->field ) ) {
 			echo $this->prepare_field_html( $args ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		} else {
 			do_action( 'frm_show_other_field_type', $this->field, $args['form'], array( 'action' => $args['form_action'] ) );

classes/views/frm-fields/back-end/settings.php

@@ -57,7 +57,7 @@
 		}
 
 		if ( $field['type'] === 'credit_card' && ! FrmAppHelper::pro_is_installed() ) {
-			if ( ! FrmStrpLiteConnectHelper::at_least_one_mode_is_setup() && ! FrmSquareLiteConnectHelper::at_least_one_mode_is_setup() ) {
+			if ( ! FrmStrpLiteConnectHelper::at_least_one_mode_is_setup() && ! FrmSquareLiteConnectHelper::at_least_one_mode_is_setup() && ! FrmPayPalLiteConnectHelper::at_least_one_mode_is_setup() ) {
 				FrmStrpLiteAppHelper::not_connected_warning();
 			} elseif ( ! FrmTransLiteActionsController::get_actions_for_form( $field['form_id'] ) ) {
 				?>
@@ -66,7 +66,7 @@
 					<span>
 						<?php
 						/* translators: %1$s: Link HTML, %2$s: End link */
-						printf( esc_html__( 'Credit Cards will not work without %1$sadding a Collect Payment action%2$s.', 'formidable' ), '<a href="?page=formidable&frm_action=settings&id=' . absint( $field['form_id'] ) . '&t=email_settings" target="_blank">', '</a>' );
+						printf( esc_html__( 'Credit Cards will not work without %1$sadding a Stripe, Square, or PayPal action%2$s.', 'formidable' ), '<a href="?page=formidable&frm_action=settings&id=' . absint( $field['form_id'] ) . '&t=email_settings" target="_blank">', '</a>' );
 						?>
 					</span>
 				</div>

classes/views/frm-form-actions/_action_icon.php

@@ -3,12 +3,19 @@
 	die( 'You are not allowed to call this page directly.' );
 }
 
+$limit = $action_control->action_options['limit'];
+
+if ( 'paypal' === $action_control->id_base ) {
+	// The PayPal add-on may overwrite this so change it back.
+	$limit = 1;
+}
+
 $single_action_attrs = array_merge(
 	$data,
 	array(
 		'href'            => 'javascript:void(0)',
 		'class'           => $classes . ' button frm-button-secondary frm-button-sm frm-with-icon frm-ml-auto-force frm-fadein-down-short',
-		'data-limit'      => $action_control->action_options['limit'],
+		'data-limit'      => $limit,
 		'data-actiontype' => $action_control->id_base,
 	)
 );

classes/views/frm-form-actions/default_actions.php

@@ -30,15 +30,53 @@
 /**
  * Add paypal action.
  */
-class FrmDefPayPalAction extends FrmFormAction {
+class FrmPayPalLiteAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops          = FrmFormAction::default_action_opts( 'frm_paypal_icon frm_show_upgrade' );
-		$action_ops['color'] = '#001c64';
+		$action_ops = array(
+			'classes' => 'frmfont frm_paypal_icon',
+			'color'   => 'var(--primary-700)',
+		);
 
 		parent::__construct( 'paypal', 'PayPal', $action_ops );
 	}
 }
 
+/**
+ * Add paypal legacy action.
+ */
+if ( class_exists( 'FrmPaymentAction' ) ) {
+	class FrmDefPayPalLegacyAction extends FrmPaymentAction {
+		public function __construct() {
+			parent::__construct();
+
+			$this->id_base = 'paypal-legacy';
+			$this->name    = 'PayPal (Legacy)';
+		}
+	}
+}
+
+class FrmStripeLiteAction extends FrmFormAction {
+	public function __construct() {
+		$action_ops = array(
+			'classes' => 'frmfont frm_stripe_icon',
+			'color'   => '#635bff',
+		);
+
+		parent::__construct( 'stripe', 'Stripe', $action_ops );
+	}
+}
+
+class FrmSquareAction extends FrmFormAction {
+	public function __construct() {
+		$action_ops = array(
+			'classes' => 'frmfont frm_square_icon',
+			'color'   => '#000',
+		);
+
+		parent::__construct( 'square', 'Square', $action_ops );
+	}
+}
+
 /**
  * Add quiz action.
  */

eslint.config.mjs

@@ -89,6 +89,8 @@ export default [
 				expect: 'readonly',
 				assert: 'readonly',
 				chai: 'readonly',
+				// Used for Google Pay payments in PayPal Commerce frontend JS.
+				google: 'readonly'
 			},
 		},
 		plugins: {

formidable.php

@@ -108,33 +108,19 @@ function frm_class_autoloader( $class_name, $filepath ) {
 		return;
 	}
 
+	$filepath = $original_filepath;
+
 	if ( preg_match( '/^FrmStrpLite.+$/', $class_name ) || preg_match( '/^FrmTransLite.+$/', $class_name ) ) {
 		// Autoload for /stripe/ folder.
-		$filepath = $original_filepath . '/stripe/';
-
-		if ( preg_match( '/^.+Helper$/', $class_name ) ) {
-			$filepath .= 'helpers/';
-		} elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
-			$filepath .= 'controllers/';
-		} else {
-			$filepath .= 'models/';
-		}
-
-		$filepath .= $class_name . '.php';
-
-		if ( file_exists( $filepath ) ) {
-			require $filepath;
-		}
-
-		return;
-	}
-
-	if ( ! preg_match( '/^FrmSquareLite.+$/', $class_name ) ) {
+		$filepath .= '/stripe/';
+	} elseif ( preg_match( '/^FrmSquareLite.+$/', $class_name ) ) {
+		$filepath .= '/square/';
+	} elseif ( preg_match( '/^FrmPayPalLite.+$/', $class_name ) ) {
+		$filepath .= '/paypal/';
+	} else {
 		return;
 	}
 
-	$filepath = $original_filepath . '/square/';
-
 	if ( preg_match( '/^.+Helper$/', $class_name ) ) {
 		$filepath .= 'helpers/';
 	} elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {