eventespresso / event-espresso-core

caffeinated/modules/event_single_caff/templates/admin-event-single-settings.template.php

Indentation +57 added lines, -57 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
 $values = EEH_Form_Fields::prep_answer_options(
-    array(
-        array('id' => 1, 'text' => __('Yes', 'event_espresso')),
-        array('id' => 0, 'text' => __('No', 'event_espresso')),
-    )
+	array(
+		array('id' => 1, 'text' => __('Yes', 'event_espresso')),
+		array('id' => 0, 'text' => __('No', 'event_espresso')),
+	)
 );
 ?>
 
@@ -12,9 +12,9 @@ 
 
 <h2 class="ee-admin-settings-hdr">
     <?php _e(
-        'Single Event Pages',
-        'event_espresso'
-    ); ?><?php // echo EEH_Template::get_help_tab_link('event_single_settings_info');?>
+		'Single Event Pages',
+		'event_espresso'
+	); ?><?php // echo EEH_Template::get_help_tab_link('event_single_settings_info');?>
 </h2>
 <table class="form-table">
     <tbody>
@@ -26,17 +26,17 @@ 
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'display_status_banner_single',
-                $display_status_banner_single,
-                $values,
-                'display_status_banner_single',
-                'display_status_banner_single'
-            ); ?>
+				'display_status_banner_single',
+				$display_status_banner_single,
+				$values,
+				'display_status_banner_single',
+				'display_status_banner_single'
+			); ?>
             <p class="description"><?php
-                _e(
-                    'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.',
-                    'event_espresso'
-                ); ?></p>
+				_e(
+					'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.',
+					'event_espresso'
+				); ?></p>
         </td>
     </tr>
 
@@ -44,23 +44,23 @@ 
         <th>
             <label for="display_venue">
                 <?php _e('Display Venue Details', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_addresses_in_reg_form_info'
-                ); ?>
+					'display_addresses_in_reg_form_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'display_venue',
-                $display_venue,
-                $values,
-                'display_venue',
-                'display_venue'
-            ); ?>
+				'display_venue',
+				$display_venue,
+				$values,
+				'display_venue',
+				'display_venue'
+			); ?>
             <p class="description"><?php
-                _e(
-                    'Do not use this if you are using the venue shortcodes in your event description.',
-                    'event_espresso'
-                ); ?></p>
+				_e(
+					'Do not use this if you are using the venue shortcodes in your event description.',
+					'event_espresso'
+				); ?></p>
         </td>
     </tr>
 
@@ -72,26 +72,26 @@ 
         </th>
         <td>
             <?php
-            echo EEH_Form_Fields::select(
-                'use_sortable_display_order',
-                $use_sortable_display_order,
-                $values,
-                'EED_Events_Single_use_sortable_display_order',
-                'EED_Events_Single_use_sortable_display_order'
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				'use_sortable_display_order',
+				$use_sortable_display_order,
+				$values,
+				'EED_Events_Single_use_sortable_display_order',
+				'EED_Events_Single_use_sortable_display_order'
+			);
+			?>
             <p class="description ">
                 <?php
-                echo sprintf(
-                    __(
-                        '%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Single page display, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.',
-                        'event_espresso'
-                    ),
-                    '<span class="important-notice">',
-                    '</span>',
-                    '<br />'
-                );
-                ?>
+				echo sprintf(
+					__(
+						'%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Single page display, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.',
+						'event_espresso'
+					),
+					'<span class="important-notice">',
+					'</span>',
+					'<br />'
+				);
+				?>
             </p>
         </td>
     </tr>
@@ -99,23 +99,23 @@ 
     <tr>
         <th>
             <?php _e('Display Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                'display_addresses_in_reg_form_info'
-            ); ?>
+				'display_addresses_in_reg_form_info'
+			); ?>
         </th>
         <td>
 
             <?php wp_nonce_field(
-                'espresso_update_event_single_order',
-                'espresso_update_event_single_order_nonce',
-                false
-            ); ?>
+				'espresso_update_event_single_order',
+				'espresso_update_event_single_order_nonce',
+				false
+			); ?>
             <?php echo $event_single_display_order; ?>
 
             <p class="description"><?php
-                _e(
-                    'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the single event page.',
-                    'event_espresso'
-                ); ?></p>
+				_e(
+					'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the single event page.',
+					'event_espresso'
+				); ?></p>
 
         </td>
     </tr>

caffeinated/payment_methods/Paypal_Pro/EE_PMT_Paypal_Pro.pm.php

Indentation +165 added lines, -165 removed lines

