PayPal Commerce Lite

_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' ),
@@ -182,6 +192,17 @@ private static function maybe_add_action_to_group( $action_controls, &$groups )
 			if ( isset( $group['actions'] ) ) {
 				$grouped = array_merge( $grouped, $group['actions'] );
 			}
+
+			// Also collect actions from sections
+			if ( ! isset( $group['sections'] ) ) {
+				continue;
+			}
+
+			foreach ( $group['sections'] as $section ) {
+				if ( isset( $section['actions'] ) ) {
+					$grouped = array_merge( $grouped, $section['actions'] );
+				}
+			}
 		}
 
 		foreach ( $action_controls as $action ) {
@@ -210,31 +231,48 @@ private static function maybe_add_action_to_group( $action_controls, &$groups )
 	 * @return array
 	 */
 	public static function form_action_groups() {
+		// Get all action controls to check which are active
+		$action_controls = self::get_form_actions();
+
+		// Determine which actions are currently available
+		$available_actions = self::get_available_my_actions( $action_controls );
+
+		// Featured actions are add-ons that are NOT currently available
+		$all_addon_actions = array(
+			'api',
+			'register',
+			'n8n',
+			'quiz',
+			'quiz_outcome',
+			'googlespreadsheet',
+		);
+		$featured_actions  = array_diff( $all_addon_actions, $available_actions );
+
 		$groups = array(
-			'misc'      => array(
-				'name'    => '',
-				'icon'    => 'frmfont frm_shuffle_icon',
-				'actions' => array(
-					'on_submit',
-					'email',
-					'wppost',
-					'register',
-					'quiz',
-					'quiz_outcome',
-					'api',
-					'googlespreadsheet',
-					'n8n',
+			'my_actions' => array(
+				'name'     => __( 'My Actions', 'formidable' ),
+				'icon'     => 'frmfont frm_shuffle_icon',
+				'sections' => array(
+					'active'   => array(
+						'name'    => '',
+						'actions' => $available_actions,
+					),
+					'featured' => array(
+						'name'    => __( 'Featured', 'formidable' ),
+						'actions' => array_values( $featured_actions ),
+					),
 				),
 			),
-			'payment'   => array(
+			'payment'    => array(
 				'name'    => __( 'E-Commerce', 'formidable' ),
 				'icon'    => 'frmfont frm_credit_card_alt_icon',
 				'actions' => array(
 					'paypal',
-					'payment',
+					'stripe',
+					'square',
 				),
 			),
-			'marketing' => array(
+			'marketing'  => array(
 				'name'    => __( 'Marketing', 'formidable' ),
 				'icon'    => 'frmfont frm_mail_bulk_icon',
 				'actions' => array(
@@ -248,16 +286,88 @@ public static function form_action_groups() {
 					'twilio',
 				),
 			),
-			'crm'       => array(
+			'crm'        => array(
 				'name'    => __( 'CRM', 'formidable' ),
 				'icon'    => 'frmfont frm_address_card_icon',
 				'actions' => self::get_crm_actions(),
 			),
+			'misc'       => array(
+				'name'    => __( 'Misc', 'formidable' ),
+				'icon'    => 'frmfont frm_shuffle_icon',
+				'actions' => self::get_misc_actions( $action_controls ),
+			),
 		);
 
 		return apply_filters( 'frm_action_groups', $groups );
 	}
 
+	/**
+	 * Get the actions that are currently available (active) for My Actions section.
+	 *
+	 * @since x.x
+	 *
+	 * @param array $action_controls The registered action controls.
+	 *
+	 * @return array
+	 */
+	private static function get_available_my_actions( $action_controls ) {
+		$available = array(
+			'on_submit',
+			'email',
+			'stripe',
+			'square',
+			'paypal',
+		);
+
+		// Include all actions that are marked as active, including custom actions.
+		// This ensures custom actions appear in "My Actions" when enabled.
+		foreach ( $action_controls as $action_id => $action_control ) {
+			if ( ! in_array( $action_id, $available, true ) && ! empty( $action_control->action_options['active'] ) ) {
+				$available[] = $action_id;
+			}
+		}
+
+		return $available;
+	}
+
+	/**
+	 * Get the actions to include in the Misc section.
+	 *
+	 * @since x.x
+	 *
+	 * @param array $action_controls The registered action controls.
+	 *
+	 * @return array
+	 */
+	private static function get_misc_actions( $action_controls ) {
+		$misc_actions = array(
+			'on_submit',
+			'email',
+			'wppost',
+			'register',
+			'api',
+			'n8n',
+			'quiz',
+			'quiz_outcome',
+			'googlespreadsheet',
+		);
+
+		// Include all active actions that aren't in specific groups (payment, marketing, crm).
+		// This ensures custom actions appear in "Misc" when enabled.
+		$payment_actions   = array( 'paypal', 'stripe', 'square' );
+		$marketing_actions = array( 'mailchimp', 'activecampaign', 'constantcontact', 'getresponse', 'aweber', 'mailpoet', 'convertkit', 'twilio' );
+
+		$excluded_actions = array_merge( $payment_actions, $marketing_actions, self::get_crm_actions() );
+
+		foreach ( $action_controls as $action_id => $action_control ) {
+			if ( ! in_array( $action_id, $misc_actions, true ) && ! in_array( $action_id, $excluded_actions, true ) && ! empty( $action_control->action_options['active'] ) ) {
+				$misc_actions[] = $action_id;
+			}
+		}
+
+		return $misc_actions;
+	}
+
 	/**
 	 * Get the actions to include in the CRM section.
 	 *
@@ -524,6 +634,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 +644,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

@@ -3952,6 +3952,8 @@ public static function localize_script( $location ) {
 				/* translators: %d is the number of allowed actions per form */
 				'only_one_action'                    => sprintf( __( 'This form action is limited to %d per form.', 'formidable' ), 1 ),
 				'edit_action_text'                   => __( 'Please edit the existing form action.', 'formidable' ),
+				'only_one_payment_action'            => __( 'This form already has a payment action, and is currently limited to a single payment action.', 'formidable' ),
+				'only_one_stripe_action'             => __( 'This form already has a payment action. Multiple Stripe actions are available when using the Stripe add-on, available for Formidable Business licenses and higher.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
 				'unsafe_params'                      => FrmFormsHelper::reserved_words(),
 				/* Translators: %s is the name of a Detail Page Slug that is a reserved word.*/
 				'slug_is_reserved'                   => sprintf( __( 'The Detail Page Slug "%s" is reserved by WordPress. This may cause problems. Is this intentional?', 'formidable' ), '****' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
@@ -4010,7 +4012,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,24 @@
 	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;
+}
+
+// Remove limit for Stripe action when Stripe add-on is active
+if ( 'stripe' === $action_control->id_base && class_exists( 'FrmStrpAppHelper' ) ) {
+	$limit = 99;
+}
+
 $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,
 	)
 );