eventespresso / event-espresso-core

core/domain/values/currency/Money.php

Indentation +297 added lines, -297 removed lines

@@ -21,301 +21,301 @@
 class Money
 {
 
-    /**
-     * number of decimal places to be added to currencies for internal computations,
-     * but removed before any output or formatting is applied.
-     * This allows us to avoid rounding errors during calculations.
-     */
-    const EXTRA_PRECISION = 3;
-
-    /**
-     * @var int $amount
-     */
-    private $amount;
-
-    /**
-     * @var Currency $currency
-     */
-    private $currency;
-
-    /**
-     * @var Calculator $calculator
-     */
-    protected $calculator;
-
-
-
-    /**
-     * Money constructor.
-     *
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a value amount of 12.50
-     * @param Currency         $currency
-     * @param Calculator       $calculator
-     * @throws InvalidDataTypeException
-     */
-    public function __construct($amount, Currency $currency, Calculator $calculator)
-    {
-        $this->currency   = $currency;
-        $this->amount     = $this->parseAmount($amount);
-        $this->calculator = $calculator;
-    }
-
-
-
-    /**
-     * @return Calculator
-     */
-    protected function calculator()
-    {
-        return $this->calculator;
-    }
-
-
-
-    /**
-     * Convert's a standard unit amount into the subunits of the currency
-     *
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a value amount of 12.50
-     * @return integer                 in the currency's subunit
-     * @throws InvalidDataTypeException
-     */
-    private function parseAmount($amount)
-    {
-        if (! in_array(gettype($amount), array('integer', 'double', 'string'), true)) {
-            throw new InvalidDataTypeException(
-                '$amount',
-                $amount,
-                'integer (or float or string)'
-            );
-        }
-        if ($this->currency->decimalMark() !== '.') {
-            // remove thousands separator and replace decimal place with standard decimal.
-            $amount = str_replace(
-                array(
-                    $this->currency->thousands(),
-                    $this->currency->decimalMark(),
-                ),
-                array(
-                    '',
-                    '.',
-                ),
-                $amount
-            );
-        }
-        // remove any non numeric values but leave the decimal
-        $amount = (float) preg_replace('/([^0-9\\.-])/', '', $amount);
-        // maybe convert the incoming  decimal amount to the currencies subunits
-        // ex: 12.5 for a currency with 100 subunits would become 1250
-        if ($this->currency()->subunits()) {
-            $amount *= $this->currency()->subunits();
-        }
-        // then shift the decimal position by the number of decimal places used internally
-        // so if our extra internal precision was 3, it would become 1250000
-        $amount *= pow(10, $this->precision());
-        // then round up the remaining value if there is still a fractional amount left
-        $amount = round($amount);
-        return (int)$amount;
-    }
-
-
-
-    /**
-     * adds or subtracts additional decimal places based on the value of the Money::EXTRA_PRECISION constant
-     *
-     * @param bool $adding_precision if true, will move the decimal to the right (increase amount)
-     *                               if false, will move the decimal to the left (decrease amount)
-     * @return integer
-     */
-    private function precision($adding_precision = true)
-    {
-        $sign = $adding_precision ? 1 : -1;
-        return Money::EXTRA_PRECISION * $sign;
-    }
-
-    /**
-     * Returns the money amount as an unformatted float
-     * @return float
-     */
-    public function floatAmount()
-    {
-        // shift the decimal position BACK by the number of decimal places used internally
-        // ex: if our extra internal precision was 3, then 1250000 would become 1250
-        $amount = $this->amount * pow(10, $this->precision(false));
-        // then maybe adjust for the currencies subunits
-        // ex: 1250 for a currency with 100 subunits would become 12.50
-        if ($this->currency()->subunits()) {
-            $amount /= $this->currency()->subunits();
-        }
-        // then shave off our extra internal precision using the number of decimal places for the currency
-        return $amount;
-    }
-
-
-
-    /**
-     * Returns the money amount as an unformatted string
-     * IF YOU REQUIRE A FORMATTED STRING, THEN USE Money::format()
-     * In the currency's standard units
-     *
-     * @return string
-     */
-    public function amount()
-    {
-        return (string) round($this->floatAmount(), $this->currency()->decimalPlaces());
-    }
-
-
-
-    /**
-     * Returns the money SUBUNITS amount as an INTEGER
-     *
-     * @return integer
-     */
-    public function amountInSubunits()
-    {
-        // shift the decimal position BACK by the number of decimal places used internally
-        // for extra internal precision, but NOT for the number of decimals used by the currency
-        // ex: if our extra internal precision was 3, then 1250000 would become 1250
-        // and even if the currency used 100 subunits, we would return 1250 and NOT 12.50
-        $amount = (string) $this->amount * pow(10, $this->precision(false));
-        // then shave off anything after the decimal
-        $amount = round($amount);
-        return (int) $amount;
-    }
-
-
-
-    /**
-     * Returns the Currency object for this money
-     *
-     * @return Currency
-     */
-    public function currency()
-    {
-        return $this->currency;
-    }
-
-
-
-    /**
-     * adds the supplied Money amount to this Money amount
-     * and returns a new Money object
-     *
-     * @param Money $other
-     * @return Money
-     * @throws InvalidArgumentException
-     */
-    public function add(Money $other)
-    {
-        $this->verifySameCurrency($other->currency());
-        return new Money(
-            $this->calculator()->add(
-                $this->amount(),
-                $other->amount()
-            ),
-            $this->currency(),
-            $this->calculator()
-        );
-    }
-
-
-
-    /**
-     * subtracts the supplied Money amount from this Money amount
-     * and returns a new Money object
-     *
-     * @param Money $other
-     * @return Money
-     * @throws InvalidArgumentException
-     */
-    public function subtract(Money $other)
-    {
-        $this->verifySameCurrency($other->currency());
-        return new Money(
-            $this->calculator()->subtract(
-                $this->amount(),
-                $other->amount()
-            ),
-            $this->currency(),
-            $this->calculator()
-        );
-    }
-
-
-    /**
-     * multiplies this Money amount by the supplied $multiplier
-     * and returns a new Money object
-     *
-     * @param float|int|string $multiplier
-     * @param int              $rounding_mode
-     * @return Money
-     * @throws InvalidDataTypeException
-     */
-    public function multiply($multiplier, $rounding_mode = Calculator::ROUND_HALF_UP)
-    {
-        return new Money(
-            $this->calculator()->multiply(
-                $this->amount(),
-                $multiplier,
-                $this->precision(),
-                $rounding_mode
-            ),
-            $this->currency(),
-            $this->calculator()
-        );
-    }
-
-
-    /**
-     * divides this Money amount by the supplied $divisor
-     * and returns a new Money object
-     *
-     * @param float|int|string $divisor
-     * @param int              $rounding_mode
-     * @return Money
-     * @throws InvalidDataTypeException
-     */
-    public function divide($divisor, $rounding_mode = Calculator::ROUND_HALF_UP)
-    {
-        return new Money(
-            $this->calculator()->divide(
-                $this->amount(),
-                $divisor,
-                $this->precision(),
-                $rounding_mode
-            ),
-            $this->currency(),
-            $this->calculator()
-        );
-    }
-
-
-
-    /**
-     * @param Currency $other_currency
-     * @throws InvalidArgumentException
-     */
-    public function verifySameCurrency(Currency $other_currency)
-    {
-        if ($this->currency()->equals($other_currency) !== true) {
-            throw new InvalidArgumentException(
-                esc_html__(
-                    'Currencies must be the same in order to add or subtract their values.',
-                    'event_espresso'
-                )
-            );
-        }
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->amount();
-    }
+	/**
+	 * number of decimal places to be added to currencies for internal computations,
+	 * but removed before any output or formatting is applied.
+	 * This allows us to avoid rounding errors during calculations.
+	 */
+	const EXTRA_PRECISION = 3;
+
+	/**
+	 * @var int $amount
+	 */
+	private $amount;
+
+	/**
+	 * @var Currency $currency
+	 */
+	private $currency;
+
+	/**
+	 * @var Calculator $calculator
+	 */
+	protected $calculator;
+
+
+
+	/**
+	 * Money constructor.
+	 *
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a value amount of 12.50
+	 * @param Currency         $currency
+	 * @param Calculator       $calculator
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct($amount, Currency $currency, Calculator $calculator)
+	{
+		$this->currency   = $currency;
+		$this->amount     = $this->parseAmount($amount);
+		$this->calculator = $calculator;
+	}
+
+
+
+	/**
+	 * @return Calculator
+	 */
+	protected function calculator()
+	{
+		return $this->calculator;
+	}
+
+
+
+	/**
+	 * Convert's a standard unit amount into the subunits of the currency
+	 *
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a value amount of 12.50
+	 * @return integer                 in the currency's subunit
+	 * @throws InvalidDataTypeException
+	 */
+	private function parseAmount($amount)
+	{
+		if (! in_array(gettype($amount), array('integer', 'double', 'string'), true)) {
+			throw new InvalidDataTypeException(
+				'$amount',
+				$amount,
+				'integer (or float or string)'
+			);
+		}
+		if ($this->currency->decimalMark() !== '.') {
+			// remove thousands separator and replace decimal place with standard decimal.
+			$amount = str_replace(
+				array(
+					$this->currency->thousands(),
+					$this->currency->decimalMark(),
+				),
+				array(
+					'',
+					'.',
+				),
+				$amount
+			);
+		}
+		// remove any non numeric values but leave the decimal
+		$amount = (float) preg_replace('/([^0-9\\.-])/', '', $amount);
+		// maybe convert the incoming  decimal amount to the currencies subunits
+		// ex: 12.5 for a currency with 100 subunits would become 1250
+		if ($this->currency()->subunits()) {
+			$amount *= $this->currency()->subunits();
+		}
+		// then shift the decimal position by the number of decimal places used internally
+		// so if our extra internal precision was 3, it would become 1250000
+		$amount *= pow(10, $this->precision());
+		// then round up the remaining value if there is still a fractional amount left
+		$amount = round($amount);
+		return (int)$amount;
+	}
+
+
+
+	/**
+	 * adds or subtracts additional decimal places based on the value of the Money::EXTRA_PRECISION constant
+	 *
+	 * @param bool $adding_precision if true, will move the decimal to the right (increase amount)
+	 *                               if false, will move the decimal to the left (decrease amount)
+	 * @return integer
+	 */
+	private function precision($adding_precision = true)
+	{
+		$sign = $adding_precision ? 1 : -1;
+		return Money::EXTRA_PRECISION * $sign;
+	}
+
+	/**
+	 * Returns the money amount as an unformatted float
+	 * @return float
+	 */
+	public function floatAmount()
+	{
+		// shift the decimal position BACK by the number of decimal places used internally
+		// ex: if our extra internal precision was 3, then 1250000 would become 1250
+		$amount = $this->amount * pow(10, $this->precision(false));
+		// then maybe adjust for the currencies subunits
+		// ex: 1250 for a currency with 100 subunits would become 12.50
+		if ($this->currency()->subunits()) {
+			$amount /= $this->currency()->subunits();
+		}
+		// then shave off our extra internal precision using the number of decimal places for the currency
+		return $amount;
+	}
+
+
+
+	/**
+	 * Returns the money amount as an unformatted string
+	 * IF YOU REQUIRE A FORMATTED STRING, THEN USE Money::format()
+	 * In the currency's standard units
+	 *
+	 * @return string
+	 */
+	public function amount()
+	{
+		return (string) round($this->floatAmount(), $this->currency()->decimalPlaces());
+	}
+
+
+
+	/**
+	 * Returns the money SUBUNITS amount as an INTEGER
+	 *
+	 * @return integer
+	 */
+	public function amountInSubunits()
+	{
+		// shift the decimal position BACK by the number of decimal places used internally
+		// for extra internal precision, but NOT for the number of decimals used by the currency
+		// ex: if our extra internal precision was 3, then 1250000 would become 1250
+		// and even if the currency used 100 subunits, we would return 1250 and NOT 12.50
+		$amount = (string) $this->amount * pow(10, $this->precision(false));
+		// then shave off anything after the decimal
+		$amount = round($amount);
+		return (int) $amount;
+	}
+
+
+
+	/**
+	 * Returns the Currency object for this money
+	 *
+	 * @return Currency
+	 */
+	public function currency()
+	{
+		return $this->currency;
+	}
+
+
+
+	/**
+	 * adds the supplied Money amount to this Money amount
+	 * and returns a new Money object
+	 *
+	 * @param Money $other
+	 * @return Money
+	 * @throws InvalidArgumentException
+	 */
+	public function add(Money $other)
+	{
+		$this->verifySameCurrency($other->currency());
+		return new Money(
+			$this->calculator()->add(
+				$this->amount(),
+				$other->amount()
+			),
+			$this->currency(),
+			$this->calculator()
+		);
+	}
+
+
+
+	/**
+	 * subtracts the supplied Money amount from this Money amount
+	 * and returns a new Money object
+	 *
+	 * @param Money $other
+	 * @return Money
+	 * @throws InvalidArgumentException
+	 */
+	public function subtract(Money $other)
+	{
+		$this->verifySameCurrency($other->currency());
+		return new Money(
+			$this->calculator()->subtract(
+				$this->amount(),
+				$other->amount()
+			),
+			$this->currency(),
+			$this->calculator()
+		);
+	}
+
+
+	/**
+	 * multiplies this Money amount by the supplied $multiplier
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $multiplier
+	 * @param int              $rounding_mode
+	 * @return Money
+	 * @throws InvalidDataTypeException
+	 */
+	public function multiply($multiplier, $rounding_mode = Calculator::ROUND_HALF_UP)
+	{
+		return new Money(
+			$this->calculator()->multiply(
+				$this->amount(),
+				$multiplier,
+				$this->precision(),
+				$rounding_mode
+			),
+			$this->currency(),
+			$this->calculator()
+		);
+	}
+
+
+	/**
+	 * divides this Money amount by the supplied $divisor
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $divisor
+	 * @param int              $rounding_mode
+	 * @return Money
+	 * @throws InvalidDataTypeException
+	 */
+	public function divide($divisor, $rounding_mode = Calculator::ROUND_HALF_UP)
+	{
+		return new Money(
+			$this->calculator()->divide(
+				$this->amount(),
+				$divisor,
+				$this->precision(),
+				$rounding_mode
+			),
+			$this->currency(),
+			$this->calculator()
+		);
+	}
+
+
+
+	/**
+	 * @param Currency $other_currency
+	 * @throws InvalidArgumentException
+	 */
+	public function verifySameCurrency(Currency $other_currency)
+	{
+		if ($this->currency()->equals($other_currency) !== true) {
+			throw new InvalidArgumentException(
+				esc_html__(
+					'Currencies must be the same in order to add or subtract their values.',
+					'event_espresso'
+				)
+			);
+		}
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->amount();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
      */
     private function parseAmount($amount)
     {
-        if (! in_array(gettype($amount), array('integer', 'double', 'string'), true)) {
+        if ( ! in_array(gettype($amount), array('integer', 'double', 'string'), true)) {
             throw new InvalidDataTypeException(
                 '$amount',
                 $amount,
@@ -116,7 +116,7 @@ 
         $amount *= pow(10, $this->precision());
         // then round up the remaining value if there is still a fractional amount left
         $amount = round($amount);
-        return (int)$amount;
+        return (int) $amount;
     }
 
 

core/domain/values/currency/Currency.php

Indentation +216 added lines, -216 removed lines

@@ -19,227 +19,227 @@
 class Currency
 {
 
-    /**
-     * eg 'US'
-     *
-     * @var string $code
-     */
-    private $code;
-
-    /**
-     * @var Label $label
-     */
-    private $label;
-
-    /**
-     * currency sign
-     *
-     * @var string $sign
-     * eg '$'
-     */
-    private $sign;
-
-    /**
-     * Whether the currency sign should come before the number or not
-     *
-     * @var boolean $sign_b4
-     */
-    private $sign_b4;
-
-    /**
-     * How many digits should come after the decimal place
-     * Although not theoretically true, it can effectively
-     * be considered that all currencies are decimal based.
-     * Therefore the number of decimal places can be used
-     * to calculate number of subunits like so:
-     *  subunits = pow( 10, decimal places  )
-     *
-     * @var int $decimal_places
-     */
-    private $decimal_places;
-
-    /**
-     * Symbol to use for decimal mark
-     *
-     * @var string $decimal_mark
-     * eg '.'
-     */
-    private $decimal_mark;
-
-    /**
-     * Symbol to use for thousands
-     *
-     * @var string $thousands
-     * eg ','
-     */
-    private $thousands;
-
-    /**
-     * The number of fractional divisions of a currency's main unit
-     * Can be used to determine the number of decimal places used.
-     * Because
-     *  subunits = pow( 10, decimal places )
-     * then
-     *  decimal places = log( subunits )
-     * except that a result of 1 means there are zero decimal places
-     *
-     * @var int
-     */
-    private $subunits;
-
-
-
-    /**
-     * Currency constructor.
-     *
-     * @param string $code
-     * @param Label  $label
-     * @param string $sign
-     * @param bool   $sign_b4
-     * @param int    $decimal_places the number of decimal places to use when DISPLAYING the currency
-     * @param string $decimal_mark
-     * @param string $thousands
-     * @param int    $subunits number of fractional divisions of a currency's main unit
-     */
-    public function __construct(
-        $code,
-        Label $label,
-        $sign,
-        $sign_b4,
-        $decimal_places,
-        $decimal_mark,
-        $thousands,
-        $subunits
-    ) {
-        $this->code           = $code;
-        $this->label          = $label;
-        $this->sign           = $sign;
-        $this->sign_b4        = $sign_b4;
-        $this->decimal_places = $decimal_places;
-        $this->decimal_mark   = $decimal_mark;
-        $this->thousands      = $thousands;
-        $this->subunits       = $subunits;
-    }
-
-
-
-    /**
-     * returns true if this currency is the same as the supplied currency
-     *
-     * @param Currency $other
-     * @return bool
-     */
-    public function equals(Currency $other)
-    {
-        return $this->code() === $other->code();
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function code()
-    {
-        return $this->code;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function name()
-    {
-        return $this->label->singular();
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function plural()
-    {
-        return $this->label->plural();
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function sign()
-    {
-        return $this->sign;
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function signB4()
-    {
-        return $this->sign_b4;
-    }
-
-
-
-    /**
-     * @return int
-     */
-    public function decimalPlaces()
-    {
-        return $this->decimal_places;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function decimalMark()
-    {
-        return $this->decimal_mark;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function thousands()
-    {
-        return $this->thousands;
-    }
+	/**
+	 * eg 'US'
+	 *
+	 * @var string $code
+	 */
+	private $code;
+
+	/**
+	 * @var Label $label
+	 */
+	private $label;
+
+	/**
+	 * currency sign
+	 *
+	 * @var string $sign
+	 * eg '$'
+	 */
+	private $sign;
+
+	/**
+	 * Whether the currency sign should come before the number or not
+	 *
+	 * @var boolean $sign_b4
+	 */
+	private $sign_b4;
+
+	/**
+	 * How many digits should come after the decimal place
+	 * Although not theoretically true, it can effectively
+	 * be considered that all currencies are decimal based.
+	 * Therefore the number of decimal places can be used
+	 * to calculate number of subunits like so:
+	 *  subunits = pow( 10, decimal places  )
+	 *
+	 * @var int $decimal_places
+	 */
+	private $decimal_places;
+
+	/**
+	 * Symbol to use for decimal mark
+	 *
+	 * @var string $decimal_mark
+	 * eg '.'
+	 */
+	private $decimal_mark;
+
+	/**
+	 * Symbol to use for thousands
+	 *
+	 * @var string $thousands
+	 * eg ','
+	 */
+	private $thousands;
+
+	/**
+	 * The number of fractional divisions of a currency's main unit
+	 * Can be used to determine the number of decimal places used.
+	 * Because
+	 *  subunits = pow( 10, decimal places )
+	 * then
+	 *  decimal places = log( subunits )
+	 * except that a result of 1 means there are zero decimal places
+	 *
+	 * @var int
+	 */
+	private $subunits;
+
+
+
+	/**
+	 * Currency constructor.
+	 *
+	 * @param string $code
+	 * @param Label  $label
+	 * @param string $sign
+	 * @param bool   $sign_b4
+	 * @param int    $decimal_places the number of decimal places to use when DISPLAYING the currency
+	 * @param string $decimal_mark
+	 * @param string $thousands
+	 * @param int    $subunits number of fractional divisions of a currency's main unit
+	 */
+	public function __construct(
+		$code,
+		Label $label,
+		$sign,
+		$sign_b4,
+		$decimal_places,
+		$decimal_mark,
+		$thousands,
+		$subunits
+	) {
+		$this->code           = $code;
+		$this->label          = $label;
+		$this->sign           = $sign;
+		$this->sign_b4        = $sign_b4;
+		$this->decimal_places = $decimal_places;
+		$this->decimal_mark   = $decimal_mark;
+		$this->thousands      = $thousands;
+		$this->subunits       = $subunits;
+	}
+
+
+
+	/**
+	 * returns true if this currency is the same as the supplied currency
+	 *
+	 * @param Currency $other
+	 * @return bool
+	 */
+	public function equals(Currency $other)
+	{
+		return $this->code() === $other->code();
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function code()
+	{
+		return $this->code;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function name()
+	{
+		return $this->label->singular();
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function plural()
+	{
+		return $this->label->plural();
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function sign()
+	{
+		return $this->sign;
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function signB4()
+	{
+		return $this->sign_b4;
+	}
+
+
+
+	/**
+	 * @return int
+	 */
+	public function decimalPlaces()
+	{
+		return $this->decimal_places;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function decimalMark()
+	{
+		return $this->decimal_mark;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function thousands()
+	{
+		return $this->thousands;
+	}
 
 
-    /**
-     * The number of divisions of the currency's main unit that comprises the smallest units
-     * ex: 1 US Dollar has 100 Pennies, so USD subunits = 100
-     * **WARNING**
-     * Some currencies, such as the Japanese Yen have no subunits,
-     * ie: the main unit is the smallest division
-     * so you need to always check that subunits is not zero
-     * before performing multiplication or division with it
-     *
-     * @return int
-     */
-    public function subunits()
-    {
-        return $this->subunits;
-    }
+	/**
+	 * The number of divisions of the currency's main unit that comprises the smallest units
+	 * ex: 1 US Dollar has 100 Pennies, so USD subunits = 100
+	 * **WARNING**
+	 * Some currencies, such as the Japanese Yen have no subunits,
+	 * ie: the main unit is the smallest division
+	 * so you need to always check that subunits is not zero
+	 * before performing multiplication or division with it
+	 *
+	 * @return int
+	 */
+	public function subunits()
+	{
+		return $this->subunits;
+	}
 
 
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->code();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->code();
+	}
 
 
 

core/services/currency/MoneyFactory.php

Spacing +1 added lines, -1 removed lines

@@ -186,7 +186,7 @@
             )
         );
         foreach ($calculators as $calculator) {
-            if (! class_exists($calculator)) {
+            if ( ! class_exists($calculator)) {
                 continue;
             }
             $calculator = new $calculator();

Indentation +157 added lines, -157 removed lines

@@ -24,163 +24,163 @@
 class MoneyFactory
 {
 
-    /**
-     * @var CurrencyFactory $currency_factory
-     */
-    protected $currency_factory;
-
-    /**
-     * @var Calculator $calculator
-     */
-    protected $calculator;
-
-
-    /**
-     * CreateMoney constructor.
-     *
-     * @param CurrencyFactory  $currency_factory
-     * @param Calculator       $calculator
-     */
-    public function __construct(
-        CurrencyFactory $currency_factory,
-        Calculator $calculator = null
-    ) {
-        $this->calculator = $calculator;
-        $this->currency_factory = $currency_factory;
-    }
-
-
-    /**
-     * factory method that returns a Money object using amount specified in the currency's subunits
-     * example: for $12.50 USD use CreateMoney::fromSubUnits(1250, 'USD')
-     *
-     * @param int    $subunits_amount money amount IN THE SUBUNITS FOR THE CURRENCY ie: cents
-     *                                example: $12.50 USD would equate to a subunits amount of 1250
-     * @param string $currency_code
-     * @return Money
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     */
-    public function createFromSubUnits($subunits_amount, $currency_code = '')
-    {
-        $currency = $this->currency_factory->createFromCode($currency_code);
-        return new Money(
-            // shift decimal BACK by number of places for currency
-            $subunits_amount * pow(10, $currency->decimalPlaces() * -1),
-            $currency,
-            $this->calculator()
-        );
-    }
-
-
-
-    /**
-     * factory method that returns a Money object using the currency corresponding to the site's country
-     * example: CreateMoney::forSite(12.5)
-     *
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a standard amount of 12.50
-     * @return Money
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     */
-    public function createForSite($amount)
-    {
-        return new Money(
-            $amount,
-            $this->currency_factory->createFromCountryCode(),
-            $this->calculator()
-        );
-    }
-
-
-
-    /**
-     * factory method that returns a Money object using the currency as specified by the supplied ISO country code
-     * example: CreateMoney::forCountry(12.5,'US')
-     *
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a value amount of 12.50
-     * @param string           $CNT_ISO
-     * @return Money
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     */
-    public function createForCountry($amount, $CNT_ISO)
-    {
-        return new Money(
-            $amount,
-            $this->currency_factory->createFromCountryCode($CNT_ISO),
-            $this->calculator()
-        );
-    }
-
-
-
-    /**
-     * factory method that returns a Money object using the currency as specified by the supplied currency code
-     * example: CreateMoney::forCurrency(12.5, 'USD')
-     *
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a value amount of 12.50
-     * @param string           $currency_code
-     * @return Money
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     */
-    public function createForCurrency($amount, $currency_code)
-    {
-        return new Money(
-            $amount,
-            $this->currency_factory->createFromCode($currency_code),
-            $this->calculator()
-        );
-    }
-
-
-
-
-    /**
-     * @return Calculator
-     */
-    public function calculator()
-    {
-        $this->initializeCalculators();
-        return $this->calculator;
-    }
-
-
-
-    /**
-     * loops through a filterable array of Calculator services
-     * and selects the first one that is supported by the current server
-     */
-    protected function initializeCalculators()
-    {
-        if ($this->calculator instanceof Calculator) {
-            return;
-        }
-        $calculators = apply_filters(
-            'FHEE__EventEspresso_core_services_currency_MoneyFactory__initializeCalculators__Calculators_array',
-            array(
-                'EventEspresso\core\services\currency\DefaultCalculator',
-            )
-        );
-        foreach ($calculators as $calculator) {
-            if (! class_exists($calculator)) {
-                continue;
-            }
-            $calculator = new $calculator();
-            if ($calculator instanceof Calculator && $calculator->isSupported()) {
-                $this->calculator = $calculator;
-                break;
-            }
-        }
-    }
+	/**
+	 * @var CurrencyFactory $currency_factory
+	 */
+	protected $currency_factory;
+
+	/**
+	 * @var Calculator $calculator
+	 */
+	protected $calculator;
+
+
+	/**
+	 * CreateMoney constructor.
+	 *
+	 * @param CurrencyFactory  $currency_factory
+	 * @param Calculator       $calculator
+	 */
+	public function __construct(
+		CurrencyFactory $currency_factory,
+		Calculator $calculator = null
+	) {
+		$this->calculator = $calculator;
+		$this->currency_factory = $currency_factory;
+	}
+
+
+	/**
+	 * factory method that returns a Money object using amount specified in the currency's subunits
+	 * example: for $12.50 USD use CreateMoney::fromSubUnits(1250, 'USD')
+	 *
+	 * @param int    $subunits_amount money amount IN THE SUBUNITS FOR THE CURRENCY ie: cents
+	 *                                example: $12.50 USD would equate to a subunits amount of 1250
+	 * @param string $currency_code
+	 * @return Money
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 */
+	public function createFromSubUnits($subunits_amount, $currency_code = '')
+	{
+		$currency = $this->currency_factory->createFromCode($currency_code);
+		return new Money(
+			// shift decimal BACK by number of places for currency
+			$subunits_amount * pow(10, $currency->decimalPlaces() * -1),
+			$currency,
+			$this->calculator()
+		);
+	}
+
+
+
+	/**
+	 * factory method that returns a Money object using the currency corresponding to the site's country
+	 * example: CreateMoney::forSite(12.5)
+	 *
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a standard amount of 12.50
+	 * @return Money
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 */
+	public function createForSite($amount)
+	{
+		return new Money(
+			$amount,
+			$this->currency_factory->createFromCountryCode(),
+			$this->calculator()
+		);
+	}
+
+
+
+	/**
+	 * factory method that returns a Money object using the currency as specified by the supplied ISO country code
+	 * example: CreateMoney::forCountry(12.5,'US')
+	 *
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a value amount of 12.50
+	 * @param string           $CNT_ISO
+	 * @return Money
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 */
+	public function createForCountry($amount, $CNT_ISO)
+	{
+		return new Money(
+			$amount,
+			$this->currency_factory->createFromCountryCode($CNT_ISO),
+			$this->calculator()
+		);
+	}
+
+
+
+	/**
+	 * factory method that returns a Money object using the currency as specified by the supplied currency code
+	 * example: CreateMoney::forCurrency(12.5, 'USD')
+	 *
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a value amount of 12.50
+	 * @param string           $currency_code
+	 * @return Money
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 */
+	public function createForCurrency($amount, $currency_code)
+	{
+		return new Money(
+			$amount,
+			$this->currency_factory->createFromCode($currency_code),
+			$this->calculator()
+		);
+	}
+
+
+
+
+	/**
+	 * @return Calculator
+	 */
+	public function calculator()
+	{
+		$this->initializeCalculators();
+		return $this->calculator;
+	}
+
+
+
+	/**
+	 * loops through a filterable array of Calculator services
+	 * and selects the first one that is supported by the current server
+	 */
+	protected function initializeCalculators()
+	{
+		if ($this->calculator instanceof Calculator) {
+			return;
+		}
+		$calculators = apply_filters(
+			'FHEE__EventEspresso_core_services_currency_MoneyFactory__initializeCalculators__Calculators_array',
+			array(
+				'EventEspresso\core\services\currency\DefaultCalculator',
+			)
+		);
+		foreach ($calculators as $calculator) {
+			if (! class_exists($calculator)) {
+				continue;
+			}
+			$calculator = new $calculator();
+			if ($calculator instanceof Calculator && $calculator->isSupported()) {
+				$this->calculator = $calculator;
+				break;
+			}
+		}
+	}
 
 
 }

core/libraries/payment_methods/EE_PMT_Base.lib.php

Indentation +718 added lines, -718 removed lines

@@ -21,724 +21,724 @@
 abstract class EE_PMT_Base
 {
 
-    const onsite = 'on-site';
-    const offsite = 'off-site';
-    const offline = 'off-line';
-
-    /**
-     * @var EE_Payment_Method
-     */
-    protected $_pm_instance = NULL;
-
-    /**
-     * @var boolean
-     */
-    protected $_requires_https = FALSE;
-
-    /**
-     * @var boolean
-     */
-    protected $_has_billing_form;
-
-    /**
-     * @var EE_Gateway
-     */
-    protected $_gateway = NULL;
-
-    /**
-     * @var EE_Payment_Method_Form
-     */
-    protected $_settings_form = NULL;
-
-    /**
-     * @var EE_Form_Section_Proper
-     */
-    protected $_billing_form = NULL;
-
-    /**
-     * @var boolean
-     */
-    protected $_cache_billing_form = TRUE;
-
-    /**
-     * String of the absolute path to the folder containing this file, with a trailing slash.
-     * eg '/public_html/wp-site/wp-content/plugins/event-espresso/payment_methods/Invoice/'
-     * @var string
-     */
-    protected $_file_folder = NULL;
-
-    /**
-     * String to the absolute URL to this file (useful for getting its web-accessible resources
-     * like images, js, or css)
-     * @var string
-     */
-    protected $_file_url = NULL;
-
-    /**
-     * Pretty name for the payment method
-     * @var string
-     */
-    protected $_pretty_name = NULL;
-
-    /**
-     *
-     * @var string
-     */
-    protected $_default_button_url = NULL;
-
-    /**
-     *
-     * @var string
-     */
-    protected $_default_description = NULL;
-
-
-    /**
-     *
-     * @param EE_Payment_Method $pm_instance
-     * @throws EE_Error
-     * @return EE_PMT_Base
-     */
-    function __construct($pm_instance = NULL)
-    {
-        if ($pm_instance instanceof EE_Payment_Method) {
-            $this->set_instance($pm_instance);
-        }
-        if ($this->_gateway) {
-            $this->_gateway->set_payment_model(EEM_Payment::instance());
-            $this->_gateway->set_payment_log(EEM_Change_Log::instance());
-            $this->_gateway->set_template_helper(new EEH_Template());
-            $this->_gateway->set_line_item_helper(new EEH_Line_Item());
-            $this->_gateway->set_money_helper(new EEH_Money());
-            $this->_gateway->set_gateway_data_formatter(new GatewayDataFormatter());
-            $this->_gateway->set_unsupported_character_remover(new AsciiOnly());
-            do_action('AHEE__EE_PMT_Base___construct__done_initializing_gateway_class', $this, $this->_gateway);
-        }
-        if (!isset($this->_has_billing_form)) {
-            // by default, On Site gateways have a billing form
-            if ($this->payment_occurs() == EE_PMT_Base::onsite) {
-                $this->set_has_billing_form(true);
-            } else {
-                $this->set_has_billing_form(false);
-            }
-        }
-
-        if (!$this->_pretty_name) {
-            throw new EE_Error(sprintf(__("You must set the pretty name for the Payment Method Type in the constructor (_pretty_name), and please make it internationalized", "event_espresso")));
-        }
-        //if the child didn't specify a default button, use the credit card one
-        if ($this->_default_button_url === NULL) {
-            $this->_default_button_url = EE_PLUGIN_DIR_URL . 'payment_methods' . DS . 'pay-by-credit-card.png';
-        }
-    }
-
-
-    /**
-     * @param boolean $has_billing_form
-     */
-    public function set_has_billing_form($has_billing_form)
-    {
-        $this->_has_billing_form = filter_var($has_billing_form, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * sets the file_folder property
-     */
-    protected function _set_file_folder()
-    {
-        $reflector = new ReflectionClass(get_class($this));
-        $fn = $reflector->getFileName();
-        $this->_file_folder = dirname($fn) . DS;
-    }
-
-
-    /**
-     * sets the file URL with a trailing slash for this PMT
-     */
-    protected function _set_file_url()
-    {
-        $plugins_dir_fixed = str_replace('\\', DS, WP_PLUGIN_DIR);
-        $file_folder_fixed = str_replace('\\', DS, $this->file_folder());
-        $file_path = str_replace($plugins_dir_fixed, WP_PLUGIN_URL, $file_folder_fixed);
-        $this->_file_url = $file_path;
-    }
-
-    /**
-     * Gets the default description on all payment methods of this type
-     * @return string
-     */
-    public function default_description()
-    {
-        return $this->_default_description;
-    }
-
-
-    /**
-     * Returns the folder containing the PMT child class, with a trailing slash
-     * @return string
-     */
-    public function file_folder()
-    {
-        if (!$this->_file_folder) {
-            $this->_set_file_folder();
-        }
-        return $this->_file_folder;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function file_url()
-    {
-        if (!$this->_file_url) {
-            $this->_set_file_url();
-        }
-        return $this->_file_url;
-    }
-
-
-    /**
-     * Sets the payment method instance this payment method type is for.
-     * Its important teh payment method instance is set before
-     * @param EE_Payment_Method $payment_method_instance
-     */
-    function set_instance($payment_method_instance)
-    {
-        $this->_pm_instance = $payment_method_instance;
-        //if they have already requested the settings form, make sure its
-        //data matches this model object
-        if ($this->_settings_form) {
-            $this->settings_form()->populate_model_obj($payment_method_instance);
-        }
-        if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
-            $this->_gateway->set_settings($payment_method_instance->settings_array());
-        }
-    }
-
-
-    /**
-     * Gets teh form for displaying to admins where they setup the payment method
-     * @return EE_Payment_Method_Form
-     */
-    function settings_form()
-    {
-        if (!$this->_settings_form) {
-            $this->_settings_form = $this->generate_new_settings_form();
-            $this->_settings_form->set_payment_method_type($this);
-            //if we have already assigned a model object to this pmt, make
-            //sure its reflected in teh form we just generated
-            if ($this->_pm_instance) {
-                $this->_settings_form->populate_model_obj($this->_pm_instance);
-            }
-        }
-        return $this->_settings_form;
-    }
-
-
-    /**
-     * Gets the form for all the settings related to this payment method type
-     * @return EE_Payment_Method_Form
-     */
-    abstract function generate_new_settings_form();
-
-
-    /**
-     * Sets the form for settings. This may be useful if we have already received
-     * a form submission and have form data it in, and want to use it anytime we're showing
-     * this payment method type's settings form later in the request
-     * @param EE_Payment_Method_Form $form
-     */
-    public function set_settings_form($form)
-    {
-        $this->_settings_form = $form;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function has_billing_form()
-    {
-        return $this->_has_billing_form;
-    }
-
-
-    /**
-     * Gets the form for displaying to attendees where they can enter their billing info
-     * which will be sent to teh gateway (can be null)
-     *
-     * @param \EE_Transaction $transaction
-     * @param array $extra_args
-     * @return \EE_Billing_Attendee_Info_Form|\EE_Billing_Info_Form|null
-     */
-    public function billing_form(EE_Transaction $transaction = NULL, $extra_args = array())
-    {
-        // has billing form already been regenerated ? or overwrite cache?
-        if (!$this->_billing_form instanceof EE_Billing_Info_Form || !$this->_cache_billing_form) {
-            $this->_billing_form = $this->generate_new_billing_form($transaction, $extra_args);
-        }
-        //if we know who the attendee is, and this is a billing form
-        //that uses attendee info, populate it
-        if (
-        apply_filters(
-            'FHEE__populate_billing_form_fields_from_attendee',
-            (
-                $this->_billing_form instanceof EE_Billing_Attendee_Info_Form
-                && $transaction instanceof EE_Transaction
-                && $transaction->primary_registration() instanceof EE_Registration
-                && $transaction->primary_registration()->attendee() instanceof EE_Attendee
-            ),
-            $this->_billing_form,
-            $transaction
-        )
-        ) {
-            $this->_billing_form->populate_from_attendee($transaction->primary_registration()->attendee());
-        }
-        return $this->_billing_form;
-    }
-
-
-    /**
-     * Creates the billing form for this payment method type
-     * @param \EE_Transaction $transaction
-     * @return \EE_Billing_Info_Form
-     */
-    abstract function generate_new_billing_form(EE_Transaction $transaction = NULL);
-
-
-    /**
-     * apply_billing_form_debug_settings
-     * applies debug data to the form
-     *
-     * @param \EE_Billing_Info_Form $billing_form
-     * @return \EE_Billing_Info_Form
-     */
-    public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form)
-    {
-        return $billing_form;
-    }
-
-
-    /**
-     * Sets the billing form for this payment method type. You may want to use this
-     * if you have form
-     * @param EE_Payment_Method $form
-     */
-    public function set_billing_form($form)
-    {
-        $this->_billing_form = $form;
-    }
-
-
-    /**
-     * Returns whether or not this payment method requires HTTPS to be used
-     * @return boolean
-     */
-    function requires_https()
-    {
-        return $this->_requires_https;
-    }
-
-
-    /**
-     *
-     * @param EE_Transaction $transaction
-     * @param float $amount
-     * @param EE_Billing_Info_Form $billing_info
-     * @param string $return_url
-     * @param string $fail_url
-     * @param string $method
-     * @param bool $by_admin
-     * @return EE_Payment
-     * @throws EE_Error
-     */
-    function process_payment(EE_Transaction $transaction, $amount = null, $billing_info = null, $return_url = null, $fail_url = '', $method = 'CART', $by_admin = false)
-    {
-        // @todo: add surcharge for the payment method, if any
-        if ($this->_gateway) {
-            //there is a gateway, so we're going to make a payment object
-            //but wait! do they already have a payment in progress that we thought was failed?
-            $duplicate_properties = array(
-                'STS_ID' => EEM_Payment::status_id_failed,
-                'TXN_ID' => $transaction->ID(),
-                'PMD_ID' => $this->_pm_instance->ID(),
-                'PAY_source' => $method,
-                'PAY_amount' => $amount !== null ? $amount : $transaction->remaining(),
-                'PAY_gateway_response' => null,
-            );
-            $payment = EEM_Payment::instance()->get_one(array($duplicate_properties));
-            //if we didn't already have a payment in progress for the same thing,
-            //then we actually want to make a new payment
-            if (!$payment instanceof EE_Payment) {
-                $payment = EE_Payment::new_instance(
-                    array_merge(
-                        $duplicate_properties,
-                        array(
-                            'PAY_timestamp' => time(),
-                            'PAY_txn_id_chq_nmbr' => null,
-                            'PAY_po_number' => null,
-                            'PAY_extra_accntng' => null,
-                            'PAY_details' => null,
-                        )
-                    )
-                );
-            }
-            //make sure the payment has been saved to show we started it, and so it has an ID should the gateway try to log it
-            $payment->save();
-            $billing_values = $this->_get_billing_values_from_form($billing_info);
-
-            //  Offsite Gateway
-            if ($this->_gateway instanceof EE_Offsite_Gateway) {
-
-                $payment = $this->_gateway->set_redirection_info(
-                    $payment,
-                    $billing_values,
-                    $return_url,
-                    EE_Config::instance()->core->txn_page_url(
-                        array(
-                            'e_reg_url_link' => $transaction->primary_registration()->reg_url_link(),
-                            'ee_payment_method' => $this->_pm_instance->slug()
-                        )
-                    ),
-                    $fail_url
-                );
-                $payment->save();
-                //  Onsite Gateway
-            } elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
-
-                $payment = $this->_gateway->do_direct_payment($payment, $billing_values);
-                $payment->save();
-
-            } else {
-                throw new EE_Error(
-                    sprintf(
-                        __('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or null (to indicate NO gateway)', 'event_espresso'),
-                        get_class($this),
-                        gettype($this->_gateway)
-                    )
-                );
-            }
-
-        } else {
-            // no gateway provided
-            // there is no payment. Must be an offline gateway
-            // create a payment object anyways, but dont save it
-            $payment = EE_Payment::new_instance(
-                array(
-                    'STS_ID' => EEM_Payment::status_id_pending,
-                    'TXN_ID' => $transaction->ID(),
-                    'PMD_ID' => $transaction->payment_method_ID(),
-                    'PAY_amount' => 0.00,
-                    'PAY_timestamp' => time(),
-                )
-            );
-
-        }
-
-        // if there is billing info, clean it and save it now
-        if ($billing_info instanceof EE_Billing_Attendee_Info_Form) {
-            $this->_save_billing_info_to_attendee($billing_info, $transaction);
-        }
-
-        return $payment;
-    }
-
-    /**
-     * Gets the values we want to pass onto the gateway. Normally these
-     * are just the 'pretty' values, but there may be times the data may need
-     * a  little massaging. Proper subsections will become arrays of inputs
-     * @param EE_Billing_Info_Form $billing_form
-     * @return array
-     */
-    protected function _get_billing_values_from_form($billing_form)
-    {
-        if ($billing_form instanceof EE_Form_Section_Proper) {
-            return $billing_form->input_pretty_values(true);
-        } else {
-            return NULL;
-        }
-    }
-
-
-    /**
-     * Handles an instant payment notification when the transaction is known (by default).
-     * @param array $req_data
-     * @param EE_Transaction $transaction
-     * @return EE_Payment
-     * @throws EE_Error
-     */
-    public function handle_ipn($req_data, $transaction)
-    {
-        $transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
-        if (!$this->_gateway instanceof EE_Offsite_Gateway) {
-            throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r($this->_gateway, TRUE)));
-
-        }
-        $payment = $this->_gateway->handle_payment_update($req_data, $transaction);
-        return $payment;
-    }
-
-
-    /**
-     * Saves the billing info onto the attendee of the primary registrant on this transaction, and
-     * cleans it first.
-     * @param EE_Billing_Attendee_Info_Form $billing_form
-     * @param EE_Transaction $transaction
-     * @return boolean success
-     */
-    protected function _save_billing_info_to_attendee($billing_form, $transaction)
-    {
-        if (!$transaction || !$transaction instanceof EE_Transaction) {
-            EE_Error::add_error(__("Cannot save billing info because no transaction was specified", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        $primary_reg = $transaction->primary_registration();
-        if (!$primary_reg) {
-            EE_Error::add_error(__("Cannot save billing info because the transaction has no primary registration", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        $attendee = $primary_reg->attendee();
-        if (!$attendee) {
-            EE_Error::add_error(__("Cannot save billing info because the transaction's primary registration has no attendee!", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method());
-
-    }
-
-
-    /**
-     * Gets the payment this IPN is for. Children may often want to
-     * override this to inspect the request
-     * @param EE_Transaction $transaction
-     * @param array $req_data
-     * @return EE_Payment
-     */
-    protected function find_payment_for_ipn(EE_Transaction $transaction, $req_data = array())
-    {
-        return $transaction->last_payment();
-    }
-
-
-    /**
-     * In case generic code cannot provide the payment processor with a specific payment method
-     * and transaction, it will try calling this method on each activate payment method.
-     * If the payment method is able to identify the request as being for it, it should fetch
-     * the payment its for and return it. If not, it should throw an EE_Error to indicate it cannot
-     * handle the IPN
-     * @param array $req_data
-     * @return EE_Payment only if this payment method can find the info its needs from $req_data
-     * and identifies the IPN as being for this payment method (not just fo ra payment method of this type)
-     * @throws EE_Error
-     */
-    public function handle_unclaimed_ipn($req_data = array())
-    {
-        throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this)));
-    }
-
-
-    /**
-     * Logic to be accomplished when the payment attempt is complete.
-     * Most payment methods don't need to do anything at this point; but some, like Mijireh, do.
-     * (Mijireh is an offsite gateway which doesn't send an IPN. So when the user returns to EE from
-     * mijireh, this method needs to be called so the Mijireh PM can ping Mijireh to know the status
-     * of the payment). Fed a transaction because it's always assumed to be the last payment that
-     * we're dealing with. Returns that last payment (if there is one)
-     *
-     * @param EE_Transaction $transaction
-     * @return EE_Payment
-     */
-    public function finalize_payment_for($transaction)
-    {
-        return $transaction->last_payment();
-    }
-
-
-    /**
-     * Whether or not this payment method's gateway supports sending refund requests
-     * @return boolean
-     */
-    public function supports_sending_refunds()
-    {
-        if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
-            return $this->_gateway->supports_sending_refunds();
-        } else {
-            return false;
-        }
-    }
-
-
-    /**
-     *
-     * @param EE_Payment $payment
-     * @param array $refund_info
-     * @throws EE_Error
-     * @return EE_Payment
-     */
-    public function process_refund(EE_Payment $payment, $refund_info = array())
-    {
-        if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
-            return $this->_gateway->do_direct_refund($payment, $refund_info);
-        } else {
-            throw new EE_Error(
-                sprintf(
-                    __('Payment Method Type "%s" does not support sending refund requests', 'event_espresso'),
-                    get_class($this)
-                )
-            );
-        }
-    }
-
-
-    /**
-     * Returns one the class's constants onsite,offsite, or offline, depending on this
-     * payment method's gateway.
-     * @return string
-     * @throws EE_Error
-     */
-    public function payment_occurs()
-    {
-        if (!$this->_gateway) {
-            return EE_PMT_Base::offline;
-        } elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
-            return EE_PMT_Base::onsite;
-        } elseif ($this->_gateway instanceof EE_Offsite_Gateway) {
-            return EE_PMT_Base::offsite;
-        } else {
-            throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"), get_class($this)));
-        }
-    }
-
-
-    /**
-     * For adding any html output ab ove the payment overview.
-     * Many gateways won't want ot display anything, so this function just returns an empty string.
-     * Other gateways may want to override this, such as offline gateways.
-     * @param EE_Payment $payment
-     * @return string
-     */
-    public function payment_overview_content(EE_Payment $payment)
-    {
-        return EEH_Template::display_template(EE_LIBRARIES . 'payment_methods' . DS . 'templates' . DS . 'payment_details_content.template.php', array('payment_method' => $this->_pm_instance, 'payment' => $payment), true);
-    }
-
-
-    /**
-     * @return array where keys are the help tab name,
-     * values are: array {
-     * @type string $title i18n name for the help tab
-     * @type string $filename name of the file located in ./help_tabs/ (ie, in a folder next to this file)
-     * @type array $template_args any arguments you want passed to the template file while rendering.
-     *                Keys will be variable names and values with be their values.
-     */
-    public function help_tabs_config()
-    {
-        return array();
-    }
-
-
-    /**
-     * The system name for this PMT (eg AIM, Paypal_Pro, Invoice... what gets put into
-     * the payment method's table's PMT_type column)
-     * @return string
-     */
-    public function system_name()
-    {
-        $classname = get_class($this);
-        return str_replace("EE_PMT_", '', $classname);
-    }
-
-
-    /**
-     * A pretty i18n version of the PMT name
-     * @return string
-     */
-    public function pretty_name()
-    {
-        return $this->_pretty_name;
-    }
-
-
-    /**
-     * Gets the default absolute URL to the payment method type's button
-     * @return string
-     */
-    public function default_button_url()
-    {
-        return $this->_default_button_url;
-    }
-
-
-    /**
-     * Gets the gateway used by this payment method (if any)
-     * @return EE_Gateway
-     */
-    public function get_gateway()
-    {
-        return $this->_gateway;
-    }
-
-
-    /**
-     * @return string html for the link to a help tab
-     */
-    public function get_help_tab_link()
-    {
-        return EEH_Template::get_help_tab_link($this->get_help_tab_name());
-    }
-
-
-    /**
-     * Returns the name of the help tab for this PMT
-     * @return string
-     */
-    public function get_help_tab_name()
-    {
-        return 'ee_' . strtolower($this->system_name()) . '_help_tab';
-    }
-
-    /**
-     * The name of the wp capability that should be associated with the usage of
-     * this PMT by an admin
-     * @return string
-     */
-    public function cap_name()
-    {
-        return 'ee_payment_method_' . strtolower($this->system_name());
-    }
-
-    /**
-     * Called by client code to tell the gateway that if it wants to change
-     * the transaction or line items or registrations related to teh payment it already
-     * processed (we think, but possibly not) that now's the time to do it.
-     * It is expected that gateways will store any info they need for this on the PAY_details,
-     * or maybe an extra meta value
-     * @param EE_Payment $payment
-     * @return void
-     */
-    public function update_txn_based_on_payment($payment)
-    {
-        if ($this->_gateway instanceof EE_Gateway) {
-            $this->_gateway->update_txn_based_on_payment($payment);
-        }
-    }
-
-    /**
-     * Returns a string of HTML describing this payment method type for an admin,
-     * primarily intended for them to read before activating it.
-     * The easiest way to set this is to create a folder 'templates' alongside
-     * your EE_PMT_{System_Name} file, and in it create a file named "{system_name}_intro.template.php".
-     * Eg, if your payment method file is named "EE_PMT_Foo_Bar.pm.php",
-     * then you'd create a file named "templates" in the same folder as it, and name the file
-     * "foo_bar_intro.template.php", and its content will be returned by this method
-     * @return string
-     */
-    public function introductory_html()
-    {
-        return EEH_Template::locate_template($this->file_folder() . 'templates' . DS . strtolower($this->system_name()) . '_intro.template.php', array('pmt_obj' => $this, 'pm_instance' => $this->_pm_instance));
-    }
+	const onsite = 'on-site';
+	const offsite = 'off-site';
+	const offline = 'off-line';
+
+	/**
+	 * @var EE_Payment_Method
+	 */
+	protected $_pm_instance = NULL;
+
+	/**
+	 * @var boolean
+	 */
+	protected $_requires_https = FALSE;
+
+	/**
+	 * @var boolean
+	 */
+	protected $_has_billing_form;
+
+	/**
+	 * @var EE_Gateway
+	 */
+	protected $_gateway = NULL;
+
+	/**
+	 * @var EE_Payment_Method_Form
+	 */
+	protected $_settings_form = NULL;
+
+	/**
+	 * @var EE_Form_Section_Proper
+	 */
+	protected $_billing_form = NULL;
+
+	/**
+	 * @var boolean
+	 */
+	protected $_cache_billing_form = TRUE;
+
+	/**
+	 * String of the absolute path to the folder containing this file, with a trailing slash.
+	 * eg '/public_html/wp-site/wp-content/plugins/event-espresso/payment_methods/Invoice/'
+	 * @var string
+	 */
+	protected $_file_folder = NULL;
+
+	/**
+	 * String to the absolute URL to this file (useful for getting its web-accessible resources
+	 * like images, js, or css)
+	 * @var string
+	 */
+	protected $_file_url = NULL;
+
+	/**
+	 * Pretty name for the payment method
+	 * @var string
+	 */
+	protected $_pretty_name = NULL;
+
+	/**
+	 *
+	 * @var string
+	 */
+	protected $_default_button_url = NULL;
+
+	/**
+	 *
+	 * @var string
+	 */
+	protected $_default_description = NULL;
+
+
+	/**
+	 *
+	 * @param EE_Payment_Method $pm_instance
+	 * @throws EE_Error
+	 * @return EE_PMT_Base
+	 */
+	function __construct($pm_instance = NULL)
+	{
+		if ($pm_instance instanceof EE_Payment_Method) {
+			$this->set_instance($pm_instance);
+		}
+		if ($this->_gateway) {
+			$this->_gateway->set_payment_model(EEM_Payment::instance());
+			$this->_gateway->set_payment_log(EEM_Change_Log::instance());
+			$this->_gateway->set_template_helper(new EEH_Template());
+			$this->_gateway->set_line_item_helper(new EEH_Line_Item());
+			$this->_gateway->set_money_helper(new EEH_Money());
+			$this->_gateway->set_gateway_data_formatter(new GatewayDataFormatter());
+			$this->_gateway->set_unsupported_character_remover(new AsciiOnly());
+			do_action('AHEE__EE_PMT_Base___construct__done_initializing_gateway_class', $this, $this->_gateway);
+		}
+		if (!isset($this->_has_billing_form)) {
+			// by default, On Site gateways have a billing form
+			if ($this->payment_occurs() == EE_PMT_Base::onsite) {
+				$this->set_has_billing_form(true);
+			} else {
+				$this->set_has_billing_form(false);
+			}
+		}
+
+		if (!$this->_pretty_name) {
+			throw new EE_Error(sprintf(__("You must set the pretty name for the Payment Method Type in the constructor (_pretty_name), and please make it internationalized", "event_espresso")));
+		}
+		//if the child didn't specify a default button, use the credit card one
+		if ($this->_default_button_url === NULL) {
+			$this->_default_button_url = EE_PLUGIN_DIR_URL . 'payment_methods' . DS . 'pay-by-credit-card.png';
+		}
+	}
+
+
+	/**
+	 * @param boolean $has_billing_form
+	 */
+	public function set_has_billing_form($has_billing_form)
+	{
+		$this->_has_billing_form = filter_var($has_billing_form, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * sets the file_folder property
+	 */
+	protected function _set_file_folder()
+	{
+		$reflector = new ReflectionClass(get_class($this));
+		$fn = $reflector->getFileName();
+		$this->_file_folder = dirname($fn) . DS;
+	}
+
+
+	/**
+	 * sets the file URL with a trailing slash for this PMT
+	 */
+	protected function _set_file_url()
+	{
+		$plugins_dir_fixed = str_replace('\\', DS, WP_PLUGIN_DIR);
+		$file_folder_fixed = str_replace('\\', DS, $this->file_folder());
+		$file_path = str_replace($plugins_dir_fixed, WP_PLUGIN_URL, $file_folder_fixed);
+		$this->_file_url = $file_path;
+	}
+
+	/**
+	 * Gets the default description on all payment methods of this type
+	 * @return string
+	 */
+	public function default_description()
+	{
+		return $this->_default_description;
+	}
+
+
+	/**
+	 * Returns the folder containing the PMT child class, with a trailing slash
+	 * @return string
+	 */
+	public function file_folder()
+	{
+		if (!$this->_file_folder) {
+			$this->_set_file_folder();
+		}
+		return $this->_file_folder;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function file_url()
+	{
+		if (!$this->_file_url) {
+			$this->_set_file_url();
+		}
+		return $this->_file_url;
+	}
+
+
+	/**
+	 * Sets the payment method instance this payment method type is for.
+	 * Its important teh payment method instance is set before
+	 * @param EE_Payment_Method $payment_method_instance
+	 */
+	function set_instance($payment_method_instance)
+	{
+		$this->_pm_instance = $payment_method_instance;
+		//if they have already requested the settings form, make sure its
+		//data matches this model object
+		if ($this->_settings_form) {
+			$this->settings_form()->populate_model_obj($payment_method_instance);
+		}
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
+			$this->_gateway->set_settings($payment_method_instance->settings_array());
+		}
+	}
+
+
+	/**
+	 * Gets teh form for displaying to admins where they setup the payment method
+	 * @return EE_Payment_Method_Form
+	 */
+	function settings_form()
+	{
+		if (!$this->_settings_form) {
+			$this->_settings_form = $this->generate_new_settings_form();
+			$this->_settings_form->set_payment_method_type($this);
+			//if we have already assigned a model object to this pmt, make
+			//sure its reflected in teh form we just generated
+			if ($this->_pm_instance) {
+				$this->_settings_form->populate_model_obj($this->_pm_instance);
+			}
+		}
+		return $this->_settings_form;
+	}
+
+
+	/**
+	 * Gets the form for all the settings related to this payment method type
+	 * @return EE_Payment_Method_Form
+	 */
+	abstract function generate_new_settings_form();
+
+
+	/**
+	 * Sets the form for settings. This may be useful if we have already received
+	 * a form submission and have form data it in, and want to use it anytime we're showing
+	 * this payment method type's settings form later in the request
+	 * @param EE_Payment_Method_Form $form
+	 */
+	public function set_settings_form($form)
+	{
+		$this->_settings_form = $form;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function has_billing_form()
+	{
+		return $this->_has_billing_form;
+	}
+
+
+	/**
+	 * Gets the form for displaying to attendees where they can enter their billing info
+	 * which will be sent to teh gateway (can be null)
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @param array $extra_args
+	 * @return \EE_Billing_Attendee_Info_Form|\EE_Billing_Info_Form|null
+	 */
+	public function billing_form(EE_Transaction $transaction = NULL, $extra_args = array())
+	{
+		// has billing form already been regenerated ? or overwrite cache?
+		if (!$this->_billing_form instanceof EE_Billing_Info_Form || !$this->_cache_billing_form) {
+			$this->_billing_form = $this->generate_new_billing_form($transaction, $extra_args);
+		}
+		//if we know who the attendee is, and this is a billing form
+		//that uses attendee info, populate it
+		if (
+		apply_filters(
+			'FHEE__populate_billing_form_fields_from_attendee',
+			(
+				$this->_billing_form instanceof EE_Billing_Attendee_Info_Form
+				&& $transaction instanceof EE_Transaction
+				&& $transaction->primary_registration() instanceof EE_Registration
+				&& $transaction->primary_registration()->attendee() instanceof EE_Attendee
+			),
+			$this->_billing_form,
+			$transaction
+		)
+		) {
+			$this->_billing_form->populate_from_attendee($transaction->primary_registration()->attendee());
+		}
+		return $this->_billing_form;
+	}
+
+
+	/**
+	 * Creates the billing form for this payment method type
+	 * @param \EE_Transaction $transaction
+	 * @return \EE_Billing_Info_Form
+	 */
+	abstract function generate_new_billing_form(EE_Transaction $transaction = NULL);
+
+
+	/**
+	 * apply_billing_form_debug_settings
+	 * applies debug data to the form
+	 *
+	 * @param \EE_Billing_Info_Form $billing_form
+	 * @return \EE_Billing_Info_Form
+	 */
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form)
+	{
+		return $billing_form;
+	}
+
+
+	/**
+	 * Sets the billing form for this payment method type. You may want to use this
+	 * if you have form
+	 * @param EE_Payment_Method $form
+	 */
+	public function set_billing_form($form)
+	{
+		$this->_billing_form = $form;
+	}
+
+
+	/**
+	 * Returns whether or not this payment method requires HTTPS to be used
+	 * @return boolean
+	 */
+	function requires_https()
+	{
+		return $this->_requires_https;
+	}
+
+
+	/**
+	 *
+	 * @param EE_Transaction $transaction
+	 * @param float $amount
+	 * @param EE_Billing_Info_Form $billing_info
+	 * @param string $return_url
+	 * @param string $fail_url
+	 * @param string $method
+	 * @param bool $by_admin
+	 * @return EE_Payment
+	 * @throws EE_Error
+	 */
+	function process_payment(EE_Transaction $transaction, $amount = null, $billing_info = null, $return_url = null, $fail_url = '', $method = 'CART', $by_admin = false)
+	{
+		// @todo: add surcharge for the payment method, if any
+		if ($this->_gateway) {
+			//there is a gateway, so we're going to make a payment object
+			//but wait! do they already have a payment in progress that we thought was failed?
+			$duplicate_properties = array(
+				'STS_ID' => EEM_Payment::status_id_failed,
+				'TXN_ID' => $transaction->ID(),
+				'PMD_ID' => $this->_pm_instance->ID(),
+				'PAY_source' => $method,
+				'PAY_amount' => $amount !== null ? $amount : $transaction->remaining(),
+				'PAY_gateway_response' => null,
+			);
+			$payment = EEM_Payment::instance()->get_one(array($duplicate_properties));
+			//if we didn't already have a payment in progress for the same thing,
+			//then we actually want to make a new payment
+			if (!$payment instanceof EE_Payment) {
+				$payment = EE_Payment::new_instance(
+					array_merge(
+						$duplicate_properties,
+						array(
+							'PAY_timestamp' => time(),
+							'PAY_txn_id_chq_nmbr' => null,
+							'PAY_po_number' => null,
+							'PAY_extra_accntng' => null,
+							'PAY_details' => null,
+						)
+					)
+				);
+			}
+			//make sure the payment has been saved to show we started it, and so it has an ID should the gateway try to log it
+			$payment->save();
+			$billing_values = $this->_get_billing_values_from_form($billing_info);
+
+			//  Offsite Gateway
+			if ($this->_gateway instanceof EE_Offsite_Gateway) {
+
+				$payment = $this->_gateway->set_redirection_info(
+					$payment,
+					$billing_values,
+					$return_url,
+					EE_Config::instance()->core->txn_page_url(
+						array(
+							'e_reg_url_link' => $transaction->primary_registration()->reg_url_link(),
+							'ee_payment_method' => $this->_pm_instance->slug()
+						)
+					),
+					$fail_url
+				);
+				$payment->save();
+				//  Onsite Gateway
+			} elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
+
+				$payment = $this->_gateway->do_direct_payment($payment, $billing_values);
+				$payment->save();
+
+			} else {
+				throw new EE_Error(
+					sprintf(
+						__('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or null (to indicate NO gateway)', 'event_espresso'),
+						get_class($this),
+						gettype($this->_gateway)
+					)
+				);
+			}
+
+		} else {
+			// no gateway provided
+			// there is no payment. Must be an offline gateway
+			// create a payment object anyways, but dont save it
+			$payment = EE_Payment::new_instance(
+				array(
+					'STS_ID' => EEM_Payment::status_id_pending,
+					'TXN_ID' => $transaction->ID(),
+					'PMD_ID' => $transaction->payment_method_ID(),
+					'PAY_amount' => 0.00,
+					'PAY_timestamp' => time(),
+				)
+			);
+
+		}
+
+		// if there is billing info, clean it and save it now
+		if ($billing_info instanceof EE_Billing_Attendee_Info_Form) {
+			$this->_save_billing_info_to_attendee($billing_info, $transaction);
+		}
+
+		return $payment;
+	}
+
+	/**
+	 * Gets the values we want to pass onto the gateway. Normally these
+	 * are just the 'pretty' values, but there may be times the data may need
+	 * a  little massaging. Proper subsections will become arrays of inputs
+	 * @param EE_Billing_Info_Form $billing_form
+	 * @return array
+	 */
+	protected function _get_billing_values_from_form($billing_form)
+	{
+		if ($billing_form instanceof EE_Form_Section_Proper) {
+			return $billing_form->input_pretty_values(true);
+		} else {
+			return NULL;
+		}
+	}
+
+
+	/**
+	 * Handles an instant payment notification when the transaction is known (by default).
+	 * @param array $req_data
+	 * @param EE_Transaction $transaction
+	 * @return EE_Payment
+	 * @throws EE_Error
+	 */
+	public function handle_ipn($req_data, $transaction)
+	{
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
+		if (!$this->_gateway instanceof EE_Offsite_Gateway) {
+			throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r($this->_gateway, TRUE)));
+
+		}
+		$payment = $this->_gateway->handle_payment_update($req_data, $transaction);
+		return $payment;
+	}
+
+
+	/**
+	 * Saves the billing info onto the attendee of the primary registrant on this transaction, and
+	 * cleans it first.
+	 * @param EE_Billing_Attendee_Info_Form $billing_form
+	 * @param EE_Transaction $transaction
+	 * @return boolean success
+	 */
+	protected function _save_billing_info_to_attendee($billing_form, $transaction)
+	{
+		if (!$transaction || !$transaction instanceof EE_Transaction) {
+			EE_Error::add_error(__("Cannot save billing info because no transaction was specified", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		$primary_reg = $transaction->primary_registration();
+		if (!$primary_reg) {
+			EE_Error::add_error(__("Cannot save billing info because the transaction has no primary registration", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		$attendee = $primary_reg->attendee();
+		if (!$attendee) {
+			EE_Error::add_error(__("Cannot save billing info because the transaction's primary registration has no attendee!", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method());
+
+	}
+
+
+	/**
+	 * Gets the payment this IPN is for. Children may often want to
+	 * override this to inspect the request
+	 * @param EE_Transaction $transaction
+	 * @param array $req_data
+	 * @return EE_Payment
+	 */
+	protected function find_payment_for_ipn(EE_Transaction $transaction, $req_data = array())
+	{
+		return $transaction->last_payment();
+	}
+
+
+	/**
+	 * In case generic code cannot provide the payment processor with a specific payment method
+	 * and transaction, it will try calling this method on each activate payment method.
+	 * If the payment method is able to identify the request as being for it, it should fetch
+	 * the payment its for and return it. If not, it should throw an EE_Error to indicate it cannot
+	 * handle the IPN
+	 * @param array $req_data
+	 * @return EE_Payment only if this payment method can find the info its needs from $req_data
+	 * and identifies the IPN as being for this payment method (not just fo ra payment method of this type)
+	 * @throws EE_Error
+	 */
+	public function handle_unclaimed_ipn($req_data = array())
+	{
+		throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this)));
+	}
+
+
+	/**
+	 * Logic to be accomplished when the payment attempt is complete.
+	 * Most payment methods don't need to do anything at this point; but some, like Mijireh, do.
+	 * (Mijireh is an offsite gateway which doesn't send an IPN. So when the user returns to EE from
+	 * mijireh, this method needs to be called so the Mijireh PM can ping Mijireh to know the status
+	 * of the payment). Fed a transaction because it's always assumed to be the last payment that
+	 * we're dealing with. Returns that last payment (if there is one)
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return EE_Payment
+	 */
+	public function finalize_payment_for($transaction)
+	{
+		return $transaction->last_payment();
+	}
+
+
+	/**
+	 * Whether or not this payment method's gateway supports sending refund requests
+	 * @return boolean
+	 */
+	public function supports_sending_refunds()
+	{
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
+			return $this->_gateway->supports_sending_refunds();
+		} else {
+			return false;
+		}
+	}
+
+
+	/**
+	 *
+	 * @param EE_Payment $payment
+	 * @param array $refund_info
+	 * @throws EE_Error
+	 * @return EE_Payment
+	 */
+	public function process_refund(EE_Payment $payment, $refund_info = array())
+	{
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
+			return $this->_gateway->do_direct_refund($payment, $refund_info);
+		} else {
+			throw new EE_Error(
+				sprintf(
+					__('Payment Method Type "%s" does not support sending refund requests', 'event_espresso'),
+					get_class($this)
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * Returns one the class's constants onsite,offsite, or offline, depending on this
+	 * payment method's gateway.
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function payment_occurs()
+	{
+		if (!$this->_gateway) {
+			return EE_PMT_Base::offline;
+		} elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
+			return EE_PMT_Base::onsite;
+		} elseif ($this->_gateway instanceof EE_Offsite_Gateway) {
+			return EE_PMT_Base::offsite;
+		} else {
+			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"), get_class($this)));
+		}
+	}
+
+
+	/**
+	 * For adding any html output ab ove the payment overview.
+	 * Many gateways won't want ot display anything, so this function just returns an empty string.
+	 * Other gateways may want to override this, such as offline gateways.
+	 * @param EE_Payment $payment
+	 * @return string
+	 */
+	public function payment_overview_content(EE_Payment $payment)
+	{
+		return EEH_Template::display_template(EE_LIBRARIES . 'payment_methods' . DS . 'templates' . DS . 'payment_details_content.template.php', array('payment_method' => $this->_pm_instance, 'payment' => $payment), true);
+	}
+
+
+	/**
+	 * @return array where keys are the help tab name,
+	 * values are: array {
+	 * @type string $title i18n name for the help tab
+	 * @type string $filename name of the file located in ./help_tabs/ (ie, in a folder next to this file)
+	 * @type array $template_args any arguments you want passed to the template file while rendering.
+	 *                Keys will be variable names and values with be their values.
+	 */
+	public function help_tabs_config()
+	{
+		return array();
+	}
+
+
+	/**
+	 * The system name for this PMT (eg AIM, Paypal_Pro, Invoice... what gets put into
+	 * the payment method's table's PMT_type column)
+	 * @return string
+	 */
+	public function system_name()
+	{
+		$classname = get_class($this);
+		return str_replace("EE_PMT_", '', $classname);
+	}
+
+
+	/**
+	 * A pretty i18n version of the PMT name
+	 * @return string
+	 */
+	public function pretty_name()
+	{
+		return $this->_pretty_name;
+	}
+
+
+	/**
+	 * Gets the default absolute URL to the payment method type's button
+	 * @return string
+	 */
+	public function default_button_url()
+	{
+		return $this->_default_button_url;
+	}
+
+
+	/**
+	 * Gets the gateway used by this payment method (if any)
+	 * @return EE_Gateway
+	 */
+	public function get_gateway()
+	{
+		return $this->_gateway;
+	}
+
+
+	/**
+	 * @return string html for the link to a help tab
+	 */
+	public function get_help_tab_link()
+	{
+		return EEH_Template::get_help_tab_link($this->get_help_tab_name());
+	}
+
+
+	/**
+	 * Returns the name of the help tab for this PMT
+	 * @return string
+	 */
+	public function get_help_tab_name()
+	{
+		return 'ee_' . strtolower($this->system_name()) . '_help_tab';
+	}
+
+	/**
+	 * The name of the wp capability that should be associated with the usage of
+	 * this PMT by an admin
+	 * @return string
+	 */
+	public function cap_name()
+	{
+		return 'ee_payment_method_' . strtolower($this->system_name());
+	}
+
+	/**
+	 * Called by client code to tell the gateway that if it wants to change
+	 * the transaction or line items or registrations related to teh payment it already
+	 * processed (we think, but possibly not) that now's the time to do it.
+	 * It is expected that gateways will store any info they need for this on the PAY_details,
+	 * or maybe an extra meta value
+	 * @param EE_Payment $payment
+	 * @return void
+	 */
+	public function update_txn_based_on_payment($payment)
+	{
+		if ($this->_gateway instanceof EE_Gateway) {
+			$this->_gateway->update_txn_based_on_payment($payment);
+		}
+	}
+
+	/**
+	 * Returns a string of HTML describing this payment method type for an admin,
+	 * primarily intended for them to read before activating it.
+	 * The easiest way to set this is to create a folder 'templates' alongside
+	 * your EE_PMT_{System_Name} file, and in it create a file named "{system_name}_intro.template.php".
+	 * Eg, if your payment method file is named "EE_PMT_Foo_Bar.pm.php",
+	 * then you'd create a file named "templates" in the same folder as it, and name the file
+	 * "foo_bar_intro.template.php", and its content will be returned by this method
+	 * @return string
+	 */
+	public function introductory_html()
+	{
+		return EEH_Template::locate_template($this->file_folder() . 'templates' . DS . strtolower($this->system_name()) . '_intro.template.php', array('pmt_obj' => $this, 'pm_instance' => $this->_pm_instance));
+	}
 
 
 }

Spacing +18 added lines, -18 removed lines

@@ -114,7 +114,7 @@ 
             $this->_gateway->set_unsupported_character_remover(new AsciiOnly());
             do_action('AHEE__EE_PMT_Base___construct__done_initializing_gateway_class', $this, $this->_gateway);
         }
-        if (!isset($this->_has_billing_form)) {
+        if ( ! isset($this->_has_billing_form)) {
             // by default, On Site gateways have a billing form
             if ($this->payment_occurs() == EE_PMT_Base::onsite) {
                 $this->set_has_billing_form(true);
@@ -123,12 +123,12 @@ 
             }
         }
 
-        if (!$this->_pretty_name) {
+        if ( ! $this->_pretty_name) {
             throw new EE_Error(sprintf(__("You must set the pretty name for the Payment Method Type in the constructor (_pretty_name), and please make it internationalized", "event_espresso")));
         }
         //if the child didn't specify a default button, use the credit card one
         if ($this->_default_button_url === NULL) {
-            $this->_default_button_url = EE_PLUGIN_DIR_URL . 'payment_methods' . DS . 'pay-by-credit-card.png';
+            $this->_default_button_url = EE_PLUGIN_DIR_URL.'payment_methods'.DS.'pay-by-credit-card.png';
         }
     }
 
@@ -149,7 +149,7 @@ 
     {
         $reflector = new ReflectionClass(get_class($this));
         $fn = $reflector->getFileName();
-        $this->_file_folder = dirname($fn) . DS;
+        $this->_file_folder = dirname($fn).DS;
     }
 
 
@@ -180,7 +180,7 @@ 
      */
     public function file_folder()
     {
-        if (!$this->_file_folder) {
+        if ( ! $this->_file_folder) {
             $this->_set_file_folder();
         }
         return $this->_file_folder;
@@ -192,7 +192,7 @@ 
      */
     public function file_url()
     {
-        if (!$this->_file_url) {
+        if ( ! $this->_file_url) {
             $this->_set_file_url();
         }
         return $this->_file_url;
@@ -224,7 +224,7 @@ 
      */
     function settings_form()
     {
-        if (!$this->_settings_form) {
+        if ( ! $this->_settings_form) {
             $this->_settings_form = $this->generate_new_settings_form();
             $this->_settings_form->set_payment_method_type($this);
             //if we have already assigned a model object to this pmt, make
@@ -276,7 +276,7 @@ 
     public function billing_form(EE_Transaction $transaction = NULL, $extra_args = array())
     {
         // has billing form already been regenerated ? or overwrite cache?
-        if (!$this->_billing_form instanceof EE_Billing_Info_Form || !$this->_cache_billing_form) {
+        if ( ! $this->_billing_form instanceof EE_Billing_Info_Form || ! $this->_cache_billing_form) {
             $this->_billing_form = $this->generate_new_billing_form($transaction, $extra_args);
         }
         //if we know who the attendee is, and this is a billing form
@@ -371,7 +371,7 @@ 
             $payment = EEM_Payment::instance()->get_one(array($duplicate_properties));
             //if we didn't already have a payment in progress for the same thing,
             //then we actually want to make a new payment
-            if (!$payment instanceof EE_Payment) {
+            if ( ! $payment instanceof EE_Payment) {
                 $payment = EE_Payment::new_instance(
                     array_merge(
                         $duplicate_properties,
@@ -472,7 +472,7 @@ 
     public function handle_ipn($req_data, $transaction)
     {
         $transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
-        if (!$this->_gateway instanceof EE_Offsite_Gateway) {
+        if ( ! $this->_gateway instanceof EE_Offsite_Gateway) {
             throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r($this->_gateway, TRUE)));
 
         }
@@ -490,17 +490,17 @@ 
      */
     protected function _save_billing_info_to_attendee($billing_form, $transaction)
     {
-        if (!$transaction || !$transaction instanceof EE_Transaction) {
+        if ( ! $transaction || ! $transaction instanceof EE_Transaction) {
             EE_Error::add_error(__("Cannot save billing info because no transaction was specified", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
             return false;
         }
         $primary_reg = $transaction->primary_registration();
-        if (!$primary_reg) {
+        if ( ! $primary_reg) {
             EE_Error::add_error(__("Cannot save billing info because the transaction has no primary registration", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
             return false;
         }
         $attendee = $primary_reg->attendee();
-        if (!$attendee) {
+        if ( ! $attendee) {
             EE_Error::add_error(__("Cannot save billing info because the transaction's primary registration has no attendee!", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
             return false;
         }
@@ -600,7 +600,7 @@ 
      */
     public function payment_occurs()
     {
-        if (!$this->_gateway) {
+        if ( ! $this->_gateway) {
             return EE_PMT_Base::offline;
         } elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
             return EE_PMT_Base::onsite;
@@ -621,7 +621,7 @@ 
      */
     public function payment_overview_content(EE_Payment $payment)
     {
-        return EEH_Template::display_template(EE_LIBRARIES . 'payment_methods' . DS . 'templates' . DS . 'payment_details_content.template.php', array('payment_method' => $this->_pm_instance, 'payment' => $payment), true);
+        return EEH_Template::display_template(EE_LIBRARIES.'payment_methods'.DS.'templates'.DS.'payment_details_content.template.php', array('payment_method' => $this->_pm_instance, 'payment' => $payment), true);
     }
 
 
@@ -696,7 +696,7 @@ 
      */
     public function get_help_tab_name()
     {
-        return 'ee_' . strtolower($this->system_name()) . '_help_tab';
+        return 'ee_'.strtolower($this->system_name()).'_help_tab';
     }
 
     /**
@@ -706,7 +706,7 @@ 
      */
     public function cap_name()
     {
-        return 'ee_payment_method_' . strtolower($this->system_name());
+        return 'ee_payment_method_'.strtolower($this->system_name());
     }
 
     /**
@@ -737,7 +737,7 @@ 
      */
     public function introductory_html()
     {
-        return EEH_Template::locate_template($this->file_folder() . 'templates' . DS . strtolower($this->system_name()) . '_intro.template.php', array('pmt_obj' => $this, 'pm_instance' => $this->_pm_instance));
+        return EEH_Template::locate_template($this->file_folder().'templates'.DS.strtolower($this->system_name()).'_intro.template.php', array('pmt_obj' => $this, 'pm_instance' => $this->_pm_instance));
     }
 
 

acceptance_tests/tests/b-TestRegistrationSummaryCept.php

Indentation +41 added lines, -41 removed lines

@@ -14,8 +14,8 @@ 
 
 //need the MER plugin active for this test (we'll deactivate it after).
 $I->ensurePluginActive(
-    'event-espresso-mer-multi-event-registration',
-    'activated'
+	'event-espresso-mer-multi-event-registration',
+	'activated'
 );
 
 //k now we need to make sure the registration multi-status message type is active because it isn't by default
@@ -73,38 +73,38 @@ 
 $I->loginAsAdmin();
 $I->amOnMessagesActivityListTablePage();
 $I->see(
-    'rsm_tester@example.org',
-    MessagesAdmin::messagesActivityListTableCellSelectorFor(
-        'to',
-        'Registration Multi-status Summary',
-        MessagesAdmin::MESSAGE_STATUS_SENT,
-        '',
-        'Primary Registrant'
-    )
+	'rsm_tester@example.org',
+	MessagesAdmin::messagesActivityListTableCellSelectorFor(
+		'to',
+		'Registration Multi-status Summary',
+		MessagesAdmin::MESSAGE_STATUS_SENT,
+		'',
+		'Primary Registrant'
+	)
 );
 $I->see(
-    'admin@example.com',
-    MessagesAdmin::messagesActivityListTableCellSelectorFor(
-        'to',
-        'Registration Multi-status Summary',
-        MessagesAdmin::MESSAGE_STATUS_SENT
-    )
+	'admin@example.com',
+	MessagesAdmin::messagesActivityListTableCellSelectorFor(
+		'to',
+		'Registration Multi-status Summary',
+		MessagesAdmin::MESSAGE_STATUS_SENT
+	)
 );
 //verify count
 $I->verifyMatchingCountofTextInMessageActivityListTableFor(
-    1,
-    'rsm_tester@example.org',
-    'to',
-    'Registration Multi-status Summary',
-    MessagesAdmin::MESSAGE_STATUS_SENT,
-    'Email',
-    'Primary Registrant'
+	1,
+	'rsm_tester@example.org',
+	'to',
+	'Registration Multi-status Summary',
+	MessagesAdmin::MESSAGE_STATUS_SENT,
+	'Email',
+	'Primary Registrant'
 );
 $I->verifyMatchingCountofTextInMessageActivityListTableFor(
-    1,
-    'admin@example.com',
-    'to',
-    'Registration Multi-status Summary'
+	1,
+	'admin@example.com',
+	'to',
+	'Registration Multi-status Summary'
 );
 
 //okay now let's do some registrations for just the first event and verify that registration multi-status summary is NOT
@@ -134,25 +134,25 @@ 
 $I->loginAsAdmin();
 $I->amOnMessagesActivityListTablePage();
 $I->dontSee(
-    'rsm_testerb@example.org',
-    MessagesAdmin::messagesActivityListTableCellSelectorFor(
-        'to',
-        'Registration Multi-status Summary',
-        MessagesAdmin::MESSAGE_STATUS_SENT,
-        '',
-        'Primary Registrant'
-    )
+	'rsm_testerb@example.org',
+	MessagesAdmin::messagesActivityListTableCellSelectorFor(
+		'to',
+		'Registration Multi-status Summary',
+		MessagesAdmin::MESSAGE_STATUS_SENT,
+		'',
+		'Primary Registrant'
+	)
 );
 //there should still only be one admin multi-status summary thing.
 $I->verifyMatchingCountofTextInMessageActivityListTableFor(
-    1,
-    'admin@example.com',
-    'to',
-    'Registration Multi-status Summary'
+	1,
+	'admin@example.com',
+	'to',
+	'Registration Multi-status Summary'
 );
 
 //deactivate MER plugin so its not active for future tests
 $I->ensurePluginDeactivated(
-    'event-espresso-mer-multi-event-registration',
-    'plugins deactivated'
+	'event-espresso-mer-multi-event-registration',
+	'plugins deactivated'
 );
\ No newline at end of file

acceptance_tests/tests/c-TestCustomMessageTemplateCept.php

Indentation +27 added lines, -27 removed lines

@@ -18,14 +18,14 @@ 
 $event_one_link = $event_two_link = $event_three_link = '';
 
 $I->wantTo(
-    'Test that when registrations for multiple events are completed, and those events share the same custom'
-    . 'template, that that custom template will be used.'
+	'Test that when registrations for multiple events are completed, and those events share the same custom'
+	. 'template, that that custom template will be used.'
 );
 
 //need the MER plugin active for this test (we'll deactivate it after).
 $I->ensurePluginActive(
-    'event-espresso-mer-multi-event-registration',
-    'activated'
+	'event-espresso-mer-multi-event-registration',
+	'activated'
 );
 
 $I->loginAsAdmin();
@@ -80,9 +80,9 @@ 
 
 
 $test_registration_details = array(
-    'fname' => 'CTGuy',
-    'lname' => 'Dude',
-    'email' => 'ctguy_dude@example.org'
+	'fname' => 'CTGuy',
+	'lname' => 'Dude',
+	'email' => 'ctguy_dude@example.org'
 );
 
 $I->amGoingTo('Register for Event One and Event Two and verify Custom Template A was used.');
@@ -108,23 +108,23 @@ 
 $I->loginAsAdmin();
 $I->amOnMessagesActivityListTablePage();
 $I->viewMessageInMessagesListTableFor(
-    'Registration Approved',
-    MessagesAdmin::MESSAGE_STATUS_SENT,
-    'Email',
-    'Registrant'
+	'Registration Approved',
+	MessagesAdmin::MESSAGE_STATUS_SENT,
+	'Email',
+	'Registrant'
 );
 $I->seeTextInViewMessageModal($custom_template_a_label);
 $I->dismissMessageModal();
 $I->deleteMessageInMessagesListTableFor(
-    'Registration Approved',
-    MessagesAdmin::MESSAGE_STATUS_SENT,
-    'Email',
-    'Registrant'
+	'Registration Approved',
+	MessagesAdmin::MESSAGE_STATUS_SENT,
+	'Email',
+	'Registrant'
 );
 
 //verify admin context
 $I->viewMessageInMessagesListTableFor(
-    'Registration Approved'
+	'Registration Approved'
 );
 $I->seeTextInViewMessageModal($custom_template_a_label);
 $I->dismissMessageModal();
@@ -153,25 +153,25 @@ 
 $I->loginAsAdmin();
 $I->amOnMessagesActivityListTablePage();
 $I->viewMessageInMessagesListTableFor(
-    'Registration Approved',
-    MessagesAdmin::MESSAGE_STATUS_SENT,
-    'Email',
-    'Registrant'
+	'Registration Approved',
+	MessagesAdmin::MESSAGE_STATUS_SENT,
+	'Email',
+	'Registrant'
 );
 $I->waitForElementVisible(MessagesAdmin::MESSAGES_LIST_TABLE_VIEW_MESSAGE_DIALOG_CONTAINER_SELECTOR);
 $I->dontSeeTextInViewMessageModal($custom_template_a_label);
 $I->dontSeeTextInViewMessageModal($custom_template_b_label);
 $I->dismissMessageModal();
 $I->deleteMessageInMessagesListTableFor(
-    'Registration Approved',
-    MessagesAdmin::MESSAGE_STATUS_SENT,
-    'Email',
-    'Registrant'
+	'Registration Approved',
+	MessagesAdmin::MESSAGE_STATUS_SENT,
+	'Email',
+	'Registrant'
 );
 
 //verify admin context
 $I->viewMessageInMessagesListTableFor(
-    'Registration Approved'
+	'Registration Approved'
 );
 $I->waitForElementVisible(MessagesAdmin::MESSAGES_LIST_TABLE_VIEW_MESSAGE_DIALOG_CONTAINER_SELECTOR);
 $I->dontSee($custom_template_a_label);
@@ -183,6 +183,6 @@ 
 
 //deactivate MER plugin so its not active for future tests
 $I->ensurePluginDeactivated(
-    'event-espresso-mer-multi-event-registration',
-    'plugins deactivated'
+	'event-espresso-mer-multi-event-registration',
+	'plugins deactivated'
 );
\ No newline at end of file

acceptance_tests/Page/EventsAdmin.php

Indentation +263 added lines, -263 removed lines

@@ -14,267 +14,267 @@
 class EventsAdmin extends CoreAdmin
 {
 
-    /**
-     * Selector for the Add new Event button in the admin.
-     * @var string
-     */
-    const ADD_NEW_EVENT_BUTTON_SELECTOR = '#add-new-event';
-
-
-    /**
-     * Selector for the Event Title field in the event editor
-     * @var string
-     */
-    const EVENT_EDITOR_TITLE_FIELD_SELECTOR = ['xpath' => "//input[@id='title']"];
-
-    /**
-     * Selector for the publish submit button in the event editor.
-     * @var string
-     */
-    const EVENT_EDITOR_PUBLISH_BUTTON_SELECTOR = ['xpath'=>"//div[@id='major-publishing-actions']//input[@id='publish']"];
-
-
-    /**
-     * Selector for the save button in the event editor
-     */
-    const EVENT_EDITOR_SAVE_BUTTON_SELECTOR = ['xpath' => "//div[@id='minor-publishing-actions']//input[@id='save-post']"];
-
-
-    /**
-     * @var string
-     */
-    const EVENT_EDITOR_DEFAULT_REGISTRATION_STATUS_FIELD_SELECTOR = '#EVT_default_registration_status';
-
-    /**
-     * Selector for the view link after publishing an event.
-     * @var string
-     */
-    const EVENT_EDITOR_VIEW_LINK_AFTER_PUBLISH_SELECTOR = "//span[@id='sample-permalink']/a";
-
-
-    /**
-     * Selector for the ID of the event in the event editor
-     * @var string
-     */
-    const EVENT_EDITOR_EVT_ID_SELECTOR = "//input[@id='post_ID']";
-
-
-    /**
-     * Selector for the search input on the event list table page.
-     * @var string
-     */
-    const EVENT_LIST_TABLE_SEARCH_INPUT_SELECTOR = '#toplevel_page_espresso_events-search-input';
-
-
-
-
-    /**
-     * @param string $additional_params
-     * @return string
-     */
-    public static function defaultEventsListTableUrl($additional_params = '')
-    {
-        return self::adminUrl('espresso_events', 'default', $additional_params);
-    }
-
-
-    /**
-     * The selector for the DTTname field for the given row in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorDatetimeNameFieldSelector($row_number = 1)
-    {
-        return self::eventEditorDatetimeFieldSelectorForField('DTT_name', $row_number);
-    }
-
-
-    /**
-     * The selector for the DTT_EVT_start field for the given row in the event editor.d
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorDatetimeStartDateFieldSelector($row_number = 1)
-    {
-        return self::eventEditorDatetimeFieldSelectorForField('DTT_EVT_start', $row_number);
-    }
-
-
-    /**
-     * Wrapper for getting the selector for a given field and given row of a datetime in the event editor.
-     *
-     * @param string $field_name
-     * @param int    $row_number
-     * @return string
-     */
-    public static function eventEditorDatetimeFieldSelectorForField($field_name, $row_number = 1)
-    {
-        return "//input[@id='event-datetime-$field_name-$row_number']";
-    }
-
-
-    /**
-     * The selector for the TKT_name field for the given display row in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketNameFieldSelector($row_number = 1)
-    {
-        return self::eventEditorTicketFieldSelectorForFieldInDisplayRow('TKT_name', $row_number);
-    }
-
-
-    /**
-     * Selector for the TKT_base_price field for the given display row in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketPriceFieldSelector($row_number = 1)
-    {
-        return self::eventEditorTicketFieldSelectorForFieldInDisplayRow('TKT_base_price', $row_number);
-    }
-
-
-    /**
-     * Selector for the TKT_qty field for the given display row in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketQuantityFieldSelector($row_number = 1)
-    {
-        return self::eventEditorTicketFieldSelectorForFieldInDisplayRow('TKT_qty', $row_number);
-    }
-
-
-    /**
-     * Selector for the advanced details toggle for the ticket for the given display row in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketAdvancedDetailsSelector($row_number = 1)
-    {
-        return "//tr[@id='display-ticketrow-$row_number']//span[contains(@class, 'gear-icon')]";
-    }
-
-
-    /**
-     * Selector for the subtotal amount for the given display row of the ticket in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketAdvancedDetailsSubtotalSelector($row_number = 1)
-    {
-        return "//span[@id='price-total-amount-$row_number']";
-    }
-
-
-    /**
-     * Selector for the Total element for the given display row of the ticket in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketAdvancedDetailsTotalSelector($row_number = 1)
-    {
-        return "//span[@id='price-total-amount-$row_number']";
-    }
-
-
-    /**
-     * Selector for the taxable selector for the ticket for the given display row in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketTaxableCheckboxSelector($row_number = 1)
-    {
-        return "//input[@id='edit-ticket-TKT_taxable-$row_number']";
-    }
-
-
-    /**
-     * This returns the xpath locater for the Tax amount display container within the advanced settings view for the
-     * given ticket (row) and the given tax id (PRC_ID).
-     *
-     * @param int $tax_id     The PRC_ID for the tax you want the locater for.  Note, this defaults to the default tax
-     *                        setup on a fresh install.
-     * @param int $row_number What row representing the ticket you want the locator for.
-     * @return string
-     */
-    public static function eventEditorTicketTaxAmountDisplayForTaxIdAndTicketRowSelector($tax_id = 2, $row_number = 1)
-    {
-        return "//span[@id='TKT-tax-amount-display-$tax_id-$row_number']";
-    }
-
-
-    /**
-     * Wrapper for getting the selector for a given field and given display row of a ticket in the event editor.
-     * @param     $field_name
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketFieldSelectorForFieldInDisplayRow($field_name, $row_number = 1)
-    {
-        return "//tr[@id='display-ticketrow-$row_number']//input[contains(@class, 'edit-ticket-$field_name')]";
-    }
-
-
-    /**
-     * Returns the selector for the event title edit link in the events list table for the given Event Title.
-     * @param string $event_title
-     * @return string
-     */
-    public static function eventListTableEventTitleEditLinkSelectorForTitle($event_title)
-    {
-        return "//td[contains(@class, 'column-name')]/strong/a[text()='$event_title']";
-    }
-
-
-    /**
-     * Locator for for the ID column in the event list table for a given event title.
-     * @param string $event_title
-     * @return string
-     */
-    public static function eventListTableEventIdSelectorForTitle($event_title)
-    {
-        return "//td[contains(@class, 'column-name')]/strong/a[text()='$event_title']"
-               . "//ancestor::tr/th[contains(@class, 'check-column')]/input";
-    }
-
-
-    /**
-     * Locator for the view link in the row of an event list table for the given event title.
-     * @param string $event_title
-     * @return string
-     */
-    public static function eventListTableEventTitleViewLinkSelectorForTitle($event_title)
-    {
-        return "//td[contains(@class, 'column-name')]/strong/a[text()='$event_title']"
-               . "//ancestor::td//span[@class='view']/a";
-    }
-
-
-    /**
-     * Locator for the messenger tab in the Notifications metabox in the event editor.
-     * @param string $messenger_slug  The slug for the messenger (it's reference slug).
-     * @return string
-     */
-    public static function eventEditorNotificationsMetaBoxMessengerTabSelector($messenger_slug)
-    {
-        return "//div[@id='espresso_events_Messages_Hooks_Extend_messages_metabox_metabox']"
-               . "//a[@rel='ee-tab-$messenger_slug']";
-    }
-
-
-    /**
-     * Locator for the select input within the notifications metabox.
-     * Note, this assumes the tab content for the related messenger is already visible.
-     * @param string $message_type_label The message type label (visible string in the table) you want the selector for.
-     * @return string
-     */
-    public static function eventEditorNotificationsMetaBoxSelectSelectorForMessageType($message_type_label)
-    {
-        return "//div[@id='espresso_events_Messages_Hooks_Extend_messages_metabox_metabox']"
-               . "//table[@class='messages-custom-template-switcher']"
-               . "//tr/td[contains(.,'Registration Approved')]"
-               . "//ancestor::tr//select[contains(@class,'message-template-selector')]";
-    }
+	/**
+	 * Selector for the Add new Event button in the admin.
+	 * @var string
+	 */
+	const ADD_NEW_EVENT_BUTTON_SELECTOR = '#add-new-event';
+
+
+	/**
+	 * Selector for the Event Title field in the event editor
+	 * @var string
+	 */
+	const EVENT_EDITOR_TITLE_FIELD_SELECTOR = ['xpath' => "//input[@id='title']"];
+
+	/**
+	 * Selector for the publish submit button in the event editor.
+	 * @var string
+	 */
+	const EVENT_EDITOR_PUBLISH_BUTTON_SELECTOR = ['xpath'=>"//div[@id='major-publishing-actions']//input[@id='publish']"];
+
+
+	/**
+	 * Selector for the save button in the event editor
+	 */
+	const EVENT_EDITOR_SAVE_BUTTON_SELECTOR = ['xpath' => "//div[@id='minor-publishing-actions']//input[@id='save-post']"];
+
+
+	/**
+	 * @var string
+	 */
+	const EVENT_EDITOR_DEFAULT_REGISTRATION_STATUS_FIELD_SELECTOR = '#EVT_default_registration_status';
+
+	/**
+	 * Selector for the view link after publishing an event.
+	 * @var string
+	 */
+	const EVENT_EDITOR_VIEW_LINK_AFTER_PUBLISH_SELECTOR = "//span[@id='sample-permalink']/a";
+
+
+	/**
+	 * Selector for the ID of the event in the event editor
+	 * @var string
+	 */
+	const EVENT_EDITOR_EVT_ID_SELECTOR = "//input[@id='post_ID']";
+
+
+	/**
+	 * Selector for the search input on the event list table page.
+	 * @var string
+	 */
+	const EVENT_LIST_TABLE_SEARCH_INPUT_SELECTOR = '#toplevel_page_espresso_events-search-input';
+
+
+
+
+	/**
+	 * @param string $additional_params
+	 * @return string
+	 */
+	public static function defaultEventsListTableUrl($additional_params = '')
+	{
+		return self::adminUrl('espresso_events', 'default', $additional_params);
+	}
+
+
+	/**
+	 * The selector for the DTTname field for the given row in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorDatetimeNameFieldSelector($row_number = 1)
+	{
+		return self::eventEditorDatetimeFieldSelectorForField('DTT_name', $row_number);
+	}
+
+
+	/**
+	 * The selector for the DTT_EVT_start field for the given row in the event editor.d
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorDatetimeStartDateFieldSelector($row_number = 1)
+	{
+		return self::eventEditorDatetimeFieldSelectorForField('DTT_EVT_start', $row_number);
+	}
+
+
+	/**
+	 * Wrapper for getting the selector for a given field and given row of a datetime in the event editor.
+	 *
+	 * @param string $field_name
+	 * @param int    $row_number
+	 * @return string
+	 */
+	public static function eventEditorDatetimeFieldSelectorForField($field_name, $row_number = 1)
+	{
+		return "//input[@id='event-datetime-$field_name-$row_number']";
+	}
+
+
+	/**
+	 * The selector for the TKT_name field for the given display row in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketNameFieldSelector($row_number = 1)
+	{
+		return self::eventEditorTicketFieldSelectorForFieldInDisplayRow('TKT_name', $row_number);
+	}
+
+
+	/**
+	 * Selector for the TKT_base_price field for the given display row in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketPriceFieldSelector($row_number = 1)
+	{
+		return self::eventEditorTicketFieldSelectorForFieldInDisplayRow('TKT_base_price', $row_number);
+	}
+
+
+	/**
+	 * Selector for the TKT_qty field for the given display row in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketQuantityFieldSelector($row_number = 1)
+	{
+		return self::eventEditorTicketFieldSelectorForFieldInDisplayRow('TKT_qty', $row_number);
+	}
+
+
+	/**
+	 * Selector for the advanced details toggle for the ticket for the given display row in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketAdvancedDetailsSelector($row_number = 1)
+	{
+		return "//tr[@id='display-ticketrow-$row_number']//span[contains(@class, 'gear-icon')]";
+	}
+
+
+	/**
+	 * Selector for the subtotal amount for the given display row of the ticket in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketAdvancedDetailsSubtotalSelector($row_number = 1)
+	{
+		return "//span[@id='price-total-amount-$row_number']";
+	}
+
+
+	/**
+	 * Selector for the Total element for the given display row of the ticket in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketAdvancedDetailsTotalSelector($row_number = 1)
+	{
+		return "//span[@id='price-total-amount-$row_number']";
+	}
+
+
+	/**
+	 * Selector for the taxable selector for the ticket for the given display row in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketTaxableCheckboxSelector($row_number = 1)
+	{
+		return "//input[@id='edit-ticket-TKT_taxable-$row_number']";
+	}
+
+
+	/**
+	 * This returns the xpath locater for the Tax amount display container within the advanced settings view for the
+	 * given ticket (row) and the given tax id (PRC_ID).
+	 *
+	 * @param int $tax_id     The PRC_ID for the tax you want the locater for.  Note, this defaults to the default tax
+	 *                        setup on a fresh install.
+	 * @param int $row_number What row representing the ticket you want the locator for.
+	 * @return string
+	 */
+	public static function eventEditorTicketTaxAmountDisplayForTaxIdAndTicketRowSelector($tax_id = 2, $row_number = 1)
+	{
+		return "//span[@id='TKT-tax-amount-display-$tax_id-$row_number']";
+	}
+
+
+	/**
+	 * Wrapper for getting the selector for a given field and given display row of a ticket in the event editor.
+	 * @param     $field_name
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketFieldSelectorForFieldInDisplayRow($field_name, $row_number = 1)
+	{
+		return "//tr[@id='display-ticketrow-$row_number']//input[contains(@class, 'edit-ticket-$field_name')]";
+	}
+
+
+	/**
+	 * Returns the selector for the event title edit link in the events list table for the given Event Title.
+	 * @param string $event_title
+	 * @return string
+	 */
+	public static function eventListTableEventTitleEditLinkSelectorForTitle($event_title)
+	{
+		return "//td[contains(@class, 'column-name')]/strong/a[text()='$event_title']";
+	}
+
+
+	/**
+	 * Locator for for the ID column in the event list table for a given event title.
+	 * @param string $event_title
+	 * @return string
+	 */
+	public static function eventListTableEventIdSelectorForTitle($event_title)
+	{
+		return "//td[contains(@class, 'column-name')]/strong/a[text()='$event_title']"
+			   . "//ancestor::tr/th[contains(@class, 'check-column')]/input";
+	}
+
+
+	/**
+	 * Locator for the view link in the row of an event list table for the given event title.
+	 * @param string $event_title
+	 * @return string
+	 */
+	public static function eventListTableEventTitleViewLinkSelectorForTitle($event_title)
+	{
+		return "//td[contains(@class, 'column-name')]/strong/a[text()='$event_title']"
+			   . "//ancestor::td//span[@class='view']/a";
+	}
+
+
+	/**
+	 * Locator for the messenger tab in the Notifications metabox in the event editor.
+	 * @param string $messenger_slug  The slug for the messenger (it's reference slug).
+	 * @return string
+	 */
+	public static function eventEditorNotificationsMetaBoxMessengerTabSelector($messenger_slug)
+	{
+		return "//div[@id='espresso_events_Messages_Hooks_Extend_messages_metabox_metabox']"
+			   . "//a[@rel='ee-tab-$messenger_slug']";
+	}
+
+
+	/**
+	 * Locator for the select input within the notifications metabox.
+	 * Note, this assumes the tab content for the related messenger is already visible.
+	 * @param string $message_type_label The message type label (visible string in the table) you want the selector for.
+	 * @return string
+	 */
+	public static function eventEditorNotificationsMetaBoxSelectSelectorForMessageType($message_type_label)
+	{
+		return "//div[@id='espresso_events_Messages_Hooks_Extend_messages_metabox_metabox']"
+			   . "//table[@class='messages-custom-template-switcher']"
+			   . "//tr/td[contains(.,'Registration Approved')]"
+			   . "//ancestor::tr//select[contains(@class,'message-template-selector')]";
+	}
 }

acceptance_tests/Helpers/EventsAdmin.php

Indentation +129 added lines, -129 removed lines

@@ -14,133 +14,133 @@
 trait EventsAdmin
 {
 
-    /**
-     * @param string $additional_params
-     */
-    public function amOnDefaultEventsListTablePage($additional_params = '')
-    {
-        $this->actor()->amOnAdminPage(EventsPage::defaultEventsListTableUrl($additional_params));
-    }
-
-
-    /**
-     * Triggers the publishing of the Event.
-     */
-    public function publishEvent()
-    {
-        $this->actor()->scrollTo(EventsPage::EVENT_EDITOR_TITLE_FIELD_SELECTOR);
-        $this->actor()->wait(2);
-        $this->actor()->click(EventsPage::EVENT_EDITOR_PUBLISH_BUTTON_SELECTOR);
-        $this->actor()->waitForText('Event published.', 30);
-    }
-
-
-    /**
-     * Triggers saving the Event.
-     */
-    public function saveEvent()
-    {
-        $this->actor()->scrollTo(EventsPage::EVENT_EDITOR_TITLE_FIELD_SELECTOR);
-        $this->actor()->wait(2);
-        $this->actor()->click(EventsPage::EVENT_EDITOR_SAVE_BUTTON_SELECTOR);
-    }
-
-
-    /**
-     * Navigates the actor to the event list table page and will attempt to edit the event for the given title.
-     * First this will search using the given title and then attempt to edit from the results of the search.
-     *
-     * Assumes actor is already logged in.
-     * @param $event_title
-     */
-    public function amEditingTheEventWithTitle($event_title)
-    {
-        $this->amOnDefaultEventsListTablePage();
-        $this->actor()->fillField(EventsPage::EVENT_LIST_TABLE_SEARCH_INPUT_SELECTOR, $event_title);
-        $this->actor()->click(CoreAdmin::LIST_TABLE_SEARCH_SUBMIT_SELECTOR);
-        $this->actor()->waitForText($event_title, 15);
-        $this->actor()->click(EventsPage::eventListTableEventTitleEditLinkSelectorForTitle($event_title));
-    }
-
-
-    /**
-     * Navigates the user to the single event page (frontend view) for the given event title via clicking the "View"
-     * link for the event in the event list table.
-     * Assumes the actor is already logged in and on the Event list table page.
-     *
-     * @param string $event_title
-     */
-    public function amOnEventPageAfterClickingViewLinkInListTableForEvent($event_title)
-    {
-        $this->actor()->moveMouseOver(EventsPage::eventListTableEventTitleEditLinkSelectorForTitle($event_title));
-        $this->actor()->click(EventsPage::eventListTableEventTitleViewLinkSelectorForTitle($event_title));
-    }
-
-
-    /**
-     * Used to retrieve the event id for the event via the list table and for the given event.
-     * @param string $event_title
-     */
-    public function observeEventIdInListTableForEvent($event_title)
-    {
-        return $this->actor()->observeValueFromInputAt(EventsPage::eventListTableEventIdSelectorForTitle($event_title));
-    }
-
-
-    /**
-     * This performs the click action on the gear icon that triggers the advanced settings view state.
-     * Assumes the actor is already logged in and editing an event.
-     *
-     * @param int $row_number  What ticket row to toggle open/close.
-     */
-    public function toggleAdvancedSettingsViewForTicketRow($row_number = 1)
-    {
-        $this->actor()->click(EventsPage::eventEditorTicketAdvancedDetailsSelector($row_number));
-    }
-
-
-    /**
-     * Toggles the TKT_is_taxable checkbox for the ticket in the given row.
-     * Assumes the actor is already logged in and editing an event and that the advanced settings view state for that
-     * ticket is "open".
-     *
-     * @param int $row_number  What ticket row to toggle the checkbox for.
-     */
-    public function toggleTicketIsTaxableForTicketRow($row_number = 1)
-    {
-        $this->actor()->click(EventsPage::eventEditorTicketTaxableCheckboxSelector($row_number));
-    }
-
-
-    /**
-     * Use to change the default registration status for the event.
-     * Assumes the view is already on the event editor.
-     * @param $registration_status
-     */
-    public function changeDefaultRegistrationStatusTo($registration_status)
-    {
-        $this->actor()->selectOption(
-            EventsPage::EVENT_EDITOR_DEFAULT_REGISTRATION_STATUS_FIELD_SELECTOR,
-            $registration_status
-        );
-    }
-
-
-    /**
-     * Use this from the context of the event editor to select the given custom template for a given message type and
-     * messenger.
-     *
-     * @param string $message_type_label  The visible label for the message type (eg Registration Approved)
-     * @param string $messenger_slug      The slug for the messenger (eg 'email')
-     * @param string $custom_template_label The visible label in the select input for the custom template you want
-     *                                      selected.
-     */
-    public function selectCustomTemplateFor($message_type_label, $messenger_slug, $custom_template_label)
-    {
-        $this->actor()->click(EventsPage::eventEditorNotificationsMetaBoxMessengerTabSelector($messenger_slug));
-        $this->actor()->selectOption(
-            EventsPage::eventEditorNotificationsMetaBoxSelectSelectorForMessageType($message_type_label),
-            $custom_template_label
-        );
-    }
+	/**
+	 * @param string $additional_params
+	 */
+	public function amOnDefaultEventsListTablePage($additional_params = '')
+	{
+		$this->actor()->amOnAdminPage(EventsPage::defaultEventsListTableUrl($additional_params));
+	}
+
+
+	/**
+	 * Triggers the publishing of the Event.
+	 */
+	public function publishEvent()
+	{
+		$this->actor()->scrollTo(EventsPage::EVENT_EDITOR_TITLE_FIELD_SELECTOR);
+		$this->actor()->wait(2);
+		$this->actor()->click(EventsPage::EVENT_EDITOR_PUBLISH_BUTTON_SELECTOR);
+		$this->actor()->waitForText('Event published.', 30);
+	}
+
+
+	/**
+	 * Triggers saving the Event.
+	 */
+	public function saveEvent()
+	{
+		$this->actor()->scrollTo(EventsPage::EVENT_EDITOR_TITLE_FIELD_SELECTOR);
+		$this->actor()->wait(2);
+		$this->actor()->click(EventsPage::EVENT_EDITOR_SAVE_BUTTON_SELECTOR);
+	}
+
+
+	/**
+	 * Navigates the actor to the event list table page and will attempt to edit the event for the given title.
+	 * First this will search using the given title and then attempt to edit from the results of the search.
+	 *
+	 * Assumes actor is already logged in.
+	 * @param $event_title
+	 */
+	public function amEditingTheEventWithTitle($event_title)
+	{
+		$this->amOnDefaultEventsListTablePage();
+		$this->actor()->fillField(EventsPage::EVENT_LIST_TABLE_SEARCH_INPUT_SELECTOR, $event_title);
+		$this->actor()->click(CoreAdmin::LIST_TABLE_SEARCH_SUBMIT_SELECTOR);
+		$this->actor()->waitForText($event_title, 15);
+		$this->actor()->click(EventsPage::eventListTableEventTitleEditLinkSelectorForTitle($event_title));
+	}
+
+
+	/**
+	 * Navigates the user to the single event page (frontend view) for the given event title via clicking the "View"
+	 * link for the event in the event list table.
+	 * Assumes the actor is already logged in and on the Event list table page.
+	 *
+	 * @param string $event_title
+	 */
+	public function amOnEventPageAfterClickingViewLinkInListTableForEvent($event_title)
+	{
+		$this->actor()->moveMouseOver(EventsPage::eventListTableEventTitleEditLinkSelectorForTitle($event_title));
+		$this->actor()->click(EventsPage::eventListTableEventTitleViewLinkSelectorForTitle($event_title));
+	}
+
+
+	/**
+	 * Used to retrieve the event id for the event via the list table and for the given event.
+	 * @param string $event_title
+	 */
+	public function observeEventIdInListTableForEvent($event_title)
+	{
+		return $this->actor()->observeValueFromInputAt(EventsPage::eventListTableEventIdSelectorForTitle($event_title));
+	}
+
+
+	/**
+	 * This performs the click action on the gear icon that triggers the advanced settings view state.
+	 * Assumes the actor is already logged in and editing an event.
+	 *
+	 * @param int $row_number  What ticket row to toggle open/close.
+	 */
+	public function toggleAdvancedSettingsViewForTicketRow($row_number = 1)
+	{
+		$this->actor()->click(EventsPage::eventEditorTicketAdvancedDetailsSelector($row_number));
+	}
+
+
+	/**
+	 * Toggles the TKT_is_taxable checkbox for the ticket in the given row.
+	 * Assumes the actor is already logged in and editing an event and that the advanced settings view state for that
+	 * ticket is "open".
+	 *
+	 * @param int $row_number  What ticket row to toggle the checkbox for.
+	 */
+	public function toggleTicketIsTaxableForTicketRow($row_number = 1)
+	{
+		$this->actor()->click(EventsPage::eventEditorTicketTaxableCheckboxSelector($row_number));
+	}
+
+
+	/**
+	 * Use to change the default registration status for the event.
+	 * Assumes the view is already on the event editor.
+	 * @param $registration_status
+	 */
+	public function changeDefaultRegistrationStatusTo($registration_status)
+	{
+		$this->actor()->selectOption(
+			EventsPage::EVENT_EDITOR_DEFAULT_REGISTRATION_STATUS_FIELD_SELECTOR,
+			$registration_status
+		);
+	}
+
+
+	/**
+	 * Use this from the context of the event editor to select the given custom template for a given message type and
+	 * messenger.
+	 *
+	 * @param string $message_type_label  The visible label for the message type (eg Registration Approved)
+	 * @param string $messenger_slug      The slug for the messenger (eg 'email')
+	 * @param string $custom_template_label The visible label in the select input for the custom template you want
+	 *                                      selected.
+	 */
+	public function selectCustomTemplateFor($message_type_label, $messenger_slug, $custom_template_label)
+	{
+		$this->actor()->click(EventsPage::eventEditorNotificationsMetaBoxMessengerTabSelector($messenger_slug));
+		$this->actor()->selectOption(
+			EventsPage::eventEditorNotificationsMetaBoxSelectSelectorForMessageType($message_type_label),
+			$custom_template_label
+		);
+	}
 }
\ No newline at end of file

acceptance_tests/Helpers/MessagesAdmin.php

Indentation +292 added lines, -292 removed lines

@@ -10,296 +10,296 @@
  */
 trait MessagesAdmin
 {
-    /**
-     * @param string $additional_params Any additional request parameters for the generated url should be included as
-     *                                  a string.
-     */
-    public function amOnMessagesActivityListTablePage($additional_params = '')
-    {
-        $this->actor()->amOnAdminPage(MessagesPage::messageActivityListTableUrl($additional_params));
-    }
-
-    /**
-     * @param string $additional_params Any additional request parameters for the generated url should be included as
-     *                                  a string.
-     */
-    public function amOnDefaultMessageTemplateListTablePage($additional_params = '')
-    {
-        $this->actor()->amOnAdminPage(MessagesPage::defaultMessageTemplateListTableUrl($additional_params));
-    }
-
-
-    /**
-     * @param string $additional_params Any additional request parameters for the generated url should be included as
-     *                                  a string.
-     */
-    public function amOnCustomMessageTemplateListTablePage($additional_params = '')
-    {
-        $this->actor()->amOnAdminPage(MessagesPage::customMessageTemplateListTableUrl($additional_params));
-    }
-
-
-    /**
-     * Directs to message settings page
-     */
-    public function amOnMessageSettingsPage()
-    {
-        $this->actor()->amOnAdminPage(MessagesPage::messageSettingsUrl());
-    }
-
-
-    public function activateMessageTypeForMessenger($message_type_slug, $messenger_slug = 'email')
-    {
-        $this->actor()->dragAndDrop(
-            MessagesPage::draggableSettingsBoxSelectorForMessageTypeAndMessenger($message_type_slug, $messenger_slug),
-            MessagesPage::MESSAGES_SETTINGS_ACTIVE_MESSAGE_TYPES_CONTAINER_SELECTOR
-        );
-    }
-
-
-    /**
-     * Assumes you are already on the list table page that has the ui for editing the template.
-     * @param string $message_type_slug
-     * @param string $context [optional] if you want to click directly to the given context in the editor
-     */
-    public function clickToEditMessageTemplateByMessageType($message_type_slug, $context = '')
-    {
-        $this->actor()->click(MessagesPage::editMessageTemplateClassByMessageType($message_type_slug, $context));
-    }
-
-
-    /**
-     * Use this action to verify that the count for the given text in the specified field is as expected.  For example
-     * filling the condition of, "There should only be 1 instance of `someaddress@email.com` in all the 'to' column.
-     *
-     * @param int    $expected_occurence_count
-     * @param string $text_to_check_for
-     * @param string $field
-     * @param string $message_type_label
-     * @param string $message_status
-     * @param string $messenger
-     * @param string $context
-     */
-    public function verifyMatchingCountofTextInMessageActivityListTableFor(
-        $expected_occurence_count,
-        $text_to_check_for,
-        $field,
-        $message_type_label,
-        $message_status = MessagesPage::MESSAGE_STATUS_SENT,
-        $messenger = 'Email',
-        $context = 'Event Admin'
-    ) {
-        $elements = $this->actor()->grabMultiple(MessagesPage::messagesActivityListTableCellSelectorFor(
-            $field,
-            $message_type_label,
-            $message_status,
-            $messenger,
-            $context,
-            $text_to_check_for,
-            0
-        ));
-        $actual_count = count($elements);
-        $this->actor()->assertEquals(
-            $expected_occurence_count,
-            $actual_count,
-            sprintf(
-                'Expected %s of the %s text for the %s field but there were actually %s counted.',
-                $expected_occurence_count,
-                $text_to_check_for,
-                $field,
-                $actual_count
-            )
-        );
-    }
-
-
-    /**
-     * This will create a custom message template for the given messenger and message type from the context of the
-     * default (global) message template list table.
-     * Also takes care of verifying the template was created.
-     * @param string $message_type_label
-     * @param string $messenger_label
-     */
-    public function createCustomMessageTemplateFromDefaultFor($message_type_label, $messenger_label)
-    {
-        $this->amOnDefaultMessageTemplateListTablePage();
-        $this->actor()->click(
-            MessagesPage::createCustomButtonForMessageTypeAndMessenger(
-                $message_type_label,
-                $messenger_label
-            )
-        );
-        $this->actor()->seeInField('#title', 'New Custom Template');
-    }
-
-
-    /**
-     * This switches the context of the current messages template to the given reference.
-     * @param string $context_reference  This should be the visible label for the option.
-     */
-    public function switchContextTo($context_reference)
-    {
-        $this->actor()->selectOption(MessagesPage::MESSAGES_CONTEXT_SWITCHER_SELECTOR, $context_reference);
-        $this->actor()->click(MessagesPage::MESSAGES_CONTEXT_SWITCHER_BUTTON_SELECTOR);
-        $this->actor()->waitForText($context_reference, 10, 'h1');
-    }
-
-
-    /**
-     * Toggles Context so its turned off or on (depending on where it started) and verifies the expected state after
-     * toggling.
-     *
-     * @param string $context_string           What context is being switched (used for the expected state text)
-     * @param bool   $expected_state_is_active Used to indicate whether the expected state is active (true) or inactive
-     *                                         (false)
-     */
-    public function toggleContextState($context_string, $expected_state_is_active = true)
-    {
-        $this->actor()->click(MessagesPage::MESSAGES_CONTEXT_ACTIVE_STATE_TOGGLE);
-        if ($expected_state_is_active) {
-            $this->actor()->waitForText("The template for $context_string is currently active.");
-        } else {
-            $this->actor()->waitForText("The template for $context_string is currently inactive");
-        }
-    }
-
-
-    /**
-     * Triggers saving the message template.
-     * @param bool $and_close   Use to indicate to click the Save and Close button.
-     */
-    public function saveMessageTemplate($and_close = false)
-    {
-        $this->actor()->scrollTo(MessagesPage::MESSAGES_CONTEXT_SWITCHER_SELECTOR);
-        if ($and_close) {
-            $this->actor()->click('Save and Close');
-        } else {
-            $this->actor()->click('Save');
-        }
-        $this->actor()->waitForText('successfully updated');
-    }
-
-
-    /**
-     * This takes care of clicking the View Message icon for the given parameters.
-     * Assumes you are already viewing the messages activity list table.
-     * @param        $message_type_label
-     * @param        $message_status
-     * @param string $messenger
-     * @param string $context
-     * @param int    $number_in_set
-     */
-    public function viewMessageInMessagesListTableFor(
-        $message_type_label,
-        $message_status = MessagesPage::MESSAGE_STATUS_SENT,
-        $messenger = 'Email',
-        $context = 'Event Admin',
-        $number_in_set = 1
-    ) {
-        $this->actor()->click(MessagesPage::messagesActivityListTableViewButtonSelectorFor(
-            $message_type_label,
-            $message_status,
-            $messenger,
-            $context,
-            $number_in_set
-        ));
-    }
-
-
-    /**
-     * Takes care of deleting a message matching the given parameters via the message activity list table.
-     * Assumes you are already viewing the messages activity list table.
-     * @param        $message_type_label
-     * @param        $message_status
-     * @param string $messenger
-     * @param string $context
-     * @param int    $number_in_set
-     */
-    public function deleteMessageInMessagesListTableFor(
-        $message_type_label,
-        $message_status = MessagesPage::MESSAGE_STATUS_SENT,
-        $messenger = 'Email',
-        $context = 'Event Admin',
-        $number_in_set = 1
-    ) {
-        $delete_action_selector = MessagesPage::messagesActivityListTableDeleteActionSelectorFor(
-            $message_type_label,
-            $message_status,
-            $messenger,
-            $context,
-            $number_in_set
-        );
-        $cell_selector = MessagesPage::messagesActivityListTableCellSelectorFor(
-            'to',
-            $message_type_label,
-            $message_status,
-            $messenger,
-            $context,
-            '',
-            $number_in_set
-        );
-        $this->actor()->scrollTo($cell_selector, 0, -30);
-        $this->actor()->moveMouseOver(
-            $cell_selector,
-            5,
-            5
-        );
-        $this->actor()->waitForElementVisible(
-            $delete_action_selector
-        );
-        $this->actor()->click(
-            $delete_action_selector
-        );
-        $this->actor()->waitForText('successfully deleted', 20);
-    }
-
-
-    /**
-     * Assuming you have already triggered the view modal for a single message from the context of the message activity
-     * list table, this will take care of validating the given text is in that window.
-     * @param string $text_to_view
-     */
-    public function seeTextInViewMessageModal($text_to_view, $should_not_see = false)
-    {
-        $this->actor()->wait(2);
-        $this->actor()->waitForElementVisible('.ee-admin-dialog-container-inner-content');
-        $this->actor()->switchToIframe('message-view-window');
-        $should_not_see ? $this->actor()->dontSee($text_to_view) : $this->actor()->see($text_to_view);
-        $this->actor()->switchToIframe();
-    }
-
-
-    /**
-     * This returns the value for the link at the given selector in the message modal.
-     * @param string $selector (any selector string accepted by WebDriver)
-     */
-    public function observeLinkAtSelectorInMessageModal($selector)
-    {
-        $this->actor()->wait(2);
-        $this->actor()->waitForElementVisible('.ee-admin-dialog-container-inner-content');
-        $this->actor()->switchToIframe('message-view-window');
-        $link = $this->actor()->observeLinkUrlAt($selector);
-        $this->actor()->switchToIframe();
-        return $link;
-    }
-
-
-    /**
-     * Assuming you have already triggered the view modal for a single message from the context of the message activity
-     * list table, this will take care of validating the given text is NOT that window.
-     * @param string $text_to_view
-     */
-    public function dontSeeTextInViewMessageModal($text_to_view)
-    {
-        $this->seeTextInViewMessageModal($text_to_view, true);
-    }
-
-
-    public function dismissMessageModal()
-    {
-        $this->actor()->executeJs('window.dialogHelper.closeModal()');
-        //this is needed otherwise phantom js gets stuck in the wrong context and any future element events will fail.
-        $this->actor()->scrollTo('form#EE_Message_List_Table-table-frm');
-        $this->actor()->click('form#EE_Message_List_Table-table-frm');
-    }
+	/**
+	 * @param string $additional_params Any additional request parameters for the generated url should be included as
+	 *                                  a string.
+	 */
+	public function amOnMessagesActivityListTablePage($additional_params = '')
+	{
+		$this->actor()->amOnAdminPage(MessagesPage::messageActivityListTableUrl($additional_params));
+	}
+
+	/**
+	 * @param string $additional_params Any additional request parameters for the generated url should be included as
+	 *                                  a string.
+	 */
+	public function amOnDefaultMessageTemplateListTablePage($additional_params = '')
+	{
+		$this->actor()->amOnAdminPage(MessagesPage::defaultMessageTemplateListTableUrl($additional_params));
+	}
+
+
+	/**
+	 * @param string $additional_params Any additional request parameters for the generated url should be included as
+	 *                                  a string.
+	 */
+	public function amOnCustomMessageTemplateListTablePage($additional_params = '')
+	{
+		$this->actor()->amOnAdminPage(MessagesPage::customMessageTemplateListTableUrl($additional_params));
+	}
+
+
+	/**
+	 * Directs to message settings page
+	 */
+	public function amOnMessageSettingsPage()
+	{
+		$this->actor()->amOnAdminPage(MessagesPage::messageSettingsUrl());
+	}
+
+
+	public function activateMessageTypeForMessenger($message_type_slug, $messenger_slug = 'email')
+	{
+		$this->actor()->dragAndDrop(
+			MessagesPage::draggableSettingsBoxSelectorForMessageTypeAndMessenger($message_type_slug, $messenger_slug),
+			MessagesPage::MESSAGES_SETTINGS_ACTIVE_MESSAGE_TYPES_CONTAINER_SELECTOR
+		);
+	}
+
+
+	/**
+	 * Assumes you are already on the list table page that has the ui for editing the template.
+	 * @param string $message_type_slug
+	 * @param string $context [optional] if you want to click directly to the given context in the editor
+	 */
+	public function clickToEditMessageTemplateByMessageType($message_type_slug, $context = '')
+	{
+		$this->actor()->click(MessagesPage::editMessageTemplateClassByMessageType($message_type_slug, $context));
+	}
+
+
+	/**
+	 * Use this action to verify that the count for the given text in the specified field is as expected.  For example
+	 * filling the condition of, "There should only be 1 instance of `someaddress@email.com` in all the 'to' column.
+	 *
+	 * @param int    $expected_occurence_count
+	 * @param string $text_to_check_for
+	 * @param string $field
+	 * @param string $message_type_label
+	 * @param string $message_status
+	 * @param string $messenger
+	 * @param string $context
+	 */
+	public function verifyMatchingCountofTextInMessageActivityListTableFor(
+		$expected_occurence_count,
+		$text_to_check_for,
+		$field,
+		$message_type_label,
+		$message_status = MessagesPage::MESSAGE_STATUS_SENT,
+		$messenger = 'Email',
+		$context = 'Event Admin'
+	) {
+		$elements = $this->actor()->grabMultiple(MessagesPage::messagesActivityListTableCellSelectorFor(
+			$field,
+			$message_type_label,
+			$message_status,
+			$messenger,
+			$context,
+			$text_to_check_for,
+			0
+		));
+		$actual_count = count($elements);
+		$this->actor()->assertEquals(
+			$expected_occurence_count,
+			$actual_count,
+			sprintf(
+				'Expected %s of the %s text for the %s field but there were actually %s counted.',
+				$expected_occurence_count,
+				$text_to_check_for,
+				$field,
+				$actual_count
+			)
+		);
+	}
+
+
+	/**
+	 * This will create a custom message template for the given messenger and message type from the context of the
+	 * default (global) message template list table.
+	 * Also takes care of verifying the template was created.
+	 * @param string $message_type_label
+	 * @param string $messenger_label
+	 */
+	public function createCustomMessageTemplateFromDefaultFor($message_type_label, $messenger_label)
+	{
+		$this->amOnDefaultMessageTemplateListTablePage();
+		$this->actor()->click(
+			MessagesPage::createCustomButtonForMessageTypeAndMessenger(
+				$message_type_label,
+				$messenger_label
+			)
+		);
+		$this->actor()->seeInField('#title', 'New Custom Template');
+	}
+
+
+	/**
+	 * This switches the context of the current messages template to the given reference.
+	 * @param string $context_reference  This should be the visible label for the option.
+	 */
+	public function switchContextTo($context_reference)
+	{
+		$this->actor()->selectOption(MessagesPage::MESSAGES_CONTEXT_SWITCHER_SELECTOR, $context_reference);
+		$this->actor()->click(MessagesPage::MESSAGES_CONTEXT_SWITCHER_BUTTON_SELECTOR);
+		$this->actor()->waitForText($context_reference, 10, 'h1');
+	}
+
+
+	/**
+	 * Toggles Context so its turned off or on (depending on where it started) and verifies the expected state after
+	 * toggling.
+	 *
+	 * @param string $context_string           What context is being switched (used for the expected state text)
+	 * @param bool   $expected_state_is_active Used to indicate whether the expected state is active (true) or inactive
+	 *                                         (false)
+	 */
+	public function toggleContextState($context_string, $expected_state_is_active = true)
+	{
+		$this->actor()->click(MessagesPage::MESSAGES_CONTEXT_ACTIVE_STATE_TOGGLE);
+		if ($expected_state_is_active) {
+			$this->actor()->waitForText("The template for $context_string is currently active.");
+		} else {
+			$this->actor()->waitForText("The template for $context_string is currently inactive");
+		}
+	}
+
+
+	/**
+	 * Triggers saving the message template.
+	 * @param bool $and_close   Use to indicate to click the Save and Close button.
+	 */
+	public function saveMessageTemplate($and_close = false)
+	{
+		$this->actor()->scrollTo(MessagesPage::MESSAGES_CONTEXT_SWITCHER_SELECTOR);
+		if ($and_close) {
+			$this->actor()->click('Save and Close');
+		} else {
+			$this->actor()->click('Save');
+		}
+		$this->actor()->waitForText('successfully updated');
+	}
+
+
+	/**
+	 * This takes care of clicking the View Message icon for the given parameters.
+	 * Assumes you are already viewing the messages activity list table.
+	 * @param        $message_type_label
+	 * @param        $message_status
+	 * @param string $messenger
+	 * @param string $context
+	 * @param int    $number_in_set
+	 */
+	public function viewMessageInMessagesListTableFor(
+		$message_type_label,
+		$message_status = MessagesPage::MESSAGE_STATUS_SENT,
+		$messenger = 'Email',
+		$context = 'Event Admin',
+		$number_in_set = 1
+	) {
+		$this->actor()->click(MessagesPage::messagesActivityListTableViewButtonSelectorFor(
+			$message_type_label,
+			$message_status,
+			$messenger,
+			$context,
+			$number_in_set
+		));
+	}
+
+
+	/**
+	 * Takes care of deleting a message matching the given parameters via the message activity list table.
+	 * Assumes you are already viewing the messages activity list table.
+	 * @param        $message_type_label
+	 * @param        $message_status
+	 * @param string $messenger
+	 * @param string $context
+	 * @param int    $number_in_set
+	 */
+	public function deleteMessageInMessagesListTableFor(
+		$message_type_label,
+		$message_status = MessagesPage::MESSAGE_STATUS_SENT,
+		$messenger = 'Email',
+		$context = 'Event Admin',
+		$number_in_set = 1
+	) {
+		$delete_action_selector = MessagesPage::messagesActivityListTableDeleteActionSelectorFor(
+			$message_type_label,
+			$message_status,
+			$messenger,
+			$context,
+			$number_in_set
+		);
+		$cell_selector = MessagesPage::messagesActivityListTableCellSelectorFor(
+			'to',
+			$message_type_label,
+			$message_status,
+			$messenger,
+			$context,
+			'',
+			$number_in_set
+		);
+		$this->actor()->scrollTo($cell_selector, 0, -30);
+		$this->actor()->moveMouseOver(
+			$cell_selector,
+			5,
+			5
+		);
+		$this->actor()->waitForElementVisible(
+			$delete_action_selector
+		);
+		$this->actor()->click(
+			$delete_action_selector
+		);
+		$this->actor()->waitForText('successfully deleted', 20);
+	}
+
+
+	/**
+	 * Assuming you have already triggered the view modal for a single message from the context of the message activity
+	 * list table, this will take care of validating the given text is in that window.
+	 * @param string $text_to_view
+	 */
+	public function seeTextInViewMessageModal($text_to_view, $should_not_see = false)
+	{
+		$this->actor()->wait(2);
+		$this->actor()->waitForElementVisible('.ee-admin-dialog-container-inner-content');
+		$this->actor()->switchToIframe('message-view-window');
+		$should_not_see ? $this->actor()->dontSee($text_to_view) : $this->actor()->see($text_to_view);
+		$this->actor()->switchToIframe();
+	}
+
+
+	/**
+	 * This returns the value for the link at the given selector in the message modal.
+	 * @param string $selector (any selector string accepted by WebDriver)
+	 */
+	public function observeLinkAtSelectorInMessageModal($selector)
+	{
+		$this->actor()->wait(2);
+		$this->actor()->waitForElementVisible('.ee-admin-dialog-container-inner-content');
+		$this->actor()->switchToIframe('message-view-window');
+		$link = $this->actor()->observeLinkUrlAt($selector);
+		$this->actor()->switchToIframe();
+		return $link;
+	}
+
+
+	/**
+	 * Assuming you have already triggered the view modal for a single message from the context of the message activity
+	 * list table, this will take care of validating the given text is NOT that window.
+	 * @param string $text_to_view
+	 */
+	public function dontSeeTextInViewMessageModal($text_to_view)
+	{
+		$this->seeTextInViewMessageModal($text_to_view, true);
+	}
+
+
+	public function dismissMessageModal()
+	{
+		$this->actor()->executeJs('window.dialogHelper.closeModal()');
+		//this is needed otherwise phantom js gets stuck in the wrong context and any future element events will fail.
+		$this->actor()->scrollTo('form#EE_Message_List_Table-table-frm');
+		$this->actor()->click('form#EE_Message_List_Table-table-frm');
+	}
 }