eventespresso / event-espresso-core

core/services/currency/DefaultCalculator.php

Indentation +76 added lines, -76 removed lines

@@ -21,82 +21,82 @@
 
 
 
-    /**
-     * returns true if a calculator is supported as determined by loaded server extensions
-     *
-     * @return bool
-     */
-    public function isSupported()
-    {
-        return true;
-    }
-
-
-
-    /**
-     * adds the supplied Money amount to this Money amount
-     * and returns a new Money object
-     *
-     * @param float|int|string $amount
-     * @param float|int|string $amount_to_add
-     * @return string
-     */
-    public function add($amount, $amount_to_add)
-    {
-        return (string) ($amount + $amount_to_add);
-    }
-
-
-
-    /**
-     * subtracts the supplied Money amount from this Money amount
-     * and returns a new Money object
-     *
-     * @param float|int|string $amount
-     * @param float|int|string $amount_to_subtract
-     * @return string
-     */
-    public function subtract($amount, $amount_to_subtract)
-    {
-        return (string) ($amount - $amount_to_subtract);
-    }
-
-
-
-    /**
-     * multiplies this Money amount by the supplied $multiplier
-     * and returns a new Money object
-     *
-     * @param float|int|string $amount
-     * @param float|int|string $multiplier
-     * @param int              $precision
-     * @param int              $rounding_mode
-     * @return string
-     * @throws InvalidArgumentException
-     */
-    public function multiply($amount, $multiplier, $precision = 3, $rounding_mode = Calculator::ROUND_HALF_UP)
-    {
-        return $this->round(($amount * $multiplier), $precision, $rounding_mode);
-    }
-
-
-
-    /**
-     * divides this Money amount by the supplied $divisor
-     * and returns a new Money object
-     *
-     * @param float|int|string $amount
-     * @param float|int|string $divisor
-     * @param int              $precision
-     * @param int              $rounding_mode
-     * @return string
-     * @throws InvalidArgumentException
-     */
-    public function divide($amount, $divisor, $precision = 3, $rounding_mode = Calculator::ROUND_HALF_UP)
-    {
-        $this->validateDivisor($divisor);
-        return $this->round(($amount / $divisor), $precision, $rounding_mode);
-    }
+	/**
+	 * returns true if a calculator is supported as determined by loaded server extensions
+	 *
+	 * @return bool
+	 */
+	public function isSupported()
+	{
+		return true;
+	}
+
+
+
+	/**
+	 * adds the supplied Money amount to this Money amount
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $amount
+	 * @param float|int|string $amount_to_add
+	 * @return string
+	 */
+	public function add($amount, $amount_to_add)
+	{
+		return (string) ($amount + $amount_to_add);
+	}
+
+
+
+	/**
+	 * subtracts the supplied Money amount from this Money amount
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $amount
+	 * @param float|int|string $amount_to_subtract
+	 * @return string
+	 */
+	public function subtract($amount, $amount_to_subtract)
+	{
+		return (string) ($amount - $amount_to_subtract);
+	}
+
+
+
+	/**
+	 * multiplies this Money amount by the supplied $multiplier
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $amount
+	 * @param float|int|string $multiplier
+	 * @param int              $precision
+	 * @param int              $rounding_mode
+	 * @return string
+	 * @throws InvalidArgumentException
+	 */
+	public function multiply($amount, $multiplier, $precision = 3, $rounding_mode = Calculator::ROUND_HALF_UP)
+	{
+		return $this->round(($amount * $multiplier), $precision, $rounding_mode);
+	}
+
+
+
+	/**
+	 * divides this Money amount by the supplied $divisor
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $amount
+	 * @param float|int|string $divisor
+	 * @param int              $precision
+	 * @param int              $rounding_mode
+	 * @return string
+	 * @throws InvalidArgumentException
+	 */
+	public function divide($amount, $divisor, $precision = 3, $rounding_mode = Calculator::ROUND_HALF_UP)
+	{
+		$this->validateDivisor($divisor);
+		return $this->round(($amount / $divisor), $precision, $rounding_mode);
+	}
 
 
 

core/services/currency/InternationalMoneyFormatter.php

Indentation +9 added lines, -9 removed lines

@@ -21,15 +21,15 @@
 
 
 
-    /**
-     * @param string   $money_amount
-     * @param Currency $currency
-     * @return string
-     */
-    public function format($money_amount, Currency $currency)
-    {
-        return $money_amount . ' <span class="currency-code">(' . $currency->code() . ')</span>';
-    }
+	/**
+	 * @param string   $money_amount
+	 * @param Currency $currency
+	 * @return string
+	 */
+	public function format($money_amount, Currency $currency)
+	{
+		return $money_amount . ' <span class="currency-code">(' . $currency->code() . ')</span>';
+	}
 
 
 

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      */
     public function format($money_amount, Currency $currency)
     {
-        return $money_amount . ' <span class="currency-code">(' . $currency->code() . ')</span>';
+        return $money_amount.' <span class="currency-code">('.$currency->code().')</span>';
     }
 
 

core/entities/Label.php

Indentation +33 added lines, -33 removed lines

@@ -17,49 +17,49 @@
 class Label
 {
 
-    /**
-     * @var string $singular
-     */
-    public $singular;
+	/**
+	 * @var string $singular
+	 */
+	public $singular;
 
-    /**
-     * @var string $plural
-     */
-    public $plural;
+	/**
+	 * @var string $plural
+	 */
+	public $plural;
 
 
 
-    /**
-     * Label constructor.
-     *
-     * @param string $singular
-     * @param string $plural
-     */
-    public function __construct($singular, $plural)
-    {
-        $this->singular = $singular;
-        $this->plural = $plural;
-    }
+	/**
+	 * Label constructor.
+	 *
+	 * @param string $singular
+	 * @param string $plural
+	 */
+	public function __construct($singular, $plural)
+	{
+		$this->singular = $singular;
+		$this->plural = $plural;
+	}
 
 
 
-    /**
-     * @return string
-     */
-    public function singular()
-    {
-        return $this->singular;
-    }
+	/**
+	 * @return string
+	 */
+	public function singular()
+	{
+		return $this->singular;
+	}
 
 
 
-    /**
-     * @return string
-     */
-    public function plural()
-    {
-        return $this->plural;
-    }
+	/**
+	 * @return string
+	 */
+	public function plural()
+	{
+		return $this->plural;
+	}
 
 
 

core/entities/money/Currency.php

Indentation +248 added lines, -248 removed lines

@@ -23,260 +23,260 @@
 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
-     *
-     * @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;
-
-
-
-    /**
-     * Currency constructor.
-     *
-     * @param string $code
-     * @param Label  $label
-     * @param string $sign
-     * @param bool   $sign_b4
-     * @param int    $decimal_places
-     * @param string $decimal_mark
-     * @param string $thousands
-     */
-    private function __construct($code, Label $label, $sign, $sign_b4, $decimal_places, $decimal_mark, $thousands)
-    {
-        $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;
-    }
-
-
-
-    /**
-     * returns a Currency object for the supplied country code
-     *
-     * @param string $CNT_ISO
-     * @return Currency
-     * @throws InvalidArgumentException
-     */
-    public static function createFromCountryCode($CNT_ISO)
-    {
-        /** @var EE_Country $country */
-        $country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
-        if (! $country instanceof EE_Country){
-            throw new InvalidArgumentException(
-                sprintf(
-                    esc_html__(
-                        'A valid country could not be found for the "%1$s" country code;',
-                        'event_espresso'
-                    ),
-                    $CNT_ISO
-                )
-            );
-        }
-        return new Currency(
-            $country->currency_code(),
-            new Label(
-                $country->currency_name_single(),
-                $country->currency_name_plural()
-            ),
-            $country->currency_sign(),
-            $country->currency_sign_before(),
-            $country->currency_decimal_places(),
-            $country->currency_decimal_mark(),
-            $country->currency_thousands_separator()
-        );
-    }
-
-
-
-    /**
-     * returns a Currency object for the supplied currency code
-     * PLZ NOTE: variations may exist between how different countries display the same currency,
-     * so it may be necessary to use Currency::createFromCountryCode() to achieve the desired results
-     *
-     * @param string $code
-     * @return Currency
-     * @throws InvalidArgumentException
-     * @throws EE_Error
-     */
-    public static function createFromCode($code)
-    {
-        /** @var EE_Country $country */
-        $country = EEM_Country::instance()->get_one(array(array('CNT_cur_code' => $code)));
-        if (! $country instanceof EE_Country) {
-            throw new InvalidArgumentException(
-                sprintf(
-                    esc_html__(
-                        'A valid currency could not be found for the "%1$s" currency code;',
-                        'event_espresso'
-                    ),
-                    $code
-                )
-            );
-        }
-        return new Currency(
-            $country->currency_code(),
-            new Label(
-                $country->currency_name_single(),
-                $country->currency_name_plural()
-            ),
-            $country->currency_sign(),
-            $country->currency_sign_before(),
-            $country->currency_decimal_places(),
-            $country->currency_decimal_mark(),
-            $country->currency_thousands_separator()
-        );
-    }
-
-
-
-    /**
-     * 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;
-    }
+	/**
+	 * 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
+	 *
+	 * @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;
+
+
+
+	/**
+	 * Currency constructor.
+	 *
+	 * @param string $code
+	 * @param Label  $label
+	 * @param string $sign
+	 * @param bool   $sign_b4
+	 * @param int    $decimal_places
+	 * @param string $decimal_mark
+	 * @param string $thousands
+	 */
+	private function __construct($code, Label $label, $sign, $sign_b4, $decimal_places, $decimal_mark, $thousands)
+	{
+		$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;
+	}
+
+
+
+	/**
+	 * returns a Currency object for the supplied country code
+	 *
+	 * @param string $CNT_ISO
+	 * @return Currency
+	 * @throws InvalidArgumentException
+	 */
+	public static function createFromCountryCode($CNT_ISO)
+	{
+		/** @var EE_Country $country */
+		$country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
+		if (! $country instanceof EE_Country){
+			throw new InvalidArgumentException(
+				sprintf(
+					esc_html__(
+						'A valid country could not be found for the "%1$s" country code;',
+						'event_espresso'
+					),
+					$CNT_ISO
+				)
+			);
+		}
+		return new Currency(
+			$country->currency_code(),
+			new Label(
+				$country->currency_name_single(),
+				$country->currency_name_plural()
+			),
+			$country->currency_sign(),
+			$country->currency_sign_before(),
+			$country->currency_decimal_places(),
+			$country->currency_decimal_mark(),
+			$country->currency_thousands_separator()
+		);
+	}
+
+
+
+	/**
+	 * returns a Currency object for the supplied currency code
+	 * PLZ NOTE: variations may exist between how different countries display the same currency,
+	 * so it may be necessary to use Currency::createFromCountryCode() to achieve the desired results
+	 *
+	 * @param string $code
+	 * @return Currency
+	 * @throws InvalidArgumentException
+	 * @throws EE_Error
+	 */
+	public static function createFromCode($code)
+	{
+		/** @var EE_Country $country */
+		$country = EEM_Country::instance()->get_one(array(array('CNT_cur_code' => $code)));
+		if (! $country instanceof EE_Country) {
+			throw new InvalidArgumentException(
+				sprintf(
+					esc_html__(
+						'A valid currency could not be found for the "%1$s" currency code;',
+						'event_espresso'
+					),
+					$code
+				)
+			);
+		}
+		return new Currency(
+			$country->currency_code(),
+			new Label(
+				$country->currency_name_single(),
+				$country->currency_name_plural()
+			),
+			$country->currency_sign(),
+			$country->currency_sign_before(),
+			$country->currency_decimal_places(),
+			$country->currency_decimal_mark(),
+			$country->currency_thousands_separator()
+		);
+	}
+
+
+
+	/**
+	 * 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;
-    }
+	/**
+	 * @return string
+	 */
+	public function thousands()
+	{
+		return $this->thousands;
+	}
 
 
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->code();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->code();
+	}
 
 
 

