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' ) ):
 

Indentation +9 added lines, -9 removed lines

@@ -265,23 +265,23 @@
 			if ( ! empty( $phone ) ) {
 				$customer->setPhoneNumber( $phone );
 				$phonePreset = WebPayItem::presetValue()
-				                         ->setTypeName( \Svea\WebPay\Checkout\Model\PresetValue::PHONE_NUMBER )
-				                         ->setValue( $phone )
-				                         ->setIsReadonly( false );
+										 ->setTypeName( \Svea\WebPay\Checkout\Model\PresetValue::PHONE_NUMBER )
+										 ->setValue( $phone )
+										 ->setIsReadonly( false );
 				$wpOrder->addPresetValue( $phonePreset );
 			}
 			$customer->setEmail( $email );
 
 			$zipPreset = WebPayItem::presetValue()
-			                       ->setTypeName( \Svea\WebPay\Checkout\Model\PresetValue::POSTAL_CODE )
-			                       ->setValue( $zipCode )
-			                       ->setIsReadonly( false );
+								   ->setTypeName( \Svea\WebPay\Checkout\Model\PresetValue::POSTAL_CODE )
+								   ->setValue( $zipCode )
+								   ->setIsReadonly( false );
 			$wpOrder->addPresetValue( $zipPreset );
 
 			$emailPreset = WebPayItem::presetValue()
-			                         ->setTypeName( \Svea\WebPay\Checkout\Model\PresetValue::EMAIL_ADDRESS )
-			                         ->setValue( $email )
-			                         ->setIsReadonly( false );
+									 ->setTypeName( \Svea\WebPay\Checkout\Model\PresetValue::EMAIL_ADDRESS )
+									 ->setValue( $email )
+									 ->setIsReadonly( false );
 			$wpOrder->addPresetValue( $emailPreset );
 
 			$current_url = esc_url( "{$_SERVER['REQUEST_SCHEME']}://{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}" );

Doc Comments +3 added lines, -3 removed lines

