eventespresso / event-espresso-core

core/libraries/line_item_filters/EE_Line_Item_Filter_Processor.class.php

Indentation +75 added lines, -75 removed lines

@@ -36,88 +36,88 @@
 class EE_Line_Item_Filter_Processor
 {
 
-    /**
-     * @type EE_Line_Item_Filter_Collection $line_item_filters
-     */
-    protected $line_item_filters;
+	/**
+	 * @type EE_Line_Item_Filter_Collection $line_item_filters
+	 */
+	protected $line_item_filters;
 
-    /**
-     * @type EEI_Line_Item $grand_total_line_item
-     */
-    protected $grand_total_line_item;
+	/**
+	 * @type EEI_Line_Item $grand_total_line_item
+	 */
+	protected $grand_total_line_item;
 
 
-    /**
-     * EE_Line_Item_Filter_Processor constructor.
-     *
-     * @param \EE_Line_Item_Filter_Collection $line_item_filters
-     * @param \EEI_Line_Item                  $grand_total_line_item
-     * @throws \EE_Error
-     */
-    public function __construct(EE_Line_Item_Filter_Collection $line_item_filters, EEI_Line_Item $grand_total_line_item)
-    {
-        $this->line_item_filters = $line_item_filters;
-        if ($grand_total_line_item->type() !== EEM_Line_Item::type_total) {
-            throw new EE_Error(__('A Line Item of the type total is required', 'event_espresso'));
-        }
-        $this->grand_total_line_item = $this->clone_and_reset_line_item_tree($grand_total_line_item);
-    }
+	/**
+	 * EE_Line_Item_Filter_Processor constructor.
+	 *
+	 * @param \EE_Line_Item_Filter_Collection $line_item_filters
+	 * @param \EEI_Line_Item                  $grand_total_line_item
+	 * @throws \EE_Error
+	 */
+	public function __construct(EE_Line_Item_Filter_Collection $line_item_filters, EEI_Line_Item $grand_total_line_item)
+	{
+		$this->line_item_filters = $line_item_filters;
+		if ($grand_total_line_item->type() !== EEM_Line_Item::type_total) {
+			throw new EE_Error(__('A Line Item of the type total is required', 'event_espresso'));
+		}
+		$this->grand_total_line_item = $this->clone_and_reset_line_item_tree($grand_total_line_item);
+	}
 
 
-    /**
-     * clone_and_reset_line_item_tree
-     *
-     * @param \EEI_Line_Item $line_item
-     * @return \EEI_Line_Item
-     */
-    protected function clone_and_reset_line_item_tree(EEI_Line_Item $line_item)
-    {
-        $cloned_line_item = $this->clone_and_reset_line_item($line_item);
-        foreach ($line_item->children() as $child_line_item) {
-            $cloned_line_item->add_child_line_item($this->clone_and_reset_line_item_tree($child_line_item));
-        }
-        return $cloned_line_item;
-    }
+	/**
+	 * clone_and_reset_line_item_tree
+	 *
+	 * @param \EEI_Line_Item $line_item
+	 * @return \EEI_Line_Item
+	 */
+	protected function clone_and_reset_line_item_tree(EEI_Line_Item $line_item)
+	{
+		$cloned_line_item = $this->clone_and_reset_line_item($line_item);
+		foreach ($line_item->children() as $child_line_item) {
+			$cloned_line_item->add_child_line_item($this->clone_and_reset_line_item_tree($child_line_item));
+		}
+		return $cloned_line_item;
+	}
 
 
-    /**
-     * clone_and_reset_line_item
-     *
-     * clones the incoming object
-     * resets any fields that represent database primary keys
-     * resets total
-     *
-     * @param \EEI_Line_Item $line_item
-     * @return \EEI_Line_Item
-     */
-    protected function clone_and_reset_line_item(EEI_Line_Item $line_item)
-    {
-        // we don't actually want to work with the original line item, so clone it
-        $cloned_line_item = clone $line_item;
-        $cloned_line_item->set('LIN_ID', null);
-        $cloned_line_item->set('LIN_parent', null);
-        $cloned_line_item->clear_related_line_item_cache();
-        foreach (array_keys(EEM_Line_Item::instance()->relation_settings()) as $relation_name) {
-            $cloned_line_item->clear_cache($relation_name, null, true);
-        }
-        $cloned_line_item->set_allow_persist(false);
-        return $cloned_line_item;
-    }
+	/**
+	 * clone_and_reset_line_item
+	 *
+	 * clones the incoming object
+	 * resets any fields that represent database primary keys
+	 * resets total
+	 *
+	 * @param \EEI_Line_Item $line_item
+	 * @return \EEI_Line_Item
+	 */
+	protected function clone_and_reset_line_item(EEI_Line_Item $line_item)
+	{
+		// we don't actually want to work with the original line item, so clone it
+		$cloned_line_item = clone $line_item;
+		$cloned_line_item->set('LIN_ID', null);
+		$cloned_line_item->set('LIN_parent', null);
+		$cloned_line_item->clear_related_line_item_cache();
+		foreach (array_keys(EEM_Line_Item::instance()->relation_settings()) as $relation_name) {
+			$cloned_line_item->clear_cache($relation_name, null, true);
+		}
+		$cloned_line_item->set_allow_persist(false);
+		return $cloned_line_item;
+	}
 
 
-    /**
-     * process
-     *
-     * @return EEI_Line_Item
-     */
-    public function process()
-    {
-        $this->line_item_filters->rewind();
-        while ($this->line_item_filters->valid()) {
-            $this->grand_total_line_item = $this->line_item_filters->current()->process($this->grand_total_line_item);
-            $this->line_item_filters->next();
-        }
-        $this->grand_total_line_item->recalculate_total_including_taxes();
-        return $this->grand_total_line_item;
-    }
+	/**
+	 * process
+	 *
+	 * @return EEI_Line_Item
+	 */
+	public function process()
+	{
+		$this->line_item_filters->rewind();
+		while ($this->line_item_filters->valid()) {
+			$this->grand_total_line_item = $this->line_item_filters->current()->process($this->grand_total_line_item);
+			$this->line_item_filters->next();
+		}
+		$this->grand_total_line_item->recalculate_total_including_taxes();
+		return $this->grand_total_line_item;
+	}
 }

core/libraries/line_item_filters/EE_Non_Zero_Line_Item_Filter.class.php

Indentation +86 added lines, -86 removed lines

