MultinetInteractive / EduAdmin-WordPress-SveaWebPay

class/class-edu-sveawebpay.php

Unused Use Statements -2 removed lines

@@ -5,8 +5,6 @@
 
 use Svea\WebPay\WebPay;
 use Svea\WebPay\WebPayItem;
-use Svea\WebPay\Config\ConfigurationService;
-use Svea\WebPay\Response\SveaResponse;
 
 if ( ! class_exists( 'EDU_SveaWebPay' ) ):
 

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 use Svea\WebPay\Config\ConfigurationService;
 use Svea\WebPay\Response\SveaResponse;
 
-if ( ! class_exists( 'EDU_SveaWebPay' ) ):
+if ( !class_exists( 'EDU_SveaWebPay' ) ):
 
 	/**
 	 * EDU_SveaWebPay integrates EduAdmin-WordPress plugin with SveaWebPay as payment gateway
@@ -167,7 +167,7 @@ 
 				foreach ( $countries as $country ) {
 					if ( $invoiceCountry == $country['CountryName'] ) {
 						$selectedCountry = $country['CountryCode'];
-						if ( ! empty( $country['CultureName'] ) ) {
+						if ( !empty( $country['CultureName'] ) ) {
 							$selectedLocale = $country['CultureName'];
 						}
 						break;
@@ -194,19 +194,19 @@ 
 
 				$customer = WebPayItem::companyCustomer();
 
-				if ( ! empty( $bookingInfo->Customer->InvoiceName ) ) {
+				if ( !empty( $bookingInfo->Customer->InvoiceName ) ) {
 					$customer->setCompanyName( $bookingInfo->Customer->InvoiceName );
 				} else {
 					$customer->setCompanyName( $bookingInfo->Customer->CustomerName );
 				}
 
-				if ( ! empty( $bookingInfo->Customer->InvoiceAddress1 ) ) {
+				if ( !empty( $bookingInfo->Customer->InvoiceAddress1 ) ) {
 					$customer->setStreetAddress( $bookingInfo->Customer->InvoiceAddress1 );
 				} else {
 					$customer->setStreetAddress( $bookingInfo->Customer->Address1 );
 				}
 
-				if ( ! empty( $bookingInfo->Customer->InvoiceZip ) ) {
+				if ( !empty( $bookingInfo->Customer->InvoiceZip ) ) {
 					$customer->setZipCode( $bookingInfo->Customer->InvoiceZip );
 				} else {
 					$customer->setZipCode( $bookingInfo->Customer->Zip );
@@ -214,17 +214,17 @@ 
 
 				$zipPreset = WebPayItem::presetValue()
 				                       ->setTypeName( \Svea\WebPay\Checkout\Model\PresetValue::POSTAL_CODE )
-				                       ->setValue( ! empty( $bookingInfo->Customer->InvoiceZip ) ? $bookingInfo->Customer->InvoiceZip : $bookingInfo->Customer->Zip )
+				                       ->setValue( !empty( $bookingInfo->Customer->InvoiceZip ) ? $bookingInfo->Customer->InvoiceZip : $bookingInfo->Customer->Zip )
 				                       ->setIsReadonly( false );
 				$wpOrder->addPresetValue( $zipPreset );
 
-				if ( ! empty( $bookingInfo->Customer->InvoiceCity ) ) {
+				if ( !empty( $bookingInfo->Customer->InvoiceCity ) ) {
 					$customer->setLocality( $bookingInfo->Customer->InvoiceCity );
 				} else {
 					$customer->setLocality( $bookingInfo->Customer->City );
 				}
 
-				if ( ! empty( $bookingInfo->Customer->Phone ) ) {
+				if ( !empty( $bookingInfo->Customer->Phone ) ) {
 					$customer->setPhoneNumber( $bookingInfo->Customer->Phone );
 					$phonePreset = WebPayItem::presetValue()
 					                         ->setTypeName( \Svea\WebPay\Checkout\Model\PresetValue::PHONE_NUMBER )
@@ -233,7 +233,7 @@ 
 					$wpOrder->addPresetValue( $phonePreset );
 				}
 
-				if ( ! empty( $bookingInfo->Customer->InvoiceEmail ) ) {
+				if ( !empty( $bookingInfo->Customer->InvoiceEmail ) ) {
 					$customer->setEmail( $bookingInfo->Customer->InvoiceEmail );
 				} else {
 					$customer->setEmail( $bookingInfo->Customer->Email );
@@ -241,7 +241,7 @@ 
 
 				$emailPreset = WebPayItem::presetValue()
 				                         ->setTypeName( \Svea\WebPay\Checkout\Model\PresetValue::EMAIL_ADDRESS )
-				                         ->setValue( ! empty( $bookingInfo->Customer->InvoiceEmail ) ? $bookingInfo->Customer->InvoiceEmail : $bookingInfo->Customer->Email )
+				                         ->setValue( !empty( $bookingInfo->Customer->InvoiceEmail ) ? $bookingInfo->Customer->InvoiceEmail : $bookingInfo->Customer->Email )
 				                         ->setIsReadonly( false );
 				$wpOrder->addPresetValue( $emailPreset );
 

Braces +35 added lines, -35 removed lines

@@ -13,11 +13,11 @@ 
 	/**
 	 * EDU_SveaWebPay integrates EduAdmin-WordPress plugin with SveaWebPay as payment gateway
 	 */