@@ -375,9 +375,9 @@
 		}
 
 		/**
-		 * @param $order_id numeric SVEA WebPay OrderId
-		 * @param $booking_id
-		 * @param $programme_booking_id
+		 * @param integer $order_id numeric SVEA WebPay OrderId
+		 * @param integer $booking_id
+		 * @param integer $programme_booking_id
 		 *
 		 * @return bool If the booking was deleted, due to cancellation
 		 * @throws \Svea\WebPay\BuildOrder\Validator\ValidationException

Spacing +15 added lines, -15 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
@@ -79,7 +79,7 @@ 
 
 			$ebi = new EduAdmin_BookingInfo( $event_booking, $_customer, $_contact );
 
-			if ( ! empty( EDU()->session['svea-order-id'] ) && ! empty( $_GET['svea_order_id'] ) && EDU()->session['svea-order-id'] === $_GET['svea_order_id'] ) {
+			if ( !empty( EDU()->session['svea-order-id'] ) && !empty( $_GET['svea_order_id'] ) && EDU()->session['svea-order-id'] === $_GET['svea_order_id'] ) {
 				do_action( 'eduadmin-bookingcompleted', $ebi );
 			} else {
 				do_action( 'eduadmin-processbooking', $ebi );
@@ -95,7 +95,7 @@ 
 				return;
 			}
 
-			if ( ! empty( $_POST['act'] ) && ( 'bookCourse' === $_POST['act'] || 'bookProgramme' === $_POST['act'] ) ) {
+			if ( !empty( $_POST['act'] ) && ( 'bookCourse' === $_POST['act'] || 'bookProgramme' === $_POST['act'] ) ) {
 				$ebi->NoRedirect = true;
 			}
 		}
@@ -193,7 +193,7 @@ 
 			foreach ( $countries as $country ) {
 				if ( $invoiceCountry == $country['CountryName'] ) {
 					$selectedCountry = $country['CountryCode'];
-					if ( ! empty( $country['CultureName'] ) ) {
+					if ( !empty( $country['CultureName'] ) ) {
 						$selectedLocale = $country['CultureName'];
 					}
 					break;
@@ -213,7 +213,7 @@ 
 			$locationCountry    = '';
 			$locationPostalCode = '';
 
-			if ( ! empty( $ebi->EventBooking['BookingId'] ) ) {
+			if ( !empty( $ebi->EventBooking['BookingId'] ) ) {
 				$booking_id   = intval( $ebi->EventBooking['BookingId'] );
 				$reference_id = $booking_id;
 
@@ -221,14 +221,14 @@ 
 
 				$eventName = $_event['EventName'];
 
-				if ( ! empty( $_event['LocationAddress'] ) && $_event['LocationAdress'] != null ) {
+				if ( !empty( $_event['LocationAddress'] ) && $_event['LocationAdress'] != null ) {
 					$locationAddress    = $_event['LocationAddress']['Address'];
 					$locationCountry    = $_event['LocationAddress']['Country'];
 					$locationPostalCode = $_event['LocationAddress']['AddressZip'];
 				}
 			}
 
-			if ( ! empty( $ebi->EventBooking['ProgrammeBookingId'] ) ) {
+			if ( !empty( $ebi->EventBooking['ProgrammeBookingId'] ) ) {
 				$programme_booking_id = intval( $ebi->EventBooking['ProgrammeBookingId'] );
 				$reference_id         = $programme_booking_id;
 
@@ -257,19 +257,19 @@ 
 
 			$customer = WebPayItem::companyCustomer();
 
-			$customerName  = ! empty( $ebi->Customer['BillingInfo']['InvoiceName'] ) ? $ebi->Customer['BillingInfo']['InvoiceName'] : $ebi->Customer['CustomerName'];
-			$streetAddress = ! empty( $ebi->Customer['BillingInfo']['Address'] ) ? $ebi->Customer['BillingInfo']['Address'] : $ebi->Customer['Address'];
-			$zipCode       = ! empty( $ebi->Customer['BillingInfo']['Zip'] ) ? $ebi->Customer['BillingInfo']['Zip'] : $ebi->Customer['Zip'];
+			$customerName  = !empty( $ebi->Customer['BillingInfo']['InvoiceName'] ) ? $ebi->Customer['BillingInfo']['InvoiceName'] : $ebi->Customer['CustomerName'];
+			$streetAddress = !empty( $ebi->Customer['BillingInfo']['Address'] ) ? $ebi->Customer['BillingInfo']['Address'] : $ebi->Customer['Address'];
+			$zipCode       = !empty( $ebi->Customer['BillingInfo']['Zip'] ) ? $ebi->Customer['BillingInfo']['Zip'] : $ebi->Customer['Zip'];
 			$city          = $ebi->Customer['BillingInfo']['City'] ? $ebi->Customer['BillingInfo']['City'] : $ebi->Customer['City'];
 			$phone         = $ebi->Customer['Phone'];
-			$email         = ! empty( $ebi->Customer['BillingInfo']['Email'] ) ? $ebi->Customer['BillingInfo']['Email'] : $ebi->Customer['Email'];
+			$email         = !empty( $ebi->Customer['BillingInfo']['Email'] ) ? $ebi->Customer['BillingInfo']['Email'] : $ebi->Customer['Email'];
 
 			$customer->setCompanyName( $customerName );
 			$customer->setStreetAddress( $streetAddress );
 			$customer->setZipCode( $zipCode );
 			$customer->setLocality( $city );
 
-			if ( ! empty( $phone ) ) {
+			if ( !empty( $phone ) ) {
 				$customer->setPhoneNumber( $phone );
 				$phonePreset = WebPayItem::presetValue()
 				                         ->setTypeName( \Svea\WebPay\Checkout\Model\PresetValue::PHONE_NUMBER )
@@ -340,7 +340,7 @@ 
 				->setConfirmationUri( $defaultThankYou )
 				->setPushUri( $defaultPushUrl )
 				->setCheckoutUri( $defaultCancel ); // We have no "checkout"-url.. So we just cancel the booking instead.
-			$wpForm  = $wpBuild->createOrder();
+			$wpForm = $wpBuild->createOrder();
 
 			EDU()->session['svea-order-id'] = $wpForm['OrderId'];
 
@@ -348,7 +348,7 @@ 
 		}
 
 		public function process_paymentstatus() {
-			if ( ! empty( $_GET['svea_order_id'] ) && intval( $_GET['svea_order_id'] ) != 0 && ! empty( $_GET['status'] ) ) {
+			if ( !empty( $_GET['svea_order_id'] ) && intval( $_GET['svea_order_id'] ) != 0 && !empty( $_GET['status'] ) ) {
 
 				$booking_id           = intval( $_GET['booking_id'] );
 				$programme_booking_id = intval( $_GET['programme_booking_id'] );
@@ -358,7 +358,7 @@ 
 				exit( 0 );
 			}
 
-			if ( isset( $_REQUEST['edu-thankyou'] ) && isset( $_REQUEST['svea'] ) && ! empty( $_GET['status'] ) ) {
+			if ( isset( $_REQUEST['edu-thankyou'] ) && isset( $_REQUEST['svea'] ) && !empty( $_GET['status'] ) ) {
 				$booking_id           = intval( $_GET['booking_id'] );
 				$programme_booking_id = intval( $_GET['programme_booking_id'] );
 

Braces +44 added lines, -44 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 = '';
@@ -37,7 +37,7 @@ 
 		/**
 		 * @param $attributes
 		 */
