eventespresso / event-espresso-core

core/db_classes/EE_State.class.php

Indentation +100 added lines, -100 removed lines

@@ -11,104 +11,104 @@
 class EE_State extends EE_Base_Class
 {
 
-    /**
-     * @param array $props_n_values
-     * @return EE_State|mixed
-     */
-    public static function new_instance($props_n_values = array())
-    {
-        $has_object = parent::_check_for_object($props_n_values, __CLASS__);
-        return $has_object ? $has_object : new self($props_n_values);
-    }
-
-
-    /**
-     * @param array $props_n_values
-     * @return EE_State
-     */
-    public static function new_instance_from_db($props_n_values = array())
-    {
-        return new self($props_n_values, true);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function country_iso()
-    {
-        return $this->get('CNT_ISO');
-    }
-
-
-    /**
-     * @return string
-     */
-    public function abbrev()
-    {
-        return $this->get('STA_abbrev');
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function active()
-    {
-        return $this->get('STA_active');
-    }
-
-
-    /**
-     * @return string
-     */
-    public function name()
-    {
-        return $this->get('STA_name');
-    }
-
-
-    /**
-     * @return EE_Country
-     */
-    public function country()
-    {
-        return $this->get_first_related('Country');
-    }
-
-
-    /**
-     * @param $iso
-     */
-    public function set_country_iso($iso)
-    {
-        $this->set('CNT_ISO', $iso);
-    }
-
-
-    /**
-     * @param $abbrev
-     */
-    public function set_abbrev($abbrev)
-    {
-        $this->set('STA_abbrev', $abbrev);
-    }
-
-
-    /**
-     * @param $active
-     */
-    public function set_active($active)
-    {
-        $this->set('STA_active', $active);
-    }
-
-
-    /**
-     * @param $name
-     */
-    public function set_name($name)
-    {
-        $this->set('STA_name', $name);
-    }
+	/**
+	 * @param array $props_n_values
+	 * @return EE_State|mixed
+	 */
+	public static function new_instance($props_n_values = array())
+	{
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
+	}
+
+
+	/**
+	 * @param array $props_n_values
+	 * @return EE_State
+	 */
+	public static function new_instance_from_db($props_n_values = array())
+	{
+		return new self($props_n_values, true);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function country_iso()
+	{
+		return $this->get('CNT_ISO');
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function abbrev()
+	{
+		return $this->get('STA_abbrev');
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function active()
+	{
+		return $this->get('STA_active');
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function name()
+	{
+		return $this->get('STA_name');
+	}
+
+
+	/**
+	 * @return EE_Country
+	 */
+	public function country()
+	{
+		return $this->get_first_related('Country');
+	}
+
+
+	/**
+	 * @param $iso
+	 */
+	public function set_country_iso($iso)
+	{
+		$this->set('CNT_ISO', $iso);
+	}
+
+
+	/**
+	 * @param $abbrev
+	 */
+	public function set_abbrev($abbrev)
+	{
+		$this->set('STA_abbrev', $abbrev);
+	}
+
+
+	/**
+	 * @param $active
+	 */
+	public function set_active($active)
+	{
+		$this->set('STA_active', $active);
+	}
+
+
+	/**
+	 * @param $name
+	 */
+	public function set_name($name)
+	{
+		$this->set('STA_name', $name);
+	}
 }

core/db_classes/EE_Event_Message_Template.class.php

Indentation +19 added lines, -19 removed lines

@@ -12,25 +12,25 @@
 class EE_Event_Message_Template extends EE_Base_Class
 {
 
-    /**
-     * @param array $props_n_values
-     * @param null  $timezone
-     * @return EE_Event_Message_Template|mixed
-     */
-    public static function new_instance($props_n_values = array(), $timezone = null)
-    {
-        $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
-        return $has_object ? $has_object : new self($props_n_values, false, $timezone);
-    }
+	/**
+	 * @param array $props_n_values
+	 * @param null  $timezone
+	 * @return EE_Event_Message_Template|mixed
+	 */
+	public static function new_instance($props_n_values = array(), $timezone = null)
+	{
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone);
+	}
 
 
-    /**
-     * @param array $props_n_values
-     * @param null  $timezone
-     * @return EE_Event_Message_Template
-     */
-    public static function new_instance_from_db($props_n_values = array(), $timezone = null)
-    {
-        return new self($props_n_values, true, $timezone);
-    }
+	/**
+	 * @param array $props_n_values
+	 * @param null  $timezone
+	 * @return EE_Event_Message_Template
+	 */
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null)
+	{
+		return new self($props_n_values, true, $timezone);
+	}
 }

core/db_classes/EE_Change_Log.class.php

Indentation +213 added lines, -213 removed lines

@@ -11,217 +11,217 @@
 class EE_Change_Log extends EE_Base_Class
 {
 
-    /**
-     * @param array  $props_n_values          incoming values
-     * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
-     *                                        used.)
-     * @param array  $date_formats            incoming date_formats in an array where the first value is the
-     *                                        date_format and the second value is the time format
-     * @return EE_Change_Log
-     * @throws EE_Error
-     */
-    public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array())
-    {
-        $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
-        return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
-    }
-
-
-    /**
-     * @param array  $props_n_values  incoming values from the database
-     * @param string $timezone        incoming timezone as set by the model.  If not set the timezone for
-     *                                the website will be used.
-     * @return EE_Change_Log
-     */
-    public static function new_instance_from_db($props_n_values = array(), $timezone = null)
-    {
-        return new self($props_n_values, true, $timezone);
-    }
-
-    /**
-     * Gets message
-     *
-     * @return mixed
-     * @throws EE_Error
-     */
-    public function message()
-    {
-        return $this->get('LOG_message');
-    }
-
-    /**
-     * Sets message
-     *
-     * @param mixed $message
-     * @throws EE_Error
-     */
-    public function set_message($message)
-    {
-        $this->set('LOG_message', $message);
-    }
-
-    /**
-     * Gets time
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function time()
-    {
-        return $this->get('LOG_time');
-    }
-
-    /**
-     * Sets time
-     *
-     * @param string $time
-     * @throws EE_Error
-     */
-    public function set_time($time)
-    {
-        $this->set('LOG_time', $time);
-    }
-
-    /**
-     * Gets log_type
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function log_type()
-    {
-        return $this->get('LOG_type');
-    }
-
-
-    /**
-     * Return the localized log type label.
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function log_type_label()
-    {
-        return EEM_Change_Log::get_pretty_label_for_type($this->log_type());
-    }
-
-    /**
-     * Sets log_type
-     *
-     * @param string $log_type
-     * @throws EE_Error
-     */
-    public function set_log_type($log_type)
-    {
-        $this->set('LOG_type', $log_type);
-    }
-
-    /**
-     * Gets type of the model object related to this log
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function OBJ_type()
-    {
-        return $this->get('OBJ_type');
-    }
-
-    /**
-     * Sets type
-     *
-     * @param string $type
-     * @throws EE_Error
-     */
-    public function set_OBJ_type($type)
-    {
-        $this->set('OBJ_type', $type);
-    }
-
-    /**
-     * Gets OBJ_ID (the ID of the item related to this log)
-     *
-     * @return mixed
-     * @throws EE_Error
-     */
-    public function OBJ_ID()
-    {
-        return $this->get('OBJ_ID');
-    }
-
-    /**
-     * Sets OBJ_ID
-     *
-     * @param mixed $OBJ_ID
-     * @throws EE_Error
-     */
-    public function set_OBJ_ID($OBJ_ID)
-    {
-        $this->set('OBJ_ID', $OBJ_ID);
-    }
-
-    /**
-     * Gets wp_user
-     *
-     * @return int
-     * @throws EE_Error
-     */
-    public function wp_user()
-    {
-        return $this->get('LOG_wp_user');
-    }
-
-    /**
-     * Sets wp_user
-     *
-     * @param int $wp_user_id
-     * @throws EE_Error
-     */
-    public function set_wp_user($wp_user_id)
-    {
-        $this->set('LOG_wp_user', $wp_user_id);
-    }
-
-    /**
-     * Gets the model object attached to this log
-     *
-     * @return EE_Base_Class
-     * @throws EE_Error
-     */
-    public function object()
-    {
-        $model_name_of_related_obj = $this->OBJ_type();
-        $is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
-        if (! $is_model_name) {
-            return null;
-        } else {
-            return $this->get_first_related($model_name_of_related_obj);
-        }
-    }
-
-    /**
-     * Shorthand for setting the OBJ_ID and OBJ_type. Slightly handier than using
-     * _add_relation_to because you don't have to specify what type of model you're
-     * associating it with
-     *
-     * @param EE_Base_Class $object
-     * @param boolean       $save
-     * @return bool if $save=true, NULL is $save=false
-     * @throws EE_Error
-     */
-    public function set_object($object, $save = true)
-    {
-        if ($object instanceof EE_Base_Class) {
-            $this->set_OBJ_type($object->get_model()->get_this_model_name());
-            $this->set_OBJ_ID($object->ID());
-        } else {
-            $this->set_OBJ_type(null);
-            $this->set_OBJ_ID(null);
-        }
-        if ($save) {
-            return $this->save();
-        } else {
-            return null;
-        }
-    }
+	/**
+	 * @param array  $props_n_values          incoming values
+	 * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
+	 *                                        used.)
+	 * @param array  $date_formats            incoming date_formats in an array where the first value is the
+	 *                                        date_format and the second value is the time format
+	 * @return EE_Change_Log
+	 * @throws EE_Error
+	 */
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array())
+	{
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
+	}
+
+
+	/**
+	 * @param array  $props_n_values  incoming values from the database
+	 * @param string $timezone        incoming timezone as set by the model.  If not set the timezone for
+	 *                                the website will be used.
+	 * @return EE_Change_Log
+	 */
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null)
+	{
+		return new self($props_n_values, true, $timezone);
+	}
+
+	/**
+	 * Gets message
+	 *
+	 * @return mixed
+	 * @throws EE_Error
+	 */
+	public function message()
+	{
+		return $this->get('LOG_message');
+	}
+
+	/**
+	 * Sets message
+	 *
+	 * @param mixed $message
+	 * @throws EE_Error
+	 */
+	public function set_message($message)
+	{
+		$this->set('LOG_message', $message);
+	}
+
+	/**
+	 * Gets time
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function time()
+	{
+		return $this->get('LOG_time');
+	}
+
+	/**
+	 * Sets time
+	 *
+	 * @param string $time
+	 * @throws EE_Error
+	 */
+	public function set_time($time)
+	{
+		$this->set('LOG_time', $time);
+	}
+
+	/**
+	 * Gets log_type
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function log_type()
+	{
+		return $this->get('LOG_type');
+	}
+
+
+	/**
+	 * Return the localized log type label.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function log_type_label()
+	{
+		return EEM_Change_Log::get_pretty_label_for_type($this->log_type());
+	}
+
+	/**
+	 * Sets log_type
+	 *
+	 * @param string $log_type
+	 * @throws EE_Error
+	 */
+	public function set_log_type($log_type)
+	{
+		$this->set('LOG_type', $log_type);
+	}
+
+	/**
+	 * Gets type of the model object related to this log
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function OBJ_type()
+	{
+		return $this->get('OBJ_type');
+	}
+
+	/**
+	 * Sets type
+	 *
+	 * @param string $type
+	 * @throws EE_Error
+	 */
+	public function set_OBJ_type($type)
+	{
+		$this->set('OBJ_type', $type);
+	}
+
+	/**
+	 * Gets OBJ_ID (the ID of the item related to this log)
+	 *
+	 * @return mixed
+	 * @throws EE_Error
+	 */
+	public function OBJ_ID()
+	{
+		return $this->get('OBJ_ID');
+	}
+
+	/**
+	 * Sets OBJ_ID
+	 *
+	 * @param mixed $OBJ_ID
+	 * @throws EE_Error
+	 */
+	public function set_OBJ_ID($OBJ_ID)
+	{
+		$this->set('OBJ_ID', $OBJ_ID);
+	}
+
+	/**
+	 * Gets wp_user
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function wp_user()
+	{
+		return $this->get('LOG_wp_user');
+	}
+
+	/**
+	 * Sets wp_user
+	 *
+	 * @param int $wp_user_id
+	 * @throws EE_Error
+	 */
+	public function set_wp_user($wp_user_id)
+	{
+		$this->set('LOG_wp_user', $wp_user_id);
+	}
+
+	/**
+	 * Gets the model object attached to this log
+	 *
+	 * @return EE_Base_Class
+	 * @throws EE_Error
+	 */
+	public function object()
+	{
+		$model_name_of_related_obj = $this->OBJ_type();
+		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
+		if (! $is_model_name) {
+			return null;
+		} else {
+			return $this->get_first_related($model_name_of_related_obj);
+		}
+	}
+
+	/**
+	 * Shorthand for setting the OBJ_ID and OBJ_type. Slightly handier than using
+	 * _add_relation_to because you don't have to specify what type of model you're
+	 * associating it with
+	 *
+	 * @param EE_Base_Class $object
+	 * @param boolean       $save
+	 * @return bool if $save=true, NULL is $save=false
+	 * @throws EE_Error
+	 */
+	public function set_object($object, $save = true)
+	{
+		if ($object instanceof EE_Base_Class) {
+			$this->set_OBJ_type($object->get_model()->get_this_model_name());
+			$this->set_OBJ_ID($object->ID());
+		} else {
+			$this->set_OBJ_type(null);
+			$this->set_OBJ_ID(null);
+		}
+		if ($save) {
+			return $this->save();
+		} else {
+			return null;
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -192,7 +192,7 @@
     {
         $model_name_of_related_obj = $this->OBJ_type();
         $is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
-        if (! $is_model_name) {
+        if ( ! $is_model_name) {
             return null;
         } else {
             return $this->get_first_related($model_name_of_related_obj);

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