eventespresso / event-espresso-core

core/services/commands/middleware/CapChecker.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 use EventEspresso\core\services\commands\CommandInterface;
 use EventEspresso\core\services\commands\CommandRequiresCapCheckInterface;
 
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 

Indentation +30 added lines, -30 removed lines

@@ -9,7 +9,7 @@ 
 use EventEspresso\core\services\commands\CommandRequiresCapCheckInterface;
 
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -29,41 +29,41 @@ 
 class CapChecker implements CommandBusMiddlewareInterface
 {
 
-    /**
-     * @type CapabilitiesCheckerInterface $capabilities_checker
-     */
-    private $capabilities_checker;
+	/**
+	 * @type CapabilitiesCheckerInterface $capabilities_checker
+	 */
+	private $capabilities_checker;
 
 
 
-    /**
-     * CapChecker constructor
-     *
-     * @param CapabilitiesCheckerInterface $capabilities_checker
-     */
-    public function __construct(CapabilitiesCheckerInterface $capabilities_checker)
-    {
-        $this->capabilities_checker = $capabilities_checker;
-    }
+	/**
+	 * CapChecker constructor
+	 *
+	 * @param CapabilitiesCheckerInterface $capabilities_checker
+	 */
+	public function __construct(CapabilitiesCheckerInterface $capabilities_checker)
+	{
+		$this->capabilities_checker = $capabilities_checker;
+	}
 
 
 
-    /**
-     * @param CommandInterface $command
-     * @param Closure         $next
-     * @return mixed
-     * @throws InvalidClassException
-     * @throws InsufficientPermissionsException
-     */
-    public function handle(CommandInterface $command, Closure $next)
-    {
-        if ($command instanceof CommandRequiresCapCheckInterface) {
-            $this->capabilities_checker->processCapCheck(
-                $command->getCapCheck()
-            );
-        }
-        return $next($command);
-    }
+	/**
+	 * @param CommandInterface $command
+	 * @param Closure         $next
+	 * @return mixed
+	 * @throws InvalidClassException
+	 * @throws InsufficientPermissionsException
+	 */
+	public function handle(CommandInterface $command, Closure $next)
+	{
+		if ($command instanceof CommandRequiresCapCheckInterface) {
+			$this->capabilities_checker->processCapCheck(
+				$command->getCapCheck()
+			);
+		}
+		return $next($command);
+	}
 
 
 }

core/services/commands/transaction/CreateTransactionCommand.php

Indentation +60 added lines, -60 removed lines

