MultinetInteractive / EduAdmin-WordPress-SveaWebPay

eduadmin-wordpress-sveawebpay.php

Spacing +15 added lines, -15 removed lines

@@ -35,44 +35,44 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
- add_action('admin_init', 'checkForEduAdminPlugin');
+ add_action( 'admin_init', 'checkForEduAdminPlugin' );
  function checkForEduAdminPlugin() {
-	 if(is_admin() && current_user_can('activate_plugins') && !is_plugin_active('eduadmin/eduadmin.php'))
+	 if ( is_admin() && current_user_can( 'activate_plugins' ) && ! is_plugin_active( 'eduadmin/eduadmin.php' ) )
 	 {
-		 add_action('admin_notices', function() {
-			 ?><div class="error"><p><?php _e('This plugin requires the EduAdmin-WordPress-plugin to be installed and activated.', 'eduadmin-sveawebpay'); ?></p></div><?php
+		 add_action( 'admin_notices', function() {
+			 ?><div class="error"><p><?php _e( 'This plugin requires the EduAdmin-WordPress-plugin to be installed and activated.', 'eduadmin-sveawebpay' ); ?></p></div><?php
 		 });
-		 deactivate_plugins(plugin_basename( __FILE__ ));
+		 deactivate_plugins( plugin_basename( __FILE__ ) );
 
-		 if(isset($_GET['activate'])) {
-			 unset($_GET['activate']);
+		 if ( isset( $_GET['activate'] ) ) {
+			 unset( $_GET['activate'] );
 		 }
 	 }
  }
 
-if(!class_exists('EDU_SveaWebPay_Loader')):
+if ( ! class_exists( 'EDU_SveaWebPay_Loader' ) ):
 
 final class EDU_SveaWebPay_Loader {
 	public function __construct() {
-		add_action('plugins_loaded', array($this, 'init'));
+		add_action( 'plugins_loaded', array ( $this, 'init' ) );
 	}
 
 	public function init() {
-		if(class_exists('EDU_Integration'))
+		if ( class_exists( 'EDU_Integration' ) )
 		{
-			require_once(__DIR__ . '/vendor/autoload.php'); // Load dependencies
-			require_once(__DIR__ . '/class/class-edu-sveawebpay.php');
+			require_once( __DIR__ . '/vendor/autoload.php' ); // Load dependencies
+			require_once( __DIR__ . '/class/class-edu-sveawebpay.php' );
 
-			add_filter('edu_integrations', array($this, 'add_integration'));
+			add_filter( 'edu_integrations', array ( $this, 'add_integration' ) );
 		}
 	}
 
-	public function add_integration($integrations)
+	public function add_integration( $integrations )
 	{
 		$integrations[] = 'EDU_SveaWebPay';
 		return $integrations;
 	}
 }
 
-$edu_sveawebpay_loader = new EDU_SveaWebPay_Loader(__FILE__);
+$edu_sveawebpay_loader = new EDU_SveaWebPay_Loader( __FILE__ );
 endif;
\ No newline at end of file

Braces +9 added lines, -12 removed lines

@@ -36,15 +36,14 @@ 
  */
 
  add_action('admin_init', 'checkForEduAdminPlugin');
- function checkForEduAdminPlugin() {
-	 if(is_admin() && current_user_can('activate_plugins') && !is_plugin_active('eduadmin/eduadmin.php'))
-	 {
-		 add_action('admin_notices', function() {
+ function checkForEduAdminPlugin() {

+	 if(is_admin() && current_user_can('activate_plugins') && !is_plugin_active('eduadmin/eduadmin.php')) {

+		 add_action('admin_notices', function() {

 			 ?><div class="error"><p><?php _e('This plugin requires the EduAdmin-WordPress-plugin to be installed and activated.', 'eduadmin-sveawebpay'); ?></p></div><?php
 		 });
 		 deactivate_plugins(plugin_basename( __FILE__ ));
 
-		 if(isset($_GET['activate'])) {
+		 if(isset($_GET['activate'])) {

 			 unset($_GET['activate']);
 		 }
 	 }
@@ -52,14 +51,13 @@ 
 
 if(!class_exists('EDU_SveaWebPay_Loader')):
 
-final class EDU_SveaWebPay_Loader {
-	public function __construct() {
+final class EDU_SveaWebPay_Loader {

+	public function __construct() {

 		add_action('plugins_loaded', array($this, 'init'));
 	}
 
-	public function init() {
-		if(class_exists('EDU_Integration'))
-		{
+	public function init() {

+		if(class_exists('EDU_Integration')) {

 			require_once(__DIR__ . '/vendor/autoload.php'); // Load dependencies
 			require_once(__DIR__ . '/class/class-edu-sveawebpay.php');
 
@@ -67,8 +65,7 @@ 
 		}
 	}
 
-	public function add_integration($integrations)
-	{
+	public function add_integration($integrations) {

 		$integrations[] = 'EDU_SveaWebPay';
 		return $integrations;
 	}

class/class-edu-sveawebpay.php

Spacing +7 added lines, -7 removed lines

@@ -23,35 +23,35 @@
 			$this->init_form_fields();
 			$this->init_settings();
 
-			add_action( 'eduadmin-processbooking', array( $this, 'process_booking' ) );
+			add_action( 'eduadmin-processbooking', array ( $this, 'process_booking' ) );
 
-			add_action( 'wp_loaded', array( $this, 'process_svearesponse' ) );
+			add_action( 'wp_loaded', array ( $this, 'process_svearesponse' ) );
 		}
 
 		/**
 		 * Initializes the settingsfields
 		 */
 		public function init_form_fields() {
-			$this->setting_fields = array(
-				'enabled'         => array(
+			$this->setting_fields = array (
+				'enabled'         => array (
 					'title'       => __( 'Enabled', 'eduadmin-sveawebpay' ),
 					'type'        => 'checkbox',
 					'description' => __( 'Enables/Disables the integration with Svea WebPay', 'eduadmin-sveawebpay' ),
 					'default'     => 'no',
 				),
-				'testrun'         => array(
+				'testrun'         => array (
 					'title'       => __( 'Sandbox mode', 'eduadmin-sveawebpay' ),
 					'type'        => 'checkbox',
 					'description' => __( 'Activate sandbox mode', 'eduadmin-sveawebpay' ),
 					'default'     => 'no',
 				),
-				'merchant_key'    => array(
+				'merchant_key'    => array (
 					'title'       => __( 'Merchant key', 'eduadmin-sveawebpay' ),
 					'type'        => 'text',
 					'description' => __( 'Please enter your merchant key from Svea WebPay.', 'eduadmin-sveawebpay' ),
 					'placeholder' => __( 'Merchant key', 'eduadmin-sveawebpay' ),
 				),
-				'merchant_secret' => array(
+				'merchant_secret' => array (
 					'title'       => __( 'Merchant secret', 'eduadmin-sveawebpay' ),
 					'type'        => 'password',
 					'description' => __( 'Please enter your merchant secret from Svea WebPay', 'eduadmin-sveawebpay' ),

Braces +32 added lines, -32 removed lines

@@ -11,11 +11,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', 'eduadmin-sveawebpay' );
 			$this->description = '';
@@ -31,7 +31,7 @@ 
 		/**
 		 * Initializes the settingsfields
 		 */
-		public function init_form_fields() {
+		public function init_form_fields() {

 			$this->setting_fields = array(
 				'enabled'         => array(
 					'title'       => __( 'Enabled', 'eduadmin-sveawebpay' ),
@@ -63,8 +63,8 @@ 
 		/**
 		 *
 		 */
-		public function process_svearesponse() {
-			if ( isset( $_REQUEST['edu-thankyou'] ) && isset( $_REQUEST['svea'] ) && isset( $_REQUEST['response'] ) ) {
+		public function process_svearesponse() {

+			if ( isset( $_REQUEST['edu-thankyou'] ) && isset( $_REQUEST['svea'] ) && isset( $_REQUEST['response'] ) ) {

 				$filter = new XFiltering();
 				$f      = new XFilter( 'EventCustomerLnkID', '=', $_REQUEST['edu-thankyou'] );
 				$filter->AddItem( $f );
@@ -90,12 +90,12 @@ 
 				$selectedCountry = 'SE';
 
 				$invoiceCountry = $ebi->Customer->InvoiceCountry;
-				if ( empty( $invoiceCountry ) ) {
+				if ( empty( $invoiceCountry ) ) {

 					$invoiceCountry = $ebi->Customer->Country;
 				}
 
-				foreach ( $countries as $country ) {
-					if ( $invoiceCountry == $country->CountryName ) {
+				foreach ( $countries as $country ) {

+					if ( $invoiceCountry == $country->CountryName ) {

 						$selectedCountry = $country->CountryCode;
 						break;
 					}
@@ -105,9 +105,9 @@ 
 
 				$response = ( new SveaResponse( $_REQUEST, $selectedCountry, $wpConfig ) )->getResponse();
 
-				if ( $response->accepted ) {
+				if ( $response->accepted ) {

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

 					EDU()->api->SetInvalidPayment( EDU()->get_token(), $ebi->EventBooking->EventCustomerLnkID );
 				}
 
@@ -123,8 +123,8 @@ 
 		/**
 		 * @param $bookingInfo EduAdminBookingInfo
 		 */
-		public function process_booking( $bookingInfo = null ) {
-			if ( isset( $_POST['act'] ) && 'bookCourse' === $_POST['act'] ) {
+		public function process_booking( $bookingInfo = null ) {

+			if ( isset( $_POST['act'] ) && 'bookCourse' === $_POST['act'] ) {

 				$bookingInfo->NoRedirect = true;
 
 				$countries = EDU()->api->GetCountries( EDU()->get_token(), 'Swedish' );
@@ -133,14 +133,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;
@@ -164,37 +164,37 @@ 
 
 				$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 );
 				}
 
-				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 );
 				}
 
-				if ( ! empty( $bookingInfo->Customer->InvoiceEmail ) ) {
+				if ( ! empty( $bookingInfo->Customer->InvoiceEmail ) ) {

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

 					$customer->setEmail( $bookingInfo->Customer->Email );
 				}
 
@@ -220,14 +220,14 @@ 
 					->setCancelUrl( apply_filters( 'eduadmin-cancel-url', $defaultCancel ) )
 					->getPaymentUrl();
 
-				if ( $wpForm->accepted ) {
-					if ( 'no' === $this->get_option( 'testrun', 'no' ) ) {
+				if ( $wpForm->accepted ) {

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

 						echo '<script type="text/javascript">location.href = "' . $wpForm->url . '";</script>';
-					} else {
+					} else {

 						echo '<script type="text/javascript">location.href = "' . $wpForm->testurl . '";</script>';
 					}
-				} else {
-					add_filter( 'edu-booking-error', function( $errors ) use ( &$wpForm ) {
+				} else {

+					add_filter( 'edu-booking-error', function( $errors ) use ( &$wpForm ) {

 						$errors[] = $wpForm->errormessage;
 					} );
 				}