eventespresso / event-espresso-core

payment_methods/Paypal_Standard/EE_PMT_Paypal_Standard.pm.php

Spacing +2 added lines, -2 removed lines

@@ -63,8 +63,8 @@
      */
     public function generate_new_settings_form()
     {
-        require_once($this->file_folder() . 'EE_Paypal_Standard_Form.form.php');
-        $form =  new EE_Paypal_Standard_Form($this);
+        require_once($this->file_folder().'EE_Paypal_Standard_Form.form.php');
+        $form = new EE_Paypal_Standard_Form($this);
         $form->get_input('PMD_debug_mode')->set_html_label_text(
             sprintf(__("Use PayPal Sandbox %s", 'event_espresso'), $this->get_help_tab_link())
         );

Indentation +101 added lines, -101 removed lines

@@ -13,105 +13,105 @@
 class EE_PMT_Paypal_Standard extends EE_PMT_Base
 {
 
-    const shipping_info_none = 1;
-    const shipping_info_optional = 0;
-    const shipping_info_required = 2;
-
-
-
-    /**
-     * @param null $pm_instance
-     * @return \EE_PMT_Paypal_Standard
-     * @throws \EE_Error
-     */
-    public function __construct($pm_instance = null)
-    {
-        require_once($this->file_folder().'EEG_Paypal_Standard.gateway.php');
-        $this->_gateway = new EEG_Paypal_Standard();
-        $this->_pretty_name = __("PayPal Standard", 'event_espresso');
-        $this->_default_description = sprintf(
-            __(
-                'Upon submitting this form, you will be forwarded to PayPal to make your payment. %1$sMake sure you return to this site in order to properly finalize your registration.%2$s',
-                'event_espresso'
-            ),
-            '<strong>',
-            '</strong>'
-        );
-        parent::__construct($pm_instance);
-        $this->_default_button_url = $this->file_url().'lib/paypal-logo.png';
-    }
-
-
-
-    /**
-     * Creates the billing form for this payment method type
-     * @param \EE_Transaction $transaction
-     * @return NULL
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null)
-    {
-        return null;
-    }
-
-
-
-    /**
-     * Gets the form for all the settings related to this payment method type
-     *
-     * @return EE_Payment_Method_Form
-     * @throws \EE_Error
-     */
-    public function generate_new_settings_form()
-    {
-        require_once($this->file_folder() . 'EE_Paypal_Standard_Form.form.php');
-        $form =  new EE_Paypal_Standard_Form($this);
-        $form->get_input('PMD_debug_mode')->set_html_label_text(
-            sprintf(__("Use PayPal Sandbox %s", 'event_espresso'), $this->get_help_tab_link())
-        );
-        $form->get_input('shipping_details')->set_html_label_text(
-            sprintf(__("Shipping Address Options %s", "event_espresso"), $this->get_help_tab_link())
-        );
-        return $form;
-    }
-
-
-
-    /**
-     * Adds the help tab
-     * @see EE_PMT_Base::help_tabs_config()
-     * @return array
-     */
-    public function help_tabs_config()
-    {
-        return array(
-            $this->get_help_tab_name() => array(
-                'title'=>  __("PayPal Standard Settings", 'event_espresso'),
-                'filename'=>'payment_methods_overview_paypalstandard'
-            )
-        );
-    }
-
-
-
-    /**
-     * 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 was 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
-     *
-     * @param EE_Transaction $transaction
-     * @return EE_Payment
-     * @throws \EE_Error
-     */
-    public function finalize_payment_for($transaction)
-    {
-        // PayPal standard actually sends the IPN info along with the user when they return to our site
-        // so in case the IPN is arriving later, let's try to process an IPN!
-        if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-            return $this->handle_ipn($_POST, $transaction);
-        } else {
-            return parent::finalize_payment_for($transaction);
-        }
-    }
+	const shipping_info_none = 1;
+	const shipping_info_optional = 0;
+	const shipping_info_required = 2;
+
+
+
+	/**
+	 * @param null $pm_instance
+	 * @return \EE_PMT_Paypal_Standard
+	 * @throws \EE_Error
+	 */
+	public function __construct($pm_instance = null)
+	{
+		require_once($this->file_folder().'EEG_Paypal_Standard.gateway.php');
+		$this->_gateway = new EEG_Paypal_Standard();
+		$this->_pretty_name = __("PayPal Standard", 'event_espresso');
+		$this->_default_description = sprintf(
+			__(
+				'Upon submitting this form, you will be forwarded to PayPal to make your payment. %1$sMake sure you return to this site in order to properly finalize your registration.%2$s',
+				'event_espresso'
+			),
+			'<strong>',
+			'</strong>'
+		);
+		parent::__construct($pm_instance);
+		$this->_default_button_url = $this->file_url().'lib/paypal-logo.png';
+	}
+
+
+
+	/**
+	 * Creates the billing form for this payment method type
+	 * @param \EE_Transaction $transaction
+	 * @return NULL
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null)
+	{
+		return null;
+	}
+
+
+
+	/**
+	 * Gets the form for all the settings related to this payment method type
+	 *
+	 * @return EE_Payment_Method_Form
+	 * @throws \EE_Error
+	 */
+	public function generate_new_settings_form()
+	{
+		require_once($this->file_folder() . 'EE_Paypal_Standard_Form.form.php');
+		$form =  new EE_Paypal_Standard_Form($this);
+		$form->get_input('PMD_debug_mode')->set_html_label_text(
+			sprintf(__("Use PayPal Sandbox %s", 'event_espresso'), $this->get_help_tab_link())
+		);
+		$form->get_input('shipping_details')->set_html_label_text(
+			sprintf(__("Shipping Address Options %s", "event_espresso"), $this->get_help_tab_link())
+		);
+		return $form;
+	}
+
+
+
+	/**
+	 * Adds the help tab
+	 * @see EE_PMT_Base::help_tabs_config()
+	 * @return array
+	 */
+	public function help_tabs_config()
+	{
+		return array(
+			$this->get_help_tab_name() => array(
+				'title'=>  __("PayPal Standard Settings", 'event_espresso'),
+				'filename'=>'payment_methods_overview_paypalstandard'
+			)
+		);
+	}
+
+
+
+	/**
+	 * 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 was 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
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return EE_Payment
+	 * @throws \EE_Error
+	 */
+	public function finalize_payment_for($transaction)
+	{
+		// PayPal standard actually sends the IPN info along with the user when they return to our site
+		// so in case the IPN is arriving later, let's try to process an IPN!
+		if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+			return $this->handle_ipn($_POST, $transaction);
+		} else {
+			return parent::finalize_payment_for($transaction);
+		}
+	}
 }

payment_methods/Paypal_Standard/EEG_Paypal_Standard.gateway.php

Indentation +600 added lines, -600 removed lines