@@ -12,170 +12,170 @@
 class EE_PMT_Paypal_Pro extends EE_PMT_Base
 {
 
-    /**
-     * @param EE_Payment_Method $pm_instance
-     * @return EE_PMT_Paypal_Pro
-     */
-    public function __construct($pm_instance = null)
-    {
-        require_once($this->file_folder().'EEG_Paypal_Pro.gateway.php');
-        $this->_gateway = new EEG_Paypal_Pro();
-        $this->_pretty_name = __("Paypal Pro", 'event_espresso');
-        $this->_default_description = __('Please provide the following billing information.', 'event_espresso');
-        $this->_requires_https = true;
-        parent::__construct($pm_instance);
-    }
-
-
-
-    /**
-     * Gets the form for all the settings related to this payment method type
-     * @return EE_Payment_Method_Form
-     */
-    public function generate_new_settings_form()
-    {
-        return new EE_Payment_Method_Form(array(
-            'extra_meta_inputs'=>array(
+	/**
+	 * @param EE_Payment_Method $pm_instance
+	 * @return EE_PMT_Paypal_Pro
+	 */
+	public function __construct($pm_instance = null)
+	{
+		require_once($this->file_folder().'EEG_Paypal_Pro.gateway.php');
+		$this->_gateway = new EEG_Paypal_Pro();
+		$this->_pretty_name = __("Paypal Pro", 'event_espresso');
+		$this->_default_description = __('Please provide the following billing information.', 'event_espresso');
+		$this->_requires_https = true;
+		parent::__construct($pm_instance);
+	}
+
+
+
+	/**
+	 * Gets the form for all the settings related to this payment method type
+	 * @return EE_Payment_Method_Form
+	 */
+	public function generate_new_settings_form()
+	{
+		return new EE_Payment_Method_Form(array(
+			'extra_meta_inputs'=>array(
 //              'paypal_email'=>new EE_Email_Input(), not actually used
-                'username'=>new EE_Text_Input(array(
-                    'html_label_text'=>  sprintf(__("Paypal API Username %s", "event_espresso"), $this->get_help_tab_link()),
-                    'required' => true
-                )),
-                'password'=>new EE_Text_Input(array(
-                    'html_label_text'=>  sprintf(__("Paypal API Password %s", "event_espresso"), $this->get_help_tab_link()),
-                    'required' => true
-                )),
-                'signature'=>new EE_Text_Input(array(
-                    'html_label_text'=>  sprintf(__("Paypal API Signature %s", "event_espresso"), $this->get_help_tab_link()),
-                    'required' => true
-                )),
-                'credit_card_types'=>new EE_Checkbox_Multi_Input(
-                    $this->card_types_supported(),
-                    array(
-                            'html_label_text' => __('Card Types Supported', 'event_espresso'),
-                            'required' => true )
-                ),
-                )
-            ));
-    }
-
-
-    /**
-     * Creates the billing form for this payment method type
-     * @param \EE_Transaction $transaction
-     * @throws \EE_Error
-     * @return EE_Billing_Info_Form
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null)
-    {
-        $allowed_types = $this->_pm_instance->get_extra_meta('credit_card_types', true);
-        // if allowed types is a string or empty array or null...
-        if (empty($allowed_types)) {
-            $allowed_types = array();
-        }
-
-        $billing_form = new EE_Billing_Attendee_Info_Form(
-            $this->_pm_instance,
-            array(
-                'name'=> 'Paypal_Pro_Billing_Form',
-            //              'html_id'=> 'ee-Paypal_Pro-billing-form',
-                'subsections'=>array(
-                    'credit_card'=>new EE_Credit_Card_Input(
-                        array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Number', 'event_espresso'))
-                    ),
-                    'credit_card_type'=>new EE_Select_Input(
-                        // the options are set dynamically
-                        array_intersect_key(EE_PMT_Paypal_Pro::card_types_supported(), array_flip($allowed_types)),
-                        array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Type', 'event_espresso'))
-                    ),
-                    'exp_month'=>new EE_Credit_Card_Month_Input(
-                        true,
-                        array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' =>  __('Expiry Month', 'event_espresso')  )
-                    ),
-                    'exp_year'=>new EE_Credit_Card_Year_Input(
-                        array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Expiry Year', 'event_espresso')  )
-                    ),
-                    'cvv'=>new EE_CVV_Input(
-                        array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('CVV', 'event_espresso') )
-                    ),
-                )
-            )
-        );
-        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
-     */
-    public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form)
-    {
-        if ($this->_pm_instance->debug_mode()) {
-            $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(dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php')),
-                'first_name'
-            );
-            $billing_form->get_input('credit_card_type')->set_default('Visa');
-            $billing_form->get_input('exp_year')->set_default(2018);
-            $billing_form->get_input('cvv')->set_default('115');
-        }
-        return $billing_form;
-    }
-
-
-
-    /**
-     * Returns an array of all the payment cards possibly supported by paypal pro.
-     * Keys are their values, values are their pretty names.
-     * @return array
-     */
-    public static function card_types_supported()
-    {
-        return array(
-            'Visa'=>  __("Visa", 'event_espresso'),
-            'MasterCard'=>  __("MasterCard", 'event_espresso'),
-            'Amex'=>  __("American Express", 'event_espresso'),
-            'Discover'=>  __("Discover", 'event_espresso')
-            );
-    }
-
-
-
-    /**
-     * Adds the help tab
-     * @see EE_PMT_Base::help_tabs_config()
-     * @return array
-     */
-    public function help_tabs_config()
-    {
-        return array(
-            $this->get_help_tab_name() => array(
-                        'title' => __('PayPal Pro Settings', 'event_espresso'),
-                        'filename' => 'payment_methods_overview_paypalpro'
-                        ),
-        );
-    }
-
-    /**
-     * Overrides parent's _get_billing_values_from_form because we want to
-     * get the country's 2-character ISO code, not the name like most gateways
-     * @param EE_Billing_Info_Form $billing_form
-     * @return array
-     */
-    protected function _get_billing_values_from_form($billing_form)
-    {
-        $billing_values = parent::_get_billing_values_from_form($billing_form);
-        $billing_values['country'] = $billing_form->get_input_value('country');
-        $billing_values['credit_card_type'] = $billing_form->get_input_value('credit_card_type');
-        return $billing_values;
-    }
+				'username'=>new EE_Text_Input(array(
+					'html_label_text'=>  sprintf(__("Paypal API Username %s", "event_espresso"), $this->get_help_tab_link()),
+					'required' => true
+				)),
+				'password'=>new EE_Text_Input(array(
+					'html_label_text'=>  sprintf(__("Paypal API Password %s", "event_espresso"), $this->get_help_tab_link()),
+					'required' => true
+				)),
+				'signature'=>new EE_Text_Input(array(
+					'html_label_text'=>  sprintf(__("Paypal API Signature %s", "event_espresso"), $this->get_help_tab_link()),
+					'required' => true
+				)),
+				'credit_card_types'=>new EE_Checkbox_Multi_Input(
+					$this->card_types_supported(),
+					array(
+							'html_label_text' => __('Card Types Supported', 'event_espresso'),
+							'required' => true )
+				),
+				)
+			));
+	}
+
+
+	/**
+	 * Creates the billing form for this payment method type
+	 * @param \EE_Transaction $transaction
+	 * @throws \EE_Error
+	 * @return EE_Billing_Info_Form
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null)
+	{
+		$allowed_types = $this->_pm_instance->get_extra_meta('credit_card_types', true);
+		// if allowed types is a string or empty array or null...
+		if (empty($allowed_types)) {
+			$allowed_types = array();
+		}
+
+		$billing_form = new EE_Billing_Attendee_Info_Form(
+			$this->_pm_instance,
+			array(
+				'name'=> 'Paypal_Pro_Billing_Form',
+			//              'html_id'=> 'ee-Paypal_Pro-billing-form',
+				'subsections'=>array(
+					'credit_card'=>new EE_Credit_Card_Input(
+						array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Number', 'event_espresso'))
+					),
+					'credit_card_type'=>new EE_Select_Input(
+						// the options are set dynamically
+						array_intersect_key(EE_PMT_Paypal_Pro::card_types_supported(), array_flip($allowed_types)),
+						array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Type', 'event_espresso'))
+					),
+					'exp_month'=>new EE_Credit_Card_Month_Input(
+						true,
+						array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' =>  __('Expiry Month', 'event_espresso')  )
+					),
+					'exp_year'=>new EE_Credit_Card_Year_Input(
+						array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Expiry Year', 'event_espresso')  )
+					),
+					'cvv'=>new EE_CVV_Input(
+						array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('CVV', 'event_espresso') )
+					),
+				)
+			)
+		);
+		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
+	 */
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form)
+	{
+		if ($this->_pm_instance->debug_mode()) {
+			$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(dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php')),
+				'first_name'
+			);
+			$billing_form->get_input('credit_card_type')->set_default('Visa');
+			$billing_form->get_input('exp_year')->set_default(2018);
+			$billing_form->get_input('cvv')->set_default('115');
+		}
+		return $billing_form;
+	}
+
+
+
+	/**
+	 * Returns an array of all the payment cards possibly supported by paypal pro.
+	 * Keys are their values, values are their pretty names.
+	 * @return array
+	 */
+	public static function card_types_supported()
+	{
+		return array(
+			'Visa'=>  __("Visa", 'event_espresso'),
+			'MasterCard'=>  __("MasterCard", 'event_espresso'),
+			'Amex'=>  __("American Express", 'event_espresso'),
+			'Discover'=>  __("Discover", 'event_espresso')
+			);
+	}
+
+
+
+	/**
+	 * Adds the help tab
+	 * @see EE_PMT_Base::help_tabs_config()
+	 * @return array
+	 */
+	public function help_tabs_config()
+	{
+		return array(
+			$this->get_help_tab_name() => array(
+						'title' => __('PayPal Pro Settings', 'event_espresso'),
+						'filename' => 'payment_methods_overview_paypalpro'
+						),
+		);
+	}
+
+	/**
+	 * Overrides parent's _get_billing_values_from_form because we want to
+	 * get the country's 2-character ISO code, not the name like most gateways
+	 * @param EE_Billing_Info_Form $billing_form
+	 * @return array
+	 */
+	protected function _get_billing_values_from_form($billing_form)
+	{
+		$billing_values = parent::_get_billing_values_from_form($billing_form);
+		$billing_values['country'] = $billing_form->get_input_value('country');
+		$billing_values['credit_card_type'] = $billing_form->get_input_value('credit_card_type');
+		return $billing_values;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -81,22 +81,22 @@ 
             //              'html_id'=> 'ee-Paypal_Pro-billing-form',
                 'subsections'=>array(
                     'credit_card'=>new EE_Credit_Card_Input(
-                        array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Number', 'event_espresso'))
+                        array('required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Number', 'event_espresso'))
                     ),
                     'credit_card_type'=>new EE_Select_Input(
                         // the options are set dynamically
                         array_intersect_key(EE_PMT_Paypal_Pro::card_types_supported(), array_flip($allowed_types)),
-                        array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Type', 'event_espresso'))
+                        array('required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Type', 'event_espresso'))
                     ),
                     'exp_month'=>new EE_Credit_Card_Month_Input(
                         true,
-                        array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' =>  __('Expiry Month', 'event_espresso')  )
+                        array('required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' =>  __('Expiry Month', 'event_espresso'))
                     ),
                     'exp_year'=>new EE_Credit_Card_Year_Input(
-                        array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Expiry Year', 'event_espresso')  )
+                        array('required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Expiry Year', 'event_espresso'))
                     ),
                     'cvv'=>new EE_CVV_Input(
-                        array( 'required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('CVV', 'event_espresso') )
+                        array('required'=>true, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('CVV', 'event_espresso'))
                     ),
                 )
             )
