eventespresso / event-espresso-core

caffeinated/core/libraries/messages/message_type/payment_declined/EE_Payment_Declined_message_type.class.php

Indentation +45 added lines, -45 removed lines

@@ -15,49 +15,49 @@
 class EE_Payment_Declined_message_type extends EE_Payment_Base_message_type
 {
 
-    public function __construct()
-    {
-
-        // setup type details for reference
-        $this->name = 'payment_declined';
-        $this->description = esc_html__('This message type is used for all declined payment notification messages that go out including any manual payments entered by an event administrator.', 'event_espresso');
-        $this->label = array(
-            'singular' => esc_html__('payment declined', 'event_espresso'),
-            'plural' => esc_html__('payments declined', 'event_espresso')
-            );
-
-        $this->_master_templates = array(
-            'email' => 'payment'
-            );
-
-        parent::__construct();
-    }
-
-
-    /**
-     * _set_contexts
-     * This sets up the contexts associated with the message_type
-     *
-     * @access  protected
-     * @return  void
-     */
-    protected function _set_contexts()
-    {
-        $this->_context_label = array(
-            'label' => esc_html__('recipient', 'event_espresso'),
-            'plural' => esc_html__('recipients', 'event_espresso'),
-            'description' => esc_html__('Recipient\'s are who will receive the template.  You may want different payment details sent out depending on who the recipient is', 'event_espresso')
-            );
-
-        $this->_contexts = array(
-            'admin' => array(
-                'label' => esc_html__('Event Admin', 'event_espresso'),
-                'description' => esc_html__('This template is what event administrators will receive when payment is declined', 'event_espresso')
-                ),
-            'primary_attendee' => array(
-                'label' => esc_html__('Primary Registrant', 'event_espresso'),
-                'description' => esc_html__('This template is what the primary registrant (the person who made the main registration) will receive when the payment is declined', 'event_espresso')
-                )
-            );
-    }
+	public function __construct()
+	{
+
+		// setup type details for reference
+		$this->name = 'payment_declined';
+		$this->description = esc_html__('This message type is used for all declined payment notification messages that go out including any manual payments entered by an event administrator.', 'event_espresso');
+		$this->label = array(
+			'singular' => esc_html__('payment declined', 'event_espresso'),
+			'plural' => esc_html__('payments declined', 'event_espresso')
+			);
+
+		$this->_master_templates = array(
+			'email' => 'payment'
+			);
+
+		parent::__construct();
+	}
+
+
+	/**
+	 * _set_contexts
+	 * This sets up the contexts associated with the message_type
+	 *
+	 * @access  protected
+	 * @return  void
+	 */
+	protected function _set_contexts()
+	{
+		$this->_context_label = array(
+			'label' => esc_html__('recipient', 'event_espresso'),
+			'plural' => esc_html__('recipients', 'event_espresso'),
+			'description' => esc_html__('Recipient\'s are who will receive the template.  You may want different payment details sent out depending on who the recipient is', 'event_espresso')
+			);
+
+		$this->_contexts = array(
+			'admin' => array(
+				'label' => esc_html__('Event Admin', 'event_espresso'),
+				'description' => esc_html__('This template is what event administrators will receive when payment is declined', 'event_espresso')
+				),
+			'primary_attendee' => array(
+				'label' => esc_html__('Primary Registrant', 'event_espresso'),
+				'description' => esc_html__('This template is what the primary registrant (the person who made the main registration) will receive when the payment is declined', 'event_espresso')
+				)
+			);
+	}
 }

caffeinated/payment_methods/Paypal_Pro/forms/PayPalProSettingsForm.php

Indentation +24 added lines, -24 removed lines

@@ -18,30 +18,30 @@
  */
 class PayPalProSettingsForm extends PayPalSettingsForm
 {
-    /**
-     * SettingsForm constructor.
-     *
-     * @param array $options_array
-     * @param string $help_tab_link
-     */
-    public function __construct(array $options_array = array(), $help_tab_link = '')
-    {
-        $options_array = array_replace_recursive(
-            array(
-                'extra_meta_inputs' => array(
-                    'credit_card_types' => new EE_Checkbox_Multi_Input(
-                        EE_PMT_Paypal_Pro::card_types_supported(),
-                        array(
-                            'html_label_text' => esc_html__('Card Types Supported', 'event_espresso'),
-                            'required' => true
-                        )
-                    ),
-                )
-            ),
-            $options_array
-        );
-        parent::__construct($options_array, $help_tab_link);
-    }
+	/**
+	 * SettingsForm constructor.
+	 *
+	 * @param array $options_array
+	 * @param string $help_tab_link
+	 */
+	public function __construct(array $options_array = array(), $help_tab_link = '')
+	{
+		$options_array = array_replace_recursive(
+			array(
+				'extra_meta_inputs' => array(
+					'credit_card_types' => new EE_Checkbox_Multi_Input(
+						EE_PMT_Paypal_Pro::card_types_supported(),
+						array(
+							'html_label_text' => esc_html__('Card Types Supported', 'event_espresso'),
+							'required' => true
+						)
+					),
+				)
+			),
+			$options_array
+		);
+		parent::__construct($options_array, $help_tab_link);
+	}
 }
 // End of file SettingsForm.php
 // Location: EventEspresso/caffeinated/payment_methods/PayPal_Pro/forms/PayPalProSettingsForm.php