@@ -19,605 +19,605 @@
 class EEG_Paypal_Standard extends EE_Offsite_Gateway
 {
 
-    /**
-     * Name for the wp option used to save the itemized payment
-     */
-    const itemized_payment_option_name = '_itemized_payment';
-
-    protected $_paypal_id;
-
-    protected $_image_url;
-
-    protected $_shipping_details;
-
-    protected $_paypal_shipping;
-
-    protected $_paypal_taxes;
-
-    protected $_gateway_url;
-
-    protected $_currencies_supported = array(
-        'USD',
-        'GBP',
-        'CAD',
-        'AUD',
-        'BRL',
-        'CHF',
-        'CZK',
-        'DKK',
-        'EUR',
-        'HKD',
-        'HUF',
-        'ILS',
-        'JPY',
-        'MXN',
-        'MYR',
-        'NOK',
-        'NZD',
-        'PHP',
-        'PLN',
-        'SEK',
-        'SGD',
-        'THB',
-        'TRY',
-        'TWD',
-        'RUB'
-    );
-
-
-    /**
-     * EEG_Paypal_Standard constructor.
-     *
-     * @return EEG_Paypal_Standard
-     */
-    public function __construct()
-    {
-        $this->set_uses_separate_IPN_request(true);
-        parent::__construct();
-    }
-
-
-    /**
-     * Also sets the gateway url class variable based on whether debug mode is enabled or not.
-     *
-     * @param array $settings_array
-     */
-    public function set_settings($settings_array)
-    {
-        parent::set_settings($settings_array);
-        $this->_gateway_url = $this->_debug_mode
-            ? 'https://www.sandbox.paypal.com/cgi-bin/webscr'
-            : 'https://www.paypal.com/cgi-bin/webscr';
-    }
-
-
-    /**
-     * @param EEI_Payment $payment      the payment to process
-     * @param array       $billing_info but should be empty for this gateway
-     * @param string      $return_url   URL to send the user to after payment on the payment provider's website
-     * @param string      $notify_url   URL to send the instant payment notification
-     * @param string      $cancel_url   URL to send the user to after a cancelled payment attempt
-     *                                  on the payment provider's website
-     * @return EEI_Payment
-     * @throws \EE_Error
-     */
-    public function set_redirection_info(
-        $payment,
-        $billing_info = array(),
-        $return_url = null,
-        $notify_url = null,
-        $cancel_url = null
-    ) {
-        $redirect_args = array();
-        $transaction = $payment->transaction();
-        $gateway_formatter = $this->_get_gateway_formatter();
-        $item_num = 1;
-        /** @type EE_Line_Item $total_line_item */
-        $total_line_item = $transaction->total_line_item();
-
-        $total_discounts_to_cart_total = $transaction->paid();
-        // only itemize the order if we're paying for the rest of the order's amount
-        if (EEH_Money::compare_floats($payment->amount(), $transaction->total(), '==')) {
-            $payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true);
-            // this payment is for the remaining transaction amount,
-            // keep track of exactly how much the itemized order amount equals
-            $itemized_sum = 0;
-            $shipping_previously_added = 0;
-            // so let's show all the line items
-            foreach ($total_line_item->get_items() as $line_item) {
-                if ($line_item instanceof EE_Line_Item) {
-                    // it's some kind of discount
-                    if ($line_item->total() < 0) {
-                        $total_discounts_to_cart_total += abs($line_item->total());
-                        $itemized_sum += $line_item->total();
-                        continue;
-                    }
-                    // dont include shipping again.
-                    if (strpos($line_item->code(), 'paypal_shipping_') === 0) {
-                        $shipping_previously_added = $line_item->total();
-                        continue;
-                    }
-                    $redirect_args[ 'item_name_' . $item_num ] = substr(
-                        $gateway_formatter->formatLineItemName($line_item, $payment),
-                        0,
-                        127
-                    );
-                    $redirect_args[ 'amount_' . $item_num ] = $line_item->unit_price();
-                    $redirect_args[ 'quantity_' . $item_num ] = $line_item->quantity();
-                    // if we're not letting PayPal calculate shipping, tell them its 0
-                    if (! $this->_paypal_shipping) {
-                        $redirect_args[ 'shipping_' . $item_num ] = '0';
-                        $redirect_args[ 'shipping2_' . $item_num ] = '0';
-                    }
-                    $item_num++;
-                    $itemized_sum += $line_item->total();
-                }
-            }
-            $taxes_li = $this->_line_item->get_taxes_subtotal($total_line_item);
-            // ideally itemized sum equals the transaction total. but if not (which is weird)
-            // and the itemized sum is LESS than the transaction total
-            // add another line item
-            // if the itemized sum is MORE than the transaction total,
-            // add the difference it to the discounts
-            $itemized_sum_diff_from_txn_total = round(
-                $transaction->total() - $itemized_sum - $taxes_li->total() - $shipping_previously_added,
-                2
-            );
-            if ($itemized_sum_diff_from_txn_total < 0) {
-                // itemized sum is too big
-                $total_discounts_to_cart_total += abs($itemized_sum_diff_from_txn_total);
-            } elseif ($itemized_sum_diff_from_txn_total > 0) {
-                $redirect_args[ 'item_name_' . $item_num ] = substr(
-                    __('Other charges', 'event_espresso'),
-                    0,
-                    127
-                );
-                $redirect_args[ 'amount_' . $item_num ] = $gateway_formatter->formatCurrency(
-                    $itemized_sum_diff_from_txn_total
-                );
-                $redirect_args[ 'quantity_' . $item_num ] = 1;
-                $item_num++;
-            }
-            if ($total_discounts_to_cart_total > 0) {
-                $redirect_args['discount_amount_cart'] = $gateway_formatter->formatCurrency(
-                    $total_discounts_to_cart_total
-                );
-            }
-            // add our taxes to the order if we're NOT using PayPal's
-            if (! $this->_paypal_taxes) {
-                $redirect_args['tax_cart'] = $total_line_item->get_total_tax();
-            }
-        } else {
-            $payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, false);
-            // partial payment that's not for the remaining amount, so we can't send an itemized list
-            $redirect_args[ 'item_name_' . $item_num ] = substr(
-                $gateway_formatter->formatPartialPaymentLineItemName($payment),
-                0,
-                127
-            );
-            $redirect_args[ 'amount_' . $item_num ] = $payment->amount();
-            $redirect_args[ 'shipping_' . $item_num ] = '0';
-            $redirect_args[ 'shipping2_' . $item_num ] = '0';
-            $redirect_args['tax_cart'] = '0';
-            $item_num++;
-        }
-
-        if ($this->_debug_mode) {
-            $redirect_args[ 'item_name_' . $item_num ] = 'DEBUG INFO (this item only added in sandbox mode';
-            $redirect_args[ 'amount_' . $item_num ] = 0;
-            $redirect_args[ 'on0_'.$item_num ] = 'NOTIFY URL';
-            $redirect_args[ 'os0_' . $item_num ] = $notify_url;
-            $redirect_args[ 'on1_'.$item_num ] = 'RETURN URL';
-            $redirect_args[ 'os1_' . $item_num ] = $return_url;
+	/**
+	 * Name for the wp option used to save the itemized payment
+	 */
+	const itemized_payment_option_name = '_itemized_payment';
+
+	protected $_paypal_id;
+
+	protected $_image_url;
+
+	protected $_shipping_details;
+
+	protected $_paypal_shipping;
+
+	protected $_paypal_taxes;
+
+	protected $_gateway_url;
+
+	protected $_currencies_supported = array(
+		'USD',
+		'GBP',
+		'CAD',
+		'AUD',
+		'BRL',
+		'CHF',
+		'CZK',
+		'DKK',
+		'EUR',
+		'HKD',
+		'HUF',
+		'ILS',
+		'JPY',
+		'MXN',
+		'MYR',
+		'NOK',
+		'NZD',
+		'PHP',
+		'PLN',
+		'SEK',
+		'SGD',
+		'THB',
+		'TRY',
+		'TWD',
+		'RUB'
+	);
+
+
+	/**
+	 * EEG_Paypal_Standard constructor.
+	 *
+	 * @return EEG_Paypal_Standard
+	 */
+	public function __construct()
+	{
+		$this->set_uses_separate_IPN_request(true);
+		parent::__construct();
+	}
+
+
+	/**
+	 * Also sets the gateway url class variable based on whether debug mode is enabled or not.
+	 *
+	 * @param array $settings_array
+	 */
+	public function set_settings($settings_array)
+	{
+		parent::set_settings($settings_array);
+		$this->_gateway_url = $this->_debug_mode
+			? 'https://www.sandbox.paypal.com/cgi-bin/webscr'
+			: 'https://www.paypal.com/cgi-bin/webscr';
+	}
+
+
+	/**
+	 * @param EEI_Payment $payment      the payment to process
+	 * @param array       $billing_info but should be empty for this gateway
+	 * @param string      $return_url   URL to send the user to after payment on the payment provider's website
+	 * @param string      $notify_url   URL to send the instant payment notification
+	 * @param string      $cancel_url   URL to send the user to after a cancelled payment attempt
+	 *                                  on the payment provider's website
+	 * @return EEI_Payment
+	 * @throws \EE_Error
+	 */
+	public function set_redirection_info(
+		$payment,
+		$billing_info = array(),
+		$return_url = null,
+		$notify_url = null,
+		$cancel_url = null
+	) {
+		$redirect_args = array();
+		$transaction = $payment->transaction();
+		$gateway_formatter = $this->_get_gateway_formatter();
+		$item_num = 1;
+		/** @type EE_Line_Item $total_line_item */
+		$total_line_item = $transaction->total_line_item();
+
+		$total_discounts_to_cart_total = $transaction->paid();
+		// only itemize the order if we're paying for the rest of the order's amount
+		if (EEH_Money::compare_floats($payment->amount(), $transaction->total(), '==')) {
+			$payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true);
+			// this payment is for the remaining transaction amount,
+			// keep track of exactly how much the itemized order amount equals
+			$itemized_sum = 0;
+			$shipping_previously_added = 0;
+			// so let's show all the line items
+			foreach ($total_line_item->get_items() as $line_item) {
+				if ($line_item instanceof EE_Line_Item) {
+					// it's some kind of discount
+					if ($line_item->total() < 0) {
+						$total_discounts_to_cart_total += abs($line_item->total());
+						$itemized_sum += $line_item->total();
+						continue;
+					}
+					// dont include shipping again.
+					if (strpos($line_item->code(), 'paypal_shipping_') === 0) {
+						$shipping_previously_added = $line_item->total();
+						continue;
+					}
+					$redirect_args[ 'item_name_' . $item_num ] = substr(
+						$gateway_formatter->formatLineItemName($line_item, $payment),
+						0,
+						127
+					);
+					$redirect_args[ 'amount_' . $item_num ] = $line_item->unit_price();
+					$redirect_args[ 'quantity_' . $item_num ] = $line_item->quantity();
+					// if we're not letting PayPal calculate shipping, tell them its 0
+					if (! $this->_paypal_shipping) {
+						$redirect_args[ 'shipping_' . $item_num ] = '0';
+						$redirect_args[ 'shipping2_' . $item_num ] = '0';
+					}
+					$item_num++;
+					$itemized_sum += $line_item->total();
+				}
+			}
+			$taxes_li = $this->_line_item->get_taxes_subtotal($total_line_item);
+			// ideally itemized sum equals the transaction total. but if not (which is weird)
+			// and the itemized sum is LESS than the transaction total
+			// add another line item
+			// if the itemized sum is MORE than the transaction total,
+			// add the difference it to the discounts
+			$itemized_sum_diff_from_txn_total = round(
+				$transaction->total() - $itemized_sum - $taxes_li->total() - $shipping_previously_added,
+				2
+			);
+			if ($itemized_sum_diff_from_txn_total < 0) {
+				// itemized sum is too big
+				$total_discounts_to_cart_total += abs($itemized_sum_diff_from_txn_total);
+			} elseif ($itemized_sum_diff_from_txn_total > 0) {
+				$redirect_args[ 'item_name_' . $item_num ] = substr(
+					__('Other charges', 'event_espresso'),
+					0,
+					127
+				);
+				$redirect_args[ 'amount_' . $item_num ] = $gateway_formatter->formatCurrency(
+					$itemized_sum_diff_from_txn_total
+				);
+				$redirect_args[ 'quantity_' . $item_num ] = 1;
+				$item_num++;
+			}
+			if ($total_discounts_to_cart_total > 0) {
+				$redirect_args['discount_amount_cart'] = $gateway_formatter->formatCurrency(
+					$total_discounts_to_cart_total
+				);
+			}
+			// add our taxes to the order if we're NOT using PayPal's
+			if (! $this->_paypal_taxes) {
+				$redirect_args['tax_cart'] = $total_line_item->get_total_tax();
+			}
+		} else {
+			$payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, false);
+			// partial payment that's not for the remaining amount, so we can't send an itemized list
+			$redirect_args[ 'item_name_' . $item_num ] = substr(
+				$gateway_formatter->formatPartialPaymentLineItemName($payment),
+				0,
+				127
+			);
+			$redirect_args[ 'amount_' . $item_num ] = $payment->amount();
+			$redirect_args[ 'shipping_' . $item_num ] = '0';
+			$redirect_args[ 'shipping2_' . $item_num ] = '0';
+			$redirect_args['tax_cart'] = '0';
+			$item_num++;
+		}
+
+		if ($this->_debug_mode) {
+			$redirect_args[ 'item_name_' . $item_num ] = 'DEBUG INFO (this item only added in sandbox mode';
+			$redirect_args[ 'amount_' . $item_num ] = 0;
+			$redirect_args[ 'on0_'.$item_num ] = 'NOTIFY URL';
+			$redirect_args[ 'os0_' . $item_num ] = $notify_url;
+			$redirect_args[ 'on1_'.$item_num ] = 'RETURN URL';
+			$redirect_args[ 'os1_' . $item_num ] = $return_url;
 //          $redirect_args['option_index_' . $item_num] = 1; // <-- dunno if this is needed ?
-            $redirect_args[ 'shipping_' . $item_num ] = '0';
-            $redirect_args[ 'shipping2_' . $item_num ] = '0';
-        }
-
-        $redirect_args['business'] = $this->_paypal_id;
-        $redirect_args['return'] = $return_url;
-        $redirect_args['cancel_return'] = $cancel_url;
-        $redirect_args['notify_url'] = $notify_url;
-        $redirect_args['cmd'] = '_cart';
-        $redirect_args['upload'] = 1;
-        $redirect_args['currency_code'] = $payment->currency_code();
-        $redirect_args['rm'] = 2;// makes the user return with method=POST
-        if ($this->_image_url) {
-            $redirect_args['image_url'] = $this->_image_url;
-        }
-        $redirect_args['no_shipping'] = $this->_shipping_details;
-        $redirect_args['bn'] = 'EventEspresso_SP';// EE will blow up if you change this
-
-        $redirect_args = apply_filters("FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this);
-
-        $payment->set_redirect_url($this->_gateway_url);
-        $payment->set_redirect_args($redirect_args);
-        // log the results
-        $this->log(
-            array(
-                'message'     => sprintf(
-                    __('PayPal payment request initiated.', 'event_espresso')
-                ),
-                'transaction' => $transaction->model_field_array(),
-            ),
-            $payment
-        );
-        return $payment;
-    }
-
-
-    /**
-     * Often used for IPNs. But applies the info in $update_info to the payment.
-     * What is $update_info? Often the contents of $_REQUEST, but not necessarily. Whatever
-     * the payment method passes in.
-     *
-     * @param array $update_info like $_POST
-     * @param EEI_Transaction $transaction
-     * @return \EEI_Payment updated
-     * @throws \EE_Error, IpnException
-     */
-    public function handle_payment_update($update_info, $transaction)
-    {
-        // verify there's payment data that's been sent
-        if (empty($update_info['payment_status']) || empty($update_info['txn_id'])) {
-            // log the results
-            $this->log(
-                array(
-                    'message'     => sprintf(
-                        // @codingStandardsIgnoreStart
-                        __('PayPal IPN response is missing critical payment data. This may indicate a PDT request and require your PayPal account settings to be corrected.', 'event_espresso')
-                        // @codingStandardsIgnoreEnd
-                    ),
-                    'update_info' => $update_info,
-                ),
-                $transaction
-            );
-            // waaaait... is this a PDT request? (see https://developer.paypal.com/docs/classic/products/payment-data-transfer/)
-            // indicated by the "tx" argument? If so, we don't need it. We'll just use the IPN data when it comes
-            if (isset($update_info['tx'])) {
-                return $transaction->last_payment();
-            } else {
-                return null;
-            }
-        }
-        $payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr($update_info['txn_id']);
-        if (! $payment instanceof EEI_Payment) {
-            $payment = $transaction->last_payment();
-        }
-        // ok, then validate the IPN. Even if we've already processed this payment,
-        // let PayPal know we don't want to hear from them anymore!
-        if (! $this->validate_ipn($update_info, $payment)) {
-            return $payment;
-        }
-        // kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction,
-        // registrations, ticket counts, etc)
-        if ((
-                $update_info['payment_status'] === 'Refunded'
-                || $update_info['payment_status'] === 'Partially_Refunded'
-            )
-            && apply_filters('FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true)
-        ) {
-            throw new EventEspresso\core\exceptions\IpnException(
-                sprintf(
-                    esc_html__('Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'),
-                    $update_info['payment_status']
-                ),
-                EventEspresso\core\exceptions\IpnException::UNSUPPORTED,
-                null,
-                $payment,
-                $update_info
-            );
-        }
-        // ok, well let's process this payment then!
-        switch ($update_info['payment_status']) {
-            case 'Completed':
-                $status = $this->_pay_model->approved_status();
-                $gateway_response = esc_html__('The payment is approved.', 'event_espresso');
-                break;
-
-            case 'Pending':
-                $status = $this->_pay_model->pending_status();
-                $gateway_response = esc_html__(
-                    'The payment is in progress. Another message will be sent when payment is approved.',
-                    'event_espresso'
-                );
-                break;
-
-            case 'Denied':
-                $status = $this->_pay_model->declined_status();
-                $gateway_response = esc_html__('The payment has been declined.', 'event_espresso');
-                break;
-
-            case 'Expired':
-            case 'Failed':
-                $status = $this->_pay_model->failed_status();
-                $gateway_response = esc_html__('The payment failed for technical reasons or expired.', 'event_espresso');
-                break;
-
-            case 'Refunded':
-            case 'Partially_Refunded':
-                // even though it's a refund, we consider the payment as approved, it just has a negative value
-                $status = $this->_pay_model->approved_status();
-                $gateway_response = esc_html__(
-                    'The payment has been refunded. Please update registrations accordingly.',
-                    'event_espresso'
-                );
-                break;
-
-            case 'Voided':
-            case 'Reversed':
-            case 'Canceled_Reversal':
-            default:
-                $status = $this->_pay_model->cancelled_status();
-                $gateway_response = esc_html__(
-                    'The payment was cancelled, reversed, or voided. Please update registrations accordingly.',
-                    'event_espresso'
-                );
-                break;
-        }
-
-        // check if we've already processed this payment
-        if ($payment instanceof EEI_Payment) {
-            // payment exists. if this has the exact same status and amount, don't bother updating. just return
-            if ($payment->status() === $status && (float) $payment->amount() === (float) $update_info['mc_gross']) {
-                // DUPLICATED IPN! don't bother updating transaction
-                throw new IpnException(
-                    sprintf(
-                        esc_html__(
-                            'It appears we have received a duplicate IPN from PayPal for payment %d',
-                            'event_espresso'
-                        ),
-                        $payment->ID()
-                    ),
-                    IpnException::DUPLICATE,
-                    null,
-                    $payment,
-                    $update_info
-                );
-            } else {
-                // new payment yippee !!!
-                $payment->set_status($status);
-                $payment->set_amount((float) $update_info['mc_gross']);
-                $payment->set_gateway_response($gateway_response);
-                $payment->set_details($update_info);
-                $payment->set_txn_id_chq_nmbr($update_info['txn_id']);
-                $this->log(
-                    array(
-                        'message'  => esc_html__(
-                            'Updated payment either from IPN or as part of POST from PayPal',
-                            'event_espresso'
-                        ),
-                        'url'      => $this->_process_response_url(),
-                        'payment'  => $payment->model_field_array(),
-                        'IPN_data' => $update_info
-                    ),
-                    $payment
-                );
-            }
-        }
-        do_action('FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this);
-        return $payment;
-    }
-
-
-    /**
-     * Validate the IPN notification.
-     *
-     * @param array                  $update_info like $_REQUEST
-     * @param EE_Payment|EEI_Payment $payment
-     * @return boolean
-     * @throws \EE_Error
-     */
-    public function validate_ipn($update_info, $payment)
-    {
-        // allow us to skip validating IPNs with PayPal (useful for testing)
-        if (apply_filters('FHEE__EEG_Paypal_Standard__validate_ipn__skip', false)) {
-            return true;
-        }
-        // ...otherwise, we actually don't care what the $update_info is, we need to look
-        // at the request directly because we can't use $update_info because it has issues with quotes
-        // Reading POSTed data directly from $_POST causes serialization issues with array data in the POST.
-        // Instead, read raw POST data from the input stream.
-        // @see https://gist.github.com/xcommerce-gists/3440401
-        $raw_post_data = file_get_contents('php://input');
-        $raw_post_array = explode('&', $raw_post_data);
-        $update_info = array();
-        foreach ($raw_post_array as $keyval) {
-            $keyval = explode('=', $keyval);
-            if (count($keyval) === 2) {
-                $update_info[ $keyval[0] ] = urldecode($keyval[1]);
-            }
-        }
-        // read the IPN message sent from PayPal and prepend 'cmd=_notify-validate'
-        $req = 'cmd=_notify-validate';
-        $uses_get_magic_quotes = function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc() === 1
-            ? true
-            : false;
-        foreach ($update_info as $key => $value) {
-            $value = $uses_get_magic_quotes ? urlencode(stripslashes($value)) : urlencode($value);
-            $req .= "&$key=$value";
-        }
-        // HTTP POST the complete, unaltered IPN back to PayPal
-        $response = wp_remote_post(
-            $this->_gateway_url,
-            array(
-                'body'              => $req,
-                'sslverify'         => false,
-                'timeout'           => 60,
-                // make sure to set a site specific unique "user-agent" string since the WordPres default gets declined by PayPal
-                // plz see: https://github.com/websharks/s2member/issues/610
-                'user-agent'        => 'Event Espresso v' . EVENT_ESPRESSO_VERSION . '; ' . home_url(),
-                'httpversion'       => '1.1'
-            )
-        );
-        // then check the response
-        if (array_key_exists('body', $response)
-            && ! is_wp_error($response)
-            && strcmp($response['body'], "VERIFIED") === 0
-        ) {
-            return true;
-        }
-        // huh, something's wack... the IPN didn't validate. We must have replied to the IPN incorrectly,
-        // or their API must have changed: http://www.paypalobjects.com/en_US/ebook/PP_OrderManagement_IntegrationGuide/ipn.html
-        if ($response instanceof WP_Error) {
-            $error_msg = sprintf(
-                esc_html__('WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso'),
-                $response->get_error_code(),
-                $response->get_error_message(),
-                print_r($response->get_error_data(), true)
-            );
-        } elseif (is_array($response) && isset($response['body'])) {
-            $error_msg = $response['body'];
-        } else {
-            $error_msg = print_r($response, true);
-        }
-        $payment->set_gateway_response(
-            sprintf(
-                esc_html__("IPN Validation failed! Paypal responded with '%s'", "event_espresso"),
-                $error_msg
-            )
-        );
-        $payment->set_details(array('REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response));
-        $payment->set_status(EEM_Payment::status_id_failed);
-        // log the results
-        $this->log(
-            array(
-                'url'     => $this->_process_response_url(),
-                'message' => $payment->gateway_response(),
-                'details' => $payment->details(),
-            ),
-            $payment
-        );
-        return false;
-    }
-
-
-    /**
-     * _process_response_url
-     * @return string
-     */
-    protected function _process_response_url()
-    {
-        if (isset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'])) {
-            $url = is_ssl() ? 'https://' : 'http://';
-            $url .= EEH_URL::filter_input_server_url('HTTP_HOST');
-            $url .= EEH_URL::filter_input_server_url();
-        } else {
-            $url = 'unknown';
-        }
-        return $url;
-    }
-
-
-    /**
-     * Updates the transaction and line items based on the payment IPN data from PayPal,
-     * like the taxes or shipping
-     *
-     * @param EEI_Payment $payment
-     * @throws \EE_Error
-     */
-    public function update_txn_based_on_payment($payment)
-    {
-        $update_info = $payment->details();
-        /** @var EE_Transaction $transaction */
-        $transaction = $payment->transaction();
-        $payment_was_itemized = $payment->get_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true, false);
-        if (! $transaction) {
-            $this->log(
-                esc_html__(
-                    // @codingStandardsIgnoreStart
-                    'Payment with ID %d has no related transaction, and so update_txn_based_on_payment couldn\'t be executed properly',
-                    // @codingStandardsIgnoreEnd
-                    'event_espresso'
-                ),
-                $payment
-            );
-            return;
-        }
-        if (! is_array($update_info)
-            || ! isset($update_info['mc_shipping'])
-            || ! isset($update_info['tax'])
-        ) {
-            $this->log(
-                array(
-                    'message' => esc_html__(
-                        // @codingStandardsIgnoreStart
-                        'Could not update transaction based on payment because the payment details have not yet been put on the payment. This normally happens during the IPN or returning from PayPal',
-                        // @codingStandardsIgnoreEnd
-                        'event_espresso'
-                    ),
-                    'url'     => $this->_process_response_url(),
-                    'payment' => $payment->model_field_array()
-                ),
-                $payment
-            );
-            return;
-        }
-        if ($payment->status() !== $this->_pay_model->approved_status()) {
-            $this->log(
-                array(
-                    'message' => esc_html__(
-                        'We shouldn\'t update transactions taxes or shipping data from non-approved payments',
-                        'event_espresso'
-                    ),
-                    'url'     => $this->_process_response_url(),
-                    'payment' => $payment->model_field_array()
-                ),
-                $payment
-            );
-            return;
-        }
-        $grand_total_needs_resaving = false;
-        /** @var EE_Line_Item $transaction_total_line_item */
-        $transaction_total_line_item = $transaction->total_line_item();
-
-        // might paypal have changed the taxes?
-        if ($this->_paypal_taxes && $payment_was_itemized) {
-            // note that we're doing this BEFORE adding shipping;
-            // we actually want PayPal's shipping to remain non-taxable
-            $this->_line_item->set_line_items_taxable($transaction_total_line_item, true, 'paypal_shipping');
-            $this->_line_item->set_total_tax_to(
-                $transaction_total_line_item,
-                (float) $update_info['tax'],
-                esc_html__('Taxes', 'event_espresso'),
-                esc_html__('Calculated by Paypal', 'event_espresso'),
-                'paypal_tax'
-            );
-            $grand_total_needs_resaving = true;
-        }
-
-        $shipping_amount = (float) $update_info['mc_shipping'];
-        // might paypal have added shipping?
-        if ($this->_paypal_shipping && $shipping_amount && $payment_was_itemized) {
-            $this->_line_item->add_unrelated_item(
-                $transaction_total_line_item,
-                sprintf(esc_html__('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID()),
-                $shipping_amount,
-                esc_html__('Shipping charges calculated by Paypal', 'event_espresso'),
-                1,
-                false,
-                'paypal_shipping_' . $transaction->ID()
-            );
-            $grand_total_needs_resaving = true;
-        }
-
-        if ($grand_total_needs_resaving) {
-            $transaction_total_line_item->save_this_and_descendants_to_txn($transaction->ID());
-            /** @var EE_Registration_Processor $registration_processor */
-            $registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
-            $registration_processor->update_registration_final_prices($transaction);
-        }
-        $this->log(
-            array(
-                'message'                     => esc_html__('Updated transaction related to payment', 'event_espresso'),
-                'url'                         => $this->_process_response_url(),
-                'transaction (updated)'       => $transaction->model_field_array(),
-                'payment (updated)'           => $payment->model_field_array(),
-                'use_paypal_shipping'         => $this->_paypal_shipping,
-                'use_paypal_tax'              => $this->_paypal_taxes,
-                'grand_total_needed_resaving' => $grand_total_needs_resaving,
-            ),
-            $payment
-        );
-    }
+			$redirect_args[ 'shipping_' . $item_num ] = '0';
+			$redirect_args[ 'shipping2_' . $item_num ] = '0';
+		}
+
+		$redirect_args['business'] = $this->_paypal_id;
+		$redirect_args['return'] = $return_url;
+		$redirect_args['cancel_return'] = $cancel_url;
+		$redirect_args['notify_url'] = $notify_url;
+		$redirect_args['cmd'] = '_cart';
+		$redirect_args['upload'] = 1;
+		$redirect_args['currency_code'] = $payment->currency_code();
+		$redirect_args['rm'] = 2;// makes the user return with method=POST
+		if ($this->_image_url) {
+			$redirect_args['image_url'] = $this->_image_url;
+		}
+		$redirect_args['no_shipping'] = $this->_shipping_details;
+		$redirect_args['bn'] = 'EventEspresso_SP';// EE will blow up if you change this
+
+		$redirect_args = apply_filters("FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this);
+
+		$payment->set_redirect_url($this->_gateway_url);
+		$payment->set_redirect_args($redirect_args);
+		// log the results
+		$this->log(
+			array(
+				'message'     => sprintf(
+					__('PayPal payment request initiated.', 'event_espresso')
+				),
+				'transaction' => $transaction->model_field_array(),
+			),
+			$payment
+		);
+		return $payment;
+	}
+
+
+	/**
+	 * Often used for IPNs. But applies the info in $update_info to the payment.
+	 * What is $update_info? Often the contents of $_REQUEST, but not necessarily. Whatever
+	 * the payment method passes in.
+	 *
+	 * @param array $update_info like $_POST
+	 * @param EEI_Transaction $transaction
+	 * @return \EEI_Payment updated
+	 * @throws \EE_Error, IpnException
+	 */
+	public function handle_payment_update($update_info, $transaction)
+	{
+		// verify there's payment data that's been sent
+		if (empty($update_info['payment_status']) || empty($update_info['txn_id'])) {
+			// log the results
+			$this->log(
+				array(
+					'message'     => sprintf(
+						// @codingStandardsIgnoreStart
+						__('PayPal IPN response is missing critical payment data. This may indicate a PDT request and require your PayPal account settings to be corrected.', 'event_espresso')
+						// @codingStandardsIgnoreEnd
+					),
+					'update_info' => $update_info,
+				),
+				$transaction
+			);
+			// waaaait... is this a PDT request? (see https://developer.paypal.com/docs/classic/products/payment-data-transfer/)
+			// indicated by the "tx" argument? If so, we don't need it. We'll just use the IPN data when it comes
+			if (isset($update_info['tx'])) {
+				return $transaction->last_payment();
+			} else {
+				return null;
+			}
+		}
+		$payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr($update_info['txn_id']);
+		if (! $payment instanceof EEI_Payment) {
+			$payment = $transaction->last_payment();
+		}
+		// ok, then validate the IPN. Even if we've already processed this payment,
+		// let PayPal know we don't want to hear from them anymore!
+		if (! $this->validate_ipn($update_info, $payment)) {
+			return $payment;
+		}
+		// kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction,
+		// registrations, ticket counts, etc)
+		if ((
+				$update_info['payment_status'] === 'Refunded'
+				|| $update_info['payment_status'] === 'Partially_Refunded'
+			)
+			&& apply_filters('FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true)
+		) {
+			throw new EventEspresso\core\exceptions\IpnException(
+				sprintf(
+					esc_html__('Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'),
+					$update_info['payment_status']
+				),
+				EventEspresso\core\exceptions\IpnException::UNSUPPORTED,
+				null,
+				$payment,
+				$update_info
+			);
+		}
+		// ok, well let's process this payment then!
+		switch ($update_info['payment_status']) {
+			case 'Completed':
+				$status = $this->_pay_model->approved_status();
+				$gateway_response = esc_html__('The payment is approved.', 'event_espresso');
+				break;
+
+			case 'Pending':
+				$status = $this->_pay_model->pending_status();
+				$gateway_response = esc_html__(
+					'The payment is in progress. Another message will be sent when payment is approved.',
+					'event_espresso'
+				);
+				break;
+
+			case 'Denied':
+				$status = $this->_pay_model->declined_status();
+				$gateway_response = esc_html__('The payment has been declined.', 'event_espresso');
+				break;
+
+			case 'Expired':
+			case 'Failed':
+				$status = $this->_pay_model->failed_status();
+				$gateway_response = esc_html__('The payment failed for technical reasons or expired.', 'event_espresso');
+				break;
+
+			case 'Refunded':
+			case 'Partially_Refunded':
+				// even though it's a refund, we consider the payment as approved, it just has a negative value
+				$status = $this->_pay_model->approved_status();
+				$gateway_response = esc_html__(
+					'The payment has been refunded. Please update registrations accordingly.',
+					'event_espresso'
+				);
+				break;
+
+			case 'Voided':
+			case 'Reversed':
+			case 'Canceled_Reversal':
+			default:
+				$status = $this->_pay_model->cancelled_status();
+				$gateway_response = esc_html__(
+					'The payment was cancelled, reversed, or voided. Please update registrations accordingly.',
+					'event_espresso'
+				);
+				break;
+		}
+
+		// check if we've already processed this payment
+		if ($payment instanceof EEI_Payment) {
+			// payment exists. if this has the exact same status and amount, don't bother updating. just return
+			if ($payment->status() === $status && (float) $payment->amount() === (float) $update_info['mc_gross']) {
+				// DUPLICATED IPN! don't bother updating transaction
+				throw new IpnException(
+					sprintf(
+						esc_html__(
+							'It appears we have received a duplicate IPN from PayPal for payment %d',
+							'event_espresso'
+						),
+						$payment->ID()
+					),
+					IpnException::DUPLICATE,
+					null,
+					$payment,
+					$update_info
+				);
+			} else {
+				// new payment yippee !!!
+				$payment->set_status($status);
+				$payment->set_amount((float) $update_info['mc_gross']);
+				$payment->set_gateway_response($gateway_response);
+				$payment->set_details($update_info);
+				$payment->set_txn_id_chq_nmbr($update_info['txn_id']);
+				$this->log(
+					array(
+						'message'  => esc_html__(
+							'Updated payment either from IPN or as part of POST from PayPal',
+							'event_espresso'
+						),
+						'url'      => $this->_process_response_url(),
+						'payment'  => $payment->model_field_array(),
+						'IPN_data' => $update_info
+					),
+					$payment
+				);
+			}
+		}
+		do_action('FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this);
+		return $payment;
+	}
+
+
+	/**
+	 * Validate the IPN notification.
+	 *
+	 * @param array                  $update_info like $_REQUEST
+	 * @param EE_Payment|EEI_Payment $payment
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
+	public function validate_ipn($update_info, $payment)
+	{
+		// allow us to skip validating IPNs with PayPal (useful for testing)
+		if (apply_filters('FHEE__EEG_Paypal_Standard__validate_ipn__skip', false)) {
+			return true;
+		}
+		// ...otherwise, we actually don't care what the $update_info is, we need to look
+		// at the request directly because we can't use $update_info because it has issues with quotes
+		// Reading POSTed data directly from $_POST causes serialization issues with array data in the POST.
+		// Instead, read raw POST data from the input stream.
+		// @see https://gist.github.com/xcommerce-gists/3440401
+		$raw_post_data = file_get_contents('php://input');
+		$raw_post_array = explode('&', $raw_post_data);
+		$update_info = array();
+		foreach ($raw_post_array as $keyval) {
+			$keyval = explode('=', $keyval);
+			if (count($keyval) === 2) {
+				$update_info[ $keyval[0] ] = urldecode($keyval[1]);
+			}
+		}
+		// read the IPN message sent from PayPal and prepend 'cmd=_notify-validate'
+		$req = 'cmd=_notify-validate';
+		$uses_get_magic_quotes = function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc() === 1
+			? true
+			: false;
+		foreach ($update_info as $key => $value) {
+			$value = $uses_get_magic_quotes ? urlencode(stripslashes($value)) : urlencode($value);
+			$req .= "&$key=$value";
+		}
+		// HTTP POST the complete, unaltered IPN back to PayPal
+		$response = wp_remote_post(
+			$this->_gateway_url,
+			array(
+				'body'              => $req,
+				'sslverify'         => false,
+				'timeout'           => 60,
+				// make sure to set a site specific unique "user-agent" string since the WordPres default gets declined by PayPal
+				// plz see: https://github.com/websharks/s2member/issues/610
+				'user-agent'        => 'Event Espresso v' . EVENT_ESPRESSO_VERSION . '; ' . home_url(),
+				'httpversion'       => '1.1'
+			)
+		);
+		// then check the response
+		if (array_key_exists('body', $response)
+			&& ! is_wp_error($response)
+			&& strcmp($response['body'], "VERIFIED") === 0
+		) {
+			return true;
+		}
+		// huh, something's wack... the IPN didn't validate. We must have replied to the IPN incorrectly,
+		// or their API must have changed: http://www.paypalobjects.com/en_US/ebook/PP_OrderManagement_IntegrationGuide/ipn.html
+		if ($response instanceof WP_Error) {
+			$error_msg = sprintf(
+				esc_html__('WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso'),
+				$response->get_error_code(),
+				$response->get_error_message(),
+				print_r($response->get_error_data(), true)
+			);
+		} elseif (is_array($response) && isset($response['body'])) {
+			$error_msg = $response['body'];
+		} else {
+			$error_msg = print_r($response, true);
+		}
+		$payment->set_gateway_response(
+			sprintf(
+				esc_html__("IPN Validation failed! Paypal responded with '%s'", "event_espresso"),
+				$error_msg
+			)
+		);
+		$payment->set_details(array('REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response));
+		$payment->set_status(EEM_Payment::status_id_failed);
+		// log the results
+		$this->log(
+			array(
+				'url'     => $this->_process_response_url(),
+				'message' => $payment->gateway_response(),
+				'details' => $payment->details(),
+			),
+			$payment
+		);
+		return false;
+	}
+
+
+	/**
+	 * _process_response_url
+	 * @return string
+	 */
+	protected function _process_response_url()
+	{
+		if (isset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'])) {
+			$url = is_ssl() ? 'https://' : 'http://';
+			$url .= EEH_URL::filter_input_server_url('HTTP_HOST');
+			$url .= EEH_URL::filter_input_server_url();
+		} else {
+			$url = 'unknown';
+		}
+		return $url;
+	}
+
+
+	/**
+	 * Updates the transaction and line items based on the payment IPN data from PayPal,
+	 * like the taxes or shipping
+	 *
+	 * @param EEI_Payment $payment
+	 * @throws \EE_Error
+	 */
+	public function update_txn_based_on_payment($payment)
+	{
+		$update_info = $payment->details();
+		/** @var EE_Transaction $transaction */
+		$transaction = $payment->transaction();
+		$payment_was_itemized = $payment->get_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true, false);
+		if (! $transaction) {
+			$this->log(
+				esc_html__(
+					// @codingStandardsIgnoreStart
+					'Payment with ID %d has no related transaction, and so update_txn_based_on_payment couldn\'t be executed properly',
+					// @codingStandardsIgnoreEnd
+					'event_espresso'
+				),
+				$payment
+			);
+			return;
+		}
+		if (! is_array($update_info)
+			|| ! isset($update_info['mc_shipping'])
+			|| ! isset($update_info['tax'])
+		) {
+			$this->log(
+				array(
+					'message' => esc_html__(
+						// @codingStandardsIgnoreStart
+						'Could not update transaction based on payment because the payment details have not yet been put on the payment. This normally happens during the IPN or returning from PayPal',
+						// @codingStandardsIgnoreEnd
+						'event_espresso'
+					),
+					'url'     => $this->_process_response_url(),
+					'payment' => $payment->model_field_array()
+				),
+				$payment
+			);
+			return;
+		}
+		if ($payment->status() !== $this->_pay_model->approved_status()) {
+			$this->log(
+				array(
+					'message' => esc_html__(
+						'We shouldn\'t update transactions taxes or shipping data from non-approved payments',
+						'event_espresso'
+					),
+					'url'     => $this->_process_response_url(),
+					'payment' => $payment->model_field_array()
+				),
+				$payment
+			);
+			return;
+		}
+		$grand_total_needs_resaving = false;
+		/** @var EE_Line_Item $transaction_total_line_item */
+		$transaction_total_line_item = $transaction->total_line_item();
+
+		// might paypal have changed the taxes?
+		if ($this->_paypal_taxes && $payment_was_itemized) {
+			// note that we're doing this BEFORE adding shipping;
+			// we actually want PayPal's shipping to remain non-taxable
+			$this->_line_item->set_line_items_taxable($transaction_total_line_item, true, 'paypal_shipping');
+			$this->_line_item->set_total_tax_to(
+				$transaction_total_line_item,
+				(float) $update_info['tax'],
+				esc_html__('Taxes', 'event_espresso'),
+				esc_html__('Calculated by Paypal', 'event_espresso'),
+				'paypal_tax'
+			);
+			$grand_total_needs_resaving = true;
+		}
+
+		$shipping_amount = (float) $update_info['mc_shipping'];
+		// might paypal have added shipping?
+		if ($this->_paypal_shipping && $shipping_amount && $payment_was_itemized) {
+			$this->_line_item->add_unrelated_item(
+				$transaction_total_line_item,
+				sprintf(esc_html__('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID()),
+				$shipping_amount,
+				esc_html__('Shipping charges calculated by Paypal', 'event_espresso'),
+				1,
+				false,
+				'paypal_shipping_' . $transaction->ID()
+			);
+			$grand_total_needs_resaving = true;
+		}
+
+		if ($grand_total_needs_resaving) {
+			$transaction_total_line_item->save_this_and_descendants_to_txn($transaction->ID());
+			/** @var EE_Registration_Processor $registration_processor */
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
+			$registration_processor->update_registration_final_prices($transaction);
+		}
+		$this->log(
+			array(
+				'message'                     => esc_html__('Updated transaction related to payment', 'event_espresso'),
+				'url'                         => $this->_process_response_url(),
+				'transaction (updated)'       => $transaction->model_field_array(),
+				'payment (updated)'           => $payment->model_field_array(),
+				'use_paypal_shipping'         => $this->_paypal_shipping,
+				'use_paypal_tax'              => $this->_paypal_taxes,
+				'grand_total_needed_resaving' => $grand_total_needs_resaving,
+			),
+			$payment
+		);
+	}
 }

Spacing +31 added lines, -31 removed lines

@@ -137,17 +137,17 @@ 
                         $shipping_previously_added = $line_item->total();
                         continue;
                     }
-                    $redirect_args[ 'item_name_' . $item_num ] = substr(
+                    $redirect_args['item_name_'.$item_num] = substr(
                         $gateway_formatter->formatLineItemName($line_item, $payment),
                         0,
                         127
                     );
-                    $redirect_args[ 'amount_' . $item_num ] = $line_item->unit_price();
-                    $redirect_args[ 'quantity_' . $item_num ] = $line_item->quantity();
+                    $redirect_args['amount_'.$item_num] = $line_item->unit_price();
+                    $redirect_args['quantity_'.$item_num] = $line_item->quantity();
                     // if we're not letting PayPal calculate shipping, tell them its 0
-                    if (! $this->_paypal_shipping) {
-                        $redirect_args[ 'shipping_' . $item_num ] = '0';
-                        $redirect_args[ 'shipping2_' . $item_num ] = '0';
+                    if ( ! $this->_paypal_shipping) {
+                        $redirect_args['shipping_'.$item_num] = '0';
+                        $redirect_args['shipping2_'.$item_num] = '0';
                     }
                     $item_num++;
                     $itemized_sum += $line_item->total();
@@ -167,15 +167,15 @@ 
                 // itemized sum is too big
                 $total_discounts_to_cart_total += abs($itemized_sum_diff_from_txn_total);
             } elseif ($itemized_sum_diff_from_txn_total > 0) {
-                $redirect_args[ 'item_name_' . $item_num ] = substr(
+                $redirect_args['item_name_'.$item_num] = substr(
                     __('Other charges', 'event_espresso'),
                     0,
                     127
                 );
-                $redirect_args[ 'amount_' . $item_num ] = $gateway_formatter->formatCurrency(
+                $redirect_args['amount_'.$item_num] = $gateway_formatter->formatCurrency(
                     $itemized_sum_diff_from_txn_total
                 );
-                $redirect_args[ 'quantity_' . $item_num ] = 1;
+                $redirect_args['quantity_'.$item_num] = 1;
                 $item_num++;
             }
             if ($total_discounts_to_cart_total > 0) {
@@ -184,34 +184,34 @@ 
                 );
             }
             // add our taxes to the order if we're NOT using PayPal's
-            if (! $this->_paypal_taxes) {
+            if ( ! $this->_paypal_taxes) {
                 $redirect_args['tax_cart'] = $total_line_item->get_total_tax();
             }
         } else {
             $payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, false);
             // partial payment that's not for the remaining amount, so we can't send an itemized list
-            $redirect_args[ 'item_name_' . $item_num ] = substr(
+            $redirect_args['item_name_'.$item_num] = substr(
                 $gateway_formatter->formatPartialPaymentLineItemName($payment),
                 0,
                 127
             );
-            $redirect_args[ 'amount_' . $item_num ] = $payment->amount();
-            $redirect_args[ 'shipping_' . $item_num ] = '0';
-            $redirect_args[ 'shipping2_' . $item_num ] = '0';
+            $redirect_args['amount_'.$item_num] = $payment->amount();
+            $redirect_args['shipping_'.$item_num] = '0';
+            $redirect_args['shipping2_'.$item_num] = '0';
             $redirect_args['tax_cart'] = '0';
             $item_num++;
         }
 
         if ($this->_debug_mode) {
-            $redirect_args[ 'item_name_' . $item_num ] = 'DEBUG INFO (this item only added in sandbox mode';
-            $redirect_args[ 'amount_' . $item_num ] = 0;
-            $redirect_args[ 'on0_'.$item_num ] = 'NOTIFY URL';
-            $redirect_args[ 'os0_' . $item_num ] = $notify_url;
-            $redirect_args[ 'on1_'.$item_num ] = 'RETURN URL';
-            $redirect_args[ 'os1_' . $item_num ] = $return_url;
+            $redirect_args['item_name_'.$item_num] = 'DEBUG INFO (this item only added in sandbox mode';
+            $redirect_args['amount_'.$item_num] = 0;
+            $redirect_args['on0_'.$item_num] = 'NOTIFY URL';
+            $redirect_args['os0_'.$item_num] = $notify_url;
+            $redirect_args['on1_'.$item_num] = 'RETURN URL';
+            $redirect_args['os1_'.$item_num] = $return_url;
 //          $redirect_args['option_index_' . $item_num] = 1; // <-- dunno if this is needed ?
-            $redirect_args[ 'shipping_' . $item_num ] = '0';
-            $redirect_args[ 'shipping2_' . $item_num ] = '0';
+            $redirect_args['shipping_'.$item_num] = '0';
+            $redirect_args['shipping2_'.$item_num] = '0';
         }
 
         $redirect_args['business'] = $this->_paypal_id;
@@ -221,12 +221,12 @@ 
         $redirect_args['cmd'] = '_cart';
         $redirect_args['upload'] = 1;
         $redirect_args['currency_code'] = $payment->currency_code();
-        $redirect_args['rm'] = 2;// makes the user return with method=POST
+        $redirect_args['rm'] = 2; // makes the user return with method=POST
         if ($this->_image_url) {
             $redirect_args['image_url'] = $this->_image_url;
         }
         $redirect_args['no_shipping'] = $this->_shipping_details;
-        $redirect_args['bn'] = 'EventEspresso_SP';// EE will blow up if you change this
+        $redirect_args['bn'] = 'EventEspresso_SP'; // EE will blow up if you change this
 
         $redirect_args = apply_filters("FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this);
 
@@ -281,12 +281,12 @@ 
             }
         }
         $payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr($update_info['txn_id']);
-        if (! $payment instanceof EEI_Payment) {
+        if ( ! $payment instanceof EEI_Payment) {
             $payment = $transaction->last_payment();
         }
         // ok, then validate the IPN. Even if we've already processed this payment,
         // let PayPal know we don't want to hear from them anymore!
-        if (! $this->validate_ipn($update_info, $payment)) {
+        if ( ! $this->validate_ipn($update_info, $payment)) {
             return $payment;
         }
         // kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction,
@@ -425,7 +425,7 @@ 
         foreach ($raw_post_array as $keyval) {
             $keyval = explode('=', $keyval);
             if (count($keyval) === 2) {
-                $update_info[ $keyval[0] ] = urldecode($keyval[1]);
+                $update_info[$keyval[0]] = urldecode($keyval[1]);
             }
         }
         // read the IPN message sent from PayPal and prepend 'cmd=_notify-validate'
@@ -446,7 +446,7 @@ 
                 'timeout'           => 60,
                 // make sure to set a site specific unique "user-agent" string since the WordPres default gets declined by PayPal
                 // plz see: https://github.com/websharks/s2member/issues/610
-                'user-agent'        => 'Event Espresso v' . EVENT_ESPRESSO_VERSION . '; ' . home_url(),
+                'user-agent'        => 'Event Espresso v'.EVENT_ESPRESSO_VERSION.'; '.home_url(),
                 'httpversion'       => '1.1'
             )
         );
@@ -522,7 +522,7 @@ 
         /** @var EE_Transaction $transaction */
         $transaction = $payment->transaction();
         $payment_was_itemized = $payment->get_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true, false);
-        if (! $transaction) {
+        if ( ! $transaction) {
             $this->log(
                 esc_html__(
                     // @codingStandardsIgnoreStart
@@ -534,7 +534,7 @@ 
             );
             return;
         }
-        if (! is_array($update_info)
+        if ( ! is_array($update_info)
             || ! isset($update_info['mc_shipping'])
             || ! isset($update_info['tax'])
         ) {
@@ -596,7 +596,7 @@ 
                 esc_html__('Shipping charges calculated by Paypal', 'event_espresso'),
                 1,
                 false,
-                'paypal_shipping_' . $transaction->ID()
+                'paypal_shipping_'.$transaction->ID()
             );
             $grand_total_needs_resaving = true;
         }

payment_methods/Paypal_Standard/templates/paypal_standard_intro.template.php

Indentation +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@
 // if this is decaf, which is put on WordPress.org, we need to inform users that
 // we just put an affiliate link there. See https://developer.wordpress.org/plugins/wordpress-org/detailed-plugin-guidelines/ section 12
 if (apply_filters('FHEE__ee_show_affiliate_links', true)) {
-    $closing_tag .= esc_html__(' (affiliate link)', 'event_espresso');
+	$closing_tag .= esc_html__(' (affiliate link)', 'event_espresso');
 }
 printf(
-    esc_html__(
-        'PayPal Standard (PayPal Payments Standard) is an off-site payment method and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.',
-        'event_espresso'
-    ),
-    '<a href="https://eventespresso.com/go/paypalstandard/" target="_blank">',
-    $closing_tag
+	esc_html__(
+		'PayPal Standard (PayPal Payments Standard) is an off-site payment method and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.',
+		'event_espresso'
+	),
+	'<a href="https://eventespresso.com/go/paypalstandard/" target="_blank">',
+	$closing_tag
 );

payment_methods/Check/templates/check_intro.template.php

Indentation +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php esc_html_e(
-    'Check is an offline payment method for accepting payments. Payments are processed manually by providing your registrants/attendees with information on how to pay with a check.',
-    'event_espresso'
+	'Check is an offline payment method for accepting payments. Payments are processed manually by providing your registrants/attendees with information on how to pay with a check.',
+	'event_espresso'
 );

payment_methods/Admin_Only/EE_PMT_Admin_Only.pm.php

Indentation +34 added lines, -34 removed lines

@@ -16,38 +16,38 @@
 
 
 
-    /**
-     *
-     * @param EE_Payment_Method $pm_instance
-     * @return EE_PMT_Admin_Only
-     */
-    public function __construct($pm_instance = null)
-    {
-        $this->_pretty_name = __("Admin Only", 'event_espresso');
-        $this->_default_button_url = '';
-        parent::__construct($pm_instance);
-    }
-
-
-
-    /**
-     * Creates the billing form for this payment method type
-     * @param \EE_Transaction $transaction
-     * @return NULL
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null)
-    {
-        return null;
-    }
-
-
-
-    /**
-     * Gets the form for all the settings related to this payment method type
-     * @return EE_Payment_Method_Form
-     */
-    public function generate_new_settings_form()
-    {
-        return new EE_Payment_Method_Form();
-    }
+	/**
+	 *
+	 * @param EE_Payment_Method $pm_instance
+	 * @return EE_PMT_Admin_Only
+	 */
+	public function __construct($pm_instance = null)
+	{
+		$this->_pretty_name = __("Admin Only", 'event_espresso');
+		$this->_default_button_url = '';
+		parent::__construct($pm_instance);
+	}
+
+
+
+	/**
+	 * Creates the billing form for this payment method type
+	 * @param \EE_Transaction $transaction
+	 * @return NULL
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null)
+	{
+		return null;
+	}
+
+
+
+	/**
+	 * Gets the form for all the settings related to this payment method type
+	 * @return EE_Payment_Method_Form
+	 */
+	public function generate_new_settings_form()
+	{
+		return new EE_Payment_Method_Form();
+	}
 }

payment_methods/Bank/templates/bank_intro.template.php

Indentation +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php esc_html_e(
-    'Bank is an offline payment method for accepting payments. Payments are processed manually by providing your registrants/attendees with information on how to pay with a bank transfer.',
-    'event_espresso'
+	'Bank is an offline payment method for accepting payments. Payments are processed manually by providing your registrants/attendees with information on how to pay with a bank transfer.',
+	'event_espresso'
 );

caffeinated/admin/new/pricing/Pricing_Admin_Page.core.php

Indentation +1412 added lines, -1412 removed lines

@@ -12,1420 +12,1420 @@
 class Pricing_Admin_Page extends EE_Admin_Page
 {
 
-    /**
-     *    constructor
-     *
-     * @Constructor
-     * @access public
-     * @param bool $routing
-     * @return Pricing_Admin_Page
-     */
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-    }
-
-
-    protected function _init_page_props()
-    {
-        $this->page_slug = PRICING_PG_SLUG;
-        $this->page_label = PRICING_LABEL;
-        $this->_admin_base_url = PRICING_ADMIN_URL;
-        $this->_admin_base_path = PRICING_ADMIN;
-    }
-
-
-    protected function _ajax_hooks()
-    {
-        add_action('wp_ajax_espresso_update_prices_order', array($this, 'update_price_order'));
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_admin_page_title = PRICING_LABEL;
-        $this->_labels = array(
-            'buttons' => array(
-                'add'         => __('Add New Default Price', 'event_espresso'),
-                'edit'        => __('Edit Default Price', 'event_espresso'),
-                'delete'      => __('Delete Default Price', 'event_espresso'),
-                'add_type'    => __('Add New Default Price Type', 'event_espresso'),
-                'edit_type'   => __('Edit Price Type', 'event_espresso'),
-                'delete_type' => __('Delete Price Type', 'event_espresso'),
-            ),
-        );
-    }
-
-
-    /**
-     *        an array for storing request actions and their corresponding methods
-     *
-     * @access private
-     * @return void
-     */
-    protected function _set_page_routes()
-    {
-        $prc_id = ! empty($this->_req_data['PRC_ID']) && ! is_array($this->_req_data['PRC_ID'])
-            ? $this->_req_data['PRC_ID'] : 0;
-        $prt_id = ! empty($this->_req_data['PRT_ID']) && ! is_array($this->_req_data['PRT_ID'])
-            ? $this->_req_data['PRT_ID'] : 0;
-        $this->_page_routes = array(
-            'default'                     => array(
-                'func'       => '_price_overview_list_table',
-                'capability' => 'ee_read_default_prices',
-            ),
-            'add_new_price'               => array(
-                'func'       => '_edit_price_details',
-                'args'       => array('new_price' => true),
-                'capability' => 'ee_edit_default_prices',
-            ),
-            'edit_price'                  => array(
-                'func'       => '_edit_price_details',
-                'args'       => array('new_price' => false),
-                'capability' => 'ee_edit_default_price',
-                'obj_id'     => $prc_id,
-            ),
-            'insert_price'                => array(
-                'func'       => '_insert_or_update_price',
-                'args'       => array('new_price' => true),
-                'noheader'   => true,
-                'capability' => 'ee_edit_default_prices',
-            ),
-            'update_price'                => array(
-                'func'       => '_insert_or_update_price',
-                'args'       => array('new_price' => false),
-                'noheader'   => true,
-                'capability' => 'ee_edit_default_price',
-                'obj_id'     => $prc_id,
-            ),
-            'trash_price'                 => array(
-                'func'       => '_trash_or_restore_price',
-                'args'       => array('trash' => true),
-                'noheader'   => true,
-                'capability' => 'ee_delete_default_price',
-                'obj_id'     => $prc_id,
-            ),
-            'restore_price'               => array(
-                'func'       => '_trash_or_restore_price',
-                'args'       => array('trash' => false),
-                'noheader'   => true,
-                'capability' => 'ee_delete_default_price',
-                'obj_id'     => $prc_id,
-            ),
-            'delete_price'                => array(
-                'func'       => '_delete_price',
-                'noheader'   => true,
-                'capability' => 'ee_delete_default_price',
-                'obj_id'     => $prc_id,
-            ),
-            'espresso_update_price_order' => array(
-                'func'       => 'update_price_order',
-                'noheader'   => true,
-                'capability' => 'ee_edit_default_prices',
-            ),
-            // price types
-            'price_types'                 => array(
-                'func'       => '_price_types_overview_list_table',
-                'capability' => 'ee_read_default_price_types',
-            ),
-            'add_new_price_type'          => array(
-                'func'       => '_edit_price_type_details',
-                'capability' => 'ee_edit_default_price_types',
-            ),
-            'edit_price_type'             => array(
-                'func'       => '_edit_price_type_details',
-                'capability' => 'ee_edit_default_price_type',
-                'obj_id'     => $prt_id,
-            ),
-            'insert_price_type'           => array(
-                'func'       => '_insert_or_update_price_type',
-                'args'       => array('new_price_type' => true),
-                'noheader'   => true,
-                'capability' => 'ee_edit_default_price_types',
-            ),
-            'update_price_type'           => array(
-                'func'       => '_insert_or_update_price_type',
-                'args'       => array('new_price_type' => false),
-                'noheader'   => true,
-                'capability' => 'ee_edit_default_price_type',
-                'obj_id'     => $prt_id,
-            ),
-            'trash_price_type'            => array(
-                'func'       => '_trash_or_restore_price_type',
-                'args'       => array('trash' => true),
-                'noheader'   => true,
-                'capability' => 'ee_delete_default_price_type',
-                'obj_id'     => $prt_id,
-            ),
-            'restore_price_type'          => array(
-                'func'       => '_trash_or_restore_price_type',
-                'args'       => array('trash' => false),
-                'noheader'   => true,
-                'capability' => 'ee_delete_default_price_type',
-                'obj_id'     => $prt_id,
-            ),
-            'delete_price_type'           => array(
-                'func'       => '_delete_price_type',
-                'noheader'   => true,
-                'capability' => 'ee_delete_default_price_type',
-                'obj_id'     => $prt_id,
-            ),
-            'tax_settings'                => array(
-                'func'       => '_tax_settings',
-                'capability' => 'manage_options',
-            ),
-            'update_tax_settings'         => array(
-                'func'       => '_update_tax_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
-        );
-    }
-
-
-    protected function _set_page_config()
-    {
-
-        $this->_page_config = array(
-            'default'            => array(
-                'nav'           => array(
-                    'label' => __('Default Pricing', 'event_espresso'),
-                    'order' => 10,
-                ),
-                'list_table'    => 'Prices_List_Table',
-                'help_tabs'     => array(
-                    'pricing_default_pricing_help_tab'                           => array(
-                        'title'    => __('Default Pricing', 'event_espresso'),
-                        'filename' => 'pricing_default_pricing',
-                    ),
-                    'pricing_default_pricing_table_column_headings_help_tab'     => array(
-                        'title'    => __('Default Pricing Table Column Headings', 'event_espresso'),
-                        'filename' => 'pricing_default_pricing_table_column_headings',
-                    ),
-                    'pricing_default_pricing_views_bulk_actions_search_help_tab' => array(
-                        'title'    => __('Default Pricing Views & Bulk Actions & Search', 'event_espresso'),
-                        'filename' => 'pricing_default_pricing_views_bulk_actions_search',
-                    ),
-                ),
-                'help_tour'     => array('Pricing_Default_Prices_Help_Tour'),
-                'require_nonce' => false,
-            ),
-            'add_new_price'      => array(
-                'nav'           => array(
-                    'label'      => __('Add New Default Price', 'event_espresso'),
-                    'order'      => 20,
-                    'persistent' => false,
-                ),
-                'help_tabs'     => array(
-                    'add_new_default_price_help_tab' => array(
-                        'title'    => __('Add New Default Price', 'event_espresso'),
-                        'filename' => 'pricing_add_new_default_price',
-                    ),
-                ),
-                'help_tour'     => array('Pricing_Add_New_Default_Price_Help_Tour'),
-                'metaboxes'     => array('_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes'),
-                'require_nonce' => false,
-            ),
-            'edit_price'         => array(
-                'nav'           => array(
-                    'label'      => __('Edit Default Price', 'event_espresso'),
-                    'order'      => 20,
-                    'url'        => isset($this->_req_data['id']) ? add_query_arg(
-                        array('id' => $this->_req_data['id']),
-                        $this->_current_page_view_url
-                    ) : $this->_admin_base_url,
-                    'persistent' => false,
-                ),
-                'metaboxes'     => array('_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes'),
-                'help_tabs'     => array(
-                    'edit_default_price_help_tab' => array(
-                        'title'    => __('Edit Default Price', 'event_espresso'),
-                        'filename' => 'pricing_edit_default_price',
-                    ),
-                ),
-                'help_tour'     => array('Pricing_Edit_Default_Price_Help_Tour'),
-                'require_nonce' => false,
-            ),
-            'price_types'        => array(
-                'nav'           => array(
-                    'label' => __('Price Types', 'event_espresso'),
-                    'order' => 30,
-                ),
-                'list_table'    => 'Price_Types_List_Table',
-                'help_tabs'     => array(
-                    'pricing_price_types_help_tab'                           => array(
-                        'title'    => __('Price Types', 'event_espresso'),
-                        'filename' => 'pricing_price_types',
-                    ),
-                    'pricing_price_types_table_column_headings_help_tab'     => array(
-                        'title'    => __('Price Types Table Column Headings', 'event_espresso'),
-                        'filename' => 'pricing_price_types_table_column_headings',
-                    ),
-                    'pricing_price_types_views_bulk_actions_search_help_tab' => array(
-                        'title'    => __('Price Types Views & Bulk Actions & Search', 'event_espresso'),
-                        'filename' => 'pricing_price_types_views_bulk_actions_search',
-                    ),
-                ),
-                'help_tour'     => array('Pricing_Price_Types_Default_Help_Tour'),
-                'metaboxes'     => array('_espresso_news_post_box', '_espresso_links_post_box'),
-                'require_nonce' => false,
-            ),
-            'add_new_price_type' => array(
-                'nav'           => array(
-                    'label'      => __('Add New Price Type', 'event_espresso'),
-                    'order'      => 40,
-                    'persistent' => false,
-                ),
-                'help_tabs'     => array(
-                    'add_new_price_type_help_tab' => array(
-                        'title'    => __('Add New Price Type', 'event_espresso'),
-                        'filename' => 'pricing_add_new_price_type',
-                    ),
-                ),
-                'help_tour'     => array('Pricing_Add_New_Price_Type_Help_Tour'),
-                'metaboxes'     => array(
-                    '_publish_post_box',
-                    '_espresso_news_post_box',
-                    '_price_type_details_meta_boxes',
-                ),
-                'require_nonce' => false,
-            ),
-            'edit_price_type'    => array(
-                'nav'       => array(
-                    'label'      => __('Edit Price Type', 'event_espresso'),
-                    'order'      => 40,
-                    'persistent' => false,
-                ),
-                'help_tabs' => array(
-                    'edit_price_type_help_tab' => array(
-                        'title'    => __('Edit Price Type', 'event_espresso'),
-                        'filename' => 'pricing_edit_price_type',
-                    ),
-                ),
-                'help_tour' => array('Pricing_Edit_Price_Type_Help_Tour'),
-                'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes'),
-
-                'require_nonce' => false,
-            ),
-            'tax_settings'       => array(
-                'nav'           => array(
-                    'label' => esc_html__('Tax Settings', 'event_espresso'),
-                    'order' => 40,
-                ),
-                'labels'        => array(
-                    'publishbox' => esc_html__('Update Tax Settings', 'event_espresso'),
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
-                // 'help_tabs'     => array(
-                //     'registration_form_reg_form_settings_help_tab' => array(
-                //         'title'    => esc_html__('Registration Form Settings', 'event_espresso'),
-                //         'filename' => 'registration_form_reg_form_settings'
-                //     ),
-                // ),
-                // 'help_tour'     => array('Registration_Form_Settings_Help_Tour'),
-                'require_nonce' => true,
-            ),
-        );
-    }
-
-
-    protected function _add_screen_options()
-    {
-        // todo
-    }
-
-
-    protected function _add_screen_options_default()
-    {
-        $this->_per_page_screen_option();
-    }
-
-
-    protected function _add_screen_options_price_types()
-    {
-        $page_title = $this->_admin_page_title;
-        $this->_admin_page_title = __('Price Types', 'event_espresso');
-        $this->_per_page_screen_option();
-        $this->_admin_page_title = $page_title;
-    }
-
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-
-    public function load_scripts_styles()
-    {
-        // styles
-        wp_enqueue_style('espresso-ui-theme');
-        wp_register_style(
-            'espresso_PRICING',
-            PRICING_ASSETS_URL . 'espresso_pricing_admin.css',
-            array(),
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('espresso_PRICING');
-
-        // scripts
-        wp_enqueue_script('ee_admin_js');
-        wp_enqueue_script('jquery-ui-position');
-        wp_enqueue_script('jquery-ui-widget');
-        // wp_enqueue_script('jquery-ui-dialog');
-        // wp_enqueue_script('jquery-ui-draggable');
-        // wp_enqueue_script('jquery-ui-datepicker');
-        wp_register_script(
-            'espresso_PRICING',
-            PRICING_ASSETS_URL . 'espresso_pricing_admin.js',
-            array('jquery'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_enqueue_script('espresso_PRICING');
-    }
-
-
-    public function load_scripts_styles_default()
-    {
-        wp_enqueue_script('espresso_ajax_table_sorting');
-    }
-
-
-    public function admin_footer_scripts()
-    {
-    }
-
-    public function admin_init()
-    {
-    }
-
-    public function admin_notices()
-    {
-    }
-
-
-    protected function _set_list_table_views_default()
-    {
-        $this->_views = array(
-            'all' => array(
-                'slug'        => 'all',
-                'label'       => __('View All Default Pricing', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'trash_price' => __('Move to Trash', 'event_espresso'),
-                ),
-            ),
-        );
-
-        if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_prices', 'pricing_trash_price')) {
-            $this->_views['trashed'] = array(
-                'slug'        => 'trashed',
-                'label'       => __('Trash', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'restore_price' => __('Restore from Trash', 'event_espresso'),
-                    'delete_price'  => __('Delete Permanently', 'event_espresso'),
-                ),
-            );
-        }
-    }
-
-
-    protected function _set_list_table_views_price_types()
-    {
-        $this->_views = array(
-            'all' => array(
-                'slug'        => 'all',
-                'label'       => __('All', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'trash_price_type' => __('Move to Trash', 'event_espresso'),
-                ),
-            ),
-        );
-
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_delete_default_price_types',
-            'pricing_trash_price_type'
-        )) {
-            $this->_views['trashed'] = array(
-                'slug'        => 'trashed',
-                'label'       => __('Trash', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'restore_price_type' => __('Restore from Trash', 'event_espresso'),
-                    'delete_price_type'  => __('Delete Permanently', 'event_espresso'),
-                ),
-            );
-        }
-    }
-
-
-    /**
-     *        generates HTML for main Prices Admin page
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _price_overview_list_table()
-    {
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
-            'add_new_price',
-            'add',
-            array(),
-            'add-new-h2'
-        );
-        $this->admin_page_title .= $this->_learn_more_about_pricing_link();
-        $this->_search_btn_label = __('Default Prices', 'event_espresso');
-        $this->display_admin_list_table_page_with_no_sidebar();
-    }
-
-
-    /**
-     *    retrieve data for Prices List table
-     *
-     * @access public
-     * @param  int     $per_page how many prices displayed per page
-     * @param  boolean $count    return the count or objects
-     * @param  boolean $trashed  whether the current view is of the trash can - eww yuck!
-     * @return mixed (int|array)  int = count || array of price objects
-     */
-    public function get_prices_overview_data($per_page = 10, $count = false, $trashed = false)
-    {
-
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        // start with an empty array
-        $event_pricing = array();
-
-        require_once(PRICING_ADMIN . 'Prices_List_Table.class.php');
-        require_once(EE_MODELS . 'EEM_Price.model.php');
-        // $PRC = EEM_Price::instance();
-
-        $this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? '' : $this->_req_data['orderby'];
-        $order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order']
-            : 'ASC';
-
-        switch ($this->_req_data['orderby']) {
-            case 'name':
-                $orderby = array('PRC_name' => $order);
-                break;
-            case 'type':
-                $orderby = array('Price_Type.PRT_name' => $order);
-                break;
-            case 'amount':
-                $orderby = array('PRC_amount' => $order);
-                break;
-            default:
-                $orderby = array('PRC_order' => $order, 'Price_Type.PRT_order' => $order, 'PRC_ID' => $order);
-        }
-
-        $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
-            ? $this->_req_data['paged'] : 1;
-        $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
-            ? $this->_req_data['perpage'] : $per_page;
-
-        $_where = array(
-            'PRC_is_default' => 1,
-            'PRC_deleted'    => $trashed,
-        );
-
-        $offset = ($current_page - 1) * $per_page;
-        $limit = array($offset, $per_page);
-
-        if (isset($this->_req_data['s'])) {
-            $sstr = '%' . $this->_req_data['s'] . '%';
-            $_where['OR'] = array(
-                'PRC_name'            => array('LIKE', $sstr),
-                'PRC_desc'            => array('LIKE', $sstr),
-                'PRC_amount'          => array('LIKE', $sstr),
-                'Price_Type.PRT_name' => array('LIKE', $sstr),
-            );
-        }
-
-        $query_params = array(
-            $_where,
-            'order_by' => $orderby,
-            'limit'    => $limit,
-            'group_by' => 'PRC_ID',
-        );
-
-        if ($count) {
-            return $trashed ? EEM_Price::instance()->count(array($_where))
-                : EEM_Price::instance()->count_deleted_and_undeleted(array($_where));
-        } else {
-            return EEM_Price::instance()->get_all_deleted_and_undeleted($query_params);
-        }
-    }
-
-
-    /**
-     *        _price_details
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _edit_price_details()
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        // grab price ID
-        $PRC_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id']) ? absint($this->_req_data['id'])
-            : false;
-        // change page title based on request action
-        switch ($this->_req_action) {
-            case 'add_new_price':
-                $this->_admin_page_title = esc_html__('Add New Price', 'event_espresso');
-                break;
-            case 'edit_price':
-                $this->_admin_page_title = esc_html__('Edit Price', 'event_espresso');
-                break;
-            default:
-                $this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
-        }
-        // add PRC_ID to title if editing
-        $this->_admin_page_title = $PRC_ID ? $this->_admin_page_title . ' # ' . $PRC_ID : $this->_admin_page_title;
-
-        // get prices
-        require_once(EE_MODELS . 'EEM_Price.model.php');
-        $PRC = EEM_Price::instance();
-
-        if ($PRC_ID) {
-            $price = $PRC->get_one_by_ID($PRC_ID);
-            $additional_hidden_fields = array(
-                'PRC_ID' => array('type' => 'hidden', 'value' => $PRC_ID),
-            );
-            $this->_set_add_edit_form_tags('update_price', $additional_hidden_fields);
-        } else {
-            $price = $PRC->get_new_price();
-            $this->_set_add_edit_form_tags('insert_price');
-        }
-
-        $this->_template_args['PRC_ID'] = $PRC_ID;
-        $this->_template_args['price'] = $price;
-
-        // get price types
-        require_once(EE_MODELS . 'EEM_Price_Type.model.php');
-        $PRT = EEM_Price_Type::instance();
-        $price_types = $PRT->get_all(array(array('PBT_ID' => array('!=', 1))));
-        $price_type_names = array();
-        if (empty($price_types)) {
-            $msg = __(
-                'You have no price types defined. Please add a price type before adding a price.',
-                'event_espresso'
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            exit();
-        } else {
-            foreach ($price_types as $type) {
-                // if ($type->is_global()) {
-                $price_type_names[] = array('id' => $type->ID(), 'text' => $type->name());
-            // }
-            }
-        }
-
-        $this->_template_args['price_types'] = $price_type_names;
-        $this->_template_args['learn_more_about_pricing_link'] = $this->_learn_more_about_pricing_link();
-
-        $this->_set_publish_post_box_vars('id', $PRC_ID);
-        // the details template wrapper
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     *        declare price details page metaboxes
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _price_details_meta_boxes()
-    {
-        add_meta_box(
-            'edit-price-details-mbox',
-            __('Default Price Details', 'event_espresso'),
-            array($this, '_edit_price_details_meta_box'),
-            $this->wp_page_slug,
-            'normal',
-            'high'
-        );
-    }
-
-
-    /**
-     *        _edit_price_details_meta_box
-     *
-     * @access public
-     * @return void
-     */
-    public function _edit_price_details_meta_box()
-    {
-        echo EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'pricing_details_main_meta_box.template.php',
-            $this->_template_args,
-            true
-        );
-    }
-
-
-    /**
-     *        set_price_column_values
-     *
-     * @access protected
-     * @return array
-     */
-    protected function set_price_column_values()
-    {
-
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-
-        $set_column_values = array(
-            'PRT_ID'         => absint($this->_req_data['PRT_ID']),
-            'PRC_amount'     => $this->_req_data['PRC_amount'],
-            'PRC_name'       => $this->_req_data['PRC_name'],
-            'PRC_desc'       => $this->_req_data['PRC_desc'],
-            'PRC_is_default' => 1,
-            'PRC_overrides'  => null,
-            'PRC_order'      => 0,
-            'PRC_deleted'    => 0,
-            'PRC_parent'     => 0,
-        );
-        return $set_column_values;
-    }
-
-
-    /**
-     *        insert_or_update_price
-     *
-     * @param boolean $insert - whether to insert or update
-     * @access protected
-     * @return void
-     */
-    protected function _insert_or_update_price($insert = false)
-    {
-
-        // echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-
-        require_once(EE_MODELS . 'EEM_Price.model.php');
-        $PRC = EEM_Price::instance();
-
-        // why be so pessimistic ???  : (
-        $success = 0;
-
-        $set_column_values = $this->set_price_column_values();
-        // is this a new Price ?
-        if ($insert) {
-            // run the insert
-            if ($PRC_ID = $PRC->insert($set_column_values)) {
-                // make sure this new price modifier is attached to the ticket but ONLY if it is not a tax type
-                $PR = EEM_price::instance()->get_one_by_ID($PRC_ID);
-                if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
-                    $ticket = EEM_Ticket::instance()->get_one_by_ID(1);
-                    $ticket->_add_relation_to($PR, 'Price');
-                    $ticket->save();
-                }
-                $success = 1;
-            } else {
-                $PRC_ID = false;
-                $success = 0;
-            }
-            $action_desc = 'created';
-        } else {
-            $PRC_ID = absint($this->_req_data['PRC_ID']);
-            // run the update
-            $where_cols_n_values = array('PRC_ID' => $PRC_ID);
-            if ($PRC->update($set_column_values, array($where_cols_n_values))) {
-                $success = 1;
-            }
-
-            $PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
-            if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
-                // if this is $PRC_ID == 1, then we need to update the default ticket attached to this price so the TKT_price value is updated.
-                if ($PRC_ID === 1) {
-                    $ticket = $PR->get_first_related('Ticket');
-                    if ($ticket) {
-                        $ticket->set('TKT_price', $PR->get('PRC_amount'));
-                        $ticket->set('TKT_name', $PR->get('PRC_name'));
-                        $ticket->set('TKT_description', $PR->get('PRC_desc'));
-                        $ticket->save();
-                    }
-                } else {
-                    // we make sure this price is attached to base ticket. but ONLY if its not a tax ticket type.
-                    $ticket = EEM_Ticket::instance()->get_one_by_ID(1);
-                    $ticket->_add_relation_to($PRC_ID, 'Price');
-                    $ticket->save();
-                }
-            }
-
-            $action_desc = 'updated';
-        }
-
-        $query_args = array('action' => 'edit_price', 'id' => $PRC_ID);
-
-        $this->_redirect_after_action($success, 'Prices', $action_desc, $query_args);
-    }
-
-
-    /**
-     *        _trash_or_restore_price
-     *
-     * @param boolean $trash - whether to move item to trash (TRUE) or restore it (FALSE)
-     * @access protected
-     * @return void
-     */
-    protected function _trash_or_restore_price($trash = true)
-    {
-
-        // echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-
-        require_once(EE_MODELS . 'EEM_Price.model.php');
-        $PRC = EEM_Price::instance();
-
-        $success = 1;
-        $PRC_deleted = $trash ? true : false;
-
-        // get base ticket for updating
-        $ticket = EEM_Ticket::instance()->get_one_by_ID(1);
-        // Checkboxes
-        if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
-            // if array has more than one element than success message should be plural
-            $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
-            // cycle thru checkboxes
-            while (list($PRC_ID, $value) = each($this->_req_data['checkbox'])) {
-                if (! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), absint($PRC_ID))) {
-                    $success = 0;
-                } else {
-                    $PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
-                    if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
-                        // if trashing then remove relations to base default ticket.  If restoring then add back to base default ticket
-                        if ($PRC_deleted) {
-                            $ticket->_remove_relation_to($PRC_ID, 'Price');
-                        } else {
-                            $ticket->_add_relation_to($PRC_ID, 'Price');
-                        }
-                        $ticket->save();
-                    }
-                }
-            }
-        } else {
-            // grab single id and delete
-            $PRC_ID = isset($this->_req_data['id']) ? absint($this->_req_data['id']) : 0;
-            if (empty($PRC_ID) || ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), $PRC_ID)) {
-                $success = 0;
-            } else {
-                $PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
-                if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
-                    // if trashing then remove relations to base default ticket.  If restoring then add back to base default ticket
-                    if ($PRC_deleted) {
-                        $ticket->_remove_relation_to($PRC_ID, 'Price');
-                    } else {
-                        $ticket->_add_relation_to($PRC_ID, 'Price');
-                    }
-                    $ticket->save();
-                }
-            }
-        }
-        $query_args = array(
-            'action' => 'default',
-        );
-
-        if ($success) {
-            if ($trash) {
-                $msg = $success == 2
-                    ? __('The Prices have been trashed.', 'event_espresso')
-                    : __(
-                        'The Price has been trashed.',
-                        'event_espresso'
-                    );
-            } else {
-                $msg = $success == 2
-                    ? __('The Prices have been restored.', 'event_espresso')
-                    : __(
-                        'The Price has been restored.',
-                        'event_espresso'
-                    );
-            }
-
-            EE_Error::add_success($msg);
-        }
-
-        $this->_redirect_after_action(false, '', '', $query_args, true);
-    }
-
-
-    /**
-     *        _delete_price
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _delete_price()
-    {
-
-        // echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-
-        require_once(EE_MODELS . 'EEM_Price.model.php');
-        $PRC = EEM_Price::instance();
-
-        $success = 1;
-        // Checkboxes
-        if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
-            // if array has more than one element than success message should be plural
-            $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
-            // cycle thru bulk action checkboxes
-            while (list($PRC_ID, $value) = each($this->_req_data['checkbox'])) {
-                if (! $PRC->delete_permanently_by_ID(absint($PRC_ID))) {
-                    $success = 0;
-                }
-            }
-        } else {
-            // grab single id and delete
-            $PRC_ID = absint($this->_req_data['id']);
-            if (! $PRC->delete_permanently_by_ID($PRC_ID)) {
-                $success = 0;
-            }
-        }
-
-        $this->_redirect_after_action($success, 'Prices', 'deleted', array());
-    }
-
-
-    public function update_price_order()
-    {
-        $success = __('Price order was updated successfully.', 'event_espresso');
-
-        // grab our row IDs
-        $row_ids = isset($this->_req_data['row_ids']) && ! empty($this->_req_data['row_ids']) ? explode(
-            ',',
-            rtrim(
-                $this->_req_data['row_ids'],
-                ','
-            )
-        ) : false;
-
-        if (is_array($row_ids)) {
-            for ($i = 0; $i < count($row_ids); $i++) {
-                // Update the prices when re-ordering
-                $id = absint($row_ids[ $i ]);
-                if (EEM_Price::instance()->update(
-                    array('PRC_order' => $i + 1),
-                    array(array('PRC_ID' => $id))
-                ) === false) {
-                    $success = false;
-                }
-            }
-        } else {
-            $success = false;
-        }
-
-        $errors = ! $success ? __('An error occurred. The price order was not updated.', 'event_espresso') : false;
-
-        echo wp_json_encode(array('return_data' => false, 'success' => $success, 'errors' => $errors));
-        die();
-    }
-
-
-
-
-
-
-    /**************************************************************************************************************************************************************
+	/**
+	 *    constructor
+	 *
+	 * @Constructor
+	 * @access public
+	 * @param bool $routing
+	 * @return Pricing_Admin_Page
+	 */
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+	}
+
+
+	protected function _init_page_props()
+	{
+		$this->page_slug = PRICING_PG_SLUG;
+		$this->page_label = PRICING_LABEL;
+		$this->_admin_base_url = PRICING_ADMIN_URL;
+		$this->_admin_base_path = PRICING_ADMIN;
+	}
+
+
+	protected function _ajax_hooks()
+	{
+		add_action('wp_ajax_espresso_update_prices_order', array($this, 'update_price_order'));
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_admin_page_title = PRICING_LABEL;
+		$this->_labels = array(
+			'buttons' => array(
+				'add'         => __('Add New Default Price', 'event_espresso'),
+				'edit'        => __('Edit Default Price', 'event_espresso'),
+				'delete'      => __('Delete Default Price', 'event_espresso'),
+				'add_type'    => __('Add New Default Price Type', 'event_espresso'),
+				'edit_type'   => __('Edit Price Type', 'event_espresso'),
+				'delete_type' => __('Delete Price Type', 'event_espresso'),
+			),
+		);
+	}
+
+
+	/**
+	 *        an array for storing request actions and their corresponding methods
+	 *
+	 * @access private
+	 * @return void
+	 */
+	protected function _set_page_routes()
+	{
+		$prc_id = ! empty($this->_req_data['PRC_ID']) && ! is_array($this->_req_data['PRC_ID'])
+			? $this->_req_data['PRC_ID'] : 0;
+		$prt_id = ! empty($this->_req_data['PRT_ID']) && ! is_array($this->_req_data['PRT_ID'])
+			? $this->_req_data['PRT_ID'] : 0;
+		$this->_page_routes = array(
+			'default'                     => array(
+				'func'       => '_price_overview_list_table',
+				'capability' => 'ee_read_default_prices',
+			),
+			'add_new_price'               => array(
+				'func'       => '_edit_price_details',
+				'args'       => array('new_price' => true),
+				'capability' => 'ee_edit_default_prices',
+			),
+			'edit_price'                  => array(
+				'func'       => '_edit_price_details',
+				'args'       => array('new_price' => false),
+				'capability' => 'ee_edit_default_price',
+				'obj_id'     => $prc_id,
+			),
+			'insert_price'                => array(
+				'func'       => '_insert_or_update_price',
+				'args'       => array('new_price' => true),
+				'noheader'   => true,
+				'capability' => 'ee_edit_default_prices',
+			),
+			'update_price'                => array(
+				'func'       => '_insert_or_update_price',
+				'args'       => array('new_price' => false),
+				'noheader'   => true,
+				'capability' => 'ee_edit_default_price',
+				'obj_id'     => $prc_id,
+			),
+			'trash_price'                 => array(
+				'func'       => '_trash_or_restore_price',
+				'args'       => array('trash' => true),
+				'noheader'   => true,
+				'capability' => 'ee_delete_default_price',
+				'obj_id'     => $prc_id,
+			),
+			'restore_price'               => array(
+				'func'       => '_trash_or_restore_price',
+				'args'       => array('trash' => false),
+				'noheader'   => true,
+				'capability' => 'ee_delete_default_price',
+				'obj_id'     => $prc_id,
+			),
+			'delete_price'                => array(
+				'func'       => '_delete_price',
+				'noheader'   => true,
+				'capability' => 'ee_delete_default_price',
+				'obj_id'     => $prc_id,
+			),
+			'espresso_update_price_order' => array(
+				'func'       => 'update_price_order',
+				'noheader'   => true,
+				'capability' => 'ee_edit_default_prices',
+			),
+			// price types
+			'price_types'                 => array(
+				'func'       => '_price_types_overview_list_table',
+				'capability' => 'ee_read_default_price_types',
+			),
+			'add_new_price_type'          => array(
+				'func'       => '_edit_price_type_details',
+				'capability' => 'ee_edit_default_price_types',
+			),
+			'edit_price_type'             => array(
+				'func'       => '_edit_price_type_details',
+				'capability' => 'ee_edit_default_price_type',
+				'obj_id'     => $prt_id,
+			),
+			'insert_price_type'           => array(
+				'func'       => '_insert_or_update_price_type',
+				'args'       => array('new_price_type' => true),
+				'noheader'   => true,
+				'capability' => 'ee_edit_default_price_types',
+			),
+			'update_price_type'           => array(
+				'func'       => '_insert_or_update_price_type',
+				'args'       => array('new_price_type' => false),
+				'noheader'   => true,
+				'capability' => 'ee_edit_default_price_type',
+				'obj_id'     => $prt_id,
+			),
+			'trash_price_type'            => array(
+				'func'       => '_trash_or_restore_price_type',
+				'args'       => array('trash' => true),
+				'noheader'   => true,
+				'capability' => 'ee_delete_default_price_type',
+				'obj_id'     => $prt_id,
+			),
+			'restore_price_type'          => array(
+				'func'       => '_trash_or_restore_price_type',
+				'args'       => array('trash' => false),
+				'noheader'   => true,
+				'capability' => 'ee_delete_default_price_type',
+				'obj_id'     => $prt_id,
+			),
+			'delete_price_type'           => array(
+				'func'       => '_delete_price_type',
+				'noheader'   => true,
+				'capability' => 'ee_delete_default_price_type',
+				'obj_id'     => $prt_id,
+			),
+			'tax_settings'                => array(
+				'func'       => '_tax_settings',
+				'capability' => 'manage_options',
+			),
+			'update_tax_settings'         => array(
+				'func'       => '_update_tax_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
+		);
+	}
+
+
+	protected function _set_page_config()
+	{
+
+		$this->_page_config = array(
+			'default'            => array(
+				'nav'           => array(
+					'label' => __('Default Pricing', 'event_espresso'),
+					'order' => 10,
+				),
+				'list_table'    => 'Prices_List_Table',
+				'help_tabs'     => array(
+					'pricing_default_pricing_help_tab'                           => array(
+						'title'    => __('Default Pricing', 'event_espresso'),
+						'filename' => 'pricing_default_pricing',
+					),
+					'pricing_default_pricing_table_column_headings_help_tab'     => array(
+						'title'    => __('Default Pricing Table Column Headings', 'event_espresso'),
+						'filename' => 'pricing_default_pricing_table_column_headings',
+					),
+					'pricing_default_pricing_views_bulk_actions_search_help_tab' => array(
+						'title'    => __('Default Pricing Views & Bulk Actions & Search', 'event_espresso'),
+						'filename' => 'pricing_default_pricing_views_bulk_actions_search',
+					),
+				),
+				'help_tour'     => array('Pricing_Default_Prices_Help_Tour'),
+				'require_nonce' => false,
+			),
+			'add_new_price'      => array(
+				'nav'           => array(
+					'label'      => __('Add New Default Price', 'event_espresso'),
+					'order'      => 20,
+					'persistent' => false,
+				),
+				'help_tabs'     => array(
+					'add_new_default_price_help_tab' => array(
+						'title'    => __('Add New Default Price', 'event_espresso'),
+						'filename' => 'pricing_add_new_default_price',
+					),
+				),
+				'help_tour'     => array('Pricing_Add_New_Default_Price_Help_Tour'),
+				'metaboxes'     => array('_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes'),
+				'require_nonce' => false,
+			),
+			'edit_price'         => array(
+				'nav'           => array(
+					'label'      => __('Edit Default Price', 'event_espresso'),
+					'order'      => 20,
+					'url'        => isset($this->_req_data['id']) ? add_query_arg(
+						array('id' => $this->_req_data['id']),
+						$this->_current_page_view_url
+					) : $this->_admin_base_url,
+					'persistent' => false,
+				),
+				'metaboxes'     => array('_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes'),
+				'help_tabs'     => array(
+					'edit_default_price_help_tab' => array(
+						'title'    => __('Edit Default Price', 'event_espresso'),
+						'filename' => 'pricing_edit_default_price',
+					),
+				),
+				'help_tour'     => array('Pricing_Edit_Default_Price_Help_Tour'),
+				'require_nonce' => false,
+			),
+			'price_types'        => array(
+				'nav'           => array(
+					'label' => __('Price Types', 'event_espresso'),
+					'order' => 30,
+				),
+				'list_table'    => 'Price_Types_List_Table',
+				'help_tabs'     => array(
+					'pricing_price_types_help_tab'                           => array(
+						'title'    => __('Price Types', 'event_espresso'),
+						'filename' => 'pricing_price_types',
+					),
+					'pricing_price_types_table_column_headings_help_tab'     => array(
+						'title'    => __('Price Types Table Column Headings', 'event_espresso'),
+						'filename' => 'pricing_price_types_table_column_headings',
+					),
+					'pricing_price_types_views_bulk_actions_search_help_tab' => array(
+						'title'    => __('Price Types Views & Bulk Actions & Search', 'event_espresso'),
+						'filename' => 'pricing_price_types_views_bulk_actions_search',
+					),
+				),
+				'help_tour'     => array('Pricing_Price_Types_Default_Help_Tour'),
+				'metaboxes'     => array('_espresso_news_post_box', '_espresso_links_post_box'),
+				'require_nonce' => false,
+			),
+			'add_new_price_type' => array(
+				'nav'           => array(
+					'label'      => __('Add New Price Type', 'event_espresso'),
+					'order'      => 40,
+					'persistent' => false,
+				),
+				'help_tabs'     => array(
+					'add_new_price_type_help_tab' => array(
+						'title'    => __('Add New Price Type', 'event_espresso'),
+						'filename' => 'pricing_add_new_price_type',
+					),
+				),
+				'help_tour'     => array('Pricing_Add_New_Price_Type_Help_Tour'),
+				'metaboxes'     => array(
+					'_publish_post_box',
+					'_espresso_news_post_box',
+					'_price_type_details_meta_boxes',
+				),
+				'require_nonce' => false,
+			),
+			'edit_price_type'    => array(
+				'nav'       => array(
+					'label'      => __('Edit Price Type', 'event_espresso'),
+					'order'      => 40,
+					'persistent' => false,
+				),
+				'help_tabs' => array(
+					'edit_price_type_help_tab' => array(
+						'title'    => __('Edit Price Type', 'event_espresso'),
+						'filename' => 'pricing_edit_price_type',
+					),
+				),
+				'help_tour' => array('Pricing_Edit_Price_Type_Help_Tour'),
+				'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes'),
+
+				'require_nonce' => false,
+			),
+			'tax_settings'       => array(
+				'nav'           => array(
+					'label' => esc_html__('Tax Settings', 'event_espresso'),
+					'order' => 40,
+				),
+				'labels'        => array(
+					'publishbox' => esc_html__('Update Tax Settings', 'event_espresso'),
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
+				// 'help_tabs'     => array(
+				//     'registration_form_reg_form_settings_help_tab' => array(
+				//         'title'    => esc_html__('Registration Form Settings', 'event_espresso'),
+				//         'filename' => 'registration_form_reg_form_settings'
+				//     ),
+				// ),
+				// 'help_tour'     => array('Registration_Form_Settings_Help_Tour'),
+				'require_nonce' => true,
+			),
+		);
+	}
+
+
+	protected function _add_screen_options()
+	{
+		// todo
+	}
+
+
+	protected function _add_screen_options_default()
+	{
+		$this->_per_page_screen_option();
+	}
+
+
+	protected function _add_screen_options_price_types()
+	{
+		$page_title = $this->_admin_page_title;
+		$this->_admin_page_title = __('Price Types', 'event_espresso');
+		$this->_per_page_screen_option();
+		$this->_admin_page_title = $page_title;
+	}
+
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+
+	public function load_scripts_styles()
+	{
+		// styles
+		wp_enqueue_style('espresso-ui-theme');
+		wp_register_style(
+			'espresso_PRICING',
+			PRICING_ASSETS_URL . 'espresso_pricing_admin.css',
+			array(),
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('espresso_PRICING');
+
+		// scripts
+		wp_enqueue_script('ee_admin_js');
+		wp_enqueue_script('jquery-ui-position');
+		wp_enqueue_script('jquery-ui-widget');
+		// wp_enqueue_script('jquery-ui-dialog');
+		// wp_enqueue_script('jquery-ui-draggable');
+		// wp_enqueue_script('jquery-ui-datepicker');
+		wp_register_script(
+			'espresso_PRICING',
+			PRICING_ASSETS_URL . 'espresso_pricing_admin.js',
+			array('jquery'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_enqueue_script('espresso_PRICING');
+	}
+
+
+	public function load_scripts_styles_default()
+	{
+		wp_enqueue_script('espresso_ajax_table_sorting');
+	}
+
+
+	public function admin_footer_scripts()
+	{
+	}
+
+	public function admin_init()
+	{
+	}
+
+	public function admin_notices()
+	{
+	}
+
+
+	protected function _set_list_table_views_default()
+	{
+		$this->_views = array(
+			'all' => array(
+				'slug'        => 'all',
+				'label'       => __('View All Default Pricing', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'trash_price' => __('Move to Trash', 'event_espresso'),
+				),
+			),
+		);
+
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_prices', 'pricing_trash_price')) {
+			$this->_views['trashed'] = array(
+				'slug'        => 'trashed',
+				'label'       => __('Trash', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'restore_price' => __('Restore from Trash', 'event_espresso'),
+					'delete_price'  => __('Delete Permanently', 'event_espresso'),
+				),
+			);
+		}
+	}
+
+
+	protected function _set_list_table_views_price_types()
+	{
+		$this->_views = array(
+			'all' => array(
+				'slug'        => 'all',
+				'label'       => __('All', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'trash_price_type' => __('Move to Trash', 'event_espresso'),
+				),
+			),
+		);
+
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_delete_default_price_types',
+			'pricing_trash_price_type'
+		)) {
+			$this->_views['trashed'] = array(
+				'slug'        => 'trashed',
+				'label'       => __('Trash', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'restore_price_type' => __('Restore from Trash', 'event_espresso'),
+					'delete_price_type'  => __('Delete Permanently', 'event_espresso'),
+				),
+			);
+		}
+	}
+
+
+	/**
+	 *        generates HTML for main Prices Admin page
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _price_overview_list_table()
+	{
+		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+			'add_new_price',
+			'add',
+			array(),
+			'add-new-h2'
+		);
+		$this->admin_page_title .= $this->_learn_more_about_pricing_link();
+		$this->_search_btn_label = __('Default Prices', 'event_espresso');
+		$this->display_admin_list_table_page_with_no_sidebar();
+	}
+
+
+	/**
+	 *    retrieve data for Prices List table
+	 *
+	 * @access public
+	 * @param  int     $per_page how many prices displayed per page
+	 * @param  boolean $count    return the count or objects
+	 * @param  boolean $trashed  whether the current view is of the trash can - eww yuck!
+	 * @return mixed (int|array)  int = count || array of price objects
+	 */
+	public function get_prices_overview_data($per_page = 10, $count = false, $trashed = false)
+	{
+
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		// start with an empty array
+		$event_pricing = array();
+
+		require_once(PRICING_ADMIN . 'Prices_List_Table.class.php');
+		require_once(EE_MODELS . 'EEM_Price.model.php');
+		// $PRC = EEM_Price::instance();
+
+		$this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? '' : $this->_req_data['orderby'];
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order']
+			: 'ASC';
+
+		switch ($this->_req_data['orderby']) {
+			case 'name':
+				$orderby = array('PRC_name' => $order);
+				break;
+			case 'type':
+				$orderby = array('Price_Type.PRT_name' => $order);
+				break;
+			case 'amount':
+				$orderby = array('PRC_amount' => $order);
+				break;
+			default:
+				$orderby = array('PRC_order' => $order, 'Price_Type.PRT_order' => $order, 'PRC_ID' => $order);
+		}
+
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
+			? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
+			? $this->_req_data['perpage'] : $per_page;
+
+		$_where = array(
+			'PRC_is_default' => 1,
+			'PRC_deleted'    => $trashed,
+		);
+
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
+
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%' . $this->_req_data['s'] . '%';
+			$_where['OR'] = array(
+				'PRC_name'            => array('LIKE', $sstr),
+				'PRC_desc'            => array('LIKE', $sstr),
+				'PRC_amount'          => array('LIKE', $sstr),
+				'Price_Type.PRT_name' => array('LIKE', $sstr),
+			);
+		}
+
+		$query_params = array(
+			$_where,
+			'order_by' => $orderby,
+			'limit'    => $limit,
+			'group_by' => 'PRC_ID',
+		);
+
+		if ($count) {
+			return $trashed ? EEM_Price::instance()->count(array($_where))
+				: EEM_Price::instance()->count_deleted_and_undeleted(array($_where));
+		} else {
+			return EEM_Price::instance()->get_all_deleted_and_undeleted($query_params);
+		}
+	}
+
+
+	/**
+	 *        _price_details
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _edit_price_details()
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		// grab price ID
+		$PRC_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id']) ? absint($this->_req_data['id'])
+			: false;
+		// change page title based on request action
+		switch ($this->_req_action) {
+			case 'add_new_price':
+				$this->_admin_page_title = esc_html__('Add New Price', 'event_espresso');
+				break;
+			case 'edit_price':
+				$this->_admin_page_title = esc_html__('Edit Price', 'event_espresso');
+				break;
+			default:
+				$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
+		}
+		// add PRC_ID to title if editing
+		$this->_admin_page_title = $PRC_ID ? $this->_admin_page_title . ' # ' . $PRC_ID : $this->_admin_page_title;
+
+		// get prices
+		require_once(EE_MODELS . 'EEM_Price.model.php');
+		$PRC = EEM_Price::instance();
+
+		if ($PRC_ID) {
+			$price = $PRC->get_one_by_ID($PRC_ID);
+			$additional_hidden_fields = array(
+				'PRC_ID' => array('type' => 'hidden', 'value' => $PRC_ID),
+			);
+			$this->_set_add_edit_form_tags('update_price', $additional_hidden_fields);
+		} else {
+			$price = $PRC->get_new_price();
+			$this->_set_add_edit_form_tags('insert_price');
+		}
+
+		$this->_template_args['PRC_ID'] = $PRC_ID;
+		$this->_template_args['price'] = $price;
+
+		// get price types
+		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		$PRT = EEM_Price_Type::instance();
+		$price_types = $PRT->get_all(array(array('PBT_ID' => array('!=', 1))));
+		$price_type_names = array();
+		if (empty($price_types)) {
+			$msg = __(
+				'You have no price types defined. Please add a price type before adding a price.',
+				'event_espresso'
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			exit();
+		} else {
+			foreach ($price_types as $type) {
+				// if ($type->is_global()) {
+				$price_type_names[] = array('id' => $type->ID(), 'text' => $type->name());
+			// }
+			}
+		}
+
+		$this->_template_args['price_types'] = $price_type_names;
+		$this->_template_args['learn_more_about_pricing_link'] = $this->_learn_more_about_pricing_link();
+
+		$this->_set_publish_post_box_vars('id', $PRC_ID);
+		// the details template wrapper
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 *        declare price details page metaboxes
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _price_details_meta_boxes()
+	{
+		add_meta_box(
+			'edit-price-details-mbox',
+			__('Default Price Details', 'event_espresso'),
+			array($this, '_edit_price_details_meta_box'),
+			$this->wp_page_slug,
+			'normal',
+			'high'
+		);
+	}
+
+
+	/**
+	 *        _edit_price_details_meta_box
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function _edit_price_details_meta_box()
+	{
+		echo EEH_Template::display_template(
+			PRICING_TEMPLATE_PATH . 'pricing_details_main_meta_box.template.php',
+			$this->_template_args,
+			true
+		);
+	}
+
+
+	/**
+	 *        set_price_column_values
+	 *
+	 * @access protected
+	 * @return array
+	 */
+	protected function set_price_column_values()
+	{
+
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+
+		$set_column_values = array(
+			'PRT_ID'         => absint($this->_req_data['PRT_ID']),
+			'PRC_amount'     => $this->_req_data['PRC_amount'],
+			'PRC_name'       => $this->_req_data['PRC_name'],
+			'PRC_desc'       => $this->_req_data['PRC_desc'],
+			'PRC_is_default' => 1,
+			'PRC_overrides'  => null,
+			'PRC_order'      => 0,
+			'PRC_deleted'    => 0,
+			'PRC_parent'     => 0,
+		);
+		return $set_column_values;
+	}
+
+
+	/**
+	 *        insert_or_update_price
+	 *
+	 * @param boolean $insert - whether to insert or update
+	 * @access protected
+	 * @return void
+	 */
+	protected function _insert_or_update_price($insert = false)
+	{
+
+		// echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+
+		require_once(EE_MODELS . 'EEM_Price.model.php');
+		$PRC = EEM_Price::instance();
+
+		// why be so pessimistic ???  : (
+		$success = 0;
+
+		$set_column_values = $this->set_price_column_values();
+		// is this a new Price ?
+		if ($insert) {
+			// run the insert
+			if ($PRC_ID = $PRC->insert($set_column_values)) {
+				// make sure this new price modifier is attached to the ticket but ONLY if it is not a tax type
+				$PR = EEM_price::instance()->get_one_by_ID($PRC_ID);
+				if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
+					$ticket = EEM_Ticket::instance()->get_one_by_ID(1);
+					$ticket->_add_relation_to($PR, 'Price');
+					$ticket->save();
+				}
+				$success = 1;
+			} else {
+				$PRC_ID = false;
+				$success = 0;
+			}
+			$action_desc = 'created';
+		} else {
+			$PRC_ID = absint($this->_req_data['PRC_ID']);
+			// run the update
+			$where_cols_n_values = array('PRC_ID' => $PRC_ID);
+			if ($PRC->update($set_column_values, array($where_cols_n_values))) {
+				$success = 1;
+			}
+
+			$PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
+			if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
+				// if this is $PRC_ID == 1, then we need to update the default ticket attached to this price so the TKT_price value is updated.
+				if ($PRC_ID === 1) {
+					$ticket = $PR->get_first_related('Ticket');
+					if ($ticket) {
+						$ticket->set('TKT_price', $PR->get('PRC_amount'));
+						$ticket->set('TKT_name', $PR->get('PRC_name'));
+						$ticket->set('TKT_description', $PR->get('PRC_desc'));
+						$ticket->save();
+					}
+				} else {
+					// we make sure this price is attached to base ticket. but ONLY if its not a tax ticket type.
+					$ticket = EEM_Ticket::instance()->get_one_by_ID(1);
+					$ticket->_add_relation_to($PRC_ID, 'Price');
+					$ticket->save();
+				}
+			}
+
+			$action_desc = 'updated';
+		}
+
+		$query_args = array('action' => 'edit_price', 'id' => $PRC_ID);
+
+		$this->_redirect_after_action($success, 'Prices', $action_desc, $query_args);
+	}
+
+
+	/**
+	 *        _trash_or_restore_price
+	 *
+	 * @param boolean $trash - whether to move item to trash (TRUE) or restore it (FALSE)
+	 * @access protected
+	 * @return void
+	 */
+	protected function _trash_or_restore_price($trash = true)
+	{
+
+		// echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+
+		require_once(EE_MODELS . 'EEM_Price.model.php');
+		$PRC = EEM_Price::instance();
+
+		$success = 1;
+		$PRC_deleted = $trash ? true : false;
+
+		// get base ticket for updating
+		$ticket = EEM_Ticket::instance()->get_one_by_ID(1);
+		// Checkboxes
+		if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+			// if array has more than one element than success message should be plural
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
+			// cycle thru checkboxes
+			while (list($PRC_ID, $value) = each($this->_req_data['checkbox'])) {
+				if (! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), absint($PRC_ID))) {
+					$success = 0;
+				} else {
+					$PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
+					if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
+						// if trashing then remove relations to base default ticket.  If restoring then add back to base default ticket
+						if ($PRC_deleted) {
+							$ticket->_remove_relation_to($PRC_ID, 'Price');
+						} else {
+							$ticket->_add_relation_to($PRC_ID, 'Price');
+						}
+						$ticket->save();
+					}
+				}
+			}
+		} else {
+			// grab single id and delete
+			$PRC_ID = isset($this->_req_data['id']) ? absint($this->_req_data['id']) : 0;
+			if (empty($PRC_ID) || ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), $PRC_ID)) {
+				$success = 0;
+			} else {
+				$PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
+				if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
+					// if trashing then remove relations to base default ticket.  If restoring then add back to base default ticket
+					if ($PRC_deleted) {
+						$ticket->_remove_relation_to($PRC_ID, 'Price');
+					} else {
+						$ticket->_add_relation_to($PRC_ID, 'Price');
+					}
+					$ticket->save();
+				}
+			}
+		}
+		$query_args = array(
+			'action' => 'default',
+		);
+
+		if ($success) {
+			if ($trash) {
+				$msg = $success == 2
+					? __('The Prices have been trashed.', 'event_espresso')
+					: __(
+						'The Price has been trashed.',
+						'event_espresso'
+					);
+			} else {
+				$msg = $success == 2
+					? __('The Prices have been restored.', 'event_espresso')
+					: __(
+						'The Price has been restored.',
+						'event_espresso'
+					);
+			}
+
+			EE_Error::add_success($msg);
+		}
+
+		$this->_redirect_after_action(false, '', '', $query_args, true);
+	}
+
+
+	/**
+	 *        _delete_price
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _delete_price()
+	{
+
+		// echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+
+		require_once(EE_MODELS . 'EEM_Price.model.php');
+		$PRC = EEM_Price::instance();
+
+		$success = 1;
+		// Checkboxes
+		if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+			// if array has more than one element than success message should be plural
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
+			// cycle thru bulk action checkboxes
+			while (list($PRC_ID, $value) = each($this->_req_data['checkbox'])) {
+				if (! $PRC->delete_permanently_by_ID(absint($PRC_ID))) {
+					$success = 0;
+				}
+			}
+		} else {
+			// grab single id and delete
+			$PRC_ID = absint($this->_req_data['id']);
+			if (! $PRC->delete_permanently_by_ID($PRC_ID)) {
+				$success = 0;
+			}
+		}
+
+		$this->_redirect_after_action($success, 'Prices', 'deleted', array());
+	}
+
+
+	public function update_price_order()
+	{
+		$success = __('Price order was updated successfully.', 'event_espresso');
+
+		// grab our row IDs
+		$row_ids = isset($this->_req_data['row_ids']) && ! empty($this->_req_data['row_ids']) ? explode(
+			',',
+			rtrim(
+				$this->_req_data['row_ids'],
+				','
+			)
+		) : false;
+
+		if (is_array($row_ids)) {
+			for ($i = 0; $i < count($row_ids); $i++) {
+				// Update the prices when re-ordering
+				$id = absint($row_ids[ $i ]);
+				if (EEM_Price::instance()->update(
+					array('PRC_order' => $i + 1),
+					array(array('PRC_ID' => $id))
+				) === false) {
+					$success = false;
+				}
+			}
+		} else {
+			$success = false;
+		}
+
+		$errors = ! $success ? __('An error occurred. The price order was not updated.', 'event_espresso') : false;
+
+		echo wp_json_encode(array('return_data' => false, 'success' => $success, 'errors' => $errors));
+		die();
+	}
+
+
+
+
+
+
+	/**************************************************************************************************************************************************************
      ********************************************************************  TICKET PRICE TYPES  ******************************************************************
      **************************************************************************************************************************************************************/
 
 
