Changeset 3746820 for formidable/trunk/stripe/controllers/FrmStrpLiteActionsController.php

Timestamp:

10/14/2026 04:54:36 PM (2 weeks ago)

Author:

formidableforms

Message:

Update to version 7.0 from GitHub

File:

• formidable/trunk/stripe/controllers/FrmStrpLiteActionsController.php (modified) (14 diffs)

formidable/trunk/stripe/controllers/FrmStrpLiteActionsController.php

@@ -10 +10 @@
          */
         private static $customer;
+
+        /**
+         * Default style setting values, keyed the same as FrmStylesHelper::get_settings_for_output().
+         * Guarantees get_appearance_rules() and its border helpers always have every
+         * key present, including the no-form-context case where there's no style to read settings from.
+         *
+         * @since 7.0
+         *
+         * @var array
+         */
+        private static $style_setting_defaults = array(
+                'text_color'          => '',
+                'font'                => '',
+                'field_font_size'     => '',
+                'text_color_disabled' => '',
+                'required_color'      => '',
+                'bg_color'            => '',
+                'field_pad'           => '',
+                'border_color'        => '',
+                'field_border_style'  => '',
+                'field_weight'        => '',
+                'bg_color_active'     => '',
+                'label_color'         => '',
+                'font_size'           => '',
+                'weight'              => '',
+                'label_padding'       => '',
+                'border_color_error'  => '',
+                'field_shape_type'    => '',
+                'field_border_width'  => '',
+                'border_radius'       => '',
+        );
 
         /**
@@ -124 +155 @@
                 }
 
-                if ( ! self::stripe_is_configured() ) {
-                        $response['error'] = __( 'Stripe still needs to be configured.', 'formidable' );
+                $connection_error = FrmTransLiteAppHelper::get_gateway_connection_error( 'stripe' );
+
+                if ( $connection_error ) {
+                        $response['error'] = $connection_error;
                         return $response;
                 }
 
-                $customer = self::set_customer_with_token( $atts, self::get_customer_id_from_posted_setup_intents( $form->id ) );
+                $setup_intent = 'recurring' === $action->post_content['type'] ? self::get_posted_setup_intent( $form->id ) : false;
+                $customer_id  = is_object( $setup_intent ) ? $setup_intent->customer : false;
+                $customer     = self::set_customer_with_token( $atts, $customer_id );
 
                 if ( ! is_object( $customer ) ) {
@@ -136 +171 @@
                 }
 
-                $one_time_payment_args = compact( 'customer', 'form', 'entry', 'action', 'amount' );
+                $one_time_payment_args = compact( 'customer', 'form', 'entry', 'action', 'amount', 'setup_intent' );
 
                 if ( ! FrmStrpLiteLinkController::create_pending_stripe_link_payment( $one_time_payment_args ) ) {
@@ -148 +183 @@
 
         /**
-         * Check if either Stripe integration is enabled.
-         *
-         * @return bool true if Stripe Connect is set up.
-         */
-        private static function stripe_is_configured() {
-                return FrmStrpLiteAppHelper::call_stripe_helper_class( 'initialize_api' );
-        }
-
-        /**
          * Get the customer id from a setup intent that was created for this submission.
          * A Stripe Link subscription builds its subscription from the setup intent's customer,
@@ -168 +194 @@
          */
         public static function get_customer_id_from_posted_setup_intents( $form_id ) {
+                $intent = self::get_posted_setup_intent( $form_id );
+                return is_object( $intent ) ? $intent->customer : false;
+        }
+
+        /**
+         * Retrieve and verify the posted setup intent once for customer and payment validation.
+         *
+         * @since 7.0
+         *
+         * @param int|string $form_id The submitted form id.
+         *
+         * @return false|object
+         */
+        private static function get_posted_setup_intent( $form_id ) {
                 $posted_intents = FrmStrpLiteAuth::get_payment_intents( 'frmintent' . $form_id );
 
@@ -175 +215 @@
 
                 $setup_intent_ids = array_filter(
-                        $posted_intents,
+                        FrmStrpLiteFormIntentHelper::flatten_client_secrets( $posted_intents ),
                         function ( $intent_id ) {
                                 return str_starts_with( $intent_id, 'seti_' );
@@ -186 +226 @@
 
                 $first_setup_intent_id = reset( $setup_intent_ids );
-                $first_setup_intent_id = explode( '_secret_', $first_setup_intent_id )[0];
+                $client_secret         = $first_setup_intent_id;
+                $first_setup_intent_id = explode( '_secret_', $client_secret )[0];
                 $setup_intent          = FrmStrpLiteAppHelper::call_stripe_helper_class( 'get_setup_intent', $first_setup_intent_id );
 
-                if ( ! is_object( $setup_intent ) || empty( $setup_intent->customer ) ) {
+                if ( ! is_object( $setup_intent ) || $setup_intent->client_secret !== $client_secret || empty( $setup_intent->customer ) ) {
                         return false;
                 }
 
-                return $setup_intent->customer;
+                return $setup_intent;
         }
 
@@ -554 +595 @@
                 $stripe_vars    = array(
                         'publishable_key' => $publishable,
+                        'https_error'     => __( 'Stripe payments require HTTPS. Please use a secure URL or contact the site administrator.', 'formidable' ),
                         'form_id'         => $form_id,
                         'nonce'           => wp_create_nonce( 'frm_strp_ajax' ),
@@ -578 +620 @@
         private static function get_style_settings_for_form( $form_id ) {
                 if ( ! $form_id ) {
-                        return array();
+                        return self::$style_setting_defaults;
                 }
 
@@ -584 +626 @@
 
                 if ( ! $style ) {
-                        return array();
+                        return self::$style_setting_defaults;
                 }
 
@@ -596 +638 @@
                 }
 
-                return $settings;
+                return wp_parse_args( $settings, self::$style_setting_defaults );
         }
 
@@ -632 +674 @@
                         ),
                         '.Label'              => array(
+                                'fontFamily'   => $settings['font'],
                                 'color'        => $settings['label_color'],
                                 'fontSize'     => $settings['font_size'],
@@ -643 +686 @@
                 );
 
+                if ( '' === (string) $settings['font'] ) {
+                        // Leave the font out so Stripe uses its default stack instead of an empty value.
+                        unset( $rules['.Input']['fontFamily'], $rules['.Label']['fontFamily'] );
+                }
+
                 /*
                  * Filters the appearance rules for Stripe elements.
@@ -728 +776 @@
                 return FrmTransLiteActionsController::remove_cc_errors( $errors, $field );
         }
+
+        /**
+         * Resolve the payment action that created a payment row.
+         *
+         * Use the action recorded on the payment, even if the form settings changed after submission.
+         *
+         * @since 7.0
+         *
+         * @param object $payment A row from the payments table.
+         *
+         * @return false|WP_Post
+         */
+        public static function get_action_for_payment( $payment ) {
+                if ( empty( $payment->action_id ) ) {
+                        return false;
+                }
+
+                $action = FrmFormAction::get_single_action_type( (int) $payment->action_id, 'payment' );
+
+                return is_object( $action ) ? $action : false;
+        }
 }