eventespresso / event-espresso-core

payment_methods/Paypal_Standard/EEG_Paypal_Standard.gateway.php

Indentation +11 added lines, -11 removed lines

@@ -453,18 +453,18 @@
 		//} else {
 		//	$current_tax_amount = 0;
 		//}
-                //always add paypal's taxes
+				//always add paypal's taxes
 		if( $this->_paypal_taxes ){
-                    //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(),
-                            floatval( $update_info['tax'] ),
-                            __( 'Taxes', 'event_espresso' ),
-                            __( 'Calculated by Paypal', 'event_espresso' ),
-                            'paypal_tax'
-                    );
-                    $grand_total_needs_resaving = TRUE;
+					//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(),
+							floatval( $update_info['tax'] ),
+							__( 'Taxes', 'event_espresso' ),
+							__( 'Calculated by Paypal', 'event_espresso' ),
+							'paypal_tax'
+					);
+					$grand_total_needs_resaving = TRUE;
 		}
 
 		$shipping_amount = floatval( $update_info[ 'mc_shipping' ] );

Spacing +113 added lines, -113 removed lines

@@ -63,7 +63,7 @@ 
 	 * @return EEG_Paypal_Standard
 	 */
 	public function __construct() {
-		$this->set_uses_separate_IPN_request( true ) ;
+		$this->set_uses_separate_IPN_request(true);
 		parent::__construct();
 	}
 