@@ -24,66 +24,66 @@
 class CreateTransactionCommand extends Command implements CommandRequiresCapCheckInterface
 {
 
-    /**
-     * @var EE_Checkout $checkout
-     */
-    protected $checkout;
-
-    /**
-     * @var array $transaction_details
-     */
-    protected $transaction_details;
-
-
-
-    /**
-     * CreateTransactionCommand constructor.
-     *
-     * @param EE_Checkout $checkout
-     * @param array       $transaction_details
-     */
-    public function __construct(EE_Checkout $checkout = null, array $transaction_details = array())
-    {
-        $this->checkout = $checkout;
-        $this->transaction_details = $transaction_details;
-    }
-
-
-
-    /**
-     * @return CapCheckInterface
-     * @throws InvalidDataTypeException
-     */
-    public function getCapCheck()
-    {
-        // need cap for non-AJAX admin requests
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
-            // there's no specific caps for editing/creating transactions,
-            // so that's why we are using ee_edit_registrations
-            return new CapCheck('ee_edit_registrations', 'create_new_transaction');
-        }
-        return new PublicCapabilities('', 'create_new_transaction');
-    }
-
-
-
-    /**
-     * @return EE_Checkout
-     */
-    public function checkout()
-    {
-        return $this->checkout;
-    }
-
-
-
-    /**
-     * @return array
-     */
-    public function transactionDetails()
-    {
-        return $this->transaction_details;
-    }
+	/**
+	 * @var EE_Checkout $checkout
+	 */
+	protected $checkout;
+
+	/**
+	 * @var array $transaction_details
+	 */
+	protected $transaction_details;
+
+
+
+	/**
+	 * CreateTransactionCommand constructor.
+	 *
+	 * @param EE_Checkout $checkout
+	 * @param array       $transaction_details
+	 */
+	public function __construct(EE_Checkout $checkout = null, array $transaction_details = array())
+	{
+		$this->checkout = $checkout;
+		$this->transaction_details = $transaction_details;
+	}
+
+
+
+	/**
+	 * @return CapCheckInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function getCapCheck()
+	{
+		// need cap for non-AJAX admin requests
+		if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
+			// there's no specific caps for editing/creating transactions,
+			// so that's why we are using ee_edit_registrations
+			return new CapCheck('ee_edit_registrations', 'create_new_transaction');
+		}
+		return new PublicCapabilities('', 'create_new_transaction');
+	}
+
+
+
+	/**
+	 * @return EE_Checkout
+	 */
+	public function checkout()
+	{
+		return $this->checkout;
+	}
+
+
+
+	/**
+	 * @return array
+	 */
+	public function transactionDetails()
+	{
+		return $this->transaction_details;
+	}
 
 
 

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     public function getCapCheck()
     {
         // need cap for non-AJAX admin requests
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
+        if ( ! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
             // there's no specific caps for editing/creating transactions,
             // so that's why we are using ee_edit_registrations
             return new CapCheck('ee_edit_registrations', 'create_new_transaction');

core/services/commands/transaction/CreateTransactionCommandHandler.php

Indentation +38 added lines, -38 removed lines

@@ -26,44 +26,44 @@
 {
 
 
-    /**
-     * @param CommandInterface $command
-     * @return mixed
-     * @throws EE_Error
-     * @throws InvalidEntityException
-     */
-    public function handle(CommandInterface $command)
-    {
-        /** @var CreateTransactionCommand $command */
-        if (! $command instanceof CreateTransactionCommand) {
-            throw new InvalidEntityException(get_class($command), 'CreateTransactionCommand');
-        }
-        $transaction_details = $command->transactionDetails();
-        $cart_total = null;
-        if ($command->checkout() instanceof EE_Checkout) {
-            // ensure cart totals have been calculated
-            $command->checkout()->cart->get_grand_total()->recalculate_total_including_taxes();
-            // grab the cart grand total
-            $cart_total = $command->checkout()->cart->get_cart_grand_total();
-            $transaction_details['TXN_reg_steps'] = $command->checkout()->initialize_txn_reg_steps_array();
-            $transaction_details['TXN_total'] = $cart_total > 0 ? $cart_total : 0;
-        }
-        // create new TXN and save it so it has an ID
-        $transaction = EE_Transaction::new_instance($transaction_details);
-        if (! $transaction instanceof EE_Transaction) {
-            throw new InvalidEntityException(get_class($transaction), 'EE_Transaction');
-        }
-        $transaction->save();
-        // ensure grand total line item created
-        $cart_total = $cart_total instanceof EE_Line_Item
-            ? $cart_total
-            : EEH_Line_Item::create_total_line_item($transaction);
-        if (! $cart_total instanceof EE_Line_Item) {
-            throw new InvalidEntityException(get_class($cart_total), 'EE_Line_Item');
-        }
-        $cart_total->save_this_and_descendants_to_txn($transaction->ID());
-        return $transaction;
-    }
+	/**
+	 * @param CommandInterface $command
+	 * @return mixed
+	 * @throws EE_Error
+	 * @throws InvalidEntityException
+	 */
+	public function handle(CommandInterface $command)
+	{
+		/** @var CreateTransactionCommand $command */
+		if (! $command instanceof CreateTransactionCommand) {
+			throw new InvalidEntityException(get_class($command), 'CreateTransactionCommand');
+		}
+		$transaction_details = $command->transactionDetails();
+		$cart_total = null;
+		if ($command->checkout() instanceof EE_Checkout) {
+			// ensure cart totals have been calculated
+			$command->checkout()->cart->get_grand_total()->recalculate_total_including_taxes();
+			// grab the cart grand total
+			$cart_total = $command->checkout()->cart->get_cart_grand_total();
+			$transaction_details['TXN_reg_steps'] = $command->checkout()->initialize_txn_reg_steps_array();
+			$transaction_details['TXN_total'] = $cart_total > 0 ? $cart_total : 0;
+		}
+		// create new TXN and save it so it has an ID
+		$transaction = EE_Transaction::new_instance($transaction_details);
+		if (! $transaction instanceof EE_Transaction) {
+			throw new InvalidEntityException(get_class($transaction), 'EE_Transaction');
+		}
+		$transaction->save();
+		// ensure grand total line item created
+		$cart_total = $cart_total instanceof EE_Line_Item
+			? $cart_total
+			: EEH_Line_Item::create_total_line_item($transaction);
+		if (! $cart_total instanceof EE_Line_Item) {
+			throw new InvalidEntityException(get_class($cart_total), 'EE_Line_Item');
+		}
+		$cart_total->save_this_and_descendants_to_txn($transaction->ID());
+		return $transaction;
+	}
 
 
 }

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
     public function handle(CommandInterface $command)
     {
         /** @var CreateTransactionCommand $command */
-        if (! $command instanceof CreateTransactionCommand) {
+        if ( ! $command instanceof CreateTransactionCommand) {
             throw new InvalidEntityException(get_class($command), 'CreateTransactionCommand');
         }
         $transaction_details = $command->transactionDetails();
@@ -50,7 +50,7 @@ 
         }
         // create new TXN and save it so it has an ID
         $transaction = EE_Transaction::new_instance($transaction_details);
-        if (! $transaction instanceof EE_Transaction) {
+        if ( ! $transaction instanceof EE_Transaction) {
             throw new InvalidEntityException(get_class($transaction), 'EE_Transaction');
         }
         $transaction->save();
@@ -58,7 +58,7 @@ 
         $cart_total = $cart_total instanceof EE_Line_Item
             ? $cart_total
             : EEH_Line_Item::create_total_line_item($transaction);
-        if (! $cart_total instanceof EE_Line_Item) {
+        if ( ! $cart_total instanceof EE_Line_Item) {
             throw new InvalidEntityException(get_class($cart_total), 'EE_Line_Item');
         }
         $cart_total->save_this_and_descendants_to_txn($transaction->ID());

core/services/commands/attendee/CreateAttendeeCommand.php

Indentation +62 added lines, -62 removed lines

@@ -24,68 +24,68 @@
 class CreateAttendeeCommand extends Command implements CommandRequiresCapCheckInterface
 {
 
-    /**
-     * array of details where keys are names of EEM_Attendee model fields
-     *
-     * @var array $attendee_details
-     */
-    protected $attendee_details;
-
-    /**
-     * an existing registration to associate this attendee with
-     *
-     * @var EE_Registration $registration
-     */
-    protected $registration;
-
-
-
-    /**
-     * CreateAttendeeCommand constructor.
-     *
-     * @param array            $attendee_details
-     * @param EE_Registration $registration
-     */
-    public function __construct(array $attendee_details, EE_Registration $registration)
-    {
-        $this->attendee_details = $attendee_details;
-        $this->registration = $registration;
-    }
-
-
-
-    /**
-     * @return array
-     */
-    public function attendeeDetails()
-    {
-        return $this->attendee_details;
-    }
-
-
-
-    /**
-     * @return EE_Registration
-     */
-    public function registration()
-    {
-        return $this->registration;
-    }
-
-
-
-    /**
-     * @return CapCheckInterface
-     * @throws InvalidDataTypeException
-     */
-    public function getCapCheck()
-    {
-        // need cap for non-AJAX admin requests
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
-            return new CapCheck('ee_edit_contacts', 'create_new_contact');
-        }
-        return new PublicCapabilities('', 'create_new_contact');
-    }
+	/**
+	 * array of details where keys are names of EEM_Attendee model fields
+	 *
+	 * @var array $attendee_details
+	 */
+	protected $attendee_details;
+
+	/**
+	 * an existing registration to associate this attendee with
+	 *
+	 * @var EE_Registration $registration
+	 */
+	protected $registration;
+
+
+
+	/**
+	 * CreateAttendeeCommand constructor.
+	 *
+	 * @param array            $attendee_details
+	 * @param EE_Registration $registration
+	 */
+	public function __construct(array $attendee_details, EE_Registration $registration)
+	{
+		$this->attendee_details = $attendee_details;
+		$this->registration = $registration;
+	}
+
+
+
+	/**
+	 * @return array
+	 */
+	public function attendeeDetails()
+	{
+		return $this->attendee_details;
+	}
+
+
+
+	/**
+	 * @return EE_Registration
+	 */
+	public function registration()
+	{
+		return $this->registration;
+	}
+
+
+
+	/**
+	 * @return CapCheckInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function getCapCheck()
+	{
+		// need cap for non-AJAX admin requests
+		if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
+			return new CapCheck('ee_edit_contacts', 'create_new_contact');
+		}
+		return new PublicCapabilities('', 'create_new_contact');
+	}
 
 
 

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
     public function getCapCheck()
     {
         // need cap for non-AJAX admin requests
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
+        if ( ! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
             return new CapCheck('ee_edit_contacts', 'create_new_contact');
         }
         return new PublicCapabilities('', 'create_new_contact');

core/services/commands/attendee/CreateAttendeeCommandHandler.php

Indentation +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
 	 * @param EEM_Attendee $attendee_model
 	 */
 	public function __construct(EEM_Attendee $attendee_model ) {
-        $this->attendee_model = $attendee_model;
+		$this->attendee_model = $attendee_model;
 	}
 
 
@@ -83,7 +83,7 @@ 
 	private function findExistingAttendee( EE_Registration $registration, array $attendee_data ) {
 		$existing_attendee = null;
 		// does this attendee already exist in the db ?
-        // we're searching using a combination of first name, last name, AND email address
+		// we're searching using a combination of first name, last name, AND email address
 		$ATT_fname = ! empty( $attendee_data['ATT_fname'] )
 			? $attendee_data['ATT_fname']
 			: '';
@@ -124,8 +124,8 @@ 
 	 */
 	private function updateExistingAttendeeData( EE_Attendee $existing_attendee, array $attendee_data ) {
 		// first remove fname, lname, and email from attendee data
-        // because these properties will be exactly the same as the returned attendee object,
-        // since they were used in the query to get the attendee object in the first place
+		// because these properties will be exactly the same as the returned attendee object,
+		// since they were used in the query to get the attendee object in the first place
 		$dont_set = array( 'ATT_fname', 'ATT_lname', 'ATT_email' );
 		// now loop thru what's left and add to attendee CPT
 		foreach ( $attendee_data as $property_name => $property_value ) {

Spacing +20 added lines, -20 removed lines

@@ -9,7 +9,7 @@ 
 use EventEspresso\core\services\commands\CommandHandler;
 use EventEspresso\core\services\commands\CommandInterface;
 
-defined( 'EVENT_ESPRESSO_VERSION' ) || exit;
+defined('EVENT_ESPRESSO_VERSION') || exit;
 
 
 
@@ -34,7 +34,7 @@ 
 	/**
 	 * @param EEM_Attendee $attendee_model
 	 */
-	public function __construct(EEM_Attendee $attendee_model ) {
+	public function __construct(EEM_Attendee $attendee_model) {
         $this->attendee_model = $attendee_model;
 	}
 
@@ -46,10 +46,10 @@ 
 	 * @throws EE_Error
 	 * @throws InvalidEntityException
 	 */
-	public function handle( CommandInterface $command ) {
+	public function handle(CommandInterface $command) {
 		/** @var CreateAttendeeCommand $command */
-		if ( ! $command instanceof CreateAttendeeCommand ) {
-			throw new InvalidEntityException( get_class( $command ), 'CreateAttendeeCommand' );
+		if ( ! $command instanceof CreateAttendeeCommand) {
+			throw new InvalidEntityException(get_class($command), 'CreateAttendeeCommand');
 		}
 		// have we met before?
 		$attendee = $this->findExistingAttendee(
@@ -57,7 +57,7 @@ 
 			$command->attendeeDetails()
 		);
 		// did we find an already existing record for this attendee ?
-		if ( $attendee instanceof EE_Attendee ) {
+		if ($attendee instanceof EE_Attendee) {
 			$attendee = $this->updateExistingAttendeeData(
 				$attendee,
 				$command->attendeeDetails()
@@ -80,21 +80,21 @@ 
 	 * @param  array           $attendee_data
 	 * @return EE_Attendee
 	 */
-	private function findExistingAttendee( EE_Registration $registration, array $attendee_data ) {
+	private function findExistingAttendee(EE_Registration $registration, array $attendee_data) {
 		$existing_attendee = null;
 		// does this attendee already exist in the db ?
         // we're searching using a combination of first name, last name, AND email address
-		$ATT_fname = ! empty( $attendee_data['ATT_fname'] )
+		$ATT_fname = ! empty($attendee_data['ATT_fname'])
 			? $attendee_data['ATT_fname']
 			: '';
-		$ATT_lname = ! empty( $attendee_data['ATT_lname'] )
+		$ATT_lname = ! empty($attendee_data['ATT_lname'])
 			? $attendee_data['ATT_lname']
 			: '';
-		$ATT_email = ! empty( $attendee_data['ATT_email'] )
+		$ATT_email = ! empty($attendee_data['ATT_email'])
 			? $attendee_data['ATT_email']
 			: '';
 		// but only if those have values
-		if ( $ATT_fname && $ATT_lname && $ATT_email ) {
+		if ($ATT_fname && $ATT_lname && $ATT_email) {
 			$existing_attendee = $this->attendee_model->find_existing_attendee(
 				array(
 					'ATT_fname' => $ATT_fname,
@@ -122,18 +122,18 @@ 
 	 * @return EE_Attendee
 	 * @throws EE_Error
 	 */
-	private function updateExistingAttendeeData( EE_Attendee $existing_attendee, array $attendee_data ) {
+	private function updateExistingAttendeeData(EE_Attendee $existing_attendee, array $attendee_data) {
 		// first remove fname, lname, and email from attendee data
         // because these properties will be exactly the same as the returned attendee object,
         // since they were used in the query to get the attendee object in the first place
-		$dont_set = array( 'ATT_fname', 'ATT_lname', 'ATT_email' );
+		$dont_set = array('ATT_fname', 'ATT_lname', 'ATT_email');
 		// now loop thru what's left and add to attendee CPT
-		foreach ( $attendee_data as $property_name => $property_value ) {
+		foreach ($attendee_data as $property_name => $property_value) {
 			if (
-				! in_array( $property_name, $dont_set, true )
-				&& $this->attendee_model->has_field( $property_name )
+				! in_array($property_name, $dont_set, true)
+				&& $this->attendee_model->has_field($property_name)
 			) {
-				$existing_attendee->set( $property_name, $property_value );
+				$existing_attendee->set($property_name, $property_value);
 			}
 		}
 		// better save that now
@@ -151,11 +151,11 @@ 
 	 * @return EE_Attendee
 	 * @throws EE_Error
 	 */
-	private function createNewAttendee( EE_Registration $registration, array $attendee_data ) {
+	private function createNewAttendee(EE_Registration $registration, array $attendee_data) {
 		// create new attendee object
-		$new_attendee = EE_Attendee::new_instance( $attendee_data );
+		$new_attendee = EE_Attendee::new_instance($attendee_data);
 		// set author to event creator
-		$new_attendee->set( 'ATT_author', $registration->event()->wp_user() );
+		$new_attendee->set('ATT_author', $registration->event()->wp_user());
 		$new_attendee->save();
 		return $new_attendee;
 	}

core/domain/services/registration/CreateRegistrationService.php

Doc Comments +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
 	 * @param EE_Transaction $transaction
 	 * @param EE_Ticket      $ticket
 	 * @param EE_Line_Item   $ticket_line_item
-	 * @param                 $reg_count
-	 * @param                 $reg_group_size
+	 * @param                 integer $reg_count
+	 * @param                 integer $reg_group_size
      * @param string          $reg_status
      * @return EE_Registration
 	 * @throws OutOfRangeException

Indentation +76 added lines, -76 removed lines

@@ -17,7 +17,7 @@ 
 use OutOfRangeException;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -41,54 +41,54 @@ 
 	 * @param EE_Line_Item   $ticket_line_item
 	 * @param                 $reg_count
 	 * @param                 $reg_group_size
-     * @param string          $reg_status
-     * @return EE_Registration
+	 * @param string          $reg_status
+	 * @return EE_Registration
 	 * @throws OutOfRangeException
 	 * @throws EE_Error
 	 * @throws UnexpectedEntityException
 	 */
-    public function create(
-        EE_Event $event,
-        EE_Transaction $transaction,
-        EE_Ticket $ticket,
-        EE_Line_Item $ticket_line_item,
-        $reg_count,
-        $reg_group_size,
-        $reg_status = EEM_Registration::status_id_incomplete
-    ) {
-        $registrations = $transaction->registrations();
-        $reg_count = $reg_count ? $reg_count : count($registrations) + 1;
-        $reg_url_link = new RegUrlLink($reg_count, $ticket_line_item);
-        $reg_code = new RegCode($reg_url_link, $transaction, $ticket);
-        // generate new EE_Registration
-        $registration = EE_Registration::new_instance(
-            array(
-                'EVT_ID'          => $event->ID(),
-                'TXN_ID'          => $transaction->ID(),
-                'TKT_ID'          => $ticket->ID(),
-                'STS_ID'          => $reg_status,
-                'REG_final_price' => $this->resolveFinalPrice($transaction, $ticket, $ticket_line_item),
-                'REG_session'     => EE_Registry::instance()->SSN->id(),
-                'REG_count'       => $reg_count,
-                'REG_group_size'  => $reg_group_size ? $reg_group_size : $this->incrementRegCount($registrations),
-                'REG_url_link'    => $reg_url_link,
-                'REG_code'        => $reg_code,
-            )
-        );
-        if ( ! $registration instanceof EE_Registration) {
-            throw new UnexpectedEntityException($registration, 'EE_Registration');
-        }
-        // save registration so that we have an ID
-        $registration->save();
-        // track reservation on reg but don't adjust ticket and datetime reserved counts
-        // because that is done as soon as the tickets are added/removed from the cart
-        $registration->reserve_ticket();
-        $registration->_add_relation_to($event, 'Event', array(), $event->ID());
-        $registration->_add_relation_to($ticket, 'Ticket', array(), $ticket->ID());
-        $transaction->_add_relation_to($registration, 'Registration', array(), $registration->ID());
-        $registration->save();
-        return $registration;
-    }
+	public function create(
+		EE_Event $event,
+		EE_Transaction $transaction,
+		EE_Ticket $ticket,
+		EE_Line_Item $ticket_line_item,
+		$reg_count,
+		$reg_group_size,
+		$reg_status = EEM_Registration::status_id_incomplete
+	) {
+		$registrations = $transaction->registrations();
+		$reg_count = $reg_count ? $reg_count : count($registrations) + 1;
+		$reg_url_link = new RegUrlLink($reg_count, $ticket_line_item);
+		$reg_code = new RegCode($reg_url_link, $transaction, $ticket);
+		// generate new EE_Registration
+		$registration = EE_Registration::new_instance(
+			array(
+				'EVT_ID'          => $event->ID(),
+				'TXN_ID'          => $transaction->ID(),
+				'TKT_ID'          => $ticket->ID(),
+				'STS_ID'          => $reg_status,
+				'REG_final_price' => $this->resolveFinalPrice($transaction, $ticket, $ticket_line_item),
+				'REG_session'     => EE_Registry::instance()->SSN->id(),
+				'REG_count'       => $reg_count,
+				'REG_group_size'  => $reg_group_size ? $reg_group_size : $this->incrementRegCount($registrations),
+				'REG_url_link'    => $reg_url_link,
+				'REG_code'        => $reg_code,
+			)
+		);
+		if ( ! $registration instanceof EE_Registration) {
+			throw new UnexpectedEntityException($registration, 'EE_Registration');
+		}
+		// save registration so that we have an ID
+		$registration->save();
+		// track reservation on reg but don't adjust ticket and datetime reserved counts
+		// because that is done as soon as the tickets are added/removed from the cart
+		$registration->reserve_ticket();
+		$registration->_add_relation_to($event, 'Event', array(), $event->ID());
+		$registration->_add_relation_to($ticket, 'Ticket', array(), $ticket->ID());
+		$transaction->_add_relation_to($registration, 'Registration', array(), $registration->ID());
+		$registration->save();
+		return $registration;
+	}
 
 
 
@@ -100,40 +100,40 @@ 
 	 * @throws EE_Error
 	 * @throws OutOfRangeException
 	 */
-    protected function resolveFinalPrice(
-        EE_Transaction $transaction,
-        EE_Ticket $ticket,
-        EE_Line_Item $ticket_line_item
-    ) {
-        $final_price = EEH_Line_Item::calculate_final_price_for_ticket_line_item(
-            $transaction->total_line_item(),
-            $ticket_line_item
-        );
-        $final_price = $final_price !== null ? $final_price : $ticket->get_ticket_total_with_taxes();
-        return (float)$final_price;
-    }
+	protected function resolveFinalPrice(
+		EE_Transaction $transaction,
+		EE_Ticket $ticket,
+		EE_Line_Item $ticket_line_item
+	) {
+		$final_price = EEH_Line_Item::calculate_final_price_for_ticket_line_item(
+			$transaction->total_line_item(),
+			$ticket_line_item
+		);
+		$final_price = $final_price !== null ? $final_price : $ticket->get_ticket_total_with_taxes();
+		return (float)$final_price;
+	}
 
 
 
-    /**
-     * @param  EE_Registration[] $registrations
-     * @param  boolean            $update_existing_registrations
-     * @return int
-     * @throws EE_Error
-     */
-    protected function incrementRegCount(array $registrations, $update_existing_registrations = true)
-    {
-        $new_reg_count = count($registrations) + 1;
-        if ($update_existing_registrations) {
-            foreach ($registrations as $registration) {
-                if ($registration instanceof EE_Registration) {
-                    $registration->set_count($new_reg_count);
-                    $registration->save();
-                }
-            }
-        }
-        return $new_reg_count;
-    }
+	/**
+	 * @param  EE_Registration[] $registrations
+	 * @param  boolean            $update_existing_registrations
+	 * @return int
+	 * @throws EE_Error
+	 */
+	protected function incrementRegCount(array $registrations, $update_existing_registrations = true)
+	{
+		$new_reg_count = count($registrations) + 1;
+		if ($update_existing_registrations) {
+			foreach ($registrations as $registration) {
+				if ($registration instanceof EE_Registration) {
+					$registration->set_count($new_reg_count);
+					$registration->save();
+				}
+			}
+		}
+		return $new_reg_count;
+	}
 
 
 }

core/domain/services/ticket/CreateTicketLineItemService.php

Indentation +39 added lines, -39 removed lines

@@ -5,7 +5,7 @@ 
 use EventEspresso\core\exceptions\UnexpectedEntityException;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -21,44 +21,44 @@ 
 class CreateTicketLineItemService extends DomainService
 {
 
-    /**
-     * @param \EE_Transaction $transaction
-     * @param \EE_Ticket      $ticket
-     * @param int             $quantity
-     * @return \EE_Line_Item
-     * @throws \EE_Error
-     * @throws UnexpectedEntityException
-     */
-    public function create(
-        \EE_Transaction $transaction,
-        \EE_Ticket $ticket,
-        $quantity = 1
-    )
-    {
-        $total_line_item = $transaction->total_line_item();
-        if (! $total_line_item instanceof \EE_Line_Item) {
-            throw new UnexpectedEntityException($total_line_item, 'EE_Line_Item');
-        }
-        // create new line item for ticket
-        $ticket_line_item = \EEH_Line_Item::add_ticket_purchase(
-            $total_line_item,
-            $ticket,
-            $quantity
-        );
-        if ( ! $ticket_line_item instanceof \EE_Line_Item) {
-            throw new UnexpectedEntityException($ticket_line_item, 'EE_Line_Item');
-        }
-        $total_line_item->save_this_and_descendants_to_txn($transaction->ID());
-        // apply any applicable promotions that were initially used during registration to new line items
-        do_action(
-            'AHEE__\EventEspresso\core\services\commands\ticket\CreateTicketLineItemCommandHandler__handle__new_ticket_line_item_added',
-            $total_line_item,
-            $ticket,
-            $transaction,
-            $quantity
-        );
-        return $ticket_line_item;
-    }
+	/**
+	 * @param \EE_Transaction $transaction
+	 * @param \EE_Ticket      $ticket
+	 * @param int             $quantity
+	 * @return \EE_Line_Item
+	 * @throws \EE_Error
+	 * @throws UnexpectedEntityException
+	 */
+	public function create(
+		\EE_Transaction $transaction,
+		\EE_Ticket $ticket,
+		$quantity = 1
+	)
+	{
+		$total_line_item = $transaction->total_line_item();
+		if (! $total_line_item instanceof \EE_Line_Item) {
+			throw new UnexpectedEntityException($total_line_item, 'EE_Line_Item');
+		}
+		// create new line item for ticket
+		$ticket_line_item = \EEH_Line_Item::add_ticket_purchase(
+			$total_line_item,
+			$ticket,
+			$quantity
+		);
+		if ( ! $ticket_line_item instanceof \EE_Line_Item) {
+			throw new UnexpectedEntityException($ticket_line_item, 'EE_Line_Item');
+		}
+		$total_line_item->save_this_and_descendants_to_txn($transaction->ID());
+		// apply any applicable promotions that were initially used during registration to new line items
+		do_action(
+			'AHEE__\EventEspresso\core\services\commands\ticket\CreateTicketLineItemCommandHandler__handle__new_ticket_line_item_added',
+			$total_line_item,
+			$ticket,
+			$transaction,
+			$quantity
+		);
+		return $ticket_line_item;
+	}
 
 
 

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     )
     {
         $total_line_item = $transaction->total_line_item();
-        if (! $total_line_item instanceof \EE_Line_Item) {
+        if ( ! $total_line_item instanceof \EE_Line_Item) {
             throw new UnexpectedEntityException($total_line_item, 'EE_Line_Item');
         }
         // create new line item for ticket

core/services/commands/registration/CreateRegistrationCommandHandler.php

Indentation +39 added lines, -39 removed lines

@@ -7,7 +7,7 @@ 
 use EventEspresso\core\services\commands\CommandInterface;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -23,50 +23,50 @@ 
 class CreateRegistrationCommandHandler extends CommandHandler
 {
 
-    /**
-     * @var CreateRegistrationService $registration_service
-     */
-    private $registration_service;
+	/**
+	 * @var CreateRegistrationService $registration_service
+	 */
+	private $registration_service;
 
 
 
-    /**
-     * Command constructor
-     *
-     * @param CreateRegistrationService $registration_service
-     */
-    public function __construct(CreateRegistrationService $registration_service)
-    {
-        $this->registration_service = $registration_service;
-    }
+	/**
+	 * Command constructor
+	 *
+	 * @param CreateRegistrationService $registration_service
+	 */
+	public function __construct(CreateRegistrationService $registration_service)
+	{
+		$this->registration_service = $registration_service;
+	}
 
 
 
-    /**
-     * @param  CommandInterface $command
-     * @return mixed
-     * @throws \OutOfRangeException
-     * @throws \EventEspresso\core\exceptions\UnexpectedEntityException
-     * @throws \EE_Error
-     * @throws \EventEspresso\core\exceptions\InvalidEntityException
-     */
-    public function handle(CommandInterface $command)
-    {
-        /** @var CreateRegistrationCommand $command */
-        if ( ! $command instanceof CreateRegistrationCommand) {
-            throw new InvalidEntityException(get_class($command), 'CreateRegistrationCommand');
-        }
-        // now create a new registration for the ticket
-        return $this->registration_service->create(
-            $command->ticket()->get_related_event(),
-            $command->transaction(),
-            $command->ticket(),
-            $command->ticketLineItem(),
-            $command->regCount(),
-            $command->regGroupSize(),
-            $command->regStatus()
-        );
-    }
+	/**
+	 * @param  CommandInterface $command
+	 * @return mixed
+	 * @throws \OutOfRangeException
+	 * @throws \EventEspresso\core\exceptions\UnexpectedEntityException
+	 * @throws \EE_Error
+	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
+	 */
+	public function handle(CommandInterface $command)
+	{
+		/** @var CreateRegistrationCommand $command */
+		if ( ! $command instanceof CreateRegistrationCommand) {
+			throw new InvalidEntityException(get_class($command), 'CreateRegistrationCommand');
+		}
+		// now create a new registration for the ticket
+		return $this->registration_service->create(
+			$command->ticket()->get_related_event(),
+			$command->transaction(),
+			$command->ticket(),
+			$command->ticketLineItem(),
+			$command->regCount(),
+			$command->regGroupSize(),
+			$command->regStatus()
+		);
+	}
 
 
 

modules/single_page_checkout/inc/EE_SPCO_Reg_Step.class.php

Indentation +632 added lines, -632 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -16,672 +16,672 @@ 
 abstract class EE_SPCO_Reg_Step
 {
 
-    /**
-     *    $_completed - TRUE if this step has fully completed it's duties
-     *
-     * @access protected
-     * @type bool $_completed
-     */
-    protected $_completed = false;
-
-    /**
-     *    $_is_current_step - TRUE if this is the current step
-     *
-     * @access protected
-     * @type bool $_is_current_step
-     */
-    protected $_is_current_step = false;
-
-    /**
-     *    $_order - when the reg step should be run relative to other steps
-     *
-     * @access protected
-     * @type int $_template
-     */
-    protected $_order = 0;
-
-    /**
-     *    $_slug - URL param for this step
-     *
-     * @access protected
-     * @type string $_slug
-     */
-    protected $_slug;
-
-    /**
-     *    $_name - Step Name - translatable string
-     *
-     * @access protected
-     * @type string $_slug
-     */
-    protected $_name;
-
-    /**
-     *    $_submit_button_text - translatable string that appears on this step's submit button
-     *
-     * @access protected
-     * @type string $_slug
-     */
-    protected $_submit_button_text;
-
-    /**
-     *    $_template - template name
-     *
-     * @access protected
-     * @type string $_template
-     */
-    protected $_template;
-
-    /**
-     *    $_reg_form_name - the form input name and id attribute
-     *
-     * @access protected
-     * @var string $_reg_form_name
-     */
-    protected $_reg_form_name;
-
-    /**
-     *    $_success_message - text to display upon successful form submission
-     *
-     * @access private
-     * @var string $_success_message
-     */
-    protected $_success_message;
-
-    /**
-     *    $_instructions - a brief description of how to complete the reg step.
-     *    Usually displayed in conjunction with the previous step's success message.
-     *
-     * @access private
-     * @var string $_instructions
-     */
-    protected $_instructions;
-
-    /**
-     *    $_valid_data - the normalized and validated data for this step
-     *
-     * @access public
-     * @var array $_valid_data
-     */
-    protected $_valid_data = array();
-
-    /**
-     *    $reg_form - the registration form for this step
-     *
-     * @access public
-     * @var EE_Form_Section_Proper $reg_form
-     */
-    public $reg_form;
-
-    /**
-     *    $checkout - EE_Checkout object for handling the properties of the current checkout process
-     *
-     * @access public
-     * @var EE_Checkout $checkout
-     */
-    public $checkout;
-
-
-
-    /**
-     * @return void
-     */
-    abstract public function translate_js_strings();
-
-
+	/**
+	 *    $_completed - TRUE if this step has fully completed it's duties
+	 *
+	 * @access protected
+	 * @type bool $_completed
+	 */
+	protected $_completed = false;
+
+	/**
+	 *    $_is_current_step - TRUE if this is the current step
+	 *
+	 * @access protected
+	 * @type bool $_is_current_step
+	 */
+	protected $_is_current_step = false;
+
+	/**
+	 *    $_order - when the reg step should be run relative to other steps
+	 *
+	 * @access protected
+	 * @type int $_template
+	 */
+	protected $_order = 0;
+
+	/**
+	 *    $_slug - URL param for this step
+	 *
+	 * @access protected
+	 * @type string $_slug
+	 */
+	protected $_slug;
+
+	/**
+	 *    $_name - Step Name - translatable string
+	 *
+	 * @access protected
+	 * @type string $_slug
+	 */
+	protected $_name;
+
+	/**
+	 *    $_submit_button_text - translatable string that appears on this step's submit button
+	 *
+	 * @access protected
+	 * @type string $_slug
+	 */
+	protected $_submit_button_text;
+
+	/**
+	 *    $_template - template name
+	 *
+	 * @access protected
+	 * @type string $_template
+	 */
+	protected $_template;
+
+	/**
+	 *    $_reg_form_name - the form input name and id attribute
+	 *
+	 * @access protected
+	 * @var string $_reg_form_name
+	 */
+	protected $_reg_form_name;
+
+	/**
+	 *    $_success_message - text to display upon successful form submission
+	 *
+	 * @access private
+	 * @var string $_success_message
+	 */
+	protected $_success_message;
+
+	/**
+	 *    $_instructions - a brief description of how to complete the reg step.
+	 *    Usually displayed in conjunction with the previous step's success message.
+	 *
+	 * @access private
+	 * @var string $_instructions
+	 */
+	protected $_instructions;
+
+	/**
+	 *    $_valid_data - the normalized and validated data for this step
+	 *
+	 * @access public
+	 * @var array $_valid_data
+	 */
+	protected $_valid_data = array();
+
+	/**
+	 *    $reg_form - the registration form for this step
+	 *
+	 * @access public
+	 * @var EE_Form_Section_Proper $reg_form
+	 */
+	public $reg_form;
+
+	/**
+	 *    $checkout - EE_Checkout object for handling the properties of the current checkout process
+	 *
+	 * @access public
+	 * @var EE_Checkout $checkout
+	 */
+	public $checkout;
+
+
+
+	/**
+	 * @return void
+	 */
+	abstract public function translate_js_strings();
+
+
 
-    /**
-     * @return void
-     */
-    abstract public function enqueue_styles_and_scripts();
-
-
-
-    /**
-     * @return boolean
-     */
-    abstract public function initialize_reg_step();
-
-
-
-    /**
-     * @return string
-     */
-    abstract public function generate_reg_form();
-
-
-
-    /**
-     * @return boolean
-     */
-    abstract public function process_reg_step();
-
-
-
-    /**
-     * @return boolean
-     */
-    abstract public function update_reg_step();
-
-
-
-    /**
-     * @return boolean
-     */
-    public function completed()
-    {
-        return $this->_completed;
-    }
+	/**
+	 * @return void
+	 */
+	abstract public function enqueue_styles_and_scripts();
+
+
+
+	/**
+	 * @return boolean
+	 */
+	abstract public function initialize_reg_step();
+
+
+
+	/**
+	 * @return string
+	 */
+	abstract public function generate_reg_form();
+
+
+
+	/**
+	 * @return boolean
+	 */
+	abstract public function process_reg_step();
+
+
+
+	/**
+	 * @return boolean
+	 */
+	abstract public function update_reg_step();
+
+
+
+	/**
+	 * @return boolean
+	 */
+	public function completed()
+	{
+		return $this->_completed;
+	}
 
 
 
-    /**
-     * set_completed - toggles $_completed to TRUE
-     */
-    public function set_completed()
-    {
-        // DEBUG LOG
-        //$this->checkout->log( __CLASS__, __FUNCTION__, __LINE__ );
-        $this->_completed = apply_filters('FHEE__EE_SPCO_Reg_Step__set_completed___completed', true, $this);
-    }
+	/**
+	 * set_completed - toggles $_completed to TRUE
+	 */
+	public function set_completed()
+	{
+		// DEBUG LOG
+		//$this->checkout->log( __CLASS__, __FUNCTION__, __LINE__ );
+		$this->_completed = apply_filters('FHEE__EE_SPCO_Reg_Step__set_completed___completed', true, $this);
+	}
 
 
 
-    /**
-     * set_completed - toggles $_completed to FALSE
-     */
-    public function set_not_completed()
-    {
-        $this->_completed = false;
-    }
+	/**
+	 * set_completed - toggles $_completed to FALSE
+	 */
+	public function set_not_completed()
+	{
+		$this->_completed = false;
+	}
 
 
 
-    /**
-     * @return string
-     */
-    public function name()
-    {
-        return $this->_name;
-    }
+	/**
+	 * @return string
+	 */
+	public function name()
+	{
+		return $this->_name;
+	}
 
 
 
-    /**
-     * @return string
-     */
-    public function slug()
-    {
-        return $this->_slug;
-    }
+	/**
+	 * @return string
+	 */
+	public function slug()
+	{
+		return $this->_slug;
+	}
 
 
 
-    /**
-     * submit_button_text
-     * the text that appears on the reg step form submit button
-     *
-     * @return string
-     */
-    public function submit_button_text()
-    {
-        return $this->_submit_button_text;
-    }
+	/**
+	 * submit_button_text
+	 * the text that appears on the reg step form submit button
+	 *
+	 * @return string
+	 */
+	public function submit_button_text()
+	{
+		return $this->_submit_button_text;
+	}
 
 
 
-    /**
-     * set_submit_button_text
-     * sets the text that appears on the reg step form submit button
-     *
-     * @param string $submit_button_text
-     */
-    public function set_submit_button_text($submit_button_text = '')
-    {
-        if (! empty($submit_button_text)) {
-            $this->_submit_button_text = $submit_button_text;
-        } else if ($this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
-            if ($this->checkout->revisit) {
-                $this->_submit_button_text = sprintf(
-                    __('Update %s', 'event_espresso'),
-                    $this->checkout->current_step->name()
-                );
-            } else {
-                $this->_submit_button_text = sprintf(
-                    __('Proceed to %s', 'event_espresso'),
-                    $this->checkout->next_step->name()
-                );
-            }
-        }
-        // filters the submit button text
-        $this->_submit_button_text = apply_filters(
-            'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text',
-            $this->_submit_button_text,
-            $this->checkout
-        );
-    }
+	/**
+	 * set_submit_button_text
+	 * sets the text that appears on the reg step form submit button
+	 *
+	 * @param string $submit_button_text
+	 */
+	public function set_submit_button_text($submit_button_text = '')
+	{
+		if (! empty($submit_button_text)) {
+			$this->_submit_button_text = $submit_button_text;
+		} else if ($this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
+			if ($this->checkout->revisit) {
+				$this->_submit_button_text = sprintf(
+					__('Update %s', 'event_espresso'),
+					$this->checkout->current_step->name()
+				);
+			} else {
+				$this->_submit_button_text = sprintf(
+					__('Proceed to %s', 'event_espresso'),
+					$this->checkout->next_step->name()
+				);
+			}
+		}
+		// filters the submit button text
+		$this->_submit_button_text = apply_filters(
+			'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text',
+			$this->_submit_button_text,
+			$this->checkout
+		);
+	}
 
 
 
-    /**
-     * @param boolean $is_current_step
-     */
-    public function set_is_current_step($is_current_step)
-    {
-        $this->_is_current_step = $is_current_step;
-    }
+	/**
+	 * @param boolean $is_current_step
+	 */
+	public function set_is_current_step($is_current_step)
+	{
+		$this->_is_current_step = $is_current_step;
+	}
 
 
 
-    /**
-     * @return boolean
-     */
-    public function is_current_step()
-    {
-        return $this->_is_current_step;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function is_current_step()
+	{
+		return $this->_is_current_step;
+	}
 
 
 
-    /**
-     * @return boolean
-     */
-    public function is_final_step()
-    {
-        return $this instanceof EE_SPCO_Reg_Step_Finalize_Registration ? true : false;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function is_final_step()
+	{
+		return $this instanceof EE_SPCO_Reg_Step_Finalize_Registration ? true : false;
+	}
 
 
 
-    /**
-     * @param int $order
-     */
-    public function set_order($order)
-    {
-        $this->_order = $order;
-    }
-
-
+	/**
+	 * @param int $order
+	 */
+	public function set_order($order)
+	{
+		$this->_order = $order;
+	}
+
+
 
-    /**
-     * @return int
-     */
-    public function order()
-    {
-        return $this->_order;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function template()
-    {
-        return $this->_template;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function success_message()
-    {
-        return $this->_success_message;
-    }
-
-
-
-    /**
-     * _set_success_message
-     *
-     * @param string $success_message
-     */
-    protected function _set_success_message($success_message)
-    {
-        $this->_success_message = $success_message;
-    }
-
-
-
-    /**
-     * _reset_success_message
-     *
-     * @return void
-     */
-    protected function _reset_success_message()
-    {
-        $this->_success_message = '';
-    }
+	/**
+	 * @return int
+	 */
+	public function order()
+	{
+		return $this->_order;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function template()
+	{
+		return $this->_template;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function success_message()
+	{
+		return $this->_success_message;
+	}
+
+
+
+	/**
+	 * _set_success_message
+	 *
+	 * @param string $success_message
+	 */
+	protected function _set_success_message($success_message)
+	{
+		$this->_success_message = $success_message;
+	}
+
+
+
+	/**
+	 * _reset_success_message
+	 *
+	 * @return void
+	 */
+	protected function _reset_success_message()
+	{
+		$this->_success_message = '';
+	}
 
 
 
-    /**
-     * @return string
-     */
-    public function _instructions()
-    {
-        return $this->_instructions;
-    }
-
-
-
-    /**
-     * @param string $instructions
-     */
-    public function set_instructions($instructions)
-    {
-        $this->_instructions = apply_filters(
-            'FHEE__EE_SPCO_Reg_Step__set_instructions__instructions',
-            $instructions,
-            $this
-        );
-    }
-
-
-
-    /**
-     * @param array $valid_data
-     */
-    public function set_valid_data($valid_data)
-    {
-        $this->_valid_data = $valid_data;
-    }
-
-
-
-    /**
-     * @return array
-     */
-    public function valid_data()
-    {
-        if (empty($this->_valid_data)) {
-            $this->_valid_data = $this->reg_form->valid_data();
-        }
-        return $this->_valid_data;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function reg_form_name()
-    {
-        if (empty($this->_reg_form_name)) {
-            $this->set_reg_form_name('ee-spco-' . $this->slug() . '-reg-step-form');
-        }
-        return $this->_reg_form_name;
-    }
-
-
-
-    /**
-     * @param string $reg_form_name
-     */
-    protected function set_reg_form_name($reg_form_name)
-    {
-        $this->_reg_form_name = $reg_form_name;
-    }
-
-
-
-    /**
-     * reg_step_url
-     *
-     * @param string $action
-     * @return string
-     */
-    public function reg_step_url($action = '')
-    {
-        $query_args = array('step' => $this->slug());
-        if (! empty($action)) {
-            $query_args['action'] = $action;
-        }
-        // final step has no display
-        if ($this instanceof EE_SPCO_Reg_Step_Finalize_Registration && $action === 'display_spco_reg_step') {
-            $query_args['action'] = 'process_reg_step';
-        }
-        if ($this->checkout->revisit) {
-            $query_args['revisit'] = true;
-        }
-        if ($this->checkout->reg_url_link) {
-            $query_args['e_reg_url_link'] = $this->checkout->reg_url_link;
-        }
-        return add_query_arg($query_args, $this->checkout->reg_page_base_url);
-    }
-
-
-
-    /**
-     * creates the default hidden inputs section
-     *
-     * @return EE_Form_Section_Proper
-     * @throws \EE_Error
-     */
-    public function reg_step_hidden_inputs()
-    {
-        // hidden inputs for admin registrations
-        if ($this->checkout->admin_request) {
-            return new EE_Form_Section_Proper(
-                array(
-                    'layout_strategy' => new EE_Div_Per_Section_Layout(),
-                    'html_id'         => 'ee-' . $this->slug() . '-hidden-inputs',
-                    'subsections'     => array(
-                        'next_step' => new EE_Fixed_Hidden_Input(
-                            array(
-                                'html_name' => 'next_step',
-                                'html_id'   => 'spco-' . $this->slug() . '-next-step',
-                                'default'   => $this->checkout->next_step instanceof EE_SPCO_Reg_Step
-                                    ? $this->checkout->next_step->slug()
-                                    : '',
-                            )
-                        ),
-                    ),
-                )
-            );
-        } else {
-            $default_form_action = apply_filters(
-                'FHEE__EE_SPCO_Reg_Step__reg_step_hidden_inputs__default_form_action',
-                empty($this->checkout->reg_url_link)
-                    ? 'process_reg_step'
-                    : 'update_reg_step',
-                $this
-            );
-            // hidden inputs for frontend registrations
-            return new EE_Form_Section_Proper(
-                array(
-                    'layout_strategy' => new EE_Div_Per_Section_Layout(),
-                    'html_id'         => 'ee-' . $this->slug() . '-hidden-inputs',
-                    'subsections'     => array(
-                        'action'         => new EE_Fixed_Hidden_Input(
-                            array(
-                                'html_name' => 'action',
-                                'html_id'   => 'spco-' . $this->slug() . '-action',
-                                'default'   => $default_form_action,
-                            )
-                        ),
-                        'next_step'      => new EE_Fixed_Hidden_Input(
-                            array(
-                                'html_name' => 'next_step',
-                                'html_id'   => 'spco-' . $this->slug() . '-next-step',
-                                'default'   => $this->checkout->next_step instanceof EE_SPCO_Reg_Step
-                                    ? $this->checkout->next_step->slug()
-                                    : '',
-                            )
-                        ),
-                        'e_reg_url_link' => new EE_Fixed_Hidden_Input(
-                            array(
-                                'html_name' => 'e_reg_url_link',
-                                'html_id'   => 'spco-reg_url_link',
-                                'default'   => $this->checkout->reg_url_link,
-                            )
-                        ),
-                        'revisit'        => new EE_Fixed_Hidden_Input(
-                            array(
-                                'html_name' => 'revisit',
-                                'html_id'   => 'spco-revisit',
-                                'default'   => $this->checkout->revisit,
-                            )
-                        ),
-                    ),
-                )
-            );
-        }
-    }
-
-
-
-    /**
-     * generate_reg_form_for_actions
-     *
-     * @param array $actions
-     * @return void
-     */
-    public function generate_reg_form_for_actions($actions = array())
-    {
-        $actions = array_merge(
-            array(
-                'generate_reg_form',
-                'display_spco_reg_step',
-                'process_reg_step',
-                'update_reg_step',
-            ),
-            $actions
-        );
-        $this->checkout->generate_reg_form = in_array($this->checkout->action, $actions, true) ? true : false;
-    }
-
-
-
-    /**
-     * @return string
-     * @throws \EE_Error
-     */
-    public function display_reg_form()
-    {
-        $html = '';
-        if ($this->reg_form instanceof EE_Form_Section_Proper) {
-            $html .= ! $this->checkout->admin_request ? $this->reg_form->form_open($this->reg_step_url()) : '';
-            if (EE_Registry::instance()->REQ->ajax) {
-                $this->reg_form->localize_validation_rules();
-                $this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
-            }
-            $html .= $this->reg_form->get_html();
-            $html .= ! $this->checkout->admin_request ? $this->reg_step_submit_button() : '';
-            $html .= ! $this->checkout->admin_request ? $this->reg_form->form_close() : '';
-        }
-        return $html;
-    }
-
-
-
-    /**
-     * div_class - returns nothing for current step, but a css class of "hidden" for others
-     *
-     * @return string
-     * @throws \EE_Error
-     */
-    public function reg_step_submit_button()
-    {
-        if (! $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
-            return '';
-        }
-        ob_start();
-        do_action(
-            'AHEE__before_spco_whats_next_buttons',
-            $this->slug(),
-            $this->checkout->next_step->slug(),
-            $this->checkout
-        );
-        $html = ob_get_clean();
-        // generate submit button
-        $sbmt_btn = new EE_Submit_Input(array(
-            'html_name'             => 'spco-go-to-step-' . $this->checkout->next_step->slug(),
-            'html_id'               => 'spco-go-to-step-' . $this->checkout->next_step->slug(),
-            'html_class'            => 'spco-next-step-btn',
-            'other_html_attributes' => ' rel="' . $this->slug() . '"',
-            'default'               => $this->submit_button_text(),
-        ));
-        $sbmt_btn->set_button_css_attributes(true, 'large');
-        $sbmt_btn_html = $sbmt_btn->get_html_for_input();
-        $html .= EEH_HTML::div(
-            apply_filters('FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', $sbmt_btn_html, $this),
-            'spco-' . $this->slug() . '-whats-next-buttons-dv',
-            'spco-whats-next-buttons'
-        );
-        return $html;
-    }
-
-
-
-    /**
-     * div_class - returns nothing for current step, but a css class of "hidden" for others
-     *
-     * @return string
-     */
-    public function div_class()
-    {
-        return $this->is_current_step() ? '' : ' hidden';
-    }
-
-
-
-    /**
-     * div_class - returns  a css class of "hidden" for current step, but nothing for others
-     *
-     * @return string
-     */
-    public function edit_lnk_url()
-    {
-        return add_query_arg(array('step' => $this->slug()), $this->checkout->reg_page_base_url);
-    }
-
-
-
-    /**
-     * div_class - returns  a css class of "hidden" for current step, but nothing for others
-     *
-     * @return string
-     */
-    public function edit_link_class()
-    {
-        return $this->is_current_step() ? ' hidden' : '';
-    }
-
-
-
-    /**
-     * update_checkout with changes that have been made to the cart
-     *
-     * @return void
-     * @throws \EE_Error
-     */
-    public function update_checkout()
-    {
-        // grab the cart grand total and reset TXN total
-        $this->checkout->transaction->set_total($this->checkout->cart->get_cart_grand_total());
-        $this->checkout->stash_transaction_and_checkout();
-    }
-
-
-
-
-
-    /**
-     *    __sleep
-     * to conserve db space, let's remove the reg_form and the EE_Checkout object from EE_SPCO_Reg_Step objects upon
-     * serialization EE_Checkout will handle the reimplementation of itself upon waking, but we won't bother with the
-     * reg form, because if needed, it will be regenerated anyways
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        // remove the reg form and the checkout
-        return array_diff(array_keys(get_object_vars($this)), array('reg_form', 'checkout'));
-    }
+	/**
+	 * @return string
+	 */
+	public function _instructions()
+	{
+		return $this->_instructions;
+	}
+
+
+
+	/**
+	 * @param string $instructions
+	 */
+	public function set_instructions($instructions)
+	{
+		$this->_instructions = apply_filters(
+			'FHEE__EE_SPCO_Reg_Step__set_instructions__instructions',
+			$instructions,
+			$this
+		);
+	}
+
+
+
+	/**
+	 * @param array $valid_data
+	 */
+	public function set_valid_data($valid_data)
+	{
+		$this->_valid_data = $valid_data;
+	}
+
+
+
+	/**
+	 * @return array
+	 */
+	public function valid_data()
+	{
+		if (empty($this->_valid_data)) {
+			$this->_valid_data = $this->reg_form->valid_data();
+		}
+		return $this->_valid_data;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function reg_form_name()
+	{
+		if (empty($this->_reg_form_name)) {
+			$this->set_reg_form_name('ee-spco-' . $this->slug() . '-reg-step-form');
+		}
+		return $this->_reg_form_name;
+	}
+
+
+
+	/**
+	 * @param string $reg_form_name
+	 */
+	protected function set_reg_form_name($reg_form_name)
+	{
+		$this->_reg_form_name = $reg_form_name;
+	}
+
+
+
+	/**
+	 * reg_step_url
+	 *
+	 * @param string $action
+	 * @return string
+	 */
+	public function reg_step_url($action = '')
+	{
+		$query_args = array('step' => $this->slug());
+		if (! empty($action)) {
+			$query_args['action'] = $action;
+		}
+		// final step has no display
+		if ($this instanceof EE_SPCO_Reg_Step_Finalize_Registration && $action === 'display_spco_reg_step') {
+			$query_args['action'] = 'process_reg_step';
+		}
+		if ($this->checkout->revisit) {
+			$query_args['revisit'] = true;
+		}
+		if ($this->checkout->reg_url_link) {
+			$query_args['e_reg_url_link'] = $this->checkout->reg_url_link;
+		}
+		return add_query_arg($query_args, $this->checkout->reg_page_base_url);
+	}
+
+
+
+	/**
+	 * creates the default hidden inputs section
+	 *
+	 * @return EE_Form_Section_Proper
+	 * @throws \EE_Error
+	 */
+	public function reg_step_hidden_inputs()
+	{
+		// hidden inputs for admin registrations
+		if ($this->checkout->admin_request) {
+			return new EE_Form_Section_Proper(
+				array(
+					'layout_strategy' => new EE_Div_Per_Section_Layout(),
+					'html_id'         => 'ee-' . $this->slug() . '-hidden-inputs',
+					'subsections'     => array(
+						'next_step' => new EE_Fixed_Hidden_Input(
+							array(
+								'html_name' => 'next_step',
+								'html_id'   => 'spco-' . $this->slug() . '-next-step',
+								'default'   => $this->checkout->next_step instanceof EE_SPCO_Reg_Step
+									? $this->checkout->next_step->slug()
+									: '',
+							)
+						),
+					),
+				)
+			);
+		} else {
+			$default_form_action = apply_filters(
+				'FHEE__EE_SPCO_Reg_Step__reg_step_hidden_inputs__default_form_action',
+				empty($this->checkout->reg_url_link)
+					? 'process_reg_step'
+					: 'update_reg_step',
+				$this
+			);
+			// hidden inputs for frontend registrations
+			return new EE_Form_Section_Proper(
+				array(
+					'layout_strategy' => new EE_Div_Per_Section_Layout(),
+					'html_id'         => 'ee-' . $this->slug() . '-hidden-inputs',
+					'subsections'     => array(
+						'action'         => new EE_Fixed_Hidden_Input(
+							array(
+								'html_name' => 'action',
+								'html_id'   => 'spco-' . $this->slug() . '-action',
+								'default'   => $default_form_action,
+							)
+						),
+						'next_step'      => new EE_Fixed_Hidden_Input(
+							array(
+								'html_name' => 'next_step',
+								'html_id'   => 'spco-' . $this->slug() . '-next-step',
+								'default'   => $this->checkout->next_step instanceof EE_SPCO_Reg_Step
+									? $this->checkout->next_step->slug()
+									: '',
+							)
+						),
+						'e_reg_url_link' => new EE_Fixed_Hidden_Input(
+							array(
+								'html_name' => 'e_reg_url_link',
+								'html_id'   => 'spco-reg_url_link',
+								'default'   => $this->checkout->reg_url_link,
+							)
+						),
+						'revisit'        => new EE_Fixed_Hidden_Input(
+							array(
+								'html_name' => 'revisit',
+								'html_id'   => 'spco-revisit',
+								'default'   => $this->checkout->revisit,
+							)
+						),
+					),
+				)
+			);
+		}
+	}
+
+
+
+	/**
+	 * generate_reg_form_for_actions
+	 *
+	 * @param array $actions
+	 * @return void
+	 */
+	public function generate_reg_form_for_actions($actions = array())
+	{
+		$actions = array_merge(
+			array(
+				'generate_reg_form',
+				'display_spco_reg_step',
+				'process_reg_step',
+				'update_reg_step',
+			),
+			$actions
+		);
+		$this->checkout->generate_reg_form = in_array($this->checkout->action, $actions, true) ? true : false;
+	}
+
+
+
+	/**
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function display_reg_form()
+	{
+		$html = '';
+		if ($this->reg_form instanceof EE_Form_Section_Proper) {
+			$html .= ! $this->checkout->admin_request ? $this->reg_form->form_open($this->reg_step_url()) : '';
+			if (EE_Registry::instance()->REQ->ajax) {
+				$this->reg_form->localize_validation_rules();
+				$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
+			}
+			$html .= $this->reg_form->get_html();
+			$html .= ! $this->checkout->admin_request ? $this->reg_step_submit_button() : '';
+			$html .= ! $this->checkout->admin_request ? $this->reg_form->form_close() : '';
+		}
+		return $html;
+	}
+
+
+
+	/**
+	 * div_class - returns nothing for current step, but a css class of "hidden" for others
+	 *
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function reg_step_submit_button()
+	{
+		if (! $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
+			return '';
+		}
+		ob_start();
+		do_action(
+			'AHEE__before_spco_whats_next_buttons',
+			$this->slug(),
+			$this->checkout->next_step->slug(),
+			$this->checkout
+		);
+		$html = ob_get_clean();
+		// generate submit button
+		$sbmt_btn = new EE_Submit_Input(array(
+			'html_name'             => 'spco-go-to-step-' . $this->checkout->next_step->slug(),
+			'html_id'               => 'spco-go-to-step-' . $this->checkout->next_step->slug(),
+			'html_class'            => 'spco-next-step-btn',
+			'other_html_attributes' => ' rel="' . $this->slug() . '"',
+			'default'               => $this->submit_button_text(),
+		));
+		$sbmt_btn->set_button_css_attributes(true, 'large');
+		$sbmt_btn_html = $sbmt_btn->get_html_for_input();
+		$html .= EEH_HTML::div(
+			apply_filters('FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', $sbmt_btn_html, $this),
+			'spco-' . $this->slug() . '-whats-next-buttons-dv',
+			'spco-whats-next-buttons'
+		);
+		return $html;
+	}
+
+
+
+	/**
+	 * div_class - returns nothing for current step, but a css class of "hidden" for others
+	 *
+	 * @return string
+	 */
+	public function div_class()
+	{
+		return $this->is_current_step() ? '' : ' hidden';
+	}
+
+
+
+	/**
+	 * div_class - returns  a css class of "hidden" for current step, but nothing for others
+	 *
+	 * @return string
+	 */
+	public function edit_lnk_url()
+	{
+		return add_query_arg(array('step' => $this->slug()), $this->checkout->reg_page_base_url);
+	}
+
+
+
+	/**
+	 * div_class - returns  a css class of "hidden" for current step, but nothing for others
+	 *
+	 * @return string
+	 */
+	public function edit_link_class()
+	{
+		return $this->is_current_step() ? ' hidden' : '';
+	}
+
+
+
+	/**
+	 * update_checkout with changes that have been made to the cart
+	 *
+	 * @return void
+	 * @throws \EE_Error
+	 */
+	public function update_checkout()
+	{
+		// grab the cart grand total and reset TXN total
+		$this->checkout->transaction->set_total($this->checkout->cart->get_cart_grand_total());
+		$this->checkout->stash_transaction_and_checkout();
+	}
+
+
+
+
+
+	/**
+	 *    __sleep
+	 * to conserve db space, let's remove the reg_form and the EE_Checkout object from EE_SPCO_Reg_Step objects upon
+	 * serialization EE_Checkout will handle the reimplementation of itself upon waking, but we won't bother with the
+	 * reg form, because if needed, it will be regenerated anyways
+	 *
+	 * @return array
+	 */
+	public function __sleep()
+	{
+		// remove the reg form and the checkout
+		return array_diff(array_keys(get_object_vars($this)), array('reg_form', 'checkout'));
+	}
 
 
 

Spacing +14 added lines, -14 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 
@@ -238,7 +238,7 @@ 
      */
     public function set_submit_button_text($submit_button_text = '')
     {
-        if (! empty($submit_button_text)) {
+        if ( ! empty($submit_button_text)) {
             $this->_submit_button_text = $submit_button_text;
         } else if ($this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
             if ($this->checkout->revisit) {
@@ -410,7 +410,7 @@ 
     public function reg_form_name()
     {
         if (empty($this->_reg_form_name)) {
-            $this->set_reg_form_name('ee-spco-' . $this->slug() . '-reg-step-form');
+            $this->set_reg_form_name('ee-spco-'.$this->slug().'-reg-step-form');
         }
         return $this->_reg_form_name;
     }
@@ -436,7 +436,7 @@ 
     public function reg_step_url($action = '')
     {
         $query_args = array('step' => $this->slug());
-        if (! empty($action)) {
+        if ( ! empty($action)) {
             $query_args['action'] = $action;
         }
         // final step has no display
@@ -467,12 +467,12 @@ 
             return new EE_Form_Section_Proper(
                 array(
                     'layout_strategy' => new EE_Div_Per_Section_Layout(),
-                    'html_id'         => 'ee-' . $this->slug() . '-hidden-inputs',
+                    'html_id'         => 'ee-'.$this->slug().'-hidden-inputs',
                     'subsections'     => array(
                         'next_step' => new EE_Fixed_Hidden_Input(
                             array(
                                 'html_name' => 'next_step',
-                                'html_id'   => 'spco-' . $this->slug() . '-next-step',
+                                'html_id'   => 'spco-'.$this->slug().'-next-step',
                                 'default'   => $this->checkout->next_step instanceof EE_SPCO_Reg_Step
                                     ? $this->checkout->next_step->slug()
                                     : '',
@@ -493,19 +493,19 @@ 
             return new EE_Form_Section_Proper(
                 array(
                     'layout_strategy' => new EE_Div_Per_Section_Layout(),
-                    'html_id'         => 'ee-' . $this->slug() . '-hidden-inputs',
+                    'html_id'         => 'ee-'.$this->slug().'-hidden-inputs',
                     'subsections'     => array(
                         'action'         => new EE_Fixed_Hidden_Input(
                             array(
                                 'html_name' => 'action',
-                                'html_id'   => 'spco-' . $this->slug() . '-action',
+                                'html_id'   => 'spco-'.$this->slug().'-action',
                                 'default'   => $default_form_action,
                             )
                         ),
                         'next_step'      => new EE_Fixed_Hidden_Input(
                             array(
                                 'html_name' => 'next_step',
-                                'html_id'   => 'spco-' . $this->slug() . '-next-step',
+                                'html_id'   => 'spco-'.$this->slug().'-next-step',
                                 'default'   => $this->checkout->next_step instanceof EE_SPCO_Reg_Step
                                     ? $this->checkout->next_step->slug()
                                     : '',
@@ -585,7 +585,7 @@ 
      */
     public function reg_step_submit_button()
     {
-        if (! $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
+        if ( ! $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
             return '';
         }
         ob_start();
@@ -598,17 +598,17 @@ 
         $html = ob_get_clean();
         // generate submit button
         $sbmt_btn = new EE_Submit_Input(array(
-            'html_name'             => 'spco-go-to-step-' . $this->checkout->next_step->slug(),
-            'html_id'               => 'spco-go-to-step-' . $this->checkout->next_step->slug(),
+            'html_name'             => 'spco-go-to-step-'.$this->checkout->next_step->slug(),
+            'html_id'               => 'spco-go-to-step-'.$this->checkout->next_step->slug(),
             'html_class'            => 'spco-next-step-btn',
-            'other_html_attributes' => ' rel="' . $this->slug() . '"',
+            'other_html_attributes' => ' rel="'.$this->slug().'"',
             'default'               => $this->submit_button_text(),
         ));
         $sbmt_btn->set_button_css_attributes(true, 'large');
         $sbmt_btn_html = $sbmt_btn->get_html_for_input();
         $html .= EEH_HTML::div(
             apply_filters('FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', $sbmt_btn_html, $this),
-            'spco-' . $this->slug() . '-whats-next-buttons-dv',
+            'spco-'.$this->slug().'-whats-next-buttons-dv',
             'spco-whats-next-buttons'
         );
         return $html;