-    /**
-     *        generates HTML for main Prices Admin page
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _price_types_overview_list_table()
-    {
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
-            'add_new_price_type',
-            'add_type',
-            array(),
-            'add-new-h2'
-        );
-        $this->admin_page_title .= $this->_learn_more_about_pricing_link();
-        $this->_search_btn_label = __('Price Types', 'event_espresso');
-        $this->display_admin_list_table_page_with_no_sidebar();
-    }
-
-
-    /**
-     *    retrieve data for Price Types List table
-     *
-     * @access public
-     * @param  int     $per_page how many prices displayed per page
-     * @param  boolean $count    return the count or objects
-     * @param  boolean $trashed  whether the current view is of the trash can - eww yuck!
-     * @return mixed (int|array)  int = count || array of price objects
-     */
-    public function get_price_types_overview_data($per_page = 10, $count = false, $trashed = false)
-    {
-
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        // start with an empty array
-
-        require_once(PRICING_ADMIN . 'Price_Types_List_Table.class.php');
-        require_once(EE_MODELS . 'EEM_Price_Type.model.php');
-
-        $this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? '' : $this->_req_data['orderby'];
-        $order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order']
-            : 'ASC';
-        switch ($this->_req_data['orderby']) {
-            case 'name':
-                $orderby = array('PRT_name' => $order);
-                break;
-            default:
-                $orderby = array('PRT_order' => $order);
-        }
-
-
-        $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
-            ? $this->_req_data['paged'] : 1;
-        $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
-            ? $this->_req_data['perpage'] : $per_page;
-
-        $offset = ($current_page - 1) * $per_page;
-        $limit = array($offset, $per_page);
-
-        $_where = array('PRT_deleted' => $trashed, 'PBT_ID' => array('!=', 1));
-
-        if (isset($this->_req_data['s'])) {
-            $sstr = '%' . $this->_req_data['s'] . '%';
-            $_where['OR'] = array(
-                'PRT_name' => array('LIKE', $sstr),
-            );
-        }
-        $query_params = array(
-            $_where,
-            'order_by' => $orderby,
-            'limit'    => $limit,
-        );
-        if ($count) {
-            return EEM_Price_Type::instance()->count_deleted_and_undeleted($query_params);
-        } else {
-            return EEM_Price_Type::instance()->get_all_deleted_and_undeleted($query_params);
-        }
-
-        // EEH_Debug_Tools::printr( $price_types, '$price_types  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-    }
-
-
-    /**
-     *        _edit_price_type_details
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _edit_price_type_details()
-    {
-
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-
-
-        // grab price type ID
-        $PRT_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id']) ? absint($this->_req_data['id'])
-            : false;
-        // change page title based on request action
-        switch ($this->_req_action) {
-            case 'add_new_price_type':
-                $this->_admin_page_title = esc_html__('Add New Price Type', 'event_espresso');
-                break;
-            case 'edit_price_type':
-                $this->_admin_page_title = esc_html__('Edit Price Type', 'event_espresso');
-                break;
-            default:
-                $this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
-        }
-        // add PRT_ID to title if editing
-        $this->_admin_page_title = $PRT_ID ? $this->_admin_page_title . ' # ' . $PRT_ID : $this->_admin_page_title;
-
-        if ($PRT_ID) {
-            $price_type = EEM_Price_Type::instance()->get_one_by_ID($PRT_ID);
-            $additional_hidden_fields = array('PRT_ID' => array('type' => 'hidden', 'value' => $PRT_ID));
-            $this->_set_add_edit_form_tags('update_price_type', $additional_hidden_fields);
-        } else {
-            $price_type = EEM_Price_Type::instance()->get_new_price_type();
-            $this->_set_add_edit_form_tags('insert_price_type');
-        }
-
-        $this->_template_args['PRT_ID'] = $PRT_ID;
-        $this->_template_args['price_type'] = $price_type;
-
-
-        $base_types = EEM_Price_Type::instance()->get_base_types();
-        $select_values = array();
-        foreach ($base_types as $ref => $text) {
-            if ($ref == EEM_Price_Type::base_type_base_price) {
-                // do not allow creation of base_type_base_prices because that's a system only base type.
-                continue;
-            }
-            $values[] = array('id' => $ref, 'text' => $text);
-        }
-
-
-        $this->_template_args['base_type_select'] = EEH_Form_Fields::select_input(
-            'base_type',
-            $values,
-            $price_type->base_type(),
-            'id="price-type-base-type-slct"'
-        );
-        $this->_template_args['learn_more_about_pricing_link'] = $this->_learn_more_about_pricing_link();
-        $redirect_URL = add_query_arg(array('action' => 'price_types'), $this->_admin_base_url);
-        $this->_set_publish_post_box_vars('id', $PRT_ID, false, $redirect_URL);
-        // the details template wrapper
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     *        declare price type details page metaboxes
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _price_type_details_meta_boxes()
-    {
-        add_meta_box(
-            'edit-price-details-mbox',
-            __('Price Type Details', 'event_espresso'),
-            array($this, '_edit_price_type_details_meta_box'),
-            $this->wp_page_slug,
-            'normal',
-            'high'
-        );
-    }
-
-
-    /**
-     *        _edit_price_type_details_meta_box
-     *
-     * @access public
-     * @return void
-     */
-    public function _edit_price_type_details_meta_box()
-    {
-        echo EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'pricing_type_details_main_meta_box.template.php',
-            $this->_template_args,
-            true
-        );
-    }
-
-
-    /**
-     *        set_price_type_column_values
-     *
-     * @access protected
-     * @return void
-     */
-    protected function set_price_type_column_values()
-    {
-
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-
-        $base_type = ! empty($this->_req_data['base_type']) ? $this->_req_data['base_type']
-            : EEM_Price_Type::base_type_base_price;
-
-        switch ($base_type) {
-            case EEM_Price_Type::base_type_base_price:
-                $this->_req_data['PBT_ID'] = EEM_Price_Type::base_type_base_price;
-                $this->_req_data['PRT_is_percent'] = 0;
-                $this->_req_data['PRT_order'] = 0;
-                break;
-
-            case EEM_Price_Type::base_type_discount:
-                $this->_req_data['PBT_ID'] = EEM_Price_Type::base_type_discount;
-                break;
-
-            case EEM_Price_Type::base_type_surcharge:
-                $this->_req_data['PBT_ID'] = EEM_Price_Type::base_type_surcharge;
-                break;
-
-            case EEM_Price_Type::base_type_tax:
-                $this->_req_data['PBT_ID'] = EEM_Price_Type::base_type_tax;
-                $this->_req_data['PRT_is_percent'] = 1;
-                break;
-        }/**/
-
-        $set_column_values = array(
-            'PRT_name'       => $this->_req_data['PRT_name'],
-            'PBT_ID'         => absint($this->_req_data['PBT_ID']),
-            'PRT_is_percent' => absint($this->_req_data['PRT_is_percent']),
-            'PRT_order'      => absint($this->_req_data['PRT_order']),
-            'PRT_deleted'    => 0,
-        );
-
-        return $set_column_values;
-    }
-
-
-    /**
-     *        _insert_or_update_price_type
-     *
-     * @param boolean $new_price_type - whether to insert or update
-     * @access protected
-     * @return void
-     */
-    protected function _insert_or_update_price_type($new_price_type = false)
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-
-        require_once(EE_MODELS . 'EEM_Price_Type.model.php');
-        $PRT = EEM_Price_Type::instance();
-
-        // why be so pessimistic ???  : (
-        $success = 0;
-
-        $set_column_values = $this->set_price_type_column_values();
-        // is this a new Price ?
-        if ($new_price_type) {
-            // run the insert
-            if ($PRT_ID = $PRT->insert($set_column_values)) {
-                $success = 1;
-            }
-            $action_desc = 'created';
-        } else {
-            $PRT_ID = absint($this->_req_data['PRT_ID']);
-            // run the update
-            $where_cols_n_values = array('PRT_ID' => $PRT_ID);
-            if ($PRT->update($set_column_values, array($where_cols_n_values))) {
-                $success = 1;
-            }
-            $action_desc = 'updated';
-        }
-
-        $query_args = array('action' => 'edit_price_type', 'id' => $PRT_ID);
-        $this->_redirect_after_action($success, 'Price Type', $action_desc, $query_args);
-    }
-
-
-    /**
-     *        _trash_or_restore_price_type
-     *
-     * @param boolean $trash - whether to move item to trash (TRUE) or restore it (FALSE)
-     * @access protected
-     * @return void
-     */
-    protected function _trash_or_restore_price_type($trash = true)
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-
-        require_once(EE_MODELS . 'EEM_Price_Type.model.php');
-        $PRT = EEM_Price_Type::instance();
-
-        $success = 1;
-        $PRT_deleted = $trash ? true : false;
-        // Checkboxes
-        if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
-            // if array has more than one element than success message should be plural
-            $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
-            $what = count($this->_req_data['checkbox']) > 1 ? 'Price Types' : 'Price Type';
-            // cycle thru checkboxes
-            while (list($PRT_ID, $value) = each($this->_req_data['checkbox'])) {
-                if (! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID)) {
-                    $success = 0;
-                }
-            }
-        } else {
-            // grab single id and delete
-            $PRT_ID = isset($this->_req_data['id']) ? absint($this->_req_data['id']) : 0;
-            if (empty($PRT_ID) || ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID)) {
-                $success = 0;
-            }
-            $what = 'Price Type';
-        }
-
-        $query_args = array('action' => 'price_types');
-        if ($success) {
-            if ($trash) {
-                $msg = $success > 1
-                    ? __('The Price Types have been trashed.', 'event_espresso')
-                    : __(
-                        'The Price Type has been trashed.',
-                        'event_espresso'
-                    );
-            } else {
-                $msg = $success > 1
-                    ? __('The Price Types have been restored.', 'event_espresso')
-                    : __(
-                        'The Price Type has been restored.',
-                        'event_espresso'
-                    );
-            }
-            EE_Error::add_success($msg);
-        }
-
-        $this->_redirect_after_action(false, '', '', $query_args, true);
-    }
-
-
-    /**
-     *        _delete_price_type
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _delete_price_type()
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-
-        $PRT = EEM_Price_Type::instance();
-
-        $success = 1;
-        // Checkboxes
-        if (! empty($this->_req_data['checkbox'])) {
-            // if array has more than one element than success message should be plural
-            $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
-            $what = $PRT->item_name($success);
-            // cycle thru bulk action checkboxes
-            while (list($PRT_ID, $value) = each($this->_req_data['checkbox'])) {
-                if (! $PRT->delete_permanently_by_ID($PRT_ID)) {
-                    $success = 0;
-                }
-            }
-        }
-
-
-        $query_args = array('action' => 'price_types');
-        $this->_redirect_after_action($success, $what, 'deleted', $query_args);
-    }
-
-
-    /**
-     *        _learn_more_about_pricing_link
-     *
-     * @access protected
-     * @return string
-     */
-    protected function _learn_more_about_pricing_link()
-    {
-        return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >' . __(
-            'learn more about how pricing works',
-            'event_espresso'
-        ) . '</a>';
-    }
-
-
-    protected function _tax_settings()
-    {
-        $this->_set_add_edit_form_tags('update_tax_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->_template_args['admin_page_content'] = $this->tax_settings_form()->get_html();
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * @return \EE_Form_Section_Proper
-     * @throws \EE_Error
-     */
-    protected function tax_settings_form()
-    {
-        return new EE_Form_Section_Proper(
-            array(
-                'name'            => 'tax_settings_form',
-                'html_id'         => 'tax_settings_form',
-                'layout_strategy' => new EE_Div_Per_Section_Layout(),
-                'subsections'     => apply_filters(
-                    'FHEE__Pricing_Admin_Page__tax_settings_form__form_subsections',
-                    array(
-                        'tax_settings' => new EE_Form_Section_Proper(
-                            array(
-                                'name'            => 'tax_settings_tbl',
-                                'html_id'         => 'tax_settings_tbl',
-                                'html_class'      => 'form-table',
-                                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                                'subsections'     => array(
-                                    'prices_displayed_including_taxes' => new EE_Yes_No_Input(
-                                        array(
-                                            'html_label_text'         => __(
-                                                "Show Prices With Taxes Included?",
-                                                'event_espresso'
-                                            ),
-                                            'html_help_text'          => __(
-                                                'Indicates whether or not to display prices with the taxes included',
-                                                'event_espresso'
-                                            ),
-                                            'default'                 => isset(
-                                                EE_Registry::instance()
-                                                    ->CFG
-                                                    ->tax_settings
-                                                    ->prices_displayed_including_taxes
-                                            )
-                                                ? EE_Registry::instance()
-                                                    ->CFG
-                                                    ->tax_settings
-                                                    ->prices_displayed_including_taxes
-                                                : true,
-                                            'display_html_label_text' => false,
-                                        )
-                                    ),
-                                ),
-                            )
-                        ),
-                    )
-                ),
-            )
-        );
-    }
-
-
-    /**
-     * _update_tax_settings
-     *
-     * @since 4.9.13
-     * @return void
-     */
-    public function _update_tax_settings()
-    {
-        if (! isset(EE_Registry::instance()->CFG->tax_settings)) {
-            EE_Registry::instance()->CFG->tax_settings = new EE_Tax_Config();
-        }
-        try {
-            $tax_form = $this->tax_settings_form();
-            // check for form submission
-            if ($tax_form->was_submitted()) {
-                // capture form data
-                $tax_form->receive_form_submission();
-                // validate form data
-                if ($tax_form->is_valid()) {
-                    // grab validated data from form
-                    $valid_data = $tax_form->valid_data();
-                    // set data on config
-                    EE_Registry::instance()
-                        ->CFG
-                        ->tax_settings
-                        ->prices_displayed_including_taxes
-                        = $valid_data['tax_settings']['prices_displayed_including_taxes'];
-                } else {
-                    if ($tax_form->submission_error_message() !== '') {
-                        EE_Error::add_error(
-                            $tax_form->submission_error_message(),
-                            __FILE__,
-                            __FUNCTION__,
-                            __LINE__
-                        );
-                    }
-                }
-            }
-        } catch (EE_Error $e) {
-            EE_Error::add_error($e->get_error(), __FILE__, __FUNCTION__, __LINE__);
-        }
-
-        $what = 'Tax Settings';
-        $success = $this->_update_espresso_configuration(
-            $what,
-            EE_Registry::instance()->CFG->tax_settings,
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        $this->_redirect_after_action($success, $what, 'updated', array('action' => 'tax_settings'));
-    }
+	/**
+	 *        generates HTML for main Prices Admin page
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _price_types_overview_list_table()
+	{
+		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+			'add_new_price_type',
+			'add_type',
+			array(),
+			'add-new-h2'
+		);
+		$this->admin_page_title .= $this->_learn_more_about_pricing_link();
+		$this->_search_btn_label = __('Price Types', 'event_espresso');
+		$this->display_admin_list_table_page_with_no_sidebar();
+	}
+
+
+	/**
+	 *    retrieve data for Price Types List table
+	 *
+	 * @access public
+	 * @param  int     $per_page how many prices displayed per page
+	 * @param  boolean $count    return the count or objects
+	 * @param  boolean $trashed  whether the current view is of the trash can - eww yuck!
+	 * @return mixed (int|array)  int = count || array of price objects
+	 */
+	public function get_price_types_overview_data($per_page = 10, $count = false, $trashed = false)
+	{
+
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		// start with an empty array
+
+		require_once(PRICING_ADMIN . 'Price_Types_List_Table.class.php');
+		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+
+		$this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? '' : $this->_req_data['orderby'];
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order']
+			: 'ASC';
+		switch ($this->_req_data['orderby']) {
+			case 'name':
+				$orderby = array('PRT_name' => $order);
+				break;
+			default:
+				$orderby = array('PRT_order' => $order);
+		}
+
+
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
+			? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
+			? $this->_req_data['perpage'] : $per_page;
+
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
+
+		$_where = array('PRT_deleted' => $trashed, 'PBT_ID' => array('!=', 1));
+
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%' . $this->_req_data['s'] . '%';
+			$_where['OR'] = array(
+				'PRT_name' => array('LIKE', $sstr),
+			);
+		}
+		$query_params = array(
+			$_where,
+			'order_by' => $orderby,
+			'limit'    => $limit,
+		);
+		if ($count) {
+			return EEM_Price_Type::instance()->count_deleted_and_undeleted($query_params);
+		} else {
+			return EEM_Price_Type::instance()->get_all_deleted_and_undeleted($query_params);
+		}
+
+		// EEH_Debug_Tools::printr( $price_types, '$price_types  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
+	}
+
+
+	/**
+	 *        _edit_price_type_details
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _edit_price_type_details()
+	{
+
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+
+
+		// grab price type ID
+		$PRT_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id']) ? absint($this->_req_data['id'])
+			: false;
+		// change page title based on request action
+		switch ($this->_req_action) {
+			case 'add_new_price_type':
+				$this->_admin_page_title = esc_html__('Add New Price Type', 'event_espresso');
+				break;
+			case 'edit_price_type':
+				$this->_admin_page_title = esc_html__('Edit Price Type', 'event_espresso');
+				break;
+			default:
+				$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
+		}
+		// add PRT_ID to title if editing
+		$this->_admin_page_title = $PRT_ID ? $this->_admin_page_title . ' # ' . $PRT_ID : $this->_admin_page_title;
+
+		if ($PRT_ID) {
+			$price_type = EEM_Price_Type::instance()->get_one_by_ID($PRT_ID);
+			$additional_hidden_fields = array('PRT_ID' => array('type' => 'hidden', 'value' => $PRT_ID));
+			$this->_set_add_edit_form_tags('update_price_type', $additional_hidden_fields);
+		} else {
+			$price_type = EEM_Price_Type::instance()->get_new_price_type();
+			$this->_set_add_edit_form_tags('insert_price_type');
+		}
+
+		$this->_template_args['PRT_ID'] = $PRT_ID;
+		$this->_template_args['price_type'] = $price_type;
+
+
+		$base_types = EEM_Price_Type::instance()->get_base_types();
+		$select_values = array();
+		foreach ($base_types as $ref => $text) {
+			if ($ref == EEM_Price_Type::base_type_base_price) {
+				// do not allow creation of base_type_base_prices because that's a system only base type.
+				continue;
+			}
+			$values[] = array('id' => $ref, 'text' => $text);
+		}
+
+
+		$this->_template_args['base_type_select'] = EEH_Form_Fields::select_input(
+			'base_type',
+			$values,
+			$price_type->base_type(),
+			'id="price-type-base-type-slct"'
+		);
+		$this->_template_args['learn_more_about_pricing_link'] = $this->_learn_more_about_pricing_link();
+		$redirect_URL = add_query_arg(array('action' => 'price_types'), $this->_admin_base_url);
+		$this->_set_publish_post_box_vars('id', $PRT_ID, false, $redirect_URL);
+		// the details template wrapper
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 *        declare price type details page metaboxes
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _price_type_details_meta_boxes()
+	{
+		add_meta_box(
+			'edit-price-details-mbox',
+			__('Price Type Details', 'event_espresso'),
+			array($this, '_edit_price_type_details_meta_box'),
+			$this->wp_page_slug,
+			'normal',
+			'high'
+		);
+	}
+
+
+	/**
+	 *        _edit_price_type_details_meta_box
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function _edit_price_type_details_meta_box()
+	{
+		echo EEH_Template::display_template(
+			PRICING_TEMPLATE_PATH . 'pricing_type_details_main_meta_box.template.php',
+			$this->_template_args,
+			true
+		);
+	}
+
+
+	/**
+	 *        set_price_type_column_values
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function set_price_type_column_values()
+	{
+
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+
+		$base_type = ! empty($this->_req_data['base_type']) ? $this->_req_data['base_type']
+			: EEM_Price_Type::base_type_base_price;
+
+		switch ($base_type) {
+			case EEM_Price_Type::base_type_base_price:
+				$this->_req_data['PBT_ID'] = EEM_Price_Type::base_type_base_price;
+				$this->_req_data['PRT_is_percent'] = 0;
+				$this->_req_data['PRT_order'] = 0;
+				break;
+
+			case EEM_Price_Type::base_type_discount:
+				$this->_req_data['PBT_ID'] = EEM_Price_Type::base_type_discount;
+				break;
+
+			case EEM_Price_Type::base_type_surcharge:
+				$this->_req_data['PBT_ID'] = EEM_Price_Type::base_type_surcharge;
+				break;
+
+			case EEM_Price_Type::base_type_tax:
+				$this->_req_data['PBT_ID'] = EEM_Price_Type::base_type_tax;
+				$this->_req_data['PRT_is_percent'] = 1;
+				break;
+		}/**/
+
+		$set_column_values = array(
+			'PRT_name'       => $this->_req_data['PRT_name'],
+			'PBT_ID'         => absint($this->_req_data['PBT_ID']),
+			'PRT_is_percent' => absint($this->_req_data['PRT_is_percent']),
+			'PRT_order'      => absint($this->_req_data['PRT_order']),
+			'PRT_deleted'    => 0,
+		);
+
+		return $set_column_values;
+	}
+
+
+	/**
+	 *        _insert_or_update_price_type
+	 *
+	 * @param boolean $new_price_type - whether to insert or update
+	 * @access protected
+	 * @return void
+	 */
+	protected function _insert_or_update_price_type($new_price_type = false)
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+
+		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		$PRT = EEM_Price_Type::instance();
+
+		// why be so pessimistic ???  : (
+		$success = 0;
+
+		$set_column_values = $this->set_price_type_column_values();
+		// is this a new Price ?
+		if ($new_price_type) {
+			// run the insert
+			if ($PRT_ID = $PRT->insert($set_column_values)) {
+				$success = 1;
+			}
+			$action_desc = 'created';
+		} else {
+			$PRT_ID = absint($this->_req_data['PRT_ID']);
+			// run the update
+			$where_cols_n_values = array('PRT_ID' => $PRT_ID);
+			if ($PRT->update($set_column_values, array($where_cols_n_values))) {
+				$success = 1;
+			}
+			$action_desc = 'updated';
+		}
+
+		$query_args = array('action' => 'edit_price_type', 'id' => $PRT_ID);
+		$this->_redirect_after_action($success, 'Price Type', $action_desc, $query_args);
+	}
+
+
+	/**
+	 *        _trash_or_restore_price_type
+	 *
+	 * @param boolean $trash - whether to move item to trash (TRUE) or restore it (FALSE)
+	 * @access protected
+	 * @return void
+	 */
+	protected function _trash_or_restore_price_type($trash = true)
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+
+		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		$PRT = EEM_Price_Type::instance();
+
+		$success = 1;
+		$PRT_deleted = $trash ? true : false;
+		// Checkboxes
+		if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+			// if array has more than one element than success message should be plural
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
+			$what = count($this->_req_data['checkbox']) > 1 ? 'Price Types' : 'Price Type';
+			// cycle thru checkboxes
+			while (list($PRT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if (! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID)) {
+					$success = 0;
+				}
+			}
+		} else {
+			// grab single id and delete
+			$PRT_ID = isset($this->_req_data['id']) ? absint($this->_req_data['id']) : 0;
+			if (empty($PRT_ID) || ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID)) {
+				$success = 0;
+			}
+			$what = 'Price Type';
+		}
+
+		$query_args = array('action' => 'price_types');
+		if ($success) {
+			if ($trash) {
+				$msg = $success > 1
+					? __('The Price Types have been trashed.', 'event_espresso')
+					: __(
+						'The Price Type has been trashed.',
+						'event_espresso'
+					);
+			} else {
+				$msg = $success > 1
+					? __('The Price Types have been restored.', 'event_espresso')
+					: __(
+						'The Price Type has been restored.',
+						'event_espresso'
+					);
+			}
+			EE_Error::add_success($msg);
+		}
+
+		$this->_redirect_after_action(false, '', '', $query_args, true);
+	}
+
+
+	/**
+	 *        _delete_price_type
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _delete_price_type()
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+
+		$PRT = EEM_Price_Type::instance();
+
+		$success = 1;
+		// Checkboxes
+		if (! empty($this->_req_data['checkbox'])) {
+			// if array has more than one element than success message should be plural
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
+			$what = $PRT->item_name($success);
+			// cycle thru bulk action checkboxes
+			while (list($PRT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if (! $PRT->delete_permanently_by_ID($PRT_ID)) {
+					$success = 0;
+				}
+			}
+		}
+
+
+		$query_args = array('action' => 'price_types');
+		$this->_redirect_after_action($success, $what, 'deleted', $query_args);
+	}
+
+
+	/**
+	 *        _learn_more_about_pricing_link
+	 *
+	 * @access protected
+	 * @return string
+	 */
+	protected function _learn_more_about_pricing_link()
+	{
+		return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >' . __(
+			'learn more about how pricing works',
+			'event_espresso'
+		) . '</a>';
+	}
+
+
+	protected function _tax_settings()
+	{
+		$this->_set_add_edit_form_tags('update_tax_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = $this->tax_settings_form()->get_html();
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * @return \EE_Form_Section_Proper
+	 * @throws \EE_Error
+	 */
+	protected function tax_settings_form()
+	{
+		return new EE_Form_Section_Proper(
+			array(
+				'name'            => 'tax_settings_form',
+				'html_id'         => 'tax_settings_form',
+				'layout_strategy' => new EE_Div_Per_Section_Layout(),
+				'subsections'     => apply_filters(
+					'FHEE__Pricing_Admin_Page__tax_settings_form__form_subsections',
+					array(
+						'tax_settings' => new EE_Form_Section_Proper(
+							array(
+								'name'            => 'tax_settings_tbl',
+								'html_id'         => 'tax_settings_tbl',
+								'html_class'      => 'form-table',
+								'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+								'subsections'     => array(
+									'prices_displayed_including_taxes' => new EE_Yes_No_Input(
+										array(
+											'html_label_text'         => __(
+												"Show Prices With Taxes Included?",
+												'event_espresso'
+											),
+											'html_help_text'          => __(
+												'Indicates whether or not to display prices with the taxes included',
+												'event_espresso'
+											),
+											'default'                 => isset(
+												EE_Registry::instance()
+													->CFG
+													->tax_settings
+													->prices_displayed_including_taxes
+											)
+												? EE_Registry::instance()
+													->CFG
+													->tax_settings
+													->prices_displayed_including_taxes
+												: true,
+											'display_html_label_text' => false,
+										)
+									),
+								),
+							)
+						),
+					)
+				),
+			)
+		);
+	}
+
+
+	/**
+	 * _update_tax_settings
+	 *
+	 * @since 4.9.13
+	 * @return void
+	 */
+	public function _update_tax_settings()
+	{
+		if (! isset(EE_Registry::instance()->CFG->tax_settings)) {
+			EE_Registry::instance()->CFG->tax_settings = new EE_Tax_Config();
+		}
+		try {
+			$tax_form = $this->tax_settings_form();
+			// check for form submission
+			if ($tax_form->was_submitted()) {
+				// capture form data
+				$tax_form->receive_form_submission();
+				// validate form data
+				if ($tax_form->is_valid()) {
+					// grab validated data from form
+					$valid_data = $tax_form->valid_data();
+					// set data on config
+					EE_Registry::instance()
+						->CFG
+						->tax_settings
+						->prices_displayed_including_taxes
+						= $valid_data['tax_settings']['prices_displayed_including_taxes'];
+				} else {
+					if ($tax_form->submission_error_message() !== '') {
+						EE_Error::add_error(
+							$tax_form->submission_error_message(),
+							__FILE__,
+							__FUNCTION__,
+							__LINE__
+						);
+					}
+				}
+			}
+		} catch (EE_Error $e) {
+			EE_Error::add_error($e->get_error(), __FILE__, __FUNCTION__, __LINE__);
+		}
+
+		$what = 'Tax Settings';
+		$success = $this->_update_espresso_configuration(
+			$what,
+			EE_Registry::instance()->CFG->tax_settings,
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'tax_settings'));
+	}
 }

