eventespresso / event-espresso-core

core/domain/services/registration/form/v1/RegFormHandler.php

Indentation +306 added lines, -306 removed lines

@@ -18,310 +18,310 @@
 class RegFormHandler
 {
 
-    /**
-     * @var EE_Checkout
-     */
-    public $checkout;
-
-    /**
-     * @var RegFormInputHandler
-     */
-    public $input_handler;
-
-    /**
-     * @var array
-     */
-    private $non_input_form_sections;
-
-    /**
-     * @var RegFormAttendeeFactory
-     */
-    private $attendee_factory;
-
-    /**
-     * @var RegistrantData
-     */
-    private $registrant_data;
-
-    /**
-     * @var EE_Registration_Processor
-     */
-    private $registration_processor;
-
-    /**
-     * @var bool
-     */
-    private $valid;
-
-
-    /**
-     * RegFormHandler constructor.
-     */
-    public function __construct(
-        EE_Checkout $checkout,
-        RegistrantData $registrant_data,
-        RegFormAttendeeFactory $attendee_factory,
-        EE_Registration_Processor $registration_processor
-    ) {
-        $this->checkout                = $checkout;
-        $this->registrant_data         = $registrant_data;
-        $this->attendee_factory        = $attendee_factory;
-        $this->registration_processor  = $registration_processor;
-        // reg form sections that do not contain inputs
-        $this->non_input_form_sections = [
-            'primary_registrant_data',
-            'additional_attendee_reg_info',
-            'spco_copy_attendee_chk',
-        ];
-        $this->initializeInputHandler();
-    }
-
-
-    private function initializeInputHandler()
-    {
-        $reg_form = $this->checkout->current_step->reg_form;
-        $required_questions = $reg_form instanceof RegForm ? $reg_form->requiredQuestions() : [];
-        $this->input_handler = LoaderFactory::getShared(
-            RegFormInputHandler::class,
-            [ $this->checkout->reg_url_link, $required_questions ]
-        );
-
-    }
-
-
-    /**
-     * @return int
-     */
-    public function attendeeCount(): int
-    {
-        return $this->registrant_data->attendeeCount();
-    }
-
-
-    /**
-     * @return bool
-     */
-    private function isInvalid(): bool
-    {
-        $this->valid = false;
-        return $this->valid;
-    }
-
-
-    /**
-     * @param EE_Registration[] $registrations
-     * @param array[][]         $reg_form_data
-     * @return bool
-     * @throws EntityNotFoundException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function processRegistrations(array $registrations, array $reg_form_data): bool
-    {
-        // start off optimistic, then trip this to false if anything goes wrong
-        $this->valid = true;
-        foreach ($registrations as $registration) {
-            // verify EE_Registration object
-            if (! $this->isValidRegistration($registration)) {
-                return $this->isInvalid();
-            }
-            $reg_url_link = $registration->reg_url_link();
-            // reg_url_link exists ?
-            if (! $this->isValidRegUrlLink($reg_url_link)) {
-                return $this->isInvalid();
-            }
-            // should this registration be processed during this visit ?
-            if (! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
-                continue;
-            }
-            // if NOT revisiting, then let's save the registration now,
-            // so that we have a REG_ID to use when generating other objects
-            if (! $this->checkout->revisit) {
-                $registration->save();
-            }
-            /**
-             * This allows plugins to trigger a fail on processing of a
-             * registration for any conditions they may have for it to pass.
-             *
-             * @var bool if true is returned by the plugin then the registration processing is halted.
-             */
-            if (
-                apply_filters(
-                    'FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process',
-                    false,
-                    $this->registrant_data->attendeeCount(),
-                    $registration,
-                    $registrations,
-                    $reg_form_data,
-                    $this
-                )
-            ) {
-                return $this->isInvalid();
-            }
-
-            // Houston, we have a registration!
-            if (! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
-                return $this->isInvalid();
-            }
-        }
-        return $this->valid;
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @return bool
-     */
-    private function isValidRegUrlLink(string $reg_url_link): bool
-    {
-        if (! empty($reg_url_link)) {
-            return true;
-        }
-        EE_Error::add_error(
-            esc_html__(
-                'An invalid or missing line item ID was encountered while attempting to process the registration form.',
-                'event_espresso'
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return bool
-     */
-    private function isValidRegistration(EE_Registration $registration): bool
-    {
-        // verify EE_Registration object
-        if ($registration instanceof EE_Registration) {
-            return true;
-        }
-        EE_Error::add_error(
-            esc_html__(
-                'An invalid Registration object was discovered when attempting to process your registration information.',
-                'event_espresso'
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @param string          $reg_url_link
-     * @param array[][]       $reg_form_data
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function processRegistration(
-        EE_Registration $registration,
-        string $reg_url_link,
-        array $reg_form_data
-    ): bool {
-        $this->registrant_data->initializeRegistrantData($registration);
-        if (! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
-            return false;
-        }
-        // RegFormAttendeeFactory
-        if (! $this->attendee_factory->create($registration, $reg_url_link)) {
-            return false;
-        }
-        // at this point, we should have enough details about the registrant to consider the registration
-        // NOT incomplete
-        $this->registration_processor->toggle_incomplete_registration_status_to_default(
-            $registration,
-            false,
-            new Context(
-                'spco_reg_step_attendee_information_process_registrations',
-                esc_html__(
-                    'Finished populating registration with details from the registration form after submitting the Attendee Information Reg Step.',
-                    'event_espresso'
-                )
-            )
-        );
-        // we can also consider the TXN to not have been failed, so temporarily upgrade it's status to
-        // abandoned
-        $this->checkout->transaction->toggle_failed_transaction_status();
-        // if we've gotten this far, then let's save what we have
-        $registration->save();
-        // add relation between TXN and registration
-        $this->associateRegistrationWithTransaction($registration);
-        return true;
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @param string          $reg_url_link
-     * @param array           $reg_form_data
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function processRegFormData(EE_Registration $registration, string $reg_url_link, array $reg_form_data): bool
-    {
-        if (isset($reg_form_data[ $reg_url_link ])) {
-            // do we need to copy basic info from primary attendee ?
-            $copy_primary = isset($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info'])
-                                  && absint($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info']) === 0;
-            $this->registrant_data->setCopyPrimary($copy_primary);
-            // filter form input data for this registration
-            $reg_form_data[ $reg_url_link ] = (array) apply_filters(
-                'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
-                $reg_form_data[ $reg_url_link ]
-            );
-            if (isset($reg_form_data['primary_attendee'])) {
-                $primary_reg_url_link = $reg_form_data['primary_attendee'] ?? '';
-                $this->registrant_data->addPrimaryRegistrantDataValue('reg_url_link', $primary_reg_url_link);
-                unset($reg_form_data['primary_attendee']);
-            }
-            // now loop through our array of valid post data && process attendee reg forms
-            foreach ($reg_form_data[ $reg_url_link ] as $form_section => $form_inputs) {
-                if (in_array($form_section, $this->non_input_form_sections, true)) {
-                    continue;
-                }
-                foreach ($form_inputs as $form_input => $input_value) {
-                    $input_processed = $this->input_handler->processFormInput(
-                        $registration,
-                        $reg_url_link,
-                        $form_input,
-                        $input_value
-                    );
-                    if (! $input_processed) {
-                        return false;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function associateRegistrationWithTransaction(EE_Registration $registration)
-    {
-        // add relation to registration
-        $this->checkout->transaction->_add_relation_to($registration, 'Registration');
-        $this->checkout->transaction->update_cache_after_object_save('Registration', $registration);
-    }
+	/**
+	 * @var EE_Checkout
+	 */
+	public $checkout;
+
+	/**
+	 * @var RegFormInputHandler
+	 */
+	public $input_handler;
+
+	/**
+	 * @var array
+	 */
+	private $non_input_form_sections;
+
+	/**
+	 * @var RegFormAttendeeFactory
+	 */
+	private $attendee_factory;
+
+	/**
+	 * @var RegistrantData
+	 */
+	private $registrant_data;
+
+	/**
+	 * @var EE_Registration_Processor
+	 */
+	private $registration_processor;
+
+	/**
+	 * @var bool
+	 */
+	private $valid;
+
+
+	/**
+	 * RegFormHandler constructor.
+	 */
+	public function __construct(
+		EE_Checkout $checkout,
+		RegistrantData $registrant_data,
+		RegFormAttendeeFactory $attendee_factory,
+		EE_Registration_Processor $registration_processor
+	) {
+		$this->checkout                = $checkout;
+		$this->registrant_data         = $registrant_data;
+		$this->attendee_factory        = $attendee_factory;
+		$this->registration_processor  = $registration_processor;
+		// reg form sections that do not contain inputs
+		$this->non_input_form_sections = [
+			'primary_registrant_data',
+			'additional_attendee_reg_info',
+			'spco_copy_attendee_chk',
+		];
+		$this->initializeInputHandler();
+	}
+
+
+	private function initializeInputHandler()
+	{
+		$reg_form = $this->checkout->current_step->reg_form;
+		$required_questions = $reg_form instanceof RegForm ? $reg_form->requiredQuestions() : [];
+		$this->input_handler = LoaderFactory::getShared(
+			RegFormInputHandler::class,
+			[ $this->checkout->reg_url_link, $required_questions ]
+		);
+
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function attendeeCount(): int
+	{
+		return $this->registrant_data->attendeeCount();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	private function isInvalid(): bool
+	{
+		$this->valid = false;
+		return $this->valid;
+	}
+
+
+	/**
+	 * @param EE_Registration[] $registrations
+	 * @param array[][]         $reg_form_data
+	 * @return bool
+	 * @throws EntityNotFoundException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function processRegistrations(array $registrations, array $reg_form_data): bool
+	{
+		// start off optimistic, then trip this to false if anything goes wrong
+		$this->valid = true;
+		foreach ($registrations as $registration) {
+			// verify EE_Registration object
+			if (! $this->isValidRegistration($registration)) {
+				return $this->isInvalid();
+			}
+			$reg_url_link = $registration->reg_url_link();
+			// reg_url_link exists ?
+			if (! $this->isValidRegUrlLink($reg_url_link)) {
+				return $this->isInvalid();
+			}
+			// should this registration be processed during this visit ?
+			if (! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
+				continue;
+			}
+			// if NOT revisiting, then let's save the registration now,
+			// so that we have a REG_ID to use when generating other objects
+			if (! $this->checkout->revisit) {
+				$registration->save();
+			}
+			/**
+			 * This allows plugins to trigger a fail on processing of a
+			 * registration for any conditions they may have for it to pass.
+			 *
+			 * @var bool if true is returned by the plugin then the registration processing is halted.
+			 */
+			if (
+				apply_filters(
+					'FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process',
+					false,
+					$this->registrant_data->attendeeCount(),
+					$registration,
+					$registrations,
+					$reg_form_data,
+					$this
+				)
+			) {
+				return $this->isInvalid();
+			}
+
+			// Houston, we have a registration!
+			if (! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
+				return $this->isInvalid();
+			}
+		}
+		return $this->valid;
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @return bool
+	 */
+	private function isValidRegUrlLink(string $reg_url_link): bool
+	{
+		if (! empty($reg_url_link)) {
+			return true;
+		}
+		EE_Error::add_error(
+			esc_html__(
+				'An invalid or missing line item ID was encountered while attempting to process the registration form.',
+				'event_espresso'
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return bool
+	 */
+	private function isValidRegistration(EE_Registration $registration): bool
+	{
+		// verify EE_Registration object
+		if ($registration instanceof EE_Registration) {
+			return true;
+		}
+		EE_Error::add_error(
+			esc_html__(
+				'An invalid Registration object was discovered when attempting to process your registration information.',
+				'event_espresso'
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @param string          $reg_url_link
+	 * @param array[][]       $reg_form_data
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function processRegistration(
+		EE_Registration $registration,
+		string $reg_url_link,
+		array $reg_form_data
+	): bool {
+		$this->registrant_data->initializeRegistrantData($registration);
+		if (! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
+			return false;
+		}
+		// RegFormAttendeeFactory
+		if (! $this->attendee_factory->create($registration, $reg_url_link)) {
+			return false;
+		}
+		// at this point, we should have enough details about the registrant to consider the registration
+		// NOT incomplete
+		$this->registration_processor->toggle_incomplete_registration_status_to_default(
+			$registration,
+			false,
+			new Context(
+				'spco_reg_step_attendee_information_process_registrations',
+				esc_html__(
+					'Finished populating registration with details from the registration form after submitting the Attendee Information Reg Step.',
+					'event_espresso'
+				)
+			)
+		);
+		// we can also consider the TXN to not have been failed, so temporarily upgrade it's status to
+		// abandoned
+		$this->checkout->transaction->toggle_failed_transaction_status();
+		// if we've gotten this far, then let's save what we have
+		$registration->save();
+		// add relation between TXN and registration
+		$this->associateRegistrationWithTransaction($registration);
+		return true;
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @param string          $reg_url_link
+	 * @param array           $reg_form_data
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function processRegFormData(EE_Registration $registration, string $reg_url_link, array $reg_form_data): bool
+	{
+		if (isset($reg_form_data[ $reg_url_link ])) {
+			// do we need to copy basic info from primary attendee ?
+			$copy_primary = isset($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info'])
+								  && absint($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info']) === 0;
+			$this->registrant_data->setCopyPrimary($copy_primary);
+			// filter form input data for this registration
+			$reg_form_data[ $reg_url_link ] = (array) apply_filters(
+				'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
+				$reg_form_data[ $reg_url_link ]
+			);
+			if (isset($reg_form_data['primary_attendee'])) {
+				$primary_reg_url_link = $reg_form_data['primary_attendee'] ?? '';
+				$this->registrant_data->addPrimaryRegistrantDataValue('reg_url_link', $primary_reg_url_link);
+				unset($reg_form_data['primary_attendee']);
+			}
+			// now loop through our array of valid post data && process attendee reg forms
+			foreach ($reg_form_data[ $reg_url_link ] as $form_section => $form_inputs) {
+				if (in_array($form_section, $this->non_input_form_sections, true)) {
+					continue;
+				}
+				foreach ($form_inputs as $form_input => $input_value) {
+					$input_processed = $this->input_handler->processFormInput(
+						$registration,
+						$reg_url_link,
+						$form_input,
+						$input_value
+					);
+					if (! $input_processed) {
+						return false;
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function associateRegistrationWithTransaction(EE_Registration $registration)
+	{
+		// add relation to registration
+		$this->checkout->transaction->_add_relation_to($registration, 'Registration');
+		$this->checkout->transaction->update_cache_after_object_save('Registration', $registration);
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -83,7 +83,7 @@ 
         $required_questions = $reg_form instanceof RegForm ? $reg_form->requiredQuestions() : [];
         $this->input_handler = LoaderFactory::getShared(
             RegFormInputHandler::class,
-            [ $this->checkout->reg_url_link, $required_questions ]
+            [$this->checkout->reg_url_link, $required_questions]
         );
 
     }
@@ -126,21 +126,21 @@ 
         $this->valid = true;
         foreach ($registrations as $registration) {
             // verify EE_Registration object
-            if (! $this->isValidRegistration($registration)) {
+            if ( ! $this->isValidRegistration($registration)) {
                 return $this->isInvalid();
             }
             $reg_url_link = $registration->reg_url_link();
             // reg_url_link exists ?
-            if (! $this->isValidRegUrlLink($reg_url_link)) {
+            if ( ! $this->isValidRegUrlLink($reg_url_link)) {
                 return $this->isInvalid();
             }
             // should this registration be processed during this visit ?
-            if (! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
+            if ( ! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
                 continue;
             }
             // if NOT revisiting, then let's save the registration now,
             // so that we have a REG_ID to use when generating other objects
-            if (! $this->checkout->revisit) {
+            if ( ! $this->checkout->revisit) {
                 $registration->save();
             }
             /**
@@ -164,7 +164,7 @@ 
             }
 
             // Houston, we have a registration!
-            if (! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
+            if ( ! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
                 return $this->isInvalid();
             }
         }
@@ -178,7 +178,7 @@ 
      */
     private function isValidRegUrlLink(string $reg_url_link): bool
     {
-        if (! empty($reg_url_link)) {
+        if ( ! empty($reg_url_link)) {
             return true;
         }
         EE_Error::add_error(
@@ -231,11 +231,11 @@ 
         array $reg_form_data
     ): bool {
         $this->registrant_data->initializeRegistrantData($registration);
-        if (! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
+        if ( ! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
             return false;
         }
         // RegFormAttendeeFactory
-        if (! $this->attendee_factory->create($registration, $reg_url_link)) {
+        if ( ! $this->attendee_factory->create($registration, $reg_url_link)) {
             return false;
         }
         // at this point, we should have enough details about the registrant to consider the registration
@@ -272,15 +272,15 @@ 
      */
     private function processRegFormData(EE_Registration $registration, string $reg_url_link, array $reg_form_data): bool
     {
-        if (isset($reg_form_data[ $reg_url_link ])) {
+        if (isset($reg_form_data[$reg_url_link])) {
             // do we need to copy basic info from primary attendee ?
-            $copy_primary = isset($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info'])
-                                  && absint($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info']) === 0;
+            $copy_primary = isset($reg_form_data[$reg_url_link]['additional_attendee_reg_info'])
+                                  && absint($reg_form_data[$reg_url_link]['additional_attendee_reg_info']) === 0;
             $this->registrant_data->setCopyPrimary($copy_primary);
             // filter form input data for this registration
-            $reg_form_data[ $reg_url_link ] = (array) apply_filters(
+            $reg_form_data[$reg_url_link] = (array) apply_filters(
                 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
-                $reg_form_data[ $reg_url_link ]
+                $reg_form_data[$reg_url_link]
             );
             if (isset($reg_form_data['primary_attendee'])) {
                 $primary_reg_url_link = $reg_form_data['primary_attendee'] ?? '';
@@ -288,7 +288,7 @@ 
                 unset($reg_form_data['primary_attendee']);
             }
             // now loop through our array of valid post data && process attendee reg forms
-            foreach ($reg_form_data[ $reg_url_link ] as $form_section => $form_inputs) {
+            foreach ($reg_form_data[$reg_url_link] as $form_section => $form_inputs) {
                 if (in_array($form_section, $this->non_input_form_sections, true)) {
                     continue;
                 }
@@ -299,7 +299,7 @@ 
                         $form_input,
                         $input_value
                     );
-                    if (! $input_processed) {
+                    if ( ! $input_processed) {
                         return false;
                     }
                 }

core/domain/services/registration/form/v1/PrivacyConsentCheckboxForm.php

Indentation +35 added lines, -35 removed lines

@@ -9,39 +9,39 @@
 
 class PrivacyConsentCheckboxForm extends EE_Form_Section_Proper
 {
-    /**
-     * @param string $reg_step_slug
-     * @param string $consent_checkbox_label_text
-     * @throws EE_Error
-     */
-    public function __construct(string $reg_step_slug, string $consent_checkbox_label_text)
-    {
-        parent::__construct(
-            [
-                'layout_strategy' =>
-                    new EE_Template_Layout(
-                        [
-                            'input_template_file' => SPCO_REG_STEPS_PATH
-                                                     . $reg_step_slug
-                                                     . '/privacy_consent.template.php',
-                        ]
-                    ),
-                'subsections'     => [
-                    'consent' => new EE_Checkbox_Multi_Input(
-                        [
-                            'consent' => $consent_checkbox_label_text,
-                        ],
-                        [
-                            'required'                          => true,
-                            'required_validation_error_message' => esc_html__(
-                                'You must consent to these terms in order to register.',
-                                'event_espresso'
-                            ),
-                            'html_label_text'                   => '',
-                        ]
-                    ),
-                ],
-            ]
-        );
-    }
+	/**
+	 * @param string $reg_step_slug
+	 * @param string $consent_checkbox_label_text
+	 * @throws EE_Error
+	 */
+	public function __construct(string $reg_step_slug, string $consent_checkbox_label_text)
+	{
+		parent::__construct(
+			[
+				'layout_strategy' =>
+					new EE_Template_Layout(
+						[
+							'input_template_file' => SPCO_REG_STEPS_PATH
+													 . $reg_step_slug
+													 . '/privacy_consent.template.php',
+						]
+					),
+				'subsections'     => [
+					'consent' => new EE_Checkbox_Multi_Input(
+						[
+							'consent' => $consent_checkbox_label_text,
+						],
+						[
+							'required'                          => true,
+							'required_validation_error_message' => esc_html__(
+								'You must consent to these terms in order to register.',
+								'event_espresso'
+							),
+							'html_label_text'                   => '',
+						]
+					),
+				],
+			]
+		);
+	}
 }

core/domain/services/registration/form/v1/RegistrantData.php

Indentation +350 added lines, -350 removed lines

@@ -19,354 +19,354 @@
 class RegistrantData
 {
 
-    /**
-     * @var int
-     */
-    private $attendee_counter = 0;
-
-    /**
-     * @var array
-     */
-    private $registrant_data = [];
-
-    /**
-     * @var bool
-     */
-    private $copy_primary = false;
-
-    /**
-     * @var array
-     */
-    private $required_questions = [];
-
-    /**
-     * @var EE_Registration[]
-     */
-    private $registrations = [];
-
-    /**
-     * @var EE_Answer[][]
-     */
-    private $registrant_answers = [];
-
-    /**
-     * array for tracking reg form data for the primary registrant
-     *
-     * @var array
-     */
-    private $primary_registrant_data;
-
-    /**
-     * the attendee object created for the primary registrant
-     *
-     * @var EE_Attendee
-     */
-    private $primary_registrant;
-
-
-    /**
-     * RegistrantData constructor.
-     */
-    public function __construct()
-    {
-        $this->primary_registrant_data = ['line_item_id' => null,];
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @throws EE_Error
-     */
-    public function initializeRegistrantData(EE_Registration $registration): void
-    {
-        $reg_url_link = $registration->reg_url_link();
-        $this->registrations[ $reg_url_link ] = $registration;
-        $this->registrant_answers[ $reg_url_link ] = $registration->answers();
-        $this->registrant_data[ $reg_url_link ] = [];
-        $this->attendee_counter++;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function attendeeCount(): int
-    {
-        return $this->attendee_counter;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function copyPrimary(): bool
-    {
-        return $this->copy_primary;
-    }
-
-
-    /**
-     * @param bool $copy_primary
-     */
-    public function setCopyPrimary(bool $copy_primary): void
-    {
-        $this->copy_primary = filter_var($copy_primary, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @return array|null
-     */
-    public function getRegistrant(string $reg_url_link): ?EE_Registration
-    {
-        return $this->registrations[ $reg_url_link ] ?? null;
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @return array|null
-     */
-    public function getRegistrantData(string $reg_url_link): ?array
-    {
-        return $this->registrant_data[ $reg_url_link ] ?? null;
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @param string $key
-     * @param mixed $value
-     */
-    public function addRegistrantDataValue(string $reg_url_link, string $key, $value): void
-    {
-        $this->registrant_data[ $reg_url_link ][ $key ] = $value;
-    }
-
-
-    /**
-     * ensures that all attendees at least have data for first name, last name, and email address
-     *
-     * @param string $reg_url_link
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function ensureCriticalRegistrantDataIsSet(string $reg_url_link): void {
-        if ($this->currentRegistrantIsPrimary()) {
-            return;
-        }
-        // bare minimum critical details include first name, last name, email address
-        $critical_attendee_details = ['ATT_fname', 'ATT_lname', 'ATT_email'];
-        // add address info to critical details?
-        if (
-        apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details',
-            false
-        )
-        ) {
-            $critical_attendee_details += [
-                'ATT_address',
-                'ATT_address2',
-                'ATT_city',
-                'STA_ID',
-                'CNT_ISO',
-                'ATT_zip',
-                'ATT_phone',
-            ];
-        }
-        foreach ($critical_attendee_details as $critical_attendee_detail) {
-            if (
-                ! isset($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
-                || empty($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
-            ) {
-                $this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ] = $this->primary_registrant->get(
-                    $critical_attendee_detail
-                );
-            }
-        }
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @param array $registrant_data
-     */
-    public function setRegistrantData(string $reg_url_link, array $registrant_data): void
-    {
-        $this->registrant_data[ $reg_url_link ] = $registrant_data;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getRequiredQuestions(): array
-    {
-        return $this->required_questions;
-    }
-
-
-    /**
-     * @param string $identifier
-     * @param string $required_question
-     */
-    public function addRequiredQuestion(string $identifier, string $required_question): void
-    {
-        $this->required_questions[ $identifier ] = $required_question;
-    }
-
-
-    /**
-     * @return EE_Answer[]
-     */
-    public function registrantAnswers(string $reg_url_link): array
-    {
-        return $this->registrant_answers[ $reg_url_link ] ?? [];
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @param string $identifier  the answer cache ID
-     * @param EE_Answer $answer
-     */
-    public function addRegistrantAnswer(string $reg_url_link, string $identifier, EE_Answer $answer): void
-    {
-        $this->registrant_answers[ $reg_url_link ][ $identifier ] = $answer;
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @param string $identifier
-     * @return EE_Answer|null
-     */
-    public function getRegistrantAnswer(string $reg_url_link, string $identifier): ?EE_Answer
-    {
-        return $this->registrant_answers[ $reg_url_link ][ $identifier ] ?? null;
-    }
-
-
-
-    /**
-     * @param string $reg_url_link
-     * @param string $identifier
-     * @return bool
-     */
-    public function registrantAnswerIsObject(string $reg_url_link, string $identifier): bool
-    {
-        $registrant_answer = $this->getRegistrantAnswer($reg_url_link, $identifier);
-        return $registrant_answer instanceof EE_Answer;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function primaryRegistrantData(): array
-    {
-        return $this->primary_registrant_data;
-    }
-
-
-    /**
-     * @param string $key
-     * @param mixed  $value
-     */
-    public function addPrimaryRegistrantDataValue(string $key, $value): void
-    {
-        $this->primary_registrant_data[ $key ] = $value;
-    }
-
-
-    /**
-     * @param string $key
-     * @return mixed
-     */
-    public function getPrimaryRegistrantDataValue(string $key)
-    {
-        return $this->primary_registrant_data[ $key ] ?? null;
-    }
-
-
-    /**
-     * @param array $primary_registrant_data
-     */
-    public function setPrimaryRegistrantData(array $primary_registrant_data): void
-    {
-        $this->primary_registrant_data = $primary_registrant_data;
-    }
-
-
-    /**
-     * @return EE_Attendee
-     */
-    public function primaryRegistrant(): EE_Attendee
-    {
-        return $this->primary_registrant;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function primaryRegistrantIsValid(): bool
-    {
-        return $this->primary_registrant instanceof EE_Attendee;
-    }
-
-
-    /**
-     * @param EE_Attendee $primary_registrant
-     */
-    public function setPrimaryRegistrant(EE_Attendee $primary_registrant): void
-    {
-        $this->primary_registrant = $primary_registrant;
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @return bool
-     */
-    public function currentRegistrantIsPrimary(string $reg_url_link = ''): bool
-    {
-        return $this->attendeeCount() === 1
-            || (
-                $this->attendeeCount() === 1
-                && $reg_url_link !== ''
-                && $this->getPrimaryRegistrantDataValue('reg_url_link') === $reg_url_link
-           );
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function currentRegistrantIsNotPrimary(): bool
-    {
-        return $this->attendeeCount() > 1;
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @param string $form_input
-     * @param mixed  $input_value
-     * @return mixed|null
-     */
-    public function saveOrCopyPrimaryRegistrantData(string $reg_url_link, string $form_input, $input_value)
-    {
-        // store a bit of data about the primary attendee
-        if (! empty($input_value) && $this->currentRegistrantIsPrimary($reg_url_link)) {
-            $this->primary_registrant_data[ $form_input ] = $input_value;
-            return $input_value;
-        }
-        // or copy value from primary if incoming value is not set
-        if ($input_value === null && $this->copyPrimary()) {
-            $input_value = $this->getPrimaryRegistrantDataValue($form_input);
-        }
-        return $input_value;
-    }
+	/**
+	 * @var int
+	 */
+	private $attendee_counter = 0;
+
+	/**
+	 * @var array
+	 */
+	private $registrant_data = [];
+
+	/**
+	 * @var bool
+	 */
+	private $copy_primary = false;
+
+	/**
+	 * @var array
+	 */
+	private $required_questions = [];
+
+	/**
+	 * @var EE_Registration[]
+	 */
+	private $registrations = [];
+
+	/**
+	 * @var EE_Answer[][]
+	 */
+	private $registrant_answers = [];
+
+	/**
+	 * array for tracking reg form data for the primary registrant
+	 *
+	 * @var array
+	 */
+	private $primary_registrant_data;
+
+	/**
+	 * the attendee object created for the primary registrant
+	 *
+	 * @var EE_Attendee
+	 */
+	private $primary_registrant;
+
+
+	/**
+	 * RegistrantData constructor.
+	 */
+	public function __construct()
+	{
+		$this->primary_registrant_data = ['line_item_id' => null,];
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @throws EE_Error
+	 */
+	public function initializeRegistrantData(EE_Registration $registration): void
+	{
+		$reg_url_link = $registration->reg_url_link();
+		$this->registrations[ $reg_url_link ] = $registration;
+		$this->registrant_answers[ $reg_url_link ] = $registration->answers();
+		$this->registrant_data[ $reg_url_link ] = [];
+		$this->attendee_counter++;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function attendeeCount(): int
+	{
+		return $this->attendee_counter;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function copyPrimary(): bool
+	{
+		return $this->copy_primary;
+	}
+
+
+	/**
+	 * @param bool $copy_primary
+	 */
+	public function setCopyPrimary(bool $copy_primary): void
+	{
+		$this->copy_primary = filter_var($copy_primary, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @return array|null
+	 */
+	public function getRegistrant(string $reg_url_link): ?EE_Registration
+	{
+		return $this->registrations[ $reg_url_link ] ?? null;
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @return array|null
+	 */
+	public function getRegistrantData(string $reg_url_link): ?array
+	{
+		return $this->registrant_data[ $reg_url_link ] ?? null;
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @param string $key
+	 * @param mixed $value
+	 */
+	public function addRegistrantDataValue(string $reg_url_link, string $key, $value): void
+	{
+		$this->registrant_data[ $reg_url_link ][ $key ] = $value;
+	}
+
+
+	/**
+	 * ensures that all attendees at least have data for first name, last name, and email address
+	 *
+	 * @param string $reg_url_link
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function ensureCriticalRegistrantDataIsSet(string $reg_url_link): void {
+		if ($this->currentRegistrantIsPrimary()) {
+			return;
+		}
+		// bare minimum critical details include first name, last name, email address
+		$critical_attendee_details = ['ATT_fname', 'ATT_lname', 'ATT_email'];
+		// add address info to critical details?
+		if (
+		apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details',
+			false
+		)
+		) {
+			$critical_attendee_details += [
+				'ATT_address',
+				'ATT_address2',
+				'ATT_city',
+				'STA_ID',
+				'CNT_ISO',
+				'ATT_zip',
+				'ATT_phone',
+			];
+		}
+		foreach ($critical_attendee_details as $critical_attendee_detail) {
+			if (
+				! isset($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
+				|| empty($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
+			) {
+				$this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ] = $this->primary_registrant->get(
+					$critical_attendee_detail
+				);
+			}
+		}
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @param array $registrant_data
+	 */
+	public function setRegistrantData(string $reg_url_link, array $registrant_data): void
+	{
+		$this->registrant_data[ $reg_url_link ] = $registrant_data;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getRequiredQuestions(): array
+	{
+		return $this->required_questions;
+	}
+
+
+	/**
+	 * @param string $identifier
+	 * @param string $required_question
+	 */
+	public function addRequiredQuestion(string $identifier, string $required_question): void
+	{
+		$this->required_questions[ $identifier ] = $required_question;
+	}
+
+
+	/**
+	 * @return EE_Answer[]
+	 */
+	public function registrantAnswers(string $reg_url_link): array
+	{
+		return $this->registrant_answers[ $reg_url_link ] ?? [];
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @param string $identifier  the answer cache ID
+	 * @param EE_Answer $answer
+	 */
+	public function addRegistrantAnswer(string $reg_url_link, string $identifier, EE_Answer $answer): void
+	{
+		$this->registrant_answers[ $reg_url_link ][ $identifier ] = $answer;
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @param string $identifier
+	 * @return EE_Answer|null
+	 */
+	public function getRegistrantAnswer(string $reg_url_link, string $identifier): ?EE_Answer
+	{
+		return $this->registrant_answers[ $reg_url_link ][ $identifier ] ?? null;
+	}
+
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @param string $identifier
+	 * @return bool
+	 */
+	public function registrantAnswerIsObject(string $reg_url_link, string $identifier): bool
+	{
+		$registrant_answer = $this->getRegistrantAnswer($reg_url_link, $identifier);
+		return $registrant_answer instanceof EE_Answer;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function primaryRegistrantData(): array
+	{
+		return $this->primary_registrant_data;
+	}
+
+
+	/**
+	 * @param string $key
+	 * @param mixed  $value
+	 */
+	public function addPrimaryRegistrantDataValue(string $key, $value): void
+	{
+		$this->primary_registrant_data[ $key ] = $value;
+	}
+
+
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+	public function getPrimaryRegistrantDataValue(string $key)
+	{
+		return $this->primary_registrant_data[ $key ] ?? null;
+	}
+
+
+	/**
+	 * @param array $primary_registrant_data
+	 */
+	public function setPrimaryRegistrantData(array $primary_registrant_data): void
+	{
+		$this->primary_registrant_data = $primary_registrant_data;
+	}
+
+
+	/**
+	 * @return EE_Attendee
+	 */
+	public function primaryRegistrant(): EE_Attendee
+	{
+		return $this->primary_registrant;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function primaryRegistrantIsValid(): bool
+	{
+		return $this->primary_registrant instanceof EE_Attendee;
+	}
+
+
+	/**
+	 * @param EE_Attendee $primary_registrant
+	 */
+	public function setPrimaryRegistrant(EE_Attendee $primary_registrant): void
+	{
+		$this->primary_registrant = $primary_registrant;
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @return bool
+	 */
+	public function currentRegistrantIsPrimary(string $reg_url_link = ''): bool
+	{
+		return $this->attendeeCount() === 1
+			|| (
+				$this->attendeeCount() === 1
+				&& $reg_url_link !== ''
+				&& $this->getPrimaryRegistrantDataValue('reg_url_link') === $reg_url_link
+		   );
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function currentRegistrantIsNotPrimary(): bool
+	{
+		return $this->attendeeCount() > 1;
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @param string $form_input
+	 * @param mixed  $input_value
+	 * @return mixed|null
+	 */
+	public function saveOrCopyPrimaryRegistrantData(string $reg_url_link, string $form_input, $input_value)
+	{
+		// store a bit of data about the primary attendee
+		if (! empty($input_value) && $this->currentRegistrantIsPrimary($reg_url_link)) {
+			$this->primary_registrant_data[ $form_input ] = $input_value;
+			return $input_value;
+		}
+		// or copy value from primary if incoming value is not set
+		if ($input_value === null && $this->copyPrimary()) {
+			$input_value = $this->getPrimaryRegistrantDataValue($form_input);
+		}
+		return $input_value;
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -69,7 +69,7 @@ 
      */
     public function __construct()
     {
-        $this->primary_registrant_data = ['line_item_id' => null,];
+        $this->primary_registrant_data = ['line_item_id' => null, ];
     }
 
 
@@ -80,9 +80,9 @@ 
     public function initializeRegistrantData(EE_Registration $registration): void
     {
         $reg_url_link = $registration->reg_url_link();
-        $this->registrations[ $reg_url_link ] = $registration;
-        $this->registrant_answers[ $reg_url_link ] = $registration->answers();
-        $this->registrant_data[ $reg_url_link ] = [];
+        $this->registrations[$reg_url_link] = $registration;
+        $this->registrant_answers[$reg_url_link] = $registration->answers();
+        $this->registrant_data[$reg_url_link] = [];
         $this->attendee_counter++;
     }
 
@@ -120,7 +120,7 @@ 
      */
     public function getRegistrant(string $reg_url_link): ?EE_Registration
     {
-        return $this->registrations[ $reg_url_link ] ?? null;
+        return $this->registrations[$reg_url_link] ?? null;
     }
 
 
@@ -130,7 +130,7 @@ 
      */
     public function getRegistrantData(string $reg_url_link): ?array
     {
-        return $this->registrant_data[ $reg_url_link ] ?? null;
+        return $this->registrant_data[$reg_url_link] ?? null;
     }
 
 
@@ -141,7 +141,7 @@ 
      */
     public function addRegistrantDataValue(string $reg_url_link, string $key, $value): void
     {
-        $this->registrant_data[ $reg_url_link ][ $key ] = $value;
+        $this->registrant_data[$reg_url_link][$key] = $value;
     }
 
 
@@ -177,10 +177,10 @@ 
         }
         foreach ($critical_attendee_details as $critical_attendee_detail) {
             if (
-                ! isset($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
-                || empty($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
+                ! isset($this->registrant_data[$reg_url_link][$critical_attendee_detail])
+                || empty($this->registrant_data[$reg_url_link][$critical_attendee_detail])
             ) {
-                $this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ] = $this->primary_registrant->get(
+                $this->registrant_data[$reg_url_link][$critical_attendee_detail] = $this->primary_registrant->get(
                     $critical_attendee_detail
                 );
             }
@@ -194,7 +194,7 @@ 
      */
     public function setRegistrantData(string $reg_url_link, array $registrant_data): void
     {
-        $this->registrant_data[ $reg_url_link ] = $registrant_data;
+        $this->registrant_data[$reg_url_link] = $registrant_data;
     }
 
 
@@ -213,7 +213,7 @@ 
      */
     public function addRequiredQuestion(string $identifier, string $required_question): void
     {
-        $this->required_questions[ $identifier ] = $required_question;
+        $this->required_questions[$identifier] = $required_question;
     }
 
 
@@ -222,7 +222,7 @@ 
      */
     public function registrantAnswers(string $reg_url_link): array
     {
-        return $this->registrant_answers[ $reg_url_link ] ?? [];
+        return $this->registrant_answers[$reg_url_link] ?? [];
     }
 
 
@@ -233,7 +233,7 @@ 
      */
     public function addRegistrantAnswer(string $reg_url_link, string $identifier, EE_Answer $answer): void
     {
-        $this->registrant_answers[ $reg_url_link ][ $identifier ] = $answer;
+        $this->registrant_answers[$reg_url_link][$identifier] = $answer;
     }
 
 
@@ -244,7 +244,7 @@ 
      */
     public function getRegistrantAnswer(string $reg_url_link, string $identifier): ?EE_Answer
     {
-        return $this->registrant_answers[ $reg_url_link ][ $identifier ] ?? null;
+        return $this->registrant_answers[$reg_url_link][$identifier] ?? null;
     }
 
 
@@ -276,7 +276,7 @@ 
      */
     public function addPrimaryRegistrantDataValue(string $key, $value): void
     {
-        $this->primary_registrant_data[ $key ] = $value;
+        $this->primary_registrant_data[$key] = $value;
     }
 
 
@@ -286,7 +286,7 @@ 
      */
     public function getPrimaryRegistrantDataValue(string $key)
     {
-        return $this->primary_registrant_data[ $key ] ?? null;
+        return $this->primary_registrant_data[$key] ?? null;
     }
 
 
@@ -359,8 +359,8 @@ 
     public function saveOrCopyPrimaryRegistrantData(string $reg_url_link, string $form_input, $input_value)
     {
         // store a bit of data about the primary attendee
-        if (! empty($input_value) && $this->currentRegistrantIsPrimary($reg_url_link)) {
-            $this->primary_registrant_data[ $form_input ] = $input_value;
+        if ( ! empty($input_value) && $this->currentRegistrantIsPrimary($reg_url_link)) {
+            $this->primary_registrant_data[$form_input] = $input_value;
             return $input_value;
         }
         // or copy value from primary if incoming value is not set

modules/single_page_checkout/reg_steps/attendee_information/EE_SPCO_Reg_Step_Attendee_Information.class.php

Indentation +468 added lines, -468 removed lines

@@ -22,472 +22,472 @@
 class EE_SPCO_Reg_Step_Attendee_Information extends EE_SPCO_Reg_Step
 {
 
-    /**
-     * @var RegForm
-     */
-    public $reg_form;
-
-    /**
-     * @var int
-     */
-    protected $reg_form_count = 0;
-
-
-    /**
-     *    class constructor
-     *
-     * @access    public
-     * @param EE_Checkout $checkout
-     */
-    public function __construct(EE_Checkout $checkout)
-    {
-        $this->_slug    = 'attendee_information';
-        $this->_name    = esc_html__('Attendee Information', 'event_espresso');
-        $this->checkout = $checkout;
-        $this->_reset_success_message();
-        $this->set_instructions(
-            esc_html__('Please answer the following registration questions before proceeding.', 'event_espresso')
-        );
-    }
-
-
-    public function translate_js_strings()
-    {
-        EE_Registry::$i18n_js_strings['required_field']            = esc_html__(
-            ' is a required question.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['required_multi_field']      = esc_html__(
-            ' is a required question. Please enter a value for at least one of the options.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['answer_required_questions'] = esc_html__(
-            'Please answer all required questions correctly before proceeding.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['attendee_info_copied']      = sprintf(
-            esc_html_x(
-                'The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.',
-                'The attendee information was successfully copied.(line break)Please ensure the rest of the registration form is completed before proceeding.',
-                'event_espresso'
-            ),
-            '<br/>'
-        );
-        EE_Registry::$i18n_js_strings['attendee_info_copy_error']  = esc_html__(
-            'An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['enter_valid_email']         = esc_html__(
-            'You must enter a valid email address.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['valid_email_and_questions'] = esc_html__(
-            'You must enter a valid email address and answer all other required questions before you can proceed.',
-            'event_espresso'
-        );
-    }
-
-
-    public function enqueue_styles_and_scripts()
-    {
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function initialize_reg_step(): bool
-    {
-        return true;
-    }
-
-
-    /**
-     * @return RegForm
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws EntityNotFoundException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function generate_reg_form(): RegForm
-    {
-        /** @var RegFormDependencyHandler $dependency_handler */
-        $dependency_handler = LoaderFactory::getShared(RegFormDependencyHandler::class);
-        $dependency_handler->registerDependencies();
-        // TODO detect if event has a reg form UUID and swap this out for form generated by new reg form builder
-        return LoaderFactory::getShared(RegForm::class, [$this]);
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::getRegForm()
-     *
-     * @deprecated   $VID:$
-     */
-    private function _registrations_reg_form()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::additionalAttendeeRegInfoInput()
-     *
-     * @deprecated   $VID:$
-     */
-    private function _additional_attendee_reg_info_input()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::questionGroupRegForm()
-     *
-     * @deprecated   $VID:$
-     */
-    private function _question_group_reg_form()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::questionGroupHeader()
-     *
-     * @deprecated   $VID:$
-     */
-    private function _question_group_header()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\CopyAttendeeInfoForm
-     *
-     * @deprecated   $VID:$
-     */
-    private function _copy_attendee_info_form()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\AutoCopyAttendeeInfoForm
-     *
-     * @deprecated   $VID:$
-     */
-    private function _auto_copy_attendee_info()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\CopyAttendeeInfoForm
-     *
-     * @deprecated   $VID:$
-     */
-    private function _copy_attendee_info_inputs()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::additionalPrimaryRegistrantInputs()
-     *
-     * @deprecated   $VID:$
-     */
-    private function _additional_primary_registrant_inputs()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegFormQuestionFactory::create()
-     *
-     * @param EE_Registration $registration
-     * @param EE_Question     $question
-     * @return EE_Form_Input_Base
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated   $VID:$
-     */
-    public function reg_form_question(EE_Registration $registration, EE_Question $question): EE_Form_Input_Base
-    {
-        /** @var RegFormQuestionFactory $reg_form_question_factory */
-        $reg_form_question_factory = LoaderFactory::getShared(RegFormQuestionFactory::class);
-        return $reg_form_question_factory->create($registration, $question);
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::generateQuestionInput()
-     *
-     * @deprecated   $VID:$
-     */
-    private function _generate_question_input()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\CountryOptions::forLegacyFormInput()
-     *
-     * @param array|null           $countries_list
-     * @param EE_Question|null     $question
-     * @param EE_Registration|null $registration
-     * @param EE_Answer|null       $answer
-     * @return array 2d keys are country IDs, values are their names
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated   $VID:$
-     */
-    public function use_cached_countries_for_form_input(
-        array $countries_list = null,
-        EE_Question $question = null,
-        EE_Registration $registration = null,
-        EE_Answer $answer = null
-    ): array {
-        /** @var CountryOptions $country_options */
-        $country_options = LoaderFactory::getShared(CountryOptions::class, [$this->checkout->action]);
-        return $country_options->forLegacyFormInput($countries_list, $question, $registration, $answer);
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\StateOptions::forLegacyFormInput()
-     *
-     * @param array|null           $states_list
-     * @param EE_Question|null     $question
-     * @param EE_Registration|null $registration
-     * @param EE_Answer|null       $answer
-     * @return array 2d keys are state IDs, values are their names
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated   $VID:$
-     */
-    public function use_cached_states_for_form_input(
-        array $states_list = null,
-        EE_Question $question = null,
-        EE_Registration $registration = null,
-        EE_Answer $answer = null
-    ): array {
-        /** @var StateOptions $state_options */
-        $state_options = LoaderFactory::getShared(StateOptions::class, [$this->checkout->action]);
-        return $state_options->forLegacyFormInput($states_list, $question, $registration, $answer);
-    }
-
-
-    /********************************************************************************************************/
-    /****************************************  PROCESS REG STEP  ****************************************/
-    /********************************************************************************************************/
-
-
-    /**
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function process_reg_step(): bool
-    {
-        // grab validated data from form
-        $valid_data = $this->checkout->current_step->valid_data();
-        // if we don't have any $valid_data then something went TERRIBLY WRONG !!!
-        if (empty($valid_data)) {
-            return $this->inValidDataError();
-        }
-        if (! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
-            return $this->inValidTransactionError();
-        }
-        // get cached registrations
-        $registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
-        // verify we got the goods
-        if (empty($registrations)) {
-            return $this->noRegistrationsError();
-        }
-        /** @var RegFormHandler $reg_form_handler */
-        $reg_form_handler = LoaderFactory::getNew(RegFormHandler::class, [$this->checkout]);
-        // extract attendee info from form data and save to model objects
-        if (! $reg_form_handler->processRegistrations($registrations, $valid_data)) {
-            // return immediately if the previous step exited early due to errors
-            return false;
-        }
-        // if first pass thru SPCO,
-        // then let's check processed registrations against the total number of tickets in the cart
-        $registrations_processed = $reg_form_handler->attendeeCount();
-        if (! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
-            return $this->registrationProcessingError($registrations_processed);
-        }
-        // mark this reg step as completed
-        $this->set_completed();
-        $this->_set_success_message(
-            esc_html__('The Attendee Information Step has been successfully completed.', 'event_espresso')
-        );
-        // do action in case a plugin wants to do something with the data submitted in step 1.
-        // passes EE_Single_Page_Checkout, and it's posted data
-        do_action('AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data);
-        return true;
-    }
-
-
-    /**
-     * @return bool
-     * @since   $VID:$
-     */
-    private function inValidDataError(): bool
-    {
-        EE_Error::add_error(
-            esc_html__('No valid question responses were received.', 'event_espresso'),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
-
-
-    /**
-     * @return bool
-     * @since   $VID:$
-     */
-    private function inValidTransactionError(): bool
-    {
-        EE_Error::add_error(
-            esc_html__(
-                'A valid transaction could not be initiated for processing your registrations.',
-                'event_espresso'
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
-
-
-    /**
-     * @return bool
-     * @since   $VID:$
-     */
-    private function noRegistrationsError(): bool
-    {
-        // combine the old translated string with a new one, in order to not break translations
-        $error_message = esc_html__(
-            'Your form data could not be applied to any valid registrations.',
-            'event_espresso'
-        );
-        $error_message .= sprintf(
-            esc_html_x(
-                '%3$sThis can sometimes happen if too much time has been taken to complete the registration process.%3$sPlease return to the %1$sEvent List%2$s and reselect your tickets. If the problem continues, please contact the site administrator.',
-                '(line break)This can sometimes happen if too much time has been taken to complete the registration process.(line break)Please return to the (link)Event List(end link) and reselect your tickets. If the problem continues, please contact the site administrator.',
-                'event_espresso'
-            ),
-            '<a href="' . get_post_type_archive_link('espresso_events') . '" >',
-            '</a>',
-            '<br />'
-        );
-        EE_Error::add_error($error_message, __FILE__, __FUNCTION__, __LINE__);
-        return false;
-    }
-
-
-    /**
-     * @param int $registrations_processed
-     * @return bool
-     * @since   $VID:$
-     */
-    private function registrationProcessingError(int $registrations_processed): bool
-    {
-        // generate a correctly translated string for all possible singular/plural combinations
-        if ($this->checkout->total_ticket_count === 1 && $registrations_processed !== 1) {
-            $error_msg = sprintf(
-                esc_html_x(
-                    'There was %1$d ticket in the Event Queue, but %2$ds registrations were processed',
-                    'There was 1 ticket in the Event Queue, but 2 registrations were processed',
-                    'event_espresso'
-                ),
-                $this->checkout->total_ticket_count,
-                $registrations_processed
-            );
-        } elseif ($this->checkout->total_ticket_count !== 1 && $registrations_processed === 1) {
-            $error_msg = sprintf(
-                esc_html_x(
-                    'There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed',
-                    'There was a total of 2 tickets in the Event Queue, but only 1 registration was processed',
-                    'event_espresso'
-                ),
-                $this->checkout->total_ticket_count,
-                $registrations_processed
-            );
-        } else {
-            $error_msg = sprintf(
-                esc_html__(
-                    'There was a total of 2 tickets in the Event Queue, but 2 registrations were processed',
-                    'event_espresso'
-                ),
-                $this->checkout->total_ticket_count,
-                $registrations_processed
-            );
-        }
-        EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
-        return false;
-    }
-
-
-    /**
-     *    update_reg_step
-     *    this is the final step after a user  revisits the site to edit their attendee information
-     *    this gets called AFTER the process_reg_step() method above
-     *
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function update_reg_step(): bool
-    {
-        // save everything
-        if ($this->process_reg_step()) {
-            $this->checkout->redirect     = true;
-            $this->checkout->redirect_url = add_query_arg(
-                [
-                    'e_reg_url_link' => $this->checkout->reg_url_link,
-                    'revisit'        => true,
-                ],
-                $this->checkout->thank_you_page_url
-            );
-            $this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * @var RegForm
+	 */
+	public $reg_form;
+
+	/**
+	 * @var int
+	 */
+	protected $reg_form_count = 0;
+
+
+	/**
+	 *    class constructor
+	 *
+	 * @access    public
+	 * @param EE_Checkout $checkout
+	 */
+	public function __construct(EE_Checkout $checkout)
+	{
+		$this->_slug    = 'attendee_information';
+		$this->_name    = esc_html__('Attendee Information', 'event_espresso');
+		$this->checkout = $checkout;
+		$this->_reset_success_message();
+		$this->set_instructions(
+			esc_html__('Please answer the following registration questions before proceeding.', 'event_espresso')
+		);
+	}
+
+
+	public function translate_js_strings()
+	{
+		EE_Registry::$i18n_js_strings['required_field']            = esc_html__(
+			' is a required question.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['required_multi_field']      = esc_html__(
+			' is a required question. Please enter a value for at least one of the options.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['answer_required_questions'] = esc_html__(
+			'Please answer all required questions correctly before proceeding.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['attendee_info_copied']      = sprintf(
+			esc_html_x(
+				'The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.',
+				'The attendee information was successfully copied.(line break)Please ensure the rest of the registration form is completed before proceeding.',
+				'event_espresso'
+			),
+			'<br/>'
+		);
+		EE_Registry::$i18n_js_strings['attendee_info_copy_error']  = esc_html__(
+			'An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['enter_valid_email']         = esc_html__(
+			'You must enter a valid email address.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['valid_email_and_questions'] = esc_html__(
+			'You must enter a valid email address and answer all other required questions before you can proceed.',
+			'event_espresso'
+		);
+	}
+
+
+	public function enqueue_styles_and_scripts()
+	{
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function initialize_reg_step(): bool
+	{
+		return true;
+	}
+
+
+	/**
+	 * @return RegForm
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws EntityNotFoundException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function generate_reg_form(): RegForm
+	{
+		/** @var RegFormDependencyHandler $dependency_handler */
+		$dependency_handler = LoaderFactory::getShared(RegFormDependencyHandler::class);
+		$dependency_handler->registerDependencies();
+		// TODO detect if event has a reg form UUID and swap this out for form generated by new reg form builder
+		return LoaderFactory::getShared(RegForm::class, [$this]);
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::getRegForm()
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _registrations_reg_form()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::additionalAttendeeRegInfoInput()
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _additional_attendee_reg_info_input()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::questionGroupRegForm()
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _question_group_reg_form()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::questionGroupHeader()
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _question_group_header()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\CopyAttendeeInfoForm
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _copy_attendee_info_form()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\AutoCopyAttendeeInfoForm
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _auto_copy_attendee_info()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\CopyAttendeeInfoForm
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _copy_attendee_info_inputs()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::additionalPrimaryRegistrantInputs()
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _additional_primary_registrant_inputs()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegFormQuestionFactory::create()
+	 *
+	 * @param EE_Registration $registration
+	 * @param EE_Question     $question
+	 * @return EE_Form_Input_Base
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated   $VID:$
+	 */
+	public function reg_form_question(EE_Registration $registration, EE_Question $question): EE_Form_Input_Base
+	{
+		/** @var RegFormQuestionFactory $reg_form_question_factory */
+		$reg_form_question_factory = LoaderFactory::getShared(RegFormQuestionFactory::class);
+		return $reg_form_question_factory->create($registration, $question);
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::generateQuestionInput()
+	 *
+	 * @deprecated   $VID:$
+	 */
+	private function _generate_question_input()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\CountryOptions::forLegacyFormInput()
+	 *
+	 * @param array|null           $countries_list
+	 * @param EE_Question|null     $question
+	 * @param EE_Registration|null $registration
+	 * @param EE_Answer|null       $answer
+	 * @return array 2d keys are country IDs, values are their names
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated   $VID:$
+	 */
+	public function use_cached_countries_for_form_input(
+		array $countries_list = null,
+		EE_Question $question = null,
+		EE_Registration $registration = null,
+		EE_Answer $answer = null
+	): array {
+		/** @var CountryOptions $country_options */
+		$country_options = LoaderFactory::getShared(CountryOptions::class, [$this->checkout->action]);
+		return $country_options->forLegacyFormInput($countries_list, $question, $registration, $answer);
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\StateOptions::forLegacyFormInput()
+	 *
+	 * @param array|null           $states_list
+	 * @param EE_Question|null     $question
+	 * @param EE_Registration|null $registration
+	 * @param EE_Answer|null       $answer
+	 * @return array 2d keys are state IDs, values are their names
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated   $VID:$
+	 */
+	public function use_cached_states_for_form_input(
+		array $states_list = null,
+		EE_Question $question = null,
+		EE_Registration $registration = null,
+		EE_Answer $answer = null
+	): array {
+		/** @var StateOptions $state_options */
+		$state_options = LoaderFactory::getShared(StateOptions::class, [$this->checkout->action]);
+		return $state_options->forLegacyFormInput($states_list, $question, $registration, $answer);
+	}
+
+
+	/********************************************************************************************************/
+	/****************************************  PROCESS REG STEP  ****************************************/
+	/********************************************************************************************************/
+
+
+	/**
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function process_reg_step(): bool
+	{
+		// grab validated data from form
+		$valid_data = $this->checkout->current_step->valid_data();
+		// if we don't have any $valid_data then something went TERRIBLY WRONG !!!
+		if (empty($valid_data)) {
+			return $this->inValidDataError();
+		}
+		if (! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
+			return $this->inValidTransactionError();
+		}
+		// get cached registrations
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		// verify we got the goods
+		if (empty($registrations)) {
+			return $this->noRegistrationsError();
+		}
+		/** @var RegFormHandler $reg_form_handler */
+		$reg_form_handler = LoaderFactory::getNew(RegFormHandler::class, [$this->checkout]);
+		// extract attendee info from form data and save to model objects
+		if (! $reg_form_handler->processRegistrations($registrations, $valid_data)) {
+			// return immediately if the previous step exited early due to errors
+			return false;
+		}
+		// if first pass thru SPCO,
+		// then let's check processed registrations against the total number of tickets in the cart
+		$registrations_processed = $reg_form_handler->attendeeCount();
+		if (! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
+			return $this->registrationProcessingError($registrations_processed);
+		}
+		// mark this reg step as completed
+		$this->set_completed();
+		$this->_set_success_message(
+			esc_html__('The Attendee Information Step has been successfully completed.', 'event_espresso')
+		);
+		// do action in case a plugin wants to do something with the data submitted in step 1.
+		// passes EE_Single_Page_Checkout, and it's posted data
+		do_action('AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data);
+		return true;
+	}
+
+
+	/**
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	private function inValidDataError(): bool
+	{
+		EE_Error::add_error(
+			esc_html__('No valid question responses were received.', 'event_espresso'),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
+
+
+	/**
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	private function inValidTransactionError(): bool
+	{
+		EE_Error::add_error(
+			esc_html__(
+				'A valid transaction could not be initiated for processing your registrations.',
+				'event_espresso'
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
+
+
+	/**
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	private function noRegistrationsError(): bool
+	{
+		// combine the old translated string with a new one, in order to not break translations
+		$error_message = esc_html__(
+			'Your form data could not be applied to any valid registrations.',
+			'event_espresso'
+		);
+		$error_message .= sprintf(
+			esc_html_x(
+				'%3$sThis can sometimes happen if too much time has been taken to complete the registration process.%3$sPlease return to the %1$sEvent List%2$s and reselect your tickets. If the problem continues, please contact the site administrator.',
+				'(line break)This can sometimes happen if too much time has been taken to complete the registration process.(line break)Please return to the (link)Event List(end link) and reselect your tickets. If the problem continues, please contact the site administrator.',
+				'event_espresso'
+			),
+			'<a href="' . get_post_type_archive_link('espresso_events') . '" >',
+			'</a>',
+			'<br />'
+		);
+		EE_Error::add_error($error_message, __FILE__, __FUNCTION__, __LINE__);
+		return false;
+	}
+
+
+	/**
+	 * @param int $registrations_processed
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	private function registrationProcessingError(int $registrations_processed): bool
+	{
+		// generate a correctly translated string for all possible singular/plural combinations
+		if ($this->checkout->total_ticket_count === 1 && $registrations_processed !== 1) {
+			$error_msg = sprintf(
+				esc_html_x(
+					'There was %1$d ticket in the Event Queue, but %2$ds registrations were processed',
+					'There was 1 ticket in the Event Queue, but 2 registrations were processed',
+					'event_espresso'
+				),
+				$this->checkout->total_ticket_count,
+				$registrations_processed
+			);
+		} elseif ($this->checkout->total_ticket_count !== 1 && $registrations_processed === 1) {
+			$error_msg = sprintf(
+				esc_html_x(
+					'There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed',
+					'There was a total of 2 tickets in the Event Queue, but only 1 registration was processed',
+					'event_espresso'
+				),
+				$this->checkout->total_ticket_count,
+				$registrations_processed
+			);
+		} else {
+			$error_msg = sprintf(
+				esc_html__(
+					'There was a total of 2 tickets in the Event Queue, but 2 registrations were processed',
+					'event_espresso'
+				),
+				$this->checkout->total_ticket_count,
+				$registrations_processed
+			);
+		}
+		EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
+		return false;
+	}
+
+
+	/**
+	 *    update_reg_step
+	 *    this is the final step after a user  revisits the site to edit their attendee information
+	 *    this gets called AFTER the process_reg_step() method above
+	 *
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function update_reg_step(): bool
+	{
+		// save everything
+		if ($this->process_reg_step()) {
+			$this->checkout->redirect     = true;
+			$this->checkout->redirect_url = add_query_arg(
+				[
+					'e_reg_url_link' => $this->checkout->reg_url_link,
+					'revisit'        => true,
+				],
+				$this->checkout->thank_you_page_url
+			);
+			$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
+			return true;
+		}
+		return false;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -53,11 +53,11 @@ 
 
     public function translate_js_strings()
     {
-        EE_Registry::$i18n_js_strings['required_field']            = esc_html__(
+        EE_Registry::$i18n_js_strings['required_field'] = esc_html__(
             ' is a required question.',
             'event_espresso'
         );
-        EE_Registry::$i18n_js_strings['required_multi_field']      = esc_html__(
+        EE_Registry::$i18n_js_strings['required_multi_field'] = esc_html__(
             ' is a required question. Please enter a value for at least one of the options.',
             'event_espresso'
         );
@@ -65,7 +65,7 @@ 
             'Please answer all required questions correctly before proceeding.',
             'event_espresso'
         );
-        EE_Registry::$i18n_js_strings['attendee_info_copied']      = sprintf(
+        EE_Registry::$i18n_js_strings['attendee_info_copied'] = sprintf(
             esc_html_x(
                 'The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.',
                 'The attendee information was successfully copied.(line break)Please ensure the rest of the registration form is completed before proceeding.',
@@ -73,11 +73,11 @@ 
             ),
             '<br/>'
         );
-        EE_Registry::$i18n_js_strings['attendee_info_copy_error']  = esc_html__(
+        EE_Registry::$i18n_js_strings['attendee_info_copy_error'] = esc_html__(
             'An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.',
             'event_espresso'
         );
-        EE_Registry::$i18n_js_strings['enter_valid_email']         = esc_html__(
+        EE_Registry::$i18n_js_strings['enter_valid_email'] = esc_html__(
             'You must enter a valid email address.',
             'event_espresso'
         );
@@ -322,7 +322,7 @@ 
         if (empty($valid_data)) {
             return $this->inValidDataError();
         }
-        if (! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
+        if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
             return $this->inValidTransactionError();
         }
         // get cached registrations
@@ -334,14 +334,14 @@ 
         /** @var RegFormHandler $reg_form_handler */
         $reg_form_handler = LoaderFactory::getNew(RegFormHandler::class, [$this->checkout]);
         // extract attendee info from form data and save to model objects
-        if (! $reg_form_handler->processRegistrations($registrations, $valid_data)) {
+        if ( ! $reg_form_handler->processRegistrations($registrations, $valid_data)) {
             // return immediately if the previous step exited early due to errors
             return false;
         }
         // if first pass thru SPCO,
         // then let's check processed registrations against the total number of tickets in the cart
         $registrations_processed = $reg_form_handler->attendeeCount();
-        if (! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
+        if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
             return $this->registrationProcessingError($registrations_processed);
         }
         // mark this reg step as completed
@@ -408,7 +408,7 @@ 
                 '(line break)This can sometimes happen if too much time has been taken to complete the registration process.(line break)Please return to the (link)Event List(end link) and reselect your tickets. If the problem continues, please contact the site administrator.',
                 'event_espresso'
             ),
-            '<a href="' . get_post_type_archive_link('espresso_events') . '" >',
+            '<a href="'.get_post_type_archive_link('espresso_events').'" >',
             '</a>',
             '<br />'
         );