eventespresso / event-espresso-core

core/services/collections/iterators/FilterIteratorsHelper.php

Indentation +14 added lines, -14 removed lines

@@ -17,18 +17,18 @@
 {
 
 
-    /**
-     * Uses CollectionFilterCallbackIterator on a provided collection with provided Closure for filtering each object
-     * in the collection.
-     * The closure receives an instance of the object and should return false if it is not "valid" and true if it is.
-     *
-     * @param Collection $collection
-     * @param Closure    $acceptance_callback
-     * @return array
-     */
-    public static function getFilteredObjectsFromCollection(Collection $collection, Closure $acceptance_callback)
-    {
-        $collection_filter_iterator = new CollectionFilterCallbackIterator($collection, $acceptance_callback);
-        return $collection_filter_iterator->getFiltered();
-    }
+	/**
+	 * Uses CollectionFilterCallbackIterator on a provided collection with provided Closure for filtering each object
+	 * in the collection.
+	 * The closure receives an instance of the object and should return false if it is not "valid" and true if it is.
+	 *
+	 * @param Collection $collection
+	 * @param Closure    $acceptance_callback
+	 * @return array
+	 */
+	public static function getFilteredObjectsFromCollection(Collection $collection, Closure $acceptance_callback)
+	{
+		$collection_filter_iterator = new CollectionFilterCallbackIterator($collection, $acceptance_callback);
+		return $collection_filter_iterator->getFiltered();
+	}
 }
\ No newline at end of file

espresso.php

Indentation +192 added lines, -192 removed lines

@@ -38,217 +38,217 @@
  * @since       4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '5.3.9');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '5.3.9');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.9.54.rc.004');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.9.54.rc.004');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
-        /**
-         *    espresso_load_error_handling
-         *    this function loads EE's class for handling exceptions and errors
-         */
-        function espresso_load_error_handling()
-        {
-            static $error_handling_loaded = false;
-            if ($error_handling_loaded) {
-                return;
-            }
-            // load debugging tools
-            if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
-                require_once   EE_HELPERS . 'EEH_Debug_Tools.helper.php';
-                \EEH_Debug_Tools::instance();
-            }
-            // load error handling
-            if (is_readable(EE_CORE . 'EE_Error.core.php')) {
-                require_once EE_CORE . 'EE_Error.core.php';
-            } else {
-                wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
-            }
-            $error_handling_loaded = true;
-        }
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		/**
+		 *    espresso_load_error_handling
+		 *    this function loads EE's class for handling exceptions and errors
+		 */
+		function espresso_load_error_handling()
+		{
+			static $error_handling_loaded = false;
+			if ($error_handling_loaded) {
+				return;
+			}
+			// load debugging tools
+			if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
+				require_once   EE_HELPERS . 'EEH_Debug_Tools.helper.php';
+				\EEH_Debug_Tools::instance();
+			}
+			// load error handling
+			if (is_readable(EE_CORE . 'EE_Error.core.php')) {
+				require_once EE_CORE . 'EE_Error.core.php';
+			} else {
+				wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
+			}
+			$error_handling_loaded = true;
+		}
 
-        /**
-         *    espresso_load_required
-         *    given a class name and path, this function will load that file or throw an exception
-         *
-         * @param    string $classname
-         * @param    string $full_path_to_file
-         * @throws    EE_Error
-         */
-        function espresso_load_required($classname, $full_path_to_file)
-        {
-            if (is_readable($full_path_to_file)) {
-                require_once $full_path_to_file;
-            } else {
-                throw new \EE_Error (
-                    sprintf(
-                        esc_html__(
-                            'The %s class file could not be located or is not readable due to file permissions.',
-                            'event_espresso'
-                        ),
-                        $classname
-                    )
-                );
-            }
-        }
+		/**
+		 *    espresso_load_required
+		 *    given a class name and path, this function will load that file or throw an exception
+		 *
+		 * @param    string $classname
+		 * @param    string $full_path_to_file
+		 * @throws    EE_Error
+		 */
+		function espresso_load_required($classname, $full_path_to_file)
+		{
+			if (is_readable($full_path_to_file)) {
+				require_once $full_path_to_file;
+			} else {
+				throw new \EE_Error (
+					sprintf(
+						esc_html__(
+							'The %s class file could not be located or is not readable due to file permissions.',
+							'event_espresso'
+						),
+						$classname
+					)
+				);
+			}
+		}
 
-        /**
-         * @since 4.9.27
-         * @throws \EE_Error
-         * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-         * @throws \EventEspresso\core\exceptions\InvalidEntityException
-         * @throws \EventEspresso\core\exceptions\InvalidIdentifierException
-         * @throws \EventEspresso\core\exceptions\InvalidClassException
-         * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-         * @throws \EventEspresso\core\services\container\exceptions\ServiceExistsException
-         * @throws \EventEspresso\core\services\container\exceptions\ServiceNotFoundException
-         * @throws \OutOfBoundsException
-         */
-        function bootstrap_espresso()
-        {
-            require_once __DIR__ . '/core/espresso_definitions.php';
-            try {
-                espresso_load_error_handling();
-                espresso_load_required(
-                    'EEH_Base',
-                    EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php'
-                );
-                espresso_load_required(
-                    'EEH_File',
-                    EE_CORE . 'interfaces' . DS . 'EEHI_File.interface.php'
-                );
-                espresso_load_required(
-                    'EEH_File',
-                    EE_CORE . 'helpers' . DS . 'EEH_File.helper.php'
-                );
-                espresso_load_required(
-                    'EEH_Array',
-                    EE_CORE . 'helpers' . DS . 'EEH_Array.helper.php'
-                );
-                // instantiate and configure PSR4 autoloader
-                espresso_load_required(
-                    'Psr4Autoloader',
-                    EE_CORE . 'Psr4Autoloader.php'
-                );
-                espresso_load_required(
-                    'EE_Psr4AutoloaderInit',
-                    EE_CORE . 'EE_Psr4AutoloaderInit.core.php'
-                );
-                $AutoloaderInit = new EE_Psr4AutoloaderInit();
-                $AutoloaderInit->initializeAutoloader();
-                espresso_load_required(
-                    'EE_Request',
-                    EE_CORE . 'request_stack' . DS . 'EE_Request.core.php'
-                );
-                espresso_load_required(
-                    'EE_Response',
-                    EE_CORE . 'request_stack' . DS . 'EE_Response.core.php'
-                );
-                espresso_load_required(
-                    'EE_Bootstrap',
-                    EE_CORE . 'EE_Bootstrap.core.php'
-                );
-                // bootstrap EE and the request stack
-                new EE_Bootstrap(
-                    new EE_Request($_GET, $_POST, $_COOKIE),
-                    new EE_Response()
-                );
-            } catch (Exception $e) {
-                require_once EE_CORE . 'exceptions' . DS . 'ExceptionStackTraceDisplay.php';
-                new EventEspresso\core\exceptions\ExceptionStackTraceDisplay($e);
-            }
-        }
-        bootstrap_espresso();
-    }
+		/**
+		 * @since 4.9.27
+		 * @throws \EE_Error
+		 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+		 * @throws \EventEspresso\core\exceptions\InvalidEntityException
+		 * @throws \EventEspresso\core\exceptions\InvalidIdentifierException
+		 * @throws \EventEspresso\core\exceptions\InvalidClassException
+		 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+		 * @throws \EventEspresso\core\services\container\exceptions\ServiceExistsException
+		 * @throws \EventEspresso\core\services\container\exceptions\ServiceNotFoundException
+		 * @throws \OutOfBoundsException
+		 */
+		function bootstrap_espresso()
+		{
+			require_once __DIR__ . '/core/espresso_definitions.php';
+			try {
+				espresso_load_error_handling();
+				espresso_load_required(
+					'EEH_Base',
+					EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php'
+				);
+				espresso_load_required(
+					'EEH_File',
+					EE_CORE . 'interfaces' . DS . 'EEHI_File.interface.php'
+				);
+				espresso_load_required(
+					'EEH_File',
+					EE_CORE . 'helpers' . DS . 'EEH_File.helper.php'
+				);
+				espresso_load_required(
+					'EEH_Array',
+					EE_CORE . 'helpers' . DS . 'EEH_Array.helper.php'
+				);
+				// instantiate and configure PSR4 autoloader
+				espresso_load_required(
+					'Psr4Autoloader',
+					EE_CORE . 'Psr4Autoloader.php'
+				);
+				espresso_load_required(
+					'EE_Psr4AutoloaderInit',
+					EE_CORE . 'EE_Psr4AutoloaderInit.core.php'
+				);
+				$AutoloaderInit = new EE_Psr4AutoloaderInit();
+				$AutoloaderInit->initializeAutoloader();
+				espresso_load_required(
+					'EE_Request',
+					EE_CORE . 'request_stack' . DS . 'EE_Request.core.php'
+				);
+				espresso_load_required(
+					'EE_Response',
+					EE_CORE . 'request_stack' . DS . 'EE_Response.core.php'
+				);
+				espresso_load_required(
+					'EE_Bootstrap',
+					EE_CORE . 'EE_Bootstrap.core.php'
+				);
+				// bootstrap EE and the request stack
+				new EE_Bootstrap(
+					new EE_Request($_GET, $_POST, $_COOKIE),
+					new EE_Response()
+				);
+			} catch (Exception $e) {
+				require_once EE_CORE . 'exceptions' . DS . 'ExceptionStackTraceDisplay.php';
+				new EventEspresso\core\exceptions\ExceptionStackTraceDisplay($e);
+			}
+		}
+		bootstrap_espresso();
+	}
 }
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }

caffeinated/payment_methods/Aim/EEG_Aim.gateway.php

Doc Comments +1 added lines, -1 removed lines

@@ -362,7 +362,7 @@
     /**
      * Posts the request to AuthorizeNet & returns response.
      *
-     * @param $payment
+     * @param EEI_Payment $payment
      * @return \EE_AuthorizeNetAIM_Response
      */
     private function _sendRequest($payment)