-	class EDU_SveaWebPay extends EDU_Integration {
+	class EDU_SveaWebPay extends EDU_Integration {

 		/**
 		 * Constructor
 		 */
-		public function __construct() {
+		public function __construct() {

 			$this->id          = 'eduadmin-sveawebpay';
 			$this->displayName = __( 'Svea Webpay (Checkout)', 'eduadmin-sveawebpay' );
 			$this->description = '';
@@ -35,11 +35,11 @@ 
 		/**
 		 * @param $bookingInfo EduAdmin_BookingInfo|null $bookingInfo
 		 */
-		public function intercept_booking( $bookingInfo = null ) {
-			if ( 'no' === $this->get_option( 'enabled', 'no' ) ) {
+		public function intercept_booking( $bookingInfo = null ) {

+			if ( 'no' === $this->get_option( 'enabled', 'no' ) ) {

 				return;
 			}
-			if ( isset( $_POST['act'] ) && 'bookCourse' === $_POST['act'] ) {
+			if ( isset( $_POST['act'] ) && 'bookCourse' === $_POST['act'] ) {

 				$bookingInfo->NoRedirect = true;
 			}
 		}
@@ -47,7 +47,7 @@ 
 		/**
 		 * Initializes the settingsfields
 		 */
-		public function init_form_fields() {
+		public function init_form_fields() {

 			$this->setting_fields = array(
 				'enabled'         => array(
 					'title'       => __( 'Enabled', 'eduadmin-sveawebpay' ),
@@ -79,12 +79,12 @@ 
 		/**
 		 *
 		 */
-		public function process_svearesponse() {
+		public function process_svearesponse() {

 
-			if ( 'no' === $this->get_option( 'enabled', 'no' ) ) {
+			if ( 'no' === $this->get_option( 'enabled', 'no' ) ) {

 				return;
 			}
-			if ( ( isset( $_REQUEST['edu-thankyou'] ) && isset( $_REQUEST['svea'] ) ) || ( isset( $_REQUEST['edu-cancel'] ) && isset( $_REQUEST['svea'] ) ) ) {
+			if ( ( isset( $_REQUEST['edu-thankyou'] ) && isset( $_REQUEST['svea'] ) ) || ( isset( $_REQUEST['edu-cancel'] ) && isset( $_REQUEST['svea'] ) ) ) {

 
 				$eclId = ( isset( $_REQUEST['edu-thankyou'] ) ? $_REQUEST['edu-thankyou'] : $_REQUEST['edu-cancel'] );
 
@@ -108,15 +108,15 @@ 
 
 				$ebi = new EduAdminBookingInfo( $eventBooking, $_customer, $_contact );
 
-				if ( 'no' !== $this->get_option( 'testrun', 'no' ) ) {
+				if ( 'no' !== $this->get_option( 'testrun', 'no' ) ) {

 					$wpConfig = new EduSveaWebPayTestConfig( $this );
-				} else {
+				} else {

 					$wpConfig = new EduSveaWebPayProductionConfig( $this );
 				}
 
 				$sveaOrderId = get_transient( 'eduadmin-sveaorderid-' . $ebi->EventBooking->EventCustomerLnkID );
 
-				if ( $sveaOrderId > 0 ) {
+				if ( $sveaOrderId > 0 ) {

 					$wpOrder = WebPay::checkout( $wpConfig );
 
 					$wpOrder->setCheckoutOrderId( intval( $sveaOrderId ) );
@@ -124,9 +124,9 @@ 
 					$order = $wpOrder->getOrder();
 				}
 
-				if ( 'Cancelled' !== $order['Status'] ) {
+				if ( 'Cancelled' !== $order['Status'] ) {

 					EDU()->api->SetValidPayment( EDU()->get_token(), $ebi->EventBooking->EventCustomerLnkID );
-				} else {
+				} else {

 					EDU()->api->SetInvalidPayment( EDU()->get_token(), $ebi->EventBooking->EventCustomerLnkID );
 				}
 
@@ -144,11 +144,11 @@ 
 		/**
 		 * @param $bookingInfo EduAdmin_BookingInfo|null $bookingInfo
 		 */
-		public function process_booking( $bookingInfo = null ) {
-			if ( 'no' === $this->get_option( 'enabled', 'no' ) ) {
+		public function process_booking( $bookingInfo = null ) {

+			if ( 'no' === $this->get_option( 'enabled', 'no' ) ) {

 				return;
 			}
-			if ( isset( $_POST['act'] ) && 'bookCourse' === $_POST['act'] ) {
+			if ( isset( $_POST['act'] ) && 'bookCourse' === $_POST['act'] ) {

 				$bookingInfo->NoRedirect = true;
 
 				$countries = EDUAPI()->OData->Countries->Search();
@@ -160,14 +160,14 @@ 
 				$selectedLocale  = 'sv-SE';
 
 				$invoiceCountry = $bookingInfo->Customer->InvoiceCountry;
-				if ( empty( $invoiceCountry ) ) {
+				if ( empty( $invoiceCountry ) ) {

 					$invoiceCountry = $bookingInfo->Customer->Country;
 				}
 
-				foreach ( $countries as $country ) {
-					if ( $invoiceCountry == $country['CountryName'] ) {
+				foreach ( $countries as $country ) {

+					if ( $invoiceCountry == $country['CountryName'] ) {

 						$selectedCountry = $country['CountryCode'];
-						if ( ! empty( $country['CultureName'] ) ) {
+						if ( ! empty( $country['CultureName'] ) ) {

 							$selectedLocale = $country['CultureName'];
 						}
 						break;
@@ -176,9 +176,9 @@ 
 
 				$currency = EDU()->get_option( 'eduadmin-currency', 'SEK' );
 
-				if ( 'no' !== $this->get_option( 'testrun', 'no' ) ) {
+				if ( 'no' !== $this->get_option( 'testrun', 'no' ) ) {

 					$wpConfig = new EduSveaWebPayTestConfig( $this );
-				} else {
+				} else {

 					$wpConfig = new EduSveaWebPayProductionConfig( $this );
 				}
 				#$wpOrder = WebPay::createOrder( $wpConfig );
@@ -194,21 +194,21 @@ 
 
 				$customer = WebPayItem::companyCustomer();
 
-				if ( ! empty( $bookingInfo->Customer->InvoiceName ) ) {
+				if ( ! empty( $bookingInfo->Customer->InvoiceName ) ) {

 					$customer->setCompanyName( $bookingInfo->Customer->InvoiceName );
-				} else {
+				} else {

 					$customer->setCompanyName( $bookingInfo->Customer->CustomerName );
 				}
 
-				if ( ! empty( $bookingInfo->Customer->InvoiceAddress1 ) ) {
+				if ( ! empty( $bookingInfo->Customer->InvoiceAddress1 ) ) {

 					$customer->setStreetAddress( $bookingInfo->Customer->InvoiceAddress1 );
-				} else {
+				} else {

 					$customer->setStreetAddress( $bookingInfo->Customer->Address1 );
 				}
 
-				if ( ! empty( $bookingInfo->Customer->InvoiceZip ) ) {
+				if ( ! empty( $bookingInfo->Customer->InvoiceZip ) ) {

 					$customer->setZipCode( $bookingInfo->Customer->InvoiceZip );
-				} else {
+				} else {

 					$customer->setZipCode( $bookingInfo->Customer->Zip );
 				}
 
@@ -218,13 +218,13 @@ 
 				                       ->setIsReadonly( false );
 				$wpOrder->addPresetValue( $zipPreset );
 
-				if ( ! empty( $bookingInfo->Customer->InvoiceCity ) ) {
+				if ( ! empty( $bookingInfo->Customer->InvoiceCity ) ) {

 					$customer->setLocality( $bookingInfo->Customer->InvoiceCity );
-				} else {
+				} else {

 					$customer->setLocality( $bookingInfo->Customer->City );
 				}
 
-				if ( ! empty( $bookingInfo->Customer->Phone ) ) {
+				if ( ! empty( $bookingInfo->Customer->Phone ) ) {

 					$customer->setPhoneNumber( $bookingInfo->Customer->Phone );
 					$phonePreset = WebPayItem::presetValue()
 					                         ->setTypeName( \Svea\WebPay\Checkout\Model\PresetValue::PHONE_NUMBER )
@@ -233,9 +233,9 @@ 
 					$wpOrder->addPresetValue( $phonePreset );
 				}
 
-				if ( ! empty( $bookingInfo->Customer->InvoiceEmail ) ) {
+				if ( ! empty( $bookingInfo->Customer->InvoiceEmail ) ) {

 					$customer->setEmail( $bookingInfo->Customer->InvoiceEmail );
-				} else {
+				} else {

 					$customer->setEmail( $bookingInfo->Customer->Email );
 				}
 
@@ -277,7 +277,7 @@ 
 
 				set_transient( 'eduadmin-sveaorderid-' . $bookingInfo->EventBooking->EventCustomerLnkID, $wpForm['OrderId'], HOUR_IN_SECONDS );
 
-				if ( array_key_exists( 'Gui', $wpForm ) ) {
+				if ( array_key_exists( 'Gui', $wpForm ) ) {

 					echo $wpForm['Gui']['Snippet'];
 				}
 			}

class/class-edu-sveawebpay-config.php

Spacing +2 added lines, -2 removed lines

@@ -106,7 +106,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCheckoutMerchantId($country = NULL) {
+	public function getCheckoutMerchantId( $country = NULL ) {
 		$merchantId = $this->plugin->get_option( 'merchant_key', '' );
 
 		return $merchantId;
@@ -117,7 +117,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCheckoutSecret($country = NULL) {
+	public function getCheckoutSecret( $country = NULL ) {
 		$secret = $this->plugin->get_option( 'merchant_secret', '' );
 
 		return $secret;

Braces +19 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class EduSveaWebPayBaseConfig implements \Svea\WebPay\Config\ConfigurationProvider {
+class EduSveaWebPayBaseConfig implements \Svea\WebPay\Config\ConfigurationProvider {

 	/**
 	 * @var EDU_SveaWebPay
 	 */
@@ -11,7 +11,7 @@ 
 	 *
 	 * @param EDU_SveaWebPay $_plugin
 	 */
-	public function __construct( $_plugin ) {
+	public function __construct( $_plugin ) {

 		$this->plugin = $_plugin;
 	}
 
@@ -26,7 +26,7 @@ 
 	 * @throws \Svea\WebPay\HostedService\Helper\InvalidTypeException  in case of unsupported $type
 	 * @throws \Svea\WebPay\HostedService\Helper\InvalidCountryException  in case of unsupported $country
 	 */
-	public function getUsername( $type, $country ) {
+	public function getUsername( $type, $country ) {

 		echo 'username';
 	}
 
@@ -41,7 +41,7 @@ 
 	 * @throws \Svea\WebPay\HostedService\Helper\InvalidTypeException  in case of unsupported $type
 	 * @throws \Svea\WebPay\HostedService\Helper\InvalidCountryException  in case of unsupported $country
 	 */
-	public function getPassword( $type, $country ) {
+	public function getPassword( $type, $country ) {

 		echo 'password';
 	}
 
@@ -56,7 +56,7 @@ 
 	 * @throws \Svea\WebPay\HostedService\Helper\InvalidTypeException  in case of unsupported $type
 	 * @throws \Svea\WebPay\HostedService\Helper\InvalidCountryException  in case of unsupported $country
 	 */
-	public function getClientNumber( $type, $country ) {
+	public function getClientNumber( $type, $country ) {

 		echo 'client';
 	}
 
@@ -68,7 +68,7 @@ 
 	 * @param string $type    Svea\WebPay\Config\ConfigurationProvider::INVOICE_TYPE, ::PAYMENTPLAN_TYPE can be used if needed to match different configuration settings
 	 * @param string $country CountryCode eg. SE, NO, DK, FI, NL, DE
 	 */
-	public function getMerchantId( $type, $country ) {
+	public function getMerchantId( $type, $country ) {

 		$merchantId = $this->plugin->get_option( 'merchant_key', '' );
 
 		return $merchantId;
@@ -82,7 +82,7 @@ 
 	 * @param string $type    Svea\WebPay\Config\ConfigurationProvider::INVOICE_TYPE, ::PAYMENTPLAN_TYPE can be used if needed to match different configuration settings
 	 * @param string $country CountryCode eg. SE, NO, DK, FI, NL, DE
 	 */
-	public function getSecret( $type, $country ) {
+	public function getSecret( $type, $country ) {

 		$secret = $this->plugin->get_option( 'merchant_secret', '' );
 
 		return $secret;
@@ -98,7 +98,8 @@ 
 	 * @return string
 	 */
 
-	public function getEndPoint( $type ) { /* Defined in subclasses */
+	public function getEndPoint( $type ) {

+/* Defined in subclasses */
 	}
 
 	/**
@@ -106,7 +107,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCheckoutMerchantId($country = NULL) {
+	public function getCheckoutMerchantId($country = NULL) {

 		$merchantId = $this->plugin->get_option( 'merchant_key', '' );
 
 		return $merchantId;
@@ -117,22 +118,22 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCheckoutSecret($country = NULL) {
+	public function getCheckoutSecret($country = NULL) {

 		$secret = $this->plugin->get_option( 'merchant_secret', '' );
 
 		return $secret;
 	}
 
-	public function getIntegrationCompany() {
+	public function getIntegrationCompany() {

 		return 'MultiNet Interactive AB : EduAdmin WordPress-plugin';
 	}
 
-	public function getIntegrationPlatform() {
+	public function getIntegrationPlatform() {

 		return 'EduAdmin WordPress';
 	}
 }
 
-class EduSveaWebPayProductionConfig extends EduSveaWebPayBaseConfig {
+class EduSveaWebPayProductionConfig extends EduSveaWebPayBaseConfig {

 
 	/**
 	 * Constants for the endpoint url found in the class ConfigurationService.php
@@ -144,8 +145,8 @@ 
 	 * @return string
 	 */
 
-	public function getEndPoint( $type ) {
-		switch ( strtoupper( $type ) ) {
+	public function getEndPoint( $type ) {

+		switch ( strtoupper( $type ) ) {

 			case 'HOSTED':
 				return Svea\WebPay\Config\ConfigurationService::SWP_PROD_URL;
 				break;
@@ -169,7 +170,7 @@ 
 	}
 }
 
-class EduSveaWebPayTestConfig extends EduSveaWebPayBaseConfig {
+class EduSveaWebPayTestConfig extends EduSveaWebPayBaseConfig {

 
 	/**
 	 * Constants for the endpoint url found in the class ConfigurationService.php
@@ -180,8 +181,8 @@ 
 	 * @throws Exception
 	 * @return string
 	 */
-	public function getEndPoint( $type ) {
-		switch ( strtoupper( $type ) ) {
+	public function getEndPoint( $type ) {

+		switch ( strtoupper( $type ) ) {

 			case 'HOSTED':
 				return Svea\WebPay\Config\ConfigurationService::SWP_TEST_URL;
 				break;