@@ -117,11 +117,11 @@ 
     {
         if ($this->_pm_instance->debug_mode()) {
             $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(dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php')),
+                array('debug_content' => new EE_Form_Section_HTML_From_Template(dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php')),
                 'first_name'
             );
             $billing_form->get_input('credit_card_type')->set_default('Visa');

caffeinated/payment_methods/Paypal_Pro/help_tabs/payment_methods_overview_paypalpro.help_tab.php

Indentation +19 added lines, -19 removed lines

@@ -4,10 +4,10 @@ 
 </p>
 <p>
     <?php printf(
-        __('See %1$shere%2$s for list of currencies supported by Paypal Pro.', 'event_espresso'),
-        "<a href='https://www.paypal.com/multicurrency'>",
-        "</a>"
-    ); ?>
+		__('See %1$shere%2$s for list of currencies supported by Paypal Pro.', 'event_espresso'),
+		"<a href='https://www.paypal.com/multicurrency'>",
+		"</a>"
+	); ?>
 </p>
 <p><strong><?php _e('PayPal Pro Settings', 'event_espresso'); ?></strong></p>
 <ul>
@@ -18,30 +18,30 @@ 
     <li>
         <strong><?php _e('PayPal API Username', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'Enter your API Username for PayPal. Learn how to find your <a href="https://www.paypal.com/us/cgi-bin/webscr?cmd=xpt/cps/merchant/wppro/WPProIntegrationSteps-outside#SectionB" target="_blank">API Username</a>.',
-            'event_espresso'
-        ); ?>
+			'Enter your API Username for PayPal. Learn how to find your <a href="https://www.paypal.com/us/cgi-bin/webscr?cmd=xpt/cps/merchant/wppro/WPProIntegrationSteps-outside#SectionB" target="_blank">API Username</a>.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('PayPal API Password', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'Enter your API Password for PayPal. Learn how to find your <a href="https://www.paypal.com/us/cgi-bin/webscr?cmd=xpt/cps/merchant/wppro/WPProIntegrationSteps-outside#SectionB" target="_blank">API Password</a>.',
-            'event_espresso'
-        ); ?>
+			'Enter your API Password for PayPal. Learn how to find your <a href="https://www.paypal.com/us/cgi-bin/webscr?cmd=xpt/cps/merchant/wppro/WPProIntegrationSteps-outside#SectionB" target="_blank">API Password</a>.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('PayPal API Signature', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'Enter your API Signature for PayPal. Learn how to find your <a href="https://www.paypal.com/us/cgi-bin/webscr?cmd=xpt/cps/merchant/wppro/WPProIntegrationSteps-outside#SectionB" target="_blank">API Signature</a>.',
-            'event_espresso'
-        ); ?>
+			'Enter your API Signature for PayPal. Learn how to find your <a href="https://www.paypal.com/us/cgi-bin/webscr?cmd=xpt/cps/merchant/wppro/WPProIntegrationSteps-outside#SectionB" target="_blank">API Signature</a>.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('Country Currency', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'Select the currency for your country. Payments will be accepted in this currency.',
-            'event_espresso'
-        ); ?>
+			'Select the currency for your country. Payments will be accepted in this currency.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('Accepted Card Types', 'event_espresso'); ?></strong><br/>
@@ -50,9 +50,9 @@ 
     <li>
         <strong><?php _e('Use the Debugging Feature and the PayPal Sandbox', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'Specify if you want to test the payment gateway by submitting a test transaction. If this option is enabled, be sure to enter your PayPal sandbox credentials in the fields above. Be sure to turn this setting off when you are done testing.',
-            'event_espresso'
-        ); ?>
+			'Specify if you want to test the payment gateway by submitting a test transaction. If this option is enabled, be sure to enter your PayPal sandbox credentials in the fields above. Be sure to turn this setting off when you are done testing.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('Button Image URL', 'event_espresso'); ?></strong><br/>

