MultinetInteractive / EduAdmin-WordPress-SveaWebPay

class/class-edu-sveawebpay.php

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 );
 				}
 			}