@@ -14,96 +14,96 @@
 class EE_Non_Zero_Line_Item_Filter extends EE_Line_Item_Filter_Base
 {
 
-    /**
-     * EE_Non_Zero_Line_Item_Filter constructor.
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * EE_Non_Zero_Line_Item_Filter constructor.
+	 */
+	public function __construct()
+	{
+	}
 
 
-    /**
-     * Creates a duplicate of the line item tree, except only includes billable items
-     * and the portion of line items attributed to billable things
-     *
-     * @param EEI_Line_Item $line_item
-     * @return EEI_Line_Item
-     */
-    public function process(EEI_Line_Item $line_item)
-    {
-        $non_zero_line_item = $this->_filter_zero_line_item($line_item);
-        if (! $non_zero_line_item instanceof EEI_Line_Item) {
-            return null;
-        }
-        // if this is an event subtotal, we want to only include it if it
-        // has a non-zero total and at least one ticket line item child
-        if ($line_item->children()) {
-            $ticket_or_subtotals_with_tkt_children_count = 0;
-            foreach ($line_item->children() as $child_line_item) {
-                $code = $child_line_item->code();
-                $child_line_item = $this->process($child_line_item);
-                if (! $child_line_item instanceof EEI_Line_Item) {
-                    $line_item->delete_child_line_item($code);
-                    continue;
-                }
-                if ((
-                        $child_line_item instanceof EEI_Line_Item
-                        && $child_line_item->type() === EEM_Line_Item::type_sub_total
-                    )
-                    || (
-                        $child_line_item instanceof EEI_Line_Item
-                        && $child_line_item->type() === EEM_Line_Item::type_line_item
-                        && $child_line_item->OBJ_type() === 'Ticket'
-                    )
-                ) {
-                    $ticket_or_subtotals_with_tkt_children_count++;
-                }
-            }
-            // if this is an event subtotal with NO ticket children
-            // we basically want to ignore it
-            return $this->_filter_zero_subtotal_line_item(
-                $non_zero_line_item,
-                $ticket_or_subtotals_with_tkt_children_count
-            );
-        }
-        return $non_zero_line_item;
-    }
+	/**
+	 * Creates a duplicate of the line item tree, except only includes billable items
+	 * and the portion of line items attributed to billable things
+	 *
+	 * @param EEI_Line_Item $line_item
+	 * @return EEI_Line_Item
+	 */
+	public function process(EEI_Line_Item $line_item)
+	{
+		$non_zero_line_item = $this->_filter_zero_line_item($line_item);
+		if (! $non_zero_line_item instanceof EEI_Line_Item) {
+			return null;
+		}
+		// if this is an event subtotal, we want to only include it if it
+		// has a non-zero total and at least one ticket line item child
+		if ($line_item->children()) {
+			$ticket_or_subtotals_with_tkt_children_count = 0;
+			foreach ($line_item->children() as $child_line_item) {
+				$code = $child_line_item->code();
+				$child_line_item = $this->process($child_line_item);
+				if (! $child_line_item instanceof EEI_Line_Item) {
+					$line_item->delete_child_line_item($code);
+					continue;
+				}
+				if ((
+						$child_line_item instanceof EEI_Line_Item
+						&& $child_line_item->type() === EEM_Line_Item::type_sub_total
+					)
+					|| (
+						$child_line_item instanceof EEI_Line_Item
+						&& $child_line_item->type() === EEM_Line_Item::type_line_item
+						&& $child_line_item->OBJ_type() === 'Ticket'
+					)
+				) {
+					$ticket_or_subtotals_with_tkt_children_count++;
+				}
+			}
+			// if this is an event subtotal with NO ticket children
+			// we basically want to ignore it
+			return $this->_filter_zero_subtotal_line_item(
+				$non_zero_line_item,
+				$ticket_or_subtotals_with_tkt_children_count
+			);
+		}
+		return $non_zero_line_item;
+	}
 
 
-    /**
-     * Creates a new, unsaved line item, but if it's a ticket line item
-     * with a total of 0, or a subtotal of 0, returns null instead
-     *
-     * @param EEI_Line_Item $line_item
-     * @return EEI_Line_Item
-     */
-    protected function _filter_zero_line_item(EEI_Line_Item $line_item)
-    {
-        if ($line_item->type() === EEM_Line_Item::type_line_item
-            && $line_item->OBJ_type() === 'Ticket'
-            && (int) $line_item->quantity() === 0
-        ) {
-            return null;
-        }
-        return $line_item;
-    }
+	/**
+	 * Creates a new, unsaved line item, but if it's a ticket line item
+	 * with a total of 0, or a subtotal of 0, returns null instead
+	 *
+	 * @param EEI_Line_Item $line_item
+	 * @return EEI_Line_Item
+	 */
+	protected function _filter_zero_line_item(EEI_Line_Item $line_item)
+	{
+		if ($line_item->type() === EEM_Line_Item::type_line_item
+			&& $line_item->OBJ_type() === 'Ticket'
+			&& (int) $line_item->quantity() === 0
+		) {
+			return null;
+		}
+		return $line_item;
+	}
 
 
-    /**
-     * Creates a new, unsaved line item, but if it's a ticket line item
-     * with a total of 0, or a subtotal of 0, returns null instead
-     *
-     * @param EEI_Line_Item $line_item
-     * @param int           $ticket_children
-     * @return EEI_Line_Item
-     */
-    protected function _filter_zero_subtotal_line_item(EEI_Line_Item $line_item, $ticket_children = 0)
-    {
-        if ((int) $ticket_children === 0
-            && $line_item->type() === EEM_Line_Item::type_sub_total
-        ) {
-            return null;
-        }
-        return $line_item;
-    }
+	/**
+	 * Creates a new, unsaved line item, but if it's a ticket line item
+	 * with a total of 0, or a subtotal of 0, returns null instead
+	 *
+	 * @param EEI_Line_Item $line_item
+	 * @param int           $ticket_children
+	 * @return EEI_Line_Item
+	 */
+	protected function _filter_zero_subtotal_line_item(EEI_Line_Item $line_item, $ticket_children = 0)
+	{
+		if ((int) $ticket_children === 0
+			&& $line_item->type() === EEM_Line_Item::type_sub_total
+		) {
+			return null;
+		}
+		return $line_item;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
     public function process(EEI_Line_Item $line_item)
     {
         $non_zero_line_item = $this->_filter_zero_line_item($line_item);
-        if (! $non_zero_line_item instanceof EEI_Line_Item) {
+        if ( ! $non_zero_line_item instanceof EEI_Line_Item) {
             return null;
         }
         // if this is an event subtotal, we want to only include it if it
@@ -42,7 +42,7 @@ 
             foreach ($line_item->children() as $child_line_item) {
                 $code = $child_line_item->code();
                 $child_line_item = $this->process($child_line_item);
-                if (! $child_line_item instanceof EEI_Line_Item) {
+                if ( ! $child_line_item instanceof EEI_Line_Item) {
                     $line_item->delete_child_line_item($code);
                     continue;
                 }

core/libraries/line_item_filters/EE_Line_Item_Filter_Collection.class.php

Indentation +7 added lines, -7 removed lines

@@ -18,11 +18,11 @@
 {
 
 
-    /**
-     * EE_Line_Item_Filter_Collection constructor.
-     */
-    public function __construct()
-    {
-        $this->interface = 'EEI_Line_Item_Filter';
-    }
+	/**
+	 * EE_Line_Item_Filter_Collection constructor.
+	 */
+	public function __construct()
+	{
+		$this->interface = 'EEI_Line_Item_Filter';
+	}
 }

core/libraries/line_item_filters/EE_Billable_Line_Item_Filter.class.php

Indentation +42 added lines, -42 removed lines

@@ -18,48 +18,48 @@
 {
 
 
-    /**
-     * EE_Billable_Line_Item_Filter constructor.
-     *
-     * @param EE_Registration[] $registrations
-     */
-    public function __construct($registrations)
-    {
-        parent::__construct($this->_remove_unbillable_registrations($registrations));
-    }
+	/**
+	 * EE_Billable_Line_Item_Filter constructor.
+	 *
+	 * @param EE_Registration[] $registrations
+	 */
+	public function __construct($registrations)
+	{
+		parent::__construct($this->_remove_unbillable_registrations($registrations));
+	}
 
 
-    /**
-     *    _calculate_billable_ticket_quantities_from_registrations
-     * compiles a list of EE_Tickets for each event in the passed array
-     *
-     * @access protected
-     * @param EE_Registration[] $registrations
-     * @return mixed
-     */
-    protected function _remove_unbillable_registrations($registrations = array())
-    {
-        if (! empty($registrations)) {
-            // these reg statuses require payment (if event is not free)
-            $requires_payment = EEM_Registration::reg_statuses_that_allow_payment();
-            foreach ($registrations as $key => $registration) {
-                if (! $registration instanceof EE_Registration) {
-                    continue;
-                }
-                // are we billing for this registration at this moment ?
-                if (!
-                    $registration->owes_monies_and_can_pay($requires_payment) &&
-                    ! (
-                        // free registration with valid reg status
-                        $registration->final_price() == 0 &&
-                        in_array($registration->status_ID(), $requires_payment)
-                    )
-                ) {
-                    // not billable. remove it
-                    unset($registrations[ $key ]);
-                }
-            }
-        }
-        return $registrations;
-    }
+	/**
+	 *    _calculate_billable_ticket_quantities_from_registrations
+	 * compiles a list of EE_Tickets for each event in the passed array
+	 *
+	 * @access protected
+	 * @param EE_Registration[] $registrations
+	 * @return mixed
+	 */
+	protected function _remove_unbillable_registrations($registrations = array())
+	{
+		if (! empty($registrations)) {
+			// these reg statuses require payment (if event is not free)
+			$requires_payment = EEM_Registration::reg_statuses_that_allow_payment();
+			foreach ($registrations as $key => $registration) {
+				if (! $registration instanceof EE_Registration) {
+					continue;
+				}
+				// are we billing for this registration at this moment ?
+				if (!
+					$registration->owes_monies_and_can_pay($requires_payment) &&
+					! (
+						// free registration with valid reg status
+						$registration->final_price() == 0 &&
+						in_array($registration->status_ID(), $requires_payment)
+					)
+				) {
+					// not billable. remove it
+					unset($registrations[ $key ]);
+				}
+			}
+		}
+		return $registrations;
+	}
 }

Spacing +4 added lines, -5 removed lines

@@ -39,16 +39,15 @@ 
      */
     protected function _remove_unbillable_registrations($registrations = array())
     {
-        if (! empty($registrations)) {
+        if ( ! empty($registrations)) {
             // these reg statuses require payment (if event is not free)
             $requires_payment = EEM_Registration::reg_statuses_that_allow_payment();
             foreach ($registrations as $key => $registration) {
-                if (! $registration instanceof EE_Registration) {
+                if ( ! $registration instanceof EE_Registration) {
                     continue;
                 }
                 // are we billing for this registration at this moment ?
-                if (!
-                    $registration->owes_monies_and_can_pay($requires_payment) &&
+                if ( ! $registration->owes_monies_and_can_pay($requires_payment) &&
                     ! (
                         // free registration with valid reg status
                         $registration->final_price() == 0 &&
@@ -56,7 +55,7 @@ 
                     )
                 ) {
                     // not billable. remove it
-                    unset($registrations[ $key ]);
+                    unset($registrations[$key]);
                 }
             }
         }

core/libraries/line_item_filters/EE_Line_Item_Filter_Base.class.php

Indentation +10 added lines, -10 removed lines

@@ -16,14 +16,14 @@
 {
 
 
-    /**
-     * process
-     *
-     * @param \EEI_Line_Item $line_item
-     * @return \EEI_Line_Item
-     */
-    public function process(EEI_Line_Item $line_item)
-    {
-        return $line_item;
-    }
+	/**
+	 * process
+	 *
+	 * @param \EEI_Line_Item $line_item
+	 * @return \EEI_Line_Item
+	 */
+	public function process(EEI_Line_Item $line_item)
+	{
+		return $line_item;
+	}
 }

core/libraries/line_item_filters/EE_Single_Registration_Line_Item_Filter.class.php

Indentation +8 added lines, -8 removed lines

@@ -16,12 +16,12 @@
 class EE_Single_Registration_Line_Item_Filter extends EE_Specific_Registrations_Line_Item_Filter
 {
 
-    /**
-     *
-     * @param EE_Registration $registration
-     */
-    public function __construct($registration)
-    {
-        parent::__construct(array($registration));
-    }
+	/**
+	 *
+	 * @param EE_Registration $registration
+	 */
+	public function __construct($registration)
+	{
+		parent::__construct(array($registration));
+	}
 }

core/libraries/line_item_filters/EE_Specific_Registrations_Line_Item_Filter.class.php

Indentation +167 added lines, -167 removed lines

@@ -13,182 +13,182 @@
 class EE_Specific_Registrations_Line_Item_Filter extends EE_Line_Item_Filter_Base
 {
 
-    /**
-     * array of line item codes and their corresponding quantities for registrations
-     *
-     * @type array $_line_item_registrations
-     */
-    protected $_line_item_registrations = array();
+	/**
+	 * array of line item codes and their corresponding quantities for registrations
+	 *
+	 * @type array $_line_item_registrations
+	 */
+	protected $_line_item_registrations = array();
 
-    /**
-     * Just kept in case we want it someday. Currently unused
-     *
-     * @var EE_Registration[]
-     */
-    protected $_registrations = array();
+	/**
+	 * Just kept in case we want it someday. Currently unused
+	 *
+	 * @var EE_Registration[]
+	 */
+	protected $_registrations = array();
 
-    /**
-     * @var EE_Registration
-     */
-    protected $_current_registration;
+	/**
+	 * @var EE_Registration
+	 */
+	protected $_current_registration;
 
-    /**
-     * these reg statuses should NOT increment the line item quantity
-     *
-     * @var array
-     */
-    protected $_closed_reg_statuses = array();
+	/**
+	 * these reg statuses should NOT increment the line item quantity
+	 *
+	 * @var array
+	 */
+	protected $_closed_reg_statuses = array();
 
 
-    /**
-     * EE_Billable_Line_Item_Filter constructor.
-     *
-     * @param EE_Registration[] $registrations
-     * @throws EE_Error
-     */
-    public function __construct($registrations)
-    {
-        $this->_registrations = $registrations;
-        $this->_calculate_registrations_per_line_item_code($registrations);
-        // these reg statuses should NOT increment the line item quantity
-        $this->_closed_reg_statuses = EEM_Registration::closed_reg_statuses();
-    }
+	/**
+	 * EE_Billable_Line_Item_Filter constructor.
+	 *
+	 * @param EE_Registration[] $registrations
+	 * @throws EE_Error
+	 */
+	public function __construct($registrations)
+	{
+		$this->_registrations = $registrations;
+		$this->_calculate_registrations_per_line_item_code($registrations);
+		// these reg statuses should NOT increment the line item quantity
+		$this->_closed_reg_statuses = EEM_Registration::closed_reg_statuses();
+	}
 
 
-    /**
-     * sets the _line_item_registrations from the provided registrations
-     *
-     * @param EE_Registration[] $registrations
-     * @return void
-     * @throws EE_Error
-     */
-    protected function _calculate_registrations_per_line_item_code($registrations)
-    {
-        foreach ($registrations as $registration) {
-            $line_item_code = EEM_Line_Item::instance()->get_var(
-                EEM_Line_Item::instance()->line_item_for_registration_query_params(
-                    $registration,
-                    array('limit' => 1)
-                ),
-                'LIN_code'
-            );
-            if ($line_item_code) {
-                if (! isset($this->_line_item_registrations[ $line_item_code ])) {
-                    $this->_line_item_registrations[ $line_item_code ] = array();
-                }
-                $this->_line_item_registrations[ $line_item_code ][ $registration->ID() ] = $registration;
-            }
-        }
-    }
+	/**
+	 * sets the _line_item_registrations from the provided registrations
+	 *
+	 * @param EE_Registration[] $registrations
+	 * @return void
+	 * @throws EE_Error
+	 */
+	protected function _calculate_registrations_per_line_item_code($registrations)
+	{
+		foreach ($registrations as $registration) {
+			$line_item_code = EEM_Line_Item::instance()->get_var(
+				EEM_Line_Item::instance()->line_item_for_registration_query_params(
+					$registration,
+					array('limit' => 1)
+				),
+				'LIN_code'
+			);
+			if ($line_item_code) {
+				if (! isset($this->_line_item_registrations[ $line_item_code ])) {
+					$this->_line_item_registrations[ $line_item_code ] = array();
+				}
+				$this->_line_item_registrations[ $line_item_code ][ $registration->ID() ] = $registration;
+			}
+		}
+	}
 
 
-    /**
-     * Creates a duplicate of the line item tree, except only includes billable items
-     * and the portion of line items attributed to billable things
-     *
-     * @param EEI_Line_Item $line_item
-     * @return EEI_Line_Item
-     * @throws EE_Error
-     */
-    public function process(EEI_Line_Item $line_item)
-    {
-        $this->_adjust_line_item_quantity($line_item);
-        if (! $line_item->children()) {
-            return $line_item;
-        }
-        // the original running total (taking ALL tickets into account)
-        $running_total_of_children = 0;
-        // the new running total (only taking the specified ticket quantities into account)
-        $running_total_of_children_under_consideration = 0;
-        // let's also track the quantity of tickets that pertain to the registrations
-        $total_child_ticket_quantity = 0;
-        foreach ($line_item->children() as $child_line_item) {
-            $original_li_total = $child_line_item->is_percent()
-                ? $running_total_of_children * $child_line_item->percent() / 100
-                : $child_line_item->unit_price() * $child_line_item->quantity();
-            $this->process($child_line_item);
-            // If this line item is a normal line item that isn't for a ticket,
-            // we want to modify its total (and unit price if not a percentage line item)
-            // so it reflects only that portion of the surcharge/discount shared by these registrations
-            if ($child_line_item->type() === EEM_Line_Item::type_line_item
-                && $child_line_item->OBJ_type() !== 'Ticket'
-            ) {
-                $percent_of_running_total = $running_total_of_children
-                    ? $original_li_total / $running_total_of_children
-                    : 0;
-                $child_line_item->set_total(
-                    $running_total_of_children_under_consideration * $percent_of_running_total
-                );
-                if (! $child_line_item->is_percent()) {
-                    $child_line_item->set_unit_price($child_line_item->total() / $child_line_item->quantity());
-                }
-            } elseif (// make sure this item's quantity and total matches its parent
-                $line_item->type() === EEM_Line_Item::type_line_item
-                && $line_item->OBJ_type() === 'Ticket'
-                // but not if it's a percentage modifier
-                && ! $child_line_item->is_percent()
-                && ! (
-                    // or a cancellation
-                    $child_line_item->is_cancelled()
-                    && ! (
-                        // unless it IS a cancellation and the current registration is cancelled
-                        $child_line_item->is_cancelled()
-                        && $this->_current_registration instanceof EE_Registration
-                        && in_array($this->_current_registration->status_ID(), $this->_closed_reg_statuses, true)
-                    )
-                )
-            ) {
-                $child_line_item->set_quantity($line_item->quantity());
-                $child_line_item->set_total($child_line_item->unit_price() * $child_line_item->quantity());
-            }
-            $running_total_of_children += $original_li_total;
-            $running_total_of_children_under_consideration += $child_line_item->total();
-            if ($child_line_item->OBJ_type() === 'Ticket') {
-                $total_child_ticket_quantity += $child_line_item->quantity();
-            }
-        }
-        $line_item->set_total($running_total_of_children_under_consideration);
-        if ($line_item->quantity()) {
-            $line_item->set_unit_price($running_total_of_children_under_consideration / $line_item->quantity());
-        } else {
-            $line_item->set_unit_price(0);
-        }
-        if ($line_item->OBJ_type() === 'Event') {
-            $line_item->set_quantity($total_child_ticket_quantity);
-        }
-        return $line_item;
-    }
+	/**
+	 * Creates a duplicate of the line item tree, except only includes billable items
+	 * and the portion of line items attributed to billable things
+	 *
+	 * @param EEI_Line_Item $line_item
+	 * @return EEI_Line_Item
+	 * @throws EE_Error
+	 */
+	public function process(EEI_Line_Item $line_item)
+	{
+		$this->_adjust_line_item_quantity($line_item);
+		if (! $line_item->children()) {
+			return $line_item;
+		}
+		// the original running total (taking ALL tickets into account)
+		$running_total_of_children = 0;
+		// the new running total (only taking the specified ticket quantities into account)
+		$running_total_of_children_under_consideration = 0;
+		// let's also track the quantity of tickets that pertain to the registrations
+		$total_child_ticket_quantity = 0;
+		foreach ($line_item->children() as $child_line_item) {
+			$original_li_total = $child_line_item->is_percent()
+				? $running_total_of_children * $child_line_item->percent() / 100
+				: $child_line_item->unit_price() * $child_line_item->quantity();
+			$this->process($child_line_item);
+			// If this line item is a normal line item that isn't for a ticket,
+			// we want to modify its total (and unit price if not a percentage line item)
+			// so it reflects only that portion of the surcharge/discount shared by these registrations
+			if ($child_line_item->type() === EEM_Line_Item::type_line_item
+				&& $child_line_item->OBJ_type() !== 'Ticket'
+			) {
+				$percent_of_running_total = $running_total_of_children
+					? $original_li_total / $running_total_of_children
+					: 0;
+				$child_line_item->set_total(
+					$running_total_of_children_under_consideration * $percent_of_running_total
+				);
+				if (! $child_line_item->is_percent()) {
+					$child_line_item->set_unit_price($child_line_item->total() / $child_line_item->quantity());
+				}
+			} elseif (// make sure this item's quantity and total matches its parent
+				$line_item->type() === EEM_Line_Item::type_line_item
+				&& $line_item->OBJ_type() === 'Ticket'
+				// but not if it's a percentage modifier
+				&& ! $child_line_item->is_percent()
+				&& ! (
+					// or a cancellation
+					$child_line_item->is_cancelled()
+					&& ! (
+						// unless it IS a cancellation and the current registration is cancelled
+						$child_line_item->is_cancelled()
+						&& $this->_current_registration instanceof EE_Registration
+						&& in_array($this->_current_registration->status_ID(), $this->_closed_reg_statuses, true)
+					)
+				)
+			) {
+				$child_line_item->set_quantity($line_item->quantity());
+				$child_line_item->set_total($child_line_item->unit_price() * $child_line_item->quantity());
+			}
+			$running_total_of_children += $original_li_total;
+			$running_total_of_children_under_consideration += $child_line_item->total();
+			if ($child_line_item->OBJ_type() === 'Ticket') {
+				$total_child_ticket_quantity += $child_line_item->quantity();
+			}
+		}
+		$line_item->set_total($running_total_of_children_under_consideration);
+		if ($line_item->quantity()) {
+			$line_item->set_unit_price($running_total_of_children_under_consideration / $line_item->quantity());
+		} else {
+			$line_item->set_unit_price(0);
+		}
+		if ($line_item->OBJ_type() === 'Event') {
+			$line_item->set_quantity($total_child_ticket_quantity);
+		}
+		return $line_item;
+	}
 
 
-    /**
-     * Adjusts quantities for line items for tickets according to the registrations provided
-     * in the constructor
-     *
-     * @param EEI_Line_Item $line_item
-     * @return EEI_Line_Item
-     */
-    protected function _adjust_line_item_quantity(EEI_Line_Item $line_item)
-    {
-        // is this a ticket ?
-        if ($line_item->type() === EEM_Line_Item::type_line_item && $line_item->OBJ_type() === 'Ticket') {
-            $this->_current_registration = null;
-            $quantity = 0;
-            // if this ticket is billable at this moment, then we should have a positive quantity
-            if (isset($this->_line_item_registrations[ $line_item->code() ])
-                && is_array($this->_line_item_registrations[ $line_item->code() ])
-            ) {
-                // set quantity based on number of open registrations for this ticket
-                foreach ($this->_line_item_registrations[ $line_item->code() ] as $registration) {
-                    if ($registration instanceof EE_Registration
-                    ) {
-                        $quantity++;
-                        $this->_current_registration = $registration;
-                    }
-                }
-            }
-            $line_item->set_quantity($quantity);
-            $line_item->set_total($line_item->unit_price() * $line_item->quantity());
-        }
-        return $line_item;
-    }
+	/**
+	 * Adjusts quantities for line items for tickets according to the registrations provided
+	 * in the constructor
+	 *
+	 * @param EEI_Line_Item $line_item
+	 * @return EEI_Line_Item
+	 */
+	protected function _adjust_line_item_quantity(EEI_Line_Item $line_item)
+	{
+		// is this a ticket ?
+		if ($line_item->type() === EEM_Line_Item::type_line_item && $line_item->OBJ_type() === 'Ticket') {
+			$this->_current_registration = null;
+			$quantity = 0;
+			// if this ticket is billable at this moment, then we should have a positive quantity
+			if (isset($this->_line_item_registrations[ $line_item->code() ])
+				&& is_array($this->_line_item_registrations[ $line_item->code() ])
+			) {
+				// set quantity based on number of open registrations for this ticket
+				foreach ($this->_line_item_registrations[ $line_item->code() ] as $registration) {
+					if ($registration instanceof EE_Registration
+					) {
+						$quantity++;
+						$this->_current_registration = $registration;
+					}
+				}
+			}
+			$line_item->set_quantity($quantity);
+			$line_item->set_total($line_item->unit_price() * $line_item->quantity());
+		}
+		return $line_item;
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -73,10 +73,10 @@ 
                 'LIN_code'
             );
             if ($line_item_code) {
-                if (! isset($this->_line_item_registrations[ $line_item_code ])) {
-                    $this->_line_item_registrations[ $line_item_code ] = array();
+                if ( ! isset($this->_line_item_registrations[$line_item_code])) {
+                    $this->_line_item_registrations[$line_item_code] = array();
                 }
-                $this->_line_item_registrations[ $line_item_code ][ $registration->ID() ] = $registration;
+                $this->_line_item_registrations[$line_item_code][$registration->ID()] = $registration;
             }
         }
     }
@@ -93,7 +93,7 @@ 
     public function process(EEI_Line_Item $line_item)
     {
         $this->_adjust_line_item_quantity($line_item);
-        if (! $line_item->children()) {
+        if ( ! $line_item->children()) {
             return $line_item;
         }
         // the original running total (taking ALL tickets into account)
@@ -119,7 +119,7 @@ 
                 $child_line_item->set_total(
                     $running_total_of_children_under_consideration * $percent_of_running_total
                 );
-                if (! $child_line_item->is_percent()) {
+                if ( ! $child_line_item->is_percent()) {
                     $child_line_item->set_unit_price($child_line_item->total() / $child_line_item->quantity());
                 }
             } elseif (// make sure this item's quantity and total matches its parent
@@ -174,11 +174,11 @@ 
             $this->_current_registration = null;
             $quantity = 0;
             // if this ticket is billable at this moment, then we should have a positive quantity
-            if (isset($this->_line_item_registrations[ $line_item->code() ])
-                && is_array($this->_line_item_registrations[ $line_item->code() ])
+            if (isset($this->_line_item_registrations[$line_item->code()])
+                && is_array($this->_line_item_registrations[$line_item->code()])
             ) {
                 // set quantity based on number of open registrations for this ticket
-                foreach ($this->_line_item_registrations[ $line_item->code() ] as $registration) {
+                foreach ($this->_line_item_registrations[$line_item->code()] as $registration) {
                     if ($registration instanceof EE_Registration
                     ) {
                         $quantity++;

core/libraries/line_item_display/EE_Line_Item_Display.class.php

Indentation +51 added lines, -51 removed lines

@@ -14,62 +14,62 @@
 class EE_Line_Item_Display
 {
 
-    private $strategy = null;
+	private $strategy = null;
 
 
-    /**
-     * @param string $context - where/how the line items are being displayed
-     * @param string $other_line_item_display_strategy
-     */
-    public function __construct($context = '', $other_line_item_display_strategy = '')
-    {
-        $context = strtolower($context);
-        switch ($context) {
-            case 'invoice':
-                $this->strategy = new EE_Invoice_Line_Item_Display_Strategy();
-                break;
-            case 'receipt':
-                $this->strategy = new EE_Receipt_Line_Item_Display_Strategy();
-                break;
-            case 'spco':
-                $this->strategy = new EE_SPCO_Line_Item_Display_Strategy();
-                break;
-            default:
-                if (! empty($other_line_item_display_strategy) &&
-                    class_exists($other_line_item_display_strategy)
-                ) {
-                    $this->strategy = new  $other_line_item_display_strategy();
-                } else {
-                    $this->strategy = new EE_Default_Line_Item_Display_Strategy();
-                }
-        }
-    }
+	/**
+	 * @param string $context - where/how the line items are being displayed
+	 * @param string $other_line_item_display_strategy
+	 */
+	public function __construct($context = '', $other_line_item_display_strategy = '')
+	{
+		$context = strtolower($context);
+		switch ($context) {
+			case 'invoice':
+				$this->strategy = new EE_Invoice_Line_Item_Display_Strategy();
+				break;
+			case 'receipt':
+				$this->strategy = new EE_Receipt_Line_Item_Display_Strategy();
+				break;
+			case 'spco':
+				$this->strategy = new EE_SPCO_Line_Item_Display_Strategy();
+				break;
+			default:
+				if (! empty($other_line_item_display_strategy) &&
+					class_exists($other_line_item_display_strategy)
+				) {
+					$this->strategy = new  $other_line_item_display_strategy();
+				} else {
+					$this->strategy = new EE_Default_Line_Item_Display_Strategy();
+				}
+		}
+	}
 
-    /**
-     * @param EE_Line_Item $line_item
-     * @param array        $options
-     * @return mixed
-     */
-    public function display_line_item(EE_Line_Item $line_item, $options = array())
-    {
-        return $this->strategy->display_line_item($line_item, $options);
-    }
+	/**
+	 * @param EE_Line_Item $line_item
+	 * @param array        $options
+	 * @return mixed
+	 */
+	public function display_line_item(EE_Line_Item $line_item, $options = array())
+	{
+		return $this->strategy->display_line_item($line_item, $options);
+	}
 
 
-    /**
-     * @return float
-     */
-    public function grand_total()
-    {
-        return $this->strategy->grand_total();
-    }
+	/**
+	 * @return float
+	 */
+	public function grand_total()
+	{
+		return $this->strategy->grand_total();
+	}
 
 
-    /**
-     * @return float
-     */
-    public function total_items()
-    {
-        return $this->strategy->total_items();
-    }
+	/**
+	 * @return float
+	 */
+	public function total_items()
+	{
+		return $this->strategy->total_items();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
                 $this->strategy = new EE_SPCO_Line_Item_Display_Strategy();
                 break;
             default:
-                if (! empty($other_line_item_display_strategy) &&
+                if ( ! empty($other_line_item_display_strategy) &&
                     class_exists($other_line_item_display_strategy)
                 ) {
                     $this->strategy = new  $other_line_item_display_strategy();

core/libraries/template_parts/EE_Template_Part_Manager.class.php

Indentation +191 added lines, -191 removed lines

@@ -14,195 +14,195 @@
 class EE_Template_Part_Manager
 {
 
-    /**
-     * @param EE_Template_Part_PriorityQueue $template_parts
-     */
-    protected $template_parts;
-
-    /**
-     * @param array $priorities
-     */
-    protected $priorities = array();
-
-    /**
-     * @param int $event_desc_priority
-     */
-    protected $event_desc_priority;
-
-    /**
-     * @param string $before_event_content
-     */
-    protected $before_event_content;
-
-    /**
-     * @param string $event_content
-     */
-    protected $event_content;
-
-    /**
-     * @param string $after_event_content
-     */
-    protected $after_event_content;
-
-
-    /**
-     *    class constructor
-     */
-    public function __construct()
-    {
-        $this->template_parts = new EE_Template_Part_PriorityQueue();
-    }
-
-
-    /**
-     *    add_template_part
-     *
-     *    used for setting the details about a particular template part
-     *
-     * @param string $name     - just a simple string identifier - do NOT use 'event'
-     * @param string $label    - template part label displayed in admin
-     * @param string $template - name or path of template to be used by EEH_Template::locate_template()
-     * @param int    $priority - order in which template parts should be applied
-     */
-    public function add_template_part($name, $label, $template, $priority)
-    {
-        // SplPriorityQueue doesn't play nice with multiple items having the same priority
-        // so if the incoming priority is already occupied, then let's increment it by one,
-        // and then pass everything back into this method and try again with the new priority
-        if (isset($this->priorities[ $priority ])) {
-            $priority++;
-            $this->add_template_part($name, $label, $template, $priority);
-            return;
-        }
-        // kk now we can mark this priority as being occupied
-        $this->priorities[ $priority ] = true;
-        // create the template part and add to the queue
-        $this->template_parts->insert(
-            new EE_Template_Part($name, $label, $template, $priority),
-            $priority
-        );
-        if ($name === 'event') {
-            $this->event_desc_priority = $priority;
-        }
-    }
-
-
-    /**
-     *    apply_template_part_filters
-     *
-     *    adds template parts to the supplied content
-     *    according to the details set when the template parts were added
-     *
-     * @access public
-     * @param string $content
-     * @return string
-     */
-    public function apply_template_part_filters($content = '')
-    {
-        $this->template_parts->rewind();
-        // loop through template parts and position content
-        while ($this->template_parts->valid()) {
-            $this->_position_template_part(
-                $content,
-                $this->template_parts->current()->template(),
-                $this->template_parts->current()->priority()
-            );
-            $this->template_parts->next();
-        }
-        // now simply add our three strings of content together
-        return $this->before_event_content . $this->event_content . $this->after_event_content;
-    }
-
-
-    /**
-     *    position_template_part
-     *
-     * based on the priority of the incoming template part
-     * relative to the known event description template part priority,
-     * this method will assign template parts to one of the following:
-     *        $this->before_event_content
-     *        $this->event_content
-     *        $this->after_event_content
-     *
-     * @access protected
-     * @param string $content
-     * @param string $template
-     * @param int    $priority
-     * @return void
-     */
-    protected function _position_template_part($content, $template, $priority)
-    {
-        // Event Description content is the actual incoming content itself
-        if ($priority === $this->event_desc_priority) {
-            $this->event_content = $content;
-        } elseif ($priority < $this->event_desc_priority) {
-            // everything BEFORE the Event Description
-            $this->before_event_content .= EEH_Template::locate_template($template);
-        } elseif ($priority > $this->event_desc_priority) {
-            // everything AFTER the Event Description
-            $this->after_event_content .= EEH_Template::locate_template($template);
-        }
-    }
-
-
-    /**
-     *    generate_sortable_list_of_template_parts
-     *
-     *    creates an HTML list (<ul>) with list items (<li>) for each template part,
-     *    in a format that can be used as a sortable list in the admin
-     *
-     * @access public
-     * @param string $list_css_id
-     * @param string $list_css_class
-     * @param string $list_item_css_class
-     * @param string $list_item_css_id_prefix
-     * @return string
-     */
-    public function generate_sortable_list_of_template_parts(
-        $list_css_id = '',
-        $list_css_class = '',
-        $list_item_css_class = '',
-        $list_item_css_id_prefix = ''
-    ) {
-        $event_archive_display_order = EEH_HTML::ul($list_css_id, $list_css_class);
-        $this->template_parts->rewind();
-        // loop through template parts and add template content
-        while ($this->template_parts->valid()) {
-            $event_archive_display_order .= EEH_HTML::li(
-                EEH_HTML::span('', '', 'dashicons dashicons-arrow-up-alt2') .
-                EEH_HTML::span('', '', 'dashicons dashicons-arrow-down-alt2') .
-                $this->template_parts->current()->label(),
-                $list_item_css_id_prefix . $this->template_parts->current()->name(),
-                $list_item_css_class
-            );
-            $this->template_parts->next();
-        }
-        $event_archive_display_order .= EEH_HTML::ulx();
-        return $event_archive_display_order;
-    }
-
-
-    /**
-     *    display_template_parts
-     *
-     * just for debugging purposes
-     *
-     * @access    public
-     * @return void
-     */
-    public function display_template_parts()
-    {
-        if (WP_DEBUG) {
-            $this->template_parts->rewind();
-            while ($this->template_parts->valid()) {
-                EEH_Debug_Tools::printr(
-                    $this->template_parts->current(),
-                    'template_part',
-                    __FILE__,
-                    __LINE__
-                );
-                $this->template_parts->next();
-            }
-        }
-    }
+	/**
+	 * @param EE_Template_Part_PriorityQueue $template_parts
+	 */
+	protected $template_parts;
+
+	/**
+	 * @param array $priorities
+	 */
+	protected $priorities = array();
+
+	/**
+	 * @param int $event_desc_priority
+	 */
+	protected $event_desc_priority;
+
+	/**
+	 * @param string $before_event_content
+	 */
+	protected $before_event_content;
+
+	/**
+	 * @param string $event_content
+	 */
+	protected $event_content;
+
+	/**
+	 * @param string $after_event_content
+	 */
+	protected $after_event_content;
+
+
+	/**
+	 *    class constructor
+	 */
+	public function __construct()
+	{
+		$this->template_parts = new EE_Template_Part_PriorityQueue();
+	}
+
+
+	/**
+	 *    add_template_part
+	 *
+	 *    used for setting the details about a particular template part
+	 *
+	 * @param string $name     - just a simple string identifier - do NOT use 'event'
+	 * @param string $label    - template part label displayed in admin
+	 * @param string $template - name or path of template to be used by EEH_Template::locate_template()
+	 * @param int    $priority - order in which template parts should be applied
+	 */
+	public function add_template_part($name, $label, $template, $priority)
+	{
+		// SplPriorityQueue doesn't play nice with multiple items having the same priority
+		// so if the incoming priority is already occupied, then let's increment it by one,
+		// and then pass everything back into this method and try again with the new priority
+		if (isset($this->priorities[ $priority ])) {
+			$priority++;
+			$this->add_template_part($name, $label, $template, $priority);
+			return;
+		}
+		// kk now we can mark this priority as being occupied
+		$this->priorities[ $priority ] = true;
+		// create the template part and add to the queue
+		$this->template_parts->insert(
+			new EE_Template_Part($name, $label, $template, $priority),
+			$priority
+		);
+		if ($name === 'event') {
+			$this->event_desc_priority = $priority;
+		}
+	}
+
+
+	/**
+	 *    apply_template_part_filters
+	 *
+	 *    adds template parts to the supplied content
+	 *    according to the details set when the template parts were added
+	 *
+	 * @access public
+	 * @param string $content
+	 * @return string
+	 */
+	public function apply_template_part_filters($content = '')
+	{
+		$this->template_parts->rewind();
+		// loop through template parts and position content
+		while ($this->template_parts->valid()) {
+			$this->_position_template_part(
+				$content,
+				$this->template_parts->current()->template(),
+				$this->template_parts->current()->priority()
+			);
+			$this->template_parts->next();
+		}
+		// now simply add our three strings of content together
+		return $this->before_event_content . $this->event_content . $this->after_event_content;
+	}
+
+
+	/**
+	 *    position_template_part
+	 *
+	 * based on the priority of the incoming template part
+	 * relative to the known event description template part priority,
+	 * this method will assign template parts to one of the following:
+	 *        $this->before_event_content
+	 *        $this->event_content
+	 *        $this->after_event_content
+	 *
+	 * @access protected
+	 * @param string $content
+	 * @param string $template
+	 * @param int    $priority
+	 * @return void
+	 */
+	protected function _position_template_part($content, $template, $priority)
+	{
+		// Event Description content is the actual incoming content itself
+		if ($priority === $this->event_desc_priority) {
+			$this->event_content = $content;
+		} elseif ($priority < $this->event_desc_priority) {
+			// everything BEFORE the Event Description
+			$this->before_event_content .= EEH_Template::locate_template($template);
+		} elseif ($priority > $this->event_desc_priority) {
+			// everything AFTER the Event Description
+			$this->after_event_content .= EEH_Template::locate_template($template);
+		}
+	}
+
+
+	/**
+	 *    generate_sortable_list_of_template_parts
+	 *
+	 *    creates an HTML list (<ul>) with list items (<li>) for each template part,
+	 *    in a format that can be used as a sortable list in the admin
+	 *
+	 * @access public
+	 * @param string $list_css_id
+	 * @param string $list_css_class
+	 * @param string $list_item_css_class
+	 * @param string $list_item_css_id_prefix
+	 * @return string
+	 */
+	public function generate_sortable_list_of_template_parts(
+		$list_css_id = '',
+		$list_css_class = '',
+		$list_item_css_class = '',
+		$list_item_css_id_prefix = ''
+	) {
+		$event_archive_display_order = EEH_HTML::ul($list_css_id, $list_css_class);
+		$this->template_parts->rewind();
+		// loop through template parts and add template content
+		while ($this->template_parts->valid()) {
+			$event_archive_display_order .= EEH_HTML::li(
+				EEH_HTML::span('', '', 'dashicons dashicons-arrow-up-alt2') .
+				EEH_HTML::span('', '', 'dashicons dashicons-arrow-down-alt2') .
+				$this->template_parts->current()->label(),
+				$list_item_css_id_prefix . $this->template_parts->current()->name(),
+				$list_item_css_class
+			);
+			$this->template_parts->next();
+		}
+		$event_archive_display_order .= EEH_HTML::ulx();
+		return $event_archive_display_order;
+	}
+
+
+	/**
+	 *    display_template_parts
+	 *
+	 * just for debugging purposes
+	 *
+	 * @access    public
+	 * @return void
+	 */
+	public function display_template_parts()
+	{
+		if (WP_DEBUG) {
+			$this->template_parts->rewind();
+			while ($this->template_parts->valid()) {
+				EEH_Debug_Tools::printr(
+					$this->template_parts->current(),
+					'template_part',
+					__FILE__,
+					__LINE__
+				);
+				$this->template_parts->next();
+			}
+		}
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -69,13 +69,13 @@ 
         // SplPriorityQueue doesn't play nice with multiple items having the same priority
         // so if the incoming priority is already occupied, then let's increment it by one,
         // and then pass everything back into this method and try again with the new priority
-        if (isset($this->priorities[ $priority ])) {
+        if (isset($this->priorities[$priority])) {
             $priority++;
             $this->add_template_part($name, $label, $template, $priority);
             return;
         }
         // kk now we can mark this priority as being occupied
-        $this->priorities[ $priority ] = true;
+        $this->priorities[$priority] = true;
         // create the template part and add to the queue
         $this->template_parts->insert(
             new EE_Template_Part($name, $label, $template, $priority),
@@ -110,7 +110,7 @@ 
             $this->template_parts->next();
         }
         // now simply add our three strings of content together
-        return $this->before_event_content . $this->event_content . $this->after_event_content;
+        return $this->before_event_content.$this->event_content.$this->after_event_content;
     }
 
 
@@ -169,10 +169,10 @@ 
         // loop through template parts and add template content
         while ($this->template_parts->valid()) {
             $event_archive_display_order .= EEH_HTML::li(
-                EEH_HTML::span('', '', 'dashicons dashicons-arrow-up-alt2') .
-                EEH_HTML::span('', '', 'dashicons dashicons-arrow-down-alt2') .
+                EEH_HTML::span('', '', 'dashicons dashicons-arrow-up-alt2').
+                EEH_HTML::span('', '', 'dashicons dashicons-arrow-down-alt2').
                 $this->template_parts->current()->label(),
-                $list_item_css_id_prefix . $this->template_parts->current()->name(),
+                $list_item_css_id_prefix.$this->template_parts->current()->name(),
                 $list_item_css_class
             );
             $this->template_parts->next();