caffeinated/payment_methods/Paypal_Pro/templates/paypal_pro_debug_info.template.php

Indentation +36 added lines, -36 removed lines

@@ -16,43 +16,43 @@ 
     <div class="sandbox-panel">
     <h2 class="section-title"><?php _e('PayPal Sandbox Mode', 'event_espresso'); ?></h2>
     <h3 style="color:#ff0000;"><?php
-        _e(
-            'Debug Mode Is Turned On. Payments will not be processed',
-            'event_espresso'
-        ); ?></h3>
+		_e(
+			'Debug Mode Is Turned On. Payments will not be processed',
+			'event_espresso'
+		); ?></h3>
 
     <p class="test-credit-cards-info-pg" style="margin-bottom:0;">
         <strong><?php _e('Testing Guidelines', 'event_espresso'); ?></strong>
     </p>
     <ul style="margin:1em 2em 1.5em; line-height:1.2em;">
         <li><?php
-            _e(
-                'While testing, use the credit card number associated with your sandbox account.',
-                'event_espresso'
-            ); ?></li>
+			_e(
+				'While testing, use the credit card number associated with your sandbox account.',
+				'event_espresso'
+			); ?></li>
         <li><?php
-            printf(
-                __(
-                    'To find the sandbox account\'s credit card, go to %1$s, then "Dashboard", then under Sandbox click "Accounts", then click your account and click "Profile", then in the popup that appears click on the "Funding" tab. Your testing card is listed there.',
-                    'event_espresso'
-                ),
-                '<a href="http://developer.paypal.com">developer.paypal.com</a>'
-            ); ?></li>
+			printf(
+				__(
+					'To find the sandbox account\'s credit card, go to %1$s, then "Dashboard", then under Sandbox click "Accounts", then click your account and click "Profile", then in the popup that appears click on the "Funding" tab. Your testing card is listed there.',
+					'event_espresso'
+				),
+				'<a href="http://developer.paypal.com">developer.paypal.com</a>'
+			); ?></li>
         <li><?php