Spacing +34 added lines, -34 removed lines

@@ -361,7 +361,7 @@ 
         wp_enqueue_style('espresso-ui-theme');
         wp_register_style(
             'espresso_PRICING',
-            PRICING_ASSETS_URL . 'espresso_pricing_admin.css',
+            PRICING_ASSETS_URL.'espresso_pricing_admin.css',
             array(),
             EVENT_ESPRESSO_VERSION
         );
@@ -376,7 +376,7 @@ 
         // wp_enqueue_script('jquery-ui-datepicker');
         wp_register_script(
             'espresso_PRICING',
-            PRICING_ASSETS_URL . 'espresso_pricing_admin.js',
+            PRICING_ASSETS_URL.'espresso_pricing_admin.js',
             array('jquery'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -469,7 +469,7 @@ 
      */
     protected function _price_overview_list_table()
     {
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+        $this->_admin_page_title .= ' '.$this->get_action_link_or_button(
             'add_new_price',
             'add',
             array(),
@@ -497,8 +497,8 @@ 
         // start with an empty array
         $event_pricing = array();
 
-        require_once(PRICING_ADMIN . 'Prices_List_Table.class.php');
-        require_once(EE_MODELS . 'EEM_Price.model.php');
+        require_once(PRICING_ADMIN.'Prices_List_Table.class.php');
+        require_once(EE_MODELS.'EEM_Price.model.php');
         // $PRC = EEM_Price::instance();
 
         $this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? '' : $this->_req_data['orderby'];
@@ -533,7 +533,7 @@ 
         $limit = array($offset, $per_page);
 
         if (isset($this->_req_data['s'])) {
-            $sstr = '%' . $this->_req_data['s'] . '%';
+            $sstr = '%'.$this->_req_data['s'].'%';
             $_where['OR'] = array(
                 'PRC_name'            => array('LIKE', $sstr),
                 'PRC_desc'            => array('LIKE', $sstr),
@@ -582,10 +582,10 @@ 
                 $this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
         }
         // add PRC_ID to title if editing
-        $this->_admin_page_title = $PRC_ID ? $this->_admin_page_title . ' # ' . $PRC_ID : $this->_admin_page_title;
+        $this->_admin_page_title = $PRC_ID ? $this->_admin_page_title.' # '.$PRC_ID : $this->_admin_page_title;
 
         // get prices
-        require_once(EE_MODELS . 'EEM_Price.model.php');
+        require_once(EE_MODELS.'EEM_Price.model.php');
         $PRC = EEM_Price::instance();
 
         if ($PRC_ID) {
@@ -603,7 +603,7 @@ 
         $this->_template_args['price'] = $price;
 
         // get price types
-        require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+        require_once(EE_MODELS.'EEM_Price_Type.model.php');
         $PRT = EEM_Price_Type::instance();
         $price_types = $PRT->get_all(array(array('PBT_ID' => array('!=', 1))));
         $price_type_names = array();
@@ -659,7 +659,7 @@ 
     public function _edit_price_details_meta_box()
     {
         echo EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'pricing_details_main_meta_box.template.php',
+            PRICING_TEMPLATE_PATH.'pricing_details_main_meta_box.template.php',
             $this->_template_args,
             true
         );
@@ -705,7 +705,7 @@ 
         // echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-        require_once(EE_MODELS . 'EEM_Price.model.php');
+        require_once(EE_MODELS.'EEM_Price.model.php');
         $PRC = EEM_Price::instance();
 
         // why be so pessimistic ???  : (
@@ -778,7 +778,7 @@ 
         // echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-        require_once(EE_MODELS . 'EEM_Price.model.php');
+        require_once(EE_MODELS.'EEM_Price.model.php');
         $PRC = EEM_Price::instance();
 
         $success = 1;
@@ -787,12 +787,12 @@ 
         // get base ticket for updating
         $ticket = EEM_Ticket::instance()->get_one_by_ID(1);
         // Checkboxes
-        if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+        if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
             // if array has more than one element than success message should be plural
             $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
             // cycle thru checkboxes
             while (list($PRC_ID, $value) = each($this->_req_data['checkbox'])) {
-                if (! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), absint($PRC_ID))) {
+                if ( ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), absint($PRC_ID))) {
                     $success = 0;
                 } else {
                     $PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
@@ -865,24 +865,24 @@ 
         // echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-        require_once(EE_MODELS . 'EEM_Price.model.php');
+        require_once(EE_MODELS.'EEM_Price.model.php');
         $PRC = EEM_Price::instance();
 
         $success = 1;
         // Checkboxes
-        if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+        if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
             // if array has more than one element than success message should be plural
             $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
             // cycle thru bulk action checkboxes
             while (list($PRC_ID, $value) = each($this->_req_data['checkbox'])) {
-                if (! $PRC->delete_permanently_by_ID(absint($PRC_ID))) {
+                if ( ! $PRC->delete_permanently_by_ID(absint($PRC_ID))) {
                     $success = 0;
                 }
             }
         } else {
             // grab single id and delete
             $PRC_ID = absint($this->_req_data['id']);
-            if (! $PRC->delete_permanently_by_ID($PRC_ID)) {
+            if ( ! $PRC->delete_permanently_by_ID($PRC_ID)) {
                 $success = 0;
             }
         }
@@ -907,7 +907,7 @@ 
         if (is_array($row_ids)) {
             for ($i = 0; $i < count($row_ids); $i++) {
                 // Update the prices when re-ordering
-                $id = absint($row_ids[ $i ]);
+                $id = absint($row_ids[$i]);
                 if (EEM_Price::instance()->update(
                     array('PRC_order' => $i + 1),
                     array(array('PRC_ID' => $id))
@@ -943,7 +943,7 @@ 
      */
     protected function _price_types_overview_list_table()
     {
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+        $this->_admin_page_title .= ' '.$this->get_action_link_or_button(
             'add_new_price_type',
             'add_type',
             array(),
@@ -970,8 +970,8 @@ 
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
         // start with an empty array
 
-        require_once(PRICING_ADMIN . 'Price_Types_List_Table.class.php');
-        require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+        require_once(PRICING_ADMIN.'Price_Types_List_Table.class.php');
+        require_once(EE_MODELS.'EEM_Price_Type.model.php');
 
         $this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? '' : $this->_req_data['orderby'];
         $order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order']
@@ -996,7 +996,7 @@ 
         $_where = array('PRT_deleted' => $trashed, 'PBT_ID' => array('!=', 1));
 
         if (isset($this->_req_data['s'])) {
-            $sstr = '%' . $this->_req_data['s'] . '%';
+            $sstr = '%'.$this->_req_data['s'].'%';
             $_where['OR'] = array(
                 'PRT_name' => array('LIKE', $sstr),
             );
@@ -1043,7 +1043,7 @@ 
                 $this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
         }
         // add PRT_ID to title if editing
-        $this->_admin_page_title = $PRT_ID ? $this->_admin_page_title . ' # ' . $PRT_ID : $this->_admin_page_title;
+        $this->_admin_page_title = $PRT_ID ? $this->_admin_page_title.' # '.$PRT_ID : $this->_admin_page_title;
 
         if ($PRT_ID) {
             $price_type = EEM_Price_Type::instance()->get_one_by_ID($PRT_ID);
@@ -1111,7 +1111,7 @@ 
     public function _edit_price_type_details_meta_box()
     {
         echo EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'pricing_type_details_main_meta_box.template.php',
+            PRICING_TEMPLATE_PATH.'pricing_type_details_main_meta_box.template.php',
             $this->_template_args,
             true
         );
@@ -1176,7 +1176,7 @@ 
     {
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-        require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+        require_once(EE_MODELS.'EEM_Price_Type.model.php');
         $PRT = EEM_Price_Type::instance();
 
         // why be so pessimistic ???  : (
@@ -1216,19 +1216,19 @@ 
     {
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-        require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+        require_once(EE_MODELS.'EEM_Price_Type.model.php');
         $PRT = EEM_Price_Type::instance();
 
         $success = 1;
         $PRT_deleted = $trash ? true : false;
         // Checkboxes
-        if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+        if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
             // if array has more than one element than success message should be plural
             $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
             $what = count($this->_req_data['checkbox']) > 1 ? 'Price Types' : 'Price Type';
             // cycle thru checkboxes
             while (list($PRT_ID, $value) = each($this->_req_data['checkbox'])) {
-                if (! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID)) {
+                if ( ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID)) {
                     $success = 0;
                 }
             }
@@ -1279,13 +1279,13 @@ 
 
         $success = 1;
         // Checkboxes
-        if (! empty($this->_req_data['checkbox'])) {
+        if ( ! empty($this->_req_data['checkbox'])) {
             // if array has more than one element than success message should be plural
             $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
             $what = $PRT->item_name($success);
             // cycle thru bulk action checkboxes
             while (list($PRT_ID, $value) = each($this->_req_data['checkbox'])) {
-                if (! $PRT->delete_permanently_by_ID($PRT_ID)) {
+                if ( ! $PRT->delete_permanently_by_ID($PRT_ID)) {
                     $success = 0;
                 }
             }
@@ -1305,10 +1305,10 @@ 
      */
     protected function _learn_more_about_pricing_link()
     {
-        return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >' . __(
+        return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >'.__(
             'learn more about how pricing works',
             'event_espresso'
-        ) . '</a>';
+        ).'</a>';
     }
 
 
@@ -1384,7 +1384,7 @@ 
      */
     public function _update_tax_settings()
     {
-        if (! isset(EE_Registry::instance()->CFG->tax_settings)) {
+        if ( ! isset(EE_Registry::instance()->CFG->tax_settings)) {
             EE_Registry::instance()->CFG->tax_settings = new EE_Tax_Config();
         }
         try {

caffeinated/admin/new/pricing/templates/event_tickets_datetime_ticket_price_row.template.php

Braces +10 added lines, -4 removed lines

@@ -33,9 +33,12 @@ 
             <input type="text" size="1" class="edit-price-PRC_amount ee-numeric"
                    name="prices_archive[<?php echo $tkt_row; ?>][<?php echo $PRC_order; ?>][PRC_amount]"
                    value="<?php echo $PRC_amount; ?>" disabled>
-        <?php else : ?>
+        <?php else {
+	: ?>
             <input type="text" size="1" class="edit-price-PRC_amount ee-numeric"
-                   name="<?php echo $edit_prices_name; ?>[<?php echo $tkt_row; ?>][<?php echo $PRC_order; ?>][PRC_amount]"
+                   name="<?php echo $edit_prices_name;
+}
+?>[<?php echo $tkt_row; ?>][<?php echo $PRC_order; ?>][PRC_amount]"
                    value="<?php echo $PRC_amount; ?>">
         <?php endif; ?>
     </td>
@@ -46,8 +49,11 @@ 
     <td>
         <?php if ($disabled) : ?>
             <span class="ee-lock-icon"></span>
-        <?php else : ?>
-            <!-- <span class="gear-icon dashicons dashicons-admin-generic clickable" data-ticket-row="<?php echo $tkt_row; ?>" data-context="price" data-price-row="<?php echo $PRC_order; ?>"></span> -->
+        <?php else {
+	: ?>
+            <!-- <span class="gear-icon dashicons dashicons-admin-generic clickable" data-ticket-row="<?php echo $tkt_row;
+}
+?>" data-context="price" data-price-row="<?php echo $PRC_order; ?>"></span> -->
             <span class="trash-icon dashicons dashicons-post-trash clickable" data-ticket-row="<?php echo $tkt_row; ?>"
                   data-context="price" data-price-row="<?php echo $PRC_order; ?>"<?php echo $show_trash_icon; ?>></span>
             <button data-ticket-row="<?php echo $tkt_row; ?>" data-price-row="<?php echo $PRC_order; ?>"

caffeinated/admin/new/pricing/templates/pricing_type_details_main_meta_box.template.php

Indentation +19 added lines, -19 removed lines

@@ -10,10 +10,10 @@ 
             <td>
                 <?php echo $base_type_select; ?><br/>
                 <p class="description"><?php
-                    _e(
-                        'Choosing a basic type allows us to quickly configure a bunch of other options for you.<br/>All events need to have at least one Base Price type option.<br/>Discounts reduce the price of an event, Surcharges increase the price.<br/>Taxes are applied to the final total.',
-                        'event_espresso'
-                    ); ?></p>
+					_e(
+						'Choosing a basic type allows us to quickly configure a bunch of other options for you.<br/>All events need to have at least one Base Price type option.<br/>Discounts reduce the price of an event, Surcharges increase the price.<br/>Taxes are applied to the final total.',
+						'event_espresso'
+					); ?></p>
             </td>
         </tr>
 
@@ -44,20 +44,20 @@ 
                     <?php _e('Fixed', 'event_espresso'); ?>
                 </label>
                 <p class="description"><?php
-                    _e(
-                        'Whether this Price Type will be applied as a percentage or applied as a set fixed amount.',
-                        'event_espresso'
-                    ); ?></p>
+					_e(
+						'Whether this Price Type will be applied as a percentage or applied as a set fixed amount.',
+						'event_espresso'
+					); ?></p>
                 <?php if ($price_type->base_type() == EEM_Price_Type::base_type_tax) :
-                    // base type is tax so let's just let the user know that taxes are always percentage.
-                    ?>
+					// base type is tax so let's just let the user know that taxes are always percentage.
+					?>
                     <p class="description" style="color:#E44064">
                         <?php
-                            _e(
-                                'The selected base type for this price type is "Tax".  Taxes are always assumed to be a percentage.  If you want to use a fixed value for a tax then please change the base type to a surcharge.',
-                                'event_espresso'
-                            );
-                        ?></p>
+							_e(
+								'The selected base type for this price type is "Tax".  Taxes are always assumed to be a percentage.  If you want to use a fixed value for a tax then please change the base type to a surcharge.',
+								'event_espresso'
+							);
+						?></p>
                 <?php endif; ?>
             </td>
         </tr>
@@ -71,10 +71,10 @@ 
                 <p class="description">
                     <?php _e('The order that Price Types are applied.', 'event_espresso'); ?></p>
                 <p class="description"><?php
-                    _e(
-                        'Price types are applied sequentially according to their Order, where higher ordered Price Types will affect lower ordered Price Types.<br/>Price types with equal Orders will be applied in parallel to whatever total precedes them and will not affect each other. Actual Prices will be set to "0" so that they are processed first. Taxes will be always be applied last but their order will still determine if they are applied in parallel or as compound taxes (one tax on top of the other).',
-                        'event_espresso'
-                    ); ?></p>
+					_e(
+						'Price types are applied sequentially according to their Order, where higher ordered Price Types will affect lower ordered Price Types.<br/>Price types with equal Orders will be applied in parallel to whatever total precedes them and will not affect each other. Actual Prices will be set to "0" so that they are processed first. Taxes will be always be applied last but their order will still determine if they are applied in parallel or as compound taxes (one tax on top of the other).',
+						'event_espresso'
+					); ?></p>
             </td>
         </tr>