@@ -73,11 +73,11 @@ 
 	 * 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){
+	public function set_settings($settings_array) {
 		parent::set_settings($settings_array);
-		if($this->_debug_mode){
+		if ($this->_debug_mode) {
 			$this->_gateway_url = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
-		}else{
+		} else {
 			$this->_gateway_url = 'https://www.paypal.com/cgi-bin/webscr';
 		}
 	}
@@ -92,7 +92,7 @@ 
 	 * @param string      $cancel_url   URL to send the user to after a cancelled payment attempt on teh payment provider's website
 	 * @return EEI_Payment
 	 */
-	public function set_redirection_info( $payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL ){
+	public function set_redirection_info($payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL) {
 		$redirect_args = array();
 		$transaction = $payment->transaction();
 		$primary_registrant = $transaction->primary_registration();
@@ -102,87 +102,87 @@ 
 
 		$total_discounts_to_cart_total = $transaction->paid();
 		//only itemize the order if we're paying for the rest of the order's amount
-		if( $payment->amount() == $transaction->total() ) {
+		if ($payment->amount() == $transaction->total()) {
 			//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 ) {
+			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() );
+					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 ) {
+					if (strpos($line_item->code(), 'paypal_shipping_') === 0) {
 						$shipping_previously_added = $line_item->total();
 						continue;
 					}
-					$redirect_args[ 'item_name_' . $item_num ] = substr(
-						sprintf( _x( '%1$s for %2$s', 'Ticket for Event', 'event_espresso' ), $line_item->name(), $line_item->ticket_event_name() ),
+					$redirect_args['item_name_'.$item_num] = substr(
+						sprintf(_x('%1$s for %2$s', 'Ticket for Event', 'event_espresso'), $line_item->name(), $line_item->ticket_event_name()),
 						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();
 				}
 			}
-			$taxes_li = $this->_line_item->get_taxes_subtotal( $total_line_item );
+			$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 = $transaction->total() - $itemized_sum - $taxes_li->total() - $shipping_previously_added;
-			if( $itemized_sum_diff_from_txn_total < 0 ) {
+			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 ] = $itemized_sum_diff_from_txn_total;
-				$redirect_args[ 'quantity_' . $item_num ] = 1;
+				$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] = $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' ] = $total_discounts_to_cart_total;
+			if ($total_discounts_to_cart_total > 0) {
+				$redirect_args['discount_amount_cart'] = $total_discounts_to_cart_total;
 			}
 			//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 {
 			//partial payment that's not for the remaining amount, so we can't send an itemized list
-			$redirect_args['item_name_' . $item_num] = substr(
-				sprintf( __('Payment of %1$s for %2$s', "event_espresso"), $payment->amount(), $primary_registrant->reg_code() ),
+			$redirect_args['item_name_'.$item_num] = substr(
+				sprintf(__('Payment of %1$s for %2$s', "event_espresso"), $payment->amount(), $primary_registrant->reg_code()),
 				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;
+		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['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;
@@ -192,14 +192,14 @@ 
 		$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['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 );
+		$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);
@@ -220,55 +220,55 @@ 
 	 * @return \EEI_Payment updated
 	 * @throws \EE_Error
 	 */
-	public function handle_payment_update( $update_info, $transaction ){
+	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'])) {
 			// 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' ] ) ) {
+			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 = $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 ) ) {
+		if ( ! $this->validate_ipn($update_info, $payment)) {
 			return $payment;
 		}
 		//ok, well let's process this payment then!
-		switch ( $update_info[ 'payment_status' ] ) {
+		switch ($update_info['payment_status']) {
 
 			case 'Completed' :
 				$status = $this->_pay_model->approved_status();
-				$gateway_response = __( 'The payment is approved.', 'event_espresso' );
+				$gateway_response = __('The payment is approved.', 'event_espresso');
 				break;
 
 			case 'Pending' :
 				$status = $this->_pay_model->pending_status();
-				$gateway_response = __( 'The payment is in progress. Another message will be sent when payment is approved.', 'event_espresso' );
+				$gateway_response = __('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 = __( 'The payment has been declined.', 'event_espresso' );
+				$gateway_response = __('The payment has been declined.', 'event_espresso');
 				break;
 
 			case 'Expired' :
 			case 'Failed' :
 				$status = $this->_pay_model->failed_status();
-				$gateway_response = __( 'The payment failed for technical reasons or expired.', 'event_espresso' );
+				$gateway_response = __('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 = __( 'The payment has been refunded. Please update registrations accordingly.', 'event_espresso' );
+				$gateway_response = __('The payment has been refunded. Please update registrations accordingly.', 'event_espresso');
 				break;
 
 			case 'Voided' :
@@ -276,25 +276,25 @@ 
 			case 'Canceled_Reversal' :
 			default :
 				$status = $this->_pay_model->cancelled_status();
-				$gateway_response = __( 'The payment was cancelled, reversed, or voided. Please update registrations accordingly.', 'event_espresso' );
+				$gateway_response = __('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 ) {
+		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 && $payment->amount() == $update_info[ 'mc_gross' ] ) {
+			if ($payment->status() == $status && $payment->amount() == $update_info['mc_gross']) {
 				// DUPLICATED IPN! dont bother updating transaction foo!;
-				$message_log = sprintf( __( 'It appears we have received a duplicate IPN from PayPal for payment %d', 'event_espresso' ), $payment->ID() );
+				$message_log = sprintf(__('It appears we have received a duplicate IPN from PayPal for payment %d', 'event_espresso'), $payment->ID());
 			} else {
 				// new payment yippee !!!
-				$payment->set_status( $status );
-				$payment->set_amount( floatval( $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' ] );
-				$message_log = sprintf( __( 'Updated payment either from IPN or as part of POST from PayPal', 'event_espresso' ) );
+				$payment->set_status($status);
+				$payment->set_amount(floatval($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']);
+				$message_log = sprintf(__('Updated payment either from IPN or as part of POST from PayPal', 'event_espresso'));
 			}
 			$this->log(
 				array(
@@ -306,11 +306,11 @@ 
 				$payment
 			);
 		}
-		do_action( 'FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this );
+		do_action('FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this);
 		// kill request here if this is a refund
-		if ( $update_info[ 'payment_status' ] == 'Refunded' || $update_info[ 'payment_status' ] == 'Partially_Refunded'   ) {
-			if ( apply_filters( 'FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true ) ) {
-				status_header( 200 );
+		if ($update_info['payment_status'] == 'Refunded' || $update_info['payment_status'] == 'Partially_Refunded') {
+			if (apply_filters('FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true)) {
+				status_header(200);
 				exit();
 			}
 		}
@@ -326,9 +326,9 @@ 
 	 * @param EE_Payment|EEI_Payment $payment
 	 * @return boolean
 	 */
-	public function validate_ipn( $update_info, $payment ) {
+	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 ) ) {
+		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
@@ -336,22 +336,22 @@ 
 		// 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 );
+		$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 ] );
+		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';
-		$get_magic_quotes_exists = function_exists( 'get_magic_quotes_gpc' ) ? true : false;
-		foreach ( $update_info as $key => $value ) {
-			if ( $get_magic_quotes_exists && get_magic_quotes_gpc() == 1 ) {
-				$value = urlencode( stripslashes( $value ) );
+		$get_magic_quotes_exists = function_exists('get_magic_quotes_gpc') ? true : false;
+		foreach ($update_info as $key => $value) {
+			if ($get_magic_quotes_exists && get_magic_quotes_gpc() == 1) {
+				$value = urlencode(stripslashes($value));
 			} else {
-				$value = urlencode( $value );
+				$value = urlencode($value);
 			}
 			$req .= "&$key=$value";
 		}
@@ -361,21 +361,21 @@ 
 			array(
 				'body' 				=> $req,
 				'sslverify' 		=> false,
-				'timeout' 		=> 60 ,
+				'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(),
 			)
 		);
 		// then check the response
-		if ( ! is_wp_error( $response ) && array_key_exists( 'body', $response ) && strcmp( $response[ 'body' ], "VERIFIED" ) == 0 ) {
+		if ( ! is_wp_error($response) && array_key_exists('body', $response) && strcmp($response['body'], "VERIFIED") == 0) {
 			return true;
 		} else {
 			// 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
-			$payment->set_gateway_response( sprintf( __( "IPN Validation failed! Paypal responded with '%s'", "event_espresso" ), $response[ 'body' ] ) );
-			$payment->set_details( array( 'REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response ) );
-			$payment->set_status( EEM_Payment::status_id_failed );
+			$payment->set_gateway_response(sprintf(__("IPN Validation failed! Paypal responded with '%s'", "event_espresso"), $response['body']));
+			$payment->set_details(array('REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response));
+			$payment->set_status(EEM_Payment::status_id_failed);
 			// log the results
 			$this->log(
 				array(
@@ -397,9 +397,9 @@ 
 	 */
 	protected function _process_response_url() {
 		EE_Registry::instance()->load_helper('URL');
-		if ( isset( $_SERVER[ 'HTTP_HOST' ], $_SERVER[ 'REQUEST_URI' ] ) ) {
+		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('HTTP_HOST');
 			$url .= EEH_URL::filter_input_server_url();
 		} else {
 			$url = 'unknown';
@@ -415,29 +415,29 @@ 
 	 * like the taxes or shipping
 	 * @param EEI_Payment $payment
 	 */
-	public function update_txn_based_on_payment( $payment ) {
+	public function update_txn_based_on_payment($payment) {
 		$update_info = $payment->details();
 		$transaction = $payment->transaction();
-		if( ! $transaction ){
-			$this->log( __( 'Payment with ID %d has no related transaction, and so update_txn_based_on_payment couldn\'t be executed properly', 'event_espresso' ), $payment );
+		if ( ! $transaction) {
+			$this->log(__('Payment with ID %d has no related transaction, and so update_txn_based_on_payment couldn\'t be executed properly', 'event_espresso'), $payment);
 			return;
 		}
-		if( ! is_array( $update_info ) || ! isset( $update_info[ 'mc_shipping' ] ) || ! isset( $update_info[ 'tax' ] ) ) {
+		if ( ! is_array($update_info) || ! isset($update_info['mc_shipping']) || ! isset($update_info['tax'])) {
 			$this->log(
 				array(
 					'url' 				=> $this->_process_response_url(),
-					'message' 	=> __( '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', 'event_espresso' ),
+					'message' 	=> __('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', 'event_espresso'),
 					'payment' 	=> $payment->model_field_array()
 				),
 				$payment
 			);
 			return;
 		}
-		if( $payment->status() !== $this->_pay_model->approved_status() ) {
+		if ($payment->status() !== $this->_pay_model->approved_status()) {
 			$this->log(
 				array(
 					'url' 				=> $this->_process_response_url(),
-					'message' 	=> __( 'We shouldn\'t update transactions taxes or shipping data from non-approved payments', 'event_espresso' ),
+					'message' 	=> __('We shouldn\'t update transactions taxes or shipping data from non-approved payments', 'event_espresso'),
 					'payment' 	=> $payment->model_field_array()
 				),
 				$payment
@@ -454,43 +454,43 @@ 
 		//	$current_tax_amount = 0;
 		//}
                 //always add paypal's taxes
-		if( $this->_paypal_taxes ){
+		if ($this->_paypal_taxes) {
                     //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_line_items_taxable($transaction->total_line_item(), true, 'paypal_shipping');
                     $this->_line_item->set_total_tax_to(
                             $transaction->total_line_item(),
-                            floatval( $update_info['tax'] ),
-                            __( 'Taxes', 'event_espresso' ),
-                            __( 'Calculated by Paypal', 'event_espresso' ),
+                            floatval($update_info['tax']),
+                            __('Taxes', 'event_espresso'),
+                            __('Calculated by Paypal', 'event_espresso'),
                             'paypal_tax'
                     );
                     $grand_total_needs_resaving = TRUE;
 		}
 
-		$shipping_amount = floatval( $update_info[ 'mc_shipping' ] );
+		$shipping_amount = floatval($update_info['mc_shipping']);
 		//might paypal have added shipping?
-		if( $this->_paypal_shipping && $shipping_amount ){
+		if ($this->_paypal_shipping && $shipping_amount) {
 			$this->_line_item->add_unrelated_item(
 				$transaction->total_line_item(),
-				sprintf( __('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID() ),
+				sprintf(__('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID()),
 				$shipping_amount,
 				__('Shipping charges calculated by Paypal', 'event_espresso'),
 				1,
 				false,
-				'paypal_shipping_' . $transaction->ID()
+				'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() );
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
-			$registration_processor->update_registration_final_prices( $transaction );
+		if ($grand_total_needs_resaving) {
+			$transaction->total_line_item()->save_this_and_descendants_to_txn($transaction->ID());
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
+			$registration_processor->update_registration_final_prices($transaction);
 		}
 		$this->log(
 			array(
 				'url' 													=> $this->_process_response_url(),
-				'message' 										=> __( 'Updated transaction related to payment', 'event_espresso' ),
+				'message' 										=> __('Updated transaction related to payment', 'event_espresso'),
 				'transaction (updated)' 					=> $transaction->model_field_array(),
 				'payment (updated)' 						=> $payment->model_field_array(),
 				'use_paypal_shipping' 					=> $this->_paypal_shipping,

payment_methods/Paypal_Standard/help_tabs/payment_methods_overview_paypalstandard.help_tab.php

Spacing +8 added lines, -8 removed lines

@@ -3,7 +3,7 @@ 
 <?php _e('Adjust the settings for the PayPal Standard payment gateway.', 'event_espresso'); ?>
 </p>
 <p>
-<?php printf( __( 'See %1$shere%2$s for list of currencies supported by Paypal Standard.', 'event_espresso' ), "<a href='https://www.paypal.com/multicurrency' target='_blank'>","</a>" ); ?>
+<?php printf(__('See %1$shere%2$s for list of currencies supported by Paypal Standard.', 'event_espresso'), "<a href='https://www.paypal.com/multicurrency' target='_blank'>", "</a>"); ?>
 </p>
 <h3><?php _e('PayPal Standard Settings', 'event_espresso'); ?></h3>
 <ul>
@@ -21,18 +21,18 @@ 
 </li>
 <li>
 <strong><?php _e('PayPal Calculates Taxes', 'event_espresso'); ?></strong><br />
-<?php printf( __('If set to "Yes", we will indicate to PayPal that it ought to calculate the taxes on the order and add it. This means PayPal\'s tax calculations will be used on the order instead of Event Espresso\'s. %1$sRead here for more information.%2$s', 'event_espresso'), "<a href='https://www.paypal.com/ca/cgi-bin/webscr?cmd=xpt/Marketing/shipping/EasyCalculateShipAndTax-outside' target='_blank'>", '</a>' ); ?><br/>
-<?php _e( 'Note: It may confuse users if Event Espresso initially calculates taxes on the order, and then they go to PayPal and it calculates taxes differently. So it is recommended that if PayPal is calculating taxes, that you do not set any taxes in Event Espresso.', 'event_espresso' );?>
+<?php printf(__('If set to "Yes", we will indicate to PayPal that it ought to calculate the taxes on the order and add it. This means PayPal\'s tax calculations will be used on the order instead of Event Espresso\'s. %1$sRead here for more information.%2$s', 'event_espresso'), "<a href='https://www.paypal.com/ca/cgi-bin/webscr?cmd=xpt/Marketing/shipping/EasyCalculateShipAndTax-outside' target='_blank'>", '</a>'); ?><br/>
+<?php _e('Note: It may confuse users if Event Espresso initially calculates taxes on the order, and then they go to PayPal and it calculates taxes differently. So it is recommended that if PayPal is calculating taxes, that you do not set any taxes in Event Espresso.', 'event_espresso'); ?>
 </li>
 <li>
 <strong><?php _e('PayPal Calculates Shipping', 'event_espresso'); ?></strong><br />
 <?php _e('Similar to the "PayPal Calculates Taxes" setting, if this is set to "Yes", we will indicate to PayPal that it ought to calculate the shipping on each payment (if there are multiple payments for a single transaction, PayPal is permitted to add shipping charges to each payment.)', 'event_espresso'); ?><br/>
-<?php _e( 'Important Note: PayPal will ONLY calculate shipping on an order if "Shipping Address Options" is set to "Prompt for an Address" (otherwise how will PayPal know how much to charge for shipping if it doesn\'t know where it\'s shipping to?)', 'event_espresso' );?>
+<?php _e('Important Note: PayPal will ONLY calculate shipping on an order if "Shipping Address Options" is set to "Prompt for an Address" (otherwise how will PayPal know how much to charge for shipping if it doesn\'t know where it\'s shipping to?)', 'event_espresso'); ?>
 <li>
-<strong><?php _e( 'Notes Regarding Paypal Taxes and Shipping', 'event_espresso' );?></strong><br/>
-<?php _e( 'If you want PayPal to calculate taxes and shipping on an order, those changes will NOT appear during the initial registration process until the user is redirected to PayPal for payment.', 'event_espresso' );?><br/>
-<?php _e( 'However, after the user has returned from PayPal, their order in Event Espresso will be updated with the new taxes and added shipping charges (e.g. it will appear on their receipt.)', 'event_espresso' );?><br/>
-<?php _e( 'Also Note: In order for PayPal to properly calculate taxes and shipping, they need to receive the entire order at the same time. So if a user goes to make a payment using PayPal, and their order somehow already has a payment on it, PayPal CANNOT calculate taxes or shipping on that order.', 'event_espresso' );?>
+<strong><?php _e('Notes Regarding Paypal Taxes and Shipping', 'event_espresso'); ?></strong><br/>
+<?php _e('If you want PayPal to calculate taxes and shipping on an order, those changes will NOT appear during the initial registration process until the user is redirected to PayPal for payment.', 'event_espresso'); ?><br/>
+<?php _e('However, after the user has returned from PayPal, their order in Event Espresso will be updated with the new taxes and added shipping charges (e.g. it will appear on their receipt.)', 'event_espresso'); ?><br/>
+<?php _e('Also Note: In order for PayPal to properly calculate taxes and shipping, they need to receive the entire order at the same time. So if a user goes to make a payment using PayPal, and their order somehow already has a payment on it, PayPal CANNOT calculate taxes or shipping on that order.', 'event_espresso'); ?>
 </li>
 <li>
 <strong><?php _e('Shipping Address Options', 'event_espresso'); ?></strong><br />