-            printf(
-                __('CVV2 should be 115 (see %s PayPal\'s documentation for other special codes %s)', 'event_espresso'),
-                '<a href="https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions#id108HH0RJ0TS" target="_blank">',
-                '</a>'
-            ); ?></li>
+			printf(
+				__('CVV2 should be 115 (see %s PayPal\'s documentation for other special codes %s)', 'event_espresso'),
+				'<a href="https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions#id108HH0RJ0TS" target="_blank">',
+				'</a>'
+			); ?></li>
     </ul>
 
     <p class="test-credit-cards-info-pg">
         <strong><?php _e('Credit Card Numbers Used for Testing', 'event_espresso'); ?></strong><br/>
         <span class="small-text"><?php
-            _e(
-                'Use the following credit card numbers for testing. Any other card number produces a general failure.',
-                'event_espresso'
-            ); ?></span>
+			_e(
+				'Use the following credit card numbers for testing. Any other card number produces a general failure.',
+				'event_espresso'
+			); ?></span>
     </p>
 
     <div class="tbl-wrap">
@@ -76,18 +76,18 @@ 
     <p class="test-credit-cards-info-pg">
         <strong><?php _e('Testing Result Code Responses', 'event_espresso'); ?></strong><br/>
         <span class="small-text"><?php
-            printf(
-                __(
-                    'You can use the amount of the transaction to generate a particular result code (see %s PayPal\'s documentation%s). The table below lists the general guidelines for specifying amounts. IMPORTANT: before you attempt any of these, ensure your sandbox PayPal account has %s "Negative Testing" set to on%s. Also be aware that you can generate AVS errors by using certain strings in your address field, and CVV errors using certain CVV values. See %s this PayPal doc %s',
-                    'event_espresso'
-                ),
-                "<a href='https://developer.paypal.com/docs/classic/api/errorcodes/#id09C3GA00GR1' target='_blank'>",
-                "</a>",
-                "<a href='https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMNXNkZ2s5VUlHTUk/edit?usp=drivesdk' target='_blank'>",
-                "</a>",
-                "<a href='https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions' target='_blank'>",
-                "</a>"
-            ); ?></span>
+			printf(
+				__(
+					'You can use the amount of the transaction to generate a particular result code (see %s PayPal\'s documentation%s). The table below lists the general guidelines for specifying amounts. IMPORTANT: before you attempt any of these, ensure your sandbox PayPal account has %s "Negative Testing" set to on%s. Also be aware that you can generate AVS errors by using certain strings in your address field, and CVV errors using certain CVV values. See %s this PayPal doc %s',
+					'event_espresso'
+				),
+				"<a href='https://developer.paypal.com/docs/classic/api/errorcodes/#id09C3GA00GR1' target='_blank'>",
+				"</a>",
+				"<a href='https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMNXNkZ2s5VUlHTUk/edit?usp=drivesdk' target='_blank'>",
+				"</a>",
+				"<a href='https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions' target='_blank'>",
+				"</a>"
+			); ?></span>
     </p>
 
     <div class="tbl-wrap">

caffeinated/payment_methods/Paypal_Pro/templates/paypal_pro_intro.template.php

Indentation +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@
 <?php printf(
-    esc_html__(
-        'PayPal Pro (Website Payments Pro) is an on-site payment method for accepting credit and debit cards and is available to event organizers in the United States, United Kingdom, and Canada. An account with PayPal is required to accept payments. Need a PayPal Pro account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.',
-        'event_espresso'
-    ),
-    '<a href="https://eventespresso.com/go/paypalpro/" target="_blank">',
-    '</a>'
+	esc_html__(
+		'PayPal Pro (Website Payments Pro) is an on-site payment method for accepting credit and debit cards and is available to event organizers in the United States, United Kingdom, and Canada. An account with PayPal is required to accept payments. Need a PayPal Pro account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.',
+		'event_espresso'
+	),
+	'<a href="https://eventespresso.com/go/paypalpro/" target="_blank">',
+	'</a>'
 );