Indentation +603 added lines, -603 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 
@@ -29,424 +29,424 @@ 
 class EEG_Aim extends EE_Onsite_Gateway
 {
 
-    const LIVE_URL    = 'https://secure2.authorize.net/gateway/transact.dll'; //Authnet URL
-
-    const SANDBOX_URL = 'https://test.authorize.net/gateway/transact.dll';
-
-    protected $_login_id;
-
-    protected $_transaction_key;
-
-    protected $_server;
-
-    protected $_currencies_supported = array(
-        'AUD',
-        'USD',
-        'CAD',
-        'EUR',
-        'GBP',
-        'NZD',
-    );
-
-    /**
-     * Whether to send test transactions (even to live site)
-     *
-     * @var boolean
-     */
-    protected $_test_transactions;
-
-    private $VERIFY_PEER = false;
-
-    private $_x_post_fields = array(
-        "version"        => "3.1",
-        "delim_char"     => ",",
-        "delim_data"     => "TRUE",
-        "relay_response" => "FALSE",
-        "encap_char"     => "|",
-    );
-
-    private $_additional_line_items = array();
-
-    /**
-     * A list of all fields in the AIM API.
-     * Used to warn user if they try to set a field not offered in the API.
-     */
-    private $_all_aim_fields = array(
-        "address",
-        "allow_partial_auth",
-        "amount",
-        "auth_code",
-        "authentication_indicator",
-        "bank_aba_code",
-        "bank_acct_name",
-        "bank_acct_num",
-        "bank_acct_type",
-        "bank_check_number",
-        "bank_name",
-        "card_code",
-        "card_num",
-        "cardholder_authentication_value",
-        "city",
-        "company",
-        "country",
-        "cust_id",
-        "customer_ip",
-        "delim_char",
-        "delim_data",
-        "description",
-        "duplicate_window",
-        "duty",
-        "echeck_type",
-        "email",
-        "email_customer",
-        "encap_char",
-        "exp_date",
-        "fax",
-        "first_name",
-        "footer_email_receipt",
-        "freight",
-        "header_email_receipt",
-        "invoice_num",
-        "last_name",
-        "line_item",
-        "login",
-        "method",
-        "phone",
-        "po_num",
-        "recurring_billing",
-        "relay_response",
-        "ship_to_address",
-        "ship_to_city",
-        "ship_to_company",
-        "ship_to_country",
-        "ship_to_first_name",
-        "ship_to_last_name",
-        "ship_to_state",
-        "ship_to_zip",
-        "split_tender_id",
-        "state",
-        "tax",
-        "tax_exempt",
-        "test_request",
-        "tran_key",
-        "trans_id",
-        "type",
-        "version",
-        "zip",
-        "solution_id"
-    );
-
-
-    /**
-     * Gets the URL where the request should go. This is filterable
-     *
-     * @return string
-     */
-    protected function _get_server_url()
-    {
-        return apply_filters(
-            'FHEE__EEG_Aim___get_server_url',
-            $this->_debug_mode ? self::SANDBOX_URL : self::LIVE_URL,
-            $this
-        );
-    }
-
-
-    /**
-     * TEMPORARY CALLBACK! Do not use
-     * Callback which filters the server url. This is added so site admins can revert to using
-     * the old AIM server in case Akamai service breaks their integration.
-     * Using Akamai will, however, be mandatory on June 30th 2016 Authorize.net
-     * (see http://www.authorize.net/support/akamaifaqs/#firewall?utm_campaign=April%202016%20Technical%20Updates%20for%20Merchants.html&utm_medium=email&utm_source=Eloqua&elqTrackId=46103bdc375c411a979c2f658fc99074&elq=7026706360154fee9b6d588b27d8eb6a&elqaid=506&elqat=1&elqCampaignId=343)
-     * Once that happens, this will be obsolete and WILL BE REMOVED.
-     *
-     * @param string $url
-     * @param EEG_Aim $gateway_object
-     * @return string
-     */
-    public function possibly_use_deprecated_aim_server($url, EEG_Aim $gateway_object)
-    {
-        if ($gateway_object->_server === 'authorize.net' && ! $gateway_object->_debug_mode) {
-            return 'https://secure.authorize.net/gateway/transact.dll';
-        } else {
-            return $url;
-        }
-    }
-
-
-    /**
-     * Asks the gateway to do whatever it does to process the payment. Onsite gateways will
-     * usually send a request directly to the payment provider and update the payment's status based on that;
-     * whereas offsite gateways will usually just update the payment with the URL and query parameters to use
-     * for sending the request via http_remote_request()
-     *
-     * @param EEI_Payment $payment
-     * @param array $billing_info {
-     *  @type $credit_card string
-     *  @type $cvv string
-     *  @type $exp_month string
-     *  @type $exp_year string
-     *  @see parent::do_direct_payment
-     * }
-     * @return EEI_Payment updated
-     */
-    public function do_direct_payment($payment, $billing_info = null)
-    {
-        add_filter('FHEE__EEG_Aim___get_server_url', array($this, 'possibly_use_deprecated_aim_server'), 10, 2);
-        // Enable test mode if needed
-        //4007000000027  <-- test successful visa
-        //4222222222222  <-- test failure card number
-
-        $item_num = 1;
-        $transaction = $payment->transaction();
-        $gateway_formatter = $this->_get_gateway_formatter();
-        $order_description = $gateway_formatter->formatOrderDescription($payment);
-        $primary_registrant = $transaction->primary_registration();
-        //if we're are charging for the full amount, show the normal line items
-        //and the itemized total adds up properly
-        if ($this->_can_easily_itemize_transaction_for($payment)) {
-            $total_line_item = $transaction->total_line_item();
-            foreach ($total_line_item->get_items() as $line_item) {
-                if ($line_item->quantity() == 0) {
-                    continue;
-                }
-                $this->addLineItem(
-                    $item_num++,
-                    $gateway_formatter->formatLineItemName($line_item, $payment),
-                    $gateway_formatter->formatLineItemDesc($line_item, $payment),
-                    $line_item->quantity(),
-                    $line_item->unit_price(),
-                    'N'
-                );
-                $order_description .= $line_item->desc().', ';
-            }
-            foreach($total_line_item->tax_descendants() as $tax_line_item) {
-                $this->addLineItem(
-                    $item_num++,
-                    $tax_line_item->name(),
-                    $tax_line_item->desc(),
-                    1,
-                    $tax_line_item->total(),
-                    'N'
-                );
-            }
-        }
-
-        //start transaction
-        //if in debug mode, use authorize.net's sandbox id; otherwise use the Event Espresso partner id
-        $partner_id = $this->_debug_mode ? 'AAA100302' : 'AAA105363';
-        $this->setField('solution_id', $partner_id);
-        $this->setField('amount', $gateway_formatter->formatCurrency($payment->amount()));
-        $this->setField('description', substr(rtrim($order_description, ', '), 0, 255));
-        $this->_set_sensitive_billing_data($billing_info);
-        $this->setField('first_name', $billing_info['first_name']);
-        $this->setField('last_name', $billing_info['last_name']);
-        $this->setField('email', $billing_info['email']);
-        $this->setField('company', $billing_info['company']);
-        $this->setField('address', $billing_info['address'].' '.$billing_info['address2']);
-        $this->setField('city', $billing_info['city']);
-        $this->setField('state', $billing_info['state']);
-        $this->setField('country', $billing_info['country']);
-        $this->setField('zip', $billing_info['zip']);
-        $this->setField('fax', $billing_info['fax']);
-        $this->setField('cust_id', $primary_registrant->ID());
-        $this->setField('phone', $billing_info['phone']);
-        //invoice_num would be nice to have it be unique per SPCO page-load, that way if users
-        //press back, they don't submit a duplicate. However, we may be keeping the user on teh same spco page
-        //in which case, we need to generate teh invoice num per request right here...
-        $this->setField('invoice_num', wp_generate_password(12, false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
-        //tell AIM that any duplicates sent in the next 5 minutes are to be ignored
-        $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS);
-
-        if ($this->_test_transactions) {
-            $this->test_request = "true";
-        }
-
-        //Capture response
-        $this->type = "AUTH_CAPTURE";
-        $response = $this->_sendRequest($payment);
-        if (! empty($response)) {
-            if ($response->error_message) {
-                $payment->set_status($this->_pay_model->failed_status());
-                $payment->set_gateway_response($response->error_message);
-            } else {
-                $payment_status = $response->approved
-                    ? $this->_pay_model->approved_status()
-                    : $this->_pay_model->declined_status();
-                $payment->set_status($payment_status);
-                //make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
-                $payment->set_amount((float) $response->amount);
-                $payment->set_gateway_response(
-                    sprintf(
-                        esc_html__('%1$s (Reason Code: %2$s)', 'event_espresso'),
-                        $response->response_reason_text,
-                        $response->response_reason_code
-                    )
-                );
-                if ($this->_debug_mode) {
-                    $txn_id = $response->invoice_number;
-                } else {
-                    $txn_id = $response->transaction_id;
-                }
-                $payment->set_txn_id_chq_nmbr($txn_id);
-            }
-            $payment->set_extra_accntng($primary_registrant->reg_code());
-            $payment->set_details(print_r($response, true));
-        } else {
-            $payment->set_status($this->_pay_model->failed_status());
-            $payment->set_gateway_response(__("There was no response from Authorize.net", 'event_espresso'));
-            $payment->set_details(print_r($response, true));
-        }
-        return $payment;
-    }
-
-
-    /**
-     * Sets billing data for the upcoming request to AIM that is considered sensitive;
-     * also this method can be overridden by children classes to easily change
-     * what billing data gets sent
-     *
-     * @param array $billing_info
-     */
-    protected function _set_sensitive_billing_data($billing_info)
-    {
-        $this->setField('card_num', $billing_info['credit_card']);
-        $this->setField('exp_date', $billing_info['exp_month'] . $billing_info['exp_year']);
-        $this->setField('card_code', $billing_info['cvv']);
-    }
-
-
-    /**
-     * Add a line item.
-     *
-     * @param string $item_id
-     * @param string $item_name
-     * @param string $item_description
-     * @param string $item_quantity
-     * @param string $item_unit_price
-     * @param string $item_taxable
-     */
-    public function addLineItem($item_id, $item_name, $item_description, $item_quantity, $item_unit_price, $item_taxable)
-    {
-        $args = array(
-            substr($item_id, 0, 31),
-            substr($item_name, 0, 31),
-            substr($item_description, 0, 255),
-            number_format(abs($item_quantity), 2, '.', ''),
-            number_format(abs($item_unit_price), 2, '.', ''),
-            $item_taxable === 'N' ? 'N' : 'Y'
-        );
-        $this->_additional_line_items[] = implode('<|>', $args);
-    }
-
-
-    /**
-     * Set an individual name/value pair. This will append x_ to the name
-     * before posting.
-     *
-     * @param string $name
-     * @param string $value
-     * @throws AuthorizeNetException
-     */
-    protected function setField($name, $value)
-    {
-        if (in_array($name, $this->_all_aim_fields)) {
-            $this->_x_post_fields[$name] = $value;
-        } else {
-            throw new AuthorizeNetException("Error: no field $name exists in the AIM API.
+	const LIVE_URL    = 'https://secure2.authorize.net/gateway/transact.dll'; //Authnet URL
+
+	const SANDBOX_URL = 'https://test.authorize.net/gateway/transact.dll';
+
+	protected $_login_id;
+
+	protected $_transaction_key;
+
+	protected $_server;
+
+	protected $_currencies_supported = array(
+		'AUD',
+		'USD',
+		'CAD',
+		'EUR',
+		'GBP',
+		'NZD',
+	);
+
+	/**
+	 * Whether to send test transactions (even to live site)
+	 *
+	 * @var boolean
+	 */
+	protected $_test_transactions;
+
+	private $VERIFY_PEER = false;
+
+	private $_x_post_fields = array(
+		"version"        => "3.1",
+		"delim_char"     => ",",
+		"delim_data"     => "TRUE",
+		"relay_response" => "FALSE",
+		"encap_char"     => "|",
+	);
+
+	private $_additional_line_items = array();
+
+	/**
+	 * A list of all fields in the AIM API.
+	 * Used to warn user if they try to set a field not offered in the API.
+	 */
+	private $_all_aim_fields = array(
+		"address",
+		"allow_partial_auth",
+		"amount",
+		"auth_code",
+		"authentication_indicator",
+		"bank_aba_code",
+		"bank_acct_name",
+		"bank_acct_num",
+		"bank_acct_type",
+		"bank_check_number",
+		"bank_name",
+		"card_code",
+		"card_num",
+		"cardholder_authentication_value",
+		"city",
+		"company",
+		"country",
+		"cust_id",
+		"customer_ip",
+		"delim_char",
+		"delim_data",
+		"description",
+		"duplicate_window",
+		"duty",
+		"echeck_type",
+		"email",
+		"email_customer",
+		"encap_char",
+		"exp_date",
+		"fax",
+		"first_name",
+		"footer_email_receipt",
+		"freight",
+		"header_email_receipt",
+		"invoice_num",
+		"last_name",
+		"line_item",
+		"login",
+		"method",
+		"phone",
+		"po_num",
+		"recurring_billing",
+		"relay_response",
+		"ship_to_address",
+		"ship_to_city",
+		"ship_to_company",
+		"ship_to_country",
+		"ship_to_first_name",
+		"ship_to_last_name",
+		"ship_to_state",
+		"ship_to_zip",
+		"split_tender_id",
+		"state",
+		"tax",
+		"tax_exempt",
+		"test_request",
+		"tran_key",
+		"trans_id",
+		"type",
+		"version",
+		"zip",
+		"solution_id"
+	);
+
+
+	/**
+	 * Gets the URL where the request should go. This is filterable
+	 *
+	 * @return string
+	 */
+	protected function _get_server_url()
+	{
+		return apply_filters(
+			'FHEE__EEG_Aim___get_server_url',
+			$this->_debug_mode ? self::SANDBOX_URL : self::LIVE_URL,
+			$this
+		);
+	}
+
+
+	/**
+	 * TEMPORARY CALLBACK! Do not use
+	 * Callback which filters the server url. This is added so site admins can revert to using
+	 * the old AIM server in case Akamai service breaks their integration.
+	 * Using Akamai will, however, be mandatory on June 30th 2016 Authorize.net
+	 * (see http://www.authorize.net/support/akamaifaqs/#firewall?utm_campaign=April%202016%20Technical%20Updates%20for%20Merchants.html&utm_medium=email&utm_source=Eloqua&elqTrackId=46103bdc375c411a979c2f658fc99074&elq=7026706360154fee9b6d588b27d8eb6a&elqaid=506&elqat=1&elqCampaignId=343)
+	 * Once that happens, this will be obsolete and WILL BE REMOVED.
+	 *
+	 * @param string $url
+	 * @param EEG_Aim $gateway_object
+	 * @return string
+	 */
+	public function possibly_use_deprecated_aim_server($url, EEG_Aim $gateway_object)
+	{
+		if ($gateway_object->_server === 'authorize.net' && ! $gateway_object->_debug_mode) {
+			return 'https://secure.authorize.net/gateway/transact.dll';
+		} else {
+			return $url;
+		}
+	}
+
+
+	/**
+	 * Asks the gateway to do whatever it does to process the payment. Onsite gateways will
+	 * usually send a request directly to the payment provider and update the payment's status based on that;
+	 * whereas offsite gateways will usually just update the payment with the URL and query parameters to use
+	 * for sending the request via http_remote_request()
+	 *
+	 * @param EEI_Payment $payment
+	 * @param array $billing_info {
+	 *  @type $credit_card string
+	 *  @type $cvv string
+	 *  @type $exp_month string
+	 *  @type $exp_year string
+	 *  @see parent::do_direct_payment
+	 * }
+	 * @return EEI_Payment updated
+	 */
+	public function do_direct_payment($payment, $billing_info = null)
+	{
+		add_filter('FHEE__EEG_Aim___get_server_url', array($this, 'possibly_use_deprecated_aim_server'), 10, 2);
+		// Enable test mode if needed
+		//4007000000027  <-- test successful visa
+		//4222222222222  <-- test failure card number
+
+		$item_num = 1;
+		$transaction = $payment->transaction();
+		$gateway_formatter = $this->_get_gateway_formatter();
+		$order_description = $gateway_formatter->formatOrderDescription($payment);
+		$primary_registrant = $transaction->primary_registration();
+		//if we're are charging for the full amount, show the normal line items
+		//and the itemized total adds up properly
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
+			$total_line_item = $transaction->total_line_item();
+			foreach ($total_line_item->get_items() as $line_item) {
+				if ($line_item->quantity() == 0) {
+					continue;
+				}
+				$this->addLineItem(
+					$item_num++,
+					$gateway_formatter->formatLineItemName($line_item, $payment),
+					$gateway_formatter->formatLineItemDesc($line_item, $payment),
+					$line_item->quantity(),
+					$line_item->unit_price(),
+					'N'
+				);
+				$order_description .= $line_item->desc().', ';
+			}
+			foreach($total_line_item->tax_descendants() as $tax_line_item) {
+				$this->addLineItem(
+					$item_num++,
+					$tax_line_item->name(),
+					$tax_line_item->desc(),
+					1,
+					$tax_line_item->total(),
+					'N'
+				);
+			}
+		}
+
+		//start transaction
+		//if in debug mode, use authorize.net's sandbox id; otherwise use the Event Espresso partner id
+		$partner_id = $this->_debug_mode ? 'AAA100302' : 'AAA105363';
+		$this->setField('solution_id', $partner_id);
+		$this->setField('amount', $gateway_formatter->formatCurrency($payment->amount()));
+		$this->setField('description', substr(rtrim($order_description, ', '), 0, 255));
+		$this->_set_sensitive_billing_data($billing_info);
+		$this->setField('first_name', $billing_info['first_name']);
+		$this->setField('last_name', $billing_info['last_name']);
+		$this->setField('email', $billing_info['email']);
+		$this->setField('company', $billing_info['company']);
+		$this->setField('address', $billing_info['address'].' '.$billing_info['address2']);
+		$this->setField('city', $billing_info['city']);
+		$this->setField('state', $billing_info['state']);
+		$this->setField('country', $billing_info['country']);
+		$this->setField('zip', $billing_info['zip']);
+		$this->setField('fax', $billing_info['fax']);
+		$this->setField('cust_id', $primary_registrant->ID());
+		$this->setField('phone', $billing_info['phone']);
+		//invoice_num would be nice to have it be unique per SPCO page-load, that way if users
+		//press back, they don't submit a duplicate. However, we may be keeping the user on teh same spco page
+		//in which case, we need to generate teh invoice num per request right here...
+		$this->setField('invoice_num', wp_generate_password(12, false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
+		//tell AIM that any duplicates sent in the next 5 minutes are to be ignored
+		$this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS);
+
+		if ($this->_test_transactions) {
+			$this->test_request = "true";
+		}
+
+		//Capture response
+		$this->type = "AUTH_CAPTURE";
+		$response = $this->_sendRequest($payment);
+		if (! empty($response)) {
+			if ($response->error_message) {
+				$payment->set_status($this->_pay_model->failed_status());
+				$payment->set_gateway_response($response->error_message);
+			} else {
+				$payment_status = $response->approved
+					? $this->_pay_model->approved_status()
+					: $this->_pay_model->declined_status();
+				$payment->set_status($payment_status);
+				//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
+				$payment->set_amount((float) $response->amount);
+				$payment->set_gateway_response(
+					sprintf(
+						esc_html__('%1$s (Reason Code: %2$s)', 'event_espresso'),
+						$response->response_reason_text,
+						$response->response_reason_code
+					)
+				);
+				if ($this->_debug_mode) {
+					$txn_id = $response->invoice_number;
+				} else {
+					$txn_id = $response->transaction_id;
+				}
+				$payment->set_txn_id_chq_nmbr($txn_id);
+			}
+			$payment->set_extra_accntng($primary_registrant->reg_code());
+			$payment->set_details(print_r($response, true));
+		} else {
+			$payment->set_status($this->_pay_model->failed_status());
+			$payment->set_gateway_response(__("There was no response from Authorize.net", 'event_espresso'));
+			$payment->set_details(print_r($response, true));
+		}
+		return $payment;
+	}
+
+
+	/**
+	 * Sets billing data for the upcoming request to AIM that is considered sensitive;
+	 * also this method can be overridden by children classes to easily change
+	 * what billing data gets sent
+	 *
+	 * @param array $billing_info
+	 */
+	protected function _set_sensitive_billing_data($billing_info)
+	{
+		$this->setField('card_num', $billing_info['credit_card']);
+		$this->setField('exp_date', $billing_info['exp_month'] . $billing_info['exp_year']);
+		$this->setField('card_code', $billing_info['cvv']);
+	}
+
+
+	/**
+	 * Add a line item.
+	 *
+	 * @param string $item_id
+	 * @param string $item_name
+	 * @param string $item_description
+	 * @param string $item_quantity
+	 * @param string $item_unit_price
+	 * @param string $item_taxable
+	 */
+	public function addLineItem($item_id, $item_name, $item_description, $item_quantity, $item_unit_price, $item_taxable)
+	{
+		$args = array(
+			substr($item_id, 0, 31),
+			substr($item_name, 0, 31),
+			substr($item_description, 0, 255),
+			number_format(abs($item_quantity), 2, '.', ''),
+			number_format(abs($item_unit_price), 2, '.', ''),
+			$item_taxable === 'N' ? 'N' : 'Y'
+		);
+		$this->_additional_line_items[] = implode('<|>', $args);
+	}
+
+
+	/**
+	 * Set an individual name/value pair. This will append x_ to the name
+	 * before posting.
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @throws AuthorizeNetException
+	 */
+	protected function setField($name, $value)
+	{
+		if (in_array($name, $this->_all_aim_fields)) {
+			$this->_x_post_fields[$name] = $value;
+		} else {
+			throw new AuthorizeNetException("Error: no field $name exists in the AIM API.
             To set a custom field use setCustomField('field','value') instead.");
-        }
-    }
-
-
-    /**
-     * Posts the request to AuthorizeNet & returns response.
-     *
-     * @param $payment
-     * @return \EE_AuthorizeNetAIM_Response
-     */
-    private function _sendRequest($payment)
-    {
-        $this->_x_post_fields['login'] = $this->_login_id;
-        $this->_x_post_fields['tran_key'] = $this->_transaction_key;
-        $x_keys = array();
-        foreach ($this->_x_post_fields as $key => $value) {
-            $x_keys[] = "x_$key=" . urlencode($this->_get_unsupported_character_remover()->format($value));
-        }
-        // Add line items
-        foreach ($this->_additional_line_items as $key => $value) {
-            $x_keys[] =  "x_line_item=" . urlencode($this->_get_unsupported_character_remover()->format($value));
-        }
-        $this->_log_clean_request($x_keys, $payment);
-        $post_url = $this->_get_server_url();
-        $curl_request = curl_init($post_url);
-        $post_body = implode("&", $x_keys);
-        curl_setopt($curl_request, CURLOPT_POSTFIELDS, $post_body);
-        curl_setopt($curl_request, CURLOPT_HEADER, 0);
-        curl_setopt($curl_request, CURLOPT_TIMEOUT, 45);
-        curl_setopt($curl_request, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl_request, CURLOPT_SSL_VERIFYHOST, 2);
-        if ($this->VERIFY_PEER) {
-            curl_setopt($curl_request, CURLOPT_CAINFO, dirname(__DIR__) . '/ssl/cert.pem');
-        } else {
-            curl_setopt($curl_request, CURLOPT_SSL_VERIFYPEER, false);
-        }
-
-        if (preg_match('/xml/', $post_url)) {
-            curl_setopt($curl_request, CURLOPT_HTTPHEADER, Array("Content-Type: text/xml"));
-        }
-
-        $response = curl_exec($curl_request);
-
-        curl_close($curl_request);
-        $response_obj =  new EE_AuthorizeNetAIM_Response($response);
-
-        return $this->_log_and_clean_response($response_obj, $payment);
-    }
-
-
-    /**
-     * Logs the clean data only
-     *
-     * @param array $request_array
-     * @param EEI_Payment $payment
-     */
-    protected function _log_clean_request($request_array, $payment)
-    {
-        $keys_to_filter_out = array('x_card_num', 'x_card_code', 'x_exp_date');
-        foreach ($request_array as $index => $keyvaltogether) {
-            foreach ($keys_to_filter_out as $key) {
-                if (strpos($keyvaltogether, $key) === 0) {
-                    //found it at the first character
-                    //so its one of them
-                    unset($request_array[$index]);
-                }
-            }
-        }
-        $this->log(
-            array(
-                'AIM Request sent:' => $request_array,
-                'Server URL'        => $this->_get_server_url()
-            ),
-            $payment
-        );
-    }
-
-
-
-    /**
-     * Logs the response and cleans it
-     *
-     * @param EE_AuthorizeNetAIM_Response $response_obj
-     * @param EE_Payment                  $payment
-     * @return \EE_AuthorizeNetAIM_Response
-     */
-    private function _log_and_clean_response($response_obj, $payment)
-    {
-        $response_obj->account_number = '';
-        $this->log(array('AIM Response received:' => (array)$response_obj), $payment);
-        return $response_obj;
-    }
+		}
+	}
+
+
+	/**
+	 * Posts the request to AuthorizeNet & returns response.
+	 *
+	 * @param $payment
+	 * @return \EE_AuthorizeNetAIM_Response
+	 */
+	private function _sendRequest($payment)
+	{
+		$this->_x_post_fields['login'] = $this->_login_id;
+		$this->_x_post_fields['tran_key'] = $this->_transaction_key;
+		$x_keys = array();
+		foreach ($this->_x_post_fields as $key => $value) {
+			$x_keys[] = "x_$key=" . urlencode($this->_get_unsupported_character_remover()->format($value));
+		}
+		// Add line items
+		foreach ($this->_additional_line_items as $key => $value) {
+			$x_keys[] =  "x_line_item=" . urlencode($this->_get_unsupported_character_remover()->format($value));
+		}
+		$this->_log_clean_request($x_keys, $payment);
+		$post_url = $this->_get_server_url();
+		$curl_request = curl_init($post_url);
+		$post_body = implode("&", $x_keys);
+		curl_setopt($curl_request, CURLOPT_POSTFIELDS, $post_body);
+		curl_setopt($curl_request, CURLOPT_HEADER, 0);
+		curl_setopt($curl_request, CURLOPT_TIMEOUT, 45);
+		curl_setopt($curl_request, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($curl_request, CURLOPT_SSL_VERIFYHOST, 2);
+		if ($this->VERIFY_PEER) {
+			curl_setopt($curl_request, CURLOPT_CAINFO, dirname(__DIR__) . '/ssl/cert.pem');
+		} else {
+			curl_setopt($curl_request, CURLOPT_SSL_VERIFYPEER, false);
+		}
+
+		if (preg_match('/xml/', $post_url)) {
+			curl_setopt($curl_request, CURLOPT_HTTPHEADER, Array("Content-Type: text/xml"));
+		}
+
+		$response = curl_exec($curl_request);
+
+		curl_close($curl_request);
+		$response_obj =  new EE_AuthorizeNetAIM_Response($response);
+
+		return $this->_log_and_clean_response($response_obj, $payment);
+	}
+
+
+	/**
+	 * Logs the clean data only
+	 *
+	 * @param array $request_array
+	 * @param EEI_Payment $payment
+	 */
+	protected function _log_clean_request($request_array, $payment)
+	{
+		$keys_to_filter_out = array('x_card_num', 'x_card_code', 'x_exp_date');
+		foreach ($request_array as $index => $keyvaltogether) {
+			foreach ($keys_to_filter_out as $key) {
+				if (strpos($keyvaltogether, $key) === 0) {
+					//found it at the first character
+					//so its one of them
+					unset($request_array[$index]);
+				}
+			}
+		}
+		$this->log(
+			array(
+				'AIM Request sent:' => $request_array,
+				'Server URL'        => $this->_get_server_url()
+			),
+			$payment
+		);
+	}
+
+
+
+	/**
+	 * Logs the response and cleans it
+	 *
+	 * @param EE_AuthorizeNetAIM_Response $response_obj
+	 * @param EE_Payment                  $payment
+	 * @return \EE_AuthorizeNetAIM_Response
+	 */
+	private function _log_and_clean_response($response_obj, $payment)
+	{
+		$response_obj->account_number = '';
+		$this->log(array('AIM Response received:' => (array)$response_obj), $payment);
+		return $response_obj;
+	}
 }
 
 
@@ -462,193 +462,193 @@ 
 class EE_AuthorizeNetAIM_Response
 {
 
-    const APPROVED = '1';
-    const DECLINED = '2';
-    const ERROR = '3';
-    const HELD = '4';
-
-    protected $_x_post_fields = array(
-        "version"        => "3.1",
-        "delim_char"     => ",",
-        "delim_data"     => "TRUE",
-        "relay_response" => "FALSE",
-        "encap_char"     => "|",
-    );
-    public $approved;
-    public $declined;
-    public $error;
-    public $held;
-    public $response_code;
-    public $response_subcode;
-    public $response_reason_code;
-    public $response_reason_text;
-    public $authorization_code;
-    public $avs_response;
-    public $transaction_id;
-    public $invoice_number;
-    public $description;
-    public $amount;
-    public $method;
-    public $transaction_type;
-    public $customer_id;
-    public $first_name;
-    public $last_name;
-    public $company;
-    public $address;
-    public $city;
-    public $state;
-    public $zip_code;
-    public $country;
-    public $phone;
-    public $fax;
-    public $email_address;
-    public $ship_to_first_name;
-    public $ship_to_last_name;
-    public $ship_to_company;
-    public $ship_to_address;
-    public $ship_to_city;
-    public $ship_to_state;
-    public $ship_to_zip_code;
-    public $ship_to_country;
-    public $tax;
-    public $duty;
-    public $freight;
-    public $tax_exempt;
-    public $purchase_order_number;
-    public $md5_hash;
-    public $card_code_response;
-    public $cavv_response; // cardholder_authentication_verification_response
-    public $account_number;
-    public $card_type;
-    public $split_tender_id;
-    public $requested_amount;
-    public $balance_on_card;
-    public $response; // The response string from AuthorizeNet.
-    public $error_message;
-    private $_response_array = array(); // An array with the split response.
-
-
-    /**
-     * Constructor. Parses the AuthorizeNet response string
-     *
-     * @param string $response The response from the AuthNet server.
-     * @var string   $delimiter The delimiter used (default is ",")
-     * @var string   $encap_char The encap_char used (default is "|")
-     * @var array    $custom_fields Any custom fields set in the request.
-     */
-
-    public function __construct($response)
-    {
-        $encap_char = $this->_x_post_fields['encap_char'];
-        $delimiter = $this->_x_post_fields['delim_char'];
-        if ($response) {
-            // Split Array
-            $this->response = $response;
-            if ($encap_char) {
-                $this->_response_array = explode($encap_char . $delimiter . $encap_char, substr($response, 1, -1));
-            } else {
-                $this->_response_array = explode($delimiter, $response);
-            }
-
-            /**
-             * If AuthorizeNet doesn't return a delimited response.
-             */
-            if (count($this->_response_array) < 10) {
-                $this->approved = false;
-                $this->error = true;
-                $this->error_message = sprintf(
-                    esc_html__('Unrecognized response from Authorize.net: %1$s', 'event_espresso'),
-                    esc_html($response)
-                );
-                return;
-            }
-
-
-
-            // Set all fields
-            $this->response_code = $this->_response_array[0];
-            $this->response_subcode = $this->_response_array[1];
-            $this->response_reason_code = $this->_response_array[2];
-            $this->response_reason_text = $this->_response_array[3];
-            $this->authorization_code = $this->_response_array[4];
-            $this->avs_response = $this->_response_array[5];
-            $this->transaction_id = $this->_response_array[6];
-            $this->invoice_number = $this->_response_array[7];
-            $this->description = $this->_response_array[8];
-            $this->amount = $this->_response_array[9];
-            $this->method = $this->_response_array[10];
-            $this->transaction_type = $this->_response_array[11];
-            $this->customer_id = $this->_response_array[12];
-            $this->first_name = $this->_response_array[13];
-            $this->last_name = $this->_response_array[14];
-            $this->company = $this->_response_array[15];
-            $this->address = $this->_response_array[16];
-            $this->city = $this->_response_array[17];
-            $this->state = $this->_response_array[18];
-            $this->zip_code = $this->_response_array[19];
-            $this->country = $this->_response_array[20];
-            $this->phone = $this->_response_array[21];
-            $this->fax = $this->_response_array[22];
-            $this->email_address = $this->_response_array[23];
-            $this->ship_to_first_name = $this->_response_array[24];
-            $this->ship_to_last_name = $this->_response_array[25];
-            $this->ship_to_company = $this->_response_array[26];
-            $this->ship_to_address = $this->_response_array[27];
-            $this->ship_to_city = $this->_response_array[28];
-            $this->ship_to_state = $this->_response_array[29];
-            $this->ship_to_zip_code = $this->_response_array[30];
-            $this->ship_to_country = $this->_response_array[31];
-            $this->tax = $this->_response_array[32];
-            $this->duty = $this->_response_array[33];
-            $this->freight = $this->_response_array[34];
-            $this->tax_exempt = $this->_response_array[35];
-            $this->purchase_order_number = $this->_response_array[36];
-            $this->md5_hash = $this->_response_array[37];
-            $this->card_code_response = $this->_response_array[38];
-            $this->cavv_response = $this->_response_array[39];
-            $this->account_number = $this->_response_array[50];
-            $this->card_type = $this->_response_array[51];
-            $this->split_tender_id = $this->_response_array[52];
-            $this->requested_amount = $this->_response_array[53];
-            $this->balance_on_card = $this->_response_array[54];
-
-            $this->approved = ($this->response_code === self::APPROVED);
-            $this->declined = ($this->response_code === self::DECLINED);
-            $this->error = ($this->response_code === self::ERROR);
-            $this->held = ($this->response_code === self::HELD);
-        } else {
-            $this->approved = false;
-            $this->error = true;
-            $this->error_message = esc_html__(
-                'Error connecting to Authorize.net',
-                'event_espresso'
-            );
-        }
-    }
+	const APPROVED = '1';
+	const DECLINED = '2';
+	const ERROR = '3';
+	const HELD = '4';
+
+	protected $_x_post_fields = array(
+		"version"        => "3.1",
+		"delim_char"     => ",",
+		"delim_data"     => "TRUE",
+		"relay_response" => "FALSE",
+		"encap_char"     => "|",
+	);
+	public $approved;
+	public $declined;
+	public $error;
+	public $held;
+	public $response_code;
+	public $response_subcode;
+	public $response_reason_code;
+	public $response_reason_text;
+	public $authorization_code;
+	public $avs_response;
+	public $transaction_id;
+	public $invoice_number;
+	public $description;
+	public $amount;
+	public $method;
+	public $transaction_type;
+	public $customer_id;
+	public $first_name;
+	public $last_name;
+	public $company;
+	public $address;
+	public $city;
+	public $state;
+	public $zip_code;
+	public $country;
+	public $phone;
+	public $fax;
+	public $email_address;
+	public $ship_to_first_name;
+	public $ship_to_last_name;
+	public $ship_to_company;
+	public $ship_to_address;
+	public $ship_to_city;
+	public $ship_to_state;
+	public $ship_to_zip_code;
+	public $ship_to_country;
+	public $tax;
+	public $duty;
+	public $freight;
+	public $tax_exempt;
+	public $purchase_order_number;
+	public $md5_hash;
+	public $card_code_response;
+	public $cavv_response; // cardholder_authentication_verification_response
+	public $account_number;
+	public $card_type;
+	public $split_tender_id;
+	public $requested_amount;
+	public $balance_on_card;
+	public $response; // The response string from AuthorizeNet.
+	public $error_message;
+	private $_response_array = array(); // An array with the split response.
+
+
+	/**
+	 * Constructor. Parses the AuthorizeNet response string
+	 *
+	 * @param string $response The response from the AuthNet server.
+	 * @var string   $delimiter The delimiter used (default is ",")
+	 * @var string   $encap_char The encap_char used (default is "|")
+	 * @var array    $custom_fields Any custom fields set in the request.
+	 */
+
+	public function __construct($response)
+	{
+		$encap_char = $this->_x_post_fields['encap_char'];
+		$delimiter = $this->_x_post_fields['delim_char'];
+		if ($response) {
+			// Split Array
+			$this->response = $response;
+			if ($encap_char) {
+				$this->_response_array = explode($encap_char . $delimiter . $encap_char, substr($response, 1, -1));
+			} else {
+				$this->_response_array = explode($delimiter, $response);
+			}
+
+			/**
+			 * If AuthorizeNet doesn't return a delimited response.
+			 */
+			if (count($this->_response_array) < 10) {
+				$this->approved = false;
+				$this->error = true;
+				$this->error_message = sprintf(
+					esc_html__('Unrecognized response from Authorize.net: %1$s', 'event_espresso'),
+					esc_html($response)
+				);
+				return;
+			}
+
+
+
+			// Set all fields
+			$this->response_code = $this->_response_array[0];
+			$this->response_subcode = $this->_response_array[1];
+			$this->response_reason_code = $this->_response_array[2];
+			$this->response_reason_text = $this->_response_array[3];
+			$this->authorization_code = $this->_response_array[4];
+			$this->avs_response = $this->_response_array[5];
+			$this->transaction_id = $this->_response_array[6];
+			$this->invoice_number = $this->_response_array[7];
+			$this->description = $this->_response_array[8];
+			$this->amount = $this->_response_array[9];
+			$this->method = $this->_response_array[10];
+			$this->transaction_type = $this->_response_array[11];
+			$this->customer_id = $this->_response_array[12];
+			$this->first_name = $this->_response_array[13];
+			$this->last_name = $this->_response_array[14];
+			$this->company = $this->_response_array[15];
+			$this->address = $this->_response_array[16];
+			$this->city = $this->_response_array[17];
+			$this->state = $this->_response_array[18];
+			$this->zip_code = $this->_response_array[19];
+			$this->country = $this->_response_array[20];
+			$this->phone = $this->_response_array[21];
+			$this->fax = $this->_response_array[22];
+			$this->email_address = $this->_response_array[23];
+			$this->ship_to_first_name = $this->_response_array[24];
+			$this->ship_to_last_name = $this->_response_array[25];
+			$this->ship_to_company = $this->_response_array[26];
+			$this->ship_to_address = $this->_response_array[27];
+			$this->ship_to_city = $this->_response_array[28];
+			$this->ship_to_state = $this->_response_array[29];
+			$this->ship_to_zip_code = $this->_response_array[30];
+			$this->ship_to_country = $this->_response_array[31];
+			$this->tax = $this->_response_array[32];
+			$this->duty = $this->_response_array[33];
+			$this->freight = $this->_response_array[34];
+			$this->tax_exempt = $this->_response_array[35];
+			$this->purchase_order_number = $this->_response_array[36];
+			$this->md5_hash = $this->_response_array[37];
+			$this->card_code_response = $this->_response_array[38];
+			$this->cavv_response = $this->_response_array[39];
+			$this->account_number = $this->_response_array[50];
+			$this->card_type = $this->_response_array[51];
+			$this->split_tender_id = $this->_response_array[52];
+			$this->requested_amount = $this->_response_array[53];
+			$this->balance_on_card = $this->_response_array[54];
+
+			$this->approved = ($this->response_code === self::APPROVED);
+			$this->declined = ($this->response_code === self::DECLINED);
+			$this->error = ($this->response_code === self::ERROR);
+			$this->held = ($this->response_code === self::HELD);
+		} else {
+			$this->approved = false;
+			$this->error = true;
+			$this->error_message = esc_html__(
+				'Error connecting to Authorize.net',
+				'event_espresso'
+			);
+		}
+	}
 }
 
 if (! class_exists('AuthorizeNetException')) {
-    /**
-     * Class AuthorizeNetException
-     *
-     * @package    AuthorizeNet
-     */
-    class AuthorizeNetException extends Exception
-    {
-
-        /**
-         * Construct the exception. Note: The message is NOT binary safe.
-         *
-         * @link http://php.net/manual/en/exception.construct.php
-         * @param string $message [optional] The Exception message to throw.
-         * @param int $code [optional] The Exception code.
-         * @param Exception $previous [optional] The previous exception used for the exception chaining. Since 5.3.0
-         * @since 5.1.0
-         */
-        public function __construct($message = "", $code = 0, Exception $previous = null)
-        {
-            parent::__construct($message, $code, $previous);
-        }
-    }
+	/**
+	 * Class AuthorizeNetException
+	 *
+	 * @package    AuthorizeNet
+	 */
+	class AuthorizeNetException extends Exception
+	{
+
+		/**
+		 * Construct the exception. Note: The message is NOT binary safe.
+		 *
+		 * @link http://php.net/manual/en/exception.construct.php
+		 * @param string $message [optional] The Exception message to throw.
+		 * @param int $code [optional] The Exception code.
+		 * @param Exception $previous [optional] The previous exception used for the exception chaining. Since 5.3.0
+		 * @since 5.1.0
+		 */
+		public function __construct($message = "", $code = 0, Exception $previous = null)
+		{
+			parent::__construct($message, $code, $previous);
+		}
+	}
 }
 // End of file EEG_Aim.gateway.php
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('NO direct script access allowed');
 }
 
@@ -220,7 +220,7 @@ 
                 );
                 $order_description .= $line_item->desc().', ';
             }
-            foreach($total_line_item->tax_descendants() as $tax_line_item) {
+            foreach ($total_line_item->tax_descendants() as $tax_line_item) {
                 $this->addLineItem(
                     $item_num++,
                     $tax_line_item->name(),
@@ -254,7 +254,7 @@ 
         //invoice_num would be nice to have it be unique per SPCO page-load, that way if users
         //press back, they don't submit a duplicate. However, we may be keeping the user on teh same spco page
         //in which case, we need to generate teh invoice num per request right here...
-        $this->setField('invoice_num', wp_generate_password(12, false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
+        $this->setField('invoice_num', wp_generate_password(12, false)); //$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
         //tell AIM that any duplicates sent in the next 5 minutes are to be ignored
         $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS);
 
@@ -265,7 +265,7 @@ 
         //Capture response
         $this->type = "AUTH_CAPTURE";
         $response = $this->_sendRequest($payment);
-        if (! empty($response)) {
+        if ( ! empty($response)) {
             if ($response->error_message) {
                 $payment->set_status($this->_pay_model->failed_status());
                 $payment->set_gateway_response($response->error_message);
@@ -311,7 +311,7 @@ 
     protected function _set_sensitive_billing_data($billing_info)
     {
         $this->setField('card_num', $billing_info['credit_card']);
-        $this->setField('exp_date', $billing_info['exp_month'] . $billing_info['exp_year']);
+        $this->setField('exp_date', $billing_info['exp_month'].$billing_info['exp_year']);
         $this->setField('card_code', $billing_info['cvv']);
     }
 
@@ -371,11 +371,11 @@ 
         $this->_x_post_fields['tran_key'] = $this->_transaction_key;
         $x_keys = array();
         foreach ($this->_x_post_fields as $key => $value) {
-            $x_keys[] = "x_$key=" . urlencode($this->_get_unsupported_character_remover()->format($value));
+            $x_keys[] = "x_$key=".urlencode($this->_get_unsupported_character_remover()->format($value));
         }
         // Add line items
         foreach ($this->_additional_line_items as $key => $value) {
-            $x_keys[] =  "x_line_item=" . urlencode($this->_get_unsupported_character_remover()->format($value));
+            $x_keys[] = "x_line_item=".urlencode($this->_get_unsupported_character_remover()->format($value));
         }
         $this->_log_clean_request($x_keys, $payment);
         $post_url = $this->_get_server_url();
@@ -387,7 +387,7 @@ 
         curl_setopt($curl_request, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($curl_request, CURLOPT_SSL_VERIFYHOST, 2);
         if ($this->VERIFY_PEER) {
-            curl_setopt($curl_request, CURLOPT_CAINFO, dirname(__DIR__) . '/ssl/cert.pem');
+            curl_setopt($curl_request, CURLOPT_CAINFO, dirname(__DIR__).'/ssl/cert.pem');
         } else {
             curl_setopt($curl_request, CURLOPT_SSL_VERIFYPEER, false);
         }
@@ -399,7 +399,7 @@ 
         $response = curl_exec($curl_request);
 
         curl_close($curl_request);
-        $response_obj =  new EE_AuthorizeNetAIM_Response($response);
+        $response_obj = new EE_AuthorizeNetAIM_Response($response);
 
         return $this->_log_and_clean_response($response_obj, $payment);
     }
@@ -444,7 +444,7 @@ 
     private function _log_and_clean_response($response_obj, $payment)
     {
         $response_obj->account_number = '';
-        $this->log(array('AIM Response received:' => (array)$response_obj), $payment);
+        $this->log(array('AIM Response received:' => (array) $response_obj), $payment);
         return $response_obj;
     }
 }
@@ -545,7 +545,7 @@ 
             // Split Array
             $this->response = $response;
             if ($encap_char) {
-                $this->_response_array = explode($encap_char . $delimiter . $encap_char, substr($response, 1, -1));
+                $this->_response_array = explode($encap_char.$delimiter.$encap_char, substr($response, 1, -1));
             } else {
                 $this->_response_array = explode($delimiter, $response);
             }
@@ -627,7 +627,7 @@ 
     }
 }
 
-if (! class_exists('AuthorizeNetException')) {
+if ( ! class_exists('AuthorizeNetException')) {
     /**
      * Class AuthorizeNetException
      *

caffeinated/payment_methods/Mijireh/EEG_Mijireh.gateway.php

Indentation +268 added lines, -268 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 
@@ -16,290 +16,290 @@ 
 class EEG_Mijireh extends EE_Offsite_Gateway
 {
 
-    /**
-     * Mijreh API access key.
-     *
-     * @var $_access_key string
-     */
-    protected $_access_key;
+	/**
+	 * Mijreh API access key.
+	 *
+	 * @var $_access_key string
+	 */
+	protected $_access_key;
 
-    /**
-     * Mijreh supported currencies.
-     *
-     * @var $_currencies_supported array
-     */
-    protected $_currencies_supported = EE_Gateway::all_currencies_supported;
+	/**
+	 * Mijreh supported currencies.
+	 *
+	 * @var $_currencies_supported array
+	 */
+	protected $_currencies_supported = EE_Gateway::all_currencies_supported;
 
-    /**
-     * Mijreh API order URL.
-     *
-     * @var $_mijireh_api_orders_url string
-     */
-    protected $_mijireh_api_orders_url = 'https://secure.mijireh.com/api/1/orders';
+	/**
+	 * Mijreh API order URL.
+	 *
+	 * @var $_mijireh_api_orders_url string
+	 */
+	protected $_mijireh_api_orders_url = 'https://secure.mijireh.com/api/1/orders';
 
 
-    /**
-     * @param EE_Payment $payment to process
-     * @param array      $billing_info but should be empty for this gateway
-     * @param string     $return_url URL to send the user to after a successful payment on the payment provider's website
-     * @param string     $notify_url URL to send the instant payment notification
-     * @param string     $cancel_url URL to send the user to after a cancelled payment attempt on teh payment provider's website
-     * @throws \EE_Error
-     * @return EE_Payment
-     */
-    public function set_redirection_info(
-        $payment,
-        $billing_info = array(),
-        $return_url = NULL,
-        $notify_url = NULL,
-        $cancel_url = NULL
-    ) {
-        /* @var $transaction EE_Transaction */
-        $transaction = $payment->transaction();
-        $gateway_formatter = $this->_get_gateway_formatter();
+	/**
+	 * @param EE_Payment $payment to process
+	 * @param array      $billing_info but should be empty for this gateway
+	 * @param string     $return_url URL to send the user to after a successful payment on the payment provider's website
+	 * @param string     $notify_url URL to send the instant payment notification
+	 * @param string     $cancel_url URL to send the user to after a cancelled payment attempt on teh payment provider's website
+	 * @throws \EE_Error
+	 * @return EE_Payment
+	 */
+	public function set_redirection_info(
+		$payment,
+		$billing_info = array(),
+		$return_url = NULL,
+		$notify_url = NULL,
+		$cancel_url = NULL
+	) {
+		/* @var $transaction EE_Transaction */
+		$transaction = $payment->transaction();
+		$gateway_formatter = $this->_get_gateway_formatter();
 
-        //get any of the current registrations,
-        $primary_registrant = $transaction->primary_registration();
+		//get any of the current registrations,
+		$primary_registrant = $transaction->primary_registration();
 
-        $primary_attendee = $primary_registrant->attendee();
-        $items = array();
-        //if we're are charging for the full amount, show the normal line items
-        if ($this->_can_easily_itemize_transaction_for($payment)) {
-            $total_line_item = $transaction->total_line_item();
-            $tax_total = $total_line_item->get_total_tax();
-            foreach ($total_line_item->get_items() as $line_item) {
-                $items[] = array(
-                    'name'     => apply_filters(
-                        'FHEE__EEG_Mijireh__set_redirection_info__full_amount_line_item_name',
-                        $gateway_formatter->formatLineItemName($line_item, $payment),
-                        $line_item,
-                        $payment,
-                        $primary_registrant
-                    ),
-                    'price'    => $gateway_formatter->formatCurrency($line_item->unit_price()),
-                    'sku'      => $line_item->code(),
-                    'quantity' => $line_item->quantity()
-                );
-            }
-        } else {//its a partial payment
-            $tax_total = 0;
-            //partial payment, so just add 1 item
-            $items[] = array(
-                'name'     => apply_filters(
-                    'FHEE__EEG_Mijireh__set_redirection_info__partial_amount_line_item_name',
-                    $gateway_formatter->formatPartialPaymentLineItemName($payment),
-                    $payment,
-                    $primary_registrant
-                ),
-                'price'    => $gateway_formatter->formatCurrency($payment->amount()),
-                'sku'      => $primary_registrant->reg_code(),
-                'quantity' => 1
-            );
-        }
-        $order = array(
-            'total'      => $gateway_formatter->formatCurrency($payment->amount()),
-            'return_url' => $return_url,
-            'items'      => $this->_prepare_for_mijireh($items),
-            'email'      => $primary_attendee->email(),
-            'first_name' => $primary_attendee->fname(),
-            'last_name'  => $primary_attendee->lname(),
-            'tax'        => $gateway_formatter->formatCurrency($tax_total),
-            'partner_id' => 'ee'
-        );
-        //setup address?
-        if ($primary_attendee->address()
-            && $primary_attendee->city()
-            && $primary_attendee->state_ID()
-            && $primary_attendee->country_ID()
-            && $primary_attendee->zip()
-        ) {
-            $shipping_address = array(
-                'first_name'     => $primary_attendee->fname(),
-                'last_name'      => $primary_attendee->lname(),
-                'street'         => $primary_attendee->address(),
-                'city'           => $primary_attendee->city(),
-                'state_province' => $primary_attendee->state_name(),
-                'zip_code'       => $primary_attendee->zip(),
-                'country'        => $primary_attendee->country_ID()
-            );
-            if ($primary_attendee->address2()) {
-                $shipping_address['apt_suite'] = $primary_attendee->address2();
-            }
-            if ($primary_attendee->phone()) {
-                $shipping_address['phone'] = $primary_attendee->phone();
-            }
-            $order['shipping_address'] = $shipping_address;
-        }
-        $order = apply_filters(
-            'FHEE__EEG_Mijireh__set_redirection_info__order_arguments',
-            $order,
-            $payment,
-            $primary_registrant
-        );
-        do_action('AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this)));
-        $order = $this->_get_unsupported_character_remover()->formatArray($order);
+		$primary_attendee = $primary_registrant->attendee();
+		$items = array();
+		//if we're are charging for the full amount, show the normal line items
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
+			$total_line_item = $transaction->total_line_item();
+			$tax_total = $total_line_item->get_total_tax();
+			foreach ($total_line_item->get_items() as $line_item) {
+				$items[] = array(
+					'name'     => apply_filters(
+						'FHEE__EEG_Mijireh__set_redirection_info__full_amount_line_item_name',
+						$gateway_formatter->formatLineItemName($line_item, $payment),
+						$line_item,
+						$payment,
+						$primary_registrant
+					),
+					'price'    => $gateway_formatter->formatCurrency($line_item->unit_price()),
+					'sku'      => $line_item->code(),
+					'quantity' => $line_item->quantity()
+				);
+			}
+		} else {//its a partial payment
+			$tax_total = 0;
+			//partial payment, so just add 1 item
+			$items[] = array(
+				'name'     => apply_filters(
+					'FHEE__EEG_Mijireh__set_redirection_info__partial_amount_line_item_name',
+					$gateway_formatter->formatPartialPaymentLineItemName($payment),
+					$payment,
+					$primary_registrant
+				),
+				'price'    => $gateway_formatter->formatCurrency($payment->amount()),
+				'sku'      => $primary_registrant->reg_code(),
+				'quantity' => 1
+			);
+		}
+		$order = array(
+			'total'      => $gateway_formatter->formatCurrency($payment->amount()),
+			'return_url' => $return_url,
+			'items'      => $this->_prepare_for_mijireh($items),
+			'email'      => $primary_attendee->email(),
+			'first_name' => $primary_attendee->fname(),
+			'last_name'  => $primary_attendee->lname(),
+			'tax'        => $gateway_formatter->formatCurrency($tax_total),
+			'partner_id' => 'ee'
+		);
+		//setup address?
+		if ($primary_attendee->address()
+			&& $primary_attendee->city()
+			&& $primary_attendee->state_ID()
+			&& $primary_attendee->country_ID()
+			&& $primary_attendee->zip()
+		) {
+			$shipping_address = array(
+				'first_name'     => $primary_attendee->fname(),
+				'last_name'      => $primary_attendee->lname(),
+				'street'         => $primary_attendee->address(),
+				'city'           => $primary_attendee->city(),
+				'state_province' => $primary_attendee->state_name(),
+				'zip_code'       => $primary_attendee->zip(),
+				'country'        => $primary_attendee->country_ID()
+			);
+			if ($primary_attendee->address2()) {
+				$shipping_address['apt_suite'] = $primary_attendee->address2();
+			}
+			if ($primary_attendee->phone()) {
+				$shipping_address['phone'] = $primary_attendee->phone();
+			}
+			$order['shipping_address'] = $shipping_address;
+		}
+		$order = apply_filters(
+			'FHEE__EEG_Mijireh__set_redirection_info__order_arguments',
+			$order,
+			$payment,
+			$primary_registrant
+		);
+		do_action('AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this)));
+		$order = $this->_get_unsupported_character_remover()->formatArray($order);
 
-        $args = array(
-            'headers' => array(
-                'Authorization' => 'Basic ' . base64_encode($this->_access_key . ':'),
-                'Accept'        => 'application/json'
-            ),
-            'body'    => wp_json_encode($order)
-        );
-        $response = wp_remote_post($this->_mijireh_api_orders_url, $args);
-        $problems_string = false;
-        $this->log(array('get checkout url request_args' => $args, 'response' => $response), $payment);
-        if (! $response instanceof WP_Error) {
-            $response_body = json_decode($response['body']);
-            if ($response_body && isset($response_body->checkout_url)) {
-                $payment->set_redirect_url($response_body->checkout_url);
-                $payment->set_txn_id_chq_nmbr($response_body->order_number);
-                $payment->set_details($response['body']);
-            } else {
-                if (is_array($response_body) || is_object($response_body)) {
-                    $response_body_as_array = (array)$response_body;
-                    foreach ($response_body_as_array as $problem_parameter => $problems) {
-                        $problems_string .= sprintf(
-                            __('\nProblems with %s: %s', 'event_espresso'),
-                            $problem_parameter,
-                            implode(", ", $problems)
-                        );
-                    }
-                } else {
-                    $problems_string = $response['body'];
-                }
-                if (! $problems_string) {
-                    //no message to show? wack
-                    if (isset($response['headers']['status'])) {
-                        $problems_string = $response['headers']['status'];
-                    } else {
-                        $problems_string = __('No response from Mijireh', 'event_espresso');
-                    }
-                }
-            }
-        } else {
-            $problems_string = implode(",", $response->get_error_messages());
-        }
-        if ($problems_string) {
-            $payment->set_gateway_response(
-                sprintf(
-                    __('Errors occurred communicating with Mijireh: %1$s', 'event_espresso'),
-                    $problems_string
-                )
-            );
-            $payment->set_details($response);
-            $payment->set_redirect_url(null);
-            //even though the payment's status is failed at this point anyways,
-            //let's be explicit about it. The fact that the redirect url is null
-            //should be enough to client code that they can't redirect the user
-            $payment->set_status($this->_pay_model->failed_status());
-        }
-        return $payment;
-    }
+		$args = array(
+			'headers' => array(
+				'Authorization' => 'Basic ' . base64_encode($this->_access_key . ':'),
+				'Accept'        => 'application/json'
+			),
+			'body'    => wp_json_encode($order)
+		);
+		$response = wp_remote_post($this->_mijireh_api_orders_url, $args);
+		$problems_string = false;
+		$this->log(array('get checkout url request_args' => $args, 'response' => $response), $payment);
+		if (! $response instanceof WP_Error) {
+			$response_body = json_decode($response['body']);
+			if ($response_body && isset($response_body->checkout_url)) {
+				$payment->set_redirect_url($response_body->checkout_url);
+				$payment->set_txn_id_chq_nmbr($response_body->order_number);
+				$payment->set_details($response['body']);
+			} else {
+				if (is_array($response_body) || is_object($response_body)) {
+					$response_body_as_array = (array)$response_body;
+					foreach ($response_body_as_array as $problem_parameter => $problems) {
+						$problems_string .= sprintf(
+							__('\nProblems with %s: %s', 'event_espresso'),
+							$problem_parameter,
+							implode(", ", $problems)
+						);
+					}
+				} else {
+					$problems_string = $response['body'];
+				}
+				if (! $problems_string) {
+					//no message to show? wack
+					if (isset($response['headers']['status'])) {
+						$problems_string = $response['headers']['status'];
+					} else {
+						$problems_string = __('No response from Mijireh', 'event_espresso');
+					}
+				}
+			}
+		} else {
+			$problems_string = implode(",", $response->get_error_messages());
+		}
+		if ($problems_string) {
+			$payment->set_gateway_response(
+				sprintf(
+					__('Errors occurred communicating with Mijireh: %1$s', 'event_espresso'),
+					$problems_string
+				)
+			);
+			$payment->set_details($response);
+			$payment->set_redirect_url(null);
+			//even though the payment's status is failed at this point anyways,
+			//let's be explicit about it. The fact that the redirect url is null
+			//should be enough to client code that they can't redirect the user
+			$payment->set_status($this->_pay_model->failed_status());
+		}
+		return $payment;
+	}
 
 
-    /**
-     * goes through $data and ensures there are no percent signs in it
-     * (which, strangely, kill mijireh)
-     *
-     * @param mixed $data
-     * @return mixed same type as $data
-     */
-    private function _prepare_for_mijireh($data)
-    {
-        if (is_array($data)) {
-            $prepared_data = array();
-            foreach($data as $key => $datum) {
-                $prepared_data[$key] = $this->_prepare_for_mijireh($datum);
-            }
-            return $prepared_data;
-        } elseif (is_string($data)) {
-            return str_replace('%', 'percent', $data);
-        } else {
-            return $data;
-        }
-    }
+	/**
+	 * goes through $data and ensures there are no percent signs in it
+	 * (which, strangely, kill mijireh)
+	 *
+	 * @param mixed $data
+	 * @return mixed same type as $data
+	 */
+	private function _prepare_for_mijireh($data)
+	{
+		if (is_array($data)) {
+			$prepared_data = array();
+			foreach($data as $key => $datum) {
+				$prepared_data[$key] = $this->_prepare_for_mijireh($datum);
+			}
+			return $prepared_data;
+		} elseif (is_string($data)) {
+			return str_replace('%', 'percent', $data);
+		} else {
+			return $data;
+		}
+	}
 
 
-    /**
-     * Handles the payment update (note: mijireh doesn't send an IPN in the usual sense,
-     * instead they just redirect the user back to our website and then we need to query them
-     * for the payment's status). Also note that the $update_info should be an array with the key
-     * 'payment' containing the EEI_Payment to update
-     *
-     * @param array $update_info unused. We just use the $transaction
-     * @param EEI_Transaction $transaction
-     * @return \EEI_Payment
-     * @throws EE_Error
-     */
-    public function handle_payment_update($update_info, $transaction)
-    {
-        foreach($transaction->pending_payments() as $payment) {
-            $payment = $this->check_payment_in_mijireh($payment);
-            if ($payment->status() === $this->_pay_model->approved_status()) {
-                return $payment;
-            }
-        }
-        $payment = $transaction instanceof EEI_Transaction ? $transaction->last_payment() : NULL;
+	/**
+	 * Handles the payment update (note: mijireh doesn't send an IPN in the usual sense,
+	 * instead they just redirect the user back to our website and then we need to query them
+	 * for the payment's status). Also note that the $update_info should be an array with the key
+	 * 'payment' containing the EEI_Payment to update
+	 *
+	 * @param array $update_info unused. We just use the $transaction
+	 * @param EEI_Transaction $transaction
+	 * @return \EEI_Payment
+	 * @throws EE_Error
+	 */
+	public function handle_payment_update($update_info, $transaction)
+	{
+		foreach($transaction->pending_payments() as $payment) {
+			$payment = $this->check_payment_in_mijireh($payment);
+			if ($payment->status() === $this->_pay_model->approved_status()) {
+				return $payment;
+			}
+		}
+		$payment = $transaction instanceof EEI_Transaction ? $transaction->last_payment() : NULL;
 
-        if (! $payment instanceof EEI_Payment) {
-            throw new EE_Error(
-                sprintf(
-                    __("Could not find Mijireh payment for transaction %s", 'event_espresso'),
-                    $transaction->ID()
-                )
-            );
-        }
-        return $payment;
-    }
+		if (! $payment instanceof EEI_Payment) {
+			throw new EE_Error(
+				sprintf(
+					__("Could not find Mijireh payment for transaction %s", 'event_espresso'),
+					$transaction->ID()
+				)
+			);
+		}
+		return $payment;
+	}
 
 
-    /**
-     * Checks the payment's status in Mijireh for this specific payment
-     *
-     * @param \EEI_Payment $payment
-     * @return \EEI_Payment
-     */
-    public function check_payment_in_mijireh(EEI_Payment $payment)
-    {
-        $request_args = array(
-            'headers' => array(
-                'Authorization' => 'Basic ' . base64_encode($this->_access_key . ':'),
-                'Accept'        => 'application/json'
-            )
-        );
+	/**
+	 * Checks the payment's status in Mijireh for this specific payment
+	 *
+	 * @param \EEI_Payment $payment
+	 * @return \EEI_Payment
+	 */
+	public function check_payment_in_mijireh(EEI_Payment $payment)
+	{
+		$request_args = array(
+			'headers' => array(
+				'Authorization' => 'Basic ' . base64_encode($this->_access_key . ':'),
+				'Accept'        => 'application/json'
+			)
+		);
 
-        $response = wp_remote_get(
-            $this->_mijireh_api_orders_url . '/' . $payment->txn_id_chq_nmbr(),
-            $request_args
-        );
+		$response = wp_remote_get(
+			$this->_mijireh_api_orders_url . '/' . $payment->txn_id_chq_nmbr(),
+			$request_args
+		);
 
-        $this->log(
-            array('get payment status request_args' => $request_args, 'response' => $response),
-            $payment
-        );
-        // validate response
-        $response_body = isset($response['body']) ? json_decode($response['body']) : '';
-        if ($response && $response_body) {
-            switch($response_body->status) {
-                case 'paid':
-                    $payment->set_status($this->_pay_model->approved_status());
-                    break;
-                case 'pending':
-                    $payment->set_status($this->_pay_model->pending_status());
-                    break;
-                default:
-                    $payment->set_status($this->_pay_model->declined_status());
-            }
-        } else {
-            $payment->set_gateway_response(__('Response from Mijireh could not be understood.', 'event_espresso'));
-            $payment->set_details($response);
-            $payment->set_status($this->_pay_model->failed_status());
-        }
-        // the following is ONLY for testing the Mijireh IPN and should NEVER be uncommented for real usage
+		$this->log(
+			array('get payment status request_args' => $request_args, 'response' => $response),
+			$payment
+		);
+		// validate response
+		$response_body = isset($response['body']) ? json_decode($response['body']) : '';
+		if ($response && $response_body) {
+			switch($response_body->status) {
+				case 'paid':
+					$payment->set_status($this->_pay_model->approved_status());
+					break;
+				case 'pending':
+					$payment->set_status($this->_pay_model->pending_status());
+					break;
+				default:
+					$payment->set_status($this->_pay_model->declined_status());
+			}
+		} else {
+			$payment->set_gateway_response(__('Response from Mijireh could not be understood.', 'event_espresso'));
+			$payment->set_details($response);
+			$payment->set_status($this->_pay_model->failed_status());
+		}
+		// the following is ONLY for testing the Mijireh IPN and should NEVER be uncommented for real usage
 //      $payment->set_status( $this->_pay_model->pending_status() );
-        return $payment;
-    }
+		return $payment;
+	}
 
 }
 // End of file EEG_Mijireh.gateway.php
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('NO direct script access allowed');
 }
 
@@ -141,7 +141,7 @@ 
 
         $args = array(
             'headers' => array(
-                'Authorization' => 'Basic ' . base64_encode($this->_access_key . ':'),
+                'Authorization' => 'Basic '.base64_encode($this->_access_key.':'),
                 'Accept'        => 'application/json'
             ),
             'body'    => wp_json_encode($order)
@@ -149,7 +149,7 @@ 
         $response = wp_remote_post($this->_mijireh_api_orders_url, $args);
         $problems_string = false;
         $this->log(array('get checkout url request_args' => $args, 'response' => $response), $payment);
-        if (! $response instanceof WP_Error) {
+        if ( ! $response instanceof WP_Error) {
             $response_body = json_decode($response['body']);
             if ($response_body && isset($response_body->checkout_url)) {
                 $payment->set_redirect_url($response_body->checkout_url);
@@ -157,7 +157,7 @@ 
                 $payment->set_details($response['body']);
             } else {
                 if (is_array($response_body) || is_object($response_body)) {
-                    $response_body_as_array = (array)$response_body;
+                    $response_body_as_array = (array) $response_body;
                     foreach ($response_body_as_array as $problem_parameter => $problems) {
                         $problems_string .= sprintf(
                             __('\nProblems with %s: %s', 'event_espresso'),
@@ -168,7 +168,7 @@ 
                 } else {
                     $problems_string = $response['body'];
                 }
-                if (! $problems_string) {
+                if ( ! $problems_string) {
                     //no message to show? wack
                     if (isset($response['headers']['status'])) {
                         $problems_string = $response['headers']['status'];
@@ -209,7 +209,7 @@ 
     {
         if (is_array($data)) {
             $prepared_data = array();
-            foreach($data as $key => $datum) {
+            foreach ($data as $key => $datum) {
                 $prepared_data[$key] = $this->_prepare_for_mijireh($datum);
             }
             return $prepared_data;
@@ -234,7 +234,7 @@ 
      */
     public function handle_payment_update($update_info, $transaction)
     {
-        foreach($transaction->pending_payments() as $payment) {
+        foreach ($transaction->pending_payments() as $payment) {
             $payment = $this->check_payment_in_mijireh($payment);
             if ($payment->status() === $this->_pay_model->approved_status()) {
                 return $payment;
@@ -242,7 +242,7 @@ 
         }
         $payment = $transaction instanceof EEI_Transaction ? $transaction->last_payment() : NULL;
 
-        if (! $payment instanceof EEI_Payment) {
+        if ( ! $payment instanceof EEI_Payment) {
             throw new EE_Error(
                 sprintf(
                     __("Could not find Mijireh payment for transaction %s", 'event_espresso'),
@@ -264,13 +264,13 @@ 
     {
         $request_args = array(
             'headers' => array(
-                'Authorization' => 'Basic ' . base64_encode($this->_access_key . ':'),
+                'Authorization' => 'Basic '.base64_encode($this->_access_key.':'),
                 'Accept'        => 'application/json'
             )
         );
 
         $response = wp_remote_get(
-            $this->_mijireh_api_orders_url . '/' . $payment->txn_id_chq_nmbr(),
+            $this->_mijireh_api_orders_url.'/'.$payment->txn_id_chq_nmbr(),
             $request_args
         );
 
@@ -281,7 +281,7 @@ 
         // validate response
         $response_body = isset($response['body']) ? json_decode($response['body']) : '';
         if ($response && $response_body) {
-            switch($response_body->status) {
+            switch ($response_body->status) {
                 case 'paid':
                     $payment->set_status($this->_pay_model->approved_status());
                     break;

payment_methods/Paypal_Standard/EEG_Paypal_Standard.gateway.php

Indentation +602 added lines, -602 removed lines

@@ -3,7 +3,7 @@ 
 use EventEspresso\core\exceptions\IpnException;
 
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 
@@ -25,607 +25,607 @@ 
 class EEG_Paypal_Standard extends EE_Offsite_Gateway
 {
 
-    /**
-     * Name for the wp option used to save the itemized payment
-     */
-    const itemized_payment_option_name = '_itemized_payment';
-
-    protected $_paypal_id;
-
-    protected $_image_url;
-
-    protected $_shipping_details;
-
-    protected $_paypal_shipping;
-
-    protected $_paypal_taxes;
-
-    protected $_gateway_url;
-
-    protected $_currencies_supported = array(
-        'USD',
-        'GBP',
-        'CAD',
-        'AUD',
-        'BRL',
-        'CHF',
-        'CZK',
-        'DKK',
-        'EUR',
-        'HKD',
-        'HUF',
-        'ILS',
-        'JPY',
-        'MXN',
-        'MYR',
-        'NOK',
-        'NZD',
-        'PHP',
-        'PLN',
-        'SEK',
-        'SGD',
-        'THB',
-        'TRY',
-        'TWD',
-        'RUB'
-    );
-
-
-    /**
-     * EEG_Paypal_Standard constructor.
-     *
-     * @return EEG_Paypal_Standard
-     */
-    public function __construct()
-    {
-        $this->set_uses_separate_IPN_request(true);
-        parent::__construct();
-    }
-
-
-    /**
-     * Also sets the gateway url class variable based on whether debug mode is enabled or not.
-     *
-     * @param array $settings_array
-     */
-    public function set_settings($settings_array)
-    {
-        parent::set_settings($settings_array);
-        $this->_gateway_url = $this->_debug_mode
-            ? 'https://www.sandbox.paypal.com/cgi-bin/webscr'
-            : 'https://www.paypal.com/cgi-bin/webscr';
-    }
-
-
-    /**
-     * @param EEI_Payment $payment      the payment to process
-     * @param array       $billing_info but should be empty for this gateway
-     * @param string      $return_url   URL to send the user to after payment on the payment provider's website
-     * @param string      $notify_url   URL to send the instant payment notification
-     * @param string      $cancel_url   URL to send the user to after a cancelled payment attempt
-     *                                  on the payment provider's website
-     * @return EEI_Payment
-     * @throws \EE_Error
-     */
-    public function set_redirection_info(
-        $payment,
-        $billing_info = array(),
-        $return_url = null,
-        $notify_url = null,
-        $cancel_url = null
-    ) {
-        $redirect_args = array();
-        $transaction = $payment->transaction();
-        $gateway_formatter = $this->_get_gateway_formatter();
-        $item_num = 1;
-        /** @type EE_Line_Item $total_line_item */
-        $total_line_item = $transaction->total_line_item();
-
-        $total_discounts_to_cart_total = $transaction->paid();
-        //only itemize the order if we're paying for the rest of the order's amount
-        if (EEH_Money::compare_floats($payment->amount(), $transaction->total(), '==')) {
-            $payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true);
-            //this payment is for the remaining transaction amount,
-            //keep track of exactly how much the itemized order amount equals
-            $itemized_sum = 0;
-            $shipping_previously_added = 0;
-            //so let's show all the line items
-            foreach ($total_line_item->get_items() as $line_item) {
-                if ($line_item instanceof EE_Line_Item) {
-                    //it's some kind of discount
-                    if ($line_item->total() < 0) {
-                        $total_discounts_to_cart_total += abs($line_item->total());
-                        $itemized_sum += $line_item->total();
-                        continue;
-                    }
-                    //dont include shipping again.
-                    if (strpos($line_item->code(), 'paypal_shipping_') === 0) {
-                        $shipping_previously_added = $line_item->total();
-                        continue;
-                    }
-                    $redirect_args['item_name_' . $item_num] = substr(
-                        $gateway_formatter->formatLineItemName($line_item, $payment),
-                        0, 127
-                    );
-                    $redirect_args['amount_' . $item_num] = $line_item->unit_price();
-                    $redirect_args['quantity_' . $item_num] = $line_item->quantity();
-                    //if we're not letting PayPal calculate shipping, tell them its 0
-                    if (! $this->_paypal_shipping) {
-                        $redirect_args['shipping_' . $item_num] = '0';
-                        $redirect_args['shipping2_' . $item_num] = '0';
-                    }
-                    $item_num++;
-                    $itemized_sum += $line_item->total();
-                }
-            }
-            $taxes_li = $this->_line_item->get_taxes_subtotal($total_line_item);
-            //ideally itemized sum equals the transaction total. but if not (which is weird)
-            //and the itemized sum is LESS than the transaction total
-            //add another line item
-            //if the itemized sum is MORE than the transaction total,
-            //add the difference it to the discounts
-            $itemized_sum_diff_from_txn_total = round(
-                $transaction->total() - $itemized_sum - $taxes_li->total() - $shipping_previously_added,
-                2
-            );
-            if ($itemized_sum_diff_from_txn_total < 0) {
-                //itemized sum is too big
-                $total_discounts_to_cart_total += abs($itemized_sum_diff_from_txn_total);
-            } elseif ($itemized_sum_diff_from_txn_total > 0) {
-                $redirect_args['item_name_' . $item_num] = substr(
-                        __('Other charges', 'event_espresso' ), 0, 127);
-                $redirect_args['amount_' . $item_num] = $gateway_formatter->formatCurrency(
-                    $itemized_sum_diff_from_txn_total
-                );
-                $redirect_args['quantity_' . $item_num] = 1;
-                $item_num++;
-            }
-            if ($total_discounts_to_cart_total > 0) {
-                $redirect_args['discount_amount_cart'] = $gateway_formatter->formatCurrency(
-                    $total_discounts_to_cart_total
-                );
-            }
-            //add our taxes to the order if we're NOT using PayPal's
-            if (! $this->_paypal_taxes) {
-                $redirect_args['tax_cart'] = $total_line_item->get_total_tax();
-            }
-        } else {
-            $payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, false);
-            //partial payment that's not for the remaining amount, so we can't send an itemized list
-            $redirect_args['item_name_' . $item_num] = substr(
-                $gateway_formatter->formatPartialPaymentLineItemName($payment),
-                0,
-                127
-            );
-            $redirect_args['amount_' . $item_num] = $payment->amount();
-            $redirect_args['shipping_' . $item_num] = '0';
-            $redirect_args['shipping2_' . $item_num] = '0';
-            $redirect_args['tax_cart'] = '0';
-            $item_num++;
-        }
-
-        if ($this->_debug_mode) {
-            $redirect_args['item_name_' . $item_num] = 'DEBUG INFO (this item only added in sandbox mode';
-            $redirect_args['amount_' . $item_num] = 0;
-            $redirect_args['on0_'.$item_num] = 'NOTIFY URL';
-            $redirect_args['os0_' . $item_num] = $notify_url;
-            $redirect_args['on1_'.$item_num] = 'RETURN URL';
-            $redirect_args['os1_' . $item_num] = $return_url;
+	/**
+	 * Name for the wp option used to save the itemized payment
+	 */
+	const itemized_payment_option_name = '_itemized_payment';
+
+	protected $_paypal_id;
+
+	protected $_image_url;
+
+	protected $_shipping_details;
+
+	protected $_paypal_shipping;
+
+	protected $_paypal_taxes;
+
+	protected $_gateway_url;
+
+	protected $_currencies_supported = array(
+		'USD',
+		'GBP',
+		'CAD',
+		'AUD',
+		'BRL',
+		'CHF',
+		'CZK',
+		'DKK',
+		'EUR',
+		'HKD',
+		'HUF',
+		'ILS',
+		'JPY',
+		'MXN',
+		'MYR',
+		'NOK',
+		'NZD',
+		'PHP',
+		'PLN',
+		'SEK',
+		'SGD',
+		'THB',
+		'TRY',
+		'TWD',
+		'RUB'
+	);
+
+
+	/**
+	 * EEG_Paypal_Standard constructor.
+	 *
+	 * @return EEG_Paypal_Standard
+	 */
+	public function __construct()
+	{
+		$this->set_uses_separate_IPN_request(true);
+		parent::__construct();
+	}
+
+
+	/**
+	 * Also sets the gateway url class variable based on whether debug mode is enabled or not.
+	 *
+	 * @param array $settings_array
+	 */
+	public function set_settings($settings_array)
+	{
+		parent::set_settings($settings_array);
+		$this->_gateway_url = $this->_debug_mode
+			? 'https://www.sandbox.paypal.com/cgi-bin/webscr'
+			: 'https://www.paypal.com/cgi-bin/webscr';
+	}
+
+
+	/**
+	 * @param EEI_Payment $payment      the payment to process
+	 * @param array       $billing_info but should be empty for this gateway
+	 * @param string      $return_url   URL to send the user to after payment on the payment provider's website
+	 * @param string      $notify_url   URL to send the instant payment notification
+	 * @param string      $cancel_url   URL to send the user to after a cancelled payment attempt
+	 *                                  on the payment provider's website
+	 * @return EEI_Payment
+	 * @throws \EE_Error
+	 */
+	public function set_redirection_info(
+		$payment,
+		$billing_info = array(),
+		$return_url = null,
+		$notify_url = null,
+		$cancel_url = null
+	) {
+		$redirect_args = array();
+		$transaction = $payment->transaction();
+		$gateway_formatter = $this->_get_gateway_formatter();
+		$item_num = 1;
+		/** @type EE_Line_Item $total_line_item */
+		$total_line_item = $transaction->total_line_item();
+
+		$total_discounts_to_cart_total = $transaction->paid();
+		//only itemize the order if we're paying for the rest of the order's amount
+		if (EEH_Money::compare_floats($payment->amount(), $transaction->total(), '==')) {
+			$payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true);
+			//this payment is for the remaining transaction amount,
+			//keep track of exactly how much the itemized order amount equals
+			$itemized_sum = 0;
+			$shipping_previously_added = 0;
+			//so let's show all the line items
+			foreach ($total_line_item->get_items() as $line_item) {
+				if ($line_item instanceof EE_Line_Item) {
+					//it's some kind of discount
+					if ($line_item->total() < 0) {
+						$total_discounts_to_cart_total += abs($line_item->total());
+						$itemized_sum += $line_item->total();
+						continue;
+					}
+					//dont include shipping again.
+					if (strpos($line_item->code(), 'paypal_shipping_') === 0) {
+						$shipping_previously_added = $line_item->total();
+						continue;
+					}
+					$redirect_args['item_name_' . $item_num] = substr(
+						$gateway_formatter->formatLineItemName($line_item, $payment),
+						0, 127
+					);
+					$redirect_args['amount_' . $item_num] = $line_item->unit_price();
+					$redirect_args['quantity_' . $item_num] = $line_item->quantity();
+					//if we're not letting PayPal calculate shipping, tell them its 0
+					if (! $this->_paypal_shipping) {
+						$redirect_args['shipping_' . $item_num] = '0';
+						$redirect_args['shipping2_' . $item_num] = '0';
+					}
+					$item_num++;
+					$itemized_sum += $line_item->total();
+				}
+			}
+			$taxes_li = $this->_line_item->get_taxes_subtotal($total_line_item);
+			//ideally itemized sum equals the transaction total. but if not (which is weird)
+			//and the itemized sum is LESS than the transaction total
+			//add another line item
+			//if the itemized sum is MORE than the transaction total,
+			//add the difference it to the discounts
+			$itemized_sum_diff_from_txn_total = round(
+				$transaction->total() - $itemized_sum - $taxes_li->total() - $shipping_previously_added,
+				2
+			);
+			if ($itemized_sum_diff_from_txn_total < 0) {
+				//itemized sum is too big
+				$total_discounts_to_cart_total += abs($itemized_sum_diff_from_txn_total);
+			} elseif ($itemized_sum_diff_from_txn_total > 0) {
+				$redirect_args['item_name_' . $item_num] = substr(
+						__('Other charges', 'event_espresso' ), 0, 127);
+				$redirect_args['amount_' . $item_num] = $gateway_formatter->formatCurrency(
+					$itemized_sum_diff_from_txn_total
+				);
+				$redirect_args['quantity_' . $item_num] = 1;
+				$item_num++;
+			}
+			if ($total_discounts_to_cart_total > 0) {
+				$redirect_args['discount_amount_cart'] = $gateway_formatter->formatCurrency(
+					$total_discounts_to_cart_total
+				);
+			}
+			//add our taxes to the order if we're NOT using PayPal's
+			if (! $this->_paypal_taxes) {
+				$redirect_args['tax_cart'] = $total_line_item->get_total_tax();
+			}
+		} else {
+			$payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, false);
+			//partial payment that's not for the remaining amount, so we can't send an itemized list
+			$redirect_args['item_name_' . $item_num] = substr(
+				$gateway_formatter->formatPartialPaymentLineItemName($payment),
+				0,
+				127
+			);
+			$redirect_args['amount_' . $item_num] = $payment->amount();
+			$redirect_args['shipping_' . $item_num] = '0';
+			$redirect_args['shipping2_' . $item_num] = '0';
+			$redirect_args['tax_cart'] = '0';
+			$item_num++;
+		}
+
+		if ($this->_debug_mode) {
+			$redirect_args['item_name_' . $item_num] = 'DEBUG INFO (this item only added in sandbox mode';
+			$redirect_args['amount_' . $item_num] = 0;
+			$redirect_args['on0_'.$item_num] = 'NOTIFY URL';
+			$redirect_args['os0_' . $item_num] = $notify_url;
+			$redirect_args['on1_'.$item_num] = 'RETURN URL';
+			$redirect_args['os1_' . $item_num] = $return_url;
 //          $redirect_args['option_index_' . $item_num] = 1; // <-- dunno if this is needed ?
-            $redirect_args['shipping_' . $item_num] = '0';
-            $redirect_args['shipping2_' . $item_num] = '0';
-        }
-
-        $redirect_args['business'] = $this->_paypal_id;
-        $redirect_args['return'] = $return_url;
-        $redirect_args['cancel_return'] = $cancel_url;
-        $redirect_args['notify_url'] = $notify_url;
-        $redirect_args['cmd'] = '_cart';
-        $redirect_args['upload'] = 1;
-        $redirect_args['currency_code'] = $payment->currency_code();
-        $redirect_args['rm'] = 2;//makes the user return with method=POST
-        if ($this->_image_url) {
-            $redirect_args['image_url'] = $this->_image_url;
-        }
-        $redirect_args['no_shipping'] = $this->_shipping_details;
-        $redirect_args['bn'] = 'EventEspresso_SP';//EE will blow up if you change this
-
-        $redirect_args = apply_filters("FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this);
-
-        $payment->set_redirect_url($this->_gateway_url);
-        $payment->set_redirect_args($redirect_args);
-        // log the results
-        $this->log(
-            array(
-                'message'     => sprintf(
-                    __('PayPal payment request initiated.', 'event_espresso')
-                ),
-                'transaction' => $transaction->model_field_array(),
-            ),
-            $payment
-        );
-        return $payment;
-    }
-
-
-    /**
-     * Often used for IPNs. But applies the info in $update_info to the payment.
-     * What is $update_info? Often the contents of $_REQUEST, but not necessarily. Whatever
-     * the payment method passes in.
-     *
-     * @param array $update_info like $_POST
-     * @param EEI_Transaction $transaction
-     * @return \EEI_Payment updated
-     * @throws \EE_Error, IpnException
-     */
-    public function handle_payment_update($update_info, $transaction)
-    {
-        // verify there's payment data that's been sent
-        if (empty($update_info['payment_status'] ) || empty($update_info['txn_id'])) {
-            // log the results
-            $this->log(
-                array(
-                    'message'     => sprintf(
-                        // @codingStandardsIgnoreStart
-                        __('PayPal IPN response is missing critical payment data. This may indicate a PDT request and require your PayPal account settings to be corrected.', 'event_espresso')
-                        // @codingStandardsIgnoreEnd
-                    ),
-                    'update_info' => $update_info,
-                ),
-                $transaction
-            );
-            // waaaait... is this a PDT request? (see https://developer.paypal.com/docs/classic/products/payment-data-transfer/)
-            // indicated by the "tx" argument? If so, we don't need it. We'll just use the IPN data when it comes
-            if (isset($update_info['tx'])) {
-                return $transaction->last_payment();
-            } else {
-                return null;
-            }
-        }
-        $payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr($update_info['txn_id']);
-        if (! $payment instanceof EEI_Payment) {
-            $payment = $transaction->last_payment();
-        }
-        // ok, then validate the IPN. Even if we've already processed this payment,
-        // let PayPal know we don't want to hear from them anymore!
-        if (! $this->validate_ipn($update_info, $payment)) {
-            return $payment;
-        }
-        // kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction,
-        // registrations, ticket counts, etc)
-        if (
-            (
-                $update_info['payment_status'] === 'Refunded'
-                || $update_info['payment_status'] === 'Partially_Refunded'
-            )
-            && apply_filters('FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true)
-        ) {
-            throw new EventEspresso\core\exceptions\IpnException(
-                sprintf(
-                    esc_html__('Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'),
-                    $update_info['payment_status']
-                ),
-                EventEspresso\core\exceptions\IpnException::UNSUPPORTED,
-                null,
-                $payment,
-                $update_info
-            );
-        }
-        //ok, well let's process this payment then!
-        switch ($update_info['payment_status']) {
-
-            case 'Completed' :
-                $status = $this->_pay_model->approved_status();
-                $gateway_response = esc_html__('The payment is approved.', 'event_espresso');
-                break;
-
-            case 'Pending' :
-                $status = $this->_pay_model->pending_status();
-                $gateway_response = esc_html__(
-                    'The payment is in progress. Another message will be sent when payment is approved.',
-                    'event_espresso'
-                );
-                break;
-
-            case 'Denied' :
-                $status = $this->_pay_model->declined_status();
-                $gateway_response = esc_html__('The payment has been declined.', 'event_espresso');
-                break;
-
-            case 'Expired' :
-            case 'Failed' :
-                $status = $this->_pay_model->failed_status();
-                $gateway_response = esc_html__('The payment failed for technical reasons or expired.', 'event_espresso');
-                break;
-
-            case 'Refunded' :
-            case 'Partially_Refunded' :
-                // even though it's a refund, we consider the payment as approved, it just has a negative value
-                $status = $this->_pay_model->approved_status();
-                $gateway_response = esc_html__(
-                    'The payment has been refunded. Please update registrations accordingly.',
-                    'event_espresso'
-                );
-                break;
-
-            case 'Voided' :
-            case 'Reversed' :
-            case 'Canceled_Reversal' :
-            default :
-                $status = $this->_pay_model->cancelled_status();
-                $gateway_response = esc_html__(
-                    'The payment was cancelled, reversed, or voided. Please update registrations accordingly.',
-                    'event_espresso'
-                );
-                break;
-
-        }
-
-        //check if we've already processed this payment
-        if ($payment instanceof EEI_Payment) {
-            //payment exists. if this has the exact same status and amount, don't bother updating. just return
-            if ($payment->status() === $status && (float)$payment->amount() === (float)$update_info['mc_gross']) {
-                // DUPLICATED IPN! don't bother updating transaction
-                throw new IpnException(
-                    sprintf(
-                        esc_html__('It appears we have received a duplicate IPN from PayPal for payment %d',
-                            'event_espresso'
-                        ),
-                        $payment->ID()
-                    ),
-                    IpnException::DUPLICATE,
-                    null,
-                    $payment,
-                    $update_info
-                );
-            } else {
-                // new payment yippee !!!
-                $payment->set_status($status);
-                $payment->set_amount((float)$update_info['mc_gross']);
-                $payment->set_gateway_response($gateway_response);
-                $payment->set_details($update_info);
-                $payment->set_txn_id_chq_nmbr($update_info['txn_id']);
-                $this->log(
-                    array(
-                        'message'  => esc_html__(
-                            'Updated payment either from IPN or as part of POST from PayPal',
-                            'event_espresso'
-                        ),
-                        'url'      => $this->_process_response_url(),
-                        'payment'  => $payment->model_field_array(),
-                        'IPN_data' => $update_info
-                    ),
-                    $payment
-                );
-            }
-
-        }
-        do_action('FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this);
-        return $payment;
-    }
-
-
-    /**
-     * Validate the IPN notification.
-     *
-     * @param array                  $update_info like $_REQUEST
-     * @param EE_Payment|EEI_Payment $payment
-     * @return boolean
-     * @throws \EE_Error
-     */
-    public function validate_ipn($update_info, $payment)
-    {
-        //allow us to skip validating IPNs with PayPal (useful for testing)
-        if (apply_filters('FHEE__EEG_Paypal_Standard__validate_ipn__skip', false)) {
-            return true;
-        }
-        //...otherwise, we actually don't care what the $update_info is, we need to look
-        //at the request directly because we can't use $update_info because it has issues with quotes
-        // Reading POSTed data directly from $_POST causes serialization issues with array data in the POST.
-        // Instead, read raw POST data from the input stream.
-        // @see https://gist.github.com/xcommerce-gists/3440401
-        $raw_post_data = file_get_contents('php://input');
-        $raw_post_array = explode('&', $raw_post_data);
-        $update_info = array();
-        foreach ($raw_post_array as $keyval) {
-            $keyval = explode('=', $keyval);
-            if (count($keyval) === 2) {
-                $update_info[$keyval[0]] = urldecode($keyval[1]);
-            }
-        }
-        // read the IPN message sent from PayPal and prepend 'cmd=_notify-validate'
-        $req = 'cmd=_notify-validate';
-        $uses_get_magic_quotes = function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc() === 1
-            ? true
-            : false;
-        foreach ($update_info as $key => $value) {
-            $value = $uses_get_magic_quotes ? urlencode(stripslashes($value)) : urlencode($value);
-            $req .= "&$key=$value";
-        }
-        // HTTP POST the complete, unaltered IPN back to PayPal
-        $response = wp_remote_post(
-            $this->_gateway_url,
-            array(
-                'body'              => $req,
-                'sslverify'         => false,
-                'timeout'           => 60,
-                // make sure to set a site specific unique "user-agent" string since the WordPres default gets declined by PayPal
-                // plz see: https://github.com/websharks/s2member/issues/610
-                'user-agent'        => 'Event Espresso v' . EVENT_ESPRESSO_VERSION . '; ' . home_url(),
-                'httpversion'       => '1.1'
-            )
-        );
-        // then check the response
-        if (
-            array_key_exists('body', $response)
-            && ! is_wp_error($response)
-            && strcmp($response['body'], "VERIFIED") === 0
-        ) {
-            return true;
-        }
-        // huh, something's wack... the IPN didn't validate. We must have replied to the IPN incorrectly,
-        // or their API must have changed: http://www.paypalobjects.com/en_US/ebook/PP_OrderManagement_IntegrationGuide/ipn.html
-        if ($response instanceof WP_Error) {
-            $error_msg = sprintf(
-                esc_html__('WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso'),
-                $response->get_error_code(),
-                $response->get_error_message(),
-                print_r($response->get_error_data(), true)
-            );
-        } elseif(is_array($response) && isset($response['body'])) {
-            $error_msg = $response['body'];
-        } else {
-            $error_msg = print_r($response, true);
-        }
-        $payment->set_gateway_response(
-            sprintf(
-                esc_html__("IPN Validation failed! Paypal responded with '%s'", "event_espresso"),
-                $error_msg
-            )
-        );
-        $payment->set_details(array('REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response));
-        $payment->set_status(EEM_Payment::status_id_failed);
-        // log the results
-        $this->log(
-            array(
-                'url'     => $this->_process_response_url(),
-                'message' => $payment->gateway_response(),
-                'details' => $payment->details(),
-            ),
-            $payment
-        );
-        return false;
-    }
-
-
-    /**
-     * _process_response_url
-     * @return string
-     */
-    protected function _process_response_url()
-    {
-        if (isset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'])) {
-            $url = is_ssl() ? 'https://' : 'http://';
-            $url .= EEH_URL::filter_input_server_url('HTTP_HOST');
-            $url .= EEH_URL::filter_input_server_url();
-        } else {
-            $url = 'unknown';
-        }
-        return $url;
-    }
-
-
-    /**
-     * Updates the transaction and line items based on the payment IPN data from PayPal,
-     * like the taxes or shipping
-     *
-     * @param EEI_Payment $payment
-     * @throws \EE_Error
-     */
-    public function update_txn_based_on_payment($payment)
-    {
-        $update_info = $payment->details();
-        /** @var EE_Transaction $transaction */
-        $transaction = $payment->transaction();
-        $payment_was_itemized = $payment->get_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true, false);
-        if (! $transaction) {
-            $this->log(
-                esc_html__(
-                    // @codingStandardsIgnoreStart
-                    'Payment with ID %d has no related transaction, and so update_txn_based_on_payment couldn\'t be executed properly',
-                    // @codingStandardsIgnoreEnd
-                    'event_espresso'
-                ),
-                $payment
-            );
-            return;
-        }
-        if (
-            ! is_array($update_info)
-            || ! isset($update_info['mc_shipping'])
-            || ! isset($update_info['tax'])
-        ) {
-            $this->log(
-                array(
-                    'message' => esc_html__(
-                        // @codingStandardsIgnoreStart
-                        'Could not update transaction based on payment because the payment details have not yet been put on the payment. This normally happens during the IPN or returning from PayPal',
-                        // @codingStandardsIgnoreEnd
-                        'event_espresso'
-                    ),
-                    'url'     => $this->_process_response_url(),
-                    'payment' => $payment->model_field_array()
-                ),
-                $payment
-            );
-            return;
-        }
-        if ($payment->status() !== $this->_pay_model->approved_status()) {
-            $this->log(
-                array(
-                    'message' => esc_html__(
-                        'We shouldn\'t update transactions taxes or shipping data from non-approved payments',
-                        'event_espresso'
-                    ),
-                    'url'     => $this->_process_response_url(),
-                    'payment' => $payment->model_field_array()
-                ),
-                $payment
-            );
-            return;
-        }
-        $grand_total_needs_resaving = false;
-        /** @var EE_Line_Item $transaction_total_line_item */
-        $transaction_total_line_item = $transaction->total_line_item();
-
-        //might paypal have changed the taxes?
-        if ($this->_paypal_taxes && $payment_was_itemized) {
-            // note that we're doing this BEFORE adding shipping;
-            // we actually want PayPal's shipping to remain non-taxable
-            $this->_line_item->set_line_items_taxable($transaction_total_line_item, true, 'paypal_shipping');
-            $this->_line_item->set_total_tax_to(
-                $transaction_total_line_item,
-                (float)$update_info['tax'],
-                esc_html__('Taxes', 'event_espresso'),
-                esc_html__('Calculated by Paypal', 'event_espresso'),
-                'paypal_tax'
-            );
-            $grand_total_needs_resaving = TRUE;
-        }
-
-        $shipping_amount = (float)$update_info['mc_shipping'];
-        //might paypal have added shipping?
-        if ($this->_paypal_shipping && $shipping_amount && $payment_was_itemized) {
-            $this->_line_item->add_unrelated_item(
-                $transaction_total_line_item,
-                sprintf(esc_html__('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID()),
-                $shipping_amount,
-                esc_html__('Shipping charges calculated by Paypal', 'event_espresso'),
-                1,
-                false,
-                'paypal_shipping_' . $transaction->ID()
-            );
-            $grand_total_needs_resaving = true;
-        }
-
-        if ($grand_total_needs_resaving) {
-            $transaction_total_line_item->save_this_and_descendants_to_txn($transaction->ID());
-            /** @var EE_Registration_Processor $registration_processor */
-            $registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
-            $registration_processor->update_registration_final_prices($transaction);
-        }
-        $this->log(
-            array(
-                'message'                     => esc_html__('Updated transaction related to payment', 'event_espresso'),
-                'url'                         => $this->_process_response_url(),
-                'transaction (updated)'       => $transaction->model_field_array(),
-                'payment (updated)'           => $payment->model_field_array(),
-                'use_paypal_shipping'         => $this->_paypal_shipping,
-                'use_paypal_tax'              => $this->_paypal_taxes,
-                'grand_total_needed_resaving' => $grand_total_needs_resaving,
-            ),
-            $payment
-        );
-    }
+			$redirect_args['shipping_' . $item_num] = '0';
+			$redirect_args['shipping2_' . $item_num] = '0';
+		}
+
+		$redirect_args['business'] = $this->_paypal_id;
+		$redirect_args['return'] = $return_url;
+		$redirect_args['cancel_return'] = $cancel_url;
+		$redirect_args['notify_url'] = $notify_url;
+		$redirect_args['cmd'] = '_cart';
+		$redirect_args['upload'] = 1;
+		$redirect_args['currency_code'] = $payment->currency_code();
+		$redirect_args['rm'] = 2;//makes the user return with method=POST
+		if ($this->_image_url) {
+			$redirect_args['image_url'] = $this->_image_url;
+		}
+		$redirect_args['no_shipping'] = $this->_shipping_details;
+		$redirect_args['bn'] = 'EventEspresso_SP';//EE will blow up if you change this
+
+		$redirect_args = apply_filters("FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this);
+
+		$payment->set_redirect_url($this->_gateway_url);
+		$payment->set_redirect_args($redirect_args);
+		// log the results
+		$this->log(
+			array(
+				'message'     => sprintf(
+					__('PayPal payment request initiated.', 'event_espresso')
+				),
+				'transaction' => $transaction->model_field_array(),
+			),
+			$payment
+		);
+		return $payment;
+	}
+
+
+	/**
+	 * Often used for IPNs. But applies the info in $update_info to the payment.
+	 * What is $update_info? Often the contents of $_REQUEST, but not necessarily. Whatever
+	 * the payment method passes in.
+	 *
+	 * @param array $update_info like $_POST
+	 * @param EEI_Transaction $transaction
+	 * @return \EEI_Payment updated
+	 * @throws \EE_Error, IpnException
+	 */
+	public function handle_payment_update($update_info, $transaction)
+	{
+		// verify there's payment data that's been sent
+		if (empty($update_info['payment_status'] ) || empty($update_info['txn_id'])) {
+			// log the results
+			$this->log(
+				array(
+					'message'     => sprintf(
+						// @codingStandardsIgnoreStart
+						__('PayPal IPN response is missing critical payment data. This may indicate a PDT request and require your PayPal account settings to be corrected.', 'event_espresso')
+						// @codingStandardsIgnoreEnd
+					),
+					'update_info' => $update_info,
+				),
+				$transaction
+			);
+			// waaaait... is this a PDT request? (see https://developer.paypal.com/docs/classic/products/payment-data-transfer/)
+			// indicated by the "tx" argument? If so, we don't need it. We'll just use the IPN data when it comes
+			if (isset($update_info['tx'])) {
+				return $transaction->last_payment();
+			} else {
+				return null;
+			}
+		}
+		$payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr($update_info['txn_id']);
+		if (! $payment instanceof EEI_Payment) {
+			$payment = $transaction->last_payment();
+		}
+		// ok, then validate the IPN. Even if we've already processed this payment,
+		// let PayPal know we don't want to hear from them anymore!
+		if (! $this->validate_ipn($update_info, $payment)) {
+			return $payment;
+		}
+		// kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction,
+		// registrations, ticket counts, etc)
+		if (
+			(
+				$update_info['payment_status'] === 'Refunded'
+				|| $update_info['payment_status'] === 'Partially_Refunded'
+			)
+			&& apply_filters('FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true)
+		) {
+			throw new EventEspresso\core\exceptions\IpnException(
+				sprintf(
+					esc_html__('Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'),
+					$update_info['payment_status']
+				),
+				EventEspresso\core\exceptions\IpnException::UNSUPPORTED,
+				null,
+				$payment,
+				$update_info
+			);
+		}
+		//ok, well let's process this payment then!
+		switch ($update_info['payment_status']) {
+
+			case 'Completed' :
+				$status = $this->_pay_model->approved_status();
+				$gateway_response = esc_html__('The payment is approved.', 'event_espresso');
+				break;
+
+			case 'Pending' :
+				$status = $this->_pay_model->pending_status();
+				$gateway_response = esc_html__(
+					'The payment is in progress. Another message will be sent when payment is approved.',
+					'event_espresso'
+				);
+				break;
+
+			case 'Denied' :
+				$status = $this->_pay_model->declined_status();
+				$gateway_response = esc_html__('The payment has been declined.', 'event_espresso');
+				break;
+
+			case 'Expired' :
+			case 'Failed' :
+				$status = $this->_pay_model->failed_status();
+				$gateway_response = esc_html__('The payment failed for technical reasons or expired.', 'event_espresso');
+				break;
+
+			case 'Refunded' :
+			case 'Partially_Refunded' :
+				// even though it's a refund, we consider the payment as approved, it just has a negative value
+				$status = $this->_pay_model->approved_status();
+				$gateway_response = esc_html__(
+					'The payment has been refunded. Please update registrations accordingly.',
+					'event_espresso'
+				);
+				break;
+
+			case 'Voided' :
+			case 'Reversed' :
+			case 'Canceled_Reversal' :
+			default :
+				$status = $this->_pay_model->cancelled_status();
+				$gateway_response = esc_html__(
+					'The payment was cancelled, reversed, or voided. Please update registrations accordingly.',
+					'event_espresso'
+				);
+				break;
+
+		}
+
+		//check if we've already processed this payment
+		if ($payment instanceof EEI_Payment) {
+			//payment exists. if this has the exact same status and amount, don't bother updating. just return
+			if ($payment->status() === $status && (float)$payment->amount() === (float)$update_info['mc_gross']) {
+				// DUPLICATED IPN! don't bother updating transaction
+				throw new IpnException(
+					sprintf(
+						esc_html__('It appears we have received a duplicate IPN from PayPal for payment %d',
+							'event_espresso'
+						),
+						$payment->ID()
+					),
+					IpnException::DUPLICATE,
+					null,
+					$payment,
+					$update_info
+				);
+			} else {
+				// new payment yippee !!!
+				$payment->set_status($status);
+				$payment->set_amount((float)$update_info['mc_gross']);
+				$payment->set_gateway_response($gateway_response);
+				$payment->set_details($update_info);
+				$payment->set_txn_id_chq_nmbr($update_info['txn_id']);
+				$this->log(
+					array(
+						'message'  => esc_html__(
+							'Updated payment either from IPN or as part of POST from PayPal',
+							'event_espresso'
+						),
+						'url'      => $this->_process_response_url(),
+						'payment'  => $payment->model_field_array(),
+						'IPN_data' => $update_info
+					),
+					$payment
+				);
+			}
+
+		}
+		do_action('FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this);
+		return $payment;
+	}
+
+
+	/**
+	 * Validate the IPN notification.
+	 *
+	 * @param array                  $update_info like $_REQUEST
+	 * @param EE_Payment|EEI_Payment $payment
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
+	public function validate_ipn($update_info, $payment)
+	{
+		//allow us to skip validating IPNs with PayPal (useful for testing)
+		if (apply_filters('FHEE__EEG_Paypal_Standard__validate_ipn__skip', false)) {
+			return true;
+		}
+		//...otherwise, we actually don't care what the $update_info is, we need to look
+		//at the request directly because we can't use $update_info because it has issues with quotes
+		// Reading POSTed data directly from $_POST causes serialization issues with array data in the POST.
+		// Instead, read raw POST data from the input stream.
+		// @see https://gist.github.com/xcommerce-gists/3440401
+		$raw_post_data = file_get_contents('php://input');
+		$raw_post_array = explode('&', $raw_post_data);
+		$update_info = array();
+		foreach ($raw_post_array as $keyval) {
+			$keyval = explode('=', $keyval);
+			if (count($keyval) === 2) {
+				$update_info[$keyval[0]] = urldecode($keyval[1]);
+			}
+		}
+		// read the IPN message sent from PayPal and prepend 'cmd=_notify-validate'
+		$req = 'cmd=_notify-validate';
+		$uses_get_magic_quotes = function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc() === 1
+			? true
+			: false;
+		foreach ($update_info as $key => $value) {
+			$value = $uses_get_magic_quotes ? urlencode(stripslashes($value)) : urlencode($value);
+			$req .= "&$key=$value";
+		}
+		// HTTP POST the complete, unaltered IPN back to PayPal
+		$response = wp_remote_post(
+			$this->_gateway_url,
+			array(
+				'body'              => $req,
+				'sslverify'         => false,
+				'timeout'           => 60,
+				// make sure to set a site specific unique "user-agent" string since the WordPres default gets declined by PayPal
+				// plz see: https://github.com/websharks/s2member/issues/610
+				'user-agent'        => 'Event Espresso v' . EVENT_ESPRESSO_VERSION . '; ' . home_url(),
+				'httpversion'       => '1.1'
+			)
+		);
+		// then check the response
+		if (
+			array_key_exists('body', $response)
+			&& ! is_wp_error($response)
+			&& strcmp($response['body'], "VERIFIED") === 0
+		) {
+			return true;
+		}
+		// huh, something's wack... the IPN didn't validate. We must have replied to the IPN incorrectly,
+		// or their API must have changed: http://www.paypalobjects.com/en_US/ebook/PP_OrderManagement_IntegrationGuide/ipn.html
+		if ($response instanceof WP_Error) {
+			$error_msg = sprintf(
+				esc_html__('WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso'),
+				$response->get_error_code(),
+				$response->get_error_message(),
+				print_r($response->get_error_data(), true)
+			);
+		} elseif(is_array($response) && isset($response['body'])) {
+			$error_msg = $response['body'];
+		} else {
+			$error_msg = print_r($response, true);
+		}
+		$payment->set_gateway_response(
+			sprintf(
+				esc_html__("IPN Validation failed! Paypal responded with '%s'", "event_espresso"),
+				$error_msg
+			)
+		);
+		$payment->set_details(array('REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response));
+		$payment->set_status(EEM_Payment::status_id_failed);
+		// log the results
+		$this->log(
+			array(
+				'url'     => $this->_process_response_url(),
+				'message' => $payment->gateway_response(),
+				'details' => $payment->details(),
+			),
+			$payment
+		);
+		return false;
+	}
+
+
+	/**
+	 * _process_response_url
+	 * @return string
+	 */
+	protected function _process_response_url()
+	{
+		if (isset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'])) {
+			$url = is_ssl() ? 'https://' : 'http://';
+			$url .= EEH_URL::filter_input_server_url('HTTP_HOST');
+			$url .= EEH_URL::filter_input_server_url();
+		} else {
+			$url = 'unknown';
+		}
+		return $url;
+	}
+
+
+	/**
+	 * Updates the transaction and line items based on the payment IPN data from PayPal,
+	 * like the taxes or shipping
+	 *
+	 * @param EEI_Payment $payment
+	 * @throws \EE_Error
+	 */
+	public function update_txn_based_on_payment($payment)
+	{
+		$update_info = $payment->details();
+		/** @var EE_Transaction $transaction */
+		$transaction = $payment->transaction();
+		$payment_was_itemized = $payment->get_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true, false);
+		if (! $transaction) {
+			$this->log(
+				esc_html__(
+					// @codingStandardsIgnoreStart
+					'Payment with ID %d has no related transaction, and so update_txn_based_on_payment couldn\'t be executed properly',
+					// @codingStandardsIgnoreEnd
+					'event_espresso'
+				),
+				$payment
+			);
+			return;
+		}
+		if (
+			! is_array($update_info)
+			|| ! isset($update_info['mc_shipping'])
+			|| ! isset($update_info['tax'])
+		) {
+			$this->log(
+				array(
+					'message' => esc_html__(
+						// @codingStandardsIgnoreStart
+						'Could not update transaction based on payment because the payment details have not yet been put on the payment. This normally happens during the IPN or returning from PayPal',
+						// @codingStandardsIgnoreEnd
+						'event_espresso'
+					),
+					'url'     => $this->_process_response_url(),
+					'payment' => $payment->model_field_array()
+				),
+				$payment
+			);
+			return;
+		}
+		if ($payment->status() !== $this->_pay_model->approved_status()) {
+			$this->log(
+				array(
+					'message' => esc_html__(
+						'We shouldn\'t update transactions taxes or shipping data from non-approved payments',
+						'event_espresso'
+					),
+					'url'     => $this->_process_response_url(),
+					'payment' => $payment->model_field_array()
+				),
+				$payment
+			);
+			return;
+		}
+		$grand_total_needs_resaving = false;
+		/** @var EE_Line_Item $transaction_total_line_item */
+		$transaction_total_line_item = $transaction->total_line_item();
+
+		//might paypal have changed the taxes?
+		if ($this->_paypal_taxes && $payment_was_itemized) {
+			// note that we're doing this BEFORE adding shipping;
+			// we actually want PayPal's shipping to remain non-taxable
+			$this->_line_item->set_line_items_taxable($transaction_total_line_item, true, 'paypal_shipping');
+			$this->_line_item->set_total_tax_to(
+				$transaction_total_line_item,
+				(float)$update_info['tax'],
+				esc_html__('Taxes', 'event_espresso'),
+				esc_html__('Calculated by Paypal', 'event_espresso'),
+				'paypal_tax'
+			);
+			$grand_total_needs_resaving = TRUE;
+		}
+
+		$shipping_amount = (float)$update_info['mc_shipping'];
+		//might paypal have added shipping?
+		if ($this->_paypal_shipping && $shipping_amount && $payment_was_itemized) {
+			$this->_line_item->add_unrelated_item(
+				$transaction_total_line_item,
+				sprintf(esc_html__('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID()),
+				$shipping_amount,
+				esc_html__('Shipping charges calculated by Paypal', 'event_espresso'),
+				1,
+				false,
+				'paypal_shipping_' . $transaction->ID()
+			);
+			$grand_total_needs_resaving = true;
+		}
+
+		if ($grand_total_needs_resaving) {
+			$transaction_total_line_item->save_this_and_descendants_to_txn($transaction->ID());
+			/** @var EE_Registration_Processor $registration_processor */
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
+			$registration_processor->update_registration_final_prices($transaction);
+		}
+		$this->log(
+			array(
+				'message'                     => esc_html__('Updated transaction related to payment', 'event_espresso'),
+				'url'                         => $this->_process_response_url(),
+				'transaction (updated)'       => $transaction->model_field_array(),
+				'payment (updated)'           => $payment->model_field_array(),
+				'use_paypal_shipping'         => $this->_paypal_shipping,
+				'use_paypal_tax'              => $this->_paypal_taxes,
+				'grand_total_needed_resaving' => $grand_total_needs_resaving,
+			),
+			$payment
+		);
+	}
 }
 // End of file EEG_Paypal_Standard.gateway.php
\ No newline at end of file

Spacing +35 added lines, -35 removed lines

@@ -2,7 +2,7 @@ 
 
 use EventEspresso\core\exceptions\IpnException;
 
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('NO direct script access allowed');
 }
 
@@ -143,16 +143,16 @@ 
                         $shipping_previously_added = $line_item->total();
                         continue;
                     }
-                    $redirect_args['item_name_' . $item_num] = substr(
+                    $redirect_args['item_name_'.$item_num] = substr(
                         $gateway_formatter->formatLineItemName($line_item, $payment),
                         0, 127
                     );
-                    $redirect_args['amount_' . $item_num] = $line_item->unit_price();
-                    $redirect_args['quantity_' . $item_num] = $line_item->quantity();
+                    $redirect_args['amount_'.$item_num] = $line_item->unit_price();
+                    $redirect_args['quantity_'.$item_num] = $line_item->quantity();
                     //if we're not letting PayPal calculate shipping, tell them its 0
-                    if (! $this->_paypal_shipping) {
-                        $redirect_args['shipping_' . $item_num] = '0';
-                        $redirect_args['shipping2_' . $item_num] = '0';
+                    if ( ! $this->_paypal_shipping) {
+                        $redirect_args['shipping_'.$item_num] = '0';
+                        $redirect_args['shipping2_'.$item_num] = '0';
                     }
                     $item_num++;
                     $itemized_sum += $line_item->total();
@@ -172,12 +172,12 @@ 
                 //itemized sum is too big
                 $total_discounts_to_cart_total += abs($itemized_sum_diff_from_txn_total);
             } elseif ($itemized_sum_diff_from_txn_total > 0) {
-                $redirect_args['item_name_' . $item_num] = substr(
-                        __('Other charges', 'event_espresso' ), 0, 127);
-                $redirect_args['amount_' . $item_num] = $gateway_formatter->formatCurrency(
+                $redirect_args['item_name_'.$item_num] = substr(
+                        __('Other charges', 'event_espresso'), 0, 127);
+                $redirect_args['amount_'.$item_num] = $gateway_formatter->formatCurrency(
                     $itemized_sum_diff_from_txn_total
                 );
-                $redirect_args['quantity_' . $item_num] = 1;
+                $redirect_args['quantity_'.$item_num] = 1;
                 $item_num++;
             }
             if ($total_discounts_to_cart_total > 0) {
@@ -186,34 +186,34 @@ 
                 );
             }
             //add our taxes to the order if we're NOT using PayPal's
-            if (! $this->_paypal_taxes) {
+            if ( ! $this->_paypal_taxes) {
                 $redirect_args['tax_cart'] = $total_line_item->get_total_tax();
             }
         } else {
             $payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, false);
             //partial payment that's not for the remaining amount, so we can't send an itemized list
-            $redirect_args['item_name_' . $item_num] = substr(
+            $redirect_args['item_name_'.$item_num] = substr(
                 $gateway_formatter->formatPartialPaymentLineItemName($payment),
                 0,
                 127
             );
-            $redirect_args['amount_' . $item_num] = $payment->amount();
-            $redirect_args['shipping_' . $item_num] = '0';
-            $redirect_args['shipping2_' . $item_num] = '0';
+            $redirect_args['amount_'.$item_num] = $payment->amount();
+            $redirect_args['shipping_'.$item_num] = '0';
+            $redirect_args['shipping2_'.$item_num] = '0';
             $redirect_args['tax_cart'] = '0';
             $item_num++;
         }
 
         if ($this->_debug_mode) {
-            $redirect_args['item_name_' . $item_num] = 'DEBUG INFO (this item only added in sandbox mode';
-            $redirect_args['amount_' . $item_num] = 0;
+            $redirect_args['item_name_'.$item_num] = 'DEBUG INFO (this item only added in sandbox mode';
+            $redirect_args['amount_'.$item_num] = 0;
             $redirect_args['on0_'.$item_num] = 'NOTIFY URL';
-            $redirect_args['os0_' . $item_num] = $notify_url;
+            $redirect_args['os0_'.$item_num] = $notify_url;
             $redirect_args['on1_'.$item_num] = 'RETURN URL';
-            $redirect_args['os1_' . $item_num] = $return_url;
+            $redirect_args['os1_'.$item_num] = $return_url;
 //          $redirect_args['option_index_' . $item_num] = 1; // <-- dunno if this is needed ?
-            $redirect_args['shipping_' . $item_num] = '0';
-            $redirect_args['shipping2_' . $item_num] = '0';
+            $redirect_args['shipping_'.$item_num] = '0';
+            $redirect_args['shipping2_'.$item_num] = '0';
         }
 
         $redirect_args['business'] = $this->_paypal_id;
@@ -223,12 +223,12 @@ 
         $redirect_args['cmd'] = '_cart';
         $redirect_args['upload'] = 1;
         $redirect_args['currency_code'] = $payment->currency_code();
-        $redirect_args['rm'] = 2;//makes the user return with method=POST
+        $redirect_args['rm'] = 2; //makes the user return with method=POST
         if ($this->_image_url) {
             $redirect_args['image_url'] = $this->_image_url;
         }
         $redirect_args['no_shipping'] = $this->_shipping_details;
-        $redirect_args['bn'] = 'EventEspresso_SP';//EE will blow up if you change this
+        $redirect_args['bn'] = 'EventEspresso_SP'; //EE will blow up if you change this
 
         $redirect_args = apply_filters("FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this);
 
@@ -261,7 +261,7 @@ 
     public function handle_payment_update($update_info, $transaction)
     {
         // verify there's payment data that's been sent
-        if (empty($update_info['payment_status'] ) || empty($update_info['txn_id'])) {
+        if (empty($update_info['payment_status']) || empty($update_info['txn_id'])) {
             // log the results
             $this->log(
                 array(
@@ -283,12 +283,12 @@ 
             }
         }
         $payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr($update_info['txn_id']);
-        if (! $payment instanceof EEI_Payment) {
+        if ( ! $payment instanceof EEI_Payment) {
             $payment = $transaction->last_payment();
         }
         // ok, then validate the IPN. Even if we've already processed this payment,
         // let PayPal know we don't want to hear from them anymore!
-        if (! $this->validate_ipn($update_info, $payment)) {
+        if ( ! $this->validate_ipn($update_info, $payment)) {
             return $payment;
         }
         // kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction,
@@ -364,7 +364,7 @@ 
         //check if we've already processed this payment
         if ($payment instanceof EEI_Payment) {
             //payment exists. if this has the exact same status and amount, don't bother updating. just return
-            if ($payment->status() === $status && (float)$payment->amount() === (float)$update_info['mc_gross']) {
+            if ($payment->status() === $status && (float) $payment->amount() === (float) $update_info['mc_gross']) {
                 // DUPLICATED IPN! don't bother updating transaction
                 throw new IpnException(
                     sprintf(
@@ -381,7 +381,7 @@ 
             } else {
                 // new payment yippee !!!
                 $payment->set_status($status);
-                $payment->set_amount((float)$update_info['mc_gross']);
+                $payment->set_amount((float) $update_info['mc_gross']);
                 $payment->set_gateway_response($gateway_response);
                 $payment->set_details($update_info);
                 $payment->set_txn_id_chq_nmbr($update_info['txn_id']);
@@ -451,7 +451,7 @@ 
                 'timeout'           => 60,
                 // make sure to set a site specific unique "user-agent" string since the WordPres default gets declined by PayPal
                 // plz see: https://github.com/websharks/s2member/issues/610
-                'user-agent'        => 'Event Espresso v' . EVENT_ESPRESSO_VERSION . '; ' . home_url(),
+                'user-agent'        => 'Event Espresso v'.EVENT_ESPRESSO_VERSION.'; '.home_url(),
                 'httpversion'       => '1.1'
             )
         );
@@ -472,7 +472,7 @@ 
                 $response->get_error_message(),
                 print_r($response->get_error_data(), true)
             );
-        } elseif(is_array($response) && isset($response['body'])) {
+        } elseif (is_array($response) && isset($response['body'])) {
             $error_msg = $response['body'];
         } else {
             $error_msg = print_r($response, true);
@@ -528,7 +528,7 @@ 
         /** @var EE_Transaction $transaction */
         $transaction = $payment->transaction();
         $payment_was_itemized = $payment->get_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true, false);
-        if (! $transaction) {
+        if ( ! $transaction) {
             $this->log(
                 esc_html__(
                     // @codingStandardsIgnoreStart
@@ -585,7 +585,7 @@ 
             $this->_line_item->set_line_items_taxable($transaction_total_line_item, true, 'paypal_shipping');
             $this->_line_item->set_total_tax_to(
                 $transaction_total_line_item,
-                (float)$update_info['tax'],
+                (float) $update_info['tax'],
                 esc_html__('Taxes', 'event_espresso'),
                 esc_html__('Calculated by Paypal', 'event_espresso'),
                 'paypal_tax'
@@ -593,7 +593,7 @@ 
             $grand_total_needs_resaving = TRUE;
         }
 
-        $shipping_amount = (float)$update_info['mc_shipping'];
+        $shipping_amount = (float) $update_info['mc_shipping'];
         //might paypal have added shipping?
         if ($this->_paypal_shipping && $shipping_amount && $payment_was_itemized) {
             $this->_line_item->add_unrelated_item(
@@ -603,7 +603,7 @@ 
                 esc_html__('Shipping charges calculated by Paypal', 'event_espresso'),
                 1,
                 false,
-                'paypal_shipping_' . $transaction->ID()
+                'paypal_shipping_'.$transaction->ID()
             );
             $grand_total_needs_resaving = true;
         }