Merge pull request #25 from wirecard/removeInvalidChars

#24 Remove invalid chars for address data, add missing library files
qenta-cee · Jul 26, 2017 · 63352d0 · 63352d0
2 parents c8db814 + f8fdb9c
commit 63352d0
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 16 deletions.
diff --git a/woocommerce-wirecard-checkout-page/class-woocommerce-wcp-gateway.php b/woocommerce-wirecard-checkout-page/class-woocommerce-wcp-gateway.php
@@ -11,7 +11,7 @@
 require_once( WOOCOMMERCE_GATEWAY_WCP_BASEDIR . 'classes/class-woocommerce-wcp-payments.php' );
 
 define( 'WOOCOMMERCE_GATEWAY_WCP_NAME', 'Woocommerce2_WirecardCheckoutPage' );
-define( 'WOOCOMMERCE_GATEWAY_WCP_VERSION', '1.3.0' );
+define( 'WOOCOMMERCE_GATEWAY_WCP_VERSION', '1.3.1' );
 define( 'WOOCOMMERCE_GATEWAY_WCP_WINDOWNAME', 'WirecardCheckoutPageFrame' );
 define( 'WOOCOMMERCE_GATEWAY_WCP_TABLE_NAME', 'woocommerce_wcp_transaction' );
 
@@ -706,35 +706,48 @@ protected function get_consumer_data( $order, $address = 'billing' ) {
 			case 'shipping':
 				$shippingAddress = new WirecardCEE_Stdlib_ConsumerData_Address( $type );
 
-				$shippingAddress->setFirstname( $order->get_shipping_first_name() )
-				                ->setLastname( $order->get_shipping_last_name() )
-				                ->setAddress1( $order->get_shipping_address_1() )
-				                ->setAddress2( $order->get_shipping_address_2() )
-				                ->setCity( $order->get_shipping_city() )
+				$shippingAddress->setFirstname( $this->rmv_chars( $order->get_shipping_first_name() ) )
+				                ->setLastname( $this->rmv_chars( $order->get_shipping_last_name() ) )
+				                ->setAddress1( $this->rmv_chars( $order->get_shipping_address_1() ) )
+				                ->setAddress2( $this->rmv_chars( $order->get_shipping_address_2() ) )
+				                ->setCity( $this->rmv_chars( $order->get_shipping_city() ) )
 				                ->setZipCode( $order->get_shipping_postcode() )
-				                ->setCountry( $order->get_shipping_country() )
-				                ->setState( $order->get_shipping_state() );
+				                ->setCountry( $this->rmv_chars( $order->get_shipping_country() ) )
+				                ->setState( $this->rmv_chars( $order->get_shipping_state() ) );
 
 				return $shippingAddress;
 			case 'billing':
 			default:
 				$billing_address = new WirecardCEE_Stdlib_ConsumerData_Address( $type );
 
-				$billing_address->setFirstname( $order->get_billing_first_name() )
-				                ->setLastname( $order->get_billing_last_name() )
-				                ->setAddress1( $order->get_billing_address_1() )
-				                ->setAddress2( $order->get_billing_address_2() )
-				                ->setCity( $order->get_billing_city() )
+				$billing_address->setFirstname( $this->rmv_chars( $order->get_billing_first_name() ) )
+				                ->setLastname( $this->rmv_chars( $order->get_billing_last_name() ) )
+				                ->setAddress1( $this->rmv_chars( $order->get_billing_address_1() ) )
+				                ->setAddress2( $this->rmv_chars( $order->get_billing_address_2() ) )
+				                ->setCity( $this->rmv_chars( $order->get_billing_city() ) )
 				                ->setZipCode( $order->get_billing_postcode() )
-				                ->setCountry( $order->get_billing_country() )
+				                ->setCountry( $this->rmv_chars( $order->get_billing_country() ) )
 				                ->setPhone( $order->get_billing_phone() )
-				                ->setState( $order->get_billing_state() );
+				                ->setState( $this->rmv_chars( $order->get_billing_state() ) );
 
 				return $billing_address;
 		}
 
 	}
 
+	/**
+	 * Remove invalid chars and trim
+	 *
+     * @since 1.3.1
+     *
+	 * @param $string
+	 *
+	 * @return string
+	 */
+	protected function rmv_chars( $string ) {
+		return trim( preg_replace( '/[\']/i', ' ', $string ) );
+	}
+
 	/**
 	 * Generate shopping basket
 	 *

diff --git a/woocommerce-wirecard-checkout-page/woocommerce-wirecard-checkout-page.php b/woocommerce-wirecard-checkout-page/woocommerce-wirecard-checkout-page.php
@@ -6,7 +6,7 @@
 Plugin Name: Wirecard Checkout Page
 Plugin URI: http://www.wirecard.at/integration/plugins/
 Description: Wirecard is a popular payment service provider (PSP) and has connections with over 20 national and international currencies.
-Version: 1.3.0
+Version: 1.3.1
 Author: Wirecard
 Author URI: http://www.wirecard.at/
 License: Proprietary