caffeinated/payment_methods/Aim/help_tabs/payment_methods_overview_aim.help_tab.php

Indentation +36 added lines, -36 removed lines

@@ -4,71 +4,71 @@
 </p>
 <p>
     <?php printf(
-        __('See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso'),
-        "<a href='http://www.authorize.net/international/'  target='_blank'>",
-        "</a>"
-    ); ?>
+		__('See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso'),
+		"<a href='http://www.authorize.net/international/'  target='_blank'>",
+		"</a>"
+	); ?>
 </p>
 <p><strong><?php _e('Authorize.net AIM Settings', 'event_espresso'); ?></strong></p>
 <ul>
     <li>
         <strong><?php _e('Authorize.net API Login ID', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'Enter your API Login ID for Authorize.net. Learn how to find your <a href="https://support.authorize.net/authkb/index?page=content&id=A405"  target="_blank">API Login ID</a>.',
-            'event_espresso'
-        ); ?>
+			'Enter your API Login ID for Authorize.net. Learn how to find your <a href="https://support.authorize.net/authkb/index?page=content&id=A405"  target="_blank">API Login ID</a>.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('Authorize.net Transaction Key', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'Enter your Transaction Key for Authorize.net. Learn how to find your <a href="https://support.authorize.net/authkb/index?page=content&id=A405" target="_blank">Transaction Key</a>.',
-            'event_espresso'
-        ); ?>
+			'Enter your Transaction Key for Authorize.net. Learn how to find your <a href="https://support.authorize.net/authkb/index?page=content&id=A405" target="_blank">Transaction Key</a>.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong>
             <?php _e(
-                'Is this an account on the Authorize.net development server?',
-                'event_espresso'
-            ); ?></strong><br/>
+				'Is this an account on the Authorize.net development server?',
+				'event_espresso'
+			); ?></strong><br/>
         <?php _e(
-            'Specify whether this is a live/production account or a test account on the Authorize.net development server.',
-            'event_espresso'
-        ); ?>
+			'Specify whether this is a live/production account or a test account on the Authorize.net development server.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('Do you want to submit a test transaction?', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'Specify if you want to test the Authorize.net AIM payment gateway by submitting a test transaction. Be sure to turn this setting off when you are done testing.',
-            'event_espresso'
-        ); ?>
+			'Specify if you want to test the Authorize.net AIM payment gateway by submitting a test transaction. Be sure to turn this setting off when you are done testing.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('Excluded and Required Payment Form Fields', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'By logging into Authorize.net, you can change which payment fields are required by Authorize.net when processing payments. These settings affect both the Advanced Integration Method (AIM, this) and the Simple Integration Method (SIM, different). The payment method settings "Excluded Payment Form Fields" and "Required Payment Form Fields" allow you to change the billing form in Event Espresso to reflect your payment form settings in Authorize.net.',
-            'event_espresso'
-        ); ?>
+			'By logging into Authorize.net, you can change which payment fields are required by Authorize.net when processing payments. These settings affect both the Advanced Integration Method (AIM, this) and the Simple Integration Method (SIM, different). The payment method settings "Excluded Payment Form Fields" and "Required Payment Form Fields" allow you to change the billing form in Event Espresso to reflect your payment form settings in Authorize.net.',
+			'event_espresso'
+		); ?>
         <br>
         <?php
-        printf(
-            __(
-                'To change your payment form settings in Authorize.net, %1$slog in to authorize.net%2$s, go to %3$sAccount then Payment Form%2$s, then %4$sForm Fields%2$s. It will look similar to %5$sthis%2$s. If you make a field required in Authorize.net, you should also make it required in Event Espresso. If it isn\'t required in Authorize.net, and you want to simplify the billing form in Event Espresso, you can exclude it from the Event Espresso Form too.',
-                'event_espresso'
-            ),
-            '<a href="http://authorize.net" target="_blank">',
-            '</a>',
-            '<a href="https://monosnap.com/file/nebVteOkEXcdDIos88SojStWOifP23" target="_blank">',
-            '<a href="https://monosnap.com/file/WyxGJtev87TcDmdGBEZ2oi1xaBIQAm" target="_blank">',
-            '<a href="https://monosnap.com/image/DbCJNfEesWXeSNUs1wLIpGYODFw52m" target="_blank">'
-        ); ?>
+		printf(
+			__(
+				'To change your payment form settings in Authorize.net, %1$slog in to authorize.net%2$s, go to %3$sAccount then Payment Form%2$s, then %4$sForm Fields%2$s. It will look similar to %5$sthis%2$s. If you make a field required in Authorize.net, you should also make it required in Event Espresso. If it isn\'t required in Authorize.net, and you want to simplify the billing form in Event Espresso, you can exclude it from the Event Espresso Form too.',
+				'event_espresso'
+			),
+			'<a href="http://authorize.net" target="_blank">',
+			'</a>',
+			'<a href="https://monosnap.com/file/nebVteOkEXcdDIos88SojStWOifP23" target="_blank">',
+			'<a href="https://monosnap.com/file/WyxGJtev87TcDmdGBEZ2oi1xaBIQAm" target="_blank">',
+			'<a href="https://monosnap.com/image/DbCJNfEesWXeSNUs1wLIpGYODFw52m" target="_blank">'
+		); ?>
     </li>
     <li>
         <strong><?php _e('Server', 'event_espresso'); ?></strong>
         <?php _e(
-            'Use this setting to change the server where Authorize.net AIM requests are sent. Change this to "Authorize.net/Akamai" before June 30th 2016 to verify your server wil work with Authorize.net\'s servers which will be in use after that date.',
-            'event_espresso'
-        ); ?>
+			'Use this setting to change the server where Authorize.net AIM requests are sent. Change this to "Authorize.net/Akamai" before June 30th 2016 to verify your server wil work with Authorize.net\'s servers which will be in use after that date.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('Button Image URL', 'event_espresso'); ?></strong><br/>