-		public function test_page( $attributes ) {
+		public function test_page( $attributes ) {

 			$attributes = shortcode_atts(
 				array(
 					'bookingid'          => 0,
@@ -47,14 +47,14 @@ 
 				'test_page'
 			);
 
-			if ( $attributes['bookingid'] > 0 ) {
+			if ( $attributes['bookingid'] > 0 ) {

 				$event_booking = EDUAPI()->OData->Bookings->GetItem(
 					$attributes['bookingid'],
 					null,
 					'Customer($select=CustomerId;),ContactPerson($select=PersonId;),OrderRows',
 					false
 				);
-			} elseif ( $attributes['programmebookingid'] > 0 ) {
+			} elseif ( $attributes['programmebookingid'] > 0 ) {

 				$event_booking = EDUAPI()->OData->ProgrammeBookings->GetItem(
 					$attributes['programmebookingid'],
 					null,
@@ -79,9 +79,9 @@ 
 
 			$ebi = new EduAdmin_BookingInfo( $event_booking, $_customer, $_contact );
 
-			if ( ! empty( EDU()->session['svea-order-id'] ) && ! empty( $_GET['svea_order_id'] ) && EDU()->session['svea-order-id'] === $_GET['svea_order_id'] ) {
+			if ( ! empty( EDU()->session['svea-order-id'] ) && ! empty( $_GET['svea_order_id'] ) && EDU()->session['svea-order-id'] === $_GET['svea_order_id'] ) {

 				do_action( 'eduadmin-bookingcompleted', $ebi );
-			} else {
+			} else {

 				do_action( 'eduadmin-processbooking', $ebi );
 			}
 		}
@@ -90,12 +90,12 @@ 
 		/**
 		 * @param EduAdmin_BookingInfo|null $ebi
 		 */
-		public function intercept_booking( $ebi = null ) {
-			if ( 'no' === $this->get_option( 'enabled', 'no' ) ) {
+		public function intercept_booking( $ebi = null ) {

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

 				return;
 			}
 
-			if ( ! empty( $_POST['act'] ) && ( 'bookCourse' === $_POST['act'] || 'bookProgramme' === $_POST['act'] ) ) {
+			if ( ! empty( $_POST['act'] ) && ( 'bookCourse' === $_POST['act'] || 'bookProgramme' === $_POST['act'] ) ) {

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

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

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

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

 				$booking_id           = intval( $_GET['booking_id'] );
 				$programme_booking_id = intval( $_GET['programme_booking_id'] );
 
@@ -148,7 +148,7 @@ 
 
 				EDU()->session['svea-order-id'] = null;
 
-				if ( $deleted ) {
+				if ( $deleted ) {

 					@wp_redirect( get_home_url() );
 					echo "<script type='text/javascript>location.href = '" . esc_js( get_home_url() ) . "';</script>";
 					exit( 0 );
@@ -159,14 +159,14 @@ 
 		/**
 		 * @param $ebi EduAdmin_BookingInfo|null $bookingInfo
 		 */
-		public function process_booking( $ebi = null ) {
-			if ( 'no' === $this->get_option( 'enabled', 'no' ) ) {
+		public function process_booking( $ebi = null ) {

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

 				return;
 			}
 
 			$ebi->NoRedirect = true;
 
-			if ( empty( $_GET['svea_order_id'] ) || empty( EDU()->session['svea-order-id'] ) ) {
+			if ( empty( $_GET['svea_order_id'] ) || empty( EDU()->session['svea-order-id'] ) ) {

 				$checkout = $this->create_checkout( $ebi );
 
 				$snippet = $checkout['Gui']['Snippet'];
@@ -179,21 +179,21 @@ 
 		 *
 		 * @returns array
 		 */
-		public function create_checkout( $ebi ) {
+		public function create_checkout( $ebi ) {

 			$countries = EDUAPI()->OData->Countries->Search()['value'];
 
 			$selectedCountry = 'SE';
 			$selectedLocale  = 'sv-SE';
 
 			$invoiceCountry = $ebi->Customer['BillingInfo']['Country'];
-			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'];
-					if ( ! empty( $country['CultureName'] ) ) {
+					if ( ! empty( $country['CultureName'] ) ) {

 						$selectedLocale = $country['CultureName'];
 					}
 					break;
@@ -213,7 +213,7 @@ 
 			$locationCountry    = '';
 			$locationPostalCode = '';
 
-			if ( ! empty( $ebi->EventBooking['BookingId'] ) ) {
+			if ( ! empty( $ebi->EventBooking['BookingId'] ) ) {

 				$booking_id   = intval( $ebi->EventBooking['BookingId'] );
 				$reference_id = $booking_id;
 
@@ -221,14 +221,14 @@ 
 
 				$eventName = $_event['EventName'];
 
-				if ( ! empty( $_event['LocationAddress'] ) && $_event['LocationAdress'] != null ) {
+				if ( ! empty( $_event['LocationAddress'] ) && $_event['LocationAdress'] != null ) {

 					$locationAddress    = $_event['LocationAddress']['Address'];
 					$locationCountry    = $_event['LocationAddress']['Country'];
 					$locationPostalCode = $_event['LocationAddress']['AddressZip'];
 				}
 			}
 
-			if ( ! empty( $ebi->EventBooking['ProgrammeBookingId'] ) ) {
+			if ( ! empty( $ebi->EventBooking['ProgrammeBookingId'] ) ) {

 				$programme_booking_id = intval( $ebi->EventBooking['ProgrammeBookingId'] );
 				$reference_id         = $programme_booking_id;
 
@@ -239,9 +239,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 );
 			}
 
@@ -269,7 +269,7 @@ 
 			$customer->setZipCode( $zipCode );
 			$customer->setLocality( $city );
 
-			if ( ! empty( $phone ) ) {
+			if ( ! empty( $phone ) ) {

 				$customer->setPhoneNumber( $phone );
 				$phonePreset = WebPayItem::presetValue()
 				                         ->setTypeName( \Svea\WebPay\Checkout\Model\PresetValue::PHONE_NUMBER )
@@ -347,8 +347,8 @@ 
 			return $wpForm;
 		}
 
-		public function process_paymentstatus() {
-			if ( ! empty( $_GET['svea_order_id'] ) && intval( $_GET['svea_order_id'] ) != 0 && ! empty( $_GET['status'] ) ) {
+		public function process_paymentstatus() {

+			if ( ! empty( $_GET['svea_order_id'] ) && intval( $_GET['svea_order_id'] ) != 0 && ! empty( $_GET['status'] ) ) {

 
 				$booking_id           = intval( $_GET['booking_id'] );
 				$programme_booking_id = intval( $_GET['programme_booking_id'] );
@@ -358,7 +358,7 @@ 
 				exit( 0 );
 			}
 
-			if ( isset( $_REQUEST['edu-thankyou'] ) && isset( $_REQUEST['svea'] ) && ! empty( $_GET['status'] ) ) {
+			if ( isset( $_REQUEST['edu-thankyou'] ) && isset( $_REQUEST['svea'] ) && ! empty( $_GET['status'] ) ) {

 				$booking_id           = intval( $_GET['booking_id'] );
 				$programme_booking_id = intval( $_GET['programme_booking_id'] );
 
@@ -366,7 +366,7 @@ 
 
 				EDU()->session['svea-order-id'] = null;
 
-				if ( $deleted ) {
+				if ( $deleted ) {

 					@wp_redirect( get_home_url() );
 					echo "<script type='text/javascript>location.href = '" . esc_js( get_home_url() ) . "';</script>";
 					exit( 0 );
@@ -382,10 +382,10 @@ 
 		 * @return bool If the booking was deleted, due to cancellation
 		 * @throws \Svea\WebPay\BuildOrder\Validator\ValidationException
 		 */
-		private function update_booking( $order_id, $booking_id, $programme_booking_id ) {
-			if ( 'no' !== $this->get_option( 'testrun', 'no' ) ) {
+		private function update_booking( $order_id, $booking_id, $programme_booking_id ) {

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

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

 				$wpConfig = new EduSveaWebPayProductionConfig( $this );
 			}
 
@@ -399,39 +399,39 @@ 
 			$patch_booking                  = new stdClass();
 			$patch_booking->PaymentMethodId = 2;
 
-			if ( 'Cancelled' === $order['Status'] ) {
+			if ( 'Cancelled' === $order['Status'] ) {

 				$patch_booking->Paid = false;
 				$delete_booking      = true;
-			} else if ( 'Final' === $order['Status'] ) {
+			} else if ( 'Final' === $order['Status'] ) {

 				$patch_booking->Paid = true;
-			} else if ( 'Created' === $order['Status'] ) {
+			} else if ( 'Created' === $order['Status'] ) {

 				$patch_booking->Paid = false;
 			}
 
-			if ( isset( $_GET['status'] ) && 'cancel' === $_GET['status'] ) {
+			if ( isset( $_GET['status'] ) && 'cancel' === $_GET['status'] ) {

 				$patch_booking->Paid = false;
 				$delete_booking      = true;
 			}
 
-			if ( $booking_id > 0 ) {
+			if ( $booking_id > 0 ) {

 				EDUAPI()->REST->Booking->PatchBooking(
 					$booking_id,
 					$patch_booking
 				);
 
-				if ( $delete_booking ) {
+				if ( $delete_booking ) {

 					EDUAPI()->REST->Booking->DeleteBooking( $booking_id );
 				}
 			}
 
-			if ( $programme_booking_id > 0 ) {
+			if ( $programme_booking_id > 0 ) {

 
 				EDUAPI()->REST->ProgrammeBooking->PatchBooking(
 					$programme_booking_id,
 					$patch_booking
 				);
 
-				if ( $delete_booking ) {
+				if ( $delete_booking ) {

 					EDUAPI()->REST->ProgrammeBooking->DeleteBooking( $programme_booking_id );
 				}
 			}

class/class-edu-sveawebpay-config.php

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';
 	}
 
@@ -69,7 +69,7 @@ 
 	 * @return string
 	 *
 	 */
-	public function getMerchantId( $type, $country ) {
+	public function getMerchantId( $type, $country ) {

 		$merchantId = $this->plugin->get_option( 'merchant_key', '' );
 
 		return $merchantId;
@@ -84,7 +84,7 @@ 
 	 * @return string
 	 *
 	 */
-	public function getSecret( $type, $country ) {
+	public function getSecret( $type, $country ) {

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

+/* Defined in subclasses */
 	}
 
 	/**
@@ -108,7 +109,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCheckoutMerchantId( $country = null ) {
+	public function getCheckoutMerchantId( $country = null ) {

 		$merchantId = $this->plugin->get_option( 'merchant_key', '' );
 
 		return $merchantId;
@@ -119,22 +120,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
@@ -146,8 +147,8 @@ 
 	 * @throws Exception
 	 */
 
-	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;
@@ -171,7 +172,7 @@ 
 	}
 }
 
-class EduSveaWebPayTestConfig extends EduSveaWebPayBaseConfig {
+class EduSveaWebPayTestConfig extends EduSveaWebPayBaseConfig {

 
 	/**
 	 * Constants for the endpoint url found in the class ConfigurationService.php
@@ -182,8 +183,8 @@ 
 	 * @return string
 	 * @throws Exception
 	 */
-	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;

eduadmin-wordpress-sveawebpay.php

Spacing +3 added lines, -3 removed lines

@@ -37,8 +37,8 @@ 
 
 add_action( 'admin_init', 'checkForEduAdminPlugin' );
 function checkForEduAdminPlugin() {
-	if ( is_admin() && current_user_can( 'activate_plugins' ) && ( ! is_plugin_active( 'eduadmin-booking/eduadmin.php' ) && ! is_plugin_active( 'eduadmin/eduadmin.php' ) ) ) {
-		add_action( 'admin_notices', function () {
+	if ( is_admin() && current_user_can( 'activate_plugins' ) && ( !is_plugin_active( 'eduadmin-booking/eduadmin.php' ) && !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>
@@ -52,7 +52,7 @@ 
 	}
 }
 
-if ( ! class_exists( 'EDU_SveaWebPay_Loader' ) ):
+if ( !class_exists( 'EDU_SveaWebPay_Loader' ) ):
 
 	final class EDU_SveaWebPay_Loader {
 		public function __construct() {

Braces +9 added lines, -9 removed lines

@@ -36,9 +36,9 @@ 
  */
 
 add_action( 'admin_init', 'checkForEduAdminPlugin' );
-function checkForEduAdminPlugin() {
-	if ( is_admin() && current_user_can( 'activate_plugins' ) && ( ! is_plugin_active( 'eduadmin-booking/eduadmin.php' ) && ! 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-booking/eduadmin.php' ) && ! 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>
@@ -46,7 +46,7 @@ 
 		} );
 		deactivate_plugins( plugin_basename( __FILE__ ) );
 
-		if ( isset( $_GET['activate'] ) ) {
+		if ( isset( $_GET['activate'] ) ) {

 			unset( $_GET['activate'] );
 		}
 	}
@@ -54,13 +54,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' );
 
@@ -68,7 +68,7 @@ 
 			}
 		}
 
-		public function add_integration( $integrations ) {
+		public function add_integration( $integrations ) {

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