caffeinated/payment_methods/Aim/EE_PMT_Aim.pm.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
      */
     protected function _setup_properties()
     {
-        require_once($this->file_folder() . 'EEG_Aim.gateway.php');
+        require_once($this->file_folder().'EEG_Aim.gateway.php');
         $this->_gateway = new EEG_Aim();
         $this->_pretty_name = esc_html__("Authorize.net AIM", 'event_espresso');
         $this->_default_description = esc_html__('Please provide the following billing information.', 'event_espresso');
@@ -128,13 +128,13 @@ 
                 $billing_form->get_input('cvv')->set_default('123');
             }
             $billing_form->add_subsections(
-                array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
+                array('fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html()),
                 'credit_card'
             );
             $billing_form->add_subsections(
                 array(
                     'debug_content' => new EE_Form_Section_HTML_From_Template(
-                        __DIR__ . '/templates/authorize_net_aim_debug_info.template.php'
+                        __DIR__.'/templates/authorize_net_aim_debug_info.template.php'
                     )
                 ),
                 'first_name'
@@ -189,7 +189,7 @@ 
                             'html_label_text' => sprintf(esc_html__("Required Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
                             'default' => array_diff(
                                 array_keys($billing_input_names),
-                                array( 'address2', 'phone', 'company', 'fax' )
+                                array('address2', 'phone', 'company', 'fax')
                             ),
                             'html_help_text' => esc_html__('Note: if fields are excluded they cannot be required.', 'event_espresso')
                         )
@@ -234,7 +234,7 @@ 
     {
         $all_billing_values_empty = array();
         foreach (array_keys($this->billing_input_names()) as $input_name) {
-            $all_billing_values_empty[ $input_name ] = '';
+            $all_billing_values_empty[$input_name] = '';
         }
         return array_merge(
             $all_billing_values_empty,

Indentation +245 added lines, -245 removed lines

@@ -10,266 +10,266 @@
  */
 class EE_PMT_Aim extends EE_PMT_Base
 {
-    /**
-     * @param EE_Payment_Method|null $pm_instance
-     * @throws ReflectionException
-     * @throws EE_Error
-     */
-    public function __construct($pm_instance = null)
-    {
-        $this->_setup_properties();
-        parent::__construct($pm_instance);
-    }
+	/**
+	 * @param EE_Payment_Method|null $pm_instance
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 */
+	public function __construct($pm_instance = null)
+	{
+		$this->_setup_properties();
+		parent::__construct($pm_instance);
+	}
 
-    /**
-     * Sets up payment method type properties for this gateway, which is normally
-     * done in the constructor, but we want this to be easy for similar gateways to override
-     * while still calling the parent constructor.
-     * So children should override this method instead of __construct
-     */
-    protected function _setup_properties()
-    {
-        require_once($this->file_folder() . 'EEG_Aim.gateway.php');
-        $this->_gateway = new EEG_Aim();
-        $this->_pretty_name = esc_html__("Authorize.net AIM", 'event_espresso');
-        $this->_default_description = esc_html__('Please provide the following billing information.', 'event_espresso');
-        $this->_requires_https = true;
-    }
+	/**
+	 * Sets up payment method type properties for this gateway, which is normally
+	 * done in the constructor, but we want this to be easy for similar gateways to override
+	 * while still calling the parent constructor.
+	 * So children should override this method instead of __construct
+	 */
+	protected function _setup_properties()
+	{
+		require_once($this->file_folder() . 'EEG_Aim.gateway.php');
+		$this->_gateway = new EEG_Aim();
+		$this->_pretty_name = esc_html__("Authorize.net AIM", 'event_espresso');
+		$this->_default_description = esc_html__('Please provide the following billing information.', 'event_espresso');
+		$this->_requires_https = true;
+	}
 
 
 
-    /**
-     * Creates the billing form for this payment method type
-     *
-     * @param EE_Transaction|null $transaction
-     * @return EE_Billing_Info_Form|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null)
-    {
-        $billing_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance, array(
-            'name' => 'AIM_Form',
-            'subsections' => array(
-                'credit_card' => new EE_Credit_Card_Input(array(
-                    'required' => true,
-                    'html_label_text' => esc_html__('Card Number', 'event_espresso')
-                )),
-                'exp_month' => new EE_Credit_Card_Month_Input(true, array(
-                    'required' => true,
-                    'html_label_text' => esc_html__('Expiry Month', 'event_espresso')
-                )),
-                'exp_year' => new EE_Credit_Card_Year_Input(array(
-                    'required' => true,
-                    'html_label_text' => esc_html__('Expiry Year', 'event_espresso')
-                )),
-                'cvv' => new EE_CVV_Input(array(
-                    'required' => true,
-                    'html_label_text' => esc_html__('CVV', 'event_espresso') )),
-            )
-        ));
-        $billing_form->add_subsections(array(
-            'company' => new EE_Text_Input(array(
-                'html_label_text' => esc_html__('Company', 'event_espresso')
-            ))
-        ), 'email', false);
-        $billing_form->add_subsections(
-            array(
-                    'fax' => new EE_Text_Input(array(
-                        'html_label_text' => esc_html__('Fax', 'event_espresso')
-                    ))
-                ),
-            'phone',
-            false
-        );
-        $settings_form = $this->settings_form();
-        if ($settings_form->get_input('excluded_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
-                $billing_form->exclude($settings_form->get_input('excluded_billing_inputs')->normalized_value());
-        }
-        if ($settings_form->get_input('required_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
-            $required_inputs = $settings_form->get_input('required_billing_inputs')->normalized_value();
-            // only change the requirement of inputs which are allowed to be changed
-            /** @var EE_Form_Input_Base[] $inputs_to_evaluate */
-            $inputs_to_evaluate = array_intersect_key(
-                $billing_form->inputs(),
-                $this->billing_input_names()
-            );
-            foreach ($inputs_to_evaluate as $input_name => $input) {
-                if (in_array($input_name, $required_inputs)) {
-                    $input->set_required(true);
-                } else {
-                    $input->set_required(false);
-                }
-            }
-        }
-        return $this->apply_billing_form_debug_settings($billing_form);
-    }
+	/**
+	 * Creates the billing form for this payment method type
+	 *
+	 * @param EE_Transaction|null $transaction
+	 * @return EE_Billing_Info_Form|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null)
+	{
+		$billing_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance, array(
+			'name' => 'AIM_Form',
+			'subsections' => array(
+				'credit_card' => new EE_Credit_Card_Input(array(
+					'required' => true,
+					'html_label_text' => esc_html__('Card Number', 'event_espresso')
+				)),
+				'exp_month' => new EE_Credit_Card_Month_Input(true, array(
+					'required' => true,
+					'html_label_text' => esc_html__('Expiry Month', 'event_espresso')
+				)),
+				'exp_year' => new EE_Credit_Card_Year_Input(array(
+					'required' => true,
+					'html_label_text' => esc_html__('Expiry Year', 'event_espresso')
+				)),
+				'cvv' => new EE_CVV_Input(array(
+					'required' => true,
+					'html_label_text' => esc_html__('CVV', 'event_espresso') )),
+			)
+		));
+		$billing_form->add_subsections(array(
+			'company' => new EE_Text_Input(array(
+				'html_label_text' => esc_html__('Company', 'event_espresso')
+			))
+		), 'email', false);
+		$billing_form->add_subsections(
+			array(
+					'fax' => new EE_Text_Input(array(
+						'html_label_text' => esc_html__('Fax', 'event_espresso')
+					))
+				),
+			'phone',
+			false
+		);
+		$settings_form = $this->settings_form();
+		if ($settings_form->get_input('excluded_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
+				$billing_form->exclude($settings_form->get_input('excluded_billing_inputs')->normalized_value());
+		}
+		if ($settings_form->get_input('required_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
+			$required_inputs = $settings_form->get_input('required_billing_inputs')->normalized_value();
+			// only change the requirement of inputs which are allowed to be changed
+			/** @var EE_Form_Input_Base[] $inputs_to_evaluate */
+			$inputs_to_evaluate = array_intersect_key(
+				$billing_form->inputs(),
+				$this->billing_input_names()
+			);
+			foreach ($inputs_to_evaluate as $input_name => $input) {
+				if (in_array($input_name, $required_inputs)) {
+					$input->set_required(true);
+				} else {
+					$input->set_required(false);
+				}
+			}
+		}
+		return $this->apply_billing_form_debug_settings($billing_form);
+	}
 
 
-    /**
-     * apply_billing_form_debug_settings
-     * applies debug data to the form
-     *
-     * @param EE_Billing_Info_Form $billing_form
-     * @return EE_Billing_Info_Form|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form)
-    {
-        if (
-            $this->_pm_instance->debug_mode()
-            || $this->_pm_instance->get_extra_meta('test_transactions', true, false)
-        ) {
-            $billing_form->get_input('credit_card')->set_default('4007000000027');
-            $billing_form->get_input('exp_year')->set_default('2020');
-            if ($billing_form->get_subsection('cvv') instanceof EE_Form_Input_Base) {
-                $billing_form->get_input('cvv')->set_default('123');
-            }
-            $billing_form->add_subsections(
-                array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
-                'credit_card'
-            );
-            $billing_form->add_subsections(
-                array(
-                    'debug_content' => new EE_Form_Section_HTML_From_Template(
-                        __DIR__ . '/templates/authorize_net_aim_debug_info.template.php'
-                    )
-                ),
-                'first_name'
-            );
-        }
-        return $billing_form;
-    }
+	/**
+	 * apply_billing_form_debug_settings
+	 * applies debug data to the form
+	 *
+	 * @param EE_Billing_Info_Form $billing_form
+	 * @return EE_Billing_Info_Form|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form)
+	{
+		if (
+			$this->_pm_instance->debug_mode()
+			|| $this->_pm_instance->get_extra_meta('test_transactions', true, false)
+		) {
+			$billing_form->get_input('credit_card')->set_default('4007000000027');
+			$billing_form->get_input('exp_year')->set_default('2020');
+			if ($billing_form->get_subsection('cvv') instanceof EE_Form_Input_Base) {
+				$billing_form->get_input('cvv')->set_default('123');
+			}
+			$billing_form->add_subsections(
+				array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
+				'credit_card'
+			);
+			$billing_form->add_subsections(
+				array(
+					'debug_content' => new EE_Form_Section_HTML_From_Template(
+						__DIR__ . '/templates/authorize_net_aim_debug_info.template.php'
+					)
+				),
+				'first_name'
+			);
+		}
+		return $billing_form;
+	}
 
 
 
-    /**
-     * Gets the form for all the settings related to this payment method type
-     *
-     * @return EE_Payment_Method_Form
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function generate_new_settings_form()
-    {
-        $billing_input_names = $this->billing_input_names();
-        return new EE_Payment_Method_Form(
-            array(
-                'extra_meta_inputs' => array(
-                    'login_id' => new EE_Text_Input(
-                        array(
-                            'html_label_text' =>  sprintf(esc_html__("Authorize.net API Login ID %s", "event_espresso"), $this->get_help_tab_link()),
-                            'required' => true )
-                    ),
-                    'transaction_key' => new EE_Text_Input(
-                        array(
-                            'html_label_text' => sprintf(esc_html__("Authorize.net Transaction Key %s", "event_espresso"), $this->get_help_tab_link()),
-                            'required' => true )
-                    ),
-                    'test_transactions' => new EE_Yes_No_Input(
-                        array(
-                            'html_label_text' =>  sprintf(esc_html__("Send test transactions? %s", 'event_espresso'), $this->get_help_tab_link()),
-                            'html_help_text' =>  esc_html__("Send test transactions, even to live server", 'event_espresso'),
-                            'default' => false,
-                            'required' => true
-                        )
-                    ),
-                    'excluded_billing_inputs' => new EE_Checkbox_Multi_Input(
-                        $billing_input_names,
-                        array(
-                        'html_label_text' => sprintf(esc_html__("Excluded Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
-                        'default' => array(
-                            'company',
-                            'fax',
-                        )
-                        )
-                    ),
-                    'required_billing_inputs' => new EE_Checkbox_Multi_Input(
-                        $billing_input_names,
-                        array(
-                            'html_label_text' => sprintf(esc_html__("Required Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
-                            'default' => array_diff(
-                                array_keys($billing_input_names),
-                                array( 'address2', 'phone', 'company', 'fax' )
-                            ),
-                            'html_help_text' => esc_html__('Note: if fields are excluded they cannot be required.', 'event_espresso')
-                        )
-                    ),
-                )
-            )
-        );
-    }
+	/**
+	 * Gets the form for all the settings related to this payment method type
+	 *
+	 * @return EE_Payment_Method_Form
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function generate_new_settings_form()
+	{
+		$billing_input_names = $this->billing_input_names();
+		return new EE_Payment_Method_Form(
+			array(
+				'extra_meta_inputs' => array(
+					'login_id' => new EE_Text_Input(
+						array(
+							'html_label_text' =>  sprintf(esc_html__("Authorize.net API Login ID %s", "event_espresso"), $this->get_help_tab_link()),
+							'required' => true )
+					),
+					'transaction_key' => new EE_Text_Input(
+						array(
+							'html_label_text' => sprintf(esc_html__("Authorize.net Transaction Key %s", "event_espresso"), $this->get_help_tab_link()),
+							'required' => true )
+					),
+					'test_transactions' => new EE_Yes_No_Input(
+						array(
+							'html_label_text' =>  sprintf(esc_html__("Send test transactions? %s", 'event_espresso'), $this->get_help_tab_link()),
+							'html_help_text' =>  esc_html__("Send test transactions, even to live server", 'event_espresso'),
+							'default' => false,
+							'required' => true
+						)
+					),
+					'excluded_billing_inputs' => new EE_Checkbox_Multi_Input(
+						$billing_input_names,
+						array(
+						'html_label_text' => sprintf(esc_html__("Excluded Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
+						'default' => array(
+							'company',
+							'fax',
+						)
+						)
+					),
+					'required_billing_inputs' => new EE_Checkbox_Multi_Input(
+						$billing_input_names,
+						array(
+							'html_label_text' => sprintf(esc_html__("Required Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
+							'default' => array_diff(
+								array_keys($billing_input_names),
+								array( 'address2', 'phone', 'company', 'fax' )
+							),
+							'html_help_text' => esc_html__('Note: if fields are excluded they cannot be required.', 'event_espresso')
+						)
+					),
+				)
+			)
+		);
+	}
 
-    /**
-     * Returns an array where keys are the slugs for billing inputs, and values
-     * are their i18n names
-     * @return array
-     */
-    public function billing_input_names()
-    {
-        return array(
-            'first_name' => esc_html__('First Name', 'event_espresso'),
-            'last_name' => esc_html__('Last Name', 'event_espresso'),
-            'email' => esc_html__('Email', 'event_espresso'),
-            'company' => esc_html__('Company', 'event_espresso'),
-            'address' => esc_html__('Address', 'event_espresso'),
-            'address2' => esc_html__('Address2', 'event_espresso'),
-            'city' => esc_html__('City', 'event_espresso'),
-            'state' => esc_html__('State', 'event_espresso'),
-            'country' => esc_html__('Country', 'event_espresso'),
-            'zip' =>  esc_html__('Zip', 'event_espresso'),
-            'phone' => esc_html__('Phone', 'event_espresso'),
-            'fax' => esc_html__('Fax', 'event_espresso'),
-            'cvv' => esc_html__('CVV', 'event_espresso')
-        );
-    }
+	/**
+	 * Returns an array where keys are the slugs for billing inputs, and values
+	 * are their i18n names
+	 * @return array
+	 */
+	public function billing_input_names()
+	{
+		return array(
+			'first_name' => esc_html__('First Name', 'event_espresso'),
+			'last_name' => esc_html__('Last Name', 'event_espresso'),
+			'email' => esc_html__('Email', 'event_espresso'),
+			'company' => esc_html__('Company', 'event_espresso'),
+			'address' => esc_html__('Address', 'event_espresso'),
+			'address2' => esc_html__('Address2', 'event_espresso'),
+			'city' => esc_html__('City', 'event_espresso'),
+			'state' => esc_html__('State', 'event_espresso'),
+			'country' => esc_html__('Country', 'event_espresso'),
+			'zip' =>  esc_html__('Zip', 'event_espresso'),
+			'phone' => esc_html__('Phone', 'event_espresso'),
+			'fax' => esc_html__('Fax', 'event_espresso'),
+			'cvv' => esc_html__('CVV', 'event_espresso')
+		);
+	}
 
-    /**
-     * Overrides parent so we always have all billing inputs in the returned array,
-     * not just the ones included at the time. This helps simplify the gateway code
-     *
-     * @param EE_Billing_Info_Form|null $billing_form
-     * @return array
-     */
-    protected function _get_billing_values_from_form($billing_form)
-    {
-        $all_billing_values_empty = array();
-        foreach (array_keys($this->billing_input_names()) as $input_name) {
-            $all_billing_values_empty[ $input_name ] = '';
-        }
-        return array_merge(
-            $all_billing_values_empty,
-            parent::_get_billing_values_from_form($billing_form)
-        );
-    }
+	/**
+	 * Overrides parent so we always have all billing inputs in the returned array,
+	 * not just the ones included at the time. This helps simplify the gateway code
+	 *
+	 * @param EE_Billing_Info_Form|null $billing_form
+	 * @return array
+	 */
+	protected function _get_billing_values_from_form($billing_form)
+	{
+		$all_billing_values_empty = array();
+		foreach (array_keys($this->billing_input_names()) as $input_name) {
+			$all_billing_values_empty[ $input_name ] = '';
+		}
+		return array_merge(
+			$all_billing_values_empty,
+			parent::_get_billing_values_from_form($billing_form)
+		);
+	}
 
 
 
-    /**
-     * Adds the help tab
-     *
-     * @return array
-     * @see EE_PMT_Base::help_tabs_config()
-     */
-    public function help_tabs_config()
-    {
-        return array(
-            $this->get_help_tab_name() => array(
-                'title' => esc_html__('Authorize.net AIM Settings', 'event_espresso'),
-                'filename' => 'payment_methods_overview_aim'
-            ),
-        );
-    }
+	/**
+	 * Adds the help tab
+	 *
+	 * @return array
+	 * @see EE_PMT_Base::help_tabs_config()
+	 */
+	public function help_tabs_config()
+	{
+		return array(
+			$this->get_help_tab_name() => array(
+				'title' => esc_html__('Authorize.net AIM Settings', 'event_espresso'),
+				'filename' => 'payment_methods_overview_aim'
+			),
+		);
+	}
 
 
 
-    /**
-     * Gets a list of instructions and/or information regarding how the payment is to be completed
-     * @return string
-     */
-    public function payment_information()
-    {
-        // TODO: Implement payment_information() method.
-    }
+	/**
+	 * Gets a list of instructions and/or information regarding how the payment is to be completed
+	 * @return string
+	 */
+	public function payment_information()
+	{
+		// TODO: Implement payment_information() method.
+	}
 }

modules/feeds/templates/espresso_events_feed.template.php

Spacing +9 added lines, -9 removed lines

@@ -16,17 +16,17 @@
 
 ?>
 <p>
-    <?php esc_html_e('Event Organizer: ', 'event_espresso') . espresso_organization_name($EVT_ID); ?>
+    <?php esc_html_e('Event Organizer: ', 'event_espresso').espresso_organization_name($EVT_ID); ?>
     <br/>
-    <?php esc_html_e('Organizer Email: ', 'event_espresso') . espresso_organization_email($EVT_ID); ?>
+    <?php esc_html_e('Organizer Email: ', 'event_espresso').espresso_organization_email($EVT_ID); ?>
     <br/>
-    <?php esc_html_e('Event Phone: ', 'event_espresso') . espresso_event_phone($EVT_ID); ?>
+    <?php esc_html_e('Event Phone: ', 'event_espresso').espresso_event_phone($EVT_ID); ?>
 </p>
-<p><?php esc_html_e('Event Status: ', 'event_espresso') . espresso_event_status($EVT_ID); ?></p>
-<p><?php esc_html_e('Categories: ', 'event_espresso') . espresso_event_categories($EVT_ID); ?></p>
-<?php esc_html_e('Dates and Times: ', 'event_espresso') . espresso_list_of_event_dates($EVT_ID); ?>
-<?php esc_html_e('Available Tickets: ', 'event_espresso') . espresso_event_tickets_available($EVT_ID); ?>
-<p><?php esc_html_e('Event Venue: ', 'event_espresso') . espresso_venue_name(null, false); ?></p>
-<p><?php esc_html_e('Description: ', 'event_espresso') . $event_description; ?></p>
+<p><?php esc_html_e('Event Status: ', 'event_espresso').espresso_event_status($EVT_ID); ?></p>
+<p><?php esc_html_e('Categories: ', 'event_espresso').espresso_event_categories($EVT_ID); ?></p>
+<?php esc_html_e('Dates and Times: ', 'event_espresso').espresso_list_of_event_dates($EVT_ID); ?>
+<?php esc_html_e('Available Tickets: ', 'event_espresso').espresso_event_tickets_available($EVT_ID); ?>
+<p><?php esc_html_e('Event Venue: ', 'event_espresso').espresso_venue_name(null, false); ?></p>
+<p><?php esc_html_e('Description: ', 'event_espresso').$event_description; ?></p>
 <br/>
  
\ No newline at end of file

modules/feeds/templates/espresso_venues_feed.template.php

Spacing +7 added lines, -7 removed lines

@@ -16,15 +16,15 @@
 
 ?>
 <p>
-    <?php esc_html_e('Organizer Name: ', 'event_espresso') . espresso_organization_name($VNU_ID); ?>
+    <?php esc_html_e('Organizer Name: ', 'event_espresso').espresso_organization_name($VNU_ID); ?>
     <br/>
-    <?php esc_html_e('Organizer Email: ', 'event_espresso') . espresso_organization_email($VNU_ID); ?>
+    <?php esc_html_e('Organizer Email: ', 'event_espresso').espresso_organization_email($VNU_ID); ?>
     <br/>
-    <?php esc_html_e('Venue Phone: ', 'event_espresso') . espresso_venue_phone($VNU_ID); ?>
+    <?php esc_html_e('Venue Phone: ', 'event_espresso').espresso_venue_phone($VNU_ID); ?>
 </p>
-<p><?php esc_html_e('Categories: ', 'event_espresso') . espresso_venue_categories($VNU_ID); ?></p>
-<p><?php esc_html_e('Address: ', 'event_espresso') . espresso_venue_address($VNU_ID); ?></p>
-<p><?php esc_html_e('Website: ', 'event_espresso') . espresso_venue_website($VNU_ID); ?></p>
-<p><?php esc_html_e('Description: ', 'event_espresso') . $venue_description; ?></p>
+<p><?php esc_html_e('Categories: ', 'event_espresso').espresso_venue_categories($VNU_ID); ?></p>
+<p><?php esc_html_e('Address: ', 'event_espresso').espresso_venue_address($VNU_ID); ?></p>
+<p><?php esc_html_e('Website: ', 'event_espresso').espresso_venue_website($VNU_ID); ?></p>
+<p><?php esc_html_e('Description: ', 'event_espresso').$venue_description; ?></p>
 <br/>
  
\ No newline at end of file

modules/invoice/EED_Invoice.module.php

Spacing +2 added lines, -2 removed lines

@@ -55,8 +55,8 @@
      */
     public function run($WP)
     {
-        if (is_readable(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php')) {
-            require_once(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php');
+        if (is_readable(EE_MODULES.'gateways/Invoice/lib/Invoice.class.php')) {
+            require_once(EE_MODULES.'gateways/Invoice/lib/Invoice.class.php');
         } else {
             $msg = esc_html__('The Invoice.class.php file could not be loaded.', 'event_espresso');
             EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);

Indentation +77 added lines, -77 removed lines

@@ -10,91 +10,91 @@
  */
 class EED_Invoice extends EED_Module
 {
-    /**
-     * @return EED_Invoice|EED_Module
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
+	/**
+	 * @return EED_Invoice|EED_Module
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
 
 
-    /**
-     *    set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks()
-    {
-        EED_Module::registerRoute('download_invoice', 'EED_Invoice', 'download_invoice');
-        EED_Module::registerRoute('launch_invoice', 'EED_Invoice', 'launch_invoice');
-    }
+	/**
+	 *    set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+		EED_Module::registerRoute('download_invoice', 'EED_Invoice', 'download_invoice');
+		EED_Module::registerRoute('launch_invoice', 'EED_Invoice', 'launch_invoice');
+	}
 
 
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-    }
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+	}
 
 
-    /**
-     *    run - initial module setup
-     *
-     * @access    public
-     * @return    void
-     */
-    public function run($WP)
-    {
-        if (is_readable(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php')) {
-            require_once(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php');
-        } else {
-            $msg = esc_html__('The Invoice.class.php file could not be loaded.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-    }
+	/**
+	 *    run - initial module setup
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function run($WP)
+	{
+		if (is_readable(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php')) {
+			require_once(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php');
+		} else {
+			$msg = esc_html__('The Invoice.class.php file could not be loaded.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+	}
 
 
-    /**
-     *    invoice_launch
-     *
-     * @access    public
-     * @return    void
-     */
-    public function launch_invoice()
-    {
-        $this->run(null);
-        $request = self::getRequest();
-        if ($request->requestParamIsSet('id')) {
-            $id = $request->getRequestParam('id', '', 'key');
-            $invoice = new Invoice($id);
-            $invoice->send_invoice();
-        }
-    }
+	/**
+	 *    invoice_launch
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function launch_invoice()
+	{
+		$this->run(null);
+		$request = self::getRequest();
+		if ($request->requestParamIsSet('id')) {
+			$id = $request->getRequestParam('id', '', 'key');
+			$invoice = new Invoice($id);
+			$invoice->send_invoice();
+		}
+	}
 
 
-    /**
-     *    download_invoice
-     *
-     * @access    public
-     * @return    void
-     */
-    public function download_invoice()
-    {
-        $this->run(null);
-        $request = self::getRequest();
-        if ($request->requestParamIsSet('id')) {
-            $id = $request->getRequestParam('id', '', 'key');
-            $invoice = new Invoice($id);
-            // send invoice but force download
-            $invoice->send_invoice(true);
-        }
-    }
+	/**
+	 *    download_invoice
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function download_invoice()
+	{
+		$this->run(null);
+		$request = self::getRequest();
+		if ($request->requestParamIsSet('id')) {
+			$id = $request->getRequestParam('id', '', 'key');
+			$invoice = new Invoice($id);
+			// send invoice but force download
+			$invoice->send_invoice(true);
+		}
+	}
 }

modules/single_page_checkout/reg_steps/finalize_registration/EE_SPCO_Reg_Step_Finalize_Registration.class.php

Spacing +3 added lines, -3 removed lines

@@ -98,7 +98,7 @@ 
             $txn_update_params
         );
         // check if transaction has a primary registrant and that it has a related Attendee object
-        if (! $this->_validate_primary_registrant()) {
+        if ( ! $this->_validate_primary_registrant()) {
             return false;
         }
         // you don't have to go home but you can't stay here !
@@ -229,7 +229,7 @@ 
      */
     protected function _validate_primary_registrant()
     {
-        if (! $this->checkout->transaction_has_primary_registrant()) {
+        if ( ! $this->checkout->transaction_has_primary_registrant()) {
             EE_Error::add_error(
                 esc_html__('A valid Primary Registration for this Transaction could not be found.', 'event_espresso'),
                 __FILE__,
@@ -255,7 +255,7 @@ 
     public function update_reg_step()
     {
         EE_Error::doing_it_wrong(
-            __CLASS__ . '::' . __FILE__,
+            __CLASS__.'::'.__FILE__,
             esc_html__(
                 'Can not call update_reg_step() on the Finalize Registration reg step.',
                 'event_espresso'

Indentation +228 added lines, -228 removed lines

@@ -14,252 +14,252 @@
  */
 class EE_SPCO_Reg_Step_Finalize_Registration extends EE_SPCO_Reg_Step
 {
-    /**
-     *    class constructor
-     *
-     * @access    public
-     * @param EE_Checkout $checkout
-     */
-    public function __construct(EE_Checkout $checkout)
-    {
-        $this->request             = EED_Single_Page_Checkout::getRequest();
-        $this->_slug               = 'finalize_registration';
-        $this->_name               = esc_html__('Finalize Registration', 'event_espresso');
-        $this->_submit_button_text = $this->_name;
-        $this->_template           = '';
-        $this->checkout            = $checkout;
-    }
+	/**
+	 *    class constructor
+	 *
+	 * @access    public
+	 * @param EE_Checkout $checkout
+	 */
+	public function __construct(EE_Checkout $checkout)
+	{
+		$this->request             = EED_Single_Page_Checkout::getRequest();
+		$this->_slug               = 'finalize_registration';
+		$this->_name               = esc_html__('Finalize Registration', 'event_espresso');
+		$this->_submit_button_text = $this->_name;
+		$this->_template           = '';
+		$this->checkout            = $checkout;
+	}
 
 
-    public function translate_js_strings()
-    {
-    }
+	public function translate_js_strings()
+	{
+	}
 
 
-    public function enqueue_styles_and_scripts()
-    {
-    }
+	public function enqueue_styles_and_scripts()
+	{
+	}
 
 
-    /**
-     * @return boolean
-     */
-    public function initialize_reg_step()
-    {
-        // there's actually no reg form to process if this is the final step
-        if ($this->is_current_step()) {
-            $this->checkout->step              = $this->slug();
-            $this->checkout->action            = 'process_reg_step';
-            $this->checkout->generate_reg_form = false;
-            $this->request->setRequestParam('step', $this->checkout->step);
-            $this->request->setRequestParam('action', $this->checkout->action);
-        }
-        return true;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function initialize_reg_step()
+	{
+		// there's actually no reg form to process if this is the final step
+		if ($this->is_current_step()) {
+			$this->checkout->step              = $this->slug();
+			$this->checkout->action            = 'process_reg_step';
+			$this->checkout->generate_reg_form = false;
+			$this->request->setRequestParam('step', $this->checkout->step);
+			$this->request->setRequestParam('action', $this->checkout->action);
+		}
+		return true;
+	}
 
 
-    /**
-     * @return string
-     */
-    public function generate_reg_form()
-    {
-        // create empty form so that things don't break
-        $this->reg_form = new EE_Form_Section_Proper();
-        return '';
-    }
+	/**
+	 * @return string
+	 */
+	public function generate_reg_form()
+	{
+		// create empty form so that things don't break
+		$this->reg_form = new EE_Form_Section_Proper();
+		return '';
+	}
 
 
-    /**
-     * @return boolean
-     * @throws RuntimeException
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function process_reg_step()
-    {
-        // ensure all data gets refreshed from the db
-        $this->checkout->refresh_all_entities(true);
-        // ensures that all details and statuses for transaction, registration, and payments are updated
-        $txn_update_params = $this->_finalize_transaction();
-        // maybe send messages
-        $this->_set_notification_triggers();
-        // send messages
-        /** @type EE_Registration_Processor $registration_processor */
-        $registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
-        $registration_processor->trigger_registration_update_notifications(
-            $this->checkout->transaction->primary_registration(),
-            $txn_update_params
-        );
-        // set a hook point
-        do_action(
-            'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed',
-            $this->checkout,
-            $txn_update_params
-        );
-        // check if transaction has a primary registrant and that it has a related Attendee object
-        if (! $this->_validate_primary_registrant()) {
-            return false;
-        }
-        // you don't have to go home but you can't stay here !
-        $this->checkout->redirect     = true;
-        $this->checkout->continue_reg = true;
-        $this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
-        if (
-            ! (
-            $this->checkout->payment_method instanceof EE_Payment_Method
-            && $this->checkout->payment_method->is_off_site()
-            )
-        ) {
-            // mark this reg step as completed
-            $this->set_completed();
-        }
-        $this->checkout->set_exit_spco();
-        return true;
-    }
+	/**
+	 * @return boolean
+	 * @throws RuntimeException
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function process_reg_step()
+	{
+		// ensure all data gets refreshed from the db
+		$this->checkout->refresh_all_entities(true);
+		// ensures that all details and statuses for transaction, registration, and payments are updated
+		$txn_update_params = $this->_finalize_transaction();
+		// maybe send messages
+		$this->_set_notification_triggers();
+		// send messages
+		/** @type EE_Registration_Processor $registration_processor */
+		$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
+		$registration_processor->trigger_registration_update_notifications(
+			$this->checkout->transaction->primary_registration(),
+			$txn_update_params
+		);
+		// set a hook point
+		do_action(
+			'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed',
+			$this->checkout,
+			$txn_update_params
+		);
+		// check if transaction has a primary registrant and that it has a related Attendee object
+		if (! $this->_validate_primary_registrant()) {
+			return false;
+		}
+		// you don't have to go home but you can't stay here !
+		$this->checkout->redirect     = true;
+		$this->checkout->continue_reg = true;
+		$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
+		if (
+			! (
+			$this->checkout->payment_method instanceof EE_Payment_Method
+			&& $this->checkout->payment_method->is_off_site()
+			)
+		) {
+			// mark this reg step as completed
+			$this->set_completed();
+		}
+		$this->checkout->set_exit_spco();
+		return true;
+	}
 
 
-    /**
-     * _finalize_transaction
-     * ensures that all details and statuses for transaction, registration, and payments are updated
-     *
-     * @return array
-     * @throws RuntimeException
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _finalize_transaction()
-    {
-        /** @type EE_Transaction_Processor $transaction_processor */
-        $transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
-        // set revisit flag in txn processor
-        $transaction_processor->set_revisit($this->checkout->revisit);
-        // at this point we'll consider a TXN to not have been abandoned
-        $this->checkout->transaction->toggle_abandoned_transaction_status();
-        if ($this->checkout->cart instanceof EE_Cart) {
-            // save TXN data to the cart
-            $this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn(
-                $this->checkout->transaction->ID()
-            );
-        }
-        // maybe update status, but don't save transaction just yet
-        $this->checkout->transaction->update_status_based_on_total_paid(false);
-        // this will result in the base session properties getting saved to the TXN_Session_data field
-        $session_data = EE_Registry::instance()->SSN->get_session_data(null, true);
-        // anonymize the last part of the IP address, now that the transaction is complete (we won't be using the IP address
-        // for spam or bot detection now)
-        if (function_exists('wp_privacy_anonymize_ip') && isset($session_data['ip_address'])) {
-            $session_data['ip_address'] = wp_privacy_anonymize_ip($session_data['ip_address']);
-        }
-        $this->checkout->transaction->set_txn_session_data($session_data);
-        // update the TXN if payment conditions have changed, but do NOT trigger notifications,
-        // because we will do that in process_reg_step() after setting some more triggers
-        return $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment(
-            $this->checkout->transaction,
-            $this->checkout->payment instanceof EE_Payment ? $this->checkout->payment : null,
-            $this->checkout->reg_cache_where_params,
-            false
-        );
-    }
+	/**
+	 * _finalize_transaction
+	 * ensures that all details and statuses for transaction, registration, and payments are updated
+	 *
+	 * @return array
+	 * @throws RuntimeException
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _finalize_transaction()
+	{
+		/** @type EE_Transaction_Processor $transaction_processor */
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+		// set revisit flag in txn processor
+		$transaction_processor->set_revisit($this->checkout->revisit);
+		// at this point we'll consider a TXN to not have been abandoned
+		$this->checkout->transaction->toggle_abandoned_transaction_status();
+		if ($this->checkout->cart instanceof EE_Cart) {
+			// save TXN data to the cart
+			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn(
+				$this->checkout->transaction->ID()
+			);
+		}
+		// maybe update status, but don't save transaction just yet
+		$this->checkout->transaction->update_status_based_on_total_paid(false);
+		// this will result in the base session properties getting saved to the TXN_Session_data field
+		$session_data = EE_Registry::instance()->SSN->get_session_data(null, true);
+		// anonymize the last part of the IP address, now that the transaction is complete (we won't be using the IP address
+		// for spam or bot detection now)
+		if (function_exists('wp_privacy_anonymize_ip') && isset($session_data['ip_address'])) {
+			$session_data['ip_address'] = wp_privacy_anonymize_ip($session_data['ip_address']);
+		}
+		$this->checkout->transaction->set_txn_session_data($session_data);
+		// update the TXN if payment conditions have changed, but do NOT trigger notifications,
+		// because we will do that in process_reg_step() after setting some more triggers
+		return $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment(
+			$this->checkout->transaction,
+			$this->checkout->payment instanceof EE_Payment ? $this->checkout->payment : null,
+			$this->checkout->reg_cache_where_params,
+			false
+		);
+	}
 
 
-    /**
-     * If request is not a revisit, and an Off-Site gateway using IPNs has NOT been selected...
-     * OR
-     * if it IS a revisit and the TXN and/or one or more REG statuses have changed...
-     * then trigger notifications
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _set_notification_triggers()
-    {
+	/**
+	 * If request is not a revisit, and an Off-Site gateway using IPNs has NOT been selected...
+	 * OR
+	 * if it IS a revisit and the TXN and/or one or more REG statuses have changed...
+	 * then trigger notifications
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _set_notification_triggers()
+	{
 
-        if ($this->checkout->payment_method instanceof EE_Payment_Method) {
-            // let's start with the assumption that we need to trigger notifications
-            // then toggle this to false for conditions where we know we don't need to
-            $deliver_notifications = true;
-            if (
+		if ($this->checkout->payment_method instanceof EE_Payment_Method) {
+			// let's start with the assumption that we need to trigger notifications
+			// then toggle this to false for conditions where we know we don't need to
+			$deliver_notifications = true;
+			if (
 // if SPCO revisit
-                filter_var($this->checkout->revisit, FILTER_VALIDATE_BOOLEAN)
-                // and TXN or REG statuses have NOT changed due to a payment
-                && ! (
-                    $this->checkout->transaction->txn_status_updated()
-                    || $this->checkout->any_reg_status_updated()
-                )
-            ) {
-                $deliver_notifications = false;
-            }
-            if ($this->checkout->payment_method->is_off_site()) {
-                /** @var EE_Gateway $gateway */
-                $gateway = $this->checkout->payment_method->type_obj()->get_gateway();
-                // and the gateway uses a separate request to process the IPN
-                /** @var RequestInterface $request */
-                $request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-                if (
-                    $gateway instanceof EE_Offsite_Gateway
-                    && $gateway->handle_IPN_in_this_request($request->requestParams(), true)
-                ) {
-                    // IPN request will handle triggering notifications
-                    $deliver_notifications = false;
-                    // no really... don't send any notices in this request
-                    remove_all_filters('FHEE__EED_Messages___maybe_registration__deliver_notifications');
-                    add_filter(
-                        'FHEE__EED_Messages___maybe_registration__deliver_notifications',
-                        '__return_false',
-                        15
-                    );
-                }
-            }
-            if ($deliver_notifications) {
-                // send out notifications
-                add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
-            }
-        }
-    }
+				filter_var($this->checkout->revisit, FILTER_VALIDATE_BOOLEAN)
+				// and TXN or REG statuses have NOT changed due to a payment
+				&& ! (
+					$this->checkout->transaction->txn_status_updated()
+					|| $this->checkout->any_reg_status_updated()
+				)
+			) {
+				$deliver_notifications = false;
+			}
+			if ($this->checkout->payment_method->is_off_site()) {
+				/** @var EE_Gateway $gateway */
+				$gateway = $this->checkout->payment_method->type_obj()->get_gateway();
+				// and the gateway uses a separate request to process the IPN
+				/** @var RequestInterface $request */
+				$request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+				if (
+					$gateway instanceof EE_Offsite_Gateway
+					&& $gateway->handle_IPN_in_this_request($request->requestParams(), true)
+				) {
+					// IPN request will handle triggering notifications
+					$deliver_notifications = false;
+					// no really... don't send any notices in this request
+					remove_all_filters('FHEE__EED_Messages___maybe_registration__deliver_notifications');
+					add_filter(
+						'FHEE__EED_Messages___maybe_registration__deliver_notifications',
+						'__return_false',
+						15
+					);
+				}
+			}
+			if ($deliver_notifications) {
+				// send out notifications
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
+			}
+		}
+	}
 
 
-    /**
-     * check if transaction has a primary registrant and that it has a related Attendee object
-     *
-     * @return boolean
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _validate_primary_registrant()
-    {
-        if (! $this->checkout->transaction_has_primary_registrant()) {
-            EE_Error::add_error(
-                esc_html__('A valid Primary Registration for this Transaction could not be found.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            $this->checkout->redirect     = false;
-            $this->checkout->continue_reg = false;
-            return false;
-        }
-        // setup URL for redirect
-        $this->checkout->redirect_url = add_query_arg(
-            ['e_reg_url_link' => $this->checkout->transaction->primary_registration()->reg_url_link()],
-            $this->checkout->thank_you_page_url
-        );
-        return true;
-    }
+	/**
+	 * check if transaction has a primary registrant and that it has a related Attendee object
+	 *
+	 * @return boolean
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _validate_primary_registrant()
+	{
+		if (! $this->checkout->transaction_has_primary_registrant()) {
+			EE_Error::add_error(
+				esc_html__('A valid Primary Registration for this Transaction could not be found.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			$this->checkout->redirect     = false;
+			$this->checkout->continue_reg = false;
+			return false;
+		}
+		// setup URL for redirect
+		$this->checkout->redirect_url = add_query_arg(
+			['e_reg_url_link' => $this->checkout->transaction->primary_registration()->reg_url_link()],
+			$this->checkout->thank_you_page_url
+		);
+		return true;
+	}
 
 
-    /**
-     * @return void
-     */
-    public function update_reg_step()
-    {
-        EE_Error::doing_it_wrong(
-            __CLASS__ . '::' . __FILE__,
-            esc_html__(
-                'Can not call update_reg_step() on the Finalize Registration reg step.',
-                'event_espresso'
-            ),
-            '4.6.0'
-        );
-    }
+	/**
+	 * @return void
+	 */
+	public function update_reg_step()
+	{
+		EE_Error::doing_it_wrong(
+			__CLASS__ . '::' . __FILE__,
+			esc_html__(
+				'Can not call update_reg_step() on the Finalize Registration reg step.',
+				'event_espresso'
+			),
+			'4.6.0'
+		);
+	}
 }

modules/single_page_checkout/reg_steps/attendee_information/auto_copy_attendee_info.template.php

Indentation +6 added lines, -6 removed lines

@@ -1,9 +1,9 @@
 <p id="spco-auto-copy-attendee-pg" class="smaller-text lt-grey-text">
     <?php echo apply_filters(
-        'FHEE__registration_page_attendee_information__auto_copy_attendee_pg',
-        esc_html__(
-            'The above information will be used for any additional tickets/attendees.',
-            'event_espresso'
-        )
-    ); ?>
+		'FHEE__registration_page_attendee_information__auto_copy_attendee_pg',
+		esc_html__(
+			'The above information will be used for any additional tickets/attendees.',
+			'event_espresso'
+		)
+	); ?>
 </p>
\ No newline at end of file

admin_pages/registrations/form_sections/EE_Registration_Custom_Questions_Form.form.php

Indentation +180 added lines, -180 removed lines

@@ -20,198 +20,198 @@
  */
 class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper
 {
-    /**
-     *
-     * @var EE_Registration
-     */
-    protected $_registration = null;
+	/**
+	 *
+	 * @var EE_Registration
+	 */
+	protected $_registration = null;
 
 
-    /**
-     *
-     * @param EE_Registration $reg
-     * @param array           $options
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(EE_Registration $reg, $options = array())
-    {
-        $this->_registration = $reg;
-        if (! isset($options['layout_strategy'])) {
-            $options['layout_strategy'] = new EE_Admin_Two_Column_Layout();
-        }
-        if (! isset($options['html_id'])) {
-            $options['html_id'] = 'reg-admin-attendee-questions-frm';
-        }
-        $this->build_form_from_registration();
-        parent::__construct($options);
-    }
+	/**
+	 *
+	 * @param EE_Registration $reg
+	 * @param array           $options
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(EE_Registration $reg, $options = array())
+	{
+		$this->_registration = $reg;
+		if (! isset($options['layout_strategy'])) {
+			$options['layout_strategy'] = new EE_Admin_Two_Column_Layout();
+		}
+		if (! isset($options['html_id'])) {
+			$options['html_id'] = 'reg-admin-attendee-questions-frm';
+		}
+		$this->build_form_from_registration();
+		parent::__construct($options);
+	}
 
 
-    /**
-     * Gets the registration object this form is about
-     * @return EE_Registration
-     */
-    public function get_registration()
-    {
-        return $this->_registration;
-    }
+	/**
+	 * Gets the registration object this form is about
+	 * @return EE_Registration
+	 */
+	public function get_registration()
+	{
+		return $this->_registration;
+	}
 
-    /**
-     * @since 4.10.0.p
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function build_form_from_registration()
-    {
-        $reg = $this->get_registration();
-        if (! $reg instanceof EE_Registration) {
-            throw new EE_Error(esc_html__('We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso'));
-        }
-        // we want to get all their question groups
-        $question_groups = EEM_Question_Group::instance()->get_all(
-            [
-                [
-                    'Event_Question_Group.EVT_ID' => $reg->event_ID(),
-                    'OR' => [
-                        'Question.QST_system*blank' =>  '',
-                        'Question.QST_system*null' => ['IS_NULL']
-                    ],
-                    'Event_Question_Group.'
-                    . EEM_Event_Question_Group::instance()->fieldNameForContext(
-                        $reg->is_primary_registrant()
-                    ) => true
-                ],
-                'order_by' => ['QSG_order' => 'ASC']
-            ]
-        );
-        // get each question groups questions
-        foreach ($question_groups as $question_group) {
-            if ($question_group instanceof EE_Question_Group) {
-                $this->_subsections[ $question_group->ID() ] = $this->build_subform_from_question_group(
-                    $question_group,
-                    $reg
-                );
-            }
-        }
-    }
+	/**
+	 * @since 4.10.0.p
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function build_form_from_registration()
+	{
+		$reg = $this->get_registration();
+		if (! $reg instanceof EE_Registration) {
+			throw new EE_Error(esc_html__('We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso'));
+		}
+		// we want to get all their question groups
+		$question_groups = EEM_Question_Group::instance()->get_all(
+			[
+				[
+					'Event_Question_Group.EVT_ID' => $reg->event_ID(),
+					'OR' => [
+						'Question.QST_system*blank' =>  '',
+						'Question.QST_system*null' => ['IS_NULL']
+					],
+					'Event_Question_Group.'
+					. EEM_Event_Question_Group::instance()->fieldNameForContext(
+						$reg->is_primary_registrant()
+					) => true
+				],
+				'order_by' => ['QSG_order' => 'ASC']
+			]
+		);
+		// get each question groups questions
+		foreach ($question_groups as $question_group) {
+			if ($question_group instanceof EE_Question_Group) {
+				$this->_subsections[ $question_group->ID() ] = $this->build_subform_from_question_group(
+					$question_group,
+					$reg
+				);
+			}
+		}
+	}
 
 
-    /**
-     *
-     * @param EE_Question_Group $question_group
-     * @param EE_Registration   $registration
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function build_subform_from_question_group($question_group, $registration)
-    {
-        if (
-            ! $question_group instanceof EE_Question_Group ||
-            ! $registration instanceof EE_Registration
-        ) {
-            throw new EE_Error(esc_html__('A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso'));
-        }
-        $parts_of_subsection = array(
-            'title' => new EE_Form_Section_HTML(
-                EEH_HTML::h5(
-                    $question_group->name(),
-                    $question_group->identifier(),
-                    'espresso-question-group-title-h5 section-title'
-                )
-            )
-        );
-        $questions = $question_group->questions(
-            array(
-                array(
-                    'OR' => array(
-                        'QST_system*blank' => '',
-                        'QST_system*null' => array( 'IS_NULL' )
-                    )
-                )
-            )
-        );
-        foreach ($questions as $question) {
-            $parts_of_subsection[ $question->ID() ] = $question->generate_form_input($registration);
-        }
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_edit_registration',
-                'edit-reg-questions-mbox',
-                $this->_registration->ID()
-            )
-        ) {
-            $parts_of_subsection['edit_link'] = new EE_Form_Section_HTML(
-                EEH_HTML::table(
-                    EEH_HTML::tr(
-                        '<th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" aria-label="' . esc_attr__('click to edit question', 'event_espresso') . '">
+	/**
+	 *
+	 * @param EE_Question_Group $question_group
+	 * @param EE_Registration   $registration
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function build_subform_from_question_group($question_group, $registration)
+	{
+		if (
+			! $question_group instanceof EE_Question_Group ||
+			! $registration instanceof EE_Registration
+		) {
+			throw new EE_Error(esc_html__('A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso'));
+		}
+		$parts_of_subsection = array(
+			'title' => new EE_Form_Section_HTML(
+				EEH_HTML::h5(
+					$question_group->name(),
+					$question_group->identifier(),
+					'espresso-question-group-title-h5 section-title'
+				)
+			)
+		);
+		$questions = $question_group->questions(
+			array(
+				array(
+					'OR' => array(
+						'QST_system*blank' => '',
+						'QST_system*null' => array( 'IS_NULL' )
+					)
+				)
+			)
+		);
+		foreach ($questions as $question) {
+			$parts_of_subsection[ $question->ID() ] = $question->generate_form_input($registration);
+		}
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_edit_registration',
+				'edit-reg-questions-mbox',
+				$this->_registration->ID()
+			)
+		) {
+			$parts_of_subsection['edit_link'] = new EE_Form_Section_HTML(
+				EEH_HTML::table(
+					EEH_HTML::tr(
+						'<th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" aria-label="' . esc_attr__('click to edit question', 'event_espresso') . '">
 		  			<span class="reg-admin-edit-question-group-spn">' . esc_html__('edit the above question group', 'event_espresso') . '</span>
 		  			<div class="dashicons dashicons-edit"></div>
 		  		</a></td>'
-                    ) .
-                    EEH_HTML::no_row()
-                )
-            );
-        }
-        return new EE_Form_Section_Proper(
-            array(
-                'subsections' => $parts_of_subsection,
-                'html_class' => 'question-group-questions',
-            )
-        );
-    }
+					) .
+					EEH_HTML::no_row()
+				)
+			);
+		}
+		return new EE_Form_Section_Proper(
+			array(
+				'subsections' => $parts_of_subsection,
+				'html_class' => 'question-group-questions',
+			)
+		);
+	}
 
 
-    /**
-     * Overrides parent so if inputs were disabled, we leave those with their defaults
-     * from the answers in the DB
-     *
-     * @param array $req_data like $_POST
-     * @return void
-     * @throws EE_Error
-     */
-    protected function _normalize($req_data)
-    {
-        $this->_received_submission = true;
-        $this->_validation_errors = array();
-        foreach ($this->get_validatable_subsections() as $subsection) {
-            if ($subsection->form_data_present_in($req_data)) {
-                try {
-                    $subsection->_normalize($req_data);
-                } catch (EE_Validation_Error $e) {
-                    $subsection->add_validation_error($e);
-                }
-            }
-        }
-    }
+	/**
+	 * Overrides parent so if inputs were disabled, we leave those with their defaults
+	 * from the answers in the DB
+	 *
+	 * @param array $req_data like $_POST
+	 * @return void
+	 * @throws EE_Error
+	 */
+	protected function _normalize($req_data)
+	{
+		$this->_received_submission = true;
+		$this->_validation_errors = array();
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ($subsection->form_data_present_in($req_data)) {
+				try {
+					$subsection->_normalize($req_data);
+				} catch (EE_Validation_Error $e) {
+					$subsection->add_validation_error($e);
+				}
+			}
+		}
+	}
 
 
-    /**
-     * Performs validation on this form section and its subsections. For each subsection,
-     * calls _validate_{subsection_name} on THIS form (if the function exists) and passes it the subsection, then calls
-     * _validate on that subsection. If you need to perform validation on the form as a whole (considering multiple)
-     * you would be best to override this _validate method, calling parent::_validate() first.
-     *
-     * @throws EE_Error
-     */
-    protected function _validate()
-    {
-        /** @var RequestInterface $request */
-        $request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-        $form_data = $request->requestParams();
-        foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
-            if ($subsection->form_data_present_in($form_data)) {
-                if (method_exists($this, '_validate_' . $subsection_name)) {
-                    call_user_func_array(array($this,'_validate_' . $subsection_name), array($subsection));
-                }
-                $subsection->_validate();
-            } elseif ($subsection instanceof EE_Form_Section_Proper) {
-                $subsection->_received_submission = true;
-            }
-        }
-    }
+	/**
+	 * Performs validation on this form section and its subsections. For each subsection,
+	 * calls _validate_{subsection_name} on THIS form (if the function exists) and passes it the subsection, then calls
+	 * _validate on that subsection. If you need to perform validation on the form as a whole (considering multiple)
+	 * you would be best to override this _validate method, calling parent::_validate() first.
+	 *
+	 * @throws EE_Error
+	 */
+	protected function _validate()
+	{
+		/** @var RequestInterface $request */
+		$request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+		$form_data = $request->requestParams();
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
+			if ($subsection->form_data_present_in($form_data)) {
+				if (method_exists($this, '_validate_' . $subsection_name)) {
+					call_user_func_array(array($this,'_validate_' . $subsection_name), array($subsection));
+				}
+				$subsection->_validate();
+			} elseif ($subsection instanceof EE_Form_Section_Proper) {
+				$subsection->_received_submission = true;
+			}
+		}
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -37,10 +37,10 @@ 
     public function __construct(EE_Registration $reg, $options = array())
     {
         $this->_registration = $reg;
-        if (! isset($options['layout_strategy'])) {
+        if ( ! isset($options['layout_strategy'])) {
             $options['layout_strategy'] = new EE_Admin_Two_Column_Layout();
         }
-        if (! isset($options['html_id'])) {
+        if ( ! isset($options['html_id'])) {
             $options['html_id'] = 'reg-admin-attendee-questions-frm';
         }
         $this->build_form_from_registration();
@@ -68,7 +68,7 @@ 
     public function build_form_from_registration()
     {
         $reg = $this->get_registration();
-        if (! $reg instanceof EE_Registration) {
+        if ( ! $reg instanceof EE_Registration) {
             throw new EE_Error(esc_html__('We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso'));
         }
         // we want to get all their question groups
@@ -91,7 +91,7 @@ 
         // get each question groups questions
         foreach ($question_groups as $question_group) {
             if ($question_group instanceof EE_Question_Group) {
-                $this->_subsections[ $question_group->ID() ] = $this->build_subform_from_question_group(
+                $this->_subsections[$question_group->ID()] = $this->build_subform_from_question_group(
                     $question_group,
                     $reg
                 );
@@ -130,13 +130,13 @@ 
                 array(
                     'OR' => array(
                         'QST_system*blank' => '',
-                        'QST_system*null' => array( 'IS_NULL' )
+                        'QST_system*null' => array('IS_NULL')
                     )
                 )
             )
         );
         foreach ($questions as $question) {
-            $parts_of_subsection[ $question->ID() ] = $question->generate_form_input($registration);
+            $parts_of_subsection[$question->ID()] = $question->generate_form_input($registration);
         }
         if (
             EE_Registry::instance()->CAP->current_user_can(
@@ -148,11 +148,11 @@ 
             $parts_of_subsection['edit_link'] = new EE_Form_Section_HTML(
                 EEH_HTML::table(
                     EEH_HTML::tr(
-                        '<th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" aria-label="' . esc_attr__('click to edit question', 'event_espresso') . '">
-		  			<span class="reg-admin-edit-question-group-spn">' . esc_html__('edit the above question group', 'event_espresso') . '</span>
+                        '<th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" aria-label="'.esc_attr__('click to edit question', 'event_espresso').'">
+		  			<span class="reg-admin-edit-question-group-spn">' . esc_html__('edit the above question group', 'event_espresso').'</span>
 		  			<div class="dashicons dashicons-edit"></div>
 		  		</a></td>'
-                    ) .
+                    ).
                     EEH_HTML::no_row()
                 )
             );
@@ -205,8 +205,8 @@ 
         $form_data = $request->requestParams();
         foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
             if ($subsection->form_data_present_in($form_data)) {
-                if (method_exists($this, '_validate_' . $subsection_name)) {
-                    call_user_func_array(array($this,'_validate_' . $subsection_name), array($subsection));
+                if (method_exists($this, '_validate_'.$subsection_name)) {
+                    call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
                 }
                 $subsection->_validate();
             } elseif ($subsection instanceof EE_Form_Section_Proper) {