caffeinated/payment_methods/Aim/EE_PMT_Aim.pm.php

Indentation +253 added lines, -253 removed lines

@@ -12,276 +12,276 @@
 {
 
 
-    /**
-     * @param EE_Payment_Method $pm_instance
-     * @return EE_PMT_Aim
-     * @throws \EE_Error
-     */
-    public function __construct($pm_instance = null)
-    {
-        $this->_setup_properties();
-        parent::__construct($pm_instance);
-        $this->_gateway->set_unsupported_character_remover(new \EventEspresso\core\services\formatters\Windows1252());
-    }
+	/**
+	 * @param EE_Payment_Method $pm_instance
+	 * @return EE_PMT_Aim
+	 * @throws \EE_Error
+	 */
+	public function __construct($pm_instance = null)
+	{
+		$this->_setup_properties();
+		parent::__construct($pm_instance);
+		$this->_gateway->set_unsupported_character_remover(new \EventEspresso\core\services\formatters\Windows1252());
+	}
     
-    /**
-     * 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 = __("Authorize.net AIM", 'event_espresso');
-        $this->_default_description = __('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 = __("Authorize.net AIM", 'event_espresso');
+		$this->_default_description = __('Please provide the following billing information.', 'event_espresso');
+		$this->_requires_https = true;
+	}
 
 
 
-    /**
-     * Creates the billing form for this payment method type
-     *
-     * @param \EE_Transaction $transaction
-     * @return EE_Billing_Info_Form
-     * @throws \EE_Error
-     */
-    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' => __('Card Number', 'event_espresso')
-                )),
-                'exp_month'=>new EE_Credit_Card_Month_Input(true, array(
-                    'required'=>true,
-                    'html_label_text' => __('Expiry Month', 'event_espresso')
-                )),
-                'exp_year'=>new EE_Credit_Card_Year_Input(array(
-                    'required'=>true,
-                    'html_label_text' => __('Expiry Year', 'event_espresso')
-                )),
-                'cvv'=>new EE_CVV_Input(array(
-                    'required'=>true,
-                    'html_label_text' => __('CVV', 'event_espresso') )),
-            )
-        ));
-        $billing_form->add_subsections(array(
-            'company' => new EE_Text_Input(array(
-                'html_label_text' => __('Company', 'event_espresso')
-            ))
-        ), 'email', false);
-        $billing_form->add_subsections(
-            array(
-                    'fax' => new EE_Text_Input(array(
-                        'html_label_text' => __('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 $transaction
+	 * @return EE_Billing_Info_Form
+	 * @throws \EE_Error
+	 */
+	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' => __('Card Number', 'event_espresso')
+				)),
+				'exp_month'=>new EE_Credit_Card_Month_Input(true, array(
+					'required'=>true,
+					'html_label_text' => __('Expiry Month', 'event_espresso')
+				)),
+				'exp_year'=>new EE_Credit_Card_Year_Input(array(
+					'required'=>true,
+					'html_label_text' => __('Expiry Year', 'event_espresso')
+				)),
+				'cvv'=>new EE_CVV_Input(array(
+					'required'=>true,
+					'html_label_text' => __('CVV', 'event_espresso') )),
+			)
+		));
+		$billing_form->add_subsections(array(
+			'company' => new EE_Text_Input(array(
+				'html_label_text' => __('Company', 'event_espresso')
+			))
+		), 'email', false);
+		$billing_form->add_subsections(
+			array(
+					'fax' => new EE_Text_Input(array(
+						'html_label_text' => __('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
-     * @throws \EE_Error
-     */
-    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__.DS.'templates'.DS.'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
+	 * @throws \EE_Error
+	 */
+	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__.DS.'templates'.DS.'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
-     */
-    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(__("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(__("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(__("Send test transactions? %s", 'event_espresso'), $this->get_help_tab_link()),
-                            'html_help_text'=>  __("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(__("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(__("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' => __('Note: if fields are excluded they cannot be required.', 'event_espresso')
-                        )
-                    ),
-                    'server' => new EE_Select_Input(
-                        apply_filters(
-                            'FHEE__EE_PMT_Aim__generate_new_settings_form__server_select_input__options',
-                            array(
-                                'akamai' => __('Authorize.net/Akamai (default)', 'event_espresso'),
-                                'authorize.net' => __('Authorize.net (deprecated)', 'event_espresso'),
-                            ),
-                            $this
-                        ),
-                        array(
-                            'html_label_text' => __('Server', 'event_espresso'),
-                            'html_help_text' => __('The Gateway Server where payment requests will be sent', 'event_espresso')
-                        )
-                    )
+	/**
+	 * Gets the form for all the settings related to this payment method type
+	 * @return EE_Payment_Method_Form
+	 */
+	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(__("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(__("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(__("Send test transactions? %s", 'event_espresso'), $this->get_help_tab_link()),
+							'html_help_text'=>  __("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(__("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(__("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' => __('Note: if fields are excluded they cannot be required.', 'event_espresso')
+						)
+					),
+					'server' => new EE_Select_Input(
+						apply_filters(
+							'FHEE__EE_PMT_Aim__generate_new_settings_form__server_select_input__options',
+							array(
+								'akamai' => __('Authorize.net/Akamai (default)', 'event_espresso'),
+								'authorize.net' => __('Authorize.net (deprecated)', 'event_espresso'),
+							),
+							$this
+						),
+						array(
+							'html_label_text' => __('Server', 'event_espresso'),
+							'html_help_text' => __('The Gateway Server where payment requests will be sent', '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' => __('First Name', 'event_espresso'),
-            'last_name' => __('Last Name', 'event_espresso'),
-            'email' => __('Email', 'event_espresso'),
-            'company' => __('Company', 'event_espresso'),
-            'address' => __('Address', 'event_espresso'),
-            'address2' => __('Address2', 'event_espresso'),
-            'city' => __('City', 'event_espresso'),
-            'state' => __('State', 'event_espresso'),
-            'country' => __('Country', 'event_espresso'),
-            'zip' =>  __('Zip', 'event_espresso'),
-            'phone' => __('Phone', 'event_espresso'),
-            'fax' => __('Fax', 'event_espresso'),
-            'cvv' => __('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' => __('First Name', 'event_espresso'),
+			'last_name' => __('Last Name', 'event_espresso'),
+			'email' => __('Email', 'event_espresso'),
+			'company' => __('Company', 'event_espresso'),
+			'address' => __('Address', 'event_espresso'),
+			'address2' => __('Address2', 'event_espresso'),
+			'city' => __('City', 'event_espresso'),
+			'state' => __('State', 'event_espresso'),
+			'country' => __('Country', 'event_espresso'),
+			'zip' =>  __('Zip', 'event_espresso'),
+			'phone' => __('Phone', 'event_espresso'),
+			'fax' => __('Fax', 'event_espresso'),
+			'cvv' => __('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 $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 $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
-     * @see EE_PMT_Base::help_tabs_config()
-     * @return array
-     */
-    public function help_tabs_config()
-    {
-        return array(
-            $this->get_help_tab_name() => array(
-                'title' => __('Authorize.net AIM Settings', 'event_espresso'),
-                'filename' => 'payment_methods_overview_aim'
-            ),
-        );
-    }
+	/**
+	 * Adds the help tab
+	 * @see EE_PMT_Base::help_tabs_config()
+	 * @return array
+	 */
+	public function help_tabs_config()
+	{
+		return array(
+			$this->get_help_tab_name() => array(
+				'title' => __('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.
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -128,7 +128,7 @@ 
                 $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(
@@ -189,7 +189,7 @@ 
                             'html_label_text' => sprintf(__("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' => __('Note: if fields are excluded they cannot be required.', 'event_espresso')
                         )
@@ -249,7 +249,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,

caffeinated/payment_methods/Aim/templates/authorize_net_aim_debug_info.template.php

Indentation +3 added lines, -3 removed lines

@@ -17,9 +17,9 @@
 
         <p>
             <?php _e(
-                'Test Mode allows you to submit test transactions to the payment gateway. Transactions that are submitted while Test Mode is ON are NOT actually processed. The result of a transaction depends on the card number submitted, and the invoice amount. If you want a transaction to be approved, use one of the following card numbers.',
-                'event_espresso'
-            ); ?>
+				'Test Mode allows you to submit test transactions to the payment gateway. Transactions that are submitted while Test Mode is ON are NOT actually processed. The result of a transaction depends on the card number submitted, and the invoice amount. If you want a transaction to be approved, use one of the following card numbers.',
+				'event_espresso'
+			); ?>
         </p>
 
         <p>

caffeinated/payment_methods/Aim/templates/aim_intro.template.php

Indentation +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@
 <?php printf(
-    esc_html__(
-        'Authorize.Net AIM is an on-site payment method for accepting credit and debit card payments and is available to event organizers in the United States, Canada, United Kingdom, and Australia. An account with Authorize.Net is required to accept payments. Need an Authorize.Net account? %1$sClick here to sign up for a merchant account%2$s.',
-        'event_espresso'
-    ),
-    '<a href="https://eventespresso.com/go/authorizenetaim/" target="_blank">',
-    '</a>'
+	esc_html__(
+		'Authorize.Net AIM is an on-site payment method for accepting credit and debit card payments and is available to event organizers in the United States, Canada, United Kingdom, and Australia. An account with Authorize.Net is required to accept payments. Need an Authorize.Net account? %1$sClick here to sign up for a merchant account%2$s.',
+		'event_espresso'
+	),
+	'<a href="https://eventespresso.com/go/authorizenetaim/" target="_blank">',
+	'</a>'
 );