Spacing +3 added lines, -3 removed lines

@@ -110,7 +110,7 @@ 
     {
         /** @var EE_Country $country */
         $country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
-        if (! $country instanceof EE_Country){
+        if ( ! $country instanceof EE_Country) {
             throw new InvalidArgumentException(
                 sprintf(
                     esc_html__(
@@ -151,7 +151,7 @@ 
     {
         /** @var EE_Country $country */
         $country = EEM_Country::instance()->get_one(array(array('CNT_cur_code' => $code)));
-        if (! $country instanceof EE_Country) {
+        if ( ! $country instanceof EE_Country) {
             throw new InvalidArgumentException(
                 sprintf(
                     esc_html__(
@@ -184,7 +184,7 @@ 
      * @param Currency $other
      * @return bool
      */
-    public function equals(Currency $other){
+    public function equals(Currency $other) {
         return $this->code() === $other->code();
     }
 

core/libraries/shortcodes/EE_Transaction_Shortcodes.lib.php

Indentation +604 added lines, -604 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 
@@ -28,612 +28,612 @@ 
 class EE_Transaction_Shortcodes extends EE_Shortcodes
 {
 
-    /**
-     * @var EE_Payment_Method $_invoice_pm the invoiec payment method for use in invoices etc
-     */
-    protected $_invoice_pm;
-
-
-
-    /**
-     * EE_Transaction_Shortcodes constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-
-
-    protected function _init_props()
-    {
-        $this->label = esc_html__('Transaction Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to transaction related data', 'event_espresso');
-        $this->_shortcodes = array(
-            '[TXN_ID]'                          => esc_html__('The transaction id for the purchase.', 'event_espresso'),
-            '[PAYMENT_URL]'                     => esc_html__('This is a link to make a payment for the event',
-                'event_espresso'),
-            '[PAYMENT_LINK_IF_NEEDED_*]'        => esc_html__('This is a special dynamic shortcode that allows one to insert a payment link conditional on there being amount owing on the transaction. Three params are available on this shortcode:',
-                    'event_espresso')
-                                                   . '<ul>'
-                                                   . '<li>'
-                                                   . sprintf(esc_html__('%sclass:%s This can be used to indicate css class is given to the containing css element (default is "callout").',
-                    'event_espresso'), '<strong>', '</strong>')
-                                                   . '</li>'
-                                                   . '<li>'
-                                                   . sprintf(esc_html__('%scustom_text:%s This should be a sprintf format text string (with %%s for where the hyperlink tags go) that is used for the generated link text (The default is "You can %%smake a payment here »%%s.)',
-                    'event_espresso'), '<strong>', '</strong>')
-                                                   . '</li>'
-                                                   . '<li>'
-                                                   . sprintf(esc_html__('%scontainer_tag:%s Use this to indicate what container tag you want surrounding the payment link (default is "p").',
-                    'event_espresso'), '<strong>', '</strong>')
-                                                   . '</li>'
-                                                   . '</ul>',
-            '[PAYMENT_DUE_DATE_*]'              => esc_html__('This is a special dynamic shortcode that allows one to output a payment due date.  It will only result in a date shown if there is money owing.  Three parameters are available on this shortcode:',
-                    'event_espresso')
-                                                   . '<ul>'
-                                                   . '<li>'
-                                                   . sprintf(esc_html__('%sformat:%s This is used to indicate what format the date is in.  Default is whatever is set as date formats for your website.',
-                    'event_espresso'), '<strong>', '</strong>')
-                                                   . '</li>'
-                                                   . '<li>'
-                                                   . sprintf(esc_html__('%sdays_until_due:%s This is the number of days form the transaction creation date that the payment is due.  Defaults to 30.',
-                    'event_espresso'), '<strong>', '</strong>')
-                                                   . '</li>'
-                                                   . '<li>'
-                                                   . sprintf(esc_html__('%sprefix_text:%s You can use this to indicate what text will prefix the date string.  Defaults to "Payment in full due by:"',
-                    'event_espresso'), '<strong>', '</strong>')
-                                                   . '</li>',
-            '[INVOICE_LINK]'                    => esc_html__('This is a full html link to the invoice',
-                'event_espresso'),
-            '[INVOICE_URL]'                     => esc_html__('This is just the url for the invoice', 'event_espresso'),
-            '[INVOICE_LOGO_URL]'                => esc_html__('This returns the url for the logo uploaded via the invoice settings page.',
-                'event_espresso'),
-            '[INVOICE_LOGO]'                    => esc_html__('This returns the logo uploaded via the invoice settings page wrapped in img_tags and with a "logo screen" classes. The image size is also set in the img tags automatically to match the uploaded logo.',
-                'event_espresso'),
-            '[INVOICE_PAYEE_NAME]'              => esc_html__('This will parse to either: the value of the "Company Name" field in the invoice payment method settings; if that is blank, then the value of the Company Name in the "Your Organization Settings", if that is blank then an empty string.',
-                'event_espresso'),
-            '[INVOICE_PAYEE_ADDRESS]'           => esc_html__('This will parse to either: the value of the "Company Address" field in the invoice payment method settings; if that is blank, then the value of the Company Address in the "Your Organization Settings", if that is blank then an empty string.',
-                'event_espresso'),
-            '[INVOICE_PAYMENT_INSTRUCTIONS]'    => esc_html__('This will parse to the value of the "Payment Instructions" field found on the Invoice payment methods settings page',
-                'event_espresso'),
-            '[INVOICE_PAYEE_EMAIL]'             => esc_html__('This will parse to either: the value of the "Company Email" field in the invoice payment method settings; if that is blank, then the value of the Company Email in the "Your Organization Settings", if that is blank then an empty string.',
-                'event_espresso'),
-            '[INVOICE_PAYEE_TAX_NUMBER_*]'      => sprintf(esc_html__('This will parse to either: the value of the "Company Tax Number" field in the invoice payment method settings; if that is blank, then the value of the Company Tax Number in the "Your Organization Settings", if that is blank then an empty string. Note this is also a special dynamic shortcode. You can use the "prefix" parameter to indicate what text you want to use as a prefix before this tax number.  It defaults to "VAT/Tax Number:". To change this prefix you do the following format for this shortcode: %1$s[INVOICE_PAYEE_TAX_NUMBER_* prefix="GST:"]%2$s and that will output: GST: 12345t56.  If you have no tax number in your settings, then no prefix will be output either.',
-                'event_espresso'), '<code>', '</code>'),
-            '[TOTAL_COST]'                      => esc_html__('The total cost for the transaction', 'event_espresso'),
-            '[TXN_STATUS]'                      => esc_html__('The transaction status for the transaction.',
-                'event_espresso'),
-            '[TXN_STATUS_ID]'                   => esc_html__('The ID representing the transaction status as saved in the db.  This tends to be useful for including with css classes for styling certain statuses differently from others.',
-                'event_espresso'),
-            '[PAYMENT_STATUS]'                  => esc_html__('The transaction status for the transaction. This parses to the same value as the [TXN_STATUS] shortcode and still remains here for legacy support.',
-                'event_espresso'),
-            '[PAYMENT_GATEWAY]'                 => esc_html__('The payment gateway used for the transaction',
-                'event_espresso'),
-            '[AMOUNT_PAID]'                     => esc_html__('The amount paid or refunded.  This will only have a value if there was a payment or refund at the time of generating the message.',
-                'event_espresso'),
-            '[LAST_AMOUNT_PAID]'                => esc_html__('This is the last payment or refund made on the transaction related to the message being generated.',
-                'event_espresso'),
-            '[TOTAL_AMOUNT_PAID]'               => esc_html__('This parses to the total amount paid over all payments',
-                'event_espresso'),
-            '[TOTAL_OWING]'                     => esc_html__('The total owing on a transaction with no attributes.',
-                'event_espresso'),
-            '[TXN_SUBTOTAL]'                    => esc_html__('The subtotal for all txn line items.', 'event_espresso'),
-            '[TXN_TAX_SUBTOTAL]'                => esc_html__('The subtotal for all tax line items.', 'event_espresso'),
-            '[OWING_STATUS_MESSAGE_*]'          => esc_html__('A dynamic shortcode for adjusting how total owing gets shown. The acceptable attributes on the shortcode are:',
-                    'event_espresso')
-                                                   . '<p></ul>'
-                                                   .
-                                                   '<li><strong>still_owing</strong>:'
-                                                   . esc_html__('If the transaction is not paid in full, then whatever is set for this attribute is shown (otherwise its just the amount owing). The default is:',
-                    'event_espresso')
-                                                   . sprintf(esc_html__('%sPlease make a payment.%s', 'event_espresso'),
-                    '<a href="[PAYMENT_URL]" class="noPrint">', '</a>')
-                                                   . '</li>'
-                                                   .
-                                                   '<li><strong>none_owing</strong>:'
-                                                   . esc_html__('If the transaction is paid in full, then you can indicate how this gets displayed.  Note, that it defaults to just be the total owing.',
-                    'event_espresso')
-                                                   . '</li></ul></p>',
-            '[TXN_TOTAL_TICKETS]'               => esc_html__('The total number of all tickets purchased in a transaction',
-                'event_espresso'),
-            '[TKT_QTY_PURCHASED]'               => sprintf(esc_html__('The total number of all tickets purchased in a transaction. %1$sNOTE: This shortcode is good to use in the "[TICKET_LIST]" field but has been deprecated from all other contexts in favor of the more explicit [TXN_TOTAL_TICKETS] shortcode.%2$s',
-                'event_espresso'), '<strong>', '</strong>'),
-            '[TRANSACTION_ADMIN_URL]'           => esc_html__('The url to the admin page for this transaction',
-                'event_espresso'),
-            '[RECEIPT_URL]'                     => esc_html__('This parses to the generated url for retrieving the receipt for the transaction',
-                'event_espresso'),
-            '[INVOICE_RECEIPT_SWITCHER_URL]'    => esc_html__('This parses to the url that will switch to the receipt if an invoice is displayed, and switch to the invoice if receipt is displayed. If a message type OTHER than invoice or receipt is displayed then this will just return the url for the invoice. If the related message type is not active  then will parse to an empty string.',
-                'event_espresso'),
-            '[INVOICE_RECEIPT_SWITCHER_BUTTON]' => sprintf(esc_html__('The same as %1$s[INVOICE_RECEIPT_SWITCHER_URL]%2$s except this returns the html for a button linked to the invoice or receipt.',
-                'event_espresso'), '<code>', '</code>'),
-        );
-    }
-
-
-
-    /**
-     * @access protected
-     * @param  string $shortcode the shortcode to be parsed.
-     * @return string parsed shortcode
-     */
-    protected function _parser($shortcode)
-    {
-        //attempt to get the transaction.  Since this is potentially used in more fields, we may have to look in the _extra_data for the transaction.
-        $transaction = $this->_data->txn instanceof EE_Transaction ? $this->_data->txn : null;
-        $transaction = ! $transaction instanceof EE_Transaction
-                       && is_array($this->_extra_data)
-                       && isset($this->_extra_data['data'])
-                       && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->txn
-            : $transaction;
-        //payment
-        $payment = $this->_data->payment instanceof EE_Payment ? $this->_data->payment : null;
-        $payment = ! $payment instanceof EE_Payment
-                   && is_array($this->_extra_data)
-                   && isset($this->_extra_data['data'])
-                   && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->payment
-            : $payment;
-        if (! $transaction instanceof EE_Transaction) {
-            return '';
-        }
-        switch ($shortcode) {
-            case '[TXN_ID]' :
-                return $transaction->ID();
-                break;
-            case '[PAYMENT_URL]' :
-                $payment_url = $transaction->payment_overview_url();
-                return empty($payment_url) ? esc_html__('http://dummypaymenturlforpreview.com', 'event_espresso')
-                    : $payment_url;
-                break;
-            case '[INVOICE_LINK]' :
-                $invoice_url = $transaction->invoice_url();
-                $invoice_url = empty($invoice_url) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
-                return sprintf(esc_html__('%sClick here for Invoice%s', 'event_espresso'),
-                    '<a href="' . $invoice_url . '">', '</a>');
-                break; /**/
-            case '[INVOICE_URL]' :
-                $invoice_url = $transaction->invoice_url();
-                return empty($invoice_url) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
-                break;
-            case '[INVOICE_LOGO_URL]' :
-                return $this->_get_invoice_logo();
-                break;
-            case '[INVOICE_LOGO]' :
-                return $this->_get_invoice_logo(true);
-                break;
-            case '[INVOICE_PAYEE_NAME]' :
-                return $this->_get_invoice_payee_name();
-                break;
-            case '[INVOICE_PAYEE_ADDRESS]' :
-                return $this->_get_invoice_payee_address();
-                break;
-            case '[INVOICE_PAYMENT_INSTRUCTIONS]' :
-                return $this->_get_invoice_payment_instructions();
-                break;
-            case '[INVOICE_PAYEE_EMAIL]' :
-                return $this->_get_invoice_payee_email();
-                break;
-            case '[TOTAL_COST]' :
-                $total = $transaction->total();
-                return ! empty($total) ? EEH_Template::format_currency($total) : '';
-                break;
-            case '[PAYMENT_STATUS]' :
-                $status = $transaction->pretty_status();
-                return ! empty($status) ? $status : esc_html__('Unknown', 'event_espresso');
-                break; /**/
-            // note the [payment_status] shortcode is kind of misleading because payment status might be different from txn status so I'm adding this here for clarity.
-            case '[TXN_STATUS]':
-                $status = $transaction->pretty_status();
-                return ! empty($status) ? $status : esc_html__('Unknown', 'event_espresso');
-                break;
-            case '[TXN_STATUS_ID]' :
-                return $transaction->status_ID();
-                break;
-            case '[PAYMENT_GATEWAY]' :
-                return $this->_get_payment_gateway($transaction);
-                break;
-            case '[AMOUNT_PAID]' :
-                return $payment instanceof EE_Payment
-                    ? EEH_Template::format_currency($payment->amount())
-                    : EEH_Template::format_currency(0);
-                break;
-            case '[LAST_AMOUNT_PAID]' :
-                $last_payment = $transaction->last_payment();
-                return $last_payment instanceof EE_Payment
-                    ? EEH_Template::format_currency($last_payment->amount())
-                    : EEH_Template::format_currency(0);
-            case '[TOTAL_AMOUNT_PAID]' :
-                return EEH_Template::format_currency($transaction->paid());
-                break;
-            case '[TOTAL_OWING]' :
-                $total_owing = $transaction->remaining();
-                return EEH_Template::format_currency($total_owing);
-                break;
-            case '[TXN_SUBTOTAL]' :
-                return EEH_Template::format_currency($this->_get_subtotal());
-                break;
-            case '[TXN_TAX_SUBTOTAL]' :
-                return EEH_Template::format_currency($this->_get_subtotal(true));
-                break;
-            case '[TKT_QTY_PURCHASED]' :
-            case '[TXN_TOTAL_TICKETS]' :
-                return $this->_data->total_ticket_count;
-                break;
-            case '[TRANSACTION_ADMIN_URL]' :
-                require_once EE_CORE . 'admin/EE_Admin_Page.core.php';
-                $query_args = array(
-                    'page'   => 'espresso_transactions',
-                    'action' => 'view_transaction',
-                    'TXN_ID' => $transaction->ID(),
-                );
-                $url = EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php'));
-                return $url;
-                break;
-            case '[RECEIPT_URL]' :
-                //get primary_registration
-                $reg = $this->_data->primary_reg_obj;
-                if (! $reg instanceof EE_Registration) {
-                    return '';
-                }
-                return $reg->receipt_url();
-                break;
-            case '[INVOICE_RECEIPT_SWITCHER_URL]' :
-                return $this->_get_invoice_receipt_switcher(false);
-                break;
-            case '[INVOICE_RECEIPT_SWITCHER_BUTTON]' :
-                return $this->_get_invoice_receipt_switcher();
-                break;
-        }
-        if (strpos($shortcode, '[OWING_STATUS_MESSAGE_*') !== false) {
-            return $this->_get_custom_total_owing($shortcode);
-        }
-        if (strpos($shortcode, '[INVOICE_PAYEE_TAX_NUMBER_*') !== false) {
-            return $this->_get_invoice_payee_tax_number($shortcode);
-        }
-        if (strpos($shortcode, '[PAYMENT_LINK_IF_NEEDED_*') !== false) {
-            return $this->_get_payment_link_if_needed($shortcode);
-        }
-        if (strpos($shortcode, '[PAYMENT_DUE_DATE_*') !== false) {
-            return $this->_get_payment_due_date($shortcode, $transaction);
-        }
-        return '';
-    }
-
-
-
-    /**
-     * parser for the [OWING_STATUS_MESSAGE_*] attribute type shortcode
-     *
-     * @since 4.5.0
-     * @param string $shortcode the incoming shortcode
-     * @return string parsed.
-     */
-    private function _get_custom_total_owing($shortcode)
-    {
-        $valid_shortcodes = array('transaction');
-        $attrs = $this->_get_shortcode_attrs($shortcode);
-        //ensure default is set.
-        $addressee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
-        $total_owing = $addressee instanceof EE_Messages_Addressee && $addressee->txn instanceof EE_Transaction
-            ? $addressee->txn->remaining() : 0;
-        if ($total_owing > 0) {
-            $owing_content = ! empty($attrs['still_owing'])
-                ? $attrs['still_owing']
-                : sprintf(esc_html__('%sPlease make a payment.%s', 'event_espresso'),
-                    '<a href="[PAYMENT_URL]" class="noPrint">', '</a>');
-            $owing_content = $this->_shortcode_helper->parse_message_template($owing_content, $addressee,
-                $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message);
-        } else {
-            $owing_content = ! empty($attrs['none_owing']) ? $attrs['none_owing'] : '';
-        }
-        return $owing_content;
-    }
-
-
-
-    /**
-     * @param EE_Transaction $transaction
-     * @return string
-     */
-    private function _get_payment_gateway($transaction)
-    {
-        $pm = $this->_get_invoice_payment_method($transaction);
-        return $pm instanceof EE_Payment_Method ? $pm->name() : '';
-    }
-
-
-
-    /**
-     * This retrieves a logo to be used for the invoice from whatever is set on the invoice logo settings page.  If its
-     * not present then the organization logo is used if its found (set on the organization settings page).
-     *
-     * @since 4.5.0
-     * @param bool $img_tags TRUE means to return with the img tag wrappers.  False just returns the url to the image.
-     * @return string url or html
-     */
-    private function _get_invoice_logo($img_tags = false)
-    {
-        //try to get the invoice payment method's logo for this transaction image first
-        $pm = $this->_get_invoice_payment_method();
-        if ($pm instanceof EE_Payment_Method) {
-            $invoice_logo_url = $pm->get_extra_meta('pdf_logo_image', true);
-        } else {
-            $invoice_logo_url = null;
-        }
-        if (empty($invoice_logo_url)) {
-            $invoice_logo_url = EE_Registry::instance()->CFG->organization->logo_url;
-        }
-        if (empty($invoice_logo_url)) {
-            return '';
-        }
-        if (! $img_tags) {
-            return $invoice_logo_url;
-        }
-        //image tags have been requested.
-        $image_size = getimagesize($invoice_logo_url);
-        //if image is wider than 300px, set the width to 300
-        if ($image_size[0] > 300) {
-            $image_width = 300;
-        } else {
-            $image_width = $image_size[0];
-        }
-        return '<img class="logo screen" src="' . $invoice_logo_url . '" width="' . $image_width . '" alt="logo" />';
-    }
-
-
-
-    /**
-     * Used to retrieve the appropriate content for the invoice payee name shortcode
-     *
-     * @since 4.5.0
-     * @return string
-     */
-    private function _get_invoice_payee_name()
-    {
-        $payee_name = null;
-        $pm = $this->_get_invoice_payment_method();
-        if ($pm instanceof EE_Payment_Method) {
-            $payee_name = $pm->get_extra_meta('pdf_payee_name', true);
-        }
-        $payee_name = empty($payee_name) ? EE_Registry::instance()->CFG->organization->get_pretty('name') : $payee_name;
-        return $payee_name;
-    }
-
-
-
-    /**
-     * gets the default invoice payment method, but has a filter so it can be overridden
-     *
-     * @return \EE_Payment_Method|null
-     */
-    private function _get_invoice_payment_method()
-    {
-        if (! $this->_invoice_pm instanceof EE_Payment_Method) {
-            $transaction = $this->_data->txn instanceof EE_Transaction ? $this->_data->txn : null;
-            $transaction = ! $transaction instanceof EE_Transaction
-                           && is_array($this->_extra_data)
-                           && isset($this->_extra_data['data'])
-                           && $this->_extra_data['data'] instanceof EE_Messages_Addressee
-                ? $this->_extra_data['data']->txn : $transaction;
-            //get the invoice payment method, and remember it for the next call too
-            $this->_invoice_pm = apply_filters('FHEE__EE_Transaction_Shortcodes__get_payment_method__default',
-                EEM_Payment_Method::instance()->get_one_of_type('Invoice'), $transaction);
-        }
-        return $this->_invoice_pm;
-    }
-
-
-
-    /**
-     * Used to retrieve the appropriate content for the invoice payee email shortcode
-     *
-     * @since 4.5.0
-     * @return string
-     */
-    private function _get_invoice_payee_email()
-    {
-        $payee_email = null;
-        $pm = $this->_get_invoice_payment_method();
-        if ($pm instanceof EE_Payment_Method) {
-            $payee_email = $pm->get_extra_meta('pdf_payee_email', true);
-        }
-        $payee_email = empty($payee_email) ? EE_Registry::instance()->CFG->organization->get_pretty('email')
-            : $payee_email;
-        return $payee_email;
-    }
-
-
-
-    /**
-     * Used to retrieve the appropriate content for the invoice payee tax number shortcode
-     *
-     * @since 4.5.0
-     * @param string $shortcode
-     * @return string
-     */
-    private function _get_invoice_payee_tax_number($shortcode)
-    {
-        $payee_tax_number = null;
-        $pm = $this->_get_invoice_payment_method();
-        if ($pm instanceof EE_Payment_Method) {
-            $payee_tax_number = $pm->get_extra_meta('pdf_payee_tax_number', true);
-        }
-        $payee_tax_number = empty($payee_tax_number) ? EE_Registry::instance()->CFG->organization->vat
-            : $payee_tax_number;
-        if (empty($payee_tax_number)) {
-            return '';
-        }
-        //any attributes?
-        $attrs = $this->_get_shortcode_attrs($shortcode);
-        //prefix?
-        $prefix = isset($attrs['prefix']) ? $attrs['prefix'] : esc_html__('VAT/Tax Number: ', 'event_espresso');
-        return $prefix . $payee_tax_number;
-    }
-
-
-
-    /**
-     * Used to retrieve the appropriate content for the invoice payee address shortcode.
-     *
-     * @since 4.5.0
-     * @return string
-     */
-    private function _get_invoice_payee_address()
-    {
-        $payee_address = null;
-        $pm = $this->_get_invoice_payment_method();
-        if ($pm instanceof EE_Payment_Method) {
-            $payee_address = $pm->get_extra_meta('pdf_payee_address', true);
-        }
-        if (empty($payee_address)) {
-            $organization = EE_Registry::instance()->CFG->organization;
-            $payee_address = $organization->get_pretty('address_1') . '<br>';
-            $payee_address .= ! empty($organization->address_2) ? $organization->get_pretty('address_2') . '<br>' : '';
-            $payee_address .= $organization->get_pretty('city') . '<br>';
-            //state
-            $state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
-            $payee_address .= $state instanceof EE_State ? $state->name() : '';
-            //Country
-            $payee_address .= ! empty($organization->CNT_ISO) ? ', ' . $organization->CNT_ISO . '<br>' : '';
-            $payee_address .= ! empty($organization->zip) ? $organization->zip : '';
-        }
-        return $payee_address;
-    }
-
-
-
-    /**
-     * Used to retrieve the appropriate content for the invoice payment instructions shortcode.
-     *
-     * @since 4.5.0
-     * @return string
-     */
-    private function _get_invoice_payment_instructions()
-    {
-        $instructions = null;
-        $pm = $this->_get_invoice_payment_method();
-        return ($pm instanceof EE_Payment_Method) ? $pm->get_extra_meta('pdf_instructions', true) : '';
-    }
-
-
-
-    /**
-     * get invoice/receipt switch button or url.
-     *
-     * @param bool $button true (default) returns the html for a button, false just returns the url.
-     * @return string
-     */
-    protected function _get_invoice_receipt_switcher($button = true)
-    {
-        $reg = $this->_data->primary_reg_obj;
-        $message_type = isset($this->_extra_data['message_type']) ? $this->_extra_data['message_type'] : '';
-        if (! $reg instanceof EE_Registration || empty($message_type)) {
-            return '';
-        }
-        $switch_to_invoice = ! $message_type instanceof EE_Invoice_message_type ? true : false;
-        $switch_to_label = $switch_to_invoice && ! $message_type instanceof EE_Receipt_message_type
-            ? esc_html__('View Invoice', 'event_espresso') : esc_html__('Switch to Invoice', 'event_espresso');
-        $switch_to_label = ! $switch_to_invoice ? esc_html__('Switch to Receipt', 'event_espresso') : $switch_to_label;
-        $switch_to_url = $switch_to_invoice ? $reg->invoice_url() : $reg->receipt_url();
-        if (! $button) {
-            return $switch_to_url;
-        }
-        if (! empty($switch_to_url)) {
-            return '
+	/**
+	 * @var EE_Payment_Method $_invoice_pm the invoiec payment method for use in invoices etc
+	 */
+	protected $_invoice_pm;
+
+
+
+	/**
+	 * EE_Transaction_Shortcodes constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+
+
+	protected function _init_props()
+	{
+		$this->label = esc_html__('Transaction Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to transaction related data', 'event_espresso');
+		$this->_shortcodes = array(
+			'[TXN_ID]'                          => esc_html__('The transaction id for the purchase.', 'event_espresso'),
+			'[PAYMENT_URL]'                     => esc_html__('This is a link to make a payment for the event',
+				'event_espresso'),
+			'[PAYMENT_LINK_IF_NEEDED_*]'        => esc_html__('This is a special dynamic shortcode that allows one to insert a payment link conditional on there being amount owing on the transaction. Three params are available on this shortcode:',
+					'event_espresso')
+												   . '<ul>'
+												   . '<li>'
+												   . sprintf(esc_html__('%sclass:%s This can be used to indicate css class is given to the containing css element (default is "callout").',
+					'event_espresso'), '<strong>', '</strong>')
+												   . '</li>'
+												   . '<li>'
+												   . sprintf(esc_html__('%scustom_text:%s This should be a sprintf format text string (with %%s for where the hyperlink tags go) that is used for the generated link text (The default is "You can %%smake a payment here »%%s.)',
+					'event_espresso'), '<strong>', '</strong>')
+												   . '</li>'
+												   . '<li>'
+												   . sprintf(esc_html__('%scontainer_tag:%s Use this to indicate what container tag you want surrounding the payment link (default is "p").',
+					'event_espresso'), '<strong>', '</strong>')
+												   . '</li>'
+												   . '</ul>',
+			'[PAYMENT_DUE_DATE_*]'              => esc_html__('This is a special dynamic shortcode that allows one to output a payment due date.  It will only result in a date shown if there is money owing.  Three parameters are available on this shortcode:',
+					'event_espresso')
+												   . '<ul>'
+												   . '<li>'
+												   . sprintf(esc_html__('%sformat:%s This is used to indicate what format the date is in.  Default is whatever is set as date formats for your website.',
+					'event_espresso'), '<strong>', '</strong>')
+												   . '</li>'
+												   . '<li>'
+												   . sprintf(esc_html__('%sdays_until_due:%s This is the number of days form the transaction creation date that the payment is due.  Defaults to 30.',
+					'event_espresso'), '<strong>', '</strong>')
+												   . '</li>'
+												   . '<li>'
+												   . sprintf(esc_html__('%sprefix_text:%s You can use this to indicate what text will prefix the date string.  Defaults to "Payment in full due by:"',
+					'event_espresso'), '<strong>', '</strong>')
+												   . '</li>',
+			'[INVOICE_LINK]'                    => esc_html__('This is a full html link to the invoice',
+				'event_espresso'),
+			'[INVOICE_URL]'                     => esc_html__('This is just the url for the invoice', 'event_espresso'),
+			'[INVOICE_LOGO_URL]'                => esc_html__('This returns the url for the logo uploaded via the invoice settings page.',
+				'event_espresso'),
+			'[INVOICE_LOGO]'                    => esc_html__('This returns the logo uploaded via the invoice settings page wrapped in img_tags and with a "logo screen" classes. The image size is also set in the img tags automatically to match the uploaded logo.',
+				'event_espresso'),
+			'[INVOICE_PAYEE_NAME]'              => esc_html__('This will parse to either: the value of the "Company Name" field in the invoice payment method settings; if that is blank, then the value of the Company Name in the "Your Organization Settings", if that is blank then an empty string.',
+				'event_espresso'),
+			'[INVOICE_PAYEE_ADDRESS]'           => esc_html__('This will parse to either: the value of the "Company Address" field in the invoice payment method settings; if that is blank, then the value of the Company Address in the "Your Organization Settings", if that is blank then an empty string.',
+				'event_espresso'),
+			'[INVOICE_PAYMENT_INSTRUCTIONS]'    => esc_html__('This will parse to the value of the "Payment Instructions" field found on the Invoice payment methods settings page',
+				'event_espresso'),
+			'[INVOICE_PAYEE_EMAIL]'             => esc_html__('This will parse to either: the value of the "Company Email" field in the invoice payment method settings; if that is blank, then the value of the Company Email in the "Your Organization Settings", if that is blank then an empty string.',
+				'event_espresso'),
+			'[INVOICE_PAYEE_TAX_NUMBER_*]'      => sprintf(esc_html__('This will parse to either: the value of the "Company Tax Number" field in the invoice payment method settings; if that is blank, then the value of the Company Tax Number in the "Your Organization Settings", if that is blank then an empty string. Note this is also a special dynamic shortcode. You can use the "prefix" parameter to indicate what text you want to use as a prefix before this tax number.  It defaults to "VAT/Tax Number:". To change this prefix you do the following format for this shortcode: %1$s[INVOICE_PAYEE_TAX_NUMBER_* prefix="GST:"]%2$s and that will output: GST: 12345t56.  If you have no tax number in your settings, then no prefix will be output either.',
+				'event_espresso'), '<code>', '</code>'),
+			'[TOTAL_COST]'                      => esc_html__('The total cost for the transaction', 'event_espresso'),
+			'[TXN_STATUS]'                      => esc_html__('The transaction status for the transaction.',
+				'event_espresso'),
+			'[TXN_STATUS_ID]'                   => esc_html__('The ID representing the transaction status as saved in the db.  This tends to be useful for including with css classes for styling certain statuses differently from others.',
+				'event_espresso'),
+			'[PAYMENT_STATUS]'                  => esc_html__('The transaction status for the transaction. This parses to the same value as the [TXN_STATUS] shortcode and still remains here for legacy support.',
+				'event_espresso'),
+			'[PAYMENT_GATEWAY]'                 => esc_html__('The payment gateway used for the transaction',
+				'event_espresso'),
+			'[AMOUNT_PAID]'                     => esc_html__('The amount paid or refunded.  This will only have a value if there was a payment or refund at the time of generating the message.',
+				'event_espresso'),
+			'[LAST_AMOUNT_PAID]'                => esc_html__('This is the last payment or refund made on the transaction related to the message being generated.',
+				'event_espresso'),
+			'[TOTAL_AMOUNT_PAID]'               => esc_html__('This parses to the total amount paid over all payments',
+				'event_espresso'),
+			'[TOTAL_OWING]'                     => esc_html__('The total owing on a transaction with no attributes.',
+				'event_espresso'),
+			'[TXN_SUBTOTAL]'                    => esc_html__('The subtotal for all txn line items.', 'event_espresso'),
+			'[TXN_TAX_SUBTOTAL]'                => esc_html__('The subtotal for all tax line items.', 'event_espresso'),
+			'[OWING_STATUS_MESSAGE_*]'          => esc_html__('A dynamic shortcode for adjusting how total owing gets shown. The acceptable attributes on the shortcode are:',
+					'event_espresso')
+												   . '<p></ul>'
+												   .
+												   '<li><strong>still_owing</strong>:'
+												   . esc_html__('If the transaction is not paid in full, then whatever is set for this attribute is shown (otherwise its just the amount owing). The default is:',
+					'event_espresso')
+												   . sprintf(esc_html__('%sPlease make a payment.%s', 'event_espresso'),
+					'<a href="[PAYMENT_URL]" class="noPrint">', '</a>')
+												   . '</li>'
+												   .
+												   '<li><strong>none_owing</strong>:'
+												   . esc_html__('If the transaction is paid in full, then you can indicate how this gets displayed.  Note, that it defaults to just be the total owing.',
+					'event_espresso')
+												   . '</li></ul></p>',
+			'[TXN_TOTAL_TICKETS]'               => esc_html__('The total number of all tickets purchased in a transaction',
+				'event_espresso'),
+			'[TKT_QTY_PURCHASED]'               => sprintf(esc_html__('The total number of all tickets purchased in a transaction. %1$sNOTE: This shortcode is good to use in the "[TICKET_LIST]" field but has been deprecated from all other contexts in favor of the more explicit [TXN_TOTAL_TICKETS] shortcode.%2$s',
+				'event_espresso'), '<strong>', '</strong>'),
+			'[TRANSACTION_ADMIN_URL]'           => esc_html__('The url to the admin page for this transaction',
+				'event_espresso'),
+			'[RECEIPT_URL]'                     => esc_html__('This parses to the generated url for retrieving the receipt for the transaction',
+				'event_espresso'),
+			'[INVOICE_RECEIPT_SWITCHER_URL]'    => esc_html__('This parses to the url that will switch to the receipt if an invoice is displayed, and switch to the invoice if receipt is displayed. If a message type OTHER than invoice or receipt is displayed then this will just return the url for the invoice. If the related message type is not active  then will parse to an empty string.',
+				'event_espresso'),
+			'[INVOICE_RECEIPT_SWITCHER_BUTTON]' => sprintf(esc_html__('The same as %1$s[INVOICE_RECEIPT_SWITCHER_URL]%2$s except this returns the html for a button linked to the invoice or receipt.',
+				'event_espresso'), '<code>', '</code>'),
+		);
+	}
+
+
+
+	/**
+	 * @access protected
+	 * @param  string $shortcode the shortcode to be parsed.
+	 * @return string parsed shortcode
+	 */
+	protected function _parser($shortcode)
+	{
+		//attempt to get the transaction.  Since this is potentially used in more fields, we may have to look in the _extra_data for the transaction.
+		$transaction = $this->_data->txn instanceof EE_Transaction ? $this->_data->txn : null;
+		$transaction = ! $transaction instanceof EE_Transaction
+					   && is_array($this->_extra_data)
+					   && isset($this->_extra_data['data'])
+					   && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->txn
+			: $transaction;
+		//payment
+		$payment = $this->_data->payment instanceof EE_Payment ? $this->_data->payment : null;
+		$payment = ! $payment instanceof EE_Payment
+				   && is_array($this->_extra_data)
+				   && isset($this->_extra_data['data'])
+				   && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->payment
+			: $payment;
+		if (! $transaction instanceof EE_Transaction) {
+			return '';
+		}
+		switch ($shortcode) {
+			case '[TXN_ID]' :
+				return $transaction->ID();
+				break;
+			case '[PAYMENT_URL]' :
+				$payment_url = $transaction->payment_overview_url();
+				return empty($payment_url) ? esc_html__('http://dummypaymenturlforpreview.com', 'event_espresso')
+					: $payment_url;
+				break;
+			case '[INVOICE_LINK]' :
+				$invoice_url = $transaction->invoice_url();
+				$invoice_url = empty($invoice_url) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
+				return sprintf(esc_html__('%sClick here for Invoice%s', 'event_espresso'),
+					'<a href="' . $invoice_url . '">', '</a>');
+				break; /**/
+			case '[INVOICE_URL]' :
+				$invoice_url = $transaction->invoice_url();
+				return empty($invoice_url) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
+				break;
+			case '[INVOICE_LOGO_URL]' :
+				return $this->_get_invoice_logo();
+				break;
+			case '[INVOICE_LOGO]' :
+				return $this->_get_invoice_logo(true);
+				break;
+			case '[INVOICE_PAYEE_NAME]' :
+				return $this->_get_invoice_payee_name();
+				break;
+			case '[INVOICE_PAYEE_ADDRESS]' :
+				return $this->_get_invoice_payee_address();
+				break;
+			case '[INVOICE_PAYMENT_INSTRUCTIONS]' :
+				return $this->_get_invoice_payment_instructions();
+				break;
+			case '[INVOICE_PAYEE_EMAIL]' :
+				return $this->_get_invoice_payee_email();
+				break;
+			case '[TOTAL_COST]' :
+				$total = $transaction->total();
+				return ! empty($total) ? EEH_Template::format_currency($total) : '';
+				break;
+			case '[PAYMENT_STATUS]' :
+				$status = $transaction->pretty_status();
+				return ! empty($status) ? $status : esc_html__('Unknown', 'event_espresso');
+				break; /**/
+			// note the [payment_status] shortcode is kind of misleading because payment status might be different from txn status so I'm adding this here for clarity.
+			case '[TXN_STATUS]':
+				$status = $transaction->pretty_status();
+				return ! empty($status) ? $status : esc_html__('Unknown', 'event_espresso');
+				break;
+			case '[TXN_STATUS_ID]' :
+				return $transaction->status_ID();
+				break;
+			case '[PAYMENT_GATEWAY]' :
+				return $this->_get_payment_gateway($transaction);
+				break;
+			case '[AMOUNT_PAID]' :
+				return $payment instanceof EE_Payment
+					? EEH_Template::format_currency($payment->amount())
+					: EEH_Template::format_currency(0);
+				break;
+			case '[LAST_AMOUNT_PAID]' :
+				$last_payment = $transaction->last_payment();
+				return $last_payment instanceof EE_Payment
+					? EEH_Template::format_currency($last_payment->amount())
+					: EEH_Template::format_currency(0);
+			case '[TOTAL_AMOUNT_PAID]' :
+				return EEH_Template::format_currency($transaction->paid());
+				break;
+			case '[TOTAL_OWING]' :
+				$total_owing = $transaction->remaining();
+				return EEH_Template::format_currency($total_owing);
+				break;
+			case '[TXN_SUBTOTAL]' :
+				return EEH_Template::format_currency($this->_get_subtotal());
+				break;
+			case '[TXN_TAX_SUBTOTAL]' :
+				return EEH_Template::format_currency($this->_get_subtotal(true));
+				break;
+			case '[TKT_QTY_PURCHASED]' :
+			case '[TXN_TOTAL_TICKETS]' :
+				return $this->_data->total_ticket_count;
+				break;
+			case '[TRANSACTION_ADMIN_URL]' :
+				require_once EE_CORE . 'admin/EE_Admin_Page.core.php';
+				$query_args = array(
+					'page'   => 'espresso_transactions',
+					'action' => 'view_transaction',
+					'TXN_ID' => $transaction->ID(),
+				);
+				$url = EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php'));
+				return $url;
+				break;
+			case '[RECEIPT_URL]' :
+				//get primary_registration
+				$reg = $this->_data->primary_reg_obj;
+				if (! $reg instanceof EE_Registration) {
+					return '';
+				}
+				return $reg->receipt_url();
+				break;
+			case '[INVOICE_RECEIPT_SWITCHER_URL]' :
+				return $this->_get_invoice_receipt_switcher(false);
+				break;
+			case '[INVOICE_RECEIPT_SWITCHER_BUTTON]' :
+				return $this->_get_invoice_receipt_switcher();
+				break;
+		}
+		if (strpos($shortcode, '[OWING_STATUS_MESSAGE_*') !== false) {
+			return $this->_get_custom_total_owing($shortcode);
+		}
+		if (strpos($shortcode, '[INVOICE_PAYEE_TAX_NUMBER_*') !== false) {
+			return $this->_get_invoice_payee_tax_number($shortcode);
+		}
+		if (strpos($shortcode, '[PAYMENT_LINK_IF_NEEDED_*') !== false) {
+			return $this->_get_payment_link_if_needed($shortcode);
+		}
+		if (strpos($shortcode, '[PAYMENT_DUE_DATE_*') !== false) {
+			return $this->_get_payment_due_date($shortcode, $transaction);
+		}
+		return '';
+	}
+
+
+
+	/**
+	 * parser for the [OWING_STATUS_MESSAGE_*] attribute type shortcode
+	 *
+	 * @since 4.5.0
+	 * @param string $shortcode the incoming shortcode
+	 * @return string parsed.
+	 */
+	private function _get_custom_total_owing($shortcode)
+	{
+		$valid_shortcodes = array('transaction');
+		$attrs = $this->_get_shortcode_attrs($shortcode);
+		//ensure default is set.
+		$addressee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
+		$total_owing = $addressee instanceof EE_Messages_Addressee && $addressee->txn instanceof EE_Transaction
+			? $addressee->txn->remaining() : 0;
+		if ($total_owing > 0) {
+			$owing_content = ! empty($attrs['still_owing'])
+				? $attrs['still_owing']
+				: sprintf(esc_html__('%sPlease make a payment.%s', 'event_espresso'),
+					'<a href="[PAYMENT_URL]" class="noPrint">', '</a>');
+			$owing_content = $this->_shortcode_helper->parse_message_template($owing_content, $addressee,
+				$valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message);
+		} else {
+			$owing_content = ! empty($attrs['none_owing']) ? $attrs['none_owing'] : '';
+		}
+		return $owing_content;
+	}
+
+
+
+	/**
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 */
+	private function _get_payment_gateway($transaction)
+	{
+		$pm = $this->_get_invoice_payment_method($transaction);
+		return $pm instanceof EE_Payment_Method ? $pm->name() : '';
+	}
+
+
+
+	/**
+	 * This retrieves a logo to be used for the invoice from whatever is set on the invoice logo settings page.  If its
+	 * not present then the organization logo is used if its found (set on the organization settings page).
+	 *
+	 * @since 4.5.0
+	 * @param bool $img_tags TRUE means to return with the img tag wrappers.  False just returns the url to the image.
+	 * @return string url or html
+	 */
+	private function _get_invoice_logo($img_tags = false)
+	{
+		//try to get the invoice payment method's logo for this transaction image first
+		$pm = $this->_get_invoice_payment_method();
+		if ($pm instanceof EE_Payment_Method) {
+			$invoice_logo_url = $pm->get_extra_meta('pdf_logo_image', true);
+		} else {
+			$invoice_logo_url = null;
+		}
+		if (empty($invoice_logo_url)) {
+			$invoice_logo_url = EE_Registry::instance()->CFG->organization->logo_url;
+		}
+		if (empty($invoice_logo_url)) {
+			return '';
+		}
+		if (! $img_tags) {
+			return $invoice_logo_url;
+		}
+		//image tags have been requested.
+		$image_size = getimagesize($invoice_logo_url);
+		//if image is wider than 300px, set the width to 300
+		if ($image_size[0] > 300) {
+			$image_width = 300;
+		} else {
+			$image_width = $image_size[0];
+		}
+		return '<img class="logo screen" src="' . $invoice_logo_url . '" width="' . $image_width . '" alt="logo" />';
+	}
+
+
+
+	/**
+	 * Used to retrieve the appropriate content for the invoice payee name shortcode
+	 *
+	 * @since 4.5.0
+	 * @return string
+	 */
+	private function _get_invoice_payee_name()
+	{
+		$payee_name = null;
+		$pm = $this->_get_invoice_payment_method();
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_name = $pm->get_extra_meta('pdf_payee_name', true);
+		}
+		$payee_name = empty($payee_name) ? EE_Registry::instance()->CFG->organization->get_pretty('name') : $payee_name;
+		return $payee_name;
+	}
+
+
+
+	/**
+	 * gets the default invoice payment method, but has a filter so it can be overridden
+	 *
+	 * @return \EE_Payment_Method|null
+	 */
+	private function _get_invoice_payment_method()
+	{
+		if (! $this->_invoice_pm instanceof EE_Payment_Method) {
+			$transaction = $this->_data->txn instanceof EE_Transaction ? $this->_data->txn : null;
+			$transaction = ! $transaction instanceof EE_Transaction
+						   && is_array($this->_extra_data)
+						   && isset($this->_extra_data['data'])
+						   && $this->_extra_data['data'] instanceof EE_Messages_Addressee
+				? $this->_extra_data['data']->txn : $transaction;
+			//get the invoice payment method, and remember it for the next call too
+			$this->_invoice_pm = apply_filters('FHEE__EE_Transaction_Shortcodes__get_payment_method__default',
+				EEM_Payment_Method::instance()->get_one_of_type('Invoice'), $transaction);
+		}
+		return $this->_invoice_pm;
+	}
+
+
+
+	/**
+	 * Used to retrieve the appropriate content for the invoice payee email shortcode
+	 *
+	 * @since 4.5.0
+	 * @return string
+	 */
+	private function _get_invoice_payee_email()
+	{
+		$payee_email = null;
+		$pm = $this->_get_invoice_payment_method();
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_email = $pm->get_extra_meta('pdf_payee_email', true);
+		}
+		$payee_email = empty($payee_email) ? EE_Registry::instance()->CFG->organization->get_pretty('email')
+			: $payee_email;
+		return $payee_email;
+	}
+
+
+
+	/**
+	 * Used to retrieve the appropriate content for the invoice payee tax number shortcode
+	 *
+	 * @since 4.5.0
+	 * @param string $shortcode
+	 * @return string
+	 */
+	private function _get_invoice_payee_tax_number($shortcode)
+	{
+		$payee_tax_number = null;
+		$pm = $this->_get_invoice_payment_method();
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_tax_number = $pm->get_extra_meta('pdf_payee_tax_number', true);
+		}
+		$payee_tax_number = empty($payee_tax_number) ? EE_Registry::instance()->CFG->organization->vat
+			: $payee_tax_number;
+		if (empty($payee_tax_number)) {
+			return '';
+		}
+		//any attributes?
+		$attrs = $this->_get_shortcode_attrs($shortcode);
+		//prefix?
+		$prefix = isset($attrs['prefix']) ? $attrs['prefix'] : esc_html__('VAT/Tax Number: ', 'event_espresso');
+		return $prefix . $payee_tax_number;
+	}
+
+
+
+	/**
+	 * Used to retrieve the appropriate content for the invoice payee address shortcode.
+	 *
+	 * @since 4.5.0
+	 * @return string
+	 */
+	private function _get_invoice_payee_address()
+	{
+		$payee_address = null;
+		$pm = $this->_get_invoice_payment_method();
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_address = $pm->get_extra_meta('pdf_payee_address', true);
+		}
+		if (empty($payee_address)) {
+			$organization = EE_Registry::instance()->CFG->organization;
+			$payee_address = $organization->get_pretty('address_1') . '<br>';
+			$payee_address .= ! empty($organization->address_2) ? $organization->get_pretty('address_2') . '<br>' : '';
+			$payee_address .= $organization->get_pretty('city') . '<br>';
+			//state
+			$state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
+			$payee_address .= $state instanceof EE_State ? $state->name() : '';
+			//Country
+			$payee_address .= ! empty($organization->CNT_ISO) ? ', ' . $organization->CNT_ISO . '<br>' : '';
+			$payee_address .= ! empty($organization->zip) ? $organization->zip : '';
+		}
+		return $payee_address;
+	}
+
+
+
+	/**
+	 * Used to retrieve the appropriate content for the invoice payment instructions shortcode.
+	 *
+	 * @since 4.5.0
+	 * @return string
+	 */
+	private function _get_invoice_payment_instructions()
+	{
+		$instructions = null;
+		$pm = $this->_get_invoice_payment_method();
+		return ($pm instanceof EE_Payment_Method) ? $pm->get_extra_meta('pdf_instructions', true) : '';
+	}
+
+
+
+	/**
+	 * get invoice/receipt switch button or url.
+	 *
+	 * @param bool $button true (default) returns the html for a button, false just returns the url.
+	 * @return string
+	 */
+	protected function _get_invoice_receipt_switcher($button = true)
+	{
+		$reg = $this->_data->primary_reg_obj;
+		$message_type = isset($this->_extra_data['message_type']) ? $this->_extra_data['message_type'] : '';
+		if (! $reg instanceof EE_Registration || empty($message_type)) {
+			return '';
+		}
+		$switch_to_invoice = ! $message_type instanceof EE_Invoice_message_type ? true : false;
+		$switch_to_label = $switch_to_invoice && ! $message_type instanceof EE_Receipt_message_type
+			? esc_html__('View Invoice', 'event_espresso') : esc_html__('Switch to Invoice', 'event_espresso');
+		$switch_to_label = ! $switch_to_invoice ? esc_html__('Switch to Receipt', 'event_espresso') : $switch_to_label;
+		$switch_to_url = $switch_to_invoice ? $reg->invoice_url() : $reg->receipt_url();
+		if (! $button) {
+			return $switch_to_url;
+		}
+		if (! empty($switch_to_url)) {
+			return '
 	<form method="post" action="' . $switch_to_url . '" >
 		<input class="print_button" type="submit" value="' . $switch_to_label . '" />
 	</form>
 			';
-        }
-        return '';
-    }
-
-
-
-    /**
-     * This returns a subtotal.
-     *
-     * @param bool $tax if true then return the subtotal for tax otherwise return subtotal.
-     * @return int
-     */
-    private function _get_subtotal($tax = false)
-    {
-        $grand_total = isset($this->_data->grand_total_line_item) ? $this->_data->grand_total_line_item : null;
-        if (! $grand_total instanceof EE_Line_Item) {
-            return 0;
-        }
-        return $tax ? $grand_total->get_total_tax() : $grand_total->get_items_total();
-    }
-
-
-
-    /**
-     * parser for the [PAYMENT_LINK_IF_NEEDED_*] attribute type shortcode
-     *
-     * @since 4.7.0
-     * @param string $shortcode the incoming shortcode
-     * @return string parsed.
-     */
-    private function _get_payment_link_if_needed($shortcode)
-    {
-        $valid_shortcodes = array('transaction');
-        $attrs = $this->_get_shortcode_attrs($shortcode);
-        //ensure default is set.
-        $addressee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
-        $total_owing = $addressee instanceof EE_Messages_Addressee && $addressee->txn instanceof EE_Transaction
-            ? $addressee->txn->remaining() : 0;
-        if ($total_owing > 0) {
-            $class = isset($attrs['class']) ? $attrs['class'] : 'callout';
-            $custom_text = isset($attrs['custom_text']) ? $attrs['custom_text'] : 'You can %smake a payment here »%s.';
-            $container_tag = isset($attrs['container_tag']) ? $attrs['container_tag'] : 'p';
-            $opening_tag = ! empty($container_tag) ? '<' . $container_tag : '';
-            $opening_tag .= ! empty($opening_tag) && ! empty($class) ? ' class="' . $class . '"' : $opening_tag;
-            $opening_tag .= ! empty($opening_tag) ? '>' : $opening_tag;
-            $closing_tag = ! empty($container_tag) ? '</' . $container_tag . '>' : '';
-            $content = $opening_tag . sprintf($custom_text, '<a href="[PAYMENT_URL]">', '</a>') . $closing_tag;
-            //we need to re run this string through the parser to catch any shortcodes that are in it.
-            $owing_content = $this->_shortcode_helper->parse_message_template($content, $addressee, $valid_shortcodes,
-                $this->_message_type, $this->_messenger, $this->_message);
-        } else {
-            return '';
-        }
-        return $owing_content;
-    }
-
-
-
-    /**
-     * Parser for the [PAYMENT_DUE_DATE_*] attribute type shortcode
-     *
-     * @since 4.8.28.rc.011
-     * @param string         $shortcode The shortcode being parsed.
-     * @param EE_Transaction $transaction
-     * @return string
-     */
-    protected function _get_payment_due_date($shortcode, EE_Transaction $transaction)
-    {
-        //if transaction is paid in full then we can just return an empty string
-        if ($transaction->remaining() === 0) {
-            return '';
-        }
-        $attrs = $this->_get_shortcode_attrs($shortcode);
-        $format = isset($attrs['format']) ? $attrs['format'] : get_option('date_format');
-        $days_until_due = isset($attrs['days_until_due']) ? (int)$attrs['days_until_due'] : 30;
-        $prefix_text = isset($attrs['prefix_text']) ? $attrs['prefix_text']
-            : esc_html__('Payment in full due by: ', 'event_espresso');
-        $transaction_created = $transaction->get_DateTime_object('TXN_timestamp');
-        //setup date due:
-        try {
-            if ($transaction_created instanceof DateTime) {
-                $date_due = $transaction_created->add(new DateInterval('P' . $days_until_due . 'D'))->format($format);
-            } else {
-                throw new Exception();
-            }
-        } catch (Exception $e) {
-            //format was likely invalid.
-            $date_due = 'Unable to calculate date due, likely the format string is invalid.';
-        }
-        return $prefix_text . $date_due;
-    }
+		}
+		return '';
+	}
+
+
+
+	/**
+	 * This returns a subtotal.
+	 *
+	 * @param bool $tax if true then return the subtotal for tax otherwise return subtotal.
+	 * @return int
+	 */
+	private function _get_subtotal($tax = false)
+	{
+		$grand_total = isset($this->_data->grand_total_line_item) ? $this->_data->grand_total_line_item : null;
+		if (! $grand_total instanceof EE_Line_Item) {
+			return 0;
+		}
+		return $tax ? $grand_total->get_total_tax() : $grand_total->get_items_total();
+	}
+
+
+
+	/**
+	 * parser for the [PAYMENT_LINK_IF_NEEDED_*] attribute type shortcode
+	 *
+	 * @since 4.7.0
+	 * @param string $shortcode the incoming shortcode
+	 * @return string parsed.
+	 */
+	private function _get_payment_link_if_needed($shortcode)
+	{
+		$valid_shortcodes = array('transaction');
+		$attrs = $this->_get_shortcode_attrs($shortcode);
+		//ensure default is set.
+		$addressee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
+		$total_owing = $addressee instanceof EE_Messages_Addressee && $addressee->txn instanceof EE_Transaction
+			? $addressee->txn->remaining() : 0;
+		if ($total_owing > 0) {
+			$class = isset($attrs['class']) ? $attrs['class'] : 'callout';
+			$custom_text = isset($attrs['custom_text']) ? $attrs['custom_text'] : 'You can %smake a payment here »%s.';
+			$container_tag = isset($attrs['container_tag']) ? $attrs['container_tag'] : 'p';
+			$opening_tag = ! empty($container_tag) ? '<' . $container_tag : '';
+			$opening_tag .= ! empty($opening_tag) && ! empty($class) ? ' class="' . $class . '"' : $opening_tag;
+			$opening_tag .= ! empty($opening_tag) ? '>' : $opening_tag;
+			$closing_tag = ! empty($container_tag) ? '</' . $container_tag . '>' : '';
+			$content = $opening_tag . sprintf($custom_text, '<a href="[PAYMENT_URL]">', '</a>') . $closing_tag;
+			//we need to re run this string through the parser to catch any shortcodes that are in it.
+			$owing_content = $this->_shortcode_helper->parse_message_template($content, $addressee, $valid_shortcodes,
+				$this->_message_type, $this->_messenger, $this->_message);
+		} else {
+			return '';
+		}
+		return $owing_content;
+	}
+
+
+
+	/**
+	 * Parser for the [PAYMENT_DUE_DATE_*] attribute type shortcode
+	 *
+	 * @since 4.8.28.rc.011
+	 * @param string         $shortcode The shortcode being parsed.
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 */
+	protected function _get_payment_due_date($shortcode, EE_Transaction $transaction)
+	{
+		//if transaction is paid in full then we can just return an empty string
+		if ($transaction->remaining() === 0) {
+			return '';
+		}
+		$attrs = $this->_get_shortcode_attrs($shortcode);
+		$format = isset($attrs['format']) ? $attrs['format'] : get_option('date_format');
+		$days_until_due = isset($attrs['days_until_due']) ? (int)$attrs['days_until_due'] : 30;
+		$prefix_text = isset($attrs['prefix_text']) ? $attrs['prefix_text']
+			: esc_html__('Payment in full due by: ', 'event_espresso');
+		$transaction_created = $transaction->get_DateTime_object('TXN_timestamp');
+		//setup date due:
+		try {
+			if ($transaction_created instanceof DateTime) {
+				$date_due = $transaction_created->add(new DateInterval('P' . $days_until_due . 'D'))->format($format);
+			} else {
+				throw new Exception();
+			}
+		} catch (Exception $e) {
+			//format was likely invalid.
+			$date_due = 'Unable to calculate date due, likely the format string is invalid.';
+		}
+		return $prefix_text . $date_due;
+	}
 
 } //end EE_Transaction Shortcodes library

Spacing +26 added lines, -26 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('NO direct script access allowed');
 }
 
@@ -173,7 +173,7 @@ 
                    && isset($this->_extra_data['data'])
                    && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->payment
             : $payment;
-        if (! $transaction instanceof EE_Transaction) {
+        if ( ! $transaction instanceof EE_Transaction) {
             return '';
         }
         switch ($shortcode) {
@@ -189,7 +189,7 @@ 
                 $invoice_url = $transaction->invoice_url();
                 $invoice_url = empty($invoice_url) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
                 return sprintf(esc_html__('%sClick here for Invoice%s', 'event_espresso'),
-                    '<a href="' . $invoice_url . '">', '</a>');
+                    '<a href="'.$invoice_url.'">', '</a>');
                 break; /**/
             case '[INVOICE_URL]' :
                 $invoice_url = $transaction->invoice_url();
@@ -260,7 +260,7 @@ 
                 return $this->_data->total_ticket_count;
                 break;
             case '[TRANSACTION_ADMIN_URL]' :
-                require_once EE_CORE . 'admin/EE_Admin_Page.core.php';
+                require_once EE_CORE.'admin/EE_Admin_Page.core.php';
                 $query_args = array(
                     'page'   => 'espresso_transactions',
                     'action' => 'view_transaction',
@@ -272,7 +272,7 @@ 
             case '[RECEIPT_URL]' :
                 //get primary_registration
                 $reg = $this->_data->primary_reg_obj;
-                if (! $reg instanceof EE_Registration) {
+                if ( ! $reg instanceof EE_Registration) {
                     return '';
                 }
                 return $reg->receipt_url();
@@ -366,7 +366,7 @@ 
         if (empty($invoice_logo_url)) {
             return '';
         }
-        if (! $img_tags) {
+        if ( ! $img_tags) {
             return $invoice_logo_url;
         }
         //image tags have been requested.
@@ -377,7 +377,7 @@ 
         } else {
             $image_width = $image_size[0];
         }
-        return '<img class="logo screen" src="' . $invoice_logo_url . '" width="' . $image_width . '" alt="logo" />';
+        return '<img class="logo screen" src="'.$invoice_logo_url.'" width="'.$image_width.'" alt="logo" />';
     }
 
 
@@ -408,7 +408,7 @@ 
      */
     private function _get_invoice_payment_method()
     {
-        if (! $this->_invoice_pm instanceof EE_Payment_Method) {
+        if ( ! $this->_invoice_pm instanceof EE_Payment_Method) {
             $transaction = $this->_data->txn instanceof EE_Transaction ? $this->_data->txn : null;
             $transaction = ! $transaction instanceof EE_Transaction
                            && is_array($this->_extra_data)
@@ -467,7 +467,7 @@ 
         $attrs = $this->_get_shortcode_attrs($shortcode);
         //prefix?
         $prefix = isset($attrs['prefix']) ? $attrs['prefix'] : esc_html__('VAT/Tax Number: ', 'event_espresso');
-        return $prefix . $payee_tax_number;
+        return $prefix.$payee_tax_number;
     }
 
 
@@ -487,14 +487,14 @@ 
         }
         if (empty($payee_address)) {
             $organization = EE_Registry::instance()->CFG->organization;
-            $payee_address = $organization->get_pretty('address_1') . '<br>';
-            $payee_address .= ! empty($organization->address_2) ? $organization->get_pretty('address_2') . '<br>' : '';
-            $payee_address .= $organization->get_pretty('city') . '<br>';
+            $payee_address = $organization->get_pretty('address_1').'<br>';
+            $payee_address .= ! empty($organization->address_2) ? $organization->get_pretty('address_2').'<br>' : '';
+            $payee_address .= $organization->get_pretty('city').'<br>';
             //state
             $state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
             $payee_address .= $state instanceof EE_State ? $state->name() : '';
             //Country
-            $payee_address .= ! empty($organization->CNT_ISO) ? ', ' . $organization->CNT_ISO . '<br>' : '';
+            $payee_address .= ! empty($organization->CNT_ISO) ? ', '.$organization->CNT_ISO.'<br>' : '';
             $payee_address .= ! empty($organization->zip) ? $organization->zip : '';
         }
         return $payee_address;
@@ -527,7 +527,7 @@ 
     {
         $reg = $this->_data->primary_reg_obj;
         $message_type = isset($this->_extra_data['message_type']) ? $this->_extra_data['message_type'] : '';
-        if (! $reg instanceof EE_Registration || empty($message_type)) {
+        if ( ! $reg instanceof EE_Registration || empty($message_type)) {
             return '';
         }
         $switch_to_invoice = ! $message_type instanceof EE_Invoice_message_type ? true : false;
@@ -535,13 +535,13 @@ 
             ? esc_html__('View Invoice', 'event_espresso') : esc_html__('Switch to Invoice', 'event_espresso');
         $switch_to_label = ! $switch_to_invoice ? esc_html__('Switch to Receipt', 'event_espresso') : $switch_to_label;
         $switch_to_url = $switch_to_invoice ? $reg->invoice_url() : $reg->receipt_url();
-        if (! $button) {
+        if ( ! $button) {
             return $switch_to_url;
         }
-        if (! empty($switch_to_url)) {
+        if ( ! empty($switch_to_url)) {
             return '
-	<form method="post" action="' . $switch_to_url . '" >
-		<input class="print_button" type="submit" value="' . $switch_to_label . '" />
+	<form method="post" action="' . $switch_to_url.'" >
+		<input class="print_button" type="submit" value="' . $switch_to_label.'" />
 	</form>
 			';
         }
@@ -559,7 +559,7 @@ 
     private function _get_subtotal($tax = false)
     {
         $grand_total = isset($this->_data->grand_total_line_item) ? $this->_data->grand_total_line_item : null;
-        if (! $grand_total instanceof EE_Line_Item) {
+        if ( ! $grand_total instanceof EE_Line_Item) {
             return 0;
         }
         return $tax ? $grand_total->get_total_tax() : $grand_total->get_items_total();
@@ -586,11 +586,11 @@ 
             $class = isset($attrs['class']) ? $attrs['class'] : 'callout';
             $custom_text = isset($attrs['custom_text']) ? $attrs['custom_text'] : 'You can %smake a payment here »%s.';
             $container_tag = isset($attrs['container_tag']) ? $attrs['container_tag'] : 'p';
-            $opening_tag = ! empty($container_tag) ? '<' . $container_tag : '';
-            $opening_tag .= ! empty($opening_tag) && ! empty($class) ? ' class="' . $class . '"' : $opening_tag;
+            $opening_tag = ! empty($container_tag) ? '<'.$container_tag : '';
+            $opening_tag .= ! empty($opening_tag) && ! empty($class) ? ' class="'.$class.'"' : $opening_tag;
             $opening_tag .= ! empty($opening_tag) ? '>' : $opening_tag;
-            $closing_tag = ! empty($container_tag) ? '</' . $container_tag . '>' : '';
-            $content = $opening_tag . sprintf($custom_text, '<a href="[PAYMENT_URL]">', '</a>') . $closing_tag;
+            $closing_tag = ! empty($container_tag) ? '</'.$container_tag.'>' : '';
+            $content = $opening_tag.sprintf($custom_text, '<a href="[PAYMENT_URL]">', '</a>').$closing_tag;
             //we need to re run this string through the parser to catch any shortcodes that are in it.
             $owing_content = $this->_shortcode_helper->parse_message_template($content, $addressee, $valid_shortcodes,
                 $this->_message_type, $this->_messenger, $this->_message);
@@ -618,14 +618,14 @@ 
         }
         $attrs = $this->_get_shortcode_attrs($shortcode);
         $format = isset($attrs['format']) ? $attrs['format'] : get_option('date_format');
-        $days_until_due = isset($attrs['days_until_due']) ? (int)$attrs['days_until_due'] : 30;
+        $days_until_due = isset($attrs['days_until_due']) ? (int) $attrs['days_until_due'] : 30;
         $prefix_text = isset($attrs['prefix_text']) ? $attrs['prefix_text']
             : esc_html__('Payment in full due by: ', 'event_espresso');
         $transaction_created = $transaction->get_DateTime_object('TXN_timestamp');
         //setup date due:
         try {
             if ($transaction_created instanceof DateTime) {
-                $date_due = $transaction_created->add(new DateInterval('P' . $days_until_due . 'D'))->format($format);
+                $date_due = $transaction_created->add(new DateInterval('P'.$days_until_due.'D'))->format($format);
             } else {
                 throw new Exception();
             }
@@ -633,7 +633,7 @@ 
             //format was likely invalid.
             $date_due = 'Unable to calculate date due, likely the format string is invalid.';
         }
-        return $prefix_text . $date_due;
+        return $prefix_text.$date_due;
     }
 
 } //end EE_Transaction Shortcodes library