AyeCode / invoicing

includes/payments/class-getpaid-payment-form-submission-items.php

Indentation +90 added lines, -90 removed lines

@@ -12,51 +12,51 @@ 
  */
 class GetPaid_Payment_Form_Submission_Items {
 
-	/**
-	 * Submission items.
-	 * @var GetPaid_Form_Item[]
-	 */
-	public $items = array();
+    /**
+     * Submission items.
+     * @var GetPaid_Form_Item[]
+     */
+    public $items = array();
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		$data         = $submission->get_data();
-		$payment_form = $submission->get_payment_form();
-		$invoice      = $submission->get_invoice();
-		$force_prices = array();
-
-		// Prepare the selected items.
-		$selected_items = array();
-		if ( ! empty( $data['getpaid-items'] ) ) {
-			$selected_items = wpinv_clean( $data['getpaid-items'] );
-
-			if ( ! empty( $invoice ) && $submission->is_initial_fetch() ) {
-				foreach ( $invoice->get_items() as $invoice_item ) {
-					if ( isset( $selected_items[ $invoice_item->get_id() ] ) ) {
-						$selected_items[ $invoice_item->get_id() ]['quantity'] = $invoice_item->get_quantity();
-						$selected_items[ $invoice_item->get_id() ]['price']    = $invoice_item->get_price();
-
-						$force_prices[ $invoice_item->get_id() ] = $invoice_item->get_price();
-					}
-				}
-			}
-		}
-
-		// (Maybe) set form items.
-		if ( isset( $data['getpaid-form-items'] ) ) {
-
-			// Confirm items key.
-			$form_items = wpinv_clean( $data['getpaid-form-items'] );
-			if ( ! isset( $data['getpaid-form-items-key'] ) || md5( NONCE_KEY . AUTH_KEY . $form_items ) !== $data['getpaid-form-items-key'] ) {
-				throw new Exception( __( 'We could not validate the form items. Please reload the page and try again.', 'invoicing' ) );
-			}
-
-			$items    = array();
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        $data         = $submission->get_data();
+        $payment_form = $submission->get_payment_form();
+        $invoice      = $submission->get_invoice();
+        $force_prices = array();
+
+        // Prepare the selected items.
+        $selected_items = array();
+        if ( ! empty( $data['getpaid-items'] ) ) {
+            $selected_items = wpinv_clean( $data['getpaid-items'] );
+
+            if ( ! empty( $invoice ) && $submission->is_initial_fetch() ) {
+                foreach ( $invoice->get_items() as $invoice_item ) {
+                    if ( isset( $selected_items[ $invoice_item->get_id() ] ) ) {
+                        $selected_items[ $invoice_item->get_id() ]['quantity'] = $invoice_item->get_quantity();
+                        $selected_items[ $invoice_item->get_id() ]['price']    = $invoice_item->get_price();
+
+                        $force_prices[ $invoice_item->get_id() ] = $invoice_item->get_price();
+                    }
+                }
+            }
+        }
+
+        // (Maybe) set form items.
+        if ( isset( $data['getpaid-form-items'] ) ) {
+
+            // Confirm items key.
+            $form_items = wpinv_clean( $data['getpaid-form-items'] );
+            if ( ! isset( $data['getpaid-form-items-key'] ) || md5( NONCE_KEY . AUTH_KEY . $form_items ) !== $data['getpaid-form-items-key'] ) {
+                throw new Exception( __( 'We could not validate the form items. Please reload the page and try again.', 'invoicing' ) );
+            }
+
+            $items    = array();
             $item_ids = array();
 
             foreach ( getpaid_convert_items_to_array( $form_items ) as $item_id => $qty ) {
@@ -69,10 +69,10 @@ 
                         $item->set_is_required( false );
                     }
 
-					if ( ! $item->user_can_set_their_price() && isset( $force_prices[ $item_id ] ) ) {
-						$item->set_is_dynamic_pricing( true );
-						$item->set_minimum_price( 0 );
-					}
+                    if ( ! $item->user_can_set_their_price() && isset( $force_prices[ $item_id ] ) ) {
+                        $item->set_is_dynamic_pricing( true );
+                        $item->set_minimum_price( 0 );
+                    }
 
                     $item_ids[] = $item->get_id();
                     $items[]    = $item;
@@ -87,61 +87,61 @@ 
                         $items[]    = $item;
                     }
                 }
-			}
+            }
 
             $payment_form->set_items( $items );
 
-		}
-
-		// Process each individual item.
-		foreach ( $payment_form->get_items() as $item ) {
-			$this->process_item( $item, $selected_items, $submission );
-		}
-
-	}
-
-	/**
-	 * Process a single item.
-	 *
-	 * @param GetPaid_Form_Item $item
-	 * @param array $selected_items
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function process_item( $item, $selected_items, $submission ) {
+        }
 
-		// Abort if this is an optional item and it has not been selected.
-		if ( ! $item->is_required() && ! isset( $selected_items[ $item->get_id() ] ) ) {
-			return;
-		}
+        // Process each individual item.
+        foreach ( $payment_form->get_items() as $item ) {
+            $this->process_item( $item, $selected_items, $submission );
+        }
 
-		// (maybe) let customers change the quantities and prices.
-		if ( isset( $selected_items[ $item->get_id() ] ) ) {
+    }
 
-			// Maybe change the quantities.
-			if ( $item->allows_quantities() ) {
-				$item->set_quantity( (float) $selected_items[ $item->get_id() ]['quantity'] );
-			}
+    /**
+     * Process a single item.
+     *
+     * @param GetPaid_Form_Item $item
+     * @param array $selected_items
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function process_item( $item, $selected_items, $submission ) {
+
+        // Abort if this is an optional item and it has not been selected.
+        if ( ! $item->is_required() && ! isset( $selected_items[ $item->get_id() ] ) ) {
+            return;
+        }
+
+        // (maybe) let customers change the quantities and prices.
+        if ( isset( $selected_items[ $item->get_id() ] ) ) {
+
+            // Maybe change the quantities.
+            if ( $item->allows_quantities() ) {
+                $item->set_quantity( (float) $selected_items[ $item->get_id() ]['quantity'] );
+            }
 
-			// Maybe change the price.
-			if ( $item->user_can_set_their_price() ) {
-				$price = (float) wpinv_sanitize_amount( $selected_items[ $item->get_id() ]['price'] );
+            // Maybe change the price.
+            if ( $item->user_can_set_their_price() ) {
+                $price = (float) wpinv_sanitize_amount( $selected_items[ $item->get_id() ]['price'] );
 
-				if ( $item->get_minimum_price() > $price ) {
-					throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $item->get_minimum_price() ) ) );
-				}
+                if ( $item->get_minimum_price() > $price ) {
+                    throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $item->get_minimum_price() ) ) );
+                }
 
-				$item->set_price( $price );
+                $item->set_price( $price );
 
-			}
-		}
+            }
+        }
 
-		if ( 0 == $item->get_quantity() ) {
-			return;
-		}
+        if ( 0 == $item->get_quantity() ) {
+            return;
+        }
 
-		// Save the item.
-		$this->items[] = apply_filters( 'getpaid_payment_form_submission_processed_item', $item, $submission );
+        // Save the item.
+        $this->items[] = apply_filters( 'getpaid_payment_form_submission_processed_item', $item, $submission );
 
-	}
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission itemss class
@@ -23,7 +23,7 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		$data         = $submission->get_data();
 		$payment_form = $submission->get_payment_form();
@@ -32,46 +32,46 @@ 
 
 		// Prepare the selected items.
 		$selected_items = array();
-		if ( ! empty( $data['getpaid-items'] ) ) {
-			$selected_items = wpinv_clean( $data['getpaid-items'] );
+		if (!empty($data['getpaid-items'])) {
+			$selected_items = wpinv_clean($data['getpaid-items']);
 
-			if ( ! empty( $invoice ) && $submission->is_initial_fetch() ) {
-				foreach ( $invoice->get_items() as $invoice_item ) {
-					if ( isset( $selected_items[ $invoice_item->get_id() ] ) ) {
-						$selected_items[ $invoice_item->get_id() ]['quantity'] = $invoice_item->get_quantity();
-						$selected_items[ $invoice_item->get_id() ]['price']    = $invoice_item->get_price();
+			if (!empty($invoice) && $submission->is_initial_fetch()) {
+				foreach ($invoice->get_items() as $invoice_item) {
+					if (isset($selected_items[$invoice_item->get_id()])) {
+						$selected_items[$invoice_item->get_id()]['quantity'] = $invoice_item->get_quantity();
+						$selected_items[$invoice_item->get_id()]['price']    = $invoice_item->get_price();
 
-						$force_prices[ $invoice_item->get_id() ] = $invoice_item->get_price();
+						$force_prices[$invoice_item->get_id()] = $invoice_item->get_price();
 					}
 				}
 			}
 		}
 
 		// (Maybe) set form items.
-		if ( isset( $data['getpaid-form-items'] ) ) {
+		if (isset($data['getpaid-form-items'])) {
 
 			// Confirm items key.
-			$form_items = wpinv_clean( $data['getpaid-form-items'] );
-			if ( ! isset( $data['getpaid-form-items-key'] ) || md5( NONCE_KEY . AUTH_KEY . $form_items ) !== $data['getpaid-form-items-key'] ) {
-				throw new Exception( __( 'We could not validate the form items. Please reload the page and try again.', 'invoicing' ) );
+			$form_items = wpinv_clean($data['getpaid-form-items']);
+			if (!isset($data['getpaid-form-items-key']) || md5(NONCE_KEY . AUTH_KEY . $form_items) !== $data['getpaid-form-items-key']) {
+				throw new Exception(__('We could not validate the form items. Please reload the page and try again.', 'invoicing'));
 			}
 
-			$items    = array();
+			$items = array();
             $item_ids = array();
 
-            foreach ( getpaid_convert_items_to_array( $form_items ) as $item_id => $qty ) {
-                if ( ! in_array( $item_id, $item_ids ) ) {
-                    $item = new GetPaid_Form_Item( $item_id );
-                    $item->set_quantity( $qty );
+            foreach (getpaid_convert_items_to_array($form_items) as $item_id => $qty) {
+                if (!in_array($item_id, $item_ids)) {
+                    $item = new GetPaid_Form_Item($item_id);
+                    $item->set_quantity($qty);
 
-                    if ( empty( $qty ) ) {
-                        $item->set_allow_quantities( true );
-                        $item->set_is_required( false );
+                    if (empty($qty)) {
+                        $item->set_allow_quantities(true);
+                        $item->set_is_required(false);
                     }
 
-					if ( ! $item->user_can_set_their_price() && isset( $force_prices[ $item_id ] ) ) {
-						$item->set_is_dynamic_pricing( true );
-						$item->set_minimum_price( 0 );
+					if (!$item->user_can_set_their_price() && isset($force_prices[$item_id])) {
+						$item->set_is_dynamic_pricing(true);
+						$item->set_minimum_price(0);
 					}
 
                     $item_ids[] = $item->get_id();
@@ -79,23 +79,23 @@ 
                 }
             }
 
-            if ( ! $payment_form->is_default() ) {
+            if (!$payment_form->is_default()) {
 
-                foreach ( $payment_form->get_items() as $item ) {
-                    if ( ! in_array( $item->get_id(), $item_ids ) ) {
+                foreach ($payment_form->get_items() as $item) {
+                    if (!in_array($item->get_id(), $item_ids)) {
                         $item_ids[] = $item->get_id();
                         $items[]    = $item;
                     }
                 }
 			}
 
-            $payment_form->set_items( $items );
+            $payment_form->set_items($items);
 
 		}
 
 		// Process each individual item.
-		foreach ( $payment_form->get_items() as $item ) {
-			$this->process_item( $item, $selected_items, $submission );
+		foreach ($payment_form->get_items() as $item) {
+			$this->process_item($item, $selected_items, $submission);
 		}
 
 	}
@@ -107,40 +107,40 @@ 
 	 * @param array $selected_items
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function process_item( $item, $selected_items, $submission ) {
+	public function process_item($item, $selected_items, $submission) {
 
 		// Abort if this is an optional item and it has not been selected.
-		if ( ! $item->is_required() && ! isset( $selected_items[ $item->get_id() ] ) ) {
+		if (!$item->is_required() && !isset($selected_items[$item->get_id()])) {
 			return;
 		}
 
 		// (maybe) let customers change the quantities and prices.
-		if ( isset( $selected_items[ $item->get_id() ] ) ) {
+		if (isset($selected_items[$item->get_id()])) {
 
 			// Maybe change the quantities.
-			if ( $item->allows_quantities() ) {
-				$item->set_quantity( (float) $selected_items[ $item->get_id() ]['quantity'] );
+			if ($item->allows_quantities()) {
+				$item->set_quantity((float) $selected_items[$item->get_id()]['quantity']);
 			}
 
 			// Maybe change the price.
-			if ( $item->user_can_set_their_price() ) {
-				$price = (float) wpinv_sanitize_amount( $selected_items[ $item->get_id() ]['price'] );
+			if ($item->user_can_set_their_price()) {
+				$price = (float) wpinv_sanitize_amount($selected_items[$item->get_id()]['price']);
 
-				if ( $item->get_minimum_price() > $price ) {
-					throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $item->get_minimum_price() ) ) );
+				if ($item->get_minimum_price() > $price) {
+					throw new Exception(sprintf(__('The minimum allowed amount is %s', 'invoicing'), getpaid_unstandardize_amount($item->get_minimum_price())));
 				}
 
-				$item->set_price( $price );
+				$item->set_price($price);
 
 			}
 		}
 
-		if ( 0 == $item->get_quantity() ) {
+		if (0 == $item->get_quantity()) {
 			return;
 		}
 
 		// Save the item.
-		$this->items[] = apply_filters( 'getpaid_payment_form_submission_processed_item', $item, $submission );
+		$this->items[] = apply_filters('getpaid_payment_form_submission_processed_item', $item, $submission);
 
 	}
 

includes/payments/class-getpaid-payment-form-submission-refresh-prices.php

Indentation +271 added lines, -271 removed lines

@@ -12,305 +12,305 @@
  */
 class GetPaid_Payment_Form_Submission_Refresh_Prices {
 
-	/**
-	 * Contains the response for refreshing prices.
-	 * @var array
-	 */
-	public $response = array();
+    /**
+     * Contains the response for refreshing prices.
+     * @var array
+     */
+    public $response = array();
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		$this->response = array(
-			'submission_id'                    => $submission->id,
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        $this->response = array(
+            'submission_id'                    => $submission->id,
             'has_recurring'                    => $submission->has_recurring,
-			'has_subscription_group'           => $submission->has_subscription_group(),
-			'has_multiple_subscription_groups' => $submission->has_multiple_subscription_groups(),
+            'has_subscription_group'           => $submission->has_subscription_group(),
+            'has_multiple_subscription_groups' => $submission->has_multiple_subscription_groups(),
             'is_free'                          => ! $submission->should_collect_payment_details(),
-		);
-
-		$payment_form = $submission->get_payment_form();
-		if ( ! empty( $payment_form->invoice ) ) {
-			$this->response['invoice'] = $payment_form->invoice->get_id();
-		}
-
-		$this->add_totals( $submission );
-		$this->add_texts( $submission );
-		$this->add_items( $submission );
-		$this->add_fees( $submission );
-		$this->add_discounts( $submission );
-		$this->add_taxes( $submission );
-		$this->add_gateways( $submission );
-		$this->add_data( $submission );
-
-	}
-
-	/**
-	 * Adds totals to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_totals( $submission ) {
-
-		$this->response = array_merge(
-			$this->response,
-			array(
-
-				'totals'      => array(
-					'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_tax() ),
-					'total'     => $submission->format_amount( $submission->get_total() ),
-					'raw_total' => html_entity_decode( sanitize_text_field( $submission->format_amount( $submission->get_total() ) ), ENT_QUOTES ),
-				),
-
-				'recurring'   => array(
-					'subtotal' => $submission->format_amount( $submission->get_recurring_subtotal() ),
-					'discount' => $submission->format_amount( $submission->get_recurring_discount() ),
-					'fees'     => $submission->format_amount( $submission->get_recurring_fee() ),
-					'tax'      => $submission->format_amount( $submission->get_recurring_tax() ),
-					'total'    => $submission->format_amount( $submission->get_recurring_total() ),
-				),
-
-				'initial_amt' => wpinv_round_amount( $submission->get_total(), null, true ),
-				'currency'    => $submission->get_currency(),
-
-			)
-		);
-
-	}
-
-	/**
-	 * Adds texts to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_texts( $submission ) {
-
-		$payable = $submission->format_amount( $submission->get_total() );
-		$groups  = getpaid_get_subscription_groups( $submission );
-
-		if ( $submission->has_recurring && 2 > count( $groups ) ) {
-
-			$recurring = new WPInv_Item( $submission->has_recurring );
-			$period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
-			$main_item = reset( $groups );
-
-			if ( $submission->get_total() == $submission->get_recurring_total() ) {
-				$payable = "$payable / $period";
-			} elseif ( $main_item ) {
-
-				$main_item = reset( $main_item );
-
-				// Calculate the next renewal date.
-				$_period      = $main_item->get_recurring_period( true );
-				$_interval    = $main_item->get_recurring_interval();
-
-				// If the subscription item has a trial period...
-				if ( $main_item->has_free_trial() ) {
-					$_period   = $main_item->get_trial_period( true );
-					$_interval = $main_item->get_trial_interval();
-				}
-
-				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
-					$period
-				);
-
-				$payable .= sprintf(
-					'<small class="text-muted form-text">%s</small>',
-					sprintf(
-						__( 'First renewal on %s', 'invoicing' ),
-						getpaid_format_date( date( 'Y-m-d H:i:s', strtotime( "+$_interval $_period", current_time( 'timestamp' ) ) ) )
-					)
-				);
-
-			} else {
-				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
-					$period
-				);
-			}
-}
+        );
+
+        $payment_form = $submission->get_payment_form();
+        if ( ! empty( $payment_form->invoice ) ) {
+            $this->response['invoice'] = $payment_form->invoice->get_id();
+        }
+
+        $this->add_totals( $submission );
+        $this->add_texts( $submission );
+        $this->add_items( $submission );
+        $this->add_fees( $submission );
+        $this->add_discounts( $submission );
+        $this->add_taxes( $submission );
+        $this->add_gateways( $submission );
+        $this->add_data( $submission );
 
-		$texts = array(
-			'.getpaid-checkout-total-payable' => $payable,
-		);
+    }
 
-		foreach ( $submission->get_items() as $item ) {
-			$item_id                                               = $item->get_id();
-			$initial_price                                         = $submission->format_amount( $item->get_sub_total() - $item->item_discount );
-			$recurring_price                                       = $submission->format_amount( $item->get_recurring_sub_total() - $item->recurring_item_discount );
-			$texts[ ".item-$item_id .getpaid-form-item-price-desc" ] = getpaid_item_recurring_price_help_text( $item, $submission->get_currency(), $initial_price, $recurring_price );
-			$texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = sprintf( __( 'Subtotal: %s', 'invoicing' ), $submission->format_amount( $item->get_sub_total() ) );
+    /**
+     * Adds totals to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_totals( $submission ) {
+
+        $this->response = array_merge(
+            $this->response,
+            array(
+
+                'totals'      => array(
+                    'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
+                    'discount'  => $submission->format_amount( $submission->get_discount() ),
+                    'fees'      => $submission->format_amount( $submission->get_fee() ),
+                    'tax'       => $submission->format_amount( $submission->get_tax() ),
+                    'total'     => $submission->format_amount( $submission->get_total() ),
+                    'raw_total' => html_entity_decode( sanitize_text_field( $submission->format_amount( $submission->get_total() ) ), ENT_QUOTES ),
+                ),
+
+                'recurring'   => array(
+                    'subtotal' => $submission->format_amount( $submission->get_recurring_subtotal() ),
+                    'discount' => $submission->format_amount( $submission->get_recurring_discount() ),
+                    'fees'     => $submission->format_amount( $submission->get_recurring_fee() ),
+                    'tax'      => $submission->format_amount( $submission->get_recurring_tax() ),
+                    'total'    => $submission->format_amount( $submission->get_recurring_total() ),
+                ),
+
+                'initial_amt' => wpinv_round_amount( $submission->get_total(), null, true ),
+                'currency'    => $submission->get_currency(),
+
+            )
+        );
+
+    }
 
-			if ( $item->get_quantity() == 1 ) {
-				$texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = '';
-			}
+    /**
+     * Adds texts to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_texts( $submission ) {
+
+        $payable = $submission->format_amount( $submission->get_total() );
+        $groups  = getpaid_get_subscription_groups( $submission );
+
+        if ( $submission->has_recurring && 2 > count( $groups ) ) {
+
+            $recurring = new WPInv_Item( $submission->has_recurring );
+            $period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
+            $main_item = reset( $groups );
+
+            if ( $submission->get_total() == $submission->get_recurring_total() ) {
+                $payable = "$payable / $period";
+            } elseif ( $main_item ) {
+
+                $main_item = reset( $main_item );
+
+                // Calculate the next renewal date.
+                $_period      = $main_item->get_recurring_period( true );
+                $_interval    = $main_item->get_recurring_interval();
+
+                // If the subscription item has a trial period...
+                if ( $main_item->has_free_trial() ) {
+                    $_period   = $main_item->get_trial_period( true );
+                    $_interval = $main_item->get_trial_interval();
+                }
+
+                $payable = sprintf(
+                    __( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
+                    $submission->format_amount( $submission->get_total() ),
+                    $submission->format_amount( $submission->get_recurring_total() ),
+                    $period
+                );
+
+                $payable .= sprintf(
+                    '<small class="text-muted form-text">%s</small>',
+                    sprintf(
+                        __( 'First renewal on %s', 'invoicing' ),
+                        getpaid_format_date( date( 'Y-m-d H:i:s', strtotime( "+$_interval $_period", current_time( 'timestamp' ) ) ) )
+                    )
+                );
+
+            } else {
+                $payable = sprintf(
+                    __( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
+                    $submission->format_amount( $submission->get_total() ),
+                    $submission->format_amount( $submission->get_recurring_total() ),
+                    $period
+                );
+            }
 }
 
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
+        $texts = array(
+            '.getpaid-checkout-total-payable' => $payable,
+        );
 
-	}
+        foreach ( $submission->get_items() as $item ) {
+            $item_id                                               = $item->get_id();
+            $initial_price                                         = $submission->format_amount( $item->get_sub_total() - $item->item_discount );
+            $recurring_price                                       = $submission->format_amount( $item->get_recurring_sub_total() - $item->recurring_item_discount );
+            $texts[ ".item-$item_id .getpaid-form-item-price-desc" ] = getpaid_item_recurring_price_help_text( $item, $submission->get_currency(), $initial_price, $recurring_price );
+            $texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = sprintf( __( 'Subtotal: %s', 'invoicing' ), $submission->format_amount( $item->get_sub_total() ) );
+
+            if ( $item->get_quantity() == 1 ) {
+                $texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = '';
+            }
+}
 
-	/**
-	 * Adds items to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_items( $submission ) {
+        $this->response = array_merge( $this->response, array( 'texts' => $texts ) );
 
-		// Add items.
-		$items          = array();
-		$selected_items = array();
+    }
+
+    /**
+     * Adds items to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_items( $submission ) {
+
+        // Add items.
+        $items          = array();
+        $selected_items = array();
 
         foreach ( $submission->get_items() as $item ) {
-			$item_id             = $item->get_id();
-			$items[ "$item_id" ] = $submission->format_amount( $item->get_sub_total() );
-
-			$selected_items[ "$item_id" ] = array(
-				'quantity'  => $item->get_quantity(),
-				'price'     => $item->get_price(),
-				'price_fmt' => $submission->format_amount( $item->get_price() ),
-			);
-		}
-
-		$this->response = array_merge(
-			$this->response,
-			array(
-				'items'          => $items,
-				'selected_items' => $selected_items,
-			)
-		);
-
-	}
-
-	/**
-	 * Adds fees to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_fees( $submission ) {
-
-		$fees = array();
+            $item_id             = $item->get_id();
+            $items[ "$item_id" ] = $submission->format_amount( $item->get_sub_total() );
+
+            $selected_items[ "$item_id" ] = array(
+                'quantity'  => $item->get_quantity(),
+                'price'     => $item->get_price(),
+                'price_fmt' => $submission->format_amount( $item->get_price() ),
+            );
+        }
+
+        $this->response = array_merge(
+            $this->response,
+            array(
+                'items'          => $items,
+                'selected_items' => $selected_items,
+            )
+        );
+
+    }
+
+    /**
+     * Adds fees to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_fees( $submission ) {
+
+        $fees = array();
 
         foreach ( $submission->get_fees() as $name => $data ) {
-			$fees[ $name ] = $submission->format_amount( $data['initial_fee'] );
-		}
+            $fees[ $name ] = $submission->format_amount( $data['initial_fee'] );
+        }
 
-		$this->response = array_merge(
-			$this->response,
-			array( 'fees' => $fees )
-		);
+        $this->response = array_merge(
+            $this->response,
+            array( 'fees' => $fees )
+        );
 
-	}
+    }
 
-	/**
-	 * Adds discounts to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_discounts( $submission ) {
+    /**
+     * Adds discounts to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_discounts( $submission ) {
 
-		$discounts = array();
+        $discounts = array();
 
         foreach ( $submission->get_discounts() as $name => $data ) {
-			$discounts[ $name ] = $submission->format_amount( $data['initial_discount'] );
-		}
+            $discounts[ $name ] = $submission->format_amount( $data['initial_discount'] );
+        }
 
-		$this->response = array_merge(
-			$this->response,
-			array( 'discounts' => $discounts )
-		);
+        $this->response = array_merge(
+            $this->response,
+            array( 'discounts' => $discounts )
+        );
 
-	}
+    }
 
-	/**
-	 * Adds taxes to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_taxes( $submission ) {
-
-		$taxes  = array();
-		$markup = '';
+    /**
+     * Adds taxes to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_taxes( $submission ) {
+
+        $taxes  = array();
+        $markup = '';
         foreach ( $submission->get_taxes() as $name => $data ) {
-			$name          = sanitize_text_field( $name );
-			$amount        = $submission->format_amount( $data['initial_tax'] );
-			$taxes[ $name ]  = $amount;
-			$markup       .= "<small class='form-text'>$name : $amount</small>";
-		}
-
-		if ( wpinv_display_individual_tax_rates() && ! empty( $taxes ) ) {
-			$this->response['texts']['.getpaid-form-cart-totals-total-tax'] = $markup;
-		}
-
-		$this->response = array_merge(
-			$this->response,
-			array( 'taxes' => $taxes )
-		);
-
-	}
-
-	/**
-	 * Adds gateways to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_gateways( $submission ) {
-
-		$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
-
-		if ( $this->response['has_recurring'] ) {
-
-			foreach ( $gateways as $i => $gateway ) {
-
-				if (
-					! getpaid_payment_gateway_supports( $gateway, 'subscription' )
-					|| ( $this->response['has_subscription_group'] && ! getpaid_payment_gateway_supports( $gateway, 'single_subscription_group' ) )
-					|| ( $this->response['has_multiple_subscription_groups'] && ! getpaid_payment_gateway_supports( $gateway, 'multiple_subscription_groups' ) ) ) {
-					unset( $gateways[ $i ] );
-				}
+            $name          = sanitize_text_field( $name );
+            $amount        = $submission->format_amount( $data['initial_tax'] );
+            $taxes[ $name ]  = $amount;
+            $markup       .= "<small class='form-text'>$name : $amount</small>";
+        }
+
+        if ( wpinv_display_individual_tax_rates() && ! empty( $taxes ) ) {
+            $this->response['texts']['.getpaid-form-cart-totals-total-tax'] = $markup;
+        }
+
+        $this->response = array_merge(
+            $this->response,
+            array( 'taxes' => $taxes )
+        );
+
+    }
+
+    /**
+     * Adds gateways to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_gateways( $submission ) {
+
+        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+
+        if ( $this->response['has_recurring'] ) {
+
+            foreach ( $gateways as $i => $gateway ) {
+
+                if (
+                    ! getpaid_payment_gateway_supports( $gateway, 'subscription' )
+                    || ( $this->response['has_subscription_group'] && ! getpaid_payment_gateway_supports( $gateway, 'single_subscription_group' ) )
+                    || ( $this->response['has_multiple_subscription_groups'] && ! getpaid_payment_gateway_supports( $gateway, 'multiple_subscription_groups' ) ) ) {
+                    unset( $gateways[ $i ] );
+                }
 }
 }
 
-		$gateways = apply_filters( 'getpaid_submission_gateways', $gateways, $submission );
-		$this->response = array_merge(
-			$this->response,
-			array( 'gateways' => $gateways )
-		);
-
-	}
-
-	/**
-	 * Adds data to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_data( $submission ) {
-
-		$this->response = array_merge(
-			$this->response,
-			array(
-				'js_data' => apply_filters(
-					'getpaid_submission_js_data',
-					array(
-						'is_recurring' => $this->response['has_recurring'],
-					),
-					$submission
-				),
-			)
-		);
-
-	}
+        $gateways = apply_filters( 'getpaid_submission_gateways', $gateways, $submission );
+        $this->response = array_merge(
+            $this->response,
+            array( 'gateways' => $gateways )
+        );
+
+    }
+
+    /**
+     * Adds data to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_data( $submission ) {
+
+        $this->response = array_merge(
+            $this->response,
+            array(
+                'js_data' => apply_filters(
+                    'getpaid_submission_js_data',
+                    array(
+                        'is_recurring' => $this->response['has_recurring'],
+                    ),
+                    $submission
+                ),
+            )
+        );
+
+    }
 
 }

Spacing +85 added lines, -85 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission refresh prices class
@@ -23,29 +23,29 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		$this->response = array(
 			'submission_id'                    => $submission->id,
             'has_recurring'                    => $submission->has_recurring,
 			'has_subscription_group'           => $submission->has_subscription_group(),
 			'has_multiple_subscription_groups' => $submission->has_multiple_subscription_groups(),
-            'is_free'                          => ! $submission->should_collect_payment_details(),
+            'is_free'                          => !$submission->should_collect_payment_details(),
 		);
 
 		$payment_form = $submission->get_payment_form();
-		if ( ! empty( $payment_form->invoice ) ) {
+		if (!empty($payment_form->invoice)) {
 			$this->response['invoice'] = $payment_form->invoice->get_id();
 		}
 
-		$this->add_totals( $submission );
-		$this->add_texts( $submission );
-		$this->add_items( $submission );
-		$this->add_fees( $submission );
-		$this->add_discounts( $submission );
-		$this->add_taxes( $submission );
-		$this->add_gateways( $submission );
-		$this->add_data( $submission );
+		$this->add_totals($submission);
+		$this->add_texts($submission);
+		$this->add_items($submission);
+		$this->add_fees($submission);
+		$this->add_discounts($submission);
+		$this->add_taxes($submission);
+		$this->add_gateways($submission);
+		$this->add_data($submission);
 
 	}
 
@@ -54,30 +54,30 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_totals( $submission ) {
+	public function add_totals($submission) {
 
 		$this->response = array_merge(
 			$this->response,
 			array(
 
 				'totals'      => array(
-					'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_tax() ),
-					'total'     => $submission->format_amount( $submission->get_total() ),
-					'raw_total' => html_entity_decode( sanitize_text_field( $submission->format_amount( $submission->get_total() ) ), ENT_QUOTES ),
+					'subtotal'  => $submission->format_amount($submission->get_subtotal()),
+					'discount'  => $submission->format_amount($submission->get_discount()),
+					'fees'      => $submission->format_amount($submission->get_fee()),
+					'tax'       => $submission->format_amount($submission->get_tax()),
+					'total'     => $submission->format_amount($submission->get_total()),
+					'raw_total' => html_entity_decode(sanitize_text_field($submission->format_amount($submission->get_total())), ENT_QUOTES),
 				),
 
 				'recurring'   => array(
-					'subtotal' => $submission->format_amount( $submission->get_recurring_subtotal() ),
-					'discount' => $submission->format_amount( $submission->get_recurring_discount() ),
-					'fees'     => $submission->format_amount( $submission->get_recurring_fee() ),
-					'tax'      => $submission->format_amount( $submission->get_recurring_tax() ),
-					'total'    => $submission->format_amount( $submission->get_recurring_total() ),
+					'subtotal' => $submission->format_amount($submission->get_recurring_subtotal()),
+					'discount' => $submission->format_amount($submission->get_recurring_discount()),
+					'fees'     => $submission->format_amount($submission->get_recurring_fee()),
+					'tax'      => $submission->format_amount($submission->get_recurring_tax()),
+					'total'    => $submission->format_amount($submission->get_recurring_total()),
 				),
 
-				'initial_amt' => wpinv_round_amount( $submission->get_total(), null, true ),
+				'initial_amt' => wpinv_round_amount($submission->get_total(), null, true),
 				'currency'    => $submission->get_currency(),
 
 			)
@@ -90,53 +90,53 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_texts( $submission ) {
+	public function add_texts($submission) {
 
-		$payable = $submission->format_amount( $submission->get_total() );
-		$groups  = getpaid_get_subscription_groups( $submission );
+		$payable = $submission->format_amount($submission->get_total());
+		$groups  = getpaid_get_subscription_groups($submission);
 
-		if ( $submission->has_recurring && 2 > count( $groups ) ) {
+		if ($submission->has_recurring && 2 > count($groups)) {
 
-			$recurring = new WPInv_Item( $submission->has_recurring );
-			$period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
-			$main_item = reset( $groups );
+			$recurring = new WPInv_Item($submission->has_recurring);
+			$period    = getpaid_get_subscription_period_label($recurring->get_recurring_period(true), $recurring->get_recurring_interval(), '');
+			$main_item = reset($groups);
 
-			if ( $submission->get_total() == $submission->get_recurring_total() ) {
+			if ($submission->get_total() == $submission->get_recurring_total()) {
 				$payable = "$payable / $period";
-			} elseif ( $main_item ) {
+			} elseif ($main_item) {
 
-				$main_item = reset( $main_item );
+				$main_item = reset($main_item);
 
 				// Calculate the next renewal date.
-				$_period      = $main_item->get_recurring_period( true );
+				$_period      = $main_item->get_recurring_period(true);
 				$_interval    = $main_item->get_recurring_interval();
 
 				// If the subscription item has a trial period...
-				if ( $main_item->has_free_trial() ) {
-					$_period   = $main_item->get_trial_period( true );
+				if ($main_item->has_free_trial()) {
+					$_period   = $main_item->get_trial_period(true);
 					$_interval = $main_item->get_trial_interval();
 				}
 
 				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
+					__('%1$s (renews at %2$s / %3$s)', 'invoicing'),
+					$submission->format_amount($submission->get_total()),
+					$submission->format_amount($submission->get_recurring_total()),
 					$period
 				);
 
 				$payable .= sprintf(
 					'<small class="text-muted form-text">%s</small>',
 					sprintf(
-						__( 'First renewal on %s', 'invoicing' ),
-						getpaid_format_date( date( 'Y-m-d H:i:s', strtotime( "+$_interval $_period", current_time( 'timestamp' ) ) ) )
+						__('First renewal on %s', 'invoicing'),
+						getpaid_format_date(date('Y-m-d H:i:s', strtotime("+$_interval $_period", current_time('timestamp'))))
 					)
 				);
 
 			} else {
 				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
+					__('%1$s (renews at %2$s / %3$s)', 'invoicing'),
+					$submission->format_amount($submission->get_total()),
+					$submission->format_amount($submission->get_recurring_total()),
 					$period
 				);
 			}
@@ -146,19 +146,19 @@ 
 			'.getpaid-checkout-total-payable' => $payable,
 		);
 
-		foreach ( $submission->get_items() as $item ) {
+		foreach ($submission->get_items() as $item) {
 			$item_id                                               = $item->get_id();
-			$initial_price                                         = $submission->format_amount( $item->get_sub_total() - $item->item_discount );
-			$recurring_price                                       = $submission->format_amount( $item->get_recurring_sub_total() - $item->recurring_item_discount );
-			$texts[ ".item-$item_id .getpaid-form-item-price-desc" ] = getpaid_item_recurring_price_help_text( $item, $submission->get_currency(), $initial_price, $recurring_price );
-			$texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = sprintf( __( 'Subtotal: %s', 'invoicing' ), $submission->format_amount( $item->get_sub_total() ) );
+			$initial_price                                         = $submission->format_amount($item->get_sub_total() - $item->item_discount);
+			$recurring_price                                       = $submission->format_amount($item->get_recurring_sub_total() - $item->recurring_item_discount);
+			$texts[".item-$item_id .getpaid-form-item-price-desc"] = getpaid_item_recurring_price_help_text($item, $submission->get_currency(), $initial_price, $recurring_price);
+			$texts[".item-$item_id .getpaid-mobile-item-subtotal"] = sprintf(__('Subtotal: %s', 'invoicing'), $submission->format_amount($item->get_sub_total()));
 
-			if ( $item->get_quantity() == 1 ) {
-				$texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = '';
+			if ($item->get_quantity() == 1) {
+				$texts[".item-$item_id .getpaid-mobile-item-subtotal"] = '';
 			}
 }
 
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
+		$this->response = array_merge($this->response, array('texts' => $texts));
 
 	}
 
@@ -167,20 +167,20 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_items( $submission ) {
+	public function add_items($submission) {
 
 		// Add items.
 		$items          = array();
 		$selected_items = array();
 
-        foreach ( $submission->get_items() as $item ) {
+        foreach ($submission->get_items() as $item) {
 			$item_id             = $item->get_id();
-			$items[ "$item_id" ] = $submission->format_amount( $item->get_sub_total() );
+			$items["$item_id"] = $submission->format_amount($item->get_sub_total());
 
-			$selected_items[ "$item_id" ] = array(
+			$selected_items["$item_id"] = array(
 				'quantity'  => $item->get_quantity(),
 				'price'     => $item->get_price(),
-				'price_fmt' => $submission->format_amount( $item->get_price() ),
+				'price_fmt' => $submission->format_amount($item->get_price()),
 			);
 		}
 
@@ -199,17 +199,17 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_fees( $submission ) {
+	public function add_fees($submission) {
 
 		$fees = array();
 
-        foreach ( $submission->get_fees() as $name => $data ) {
-			$fees[ $name ] = $submission->format_amount( $data['initial_fee'] );
+        foreach ($submission->get_fees() as $name => $data) {
+			$fees[$name] = $submission->format_amount($data['initial_fee']);
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'fees' => $fees )
+			array('fees' => $fees)
 		);
 
 	}
@@ -219,17 +219,17 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_discounts( $submission ) {
+	public function add_discounts($submission) {
 
 		$discounts = array();
 
-        foreach ( $submission->get_discounts() as $name => $data ) {
-			$discounts[ $name ] = $submission->format_amount( $data['initial_discount'] );
+        foreach ($submission->get_discounts() as $name => $data) {
+			$discounts[$name] = $submission->format_amount($data['initial_discount']);
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'discounts' => $discounts )
+			array('discounts' => $discounts)
 		);
 
 	}
@@ -239,24 +239,24 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_taxes( $submission ) {
+	public function add_taxes($submission) {
 
 		$taxes  = array();
 		$markup = '';
-        foreach ( $submission->get_taxes() as $name => $data ) {
-			$name          = sanitize_text_field( $name );
-			$amount        = $submission->format_amount( $data['initial_tax'] );
-			$taxes[ $name ]  = $amount;
+        foreach ($submission->get_taxes() as $name => $data) {
+			$name          = sanitize_text_field($name);
+			$amount        = $submission->format_amount($data['initial_tax']);
+			$taxes[$name] = $amount;
 			$markup       .= "<small class='form-text'>$name : $amount</small>";
 		}
 
-		if ( wpinv_display_individual_tax_rates() && ! empty( $taxes ) ) {
+		if (wpinv_display_individual_tax_rates() && !empty($taxes)) {
 			$this->response['texts']['.getpaid-form-cart-totals-total-tax'] = $markup;
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'taxes' => $taxes )
+			array('taxes' => $taxes)
 		);
 
 	}
@@ -266,27 +266,27 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_gateways( $submission ) {
+	public function add_gateways($submission) {
 
-		$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+		$gateways = array_keys(wpinv_get_enabled_payment_gateways());
 
-		if ( $this->response['has_recurring'] ) {
+		if ($this->response['has_recurring']) {
 
-			foreach ( $gateways as $i => $gateway ) {
+			foreach ($gateways as $i => $gateway) {
 
 				if (
-					! getpaid_payment_gateway_supports( $gateway, 'subscription' )
-					|| ( $this->response['has_subscription_group'] && ! getpaid_payment_gateway_supports( $gateway, 'single_subscription_group' ) )
-					|| ( $this->response['has_multiple_subscription_groups'] && ! getpaid_payment_gateway_supports( $gateway, 'multiple_subscription_groups' ) ) ) {
-					unset( $gateways[ $i ] );
+					!getpaid_payment_gateway_supports($gateway, 'subscription')
+					|| ($this->response['has_subscription_group'] && !getpaid_payment_gateway_supports($gateway, 'single_subscription_group'))
+					|| ($this->response['has_multiple_subscription_groups'] && !getpaid_payment_gateway_supports($gateway, 'multiple_subscription_groups')) ) {
+					unset($gateways[$i]);
 				}
 }
 }
 
-		$gateways = apply_filters( 'getpaid_submission_gateways', $gateways, $submission );
+		$gateways = apply_filters('getpaid_submission_gateways', $gateways, $submission);
 		$this->response = array_merge(
 			$this->response,
-			array( 'gateways' => $gateways )
+			array('gateways' => $gateways)
 		);
 
 	}
@@ -296,7 +296,7 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_data( $submission ) {
+	public function add_data($submission) {
 
 		$this->response = array_merge(
 			$this->response,

includes/payments/class-getpaid-form-item.php

Indentation +359 added lines, -359 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -10,67 +10,67 @@ 
 class GetPaid_Form_Item  extends WPInv_Item {
 
     /**
-	 * Stores a custom description for the item.
-	 *
-	 * @var string
-	 */
-	protected $custom_description = null;
-
-	/**
-	 * Stores the item quantity.
-	 *
-	 * @var float
-	 */
-	protected $quantity = 1;
-
-	/**
-	 * Stores the item meta.
-	 *
-	 * @var array
-	 */
-	protected $meta = array();
-
-	/**
-	 * Is this item required?
-	 *
-	 * @var int
-	 */
-	protected $is_required = true;
-
-	/**
-	 * Are quantities allowed?
-	 *
-	 * @var int
-	 */
-	protected $allow_quantities = false;
-
-	/**
-	 * Associated invoice.
-	 *
-	 * @var int
-	 */
-	public $invoice_id = 0;
-
-	/**
-	 * Item discount.
-	 *
-	 * @var float
-	 */
-	public $item_discount = 0;
-
-	/**
-	 * Recurring item discount.
-	 *
-	 * @var float
-	 */
-	public $recurring_item_discount = 0;
-
-	/**
-	 * Item tax.
-	 *
-	 * @var float
-	 */
-	public $item_tax = 0;
+     * Stores a custom description for the item.
+     *
+     * @var string
+     */
+    protected $custom_description = null;
+
+    /**
+     * Stores the item quantity.
+     *
+     * @var float
+     */
+    protected $quantity = 1;
+
+    /**
+     * Stores the item meta.
+     *
+     * @var array
+     */
+    protected $meta = array();
+
+    /**
+     * Is this item required?
+     *
+     * @var int
+     */
+    protected $is_required = true;
+
+    /**
+     * Are quantities allowed?
+     *
+     * @var int
+     */
+    protected $allow_quantities = false;
+
+    /**
+     * Associated invoice.
+     *
+     * @var int
+     */
+    public $invoice_id = 0;
+
+    /**
+     * Item discount.
+     *
+     * @var float
+     */
+    public $item_discount = 0;
+
+    /**
+     * Recurring item discount.
+     *
+     * @var float
+     */
+    public $recurring_item_discount = 0;
+
+    /**
+     * Item tax.
+     *
+     * @var float
+     */
+    public $item_tax = 0;
 
     /*
 	|--------------------------------------------------------------------------
@@ -88,230 +88,230 @@ 
     */
 
     /**
-	 * Get the item name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_name( $context = 'view' ) {
-		$name = parent::get_name( $context );
-		return $name . wpinv_get_item_suffix( $this );
-	}
-
-	/**
-	 * Get the item name without a suffix.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_raw_name( $context = 'view' ) {
-		return parent::get_name( $context );
-	}
-
-	/**
-	 * Get the item description.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_description( $context = 'view' ) {
-
-		if ( isset( $this->custom_description ) ) {
-			return $this->custom_description;
-		}
-
-		return parent::get_description( $context );
-	}
-
-	/**
-	 * Returns the sub total.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_sub_total( $context = 'view' ) {
-		return $this->get_quantity( $context ) * $this->get_initial_price( $context );
-	}
-
-	/**
-	 * Returns the recurring sub total.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_recurring_sub_total( $context = 'view' ) {
-
-		if ( $this->is_recurring() ) {
-			return $this->get_quantity( $context ) * $this->get_price( $context );
-		}
-
-		return 0;
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function get_qantity( $context = 'view' ) {
-		return $this->get_quantity( $context );
-	}
-
-	/**
-	 * Get the item quantity.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_quantity( $context = 'view' ) {
-		$quantity = (float) $this->quantity;
-
-		if ( 'view' === $context ) {
-			return apply_filters( 'getpaid_payment_form_item_quantity', $quantity, $this );
-		}
-
-		return $quantity;
-
-	}
-
-	/**
-	 * Get the item meta data.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return meta
-	 */
-	public function get_item_meta( $context = 'view' ) {
-		$meta = $this->meta;
-
-		if ( 'view' === $context ) {
-			return apply_filters( 'getpaid_payment_form_item_meta', $meta, $this );
-		}
-
-		return $meta;
-
-	}
-
-	/**
-	 * Returns whether or not customers can update the item quantity.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_allow_quantities( $context = 'view' ) {
-		$allow_quantities = (bool) $this->allow_quantities;
-
-		if ( 'view' === $context ) {
-			return apply_filters( 'getpaid_payment_form_item_allow_quantities', $allow_quantities, $this );
-		}
-
-		return $allow_quantities;
-
-	}
-
-	/**
-	 * Returns whether or not the item is required.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_is_required( $context = 'view' ) {
-		$is_required = (bool) $this->is_required;
-
-		if ( 'view' === $context ) {
-			return apply_filters( 'getpaid_payment_form_item_is_required', $is_required, $this );
-		}
-
-		return $is_required;
-
-	}
-
-	/**
-	 * Prepares form data for use.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function prepare_data_for_use( $required = null ) {
-
-		$required = is_null( $required ) ? $this->is_required() : $required;
-		return array(
-			'title'            => wp_strip_all_tags( $this->get_name() ),
-			'id'               => $this->get_id(),
-			'price'            => $this->get_price(),
-			'recurring'        => $this->is_recurring(),
-			'description'      => $this->get_description(),
-			'allow_quantities' => $this->allows_quantities(),
-			'required'         => $required,
-		);
-
-	}
-
-	/**
-	 * Prepares form data for ajax use.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function prepare_data_for_invoice_edit_ajax( $currency = '', $is_renewal = false ) {
-
-		$description = getpaid_item_recurring_price_help_text( $this, $currency );
-
-		if ( $description ) {
-			$description = "<div class='getpaid-subscription-help-text'>$description</div>";
-		}
-
-		$price    = ! $is_renewal ? $this->get_price() : $this->get_recurring_price();
-		$subtotal = ! $is_renewal ? $this->get_sub_total() : $this->get_recurring_sub_total();
-		return array(
-			'id'     => $this->get_id(),
-			'texts'  => array(
-				'item-name'        => sanitize_text_field( $this->get_name() ),
-				'item-description' => wp_kses_post( $this->get_description() ) . $description,
-				'item-quantity'    => floatval( $this->get_quantity() ),
-				'item-price'       => wpinv_price( $price, $currency ),
-				'item-total'       => wpinv_price( $subtotal, $currency ),
-			),
-			'inputs' => array(
-				'item-id'          => $this->get_id(),
-				'item-name'        => sanitize_text_field( $this->get_name() ),
-				'item-description' => wp_kses_post( $this->get_description() ),
-				'item-quantity'    => floatval( $this->get_quantity() ),
-				'item-price'       => $price,
-			),
-		);
-
-	}
-
-	/**
-	 * Prepares form data for saving (cart_details).
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function prepare_data_for_saving() {
-
-		return array(
-			'post_id'          => $this->invoice_id,
-			'item_id'          => $this->get_id(),
-			'item_name'        => sanitize_text_field( $this->get_raw_name( 'edit' ) ),
-			'item_description' => $this->get_description( 'edit' ),
-			'tax'              => $this->item_tax,
-			'item_price'       => $this->get_price( 'edit' ),
-			'quantity'         => (float) $this->get_quantity( 'edit' ),
-			'discount'         => $this->item_discount,
-			'subtotal'         => $this->get_sub_total( 'edit' ),
-			'price'            => $this->get_sub_total( 'edit' ) + $this->item_tax - $this->item_discount,
-			'meta'             => $this->get_item_meta( 'edit' ),
-		);
-
-	}
+     * Get the item name.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_name( $context = 'view' ) {
+        $name = parent::get_name( $context );
+        return $name . wpinv_get_item_suffix( $this );
+    }
+
+    /**
+     * Get the item name without a suffix.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_raw_name( $context = 'view' ) {
+        return parent::get_name( $context );
+    }
+
+    /**
+     * Get the item description.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_description( $context = 'view' ) {
+
+        if ( isset( $this->custom_description ) ) {
+            return $this->custom_description;
+        }
+
+        return parent::get_description( $context );
+    }
+
+    /**
+     * Returns the sub total.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_sub_total( $context = 'view' ) {
+        return $this->get_quantity( $context ) * $this->get_initial_price( $context );
+    }
+
+    /**
+     * Returns the recurring sub total.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_recurring_sub_total( $context = 'view' ) {
+
+        if ( $this->is_recurring() ) {
+            return $this->get_quantity( $context ) * $this->get_price( $context );
+        }
+
+        return 0;
+    }
+
+    /**
+     * @deprecated
+     */
+    public function get_qantity( $context = 'view' ) {
+        return $this->get_quantity( $context );
+    }
+
+    /**
+     * Get the item quantity.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_quantity( $context = 'view' ) {
+        $quantity = (float) $this->quantity;
+
+        if ( 'view' === $context ) {
+            return apply_filters( 'getpaid_payment_form_item_quantity', $quantity, $this );
+        }
+
+        return $quantity;
+
+    }
+
+    /**
+     * Get the item meta data.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return meta
+     */
+    public function get_item_meta( $context = 'view' ) {
+        $meta = $this->meta;
+
+        if ( 'view' === $context ) {
+            return apply_filters( 'getpaid_payment_form_item_meta', $meta, $this );
+        }
+
+        return $meta;
+
+    }
+
+    /**
+     * Returns whether or not customers can update the item quantity.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_allow_quantities( $context = 'view' ) {
+        $allow_quantities = (bool) $this->allow_quantities;
+
+        if ( 'view' === $context ) {
+            return apply_filters( 'getpaid_payment_form_item_allow_quantities', $allow_quantities, $this );
+        }
+
+        return $allow_quantities;
+
+    }
+
+    /**
+     * Returns whether or not the item is required.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_is_required( $context = 'view' ) {
+        $is_required = (bool) $this->is_required;
+
+        if ( 'view' === $context ) {
+            return apply_filters( 'getpaid_payment_form_item_is_required', $is_required, $this );
+        }
+
+        return $is_required;
+
+    }
+
+    /**
+     * Prepares form data for use.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function prepare_data_for_use( $required = null ) {
+
+        $required = is_null( $required ) ? $this->is_required() : $required;
+        return array(
+            'title'            => wp_strip_all_tags( $this->get_name() ),
+            'id'               => $this->get_id(),
+            'price'            => $this->get_price(),
+            'recurring'        => $this->is_recurring(),
+            'description'      => $this->get_description(),
+            'allow_quantities' => $this->allows_quantities(),
+            'required'         => $required,
+        );
+
+    }
+
+    /**
+     * Prepares form data for ajax use.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function prepare_data_for_invoice_edit_ajax( $currency = '', $is_renewal = false ) {
+
+        $description = getpaid_item_recurring_price_help_text( $this, $currency );
+
+        if ( $description ) {
+            $description = "<div class='getpaid-subscription-help-text'>$description</div>";
+        }
+
+        $price    = ! $is_renewal ? $this->get_price() : $this->get_recurring_price();
+        $subtotal = ! $is_renewal ? $this->get_sub_total() : $this->get_recurring_sub_total();
+        return array(
+            'id'     => $this->get_id(),
+            'texts'  => array(
+                'item-name'        => sanitize_text_field( $this->get_name() ),
+                'item-description' => wp_kses_post( $this->get_description() ) . $description,
+                'item-quantity'    => floatval( $this->get_quantity() ),
+                'item-price'       => wpinv_price( $price, $currency ),
+                'item-total'       => wpinv_price( $subtotal, $currency ),
+            ),
+            'inputs' => array(
+                'item-id'          => $this->get_id(),
+                'item-name'        => sanitize_text_field( $this->get_name() ),
+                'item-description' => wp_kses_post( $this->get_description() ),
+                'item-quantity'    => floatval( $this->get_quantity() ),
+                'item-price'       => $price,
+            ),
+        );
+
+    }
+
+    /**
+     * Prepares form data for saving (cart_details).
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function prepare_data_for_saving() {
+
+        return array(
+            'post_id'          => $this->invoice_id,
+            'item_id'          => $this->get_id(),
+            'item_name'        => sanitize_text_field( $this->get_raw_name( 'edit' ) ),
+            'item_description' => $this->get_description( 'edit' ),
+            'tax'              => $this->item_tax,
+            'item_price'       => $this->get_price( 'edit' ),
+            'quantity'         => (float) $this->get_quantity( 'edit' ),
+            'discount'         => $this->item_discount,
+            'subtotal'         => $this->get_sub_total( 'edit' ),
+            'price'            => $this->get_sub_total( 'edit' ) + $this->item_tax - $this->item_discount,
+            'meta'             => $this->get_item_meta( 'edit' ),
+        );
+
+    }
 
     /*
 	|--------------------------------------------------------------------------
@@ -323,70 +323,70 @@ 
 	| object.
     */
 
-	/**
-	 * Set the item qantity.
-	 *
-	 * @since 1.0.19
-	 * @param  float $quantity The item quantity.
-	 */
-	public function set_quantity( $quantity ) {
-
-		if ( ! is_numeric( $quantity ) ) {
-			$quantity = 1;
-		}
-
-		$this->quantity = (float) $quantity;
-
-	}
-
-	/**
-	 * Set the item meta data.
-	 *
-	 * @since 1.0.19
-	 * @param  array $meta The item meta data.
-	 */
-	public function set_item_meta( $meta ) {
-		$this->meta = maybe_unserialize( $meta );
-	}
-
-	/**
-	 * Set whether or not the quantities are allowed.
-	 *
-	 * @since 1.0.19
-	 * @param  bool $allow_quantities
-	 */
-	public function set_allow_quantities( $allow_quantities ) {
-		$this->allow_quantities = (bool) $allow_quantities;
-	}
-
-	/**
-	 * Set whether or not the item is required.
-	 *
-	 * @since 1.0.19
-	 * @param  bool $is_required
-	 */
-	public function set_is_required( $is_required ) {
-		$this->is_required = (bool) $is_required;
-	}
-
-	/**
-	 * Sets the custom item description.
-	 *
-	 * @since 1.0.19
-	 * @param  string $description
-	 */
-	public function set_custom_description( $description ) {
-		$this->custom_description = $description;
-	}
+    /**
+     * Set the item qantity.
+     *
+     * @since 1.0.19
+     * @param  float $quantity The item quantity.
+     */
+    public function set_quantity( $quantity ) {
+
+        if ( ! is_numeric( $quantity ) ) {
+            $quantity = 1;
+        }
+
+        $this->quantity = (float) $quantity;
+
+    }
+
+    /**
+     * Set the item meta data.
+     *
+     * @since 1.0.19
+     * @param  array $meta The item meta data.
+     */
+    public function set_item_meta( $meta ) {
+        $this->meta = maybe_unserialize( $meta );
+    }
+
+    /**
+     * Set whether or not the quantities are allowed.
+     *
+     * @since 1.0.19
+     * @param  bool $allow_quantities
+     */
+    public function set_allow_quantities( $allow_quantities ) {
+        $this->allow_quantities = (bool) $allow_quantities;
+    }
+
+    /**
+     * Set whether or not the item is required.
+     *
+     * @since 1.0.19
+     * @param  bool $is_required
+     */
+    public function set_is_required( $is_required ) {
+        $this->is_required = (bool) $is_required;
+    }
+
+    /**
+     * Sets the custom item description.
+     *
+     * @since 1.0.19
+     * @param  string $description
+     */
+    public function set_custom_description( $description ) {
+        $this->custom_description = $description;
+    }
 
     /**
      * We do not want to save items to the database.
      *
-	 * @return int item id
+     * @return int item id
      */
     public function save( $data = array() ) {
         return $this->get_id();
-	}
+    }
 
     /*
 	|--------------------------------------------------------------------------
@@ -398,23 +398,23 @@ 
 	*/
 
     /**
-	 * Checks whether the item has enabled dynamic pricing.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_required() {
+     * Checks whether the item has enabled dynamic pricing.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_required() {
         return (bool) $this->get_is_required();
-	}
-
-	/**
-	 * Checks whether users can edit the quantities.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function allows_quantities() {
+    }
+
+    /**
+     * Checks whether users can edit the quantities.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function allows_quantities() {
         return (bool) $this->get_allow_quantities();
-	}
+    }
 
 }

Spacing +59 added lines, -59 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -94,9 +94,9 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_name( $context = 'view' ) {
-		$name = parent::get_name( $context );
-		return $name . wpinv_get_item_suffix( $this );
+	public function get_name($context = 'view') {
+		$name = parent::get_name($context);
+		return $name . wpinv_get_item_suffix($this);
 	}
 
 	/**
@@ -106,8 +106,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_raw_name( $context = 'view' ) {
-		return parent::get_name( $context );
+	public function get_raw_name($context = 'view') {
+		return parent::get_name($context);
 	}
 
 	/**
@@ -117,13 +117,13 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_description( $context = 'view' ) {
+	public function get_description($context = 'view') {
 
-		if ( isset( $this->custom_description ) ) {
+		if (isset($this->custom_description)) {
 			return $this->custom_description;
 		}
 
-		return parent::get_description( $context );
+		return parent::get_description($context);
 	}
 
 	/**
@@ -133,8 +133,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_sub_total( $context = 'view' ) {
-		return $this->get_quantity( $context ) * $this->get_initial_price( $context );
+	public function get_sub_total($context = 'view') {
+		return $this->get_quantity($context) * $this->get_initial_price($context);
 	}
 
 	/**
@@ -144,10 +144,10 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_recurring_sub_total( $context = 'view' ) {
+	public function get_recurring_sub_total($context = 'view') {
 
-		if ( $this->is_recurring() ) {
-			return $this->get_quantity( $context ) * $this->get_price( $context );
+		if ($this->is_recurring()) {
+			return $this->get_quantity($context) * $this->get_price($context);
 		}
 
 		return 0;
@@ -156,8 +156,8 @@ 
 	/**
 	 * @deprecated
 	 */
-	public function get_qantity( $context = 'view' ) {
-		return $this->get_quantity( $context );
+	public function get_qantity($context = 'view') {
+		return $this->get_quantity($context);
 	}
 
 	/**
@@ -167,11 +167,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_quantity( $context = 'view' ) {
+	public function get_quantity($context = 'view') {
 		$quantity = (float) $this->quantity;
 
-		if ( 'view' === $context ) {
-			return apply_filters( 'getpaid_payment_form_item_quantity', $quantity, $this );
+		if ('view' === $context) {
+			return apply_filters('getpaid_payment_form_item_quantity', $quantity, $this);
 		}
 
 		return $quantity;
@@ -185,11 +185,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return meta
 	 */
-	public function get_item_meta( $context = 'view' ) {
+	public function get_item_meta($context = 'view') {
 		$meta = $this->meta;
 
-		if ( 'view' === $context ) {
-			return apply_filters( 'getpaid_payment_form_item_meta', $meta, $this );
+		if ('view' === $context) {
+			return apply_filters('getpaid_payment_form_item_meta', $meta, $this);
 		}
 
 		return $meta;
@@ -203,11 +203,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return bool
 	 */
-	public function get_allow_quantities( $context = 'view' ) {
+	public function get_allow_quantities($context = 'view') {
 		$allow_quantities = (bool) $this->allow_quantities;
 
-		if ( 'view' === $context ) {
-			return apply_filters( 'getpaid_payment_form_item_allow_quantities', $allow_quantities, $this );
+		if ('view' === $context) {
+			return apply_filters('getpaid_payment_form_item_allow_quantities', $allow_quantities, $this);
 		}
 
 		return $allow_quantities;
@@ -221,11 +221,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return bool
 	 */
-	public function get_is_required( $context = 'view' ) {
+	public function get_is_required($context = 'view') {
 		$is_required = (bool) $this->is_required;
 
-		if ( 'view' === $context ) {
-			return apply_filters( 'getpaid_payment_form_item_is_required', $is_required, $this );
+		if ('view' === $context) {
+			return apply_filters('getpaid_payment_form_item_is_required', $is_required, $this);
 		}
 
 		return $is_required;
@@ -238,11 +238,11 @@ 
 	 * @since 1.0.19
 	 * @return array
 	 */
-	public function prepare_data_for_use( $required = null ) {
+	public function prepare_data_for_use($required = null) {
 
-		$required = is_null( $required ) ? $this->is_required() : $required;
+		$required = is_null($required) ? $this->is_required() : $required;
 		return array(
-			'title'            => wp_strip_all_tags( $this->get_name() ),
+			'title'            => wp_strip_all_tags($this->get_name()),
 			'id'               => $this->get_id(),
 			'price'            => $this->get_price(),
 			'recurring'        => $this->is_recurring(),
@@ -259,30 +259,30 @@ 
 	 * @since 1.0.19
 	 * @return array
 	 */
-	public function prepare_data_for_invoice_edit_ajax( $currency = '', $is_renewal = false ) {
+	public function prepare_data_for_invoice_edit_ajax($currency = '', $is_renewal = false) {
 
-		$description = getpaid_item_recurring_price_help_text( $this, $currency );
+		$description = getpaid_item_recurring_price_help_text($this, $currency);
 
-		if ( $description ) {
+		if ($description) {
 			$description = "<div class='getpaid-subscription-help-text'>$description</div>";
 		}
 
-		$price    = ! $is_renewal ? $this->get_price() : $this->get_recurring_price();
-		$subtotal = ! $is_renewal ? $this->get_sub_total() : $this->get_recurring_sub_total();
+		$price    = !$is_renewal ? $this->get_price() : $this->get_recurring_price();
+		$subtotal = !$is_renewal ? $this->get_sub_total() : $this->get_recurring_sub_total();
 		return array(
 			'id'     => $this->get_id(),
 			'texts'  => array(
-				'item-name'        => sanitize_text_field( $this->get_name() ),
-				'item-description' => wp_kses_post( $this->get_description() ) . $description,
-				'item-quantity'    => floatval( $this->get_quantity() ),
-				'item-price'       => wpinv_price( $price, $currency ),
-				'item-total'       => wpinv_price( $subtotal, $currency ),
+				'item-name'        => sanitize_text_field($this->get_name()),
+				'item-description' => wp_kses_post($this->get_description()) . $description,
+				'item-quantity'    => floatval($this->get_quantity()),
+				'item-price'       => wpinv_price($price, $currency),
+				'item-total'       => wpinv_price($subtotal, $currency),
 			),
 			'inputs' => array(
 				'item-id'          => $this->get_id(),
-				'item-name'        => sanitize_text_field( $this->get_name() ),
-				'item-description' => wp_kses_post( $this->get_description() ),
-				'item-quantity'    => floatval( $this->get_quantity() ),
+				'item-name'        => sanitize_text_field($this->get_name()),
+				'item-description' => wp_kses_post($this->get_description()),
+				'item-quantity'    => floatval($this->get_quantity()),
 				'item-price'       => $price,
 			),
 		);
@@ -300,15 +300,15 @@ 
 		return array(
 			'post_id'          => $this->invoice_id,
 			'item_id'          => $this->get_id(),
-			'item_name'        => sanitize_text_field( $this->get_raw_name( 'edit' ) ),
-			'item_description' => $this->get_description( 'edit' ),
+			'item_name'        => sanitize_text_field($this->get_raw_name('edit')),
+			'item_description' => $this->get_description('edit'),
 			'tax'              => $this->item_tax,
-			'item_price'       => $this->get_price( 'edit' ),
-			'quantity'         => (float) $this->get_quantity( 'edit' ),
+			'item_price'       => $this->get_price('edit'),
+			'quantity'         => (float) $this->get_quantity('edit'),
 			'discount'         => $this->item_discount,
-			'subtotal'         => $this->get_sub_total( 'edit' ),
-			'price'            => $this->get_sub_total( 'edit' ) + $this->item_tax - $this->item_discount,
-			'meta'             => $this->get_item_meta( 'edit' ),
+			'subtotal'         => $this->get_sub_total('edit'),
+			'price'            => $this->get_sub_total('edit') + $this->item_tax - $this->item_discount,
+			'meta'             => $this->get_item_meta('edit'),
 		);
 
 	}
@@ -329,9 +329,9 @@ 
 	 * @since 1.0.19
 	 * @param  float $quantity The item quantity.
 	 */
-	public function set_quantity( $quantity ) {
+	public function set_quantity($quantity) {
 
-		if ( ! is_numeric( $quantity ) ) {
+		if (!is_numeric($quantity)) {
 			$quantity = 1;
 		}
 
@@ -345,8 +345,8 @@ 
 	 * @since 1.0.19
 	 * @param  array $meta The item meta data.
 	 */
-	public function set_item_meta( $meta ) {
-		$this->meta = maybe_unserialize( $meta );
+	public function set_item_meta($meta) {
+		$this->meta = maybe_unserialize($meta);
 	}
 
 	/**
@@ -355,7 +355,7 @@ 
 	 * @since 1.0.19
 	 * @param  bool $allow_quantities
 	 */
-	public function set_allow_quantities( $allow_quantities ) {
+	public function set_allow_quantities($allow_quantities) {
 		$this->allow_quantities = (bool) $allow_quantities;
 	}
 
@@ -365,7 +365,7 @@ 
 	 * @since 1.0.19
 	 * @param  bool $is_required
 	 */
-	public function set_is_required( $is_required ) {
+	public function set_is_required($is_required) {
 		$this->is_required = (bool) $is_required;
 	}
 
@@ -375,7 +375,7 @@ 
 	 * @since 1.0.19
 	 * @param  string $description
 	 */
-	public function set_custom_description( $description ) {
+	public function set_custom_description($description) {
 		$this->custom_description = $description;
 	}
 
@@ -384,7 +384,7 @@ 
      *
 	 * @return int item id
      */
-    public function save( $data = array() ) {
+    public function save($data = array()) {
         return $this->get_id();
 	}
 

includes/admin/register-settings.php

Indentation +320 added lines, -320 removed lines

@@ -25,8 +25,8 @@ 
                     $defaults[ $key ] = $setting['std'];
                 }
             }
-		}
-	}
+        }
+    }
 
     return $defaults;
 
@@ -144,7 +144,7 @@ 
  *
  */
 function wpinv_register_settings() {
-	do_action( 'getpaid_before_register_settings' );
+    do_action( 'getpaid_before_register_settings' );
 
     // Loop through all tabs.
     foreach ( wpinv_get_registered_settings() as $tab => $sections ) {
@@ -159,7 +159,7 @@ 
                 $settings = $sections;
             }
 
-			do_action( "getpaid_register_{$tab}_{$section}" );
+            do_action( "getpaid_register_{$tab}_{$section}" );
 
             // Register the setting section.
             add_settings_section(
@@ -180,7 +180,7 @@ 
     // Creates our settings in the options table.
     register_setting( 'wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize' );
 
-	do_action( 'getpaid_after_register_settings' );
+    do_action( 'getpaid_after_register_settings' );
 }
 add_action( 'admin_init', 'wpinv_register_settings' );
 
@@ -197,13 +197,13 @@ 
     $name       = isset( $option['name'] ) ? $option['name'] : '';
     $cb         = "wpinv_{$option['type']}_callback";
     $section    = "wpinv_settings_{$tab}_$section";
-	$is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
+    $is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
 
-	if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
-		$tip   = wpinv_clean( $option['desc'] );
-		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
-	}
+    if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
+        $tip   = wpinv_clean( $option['desc'] );
+        $name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
+        unset( $option['desc'] );
+    }
 
     // Loop through all tabs.
     add_settings_field(
@@ -230,9 +230,9 @@ 
             'faux'            => isset( $option['faux'] ) ? $option['faux'] : false,
             'onchange'        => isset( $option['onchange'] ) ? $option['onchange'] : '',
             'custom'          => isset( $option['custom'] ) ? $option['custom'] : '',
-			'default_content' => isset( $option['default_content'] ) ? $option['default_content'] : '',
-			'class'           => isset( $option['class'] ) ? $option['class'] : '',
-			'style'           => isset( $option['style'] ) ? $option['style'] : '',
+            'default_content' => isset( $option['default_content'] ) ? $option['default_content'] : '',
+            'class'           => isset( $option['class'] ) ? $option['class'] : '',
+            'style'           => isset( $option['style'] ) ? $option['style'] : '',
             'cols'            => isset( $option['cols'] ) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
             'rows'            => isset( $option['rows'] ) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
         )
@@ -246,7 +246,7 @@ 
  * @return array
  */
 function wpinv_get_registered_settings() {
-	return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
+    return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
 }
 
 /**
@@ -265,18 +265,18 @@ 
  */
 function wpinv_settings_sanitize( $input = array() ) {
 
-	$wpinv_options = wpinv_get_options();
-	$raw_referrer  = wp_get_raw_referer();
+    $wpinv_options = wpinv_get_options();
+    $raw_referrer  = wp_get_raw_referer();
 
     if ( empty( $raw_referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+        return array_merge( $wpinv_options, $input );
     }
 
     wp_parse_str( $raw_referrer, $referrer );
 
-	if ( in_array( 'gp-setup', $referrer ) ) {
-		return array_merge( $wpinv_options, $input );
-	}
+    if ( in_array( 'gp-setup', $referrer ) ) {
+        return array_merge( $wpinv_options, $input );
+    }
 
     $settings = wpinv_get_registered_settings();
     $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
@@ -298,10 +298,10 @@ 
         }
 
         // General filter
-		$input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+        $input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
 
-		// Key specific filter.
-		$input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
+        // Key specific filter.
+        $input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
@@ -344,14 +344,14 @@ 
 
     foreach ( $new_rates as $rate ) {
 
-		$rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
-		$rate['name']    = sanitize_text_field( $rate['name'] );
-		$rate['state']   = sanitize_text_field( $rate['state'] );
-		$rate['country'] = sanitize_text_field( $rate['country'] );
-		$rate['global']  = empty( $rate['state'] );
-		$tax_rates[]     = $rate;
+        $rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
+        $rate['name']    = sanitize_text_field( $rate['name'] );
+        $rate['state']   = sanitize_text_field( $rate['state'] );
+        $rate['country'] = sanitize_text_field( $rate['country'] );
+        $rate['global']  = empty( $rate['state'] );
+        $tax_rates[]     = $rate;
 
-	}
+    }
 
     update_option( 'wpinv_tax_rates', $tax_rates );
 
@@ -364,21 +364,21 @@ 
         return $input;
     }
 
-	if ( empty( $_POST['wpinv_tax_rules_nonce'] ) || ! wp_verify_nonce( $_POST['wpinv_tax_rules_nonce'], 'wpinv_tax_rules' ) ) {
-		return $input;
-	}
+    if ( empty( $_POST['wpinv_tax_rules_nonce'] ) || ! wp_verify_nonce( $_POST['wpinv_tax_rules_nonce'], 'wpinv_tax_rules' ) ) {
+        return $input;
+    }
 
     $new_rules = ! empty( $_POST['tax_rules'] ) ? wp_kses_post_deep( array_values( $_POST['tax_rules'] ) ) : array();
     $tax_rules = array();
 
     foreach ( $new_rules as $rule ) {
 
-		$rule['key']      = sanitize_title_with_dashes( $rule['key'] );
-		$rule['label']    = sanitize_text_field( $rule['label'] );
-		$rule['tax_base'] = sanitize_text_field( $rule['tax_base'] );
-		$tax_rules[]      = $rule;
+        $rule['key']      = sanitize_title_with_dashes( $rule['key'] );
+        $rule['label']    = sanitize_text_field( $rule['label'] );
+        $rule['tax_base'] = sanitize_text_field( $rule['tax_base'] );
+        $tax_rules[]      = $rule;
 
-	}
+    }
 
     update_option( 'wpinv_tax_rules', $tax_rules );
 
@@ -391,11 +391,11 @@ 
     $tabs['general']  = __( 'General', 'invoicing' );
     $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
     $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-	$tabs['emails']   = __( 'Emails', 'invoicing' );
+    $tabs['emails']   = __( 'Emails', 'invoicing' );
 
-	if ( count( getpaid_get_integration_settings() ) > 0 ) {
-		$tabs['integrations'] = __( 'Integrations', 'invoicing' );
-	}
+    if ( count( getpaid_get_integration_settings() ) > 0 ) {
+        $tabs['integrations'] = __( 'Integrations', 'invoicing' );
+    }
 
     $tabs['privacy']  = __( 'Privacy', 'invoicing' );
     $tabs['misc']     = __( 'Misc', 'invoicing' );
@@ -426,53 +426,53 @@ 
         'general'      => apply_filters(
             'wpinv_settings_sections_general',
             array(
-				'main'             => __( 'General Settings', 'invoicing' ),
-				'page_section'     => __( 'Page Settings', 'invoicing' ),
-				'currency_section' => __( 'Currency Settings', 'invoicing' ),
-				'labels'           => __( 'Label Texts', 'invoicing' ),
+                'main'             => __( 'General Settings', 'invoicing' ),
+                'page_section'     => __( 'Page Settings', 'invoicing' ),
+                'currency_section' => __( 'Currency Settings', 'invoicing' ),
+                'labels'           => __( 'Label Texts', 'invoicing' ),
             )
         ),
         'gateways'     => apply_filters(
             'wpinv_settings_sections_gateways',
             array(
-				'main' => __( 'Gateway Settings', 'invoicing' ),
+                'main' => __( 'Gateway Settings', 'invoicing' ),
             )
         ),
         'taxes'        => apply_filters(
             'wpinv_settings_sections_taxes',
             array(
-				'main'  => __( 'Tax Settings', 'invoicing' ),
-				'rules' => __( 'Tax Rules', 'invoicing' ),
-				'rates' => __( 'Tax Rates', 'invoicing' ),
-				'vat'   => __( 'EU VAT Settings', 'invoicing' ),
+                'main'  => __( 'Tax Settings', 'invoicing' ),
+                'rules' => __( 'Tax Rules', 'invoicing' ),
+                'rates' => __( 'Tax Rates', 'invoicing' ),
+                'vat'   => __( 'EU VAT Settings', 'invoicing' ),
             )
         ),
         'emails'       => apply_filters(
             'wpinv_settings_sections_emails',
             array(
-				'main' => __( 'Email Settings', 'invoicing' ),
+                'main' => __( 'Email Settings', 'invoicing' ),
             )
         ),
 
-		'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
+        'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
 
         'privacy'      => apply_filters(
             'wpinv_settings_sections_privacy',
             array(
-				'main' => __( 'Privacy policy', 'invoicing' ),
+                'main' => __( 'Privacy policy', 'invoicing' ),
             )
         ),
         'misc'         => apply_filters(
             'wpinv_settings_sections_misc',
             array(
-				'main'       => __( 'Miscellaneous', 'invoicing' ),
-				'custom-css' => __( 'Custom CSS', 'invoicing' ),
+                'main'       => __( 'Miscellaneous', 'invoicing' ),
+                'custom-css' => __( 'Custom CSS', 'invoicing' ),
             )
         ),
         'tools'        => apply_filters(
             'wpinv_settings_sections_tools',
             array(
-				'main' => __( 'Diagnostic Tools', 'invoicing' ),
+                'main' => __( 'Diagnostic Tools', 'invoicing' ),
             )
         ),
     );
@@ -483,46 +483,46 @@ 
 }
 
 function wpinv_get_pages( $with_slug = false, $default_label = null ) {
-	$pages_options = array();
+    $pages_options = array();
 
-	if ( $default_label !== null && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
-	}
+    if ( $default_label !== null && $default_label !== false ) {
+        $pages_options = array( '' => $default_label ); // Blank option
+    }
 
-	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
-			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
+    $pages = get_pages();
+    if ( $pages ) {
+        foreach ( $pages as $page ) {
+            $title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
             $pages_options[ $page->ID ] = $title;
-		}
-	}
+        }
+    }
 
-	return $pages_options;
+    return $pages_options;
 }
 
 function wpinv_header_callback( $args ) {
-	if ( ! empty( $args['desc'] ) ) {
+    if ( ! empty( $args['desc'] ) ) {
         echo wp_kses_post( $args['desc'] );
     }
 }
 
 function wpinv_hidden_callback( $args ) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	if ( isset( $args['set_value'] ) ) {
-		$value = $args['set_value'];
-	}
+    if ( isset( $args['set_value'] ) ) {
+        $value = $args['set_value'];
+    }
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$name  = '';
-	} else {
-		$name = 'wpinv_settings[' . esc_attr( $args['id'] ) . ']';
-	}
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $name  = '';
+    } else {
+        $name = 'wpinv_settings[' . esc_attr( $args['id'] ) . ']';
+    }
 
-	echo '<input type="hidden" id="wpinv_settings[' . esc_attr( $args['id'] ) . ']" name="' . esc_attr( $name ) . '" value="' . esc_attr( stripslashes( $value ) ) . '" />';
+    echo '<input type="hidden" id="wpinv_settings[' . esc_attr( $args['id'] ) . ']" name="' . esc_attr( $name ) . '" value="' . esc_attr( stripslashes( $value ) ) . '" />';
 
 }
 
@@ -531,12 +531,12 @@ 
  */
 function wpinv_checkbox_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	$id  = esc_attr( $args['id'] );
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    $id  = esc_attr( $args['id'] );
 
-	getpaid_hidden_field( "wpinv_settings[$id]", '0' );
-	?>
+    getpaid_hidden_field( "wpinv_settings[$id]", '0' );
+    ?>
 		<label>
 			<input id="wpinv-settings-<?php echo esc_attr( $id ); ?>" name="wpinv_settings[<?php echo esc_attr( $id ); ?>]" <?php checked( empty( $std ), false ); ?> value="1" type="checkbox" />
 			<?php echo wp_kses_post( $args['desc'] ); ?>
@@ -546,75 +546,75 @@ 
 
 function wpinv_multicheck_callback( $args ) {
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+    if ( ! empty( $args['options'] ) ) {
 
-		$std     = isset( $args['std'] ) ? $args['std'] : array();
-		$value   = wpinv_get_option( $args['id'], $std );
+        $std     = isset( $args['std'] ) ? $args['std'] : array();
+        $value   = wpinv_get_option( $args['id'], $std );
 
-		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . esc_attr( $sanitize_id . $class ) . '">';
+        echo '<div class="wpi-mcheck-rows wpi-mcheck-' . esc_attr( $sanitize_id . $class ) . '">';
         foreach ( $args['options'] as $key => $option ) :
-			$sanitize_key = esc_attr( wpinv_sanitize_key( $key ) );
-			if ( in_array( $sanitize_key, $value ) ) {
-				$enabled = $sanitize_key;
-			} else {
-				$enabled = null;
-			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']">' . wp_kses_post( $option ) . '</label></div>';
-		endforeach;
-		echo '</div>';
-		echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            $sanitize_key = esc_attr( wpinv_sanitize_key( $key ) );
+            if ( in_array( $sanitize_key, $value ) ) {
+                $enabled = $sanitize_key;
+            } else {
+                $enabled = null;
+            }
+            echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
+            echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']">' . wp_kses_post( $option ) . '</label></div>';
+        endforeach;
+        echo '</div>';
+        echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 function wpinv_payment_icons_callback( $args ) {
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$value   = wpinv_get_option( $args['id'], false );
+    $value   = wpinv_get_option( $args['id'], false );
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach ( $args['options'] as $key => $option ) {
+    if ( ! empty( $args['options'] ) ) {
+        foreach ( $args['options'] as $key => $option ) {
             $sanitize_key = wpinv_sanitize_key( $key );
 
-			if ( empty( $value ) ) {
-				$enabled = $option;
-			} else {
-				$enabled = null;
-			}
-
-			echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
-
-				echo '<input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
-
-				if ( wpinv_string_is_image_url( $key ) ) {
-				echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				} else {
-				$card = strtolower( str_replace( ' ', '', $option ) );
-
-				if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-					$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
-					} else {
-					$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
-					$content_dir = WP_CONTENT_DIR;
-
-					if ( function_exists( 'wp_normalize_path' ) ) {
-						// Replaces backslashes with forward slashes for Windows systems
-						$image = wp_normalize_path( $image );
-						$content_dir = wp_normalize_path( $content_dir );
-						}
-
-					$image = str_replace( $content_dir, content_url(), $image );
-					}
-
-				echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				}
-			echo wp_kses_post( $option ) . '</label>';
-		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            if ( empty( $value ) ) {
+                $enabled = $option;
+            } else {
+                $enabled = null;
+            }
+
+            echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
+
+                echo '<input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+
+                if ( wpinv_string_is_image_url( $key ) ) {
+                echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                } else {
+                $card = strtolower( str_replace( ' ', '', $option ) );
+
+                if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
+                    $image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+                    } else {
+                    $image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+                    $content_dir = WP_CONTENT_DIR;
+
+                    if ( function_exists( 'wp_normalize_path' ) ) {
+                        // Replaces backslashes with forward slashes for Windows systems
+                        $image = wp_normalize_path( $image );
+                        $content_dir = wp_normalize_path( $content_dir );
+                        }
+
+                    $image = str_replace( $content_dir, content_url(), $image );
+                    }
+
+                echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                }
+            echo wp_kses_post( $option ) . '</label>';
+        }
+        echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 /**
@@ -622,9 +622,9 @@ 
  */
 function wpinv_radio_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	?>
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    ?>
 		<fieldset>
 			<ul id="wpinv-settings-<?php echo esc_attr( $args['id'] ); ?>" style="margin-top: 0;">
 				<?php foreach ( $args['options'] as $key => $option ) : ?>
@@ -638,7 +638,7 @@ 
 			</ul>
 		</fieldset>
 	<?php
-	getpaid_settings_description_callback( $args );
+    getpaid_settings_description_callback( $args );
 }
 
 /**
@@ -646,10 +646,10 @@ 
  */
 function getpaid_settings_description_callback( $args ) {
 
-	if ( ! empty( $args['desc'] ) ) {
-		$description = $args['desc'];
-		echo wp_kses_post( "<p class='description'>$description</p>" );
-	}
+    if ( ! empty( $args['desc'] ) ) {
+        $description = $args['desc'];
+        echo wp_kses_post( "<p class='description'>$description</p>" );
+    }
 
 }
 
@@ -658,7 +658,7 @@ 
  */
 function wpinv_gateways_callback() {
 
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -672,26 +672,26 @@ 
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     $class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	echo '<select name="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" class="' . esc_attr( $class ) . '" >';
+    echo '<select name="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" class="' . esc_attr( $class ) . '" >';
 
-	foreach ( $args['options'] as $key => $option ) :
+    foreach ( $args['options'] as $key => $option ) :
 
-		echo '<option value="' . esc_attr( $key ) . '" ';
+        echo '<option value="' . esc_attr( $key ) . '" ';
 
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
+        if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
             selected( $key, $args['selected'] );
         } else {
             selected( $key, $value );
         }
 
-		echo '>' . esc_html( $option['admin_label'] ) . '</option>';
-	endforeach;
+        echo '>' . esc_html( $option['admin_label'] ) . '</option>';
+    endforeach;
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 }
 
 /**
@@ -702,38 +702,38 @@ 
  */
 function wpinv_settings_attrs_helper( $args ) {
 
-	$value = isset( $args['std'] ) ? $args['std'] : '';
-	$id    = esc_attr( $args['id'] );
-	$value = is_scalar( $value ) ? $value : '';
-
-	$attrs = array(
-		'name'     => ! empty( $args['faux'] ) ? false : "wpinv_settings[$id]",
-		'readonly' => ! empty( $args['faux'] ),
-		'value'    => ! empty( $args['faux'] ) ? $value : wpinv_get_option( $args['id'], $value ),
-		'id'       => 'wpinv-settings-' . $args['id'],
-		'style'    => $args['style'],
-		'class'    => $args['class'],
-		'placeholder' => $args['placeholder'],
-		'data-placeholder' => $args['placeholder'],
-	);
+    $value = isset( $args['std'] ) ? $args['std'] : '';
+    $id    = esc_attr( $args['id'] );
+    $value = is_scalar( $value ) ? $value : '';
+
+    $attrs = array(
+        'name'     => ! empty( $args['faux'] ) ? false : "wpinv_settings[$id]",
+        'readonly' => ! empty( $args['faux'] ),
+        'value'    => ! empty( $args['faux'] ) ? $value : wpinv_get_option( $args['id'], $value ),
+        'id'       => 'wpinv-settings-' . $args['id'],
+        'style'    => $args['style'],
+        'class'    => $args['class'],
+        'placeholder' => $args['placeholder'],
+        'data-placeholder' => $args['placeholder'],
+    );
 
-	if ( ! empty( $args['onchange'] ) ) {
-		$attrs['onchange'] = $args['onchange'];
-	}
+    if ( ! empty( $args['onchange'] ) ) {
+        $attrs['onchange'] = $args['onchange'];
+    }
 
-	foreach ( $attrs as $key => $value ) {
+    foreach ( $attrs as $key => $value ) {
 
-		if ( false === $value ) {
-			continue;
-		}
+        if ( false === $value ) {
+            continue;
+        }
 
-		if ( true === $value ) {
-			echo ' ' . esc_attr( $key );
-		} else {
-			echo ' ' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
-		}
+        if ( true === $value ) {
+            echo ' ' . esc_attr( $key );
+        } else {
+            echo ' ' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
+        }
 
-	}
+    }
 
 }
 
@@ -742,7 +742,7 @@ 
  */
 function wpinv_text_callback( $args ) {
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="text" <?php wpinv_settings_attrs_helper( $args ); ?>>
 			<?php getpaid_settings_description_callback( $args ); ?>
@@ -756,7 +756,7 @@ 
  */
 function wpinv_number_callback( $args ) {
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="number" step="<?php echo esc_attr( $args['step'] ); ?>" max="<?php echo intval( $args['max'] ); ?>" min="<?php echo intval( $args['min'] ); ?>" <?php wpinv_settings_attrs_helper( $args ); ?>>
 			<?php getpaid_settings_description_callback( $args ); ?>
@@ -768,34 +768,34 @@ 
 function wpinv_textarea_callback( $args ) {
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
     $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
     $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
 
-	echo '<textarea class="' . esc_attr( $class ) . ' txtarea-' . esc_attr( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . esc_attr( $args['cols'] ) . '" rows="' . esc_attr( $args['rows'] ) . '" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	echo '<br /><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '<textarea class="' . esc_attr( $class ) . ' txtarea-' . esc_attr( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . esc_attr( $args['cols'] ) . '" rows="' . esc_attr( $args['rows'] ) . '" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    echo '<br /><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_password_callback( $args ) {
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	echo '<input type="password" class="' . esc_attr( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    echo '<input type="password" class="' . esc_attr( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_missing_callback( $args ) {
-	printf(
-		esc_html__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
-		'<strong>' . esc_html( $args['id'] ) . '</strong>'
-	);
+    printf(
+        esc_html__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+        '<strong>' . esc_html( $args['id'] ) . '</strong>'
+    );
 }
 
 /**
@@ -803,13 +803,13 @@ 
  */
 function wpinv_select_callback( $args ) {
 
-	$desc   = wp_kses_post( $args['desc'] );
-	$desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$value  = isset( $args['std'] ) ? $args['std'] : '';
-	$value  = wpinv_get_option( $args['id'], $value );
-	$rand   = uniqid( 'random_id' );
+    $desc   = wp_kses_post( $args['desc'] );
+    $desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $value  = isset( $args['std'] ) ? $args['std'] : '';
+    $value  = wpinv_get_option( $args['id'], $value );
+    $rand   = uniqid( 'random_id' );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<select <?php wpinv_settings_attrs_helper( $args ); ?> data-allow-clear="true">
 				<?php foreach ( $args['options'] as $option => $name ) : ?>
@@ -842,50 +842,50 @@ 
 function wpinv_color_select_callback( $args ) {
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+    echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $color['label'] ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $color ) {
+        echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $color['label'] ) . '</option>';
+    }
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_rich_editor_callback( $args ) {
-	global $wp_version;
+    global $wp_version;
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
-		$value = $std;
-	}
+    if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
+        $value = $std;
+    }
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+    $rows = isset( $args['size'] ) ? $args['size'] : 20;
 
-	echo '<div class="getpaid-settings-editor-input">';
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
-		wp_editor(
+    echo '<div class="getpaid-settings-editor-input">';
+    if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+        wp_editor(
             stripslashes( $value ),
             'wpinv_settings_' . esc_attr( $args['id'] ),
             array(
-				'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']',
-				'textarea_rows' => absint( $rows ),
-				'media_buttons' => false,
+                'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']',
+                'textarea_rows' => absint( $rows ),
+                'media_buttons' => false,
             )
         );
-	} else {
-		echo '<textarea class="large-text" rows="10" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	}
+    } else {
+        echo '<textarea class="large-text" rows="10" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    }
 
-	echo '</div><br/><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</div><br/><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
@@ -893,51 +893,51 @@ 
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	echo '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	echo '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . esc_attr__( 'Upload File', 'invoicing' ) . '"/></span>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    echo '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    echo '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . esc_attr__( 'Upload File', 'invoicing' ) . '"/></span>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_color_callback( $args ) {
 
-	$std         = isset( $args['std'] ) ? $args['std'] : '';
-	$value       = wpinv_get_option( $args['id'], $std );
+    $std         = isset( $args['std'] ) ? $args['std'] : '';
+    $value       = wpinv_get_option( $args['id'], $std );
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	echo '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_country_states_callback( $args ) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
 
-	$states = wpinv_get_country_states();
+    $states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? 'wpinv-no-states' : 'wpi_select2';
-	echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="' . esc_attr( $class ) . '" data-placeholder="' . esc_html( $placeholder ) . '"/>';
+    $class = empty( $states ) ? 'wpinv-no-states' : 'wpi_select2';
+    echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="' . esc_attr( $class ) . '" data-placeholder="' . esc_html( $placeholder ) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $states as $option => $name ) {
+        echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $name ) . '</option>';
+    }
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
@@ -946,7 +946,7 @@ 
  */
 function wpinv_tax_rates_callback() {
 
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -962,9 +962,9 @@ 
  */
 function wpinv_tax_rate_callback( $tax_rate, $key ) {
 
-	$key                      = sanitize_key( $key );
-	$tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
-	include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
+    $key                      = sanitize_key( $key );
+    $tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
+    include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
 
 }
 
@@ -973,7 +973,7 @@ 
  */
 function wpinv_tax_rules_callback() {
 
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -1011,14 +1011,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1030,14 +1030,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'refresh_permalinks' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'refresh_permalinks' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1049,14 +1049,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1068,14 +1068,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1088,14 +1088,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1108,8 +1108,8 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
-					?>
+                        echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Launch', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1123,19 +1123,19 @@ 
 
 
 function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+    echo wp_kses_post( $args['desc'] );
 }
 
 function wpinv_raw_html_callback( $args ) {
-	echo wp_kses( $args['desc'], getpaid_allowed_html() );
+    echo wp_kses( $args['desc'], getpaid_allowed_html() );
 }
 
 function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+    do_action( 'wpinv_' . $args['id'], $args );
 }
 
 function wpinv_set_settings_cap() {
-	return wpinv_get_capability();
+    return wpinv_get_capability();
 }
 add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
 
@@ -1159,15 +1159,15 @@ 
  */
 function wpinv_get_merge_tags_help_text( $subscription = false ) {
 
-	$url  = $subscription ? 'https://gist.github.com/picocodes/3d213982d57c34edf7a46fd3f0e8583e' : 'https://gist.github.com/picocodes/43bdc4d4bbba844534b2722e2af0b58f';
-	$link = sprintf(
-		'<strong><a href="%s" target="_blank">%s</a></strong>',
-		$url,
-		esc_html__( 'View available merge tags.', 'invoicing' )
-	);
+    $url  = $subscription ? 'https://gist.github.com/picocodes/3d213982d57c34edf7a46fd3f0e8583e' : 'https://gist.github.com/picocodes/43bdc4d4bbba844534b2722e2af0b58f';
+    $link = sprintf(
+        '<strong><a href="%s" target="_blank">%s</a></strong>',
+        $url,
+        esc_html__( 'View available merge tags.', 'invoicing' )
+    );
 
-	$description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
+    $description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
 
-	return "$description $link";
+    return "$description $link";
 
 }

Spacing +386 added lines, -386 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Retrieves all default settings.
@@ -16,13 +16,13 @@ 
 function wpinv_get_settings() {
     $defaults = array();
 
-    foreach ( array_values( wpinv_get_registered_settings() ) as $tab_settings ) {
+    foreach (array_values(wpinv_get_registered_settings()) as $tab_settings) {
 
-        foreach ( array_values( $tab_settings ) as $section_settings ) {
+        foreach (array_values($tab_settings) as $section_settings) {
 
-            foreach ( $section_settings as $key => $setting ) {
-                if ( isset( $setting['std'] ) ) {
-                    $defaults[ $key ] = $setting['std'];
+            foreach ($section_settings as $key => $setting) {
+                if (isset($setting['std'])) {
+                    $defaults[$key] = $setting['std'];
                 }
             }
 		}
@@ -41,12 +41,12 @@ 
     global $wpinv_options;
 
     // Try fetching the saved options.
-    if ( empty( $wpinv_options ) ) {
-        $wpinv_options = get_option( 'wpinv_settings' );
+    if (empty($wpinv_options)) {
+        $wpinv_options = get_option('wpinv_settings');
     }
 
     // If that fails, don't fetch the default settings to prevent a loop.
-    if ( ! is_array( $wpinv_options ) ) {
+    if (!is_array($wpinv_options)) {
         $wpinv_options = array();
     }
 
@@ -60,13 +60,13 @@ 
  * @param mixed $default The default value to use if the setting has not been set.
  * @return mixed
  */
-function wpinv_get_option( $key = '', $default = false ) {
+function wpinv_get_option($key = '', $default = false) {
 
     $options = wpinv_get_options();
-    $value   = isset( $options[ $key ] ) ? $options[ $key ] : $default;
-    $value   = apply_filters( 'wpinv_get_option', $value, $key, $default );
+    $value   = isset($options[$key]) ? $options[$key] : $default;
+    $value   = apply_filters('wpinv_get_option', $value, $key, $default);
 
-    return apply_filters( 'wpinv_get_option_' . $key, $value, $key, $default );
+    return apply_filters('wpinv_get_option_' . $key, $value, $key, $default);
 }
 
 /**
@@ -75,11 +75,11 @@ 
  * @param array $options the new options.
  * @return bool
  */
-function wpinv_update_options( $options ) {
+function wpinv_update_options($options) {
     global $wpinv_options;
 
     // update the option.
-    if ( is_array( $options ) && update_option( 'wpinv_settings', $options ) ) {
+    if (is_array($options) && update_option('wpinv_settings', $options)) {
         $wpinv_options = $options;
         return true;
     }
@@ -94,24 +94,24 @@ 
  * @param mixed $value The setting value.
  * @return bool
  */
-function wpinv_update_option( $key = '', $value = false ) {
+function wpinv_update_option($key = '', $value = false) {
 
     // If no key, exit.
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     // Maybe delete the option instead.
-    if ( is_null( $value ) ) {
-        return wpinv_delete_option( $key );
+    if (is_null($value)) {
+        return wpinv_delete_option($key);
     }
 
     // Prepare the new options.
     $options         = wpinv_get_options();
-    $options[ $key ] = apply_filters( 'wpinv_update_option', $value, $key );
+    $options[$key] = apply_filters('wpinv_update_option', $value, $key);
 
     // Save the new options.
-    return wpinv_update_options( $options );
+    return wpinv_update_options($options);
 
 }
 
@@ -121,18 +121,18 @@ 
  * @param string $key the setting key.
  * @return bool
  */
-function wpinv_delete_option( $key = '' ) {
+function wpinv_delete_option($key = '') {
 
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     $options = wpinv_get_options();
 
-    if ( isset( $options[ $key ] ) ) {
-        unset( $options[ $key ] );
-        return wpinv_update_options( $options );
+    if (isset($options[$key])) {
+        unset($options[$key]);
+        return wpinv_update_options($options);
     }
 
     return true;
@@ -144,22 +144,22 @@ 
  *
  */
 function wpinv_register_settings() {
-	do_action( 'getpaid_before_register_settings' );
+	do_action('getpaid_before_register_settings');
 
     // Loop through all tabs.
-    foreach ( wpinv_get_registered_settings() as $tab => $sections ) {
+    foreach (wpinv_get_registered_settings() as $tab => $sections) {
 
         // In each tab, loop through sections.
-        foreach ( $sections as $section => $settings ) {
+        foreach ($sections as $section => $settings) {
 
             // Check for backwards compatibility
-            $section_tabs = wpinv_get_settings_tab_sections( $tab );
-            if ( ! is_array( $section_tabs ) || ! array_key_exists( $section, $section_tabs ) ) {
+            $section_tabs = wpinv_get_settings_tab_sections($tab);
+            if (!is_array($section_tabs) || !array_key_exists($section, $section_tabs)) {
                 $section = 'main';
                 $settings = $sections;
             }
 
-			do_action( "getpaid_register_{$tab}_{$section}" );
+			do_action("getpaid_register_{$tab}_{$section}");
 
             // Register the setting section.
             add_settings_section(
@@ -169,20 +169,20 @@ 
                 'wpinv_settings_' . $tab . '_' . $section
             );
 
-            foreach ( $settings as $option ) {
-                if ( ! empty( $option['id'] ) ) {
-                    wpinv_register_settings_option( $tab, $section, $option );
+            foreach ($settings as $option) {
+                if (!empty($option['id'])) {
+                    wpinv_register_settings_option($tab, $section, $option);
                 }
             }
 }
     }
 
     // Creates our settings in the options table.
-    register_setting( 'wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize' );
+    register_setting('wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize');
 
-	do_action( 'getpaid_after_register_settings' );
+	do_action('getpaid_after_register_settings');
 }
-add_action( 'admin_init', 'wpinv_register_settings' );
+add_action('admin_init', 'wpinv_register_settings');
 
 /**
  * Register a single settings option.
@@ -192,49 +192,49 @@ 
  * @param string $option
  *
  */
-function wpinv_register_settings_option( $tab, $section, $option ) {
+function wpinv_register_settings_option($tab, $section, $option) {
 
-    $name       = isset( $option['name'] ) ? $option['name'] : '';
+    $name       = isset($option['name']) ? $option['name'] : '';
     $cb         = "wpinv_{$option['type']}_callback";
     $section    = "wpinv_settings_{$tab}_$section";
-	$is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
+	$is_wizzard = is_admin() && isset($_GET['page']) && 'gp-setup' == $_GET['page'];
 
-	if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
-		$tip   = wpinv_clean( $option['desc'] );
+	if (isset($option['desc']) && (!$is_wizzard && !empty($option['help-tip']))) {
+		$tip   = wpinv_clean($option['desc']);
 		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
+		unset($option['desc']);
 	}
 
     // Loop through all tabs.
     add_settings_field(
         'wpinv_settings[' . $option['id'] . ']',
         $name,
-        function_exists( $cb ) ? $cb : 'wpinv_missing_callback',
+        function_exists($cb) ? $cb : 'wpinv_missing_callback',
         $section,
         $section,
         array(
             'section'         => $section,
-            'id'              => isset( $option['id'] ) ? $option['id'] : uniqid( 'wpinv-' ),
-            'desc'            => isset( $option['desc'] ) ? $option['desc'] : '',
+            'id'              => isset($option['id']) ? $option['id'] : uniqid('wpinv-'),
+            'desc'            => isset($option['desc']) ? $option['desc'] : '',
             'name'            => $name,
-            'size'            => isset( $option['size'] ) ? $option['size'] : null,
-            'options'         => isset( $option['options'] ) ? $option['options'] : '',
-            'selected'        => isset( $option['selected'] ) ? $option['selected'] : null,
-            'std'             => isset( $option['std'] ) ? $option['std'] : '',
-            'min'             => isset( $option['min'] ) ? $option['min'] : 0,
-            'max'             => isset( $option['max'] ) ? $option['max'] : 999999,
-            'step'            => isset( $option['step'] ) ? $option['step'] : 1,
-            'placeholder'     => isset( $option['placeholder'] ) ? $option['placeholder'] : null,
-            'allow_blank'     => isset( $option['allow_blank'] ) ? $option['allow_blank'] : true,
-            'readonly'        => isset( $option['readonly'] ) ? $option['readonly'] : false,
-            'faux'            => isset( $option['faux'] ) ? $option['faux'] : false,
-            'onchange'        => isset( $option['onchange'] ) ? $option['onchange'] : '',
-            'custom'          => isset( $option['custom'] ) ? $option['custom'] : '',
-			'default_content' => isset( $option['default_content'] ) ? $option['default_content'] : '',
-			'class'           => isset( $option['class'] ) ? $option['class'] : '',
-			'style'           => isset( $option['style'] ) ? $option['style'] : '',
-            'cols'            => isset( $option['cols'] ) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
-            'rows'            => isset( $option['rows'] ) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
+            'size'            => isset($option['size']) ? $option['size'] : null,
+            'options'         => isset($option['options']) ? $option['options'] : '',
+            'selected'        => isset($option['selected']) ? $option['selected'] : null,
+            'std'             => isset($option['std']) ? $option['std'] : '',
+            'min'             => isset($option['min']) ? $option['min'] : 0,
+            'max'             => isset($option['max']) ? $option['max'] : 999999,
+            'step'            => isset($option['step']) ? $option['step'] : 1,
+            'placeholder'     => isset($option['placeholder']) ? $option['placeholder'] : null,
+            'allow_blank'     => isset($option['allow_blank']) ? $option['allow_blank'] : true,
+            'readonly'        => isset($option['readonly']) ? $option['readonly'] : false,
+            'faux'            => isset($option['faux']) ? $option['faux'] : false,
+            'onchange'        => isset($option['onchange']) ? $option['onchange'] : '',
+            'custom'          => isset($option['custom']) ? $option['custom'] : '',
+			'default_content' => isset($option['default_content']) ? $option['default_content'] : '',
+			'class'           => isset($option['class']) ? $option['class'] : '',
+			'style'           => isset($option['style']) ? $option['style'] : '',
+            'cols'            => isset($option['cols']) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
+            'rows'            => isset($option['rows']) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
         )
     );
 
@@ -246,7 +246,7 @@ 
  * @return array
  */
 function wpinv_get_registered_settings() {
-	return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
+	return array_filter(apply_filters('wpinv_registered_settings', wpinv_get_data('admin-settings')));
 }
 
 /**
@@ -255,7 +255,7 @@ 
  * @return array
  */
 function getpaid_get_integration_settings() {
-    return apply_filters( 'getpaid_integration_settings', array() );
+    return apply_filters('getpaid_integration_settings', array());
 }
 
 /**
@@ -263,153 +263,153 @@ 
  *
  * @return array
  */
-function wpinv_settings_sanitize( $input = array() ) {
+function wpinv_settings_sanitize($input = array()) {
 
 	$wpinv_options = wpinv_get_options();
 	$raw_referrer  = wp_get_raw_referer();
 
-    if ( empty( $raw_referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+    if (empty($raw_referrer)) {
+		return array_merge($wpinv_options, $input);
     }
 
-    wp_parse_str( $raw_referrer, $referrer );
+    wp_parse_str($raw_referrer, $referrer);
 
-	if ( in_array( 'gp-setup', $referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+	if (in_array('gp-setup', $referrer)) {
+		return array_merge($wpinv_options, $input);
 	}
 
     $settings = wpinv_get_registered_settings();
-    $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
-    $section  = isset( $referrer['section'] ) ? $referrer['section'] : 'main';
+    $tab      = isset($referrer['tab']) ? $referrer['tab'] : 'general';
+    $section  = isset($referrer['section']) ? $referrer['section'] : 'main';
 
     $input = $input ? $input : array();
-    $input = apply_filters( 'wpinv_settings_tab_' . $tab . '_sanitize', $input );
-    $input = apply_filters( 'wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input );
+    $input = apply_filters('wpinv_settings_tab_' . $tab . '_sanitize', $input);
+    $input = apply_filters('wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input);
 
     // Loop through each setting being saved and pass it through a sanitization filter
-    foreach ( $input as $key => $value ) {
+    foreach ($input as $key => $value) {
 
         // Get the setting type (checkbox, select, etc)
-        $type = isset( $settings[ $tab ][ $section ][ $key ]['type'] ) ? $settings[ $tab ][ $section ][ $key ]['type'] : false;
+        $type = isset($settings[$tab][$section][$key]['type']) ? $settings[$tab][$section][$key]['type'] : false;
 
-        if ( $type ) {
+        if ($type) {
             // Field type specific filter
-            $input[ $key ] = apply_filters( "wpinv_settings_sanitize_$type", $value, $key );
+            $input[$key] = apply_filters("wpinv_settings_sanitize_$type", $value, $key);
         }
 
         // General filter
-		$input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+		$input[$key] = apply_filters('wpinv_settings_sanitize', $input[$key], $key);
 
 		// Key specific filter.
-		$input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
+		$input[$key] = apply_filters("wpinv_settings_sanitize_$key", $input[$key]);
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
-    $main_settings    = isset( $settings[ $tab ] ) ? $settings[ $tab ] : array(); // Check for extensions that aren't using new sections
-    $section_settings = ! empty( $settings[ $tab ][ $section ] ) ? $settings[ $tab ][ $section ] : array();
+    $main_settings    = isset($settings[$tab]) ? $settings[$tab] : array(); // Check for extensions that aren't using new sections
+    $section_settings = !empty($settings[$tab][$section]) ? $settings[$tab][$section] : array();
 
-    $found_settings   = array_merge( $main_settings, $section_settings );
+    $found_settings   = array_merge($main_settings, $section_settings);
 
-    if ( ! empty( $found_settings ) ) {
-        foreach ( $found_settings as $key => $value ) {
+    if (!empty($found_settings)) {
+        foreach ($found_settings as $key => $value) {
 
             // settings used to have numeric keys, now they have keys that match the option ID. This ensures both methods work
-            if ( is_numeric( $key ) ) {
+            if (is_numeric($key)) {
                 $key = $value['id'];
             }
 
-            if ( ! isset( $input[ $key ] ) && isset( $wpinv_options[ $key ] ) ) {
-                unset( $wpinv_options[ $key ] );
+            if (!isset($input[$key]) && isset($wpinv_options[$key])) {
+                unset($wpinv_options[$key]);
             }
         }
     }
 
     // Merge our new settings with the existing
-    $output = array_merge( $wpinv_options, $input );
+    $output = array_merge($wpinv_options, $input);
 
-    add_settings_error( 'wpinv-notices', '', __( 'Settings updated.', 'invoicing' ), 'updated' );
+    add_settings_error('wpinv-notices', '', __('Settings updated.', 'invoicing'), 'updated');
 
     return $output;
 }
-add_filter( 'wpinv_settings_sanitize_text', 'trim', 10, 1 );
-add_filter( 'wpinv_settings_sanitize_tax_rate', 'wpinv_sanitize_amount' );
+add_filter('wpinv_settings_sanitize_text', 'trim', 10, 1);
+add_filter('wpinv_settings_sanitize_tax_rate', 'wpinv_sanitize_amount');
 
-function wpinv_settings_sanitize_tax_rates( $input ) {
-    if ( ! wpinv_current_user_can_manage_invoicing() ) {
+function wpinv_settings_sanitize_tax_rates($input) {
+    if (!wpinv_current_user_can_manage_invoicing()) {
         return $input;
     }
 
-    $new_rates = ! empty( $_POST['tax_rates'] ) ? wp_kses_post_deep( array_values( $_POST['tax_rates'] ) ) : array();
+    $new_rates = !empty($_POST['tax_rates']) ? wp_kses_post_deep(array_values($_POST['tax_rates'])) : array();
     $tax_rates = array();
 
-    foreach ( $new_rates as $rate ) {
+    foreach ($new_rates as $rate) {
 
-		$rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
-		$rate['name']    = sanitize_text_field( $rate['name'] );
-		$rate['state']   = sanitize_text_field( $rate['state'] );
-		$rate['country'] = sanitize_text_field( $rate['country'] );
-		$rate['global']  = empty( $rate['state'] );
+		$rate['rate']    = wpinv_sanitize_amount($rate['rate']);
+		$rate['name']    = sanitize_text_field($rate['name']);
+		$rate['state']   = sanitize_text_field($rate['state']);
+		$rate['country'] = sanitize_text_field($rate['country']);
+		$rate['global']  = empty($rate['state']);
 		$tax_rates[]     = $rate;
 
 	}
 
-    update_option( 'wpinv_tax_rates', $tax_rates );
+    update_option('wpinv_tax_rates', $tax_rates);
 
     return $input;
 }
-add_filter( 'wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates' );
+add_filter('wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates');
 
-function wpinv_settings_sanitize_tax_rules( $input ) {
-    if ( ! wpinv_current_user_can_manage_invoicing() ) {
+function wpinv_settings_sanitize_tax_rules($input) {
+    if (!wpinv_current_user_can_manage_invoicing()) {
         return $input;
     }
 
-	if ( empty( $_POST['wpinv_tax_rules_nonce'] ) || ! wp_verify_nonce( $_POST['wpinv_tax_rules_nonce'], 'wpinv_tax_rules' ) ) {
+	if (empty($_POST['wpinv_tax_rules_nonce']) || !wp_verify_nonce($_POST['wpinv_tax_rules_nonce'], 'wpinv_tax_rules')) {
 		return $input;
 	}
 
-    $new_rules = ! empty( $_POST['tax_rules'] ) ? wp_kses_post_deep( array_values( $_POST['tax_rules'] ) ) : array();
+    $new_rules = !empty($_POST['tax_rules']) ? wp_kses_post_deep(array_values($_POST['tax_rules'])) : array();
     $tax_rules = array();
 
-    foreach ( $new_rules as $rule ) {
+    foreach ($new_rules as $rule) {
 
-		$rule['key']      = sanitize_title_with_dashes( $rule['key'] );
-		$rule['label']    = sanitize_text_field( $rule['label'] );
-		$rule['tax_base'] = sanitize_text_field( $rule['tax_base'] );
+		$rule['key']      = sanitize_title_with_dashes($rule['key']);
+		$rule['label']    = sanitize_text_field($rule['label']);
+		$rule['tax_base'] = sanitize_text_field($rule['tax_base']);
 		$tax_rules[]      = $rule;
 
 	}
 
-    update_option( 'wpinv_tax_rules', $tax_rules );
+    update_option('wpinv_tax_rules', $tax_rules);
 
     return $input;
 }
-add_filter( 'wpinv_settings_taxes-rules_sanitize', 'wpinv_settings_sanitize_tax_rules' );
+add_filter('wpinv_settings_taxes-rules_sanitize', 'wpinv_settings_sanitize_tax_rules');
 
 function wpinv_get_settings_tabs() {
     $tabs             = array();
-    $tabs['general']  = __( 'General', 'invoicing' );
-    $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
-    $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-	$tabs['emails']   = __( 'Emails', 'invoicing' );
+    $tabs['general']  = __('General', 'invoicing');
+    $tabs['gateways'] = __('Payment Gateways', 'invoicing');
+    $tabs['taxes']    = __('Taxes', 'invoicing');
+	$tabs['emails'] = __('Emails', 'invoicing');
 
-	if ( count( getpaid_get_integration_settings() ) > 0 ) {
-		$tabs['integrations'] = __( 'Integrations', 'invoicing' );
+	if (count(getpaid_get_integration_settings()) > 0) {
+		$tabs['integrations'] = __('Integrations', 'invoicing');
 	}
 
-    $tabs['privacy']  = __( 'Privacy', 'invoicing' );
-    $tabs['misc']     = __( 'Misc', 'invoicing' );
-    $tabs['tools']    = __( 'Tools', 'invoicing' );
+    $tabs['privacy']  = __('Privacy', 'invoicing');
+    $tabs['misc']     = __('Misc', 'invoicing');
+    $tabs['tools']    = __('Tools', 'invoicing');
 
-    return apply_filters( 'wpinv_settings_tabs', $tabs );
+    return apply_filters('wpinv_settings_tabs', $tabs);
 }
 
-function wpinv_get_settings_tab_sections( $tab = false ) {
+function wpinv_get_settings_tab_sections($tab = false) {
     $tabs     = false;
     $sections = wpinv_get_registered_settings_sections();
 
-    if ( $tab && ! empty( $sections[ $tab ] ) ) {
-        $tabs = $sections[ $tab ];
+    if ($tab && !empty($sections[$tab])) {
+        $tabs = $sections[$tab];
     }
 
     return $tabs;
@@ -418,7 +418,7 @@ 
 function wpinv_get_registered_settings_sections() {
     static $sections = false;
 
-    if ( false !== $sections ) {
+    if (false !== $sections) {
         return $sections;
     }
 
@@ -426,229 +426,229 @@ 
         'general'      => apply_filters(
             'wpinv_settings_sections_general',
             array(
-				'main'             => __( 'General Settings', 'invoicing' ),
-				'page_section'     => __( 'Page Settings', 'invoicing' ),
-				'currency_section' => __( 'Currency Settings', 'invoicing' ),
-				'labels'           => __( 'Label Texts', 'invoicing' ),
+				'main'             => __('General Settings', 'invoicing'),
+				'page_section'     => __('Page Settings', 'invoicing'),
+				'currency_section' => __('Currency Settings', 'invoicing'),
+				'labels'           => __('Label Texts', 'invoicing'),
             )
         ),
         'gateways'     => apply_filters(
             'wpinv_settings_sections_gateways',
             array(
-				'main' => __( 'Gateway Settings', 'invoicing' ),
+				'main' => __('Gateway Settings', 'invoicing'),
             )
         ),
         'taxes'        => apply_filters(
             'wpinv_settings_sections_taxes',
             array(
-				'main'  => __( 'Tax Settings', 'invoicing' ),
-				'rules' => __( 'Tax Rules', 'invoicing' ),
-				'rates' => __( 'Tax Rates', 'invoicing' ),
-				'vat'   => __( 'EU VAT Settings', 'invoicing' ),
+				'main'  => __('Tax Settings', 'invoicing'),
+				'rules' => __('Tax Rules', 'invoicing'),
+				'rates' => __('Tax Rates', 'invoicing'),
+				'vat'   => __('EU VAT Settings', 'invoicing'),
             )
         ),
         'emails'       => apply_filters(
             'wpinv_settings_sections_emails',
             array(
-				'main' => __( 'Email Settings', 'invoicing' ),
+				'main' => __('Email Settings', 'invoicing'),
             )
         ),
 
-		'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
+		'integrations' => wp_list_pluck(getpaid_get_integration_settings(), 'label', 'id'),
 
         'privacy'      => apply_filters(
             'wpinv_settings_sections_privacy',
             array(
-				'main' => __( 'Privacy policy', 'invoicing' ),
+				'main' => __('Privacy policy', 'invoicing'),
             )
         ),
         'misc'         => apply_filters(
             'wpinv_settings_sections_misc',
             array(
-				'main'       => __( 'Miscellaneous', 'invoicing' ),
-				'custom-css' => __( 'Custom CSS', 'invoicing' ),
+				'main'       => __('Miscellaneous', 'invoicing'),
+				'custom-css' => __('Custom CSS', 'invoicing'),
             )
         ),
         'tools'        => apply_filters(
             'wpinv_settings_sections_tools',
             array(
-				'main' => __( 'Diagnostic Tools', 'invoicing' ),
+				'main' => __('Diagnostic Tools', 'invoicing'),
             )
         ),
     );
 
-    $sections = apply_filters( 'wpinv_settings_sections', $sections );
+    $sections = apply_filters('wpinv_settings_sections', $sections);
 
     return $sections;
 }
 
-function wpinv_get_pages( $with_slug = false, $default_label = null ) {
+function wpinv_get_pages($with_slug = false, $default_label = null) {
 	$pages_options = array();
 
-	if ( $default_label !== null && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
+	if ($default_label !== null && $default_label !== false) {
+		$pages_options = array('' => $default_label); // Blank option
 	}
 
 	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
+	if ($pages) {
+		foreach ($pages as $page) {
 			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
-            $pages_options[ $page->ID ] = $title;
+            $pages_options[$page->ID] = $title;
 		}
 	}
 
 	return $pages_options;
 }
 
-function wpinv_header_callback( $args ) {
-	if ( ! empty( $args['desc'] ) ) {
-        echo wp_kses_post( $args['desc'] );
+function wpinv_header_callback($args) {
+	if (!empty($args['desc'])) {
+        echo wp_kses_post($args['desc']);
     }
 }
 
-function wpinv_hidden_callback( $args ) {
+function wpinv_hidden_callback($args) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	if ( isset( $args['set_value'] ) ) {
+	if (isset($args['set_value'])) {
 		$value = $args['set_value'];
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$name  = '';
+		$name = '';
 	} else {
-		$name = 'wpinv_settings[' . esc_attr( $args['id'] ) . ']';
+		$name = 'wpinv_settings[' . esc_attr($args['id']) . ']';
 	}
 
-	echo '<input type="hidden" id="wpinv_settings[' . esc_attr( $args['id'] ) . ']" name="' . esc_attr( $name ) . '" value="' . esc_attr( stripslashes( $value ) ) . '" />';
+	echo '<input type="hidden" id="wpinv_settings[' . esc_attr($args['id']) . ']" name="' . esc_attr($name) . '" value="' . esc_attr(stripslashes($value)) . '" />';
 
 }
 
 /**
  * Displays a checkbox settings callback.
  */
-function wpinv_checkbox_callback( $args ) {
+function wpinv_checkbox_callback($args) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	$id  = esc_attr( $args['id'] );
+	$std = isset($args['std']) ? $args['std'] : '';
+	$std = wpinv_get_option($args['id'], $std);
+	$id  = esc_attr($args['id']);
 
-	getpaid_hidden_field( "wpinv_settings[$id]", '0' );
+	getpaid_hidden_field("wpinv_settings[$id]", '0');
 	?>
 		<label>
-			<input id="wpinv-settings-<?php echo esc_attr( $id ); ?>" name="wpinv_settings[<?php echo esc_attr( $id ); ?>]" <?php checked( empty( $std ), false ); ?> value="1" type="checkbox" />
-			<?php echo wp_kses_post( $args['desc'] ); ?>
+			<input id="wpinv-settings-<?php echo esc_attr($id); ?>" name="wpinv_settings[<?php echo esc_attr($id); ?>]" <?php checked(empty($std), false); ?> value="1" type="checkbox" />
+			<?php echo wp_kses_post($args['desc']); ?>
 		</label>
 	<?php
 }
 
-function wpinv_multicheck_callback( $args ) {
+function wpinv_multicheck_callback($args) {
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+	$sanitize_id = wpinv_sanitize_key($args['id']);
+	$class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+	if (!empty($args['options'])) {
 
-		$std     = isset( $args['std'] ) ? $args['std'] : array();
-		$value   = wpinv_get_option( $args['id'], $std );
+		$std     = isset($args['std']) ? $args['std'] : array();
+		$value   = wpinv_get_option($args['id'], $std);
 
-		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . esc_attr( $sanitize_id . $class ) . '">';
-        foreach ( $args['options'] as $key => $option ) :
-			$sanitize_key = esc_attr( wpinv_sanitize_key( $key ) );
-			if ( in_array( $sanitize_key, $value ) ) {
+		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . esc_attr($sanitize_id . $class) . '">';
+        foreach ($args['options'] as $key => $option) :
+			$sanitize_key = esc_attr(wpinv_sanitize_key($key));
+			if (in_array($sanitize_key, $value)) {
 				$enabled = $sanitize_key;
 			} else {
 				$enabled = null;
 			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']">' . wp_kses_post( $option ) . '</label></div>';
+			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" id="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" type="checkbox" value="' . esc_attr($sanitize_key) . '" ' . checked($sanitize_key, $enabled, false) . '/>&nbsp;';
+			echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']">' . wp_kses_post($option) . '</label></div>';
 		endforeach;
 		echo '</div>';
-		echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+		echo '<p class="description">' . wp_kses_post($args['desc']) . '</p>';
 	}
 }
 
-function wpinv_payment_icons_callback( $args ) {
+function wpinv_payment_icons_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$value   = wpinv_get_option( $args['id'], false );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$value = wpinv_get_option($args['id'], false);
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach ( $args['options'] as $key => $option ) {
-            $sanitize_key = wpinv_sanitize_key( $key );
+	if (!empty($args['options'])) {
+		foreach ($args['options'] as $key => $option) {
+            $sanitize_key = wpinv_sanitize_key($key);
 
-			if ( empty( $value ) ) {
+			if (empty($value)) {
 				$enabled = $option;
 			} else {
 				$enabled = null;
 			}
 
-			echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
+			echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
 
-				echo '<input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+				echo '<input name="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" id="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" type="checkbox" value="' . esc_attr($option) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
 
-				if ( wpinv_string_is_image_url( $key ) ) {
-				echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+				if (wpinv_string_is_image_url($key)) {
+				echo '<img class="payment-icon" src="' . esc_url($key) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				} else {
-				$card = strtolower( str_replace( ' ', '', $option ) );
+				$card = strtolower(str_replace(' ', '', $option));
 
-				if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-					$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+				if (has_filter('wpinv_accepted_payment_' . $card . '_image')) {
+					$image = apply_filters('wpinv_accepted_payment_' . $card . '_image', '');
 					} else {
-					$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+					$image       = wpinv_locate_template('images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false);
 					$content_dir = WP_CONTENT_DIR;
 
-					if ( function_exists( 'wp_normalize_path' ) ) {
+					if (function_exists('wp_normalize_path')) {
 						// Replaces backslashes with forward slashes for Windows systems
-						$image = wp_normalize_path( $image );
-						$content_dir = wp_normalize_path( $content_dir );
+						$image = wp_normalize_path($image);
+						$content_dir = wp_normalize_path($content_dir);
 						}
 
-					$image = str_replace( $content_dir, content_url(), $image );
+					$image = str_replace($content_dir, content_url(), $image);
 					}
 
-				echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+				echo '<img class="payment-icon" src="' . esc_url($image) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				}
-			echo wp_kses_post( $option ) . '</label>';
+			echo wp_kses_post($option) . '</label>';
 		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post($args['desc']) . '</p>';
 	}
 }
 
 /**
  * Displays a radio settings field.
  */
-function wpinv_radio_callback( $args ) {
+function wpinv_radio_callback($args) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
+	$std = isset($args['std']) ? $args['std'] : '';
+	$std = wpinv_get_option($args['id'], $std);
 	?>
 		<fieldset>
-			<ul id="wpinv-settings-<?php echo esc_attr( $args['id'] ); ?>" style="margin-top: 0;">
-				<?php foreach ( $args['options'] as $key => $option ) : ?>
+			<ul id="wpinv-settings-<?php echo esc_attr($args['id']); ?>" style="margin-top: 0;">
+				<?php foreach ($args['options'] as $key => $option) : ?>
 					<li>
 						<label>
-							<input name="wpinv_settings[<?php echo esc_attr( $args['id'] ); ?>]" <?php checked( $std, $key ); ?> value="<?php echo esc_attr( $key ); ?>" type="radio">
-							<?php echo wp_kses_post( $option ); ?>
+							<input name="wpinv_settings[<?php echo esc_attr($args['id']); ?>]" <?php checked($std, $key); ?> value="<?php echo esc_attr($key); ?>" type="radio">
+							<?php echo wp_kses_post($option); ?>
 						</label>
 					</li>
 				<?php endforeach; ?>
 			</ul>
 		</fieldset>
 	<?php
-	getpaid_settings_description_callback( $args );
+	getpaid_settings_description_callback($args);
 }
 
 /**
  * Displays a description if available.
  */
-function getpaid_settings_description_callback( $args ) {
+function getpaid_settings_description_callback($args) {
 
-	if ( ! empty( $args['desc'] ) ) {
+	if (!empty($args['desc'])) {
 		$description = $args['desc'];
-		echo wp_kses_post( "<p class='description'>$description</p>" );
+		echo wp_kses_post("<p class='description'>$description</p>");
 	}
 
 }
@@ -663,35 +663,35 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-gateways-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-gateways-edit.php'; ?>
 
 	<?php
 }
 
-function wpinv_gateway_select_callback( $args ) {
+function wpinv_gateway_select_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-    $class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+    $class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	echo '<select name="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" class="' . esc_attr( $class ) . '" >';
+	echo '<select name="wpinv_settings[' . esc_attr($sanitize_id) . ']"" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" class="' . esc_attr($class) . '" >';
 
-	foreach ( $args['options'] as $key => $option ) :
+	foreach ($args['options'] as $key => $option) :
 
-		echo '<option value="' . esc_attr( $key ) . '" ';
+		echo '<option value="' . esc_attr($key) . '" ';
 
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
-            selected( $key, $args['selected'] );
+		if (isset($args['selected']) && $args['selected'] !== null && $args['selected'] !== false) {
+            selected($key, $args['selected']);
         } else {
-            selected( $key, $value );
+            selected($key, $value);
         }
 
-		echo '>' . esc_html( $option['admin_label'] ) . '</option>';
+		echo '>' . esc_html($option['admin_label']) . '</option>';
 	endforeach;
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 }
 
 /**
@@ -700,16 +700,16 @@ 
  * @param array $args
  * @return string
  */
-function wpinv_settings_attrs_helper( $args ) {
+function wpinv_settings_attrs_helper($args) {
 
-	$value = isset( $args['std'] ) ? $args['std'] : '';
-	$id    = esc_attr( $args['id'] );
-	$value = is_scalar( $value ) ? $value : '';
+	$value = isset($args['std']) ? $args['std'] : '';
+	$id    = esc_attr($args['id']);
+	$value = is_scalar($value) ? $value : '';
 
 	$attrs = array(
-		'name'     => ! empty( $args['faux'] ) ? false : "wpinv_settings[$id]",
-		'readonly' => ! empty( $args['faux'] ),
-		'value'    => ! empty( $args['faux'] ) ? $value : wpinv_get_option( $args['id'], $value ),
+		'name'     => !empty($args['faux']) ? false : "wpinv_settings[$id]",
+		'readonly' => !empty($args['faux']),
+		'value'    => !empty($args['faux']) ? $value : wpinv_get_option($args['id'], $value),
 		'id'       => 'wpinv-settings-' . $args['id'],
 		'style'    => $args['style'],
 		'class'    => $args['class'],
@@ -717,20 +717,20 @@ 
 		'data-placeholder' => $args['placeholder'],
 	);
 
-	if ( ! empty( $args['onchange'] ) ) {
+	if (!empty($args['onchange'])) {
 		$attrs['onchange'] = $args['onchange'];
 	}
 
-	foreach ( $attrs as $key => $value ) {
+	foreach ($attrs as $key => $value) {
 
-		if ( false === $value ) {
+		if (false === $value) {
 			continue;
 		}
 
-		if ( true === $value ) {
-			echo ' ' . esc_attr( $key );
+		if (true === $value) {
+			echo ' ' . esc_attr($key);
 		} else {
-			echo ' ' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
+			echo ' ' . esc_attr($key) . '="' . esc_attr($value) . '"';
 		}
 
 	}
@@ -740,12 +740,12 @@ 
 /**
  * Displays a text input settings callback.
  */
-function wpinv_text_callback( $args ) {
+function wpinv_text_callback($args) {
 
 	?>
 		<label style="width: 100%;">
-			<input type="text" <?php wpinv_settings_attrs_helper( $args ); ?>>
-			<?php getpaid_settings_description_callback( $args ); ?>
+			<input type="text" <?php wpinv_settings_attrs_helper($args); ?>>
+			<?php getpaid_settings_description_callback($args); ?>
 		</label>
 	<?php
 
@@ -754,174 +754,174 @@ 
 /**
  * Displays a number input settings callback.
  */
-function wpinv_number_callback( $args ) {
+function wpinv_number_callback($args) {
 
 	?>
 		<label style="width: 100%;">
-			<input type="number" step="<?php echo esc_attr( $args['step'] ); ?>" max="<?php echo intval( $args['max'] ); ?>" min="<?php echo intval( $args['min'] ); ?>" <?php wpinv_settings_attrs_helper( $args ); ?>>
-			<?php getpaid_settings_description_callback( $args ); ?>
+			<input type="number" step="<?php echo esc_attr($args['step']); ?>" max="<?php echo intval($args['max']); ?>" min="<?php echo intval($args['min']); ?>" <?php wpinv_settings_attrs_helper($args); ?>>
+			<?php getpaid_settings_description_callback($args); ?>
 		</label>
 	<?php
 
 }
 
-function wpinv_textarea_callback( $args ) {
+function wpinv_textarea_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-    $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
+    $size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+    $class = (isset($args['class']) && !is_null($args['class'])) ? $args['class'] : 'large-text';
 
-	echo '<textarea class="' . esc_attr( $class ) . ' txtarea-' . esc_attr( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . esc_attr( $args['cols'] ) . '" rows="' . esc_attr( $args['rows'] ) . '" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	echo '<br /><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<textarea class="' . esc_attr($class) . ' txtarea-' . esc_attr($size) . ' wpi-' . esc_attr(sanitize_html_class($sanitize_id)) . ' " cols="' . esc_attr($args['cols']) . '" rows="' . esc_attr($args['rows']) . '" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']">' . esc_textarea(stripslashes($value)) . '</textarea>';
+	echo '<br /><label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_password_callback( $args ) {
+function wpinv_password_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	echo '<input type="password" class="' . esc_attr( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	echo '<input type="password" class="' . esc_attr($size) . '-text" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '"/>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_missing_callback( $args ) {
+function wpinv_missing_callback($args) {
 	printf(
-		esc_html__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
-		'<strong>' . esc_html( $args['id'] ) . '</strong>'
+		esc_html__('The callback function used for the %s setting is missing.', 'invoicing'),
+		'<strong>' . esc_html($args['id']) . '</strong>'
 	);
 }
 
 /**
  * Displays a number input settings callback.
  */
-function wpinv_select_callback( $args ) {
+function wpinv_select_callback($args) {
 
-	$desc   = wp_kses_post( $args['desc'] );
-	$desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$value  = isset( $args['std'] ) ? $args['std'] : '';
-	$value  = wpinv_get_option( $args['id'], $value );
-	$rand   = uniqid( 'random_id' );
+	$desc   = wp_kses_post($args['desc']);
+	$desc   = empty($desc) ? '' : "<p class='description'>$desc</p>";
+	$value  = isset($args['std']) ? $args['std'] : '';
+	$value  = wpinv_get_option($args['id'], $value);
+	$rand   = uniqid('random_id');
 
 	?>
 		<label style="width: 100%;">
-			<select <?php wpinv_settings_attrs_helper( $args ); ?> data-allow-clear="true">
-				<?php foreach ( $args['options'] as $option => $name ) : ?>
-					<option value="<?php echo esc_attr( $option ); ?>" <?php echo selected( $option, $value ); ?>><?php echo esc_html( $name ); ?></option>
+			<select <?php wpinv_settings_attrs_helper($args); ?> data-allow-clear="true">
+				<?php foreach ($args['options'] as $option => $name) : ?>
+					<option value="<?php echo esc_attr($option); ?>" <?php echo selected($option, $value); ?>><?php echo esc_html($name); ?></option>
 				<?php endforeach; ?>
 			</select>
 
-			<?php if ( substr( $args['id'], -5 ) === '_page' && is_numeric( $value ) ) : ?>
-				<a href="<?php echo esc_url( get_edit_post_link( $value ) ); ?>" target="_blank" class="button getpaid-page-setting-edit"><?php esc_html_e( 'Edit Page', 'invoicing' ); ?></a>
+			<?php if (substr($args['id'], -5) === '_page' && is_numeric($value)) : ?>
+				<a href="<?php echo esc_url(get_edit_post_link($value)); ?>" target="_blank" class="button getpaid-page-setting-edit"><?php esc_html_e('Edit Page', 'invoicing'); ?></a>
 			<?php endif; ?>
 
-			<?php if ( substr( $args['id'], -5 ) === '_page' && ! empty( $args['default_content'] ) ) : ?>
-				&nbsp;<a href="#TB_inline?&width=400&height=550&inlineId=<?php echo esc_attr( $rand ); ?>" class="button thickbox getpaid-page-setting-view-default"><?php esc_html_e( 'View Default Content', 'invoicing' ); ?></a>
-				<div id='<?php echo esc_attr( $rand ); ?>' style='display:none;'>
+			<?php if (substr($args['id'], -5) === '_page' && !empty($args['default_content'])) : ?>
+				&nbsp;<a href="#TB_inline?&width=400&height=550&inlineId=<?php echo esc_attr($rand); ?>" class="button thickbox getpaid-page-setting-view-default"><?php esc_html_e('View Default Content', 'invoicing'); ?></a>
+				<div id='<?php echo esc_attr($rand); ?>' style='display:none;'>
 					<div>
-						<h3><?php esc_html_e( 'Original Content', 'invoicing' ); ?></h3>
-						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php echo wp_kses_post( gepaid_trim_lines( $args['default_content'] ) ); ?></textarea>
-						<h3><?php esc_html_e( 'Current Content', 'invoicing' ); ?></h3>
-						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php $_post = get_post( $value ); echo empty( $_post ) ? '' : wp_kses_post( gepaid_trim_lines( $_post->post_content ) ); ?></textarea>
+						<h3><?php esc_html_e('Original Content', 'invoicing'); ?></h3>
+						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php echo wp_kses_post(gepaid_trim_lines($args['default_content'])); ?></textarea>
+						<h3><?php esc_html_e('Current Content', 'invoicing'); ?></h3>
+						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php $_post = get_post($value); echo empty($_post) ? '' : wp_kses_post(gepaid_trim_lines($_post->post_content)); ?></textarea>
 					</div>
 				</div>
 			<?php endif; ?>
 
-			<?php echo wp_kses_post( $desc ); ?>
+			<?php echo wp_kses_post($desc); ?>
 		</label>
 	<?php
 
 }
 
-function wpinv_color_select_callback( $args ) {
+function wpinv_color_select_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+	echo '<select id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $color['label'] ) . '</option>';
+	foreach ($args['options'] as $option => $color) {
+		echo '<option value="' . esc_attr($option) . '" ' . selected($option, $value) . '>' . esc_html($color['label']) . '</option>';
 	}
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_rich_editor_callback( $args ) {
+function wpinv_rich_editor_callback($args) {
 	global $wp_version;
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
+	if (!empty($args['allow_blank']) && empty($value)) {
 		$value = $std;
 	}
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+	$rows = isset($args['size']) ? $args['size'] : 20;
 
 	echo '<div class="getpaid-settings-editor-input">';
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+	if ($wp_version >= 3.3 && function_exists('wp_editor')) {
 		wp_editor(
-            stripslashes( $value ),
-            'wpinv_settings_' . esc_attr( $args['id'] ),
+            stripslashes($value),
+            'wpinv_settings_' . esc_attr($args['id']),
             array(
-				'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']',
-				'textarea_rows' => absint( $rows ),
+				'textarea_name' => 'wpinv_settings[' . esc_attr($args['id']) . ']',
+				'textarea_rows' => absint($rows),
 				'media_buttons' => false,
             )
         );
 	} else {
-		echo '<textarea class="large-text" rows="10" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+		echo '<textarea class="large-text" rows="10" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" class="wpi-' . esc_attr(sanitize_html_class($args['id'])) . '">' . esc_textarea(stripslashes($value)) . '</textarea>';
 	}
 
-	echo '</div><br/><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '</div><br/><label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_upload_callback( $args ) {
+function wpinv_upload_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	echo '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	echo '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . esc_attr__( 'Upload File', 'invoicing' ) . '"/></span>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	echo '<input type="text" class="' . sanitize_html_class($size) . '-text" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr(stripslashes($value)) . '"/>';
+	echo '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . esc_attr__('Upload File', 'invoicing') . '"/></span>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_color_callback( $args ) {
+function wpinv_color_callback($args) {
 
-	$std         = isset( $args['std'] ) ? $args['std'] : '';
-	$value       = wpinv_get_option( $args['id'], $std );
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+	$std         = isset($args['std']) ? $args['std'] : '';
+	$value       = wpinv_get_option($args['id'], $std);
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	echo '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '" data-default-color="' . esc_attr($std) . '" />';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_country_states_callback( $args ) {
+function wpinv_country_states_callback($args) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $args['placeholder'] ) ) {
+	if (isset($args['placeholder'])) {
 		$placeholder = $args['placeholder'];
 	} else {
 		$placeholder = '';
@@ -929,15 +929,15 @@ 
 
 	$states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? 'wpinv-no-states' : 'wpi_select2';
-	echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="' . esc_attr( $class ) . '" data-placeholder="' . esc_html( $placeholder ) . '"/>';
+	$class = empty($states) ? 'wpinv-no-states' : 'wpi_select2';
+	echo '<select id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" class="' . esc_attr($class) . '" data-placeholder="' . esc_html($placeholder) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $name ) . '</option>';
+	foreach ($states as $option => $name) {
+		echo '<option value="' . esc_attr($option) . '" ' . selected($option, $value) . '>' . esc_html($name) . '</option>';
 	}
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
@@ -951,7 +951,7 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-tax-rates-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-tax-rates-edit.php'; ?>
 
 	<?php
 
@@ -960,11 +960,11 @@ 
 /**
  * Displays a tax rate' edit row.
  */
-function wpinv_tax_rate_callback( $tax_rate, $key ) {
+function wpinv_tax_rate_callback($tax_rate, $key) {
 
-	$key                      = sanitize_key( $key );
-	$tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
-	include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
+	$key                      = sanitize_key($key);
+	$tax_rate['reduced_rate'] = empty($tax_rate['reduced_rate']) ? 0 : $tax_rate['reduced_rate'];
+	include plugin_dir_path(__FILE__) . 'views/html-tax-rate-edit.php';
 
 }
 
@@ -978,177 +978,177 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-tax-rules-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-tax-rules-edit.php'; ?>
 
 	<?php
 
 }
 
-function wpinv_tools_callback( $args ) {
+function wpinv_tools_callback($args) {
     ?>
     </td><tr>
     <td colspan="2" class="wpinv_tools_tdbox">
     <?php
-    if ( $args['desc'] ) {
+    if ($args['desc']) {
 ?>
-<p><?php echo wp_kses_post( $args['desc'] ); ?></p><?php } ?>
-    <?php do_action( 'wpinv_tools_before' ); ?>
+<p><?php echo wp_kses_post($args['desc']); ?></p><?php } ?>
+    <?php do_action('wpinv_tools_before'); ?>
     <table id="wpinv_tools_table" class="wp-list-table widefat fixed posts">
         <thead>
             <tr>
-                <th scope="col" class="wpinv-th-tool"><?php esc_html_e( 'Tool', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-desc"><?php esc_html_e( 'Description', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-action"><?php esc_html_e( 'Action', 'invoicing' ); ?></th>
+                <th scope="col" class="wpinv-th-tool"><?php esc_html_e('Tool', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-desc"><?php esc_html_e('Description', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-action"><?php esc_html_e('Action', 'invoicing'); ?></th>
             </tr>
         </thead>
 
         <tbody>
 			<tr>
-                <td><?php esc_html_e( 'Check Pages', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Check Pages', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Creates any missing GetPaid pages.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Creates any missing GetPaid pages.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+								add_query_arg('getpaid-admin-action', 'create_missing_pages'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php esc_html_e( 'Refresh Permalinks', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Refresh Permalinks', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Might fix the page not found error when viewing an invoice.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Might fix the page not found error when viewing an invoice.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'refresh_permalinks' ),
+								add_query_arg('getpaid-admin-action', 'refresh_permalinks'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php esc_html_e( 'Create Database Tables', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Create Database Tables', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Run this tool to create any missing database tables.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Run this tool to create any missing database tables.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+								add_query_arg('getpaid-admin-action', 'create_missing_tables'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php esc_html_e( 'Migrate old invoices', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Migrate old invoices', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'If your old invoices were not migrated after updating from Invoicing to GetPaid, you can use this tool to migrate them.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('If your old invoices were not migrated after updating from Invoicing to GetPaid, you can use this tool to migrate them.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
+								add_query_arg('getpaid-admin-action', 'migrate_old_invoices'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 
 			<tr>
-                <td><?php esc_html_e( 'Recalculate Discounts', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Recalculate Discounts', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Recalculate discounts for existing invoices that have discount codes but are not discounted.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Recalculate discounts for existing invoices that have discount codes but are not discounted.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
+								add_query_arg('getpaid-admin-action', 'recalculate_discounts'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 
 			<tr>
-                <td><?php esc_html_e( 'Set-up Wizard', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Set-up Wizard', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Launch the quick set-up wizard.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Launch the quick set-up wizard.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
-						echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
+						echo esc_url(admin_url('index.php?page=gp-setup'));
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Launch', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Launch', 'invoicing'); ?></a>
                 </td>
             </tr>
 
-			<?php do_action( 'wpinv_tools_row' ); ?>
+			<?php do_action('wpinv_tools_row'); ?>
         </tbody>
     </table>
-    <?php do_action( 'wpinv_tools_after' ); ?>
+    <?php do_action('wpinv_tools_after'); ?>
     <?php
 }
 
 
-function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+function wpinv_descriptive_text_callback($args) {
+	echo wp_kses_post($args['desc']);
 }
 
-function wpinv_raw_html_callback( $args ) {
-	echo wp_kses( $args['desc'], getpaid_allowed_html() );
+function wpinv_raw_html_callback($args) {
+	echo wp_kses($args['desc'], getpaid_allowed_html());
 }
 
-function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+function wpinv_hook_callback($args) {
+	do_action('wpinv_' . $args['id'], $args);
 }
 
 function wpinv_set_settings_cap() {
 	return wpinv_get_capability();
 }
-add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
+add_filter('option_page_capability_wpinv_settings', 'wpinv_set_settings_cap');
 
 
-function wpinv_on_update_settings( $old_value, $value, $option ) {
-    $old = ! empty( $old_value['remove_data_on_unistall'] ) ? 1 : '';
-    $new = ! empty( $value['remove_data_on_unistall'] ) ? 1 : '';
+function wpinv_on_update_settings($old_value, $value, $option) {
+    $old = !empty($old_value['remove_data_on_unistall']) ? 1 : '';
+    $new = !empty($value['remove_data_on_unistall']) ? 1 : '';
 
-    if ( $old != $new ) {
-        update_option( 'wpinv_remove_data_on_invoice_unistall', $new );
+    if ($old != $new) {
+        update_option('wpinv_remove_data_on_invoice_unistall', $new);
     }
 }
-add_action( 'update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3 );
+add_action('update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3);
 
 /**
  * Returns the merge tags help text.
@@ -1157,16 +1157,16 @@ 
  *
  * @return string
  */
-function wpinv_get_merge_tags_help_text( $subscription = false ) {
+function wpinv_get_merge_tags_help_text($subscription = false) {
 
 	$url  = $subscription ? 'https://gist.github.com/picocodes/3d213982d57c34edf7a46fd3f0e8583e' : 'https://gist.github.com/picocodes/43bdc4d4bbba844534b2722e2af0b58f';
 	$link = sprintf(
 		'<strong><a href="%s" target="_blank">%s</a></strong>',
 		$url,
-		esc_html__( 'View available merge tags.', 'invoicing' )
+		esc_html__('View available merge tags.', 'invoicing')
 	);
 
-	$description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
+	$description = esc_html__('The content of the email (Merge Tags and HTML are allowed).', 'invoicing');
 
 	return "$description $link";
 

includes/class-wpinv.php

Indentation +605 added lines, -605 removed lines

@@ -14,650 +14,650 @@
  */
 class WPInv_Plugin {
 
-	/**
-	 * GetPaid version.
-	 *
-	 * @var string
-	 */
-	public $version;
-
-	/**
-	 * Data container.
-	 *
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Form elements instance.
-	 *
-	 * @var WPInv_Payment_Form_Elements
-	 */
-	public $form_elements;
-
-	/**
-	 * @var array An array of payment gateways.
-	 */
-	public $gateways;
-
-	/**
-	 * Class constructor.
-	 */
-	public function __construct() {
-		$this->define_constants();
-		$this->includes();
-		$this->init_hooks();
-		$this->set_properties();
-	}
-
-	/**
-	 * Sets a custom data property.
-	 *
-	 * @param string $prop The prop to set.
-	 * @param mixed $value The value to retrieve.
-	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
-	}
-
-	/**
-	 * Gets a custom data property.
-	 *
-	 * @param string $prop The prop to set.
-	 * @return mixed The value.
-	 */
-	public function get( $prop ) {
-
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Define class properties.
-	 */
-	public function set_properties() {
-
-		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
-		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
-
-		// Init other objects.
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-		$this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
-
-	}
-
-	 /**
-	 * Define plugin constants.
-	 */
-	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
-		$this->version = WPINV_VERSION;
-	}
-
-	/**
-	 * Hook into actions and filters.
-	 *
-	 * @since 1.0.19
-	 */
-	protected function init_hooks() {
-		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
-
-		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		add_action( 'init', array( $this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
-		add_action( 'wp_footer', array( $this, 'wp_footer' ) );
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-		add_action( 'widgets_init', array( $this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'the_seo_framework_sitemap_supported_post_types', array( $this, 'exclude_invoicing_post_types' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
-
-		add_filter( 'query_vars', array( $this, 'custom_query_vars' ) );
+    /**
+     * GetPaid version.
+     *
+     * @var string
+     */
+    public $version;
+
+    /**
+     * Data container.
+     *
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Form elements instance.
+     *
+     * @var WPInv_Payment_Form_Elements
+     */
+    public $form_elements;
+
+    /**
+     * @var array An array of payment gateways.
+     */
+    public $gateways;
+
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
+        $this->define_constants();
+        $this->includes();
+        $this->init_hooks();
+        $this->set_properties();
+    }
+
+    /**
+     * Sets a custom data property.
+     *
+     * @param string $prop The prop to set.
+     * @param mixed $value The value to retrieve.
+     */
+    public function set( $prop, $value ) {
+        $this->data[ $prop ] = $value;
+    }
+
+    /**
+     * Gets a custom data property.
+     *
+     * @param string $prop The prop to set.
+     * @return mixed The value.
+     */
+    public function get( $prop ) {
+
+        if ( isset( $this->data[ $prop ] ) ) {
+            return $this->data[ $prop ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Define class properties.
+     */
+    public function set_properties() {
+
+        // Sessions.
+        $this->set( 'session', new WPInv_Session_Handler() );
+        $GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+        $GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
+
+        // Init other objects.
+        $this->set( 'notes', new WPInv_Notes() );
+        $this->set( 'api', new WPInv_API() );
+        $this->set( 'post_types', new GetPaid_Post_Types() );
+        $this->set( 'template', new GetPaid_Template() );
+        $this->set( 'admin', new GetPaid_Admin() );
+        $this->set( 'subscriptions', new WPInv_Subscriptions() );
+        $this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
+        $this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
+        $this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
+        $this->set( 'payment_forms', new GetPaid_Payment_Forms() );
+        $this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+
+    }
+
+        /**
+         * Define plugin constants.
+         */
+    public function define_constants() {
+        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
+        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        $this->version = WPINV_VERSION;
+    }
+
+    /**
+     * Hook into actions and filters.
+     *
+     * @since 1.0.19
+     */
+    protected function init_hooks() {
+        /* Internationalize the text strings used. */
+        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+
+        // Init the plugin after WordPress inits.
+        add_action( 'init', array( $this, 'init' ), 1 );
+        add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
+        add_action( 'init', array( $this, 'wpinv_actions' ) );
+        add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
+        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
+        add_action( 'wp_footer', array( $this, 'wp_footer' ) );
+        add_action( 'wp_head', array( $this, 'wp_head' ) );
+        add_action( 'widgets_init', array( $this, 'register_widgets' ) );
+        add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
+        add_filter( 'the_seo_framework_sitemap_supported_post_types', array( $this, 'exclude_invoicing_post_types' ) );
+        add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+
+        add_filter( 'query_vars', array( $this, 'custom_query_vars' ) );
         add_action( 'init', array( $this, 'add_rewrite_rule' ), 10, 0 );
-		add_action( 'pre_get_posts', array( $this, 'maybe_process_new_ipn' ), 1 );
-
-		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
-
-	}
-
-	public function plugins_loaded() {
-		/* Internationalize the text strings used. */
-		$this->load_textdomain();
-
-		do_action( 'wpinv_loaded' );
-
-		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
-			wpinv_oxygen_fix_conflict();
-		}
-	}
-
-	/**
-	 * Load Localisation files.
-	 *
-	 * Note: the first-loaded translation file overrides any following ones if the same translation is present.
-	 *
-	 * Locales found in:
-	 *      - WP_LANG_DIR/plugins/invoicing-LOCALE.mo
-	 *      - WP_PLUGIN_DIR/invoicing/languages/invoicing-LOCALE.mo
-	 *
-	 * @since 1.0.0
-	 */
-	public function load_textdomain() {
-
-		load_plugin_textdomain(
-			'invoicing',
-			false,
-			plugin_basename( dirname( WPINV_PLUGIN_FILE ) ) . '/languages/'
-		);
-
-	}
-
-	/**
-	 * Include required core files used in admin and on the frontend.
-	 */
-	public function includes() {
-
-		// Start with the settings.
-		require_once WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php';
-
-		// Packages/libraries.
-		require_once WPINV_PLUGIN_DIR . 'vendor/autoload.php';
-		require_once WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php';
-
-		// Load functions.
-		require_once WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/invoice-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/subscription-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/user-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/error-functions.php';
-
-		// Register autoloader.
-		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
-		}
-
-		require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/checkout.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/invoice-history.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/subscriptions.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/buy-item.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/getpaid.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/invoice.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php';
-
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-			GetPaid_Post_Types_Admin::init();
-
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php';
-			// load the user class only on the users.php page
-			global $pagenow;
-			if ( $pagenow == 'users.php' ) {
-				new WPInv_Admin_Users();
-			}
-		}
-
-		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php';
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
-		}
-
-	}
-
-	/**
-	 * Class autoloader
-	 *
-	 * @param       string $class_name The name of the class to load.
-	 * @access      public
-	 * @since       1.0.19
-	 * @return      void
-	 */
-	public function autoload( $class_name ) {
-
-		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
-
-		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
-			return;
-		}
-
-		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
-
-		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
-
-		// And an array of possible locations in order of importance.
-		$locations = array(
-			"$plugin_path/includes",
-			"$plugin_path/includes/data-stores",
-			"$plugin_path/includes/gateways",
-			"$plugin_path/includes/payments",
-			"$plugin_path/includes/geolocation",
-			"$plugin_path/includes/reports",
-			"$plugin_path/includes/api",
-			"$plugin_path/includes/admin",
-			"$plugin_path/includes/admin/meta-boxes",
-		);
-
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
-
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
-				break;
-			}
+        add_action( 'pre_get_posts', array( $this, 'maybe_process_new_ipn' ), 1 );
+
+        // Fires after registering actions.
+        do_action( 'wpinv_actions', $this );
+        do_action( 'getpaid_actions', $this );
+
+    }
+
+    public function plugins_loaded() {
+        /* Internationalize the text strings used. */
+        $this->load_textdomain();
+
+        do_action( 'wpinv_loaded' );
+
+        // Fix oxygen page builder conflict
+        if ( function_exists( 'ct_css_output' ) ) {
+            wpinv_oxygen_fix_conflict();
+        }
+    }
+
+    /**
+     * Load Localisation files.
+     *
+     * Note: the first-loaded translation file overrides any following ones if the same translation is present.
+     *
+     * Locales found in:
+     *      - WP_LANG_DIR/plugins/invoicing-LOCALE.mo
+     *      - WP_PLUGIN_DIR/invoicing/languages/invoicing-LOCALE.mo
+     *
+     * @since 1.0.0
+     */
+    public function load_textdomain() {
+
+        load_plugin_textdomain(
+            'invoicing',
+            false,
+            plugin_basename( dirname( WPINV_PLUGIN_FILE ) ) . '/languages/'
+        );
+
+    }
+
+    /**
+     * Include required core files used in admin and on the frontend.
+     */
+    public function includes() {
+
+        // Start with the settings.
+        require_once WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php';
+
+        // Packages/libraries.
+        require_once WPINV_PLUGIN_DIR . 'vendor/autoload.php';
+        require_once WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php';
+
+        // Load functions.
+        require_once WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/invoice-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/subscription-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/user-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/error-functions.php';
+
+        // Register autoloader.
+        try {
+            spl_autoload_register( array( $this, 'autoload' ), true );
+        } catch ( Exception $e ) {
+            wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+        }
+
+        require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/checkout.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/invoice-history.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/subscriptions.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/buy-item.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/getpaid.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/invoice.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php';
+
+        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+            GetPaid_Post_Types_Admin::init();
+
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php';
+            // load the user class only on the users.php page
+            global $pagenow;
+            if ( $pagenow == 'users.php' ) {
+                new WPInv_Admin_Users();
+            }
+        }
+
+        // Register cli commands
+        if ( defined( 'WP_CLI' ) && WP_CLI ) {
+            require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php';
+            WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+        }
+
+    }
+
+    /**
+     * Class autoloader
+     *
+     * @param       string $class_name The name of the class to load.
+     * @access      public
+     * @since       1.0.19
+     * @return      void
+     */
+    public function autoload( $class_name ) {
+
+        // Normalize the class name...
+        $class_name  = strtolower( $class_name );
+
+        // ... and make sure it is our class.
+        if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+            return;
+        }
+
+        // Next, prepare the file name from the class.
+        $file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+
+        // Base path of the classes.
+        $plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+
+        // And an array of possible locations in order of importance.
+        $locations = array(
+            "$plugin_path/includes",
+            "$plugin_path/includes/data-stores",
+            "$plugin_path/includes/gateways",
+            "$plugin_path/includes/payments",
+            "$plugin_path/includes/geolocation",
+            "$plugin_path/includes/reports",
+            "$plugin_path/includes/api",
+            "$plugin_path/includes/admin",
+            "$plugin_path/includes/admin/meta-boxes",
+        );
+
+        foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+
+            if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
+                include trailingslashit( $location ) . $file_name;
+                break;
+            }
 }
 
-	}
-
-	/**
-	 * Inits hooks etc.
-	 */
-	public function init() {
-
-		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
-
-		// Maybe upgrade.
-		$this->maybe_upgrade_database();
-
-		// Load default gateways.
-		$gateways = apply_filters(
-			'getpaid_default_gateways',
-			array(
-				'manual'        => 'GetPaid_Manual_Gateway',
-				'paypal'        => 'GetPaid_Paypal_Gateway',
-				'worldpay'      => 'GetPaid_Worldpay_Gateway',
-				'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
-				'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
-			)
-		);
-
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
-		}
-
-		if ( 'yes' != get_option( 'wpinv_renamed_gateways' ) ) {
-			GetPaid_Installer::rename_gateways_label();
-			update_option( 'wpinv_renamed_gateways', 'yes' );
-		}
-
-		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
-
-	}
-
-	/**
-	 * Checks if this is an IPN request and processes it.
-	 */
-	public function maybe_process_ipn() {
-
-		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
-			return;
-		}
-
-		$gateway = sanitize_text_field( $_GET['wpi-gateway'] );
-
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
-		exit;
-
-	}
-
-	public function enqueue_scripts() {
-
-		// Fires before adding scripts.
-		do_action( 'getpaid_enqueue_scripts' );
-
-		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-		$localize['thousands']            = wpinv_thousands_separator();
-		$localize['decimals']             = wpinv_decimal_separator();
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
-		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['loading']              = __( 'Loading...', 'invoicing' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
-		$localize['recaptchaSettings']    = getpaid_get_recaptcha_settings();
-
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
-
-		// reCaptcha.
-		if ( getpaid_is_recaptcha_enabled() ) {
-			$url = apply_filters(
-				'getpaid_recaptcha_api_url',
-				add_query_arg(
-					array(
-						'render' => 'v2' === getpaid_get_recaptcha_version() ? 'explicit' : getpaid_get_recaptcha_site_key(),
-					),
-					'https://www.google.com/recaptcha/api.js'
-				)
-			);
-			wp_enqueue_script( 'recaptcha', $url, array(), null, true ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
-		}
-
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'jquery' ), $version, true );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
-	}
-
-	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
-		}
-
-		if ( defined( 'WP_ALL_IMPORT_ROOT_DIR' ) ) {
-			include plugin_dir_path( __FILE__ ) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
-		}
-	}
-
-	/**
+    }
+
+    /**
+     * Inits hooks etc.
+     */
+    public function init() {
+
+        // Fires before getpaid inits.
+        do_action( 'before_getpaid_init', $this );
+
+        // Maybe upgrade.
+        $this->maybe_upgrade_database();
+
+        // Load default gateways.
+        $gateways = apply_filters(
+            'getpaid_default_gateways',
+            array(
+                'manual'        => 'GetPaid_Manual_Gateway',
+                'paypal'        => 'GetPaid_Paypal_Gateway',
+                'worldpay'      => 'GetPaid_Worldpay_Gateway',
+                'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
+                'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
+            )
+        );
+
+        foreach ( $gateways as $id => $class ) {
+            $this->gateways[ $id ] = new $class();
+        }
+
+        if ( 'yes' != get_option( 'wpinv_renamed_gateways' ) ) {
+            GetPaid_Installer::rename_gateways_label();
+            update_option( 'wpinv_renamed_gateways', 'yes' );
+        }
+
+        // Fires after getpaid inits.
+        do_action( 'getpaid_init', $this );
+
+    }
+
+    /**
+     * Checks if this is an IPN request and processes it.
+     */
+    public function maybe_process_ipn() {
+
+        // Ensure that this is an IPN request.
+        if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+            return;
+        }
+
+        $gateway = sanitize_text_field( $_GET['wpi-gateway'] );
+
+        do_action( 'wpinv_verify_payment_ipn', $gateway );
+        do_action( "wpinv_verify_{$gateway}_ipn" );
+        exit;
+
+    }
+
+    public function enqueue_scripts() {
+
+        // Fires before adding scripts.
+        do_action( 'getpaid_enqueue_scripts' );
+
+        $localize                         = array();
+        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
+        $localize['thousands']            = wpinv_thousands_separator();
+        $localize['decimals']             = wpinv_decimal_separator();
+        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['txtComplete']          = __( 'Continue', 'invoicing' );
+        $localize['UseTaxes']             = wpinv_use_taxes();
+        $localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
+        $localize['loading']              = __( 'Loading...', 'invoicing' );
+        $localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+        $localize['recaptchaSettings']    = getpaid_get_recaptcha_settings();
+
+        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+
+        // reCaptcha.
+        if ( getpaid_is_recaptcha_enabled() ) {
+            $url = apply_filters(
+                'getpaid_recaptcha_api_url',
+                add_query_arg(
+                    array(
+                        'render' => 'v2' === getpaid_get_recaptcha_version() ? 'explicit' : getpaid_get_recaptcha_site_key(),
+                    ),
+                    'https://www.google.com/recaptcha/api.js'
+                )
+            );
+            wp_enqueue_script( 'recaptcha', $url, array(), null, true ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
+        }
+
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
+        wp_enqueue_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'jquery' ), $version, true );
+        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+    }
+
+    public function wpinv_actions() {
+        if ( isset( $_REQUEST['wpi_action'] ) ) {
+            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        }
+
+        if ( defined( 'WP_ALL_IMPORT_ROOT_DIR' ) ) {
+            include plugin_dir_path( __FILE__ ) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
+        }
+    }
+
+    /**
      * Fires an action after verifying that a user can fire them.
-	 *
-	 * Note: If the action is on an invoice, subscription etc, esure that the
-	 * current user owns the invoice/subscription.
+     *
+     * Note: If the action is on an invoice, subscription etc, esure that the
+     * current user owns the invoice/subscription.
      */
     public function maybe_do_authenticated_action() {
 
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+        if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
 
-			$key  = sanitize_key( $_REQUEST['getpaid-action'] );
-			$data = wp_unslash( $_REQUEST );
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $data );
-			}
+            $key  = sanitize_key( $_REQUEST['getpaid-action'] );
+            $data = wp_unslash( $_REQUEST );
+            if ( is_user_logged_in() ) {
+                do_action( "getpaid_authenticated_action_$key", $data );
+            }
 
-			do_action( "getpaid_unauthenticated_action_$key", $data );
+            do_action( "getpaid_unauthenticated_action_$key", $data );
 
-		}
+        }
 
     }
 
-	public function pre_get_posts( $wp_query ) {
-
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
-		}
-
-		return $wp_query;
-	}
-
-	/**
-	 * Register widgets
-	 *
-	 */
-	public function register_widgets() {
-		global $pagenow;
-
-		// Currently, UX Builder does not work particulaly well with SuperDuper.
-		// So we disable our widgets when editing a page with UX Builder.
-		if ( function_exists( 'ux_builder_is_active' ) && ux_builder_is_active() ) {
-			return;
-		}
-
-		$block_widget_init_screens = function_exists( 'sd_pagenow_exclude' ) ? sd_pagenow_exclude() : array();
-
-		if ( is_admin() && $pagenow && in_array( $pagenow, $block_widget_init_screens ) ) {
-			// don't initiate in these conditions.
-		} else {
-
-			// Only load allowed widgets.
-			$exclude = function_exists( 'sd_widget_exclude' ) ? sd_widget_exclude() : array();
-			$widgets = apply_filters(
-				'getpaid_widget_classes',
-				array(
-					'WPInv_Checkout_Widget',
-					'WPInv_History_Widget',
-					'WPInv_Receipt_Widget',
-					'WPInv_Subscriptions_Widget',
-					'WPInv_Buy_Item_Widget',
-					'WPInv_Messages_Widget',
-					'WPInv_GetPaid_Widget',
-					'WPInv_Invoice_Widget',
-				)
-			);
-
-			// For each widget...
-			foreach ( $widgets as $widget ) {
-
-				// Abort early if it is excluded for this page.
-				if ( in_array( $widget, $exclude ) ) {
-					continue;
-				}
-
-				// SD V1 used to extend the widget class. V2 does not, so we cannot call register widget on it.
-				if ( is_subclass_of( $widget, 'WP_Widget' ) ) {
-					register_widget( $widget );
-				} else {
-					new $widget();
-				}
+    public function pre_get_posts( $wp_query ) {
+
+        if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
+            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+        }
+
+        return $wp_query;
+    }
+
+    /**
+     * Register widgets
+     *
+     */
+    public function register_widgets() {
+        global $pagenow;
+
+        // Currently, UX Builder does not work particulaly well with SuperDuper.
+        // So we disable our widgets when editing a page with UX Builder.
+        if ( function_exists( 'ux_builder_is_active' ) && ux_builder_is_active() ) {
+            return;
+        }
+
+        $block_widget_init_screens = function_exists( 'sd_pagenow_exclude' ) ? sd_pagenow_exclude() : array();
+
+        if ( is_admin() && $pagenow && in_array( $pagenow, $block_widget_init_screens ) ) {
+            // don't initiate in these conditions.
+        } else {
+
+            // Only load allowed widgets.
+            $exclude = function_exists( 'sd_widget_exclude' ) ? sd_widget_exclude() : array();
+            $widgets = apply_filters(
+                'getpaid_widget_classes',
+                array(
+                    'WPInv_Checkout_Widget',
+                    'WPInv_History_Widget',
+                    'WPInv_Receipt_Widget',
+                    'WPInv_Subscriptions_Widget',
+                    'WPInv_Buy_Item_Widget',
+                    'WPInv_Messages_Widget',
+                    'WPInv_GetPaid_Widget',
+                    'WPInv_Invoice_Widget',
+                )
+            );
+
+            // For each widget...
+            foreach ( $widgets as $widget ) {
+
+                // Abort early if it is excluded for this page.
+                if ( in_array( $widget, $exclude ) ) {
+                    continue;
+                }
+
+                // SD V1 used to extend the widget class. V2 does not, so we cannot call register widget on it.
+                if ( is_subclass_of( $widget, 'WP_Widget' ) ) {
+                    register_widget( $widget );
+                } else {
+                    new $widget();
+                }
 }
 }
 
-	}
+    }
+
+    /**
+     * Upgrades the database.
+     *
+     * @since 2.0.2
+     */
+    public function maybe_upgrade_database() {
+
+        $wpi_version = get_option( 'wpinv_version', 0 );
+
+        if ( $wpi_version == WPINV_VERSION ) {
+            return;
+        }
+
+        $installer = new GetPaid_Installer();
+
+        if ( empty( $wpi_version ) ) {
+            return $installer->upgrade_db( 0 );
+        }
+
+        $upgrades  = array(
+            '0.0.5'  => '004',
+            '1.0.3'  => '102',
+            '2.0.0'  => '118',
+            '2.0.8'  => '207',
+            '2.6.16' => '2615',
+        );
+
+        foreach ( $upgrades as $key => $method ) {
+
+            if ( version_compare( $wpi_version, $key, '<' ) ) {
+                return $installer->upgrade_db( $method );
+            }
+        }
+
+    }
+
+    /**
+     * Flushes the permalinks if needed.
+     *
+     * @since 2.0.8
+     */
+    public function maybe_flush_permalinks() {
+
+        $flush = get_option( 'wpinv_flush_permalinks', 0 );
+
+        if ( ! empty( $flush ) ) {
+            flush_rewrite_rules();
+            delete_option( 'wpinv_flush_permalinks' );
+        }
+
+    }
+
+    /**
+     * Remove our pages from yoast sitemaps.
+     *
+     * @since 1.0.19
+     * @param int[] $excluded_posts_ids
+     */
+    public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ) {
+
+        // Ensure that we have an array.
+        if ( ! is_array( $excluded_posts_ids ) ) {
+            $excluded_posts_ids = array();
+        }
+
+        // Prepare our pages.
+        $our_pages = array();
+
+        // Checkout page.
+        $our_pages[] = wpinv_get_option( 'checkout_page', false );
+
+        // Success page.
+        $our_pages[] = wpinv_get_option( 'success_page', false );
+
+        // Failure page.
+        $our_pages[] = wpinv_get_option( 'failure_page', false );
+
+        // History page.
+        $our_pages[] = wpinv_get_option( 'invoice_history_page', false );
 
-	/**
-	 * Upgrades the database.
-	 *
-	 * @since 2.0.2
-	 */
-	public function maybe_upgrade_database() {
+        // Subscriptions page.
+        $our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
 
-		$wpi_version = get_option( 'wpinv_version', 0 );
+        $our_pages   = array_map( 'intval', array_filter( $our_pages ) );
 
-		if ( $wpi_version == WPINV_VERSION ) {
-			return;
-		}
+        $excluded_posts_ids = $excluded_posts_ids + $our_pages;
+        return array_unique( $excluded_posts_ids );
 
-		$installer = new GetPaid_Installer();
+    }
+
+    /**
+     * Remove our pages from yoast sitemaps.
+     *
+     * @since 1.0.19
+     * @param string[] $post_types
+     */
+    public function exclude_invoicing_post_types( $post_types ) {
+
+        // Ensure that we have an array.
+        if ( ! is_array( $post_types ) ) {
+            $post_types = array();
+        }
+
+        // Remove our post types.
+        return array_diff( $post_types, array_keys( getpaid_get_invoice_post_types() ) );
+    }
+
+    /**
+     * Displays additional footer code.
+     *
+     * @since 2.0.0
+     */
+    public function wp_footer() {
+        wpinv_get_template( 'frontend-footer.php' );
+    }
 
-		if ( empty( $wpi_version ) ) {
-			return $installer->upgrade_db( 0 );
-		}
+    /**
+     * Displays additional header code.
+     *
+     * @since 2.0.0
+     */
+    public function wp_head() {
+        wpinv_get_template( 'frontend-head.php' );
+    }
 
-		$upgrades  = array(
-			'0.0.5'  => '004',
-			'1.0.3'  => '102',
-			'2.0.0'  => '118',
-			'2.0.8'  => '207',
-			'2.6.16' => '2615',
-		);
-
-		foreach ( $upgrades as $key => $method ) {
-
-			if ( version_compare( $wpi_version, $key, '<' ) ) {
-				return $installer->upgrade_db( $method );
-			}
-		}
-
-	}
-
-	/**
-	 * Flushes the permalinks if needed.
-	 *
-	 * @since 2.0.8
-	 */
-	public function maybe_flush_permalinks() {
-
-		$flush = get_option( 'wpinv_flush_permalinks', 0 );
-
-		if ( ! empty( $flush ) ) {
-			flush_rewrite_rules();
-			delete_option( 'wpinv_flush_permalinks' );
-		}
-
-	}
-
-	/**
-	 * Remove our pages from yoast sitemaps.
-	 *
-	 * @since 1.0.19
-	 * @param int[] $excluded_posts_ids
-	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ) {
-
-		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
-			$excluded_posts_ids = array();
-		}
-
-		// Prepare our pages.
-		$our_pages = array();
-
-		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
-
-		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
-
-		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
-
-		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
-
-		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
-
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
-
-		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-		return array_unique( $excluded_posts_ids );
-
-	}
-
-	/**
-	 * Remove our pages from yoast sitemaps.
-	 *
-	 * @since 1.0.19
-	 * @param string[] $post_types
-	 */
-	public function exclude_invoicing_post_types( $post_types ) {
-
-		// Ensure that we have an array.
-		if ( ! is_array( $post_types ) ) {
-			$post_types = array();
-		}
-
-		// Remove our post types.
-		return array_diff( $post_types, array_keys( getpaid_get_invoice_post_types() ) );
-	}
-
-	/**
-	 * Displays additional footer code.
-	 *
-	 * @since 2.0.0
-	 */
-	public function wp_footer() {
-		wpinv_get_template( 'frontend-footer.php' );
-	}
-
-	/**
-	 * Displays additional header code.
-	 *
-	 * @since 2.0.0
-	 */
-	public function wp_head() {
-		wpinv_get_template( 'frontend-head.php' );
-	}
-
-	/**
-	 * Custom query vars.
-	 *
-	 */
-	public function custom_query_vars( $vars ) {
+    /**
+     * Custom query vars.
+     *
+     */
+    public function custom_query_vars( $vars ) {
         $vars[] = 'getpaid-ipn';
         return $vars;
-	}
+    }
 
-	/**
-	 * Add rewrite tags and rules.
-	 *
-	 */
-	public function add_rewrite_rule() {
+    /**
+     * Add rewrite tags and rules.
+     *
+     */
+    public function add_rewrite_rule() {
         $tag = 'getpaid-ipn';
         add_rewrite_tag( "%$tag%", '([^&]+)' );
         add_rewrite_rule( "^$tag/([^/]*)/?", "index.php?$tag=\$matches[1]", 'top' );
-	}
+    }
 
-	/**
-	 * Processes non-query string ipns.
-	 *
-	 */
-	public function maybe_process_new_ipn( $query ) {
+    /**
+     * Processes non-query string ipns.
+     *
+     */
+    public function maybe_process_new_ipn( $query ) {
 
         if ( is_admin() || ! $query->is_main_query() ) {
             return;
         }
 
-		$gateway = get_query_var( 'getpaid-ipn' );
+        $gateway = get_query_var( 'getpaid-ipn' );
 
         if ( ! empty( $gateway ) ) {
 
-			$gateway = sanitize_text_field( $gateway );
-			nocache_headers();
-			do_action( 'wpinv_verify_payment_ipn', $gateway );
-			do_action( "wpinv_verify_{$gateway}_ipn" );
-			exit;
+            $gateway = sanitize_text_field( $gateway );
+            nocache_headers();
+            do_action( 'wpinv_verify_payment_ipn', $gateway );
+            do_action( "wpinv_verify_{$gateway}_ipn" );
+            exit;
 
         }
 
-	}
+    }
 
 }

Spacing +136 added lines, -136 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Invoicing class.
@@ -56,8 +56,8 @@ 
 	 * @param string $prop The prop to set.
 	 * @param mixed $value The value to retrieve.
 	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
+	public function set($prop, $value) {
+		$this->data[$prop] = $value;
 	}
 
 	/**
@@ -66,10 +66,10 @@ 
 	 * @param string $prop The prop to set.
 	 * @return mixed The value.
 	 */
-	public function get( $prop ) {
+	public function get($prop) {
 
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
+		if (isset($this->data[$prop])) {
+			return $this->data[$prop];
 		}
 
 		return null;
@@ -81,22 +81,22 @@ 
 	public function set_properties() {
 
 		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+		$this->set('session', new WPInv_Session_Handler());
+		$GLOBALS['wpi_session'] = $this->get('session'); // Backwards compatibility.
 		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
 
 		// Init other objects.
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-		$this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+		$this->set('notes', new WPInv_Notes());
+		$this->set('api', new WPInv_API());
+		$this->set('post_types', new GetPaid_Post_Types());
+		$this->set('template', new GetPaid_Template());
+		$this->set('admin', new GetPaid_Admin());
+		$this->set('subscriptions', new WPInv_Subscriptions());
+		$this->set('invoice_emails', new GetPaid_Invoice_Notification_Emails());
+		$this->set('subscription_emails', new GetPaid_Subscription_Notification_Emails());
+		$this->set('daily_maintenace', new GetPaid_Daily_Maintenance());
+		$this->set('payment_forms', new GetPaid_Payment_Forms());
+		$this->set('maxmind', new GetPaid_MaxMind_Geolocation());
 
 	}
 
@@ -104,8 +104,8 @@ 
 	 * Define plugin constants.
 	 */
 	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+		define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+		define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
 		$this->version = WPINV_VERSION;
 	}
 
@@ -116,28 +116,28 @@ 
 	 */
 	protected function init_hooks() {
 		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+		add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
 
 		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		add_action( 'init', array( $this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
-		add_action( 'wp_footer', array( $this, 'wp_footer' ) );
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-		add_action( 'widgets_init', array( $this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'the_seo_framework_sitemap_supported_post_types', array( $this, 'exclude_invoicing_post_types' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
-
-		add_filter( 'query_vars', array( $this, 'custom_query_vars' ) );
-        add_action( 'init', array( $this, 'add_rewrite_rule' ), 10, 0 );
-		add_action( 'pre_get_posts', array( $this, 'maybe_process_new_ipn' ), 1 );
+		add_action('init', array($this, 'init'), 1);
+		add_action('init', array($this, 'maybe_process_ipn'), 10);
+		add_action('init', array($this, 'wpinv_actions'));
+		add_action('init', array($this, 'maybe_do_authenticated_action'), 100);
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), 11);
+		add_action('wp_footer', array($this, 'wp_footer'));
+		add_action('wp_head', array($this, 'wp_head'));
+		add_action('widgets_init', array($this, 'register_widgets'));
+		add_filter('wpseo_exclude_from_sitemap_by_post_ids', array($this, 'wpseo_exclude_from_sitemap_by_post_ids'));
+		add_filter('the_seo_framework_sitemap_supported_post_types', array($this, 'exclude_invoicing_post_types'));
+		add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
+
+		add_filter('query_vars', array($this, 'custom_query_vars'));
+        add_action('init', array($this, 'add_rewrite_rule'), 10, 0);
+		add_action('pre_get_posts', array($this, 'maybe_process_new_ipn'), 1);
 
 		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
+		do_action('wpinv_actions', $this);
+		do_action('getpaid_actions', $this);
 
 	}
 
@@ -145,10 +145,10 @@ 
 		/* Internationalize the text strings used. */
 		$this->load_textdomain();
 
-		do_action( 'wpinv_loaded' );
+		do_action('wpinv_loaded');
 
 		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
+		if (function_exists('ct_css_output')) {
 			wpinv_oxygen_fix_conflict();
 		}
 	}
@@ -169,7 +169,7 @@ 
 		load_plugin_textdomain(
 			'invoicing',
 			false,
-			plugin_basename( dirname( WPINV_PLUGIN_FILE ) ) . '/languages/'
+			plugin_basename(dirname(WPINV_PLUGIN_FILE)) . '/languages/'
 		);
 
 	}
@@ -205,9 +205,9 @@ 
 
 		// Register autoloader.
 		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+			spl_autoload_register(array($this, 'autoload'), true);
+		} catch (Exception $e) {
+			wpinv_error_log($e->getMessage(), '', __FILE__, 149, true);
 		}
 
 		require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php';
@@ -233,7 +233,7 @@ 
 		require_once WPINV_PLUGIN_DIR . 'widgets/invoice.php';
 		require_once WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php';
 
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+		if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
 			GetPaid_Post_Types_Admin::init();
 
 			require_once WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php';
@@ -244,15 +244,15 @@ 
 			require_once WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php';
 			// load the user class only on the users.php page
 			global $pagenow;
-			if ( $pagenow == 'users.php' ) {
+			if ($pagenow == 'users.php') {
 				new WPInv_Admin_Users();
 			}
 		}
 
 		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
+		if (defined('WP_CLI') && WP_CLI) {
 			require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php';
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+			WP_CLI::add_command('invoicing', 'WPInv_CLI');
 		}
 
 	}
@@ -265,21 +265,21 @@ 
 	 * @since       1.0.19
 	 * @return      void
 	 */
-	public function autoload( $class_name ) {
+	public function autoload($class_name) {
 
 		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
+		$class_name = strtolower($class_name);
 
 		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+		if (false === strpos($class_name, 'getpaid_') && false === strpos($class_name, 'wpinv_')) {
 			return;
 		}
 
 		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+		$file_name = 'class-' . str_replace('_', '-', $class_name) . '.php';
 
 		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+		$plugin_path = untrailingslashit(WPINV_PLUGIN_DIR);
 
 		// And an array of possible locations in order of importance.
 		$locations = array(
@@ -294,10 +294,10 @@ 
 			"$plugin_path/includes/admin/meta-boxes",
 		);
 
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+		foreach (apply_filters('getpaid_autoload_locations', $locations) as $location) {
 
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
+			if (file_exists(trailingslashit($location) . $file_name)) {
+				include trailingslashit($location) . $file_name;
 				break;
 			}
 }
@@ -310,7 +310,7 @@ 
 	public function init() {
 
 		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
+		do_action('before_getpaid_init', $this);
 
 		// Maybe upgrade.
 		$this->maybe_upgrade_database();
@@ -327,17 +327,17 @@ 
 			)
 		);
 
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
+		foreach ($gateways as $id => $class) {
+			$this->gateways[$id] = new $class();
 		}
 
-		if ( 'yes' != get_option( 'wpinv_renamed_gateways' ) ) {
+		if ('yes' != get_option('wpinv_renamed_gateways')) {
 			GetPaid_Installer::rename_gateways_label();
-			update_option( 'wpinv_renamed_gateways', 'yes' );
+			update_option('wpinv_renamed_gateways', 'yes');
 		}
 
 		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
+		do_action('getpaid_init', $this);
 
 	}
 
@@ -347,14 +347,14 @@ 
 	public function maybe_process_ipn() {
 
 		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+		if (empty($_GET['wpi-listener']) || 'IPN' !== $_GET['wpi-listener'] || empty($_GET['wpi-gateway'])) {
 			return;
 		}
 
-		$gateway = sanitize_text_field( $_GET['wpi-gateway'] );
+		$gateway = sanitize_text_field($_GET['wpi-gateway']);
 
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
+		do_action('wpinv_verify_payment_ipn', $gateway);
+		do_action("wpinv_verify_{$gateway}_ipn");
 		exit;
 
 	}
@@ -362,24 +362,24 @@ 
 	public function enqueue_scripts() {
 
 		// Fires before adding scripts.
-		do_action( 'getpaid_enqueue_scripts' );
+		do_action('getpaid_enqueue_scripts');
 
 		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
+		$localize['ajax_url']             = admin_url('admin-ajax.php');
 		$localize['thousands']            = wpinv_thousands_separator();
 		$localize['decimals']             = wpinv_decimal_separator();
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
+		$localize['nonce']                = wp_create_nonce('wpinv-nonce');
+		$localize['txtComplete']          = __('Continue', 'invoicing');
 		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['loading']              = __( 'Loading...', 'invoicing' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+		$localize['formNonce']            = wp_create_nonce('getpaid_form_nonce');
+		$localize['loading']              = __('Loading...', 'invoicing');
+		$localize['connectionError']      = __('Could not establish a connection to the server.', 'invoicing');
 		$localize['recaptchaSettings']    = getpaid_get_recaptcha_settings();
 
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
+		$localize = apply_filters('wpinv_front_js_localize', $localize);
 
 		// reCaptcha.
-		if ( getpaid_is_recaptcha_enabled() ) {
+		if (getpaid_is_recaptcha_enabled()) {
 			$url = apply_filters(
 				'getpaid_recaptcha_api_url',
 				add_query_arg(
@@ -389,21 +389,21 @@ 
 					'https://www.google.com/recaptcha/api.js'
 				)
 			);
-			wp_enqueue_script( 'recaptcha', $url, array(), null, true ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
+			wp_enqueue_script('recaptcha', $url, array(), null, true); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
 		}
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'jquery' ), $version, true );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js');
+		wp_enqueue_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array('jquery'), $version, true);
+		wp_localize_script('wpinv-front-script', 'WPInv', $localize);
 	}
 
 	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+		if (isset($_REQUEST['wpi_action'])) {
+			do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
 		}
 
-		if ( defined( 'WP_ALL_IMPORT_ROOT_DIR' ) ) {
-			include plugin_dir_path( __FILE__ ) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
+		if (defined('WP_ALL_IMPORT_ROOT_DIR')) {
+			include plugin_dir_path(__FILE__) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
 		}
 	}
 
@@ -415,24 +415,24 @@ 
      */
     public function maybe_do_authenticated_action() {
 
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+		if (isset($_REQUEST['getpaid-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
 
-			$key  = sanitize_key( $_REQUEST['getpaid-action'] );
-			$data = wp_unslash( $_REQUEST );
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $data );
+			$key  = sanitize_key($_REQUEST['getpaid-action']);
+			$data = wp_unslash($_REQUEST);
+			if (is_user_logged_in()) {
+				do_action("getpaid_authenticated_action_$key", $data);
 			}
 
-			do_action( "getpaid_unauthenticated_action_$key", $data );
+			do_action("getpaid_unauthenticated_action_$key", $data);
 
 		}
 
     }
 
-	public function pre_get_posts( $wp_query ) {
+	public function pre_get_posts($wp_query) {
 
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+		if (!is_admin() && !empty($wp_query->query_vars['post_type']) && getpaid_is_invoice_post_type($wp_query->query_vars['post_type']) && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+			$wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses(false, false, $wp_query->query_vars['post_type']));
 		}
 
 		return $wp_query;
@@ -447,18 +447,18 @@ 
 
 		// Currently, UX Builder does not work particulaly well with SuperDuper.
 		// So we disable our widgets when editing a page with UX Builder.
-		if ( function_exists( 'ux_builder_is_active' ) && ux_builder_is_active() ) {
+		if (function_exists('ux_builder_is_active') && ux_builder_is_active()) {
 			return;
 		}
 
-		$block_widget_init_screens = function_exists( 'sd_pagenow_exclude' ) ? sd_pagenow_exclude() : array();
+		$block_widget_init_screens = function_exists('sd_pagenow_exclude') ? sd_pagenow_exclude() : array();
 
-		if ( is_admin() && $pagenow && in_array( $pagenow, $block_widget_init_screens ) ) {
+		if (is_admin() && $pagenow && in_array($pagenow, $block_widget_init_screens)) {
 			// don't initiate in these conditions.
 		} else {
 
 			// Only load allowed widgets.
-			$exclude = function_exists( 'sd_widget_exclude' ) ? sd_widget_exclude() : array();
+			$exclude = function_exists('sd_widget_exclude') ? sd_widget_exclude() : array();
 			$widgets = apply_filters(
 				'getpaid_widget_classes',
 				array(
@@ -474,16 +474,16 @@ 
 			);
 
 			// For each widget...
-			foreach ( $widgets as $widget ) {
+			foreach ($widgets as $widget) {
 
 				// Abort early if it is excluded for this page.
-				if ( in_array( $widget, $exclude ) ) {
+				if (in_array($widget, $exclude)) {
 					continue;
 				}
 
 				// SD V1 used to extend the widget class. V2 does not, so we cannot call register widget on it.
-				if ( is_subclass_of( $widget, 'WP_Widget' ) ) {
-					register_widget( $widget );
+				if (is_subclass_of($widget, 'WP_Widget')) {
+					register_widget($widget);
 				} else {
 					new $widget();
 				}
@@ -499,19 +499,19 @@ 
 	 */
 	public function maybe_upgrade_database() {
 
-		$wpi_version = get_option( 'wpinv_version', 0 );
+		$wpi_version = get_option('wpinv_version', 0);
 
-		if ( $wpi_version == WPINV_VERSION ) {
+		if ($wpi_version == WPINV_VERSION) {
 			return;
 		}
 
 		$installer = new GetPaid_Installer();
 
-		if ( empty( $wpi_version ) ) {
-			return $installer->upgrade_db( 0 );
+		if (empty($wpi_version)) {
+			return $installer->upgrade_db(0);
 		}
 
-		$upgrades  = array(
+		$upgrades = array(
 			'0.0.5'  => '004',
 			'1.0.3'  => '102',
 			'2.0.0'  => '118',
@@ -519,10 +519,10 @@ 
 			'2.6.16' => '2615',
 		);
 
-		foreach ( $upgrades as $key => $method ) {
+		foreach ($upgrades as $key => $method) {
 
-			if ( version_compare( $wpi_version, $key, '<' ) ) {
-				return $installer->upgrade_db( $method );
+			if (version_compare($wpi_version, $key, '<')) {
+				return $installer->upgrade_db($method);
 			}
 		}
 
@@ -535,11 +535,11 @@ 
 	 */
 	public function maybe_flush_permalinks() {
 
-		$flush = get_option( 'wpinv_flush_permalinks', 0 );
+		$flush = get_option('wpinv_flush_permalinks', 0);
 
-		if ( ! empty( $flush ) ) {
+		if (!empty($flush)) {
 			flush_rewrite_rules();
-			delete_option( 'wpinv_flush_permalinks' );
+			delete_option('wpinv_flush_permalinks');
 		}
 
 	}
@@ -550,10 +550,10 @@ 
 	 * @since 1.0.19
 	 * @param int[] $excluded_posts_ids
 	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ) {
+	public function wpseo_exclude_from_sitemap_by_post_ids($excluded_posts_ids) {
 
 		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
+		if (!is_array($excluded_posts_ids)) {
 			$excluded_posts_ids = array();
 		}
 
@@ -561,24 +561,24 @@ 
 		$our_pages = array();
 
 		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
+		$our_pages[] = wpinv_get_option('checkout_page', false);
 
 		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
+		$our_pages[] = wpinv_get_option('success_page', false);
 
 		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
+		$our_pages[] = wpinv_get_option('failure_page', false);
 
 		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+		$our_pages[] = wpinv_get_option('invoice_history_page', false);
 
 		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+		$our_pages[] = wpinv_get_option('invoice_subscription_page', false);
 
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+		$our_pages   = array_map('intval', array_filter($our_pages));
 
 		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-		return array_unique( $excluded_posts_ids );
+		return array_unique($excluded_posts_ids);
 
 	}
 
@@ -588,15 +588,15 @@ 
 	 * @since 1.0.19
 	 * @param string[] $post_types
 	 */
-	public function exclude_invoicing_post_types( $post_types ) {
+	public function exclude_invoicing_post_types($post_types) {
 
 		// Ensure that we have an array.
-		if ( ! is_array( $post_types ) ) {
+		if (!is_array($post_types)) {
 			$post_types = array();
 		}
 
 		// Remove our post types.
-		return array_diff( $post_types, array_keys( getpaid_get_invoice_post_types() ) );
+		return array_diff($post_types, array_keys(getpaid_get_invoice_post_types()));
 	}
 
 	/**
@@ -605,7 +605,7 @@ 
 	 * @since 2.0.0
 	 */
 	public function wp_footer() {
-		wpinv_get_template( 'frontend-footer.php' );
+		wpinv_get_template('frontend-footer.php');
 	}
 
 	/**
@@ -614,14 +614,14 @@ 
 	 * @since 2.0.0
 	 */
 	public function wp_head() {
-		wpinv_get_template( 'frontend-head.php' );
+		wpinv_get_template('frontend-head.php');
 	}
 
 	/**
 	 * Custom query vars.
 	 *
 	 */
-	public function custom_query_vars( $vars ) {
+	public function custom_query_vars($vars) {
         $vars[] = 'getpaid-ipn';
         return $vars;
 	}
@@ -632,28 +632,28 @@ 
 	 */
 	public function add_rewrite_rule() {
         $tag = 'getpaid-ipn';
-        add_rewrite_tag( "%$tag%", '([^&]+)' );
-        add_rewrite_rule( "^$tag/([^/]*)/?", "index.php?$tag=\$matches[1]", 'top' );
+        add_rewrite_tag("%$tag%", '([^&]+)');
+        add_rewrite_rule("^$tag/([^/]*)/?", "index.php?$tag=\$matches[1]", 'top');
 	}
 
 	/**
 	 * Processes non-query string ipns.
 	 *
 	 */
-	public function maybe_process_new_ipn( $query ) {
+	public function maybe_process_new_ipn($query) {
 
-        if ( is_admin() || ! $query->is_main_query() ) {
+        if (is_admin() || !$query->is_main_query()) {
             return;
         }
 
-		$gateway = get_query_var( 'getpaid-ipn' );
+		$gateway = get_query_var('getpaid-ipn');
 
-        if ( ! empty( $gateway ) ) {
+        if (!empty($gateway)) {
 
-			$gateway = sanitize_text_field( $gateway );
+			$gateway = sanitize_text_field($gateway);
 			nocache_headers();
-			do_action( 'wpinv_verify_payment_ipn', $gateway );
-			do_action( "wpinv_verify_{$gateway}_ipn" );
+			do_action('wpinv_verify_payment_ipn', $gateway);
+			do_action("wpinv_verify_{$gateway}_ipn");
 			exit;
 
         }

includes/wpinv-payment-functions.php

Indentation +272 added lines, -272 removed lines

@@ -1,196 +1,196 @@ 
 <?php
 function wpinv_is_subscription_payment( $invoice = '' ) {
-	if ( empty( $invoice ) ) {
-		return false;
-	}
+    if ( empty( $invoice ) ) {
+        return false;
+    }
 
-	if ( ! is_object( $invoice ) && is_scalar( $invoice ) ) {
-		$invoice = wpinv_get_invoice( $invoice );
-	}
+    if ( ! is_object( $invoice ) && is_scalar( $invoice ) ) {
+        $invoice = wpinv_get_invoice( $invoice );
+    }
 
-	if ( empty( $invoice ) ) {
-		return false;
-	}
+    if ( empty( $invoice ) ) {
+        return false;
+    }
 
-	if ( $invoice->is_renewal() ) {
-		return true;
-	}
+    if ( $invoice->is_renewal() ) {
+        return true;
+    }
 
-	return false;
+    return false;
 }
 
 function wpinv_payment_link_transaction_id( $invoice = '' ) {
-	if ( empty( $invoice ) ) {
-		return false;
-	}
+    if ( empty( $invoice ) ) {
+        return false;
+    }
 
-	if ( ! is_object( $invoice ) && is_scalar( $invoice ) ) {
-		$invoice = wpinv_get_invoice( $invoice );
-	}
+    if ( ! is_object( $invoice ) && is_scalar( $invoice ) ) {
+        $invoice = wpinv_get_invoice( $invoice );
+    }
 
-	if ( empty( $invoice ) ) {
-		return false;
-	}
+    if ( empty( $invoice ) ) {
+        return false;
+    }
 
-	return apply_filters( 'wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice );
+    return apply_filters( 'wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice );
 }
 
 function wpinv_subscription_initial_payment_desc( $amount, $period, $interval, $trial_period = '', $trial_interval = 0 ) {
-	$interval   = (int)$interval > 0 ? (int)$interval : 1;
-
-	if ( $trial_interval > 0 && ! empty( $trial_period ) ) {
-		$amount = __( 'Free', 'invoicing' );
-		$interval = $trial_interval;
-		$period = $trial_period;
-	}
-
-	$description = '';
-	switch ( $period ) {
-		case 'D':
-		case 'day':
-			$description = wp_sprintf( _n( '%s for the first day.', '%1$s for the first %2$d days.', $interval, 'invoicing' ), $amount, $interval );
-			break;
-		case 'W':
-		case 'week':
-			$description = wp_sprintf( _n( '%s for the first week.', '%1$s for the first %2$d weeks.', $interval, 'invoicing' ), $amount, $interval );
-			break;
-		case 'M':
-		case 'month':
-			$description = wp_sprintf( _n( '%s for the first month.', '%1$s for the first %2$d months.', $interval, 'invoicing' ), $amount, $interval );
-			break;
-		case 'Y':
-		case 'year':
-			$description = wp_sprintf( _n( '%s for the first year.', '%1$s for the first %2$d years.', $interval, 'invoicing' ), $amount, $interval );
-			break;
-	}
-
-	return apply_filters( 'wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval );
+    $interval   = (int)$interval > 0 ? (int)$interval : 1;
+
+    if ( $trial_interval > 0 && ! empty( $trial_period ) ) {
+        $amount = __( 'Free', 'invoicing' );
+        $interval = $trial_interval;
+        $period = $trial_period;
+    }
+
+    $description = '';
+    switch ( $period ) {
+        case 'D':
+        case 'day':
+            $description = wp_sprintf( _n( '%s for the first day.', '%1$s for the first %2$d days.', $interval, 'invoicing' ), $amount, $interval );
+            break;
+        case 'W':
+        case 'week':
+            $description = wp_sprintf( _n( '%s for the first week.', '%1$s for the first %2$d weeks.', $interval, 'invoicing' ), $amount, $interval );
+            break;
+        case 'M':
+        case 'month':
+            $description = wp_sprintf( _n( '%s for the first month.', '%1$s for the first %2$d months.', $interval, 'invoicing' ), $amount, $interval );
+            break;
+        case 'Y':
+        case 'year':
+            $description = wp_sprintf( _n( '%s for the first year.', '%1$s for the first %2$d years.', $interval, 'invoicing' ), $amount, $interval );
+            break;
+    }
+
+    return apply_filters( 'wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval );
 }
 
 function wpinv_subscription_recurring_payment_desc( $amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0 ) {
-	$interval   = (int)$interval > 0 ? (int)$interval : 1;
-	$bill_times = (int)$bill_times > 0 ? (int)$bill_times : 0;
-
-	$description = '';
-	switch ( $period ) {
-		case 'D':
-		case 'day':
-			if ( (int)$bill_times > 0 ) {
-				if ( $interval > 1 ) {
-					if ( $bill_times > 1 ) {
-						$description = wp_sprintf( __( '%1$s for each %2$d days, for %3$d installments.', 'invoicing' ), $amount, $interval, $bill_times );
-					} else {
-						$description = wp_sprintf( __( '%1$s for %2$d days.', 'invoicing' ), $amount, $interval );
-					}
-				} else {
-					$description = wp_sprintf( _n( '%s for one day.', '%1$s for each day, for %2$d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
-				}
-			} else {
-				$description = wp_sprintf( _n( '%s for each day.', '%1$s for each %2$d days.', $interval, 'invoicing' ), $amount, $interval );
-			}
-			break;
-		case 'W':
-		case 'week':
-			if ( (int)$bill_times > 0 ) {
-				if ( $interval > 1 ) {
-					if ( $bill_times > 1 ) {
-						$description = wp_sprintf( __( '%1$s for each %2$d weeks, for %3$d installments.', 'invoicing' ), $amount, $interval, $bill_times );
-					} else {
-						$description = wp_sprintf( __( '%1$s for %2$d weeks.', 'invoicing' ), $amount, $interval );
-					}
-				} else {
-					$description = wp_sprintf( _n( '%s for one week.', '%1$s for each week, for %2$d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
-				}
-			} else {
-				$description = wp_sprintf( _n( '%s for each week.', '%1$s for each %2$d weeks.', $interval, 'invoicing' ), $amount, $interval );
-			}
-			break;
-		case 'M':
-		case 'month':
-			if ( (int)$bill_times > 0 ) {
-				if ( $interval > 1 ) {
-					if ( $bill_times > 1 ) {
-						$description = wp_sprintf( __( '%1$s for each %2$d months, for %3$d installments.', 'invoicing' ), $amount, $interval, $bill_times );
-					} else {
-						$description = wp_sprintf( __( '%1$s for %2$d months.', 'invoicing' ), $amount, $interval );
-					}
-				} else {
-					$description = wp_sprintf( _n( '%s for one month.', '%1$s for each month, for %2$d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
-				}
-			} else {
-				$description = wp_sprintf( _n( '%s for each month.', '%1$s for each %2$d months.', $interval, 'invoicing' ), $amount, $interval );
-			}
-			break;
-		case 'Y':
-		case 'year':
-			if ( (int)$bill_times > 0 ) {
-				if ( $interval > 1 ) {
-					if ( $bill_times > 1 ) {
-						$description = wp_sprintf( __( '%1$s for each %2$d years, for %3$d installments.', 'invoicing' ), $amount, $interval, $bill_times );
-					} else {
-						$description = wp_sprintf( __( '%1$s for %2$d years.', 'invoicing' ), $amount, $interval );
-					}
-				} else {
-					$description = wp_sprintf( _n( '%s for one year.', '%1$s for each year, for %2$d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
-				}
-			} else {
-				$description = wp_sprintf( _n( '%s for each year.', '%1$s for each %2$d years.', $interval, 'invoicing' ), $amount, $interval );
-			}
-			break;
-	}
-
-	return apply_filters( 'wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    $interval   = (int)$interval > 0 ? (int)$interval : 1;
+    $bill_times = (int)$bill_times > 0 ? (int)$bill_times : 0;
+
+    $description = '';
+    switch ( $period ) {
+        case 'D':
+        case 'day':
+            if ( (int)$bill_times > 0 ) {
+                if ( $interval > 1 ) {
+                    if ( $bill_times > 1 ) {
+                        $description = wp_sprintf( __( '%1$s for each %2$d days, for %3$d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+                    } else {
+                        $description = wp_sprintf( __( '%1$s for %2$d days.', 'invoicing' ), $amount, $interval );
+                    }
+                } else {
+                    $description = wp_sprintf( _n( '%s for one day.', '%1$s for each day, for %2$d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                }
+            } else {
+                $description = wp_sprintf( _n( '%s for each day.', '%1$s for each %2$d days.', $interval, 'invoicing' ), $amount, $interval );
+            }
+            break;
+        case 'W':
+        case 'week':
+            if ( (int)$bill_times > 0 ) {
+                if ( $interval > 1 ) {
+                    if ( $bill_times > 1 ) {
+                        $description = wp_sprintf( __( '%1$s for each %2$d weeks, for %3$d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+                    } else {
+                        $description = wp_sprintf( __( '%1$s for %2$d weeks.', 'invoicing' ), $amount, $interval );
+                    }
+                } else {
+                    $description = wp_sprintf( _n( '%s for one week.', '%1$s for each week, for %2$d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                }
+            } else {
+                $description = wp_sprintf( _n( '%s for each week.', '%1$s for each %2$d weeks.', $interval, 'invoicing' ), $amount, $interval );
+            }
+            break;
+        case 'M':
+        case 'month':
+            if ( (int)$bill_times > 0 ) {
+                if ( $interval > 1 ) {
+                    if ( $bill_times > 1 ) {
+                        $description = wp_sprintf( __( '%1$s for each %2$d months, for %3$d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+                    } else {
+                        $description = wp_sprintf( __( '%1$s for %2$d months.', 'invoicing' ), $amount, $interval );
+                    }
+                } else {
+                    $description = wp_sprintf( _n( '%s for one month.', '%1$s for each month, for %2$d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                }
+            } else {
+                $description = wp_sprintf( _n( '%s for each month.', '%1$s for each %2$d months.', $interval, 'invoicing' ), $amount, $interval );
+            }
+            break;
+        case 'Y':
+        case 'year':
+            if ( (int)$bill_times > 0 ) {
+                if ( $interval > 1 ) {
+                    if ( $bill_times > 1 ) {
+                        $description = wp_sprintf( __( '%1$s for each %2$d years, for %3$d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+                    } else {
+                        $description = wp_sprintf( __( '%1$s for %2$d years.', 'invoicing' ), $amount, $interval );
+                    }
+                } else {
+                    $description = wp_sprintf( _n( '%s for one year.', '%1$s for each year, for %2$d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                }
+            } else {
+                $description = wp_sprintf( _n( '%s for each year.', '%1$s for each %2$d years.', $interval, 'invoicing' ), $amount, $interval );
+            }
+            break;
+    }
+
+    return apply_filters( 'wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
 }
 
 function wpinv_subscription_payment_desc( $invoice ) {
-	if ( empty( $invoice ) ) {
-		return null;
-	}
-
-	$description = '';
-	if ( $invoice->is_parent() && $item = $invoice->get_recurring( true ) ) {
-		if ( $item->has_free_trial() ) {
-			$trial_period = $item->get_trial_period();
-			$trial_interval = $item->get_trial_interval();
-		} else {
-			$trial_period = '';
-			$trial_interval = 0;
-		}
-
-		$description = wpinv_get_billing_cycle( $invoice->get_total(), $invoice->get_recurring_details( 'total' ), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency() );
-	}
-
-	return apply_filters( 'wpinv_subscription_payment_desc', $description, $invoice );
+    if ( empty( $invoice ) ) {
+        return null;
+    }
+
+    $description = '';
+    if ( $invoice->is_parent() && $item = $invoice->get_recurring( true ) ) {
+        if ( $item->has_free_trial() ) {
+            $trial_period = $item->get_trial_period();
+            $trial_interval = $item->get_trial_interval();
+        } else {
+            $trial_period = '';
+            $trial_interval = 0;
+        }
+
+        $description = wpinv_get_billing_cycle( $invoice->get_total(), $invoice->get_recurring_details( 'total' ), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency() );
+    }
+
+    return apply_filters( 'wpinv_subscription_payment_desc', $description, $invoice );
 }
 
 function wpinv_get_billing_cycle( $initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '' ) {
-	$initial_total      = wpinv_round_amount( $initial );
-	$recurring_total    = wpinv_round_amount( $recurring );
+    $initial_total      = wpinv_round_amount( $initial );
+    $recurring_total    = wpinv_round_amount( $recurring );
 
-	if ( $trial_interval > 0 && ! empty( $trial_period ) ) {
-		// Free trial
-	} else {
-		if ( $bill_times == 1 ) {
-			$recurring_total = $initial_total;
-		} elseif ( $bill_times > 1 && $initial_total != $recurring_total ) {
-			$bill_times--;
-		}
-	}
+    if ( $trial_interval > 0 && ! empty( $trial_period ) ) {
+        // Free trial
+    } else {
+        if ( $bill_times == 1 ) {
+            $recurring_total = $initial_total;
+        } elseif ( $bill_times > 1 && $initial_total != $recurring_total ) {
+            $bill_times--;
+        }
+    }
 
-	$initial_amount     = wpinv_price( $initial_total, $currency );
-	$recurring_amount   = wpinv_price( $recurring_total, $currency );
+    $initial_amount     = wpinv_price( $initial_total, $currency );
+    $recurring_amount   = wpinv_price( $recurring_total, $currency );
 
-	$recurring          = wpinv_subscription_recurring_payment_desc( $recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    $recurring          = wpinv_subscription_recurring_payment_desc( $recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
 
-	if ( $initial_total != $recurring_total ) {
-		$initial        = wpinv_subscription_initial_payment_desc( $initial_amount, $period, $interval, $trial_period, $trial_interval );
+    if ( $initial_total != $recurring_total ) {
+        $initial        = wpinv_subscription_initial_payment_desc( $initial_amount, $period, $interval, $trial_period, $trial_interval );
 
-		$description    = wp_sprintf( __( '%1$s Then %2$s', 'invoicing' ), $initial, $recurring );
-	} else {
-		$description    = $recurring;
-	}
+        $description    = wp_sprintf( __( '%1$s Then %2$s', 'invoicing' ), $initial, $recurring );
+    } else {
+        $description    = $recurring;
+    }
 
-	return apply_filters( 'wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency );
+    return apply_filters( 'wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency );
 }
 
 /**
@@ -202,25 +202,25 @@ 
  */
 function getpaid_get_card_name( $card_number ) {
 
-	// Known regexes.
-	$regexes = array(
-		'/^4/'                     => __( 'Visa', 'invoicing' ),
-		'/^5[1-5]/'                => __( 'Mastercard', 'invoicing' ),
-		'/^3[47]/'                 => __( 'Amex', 'invoicing' ),
-		'/^3(?:0[0-5]|[68])/'      => __( 'Diners Club', 'invoicing' ),
-		'/^6(?:011|5)/'            => __( 'Discover', 'invoicing' ),
-		'/^(?:2131|1800|35\d{3})/' => __( 'JCB', 'invoicing' ),
-	);
-
-	// Confirm if one matches.
-	foreach ( $regexes as $regex => $card ) {
-		if ( preg_match( $regex, $card_number ) >= 1 ) {
-			return $card;
-		}
-	}
-
-	// None matched.
-	return __( 'Card', 'invoicing' );
+    // Known regexes.
+    $regexes = array(
+        '/^4/'                     => __( 'Visa', 'invoicing' ),
+        '/^5[1-5]/'                => __( 'Mastercard', 'invoicing' ),
+        '/^3[47]/'                 => __( 'Amex', 'invoicing' ),
+        '/^3(?:0[0-5]|[68])/'      => __( 'Diners Club', 'invoicing' ),
+        '/^6(?:011|5)/'            => __( 'Discover', 'invoicing' ),
+        '/^(?:2131|1800|35\d{3})/' => __( 'JCB', 'invoicing' ),
+    );
+
+    // Confirm if one matches.
+    foreach ( $regexes as $regex => $card ) {
+        if ( preg_match( $regex, $card_number ) >= 1 ) {
+            return $card;
+        }
+    }
+
+    // None matched.
+    return __( 'Card', 'invoicing' );
 
 }
 
@@ -230,24 +230,24 @@ 
  * @param WPInv_Invoice|int|null $invoice
  */
 function wpinv_send_back_to_checkout( $invoice = null ) {
-	$response = array( 'success' => false );
-	$invoice  = wpinv_get_invoice( $invoice );
-
-	// Was an invoice created?
-	if ( ! empty( $invoice ) ) {
-		$invoice             = is_scalar( $invoice ) ? new WPInv_Invoice( $invoice ) : $invoice;
-		$response['invoice'] = $invoice->get_id();
-		do_action( 'getpaid_checkout_invoice_exception', $invoice );
-	}
-
-	// Do we have any errors?
-	if ( wpinv_get_errors() ) {
-		$response['data'] = getpaid_get_errors_html( true, false );
-	} else {
-		$response['data'] = __( 'An error occured while processing your payment. Please try again.', 'invoicing' );
-	}
-
-	wp_send_json( $response );
+    $response = array( 'success' => false );
+    $invoice  = wpinv_get_invoice( $invoice );
+
+    // Was an invoice created?
+    if ( ! empty( $invoice ) ) {
+        $invoice             = is_scalar( $invoice ) ? new WPInv_Invoice( $invoice ) : $invoice;
+        $response['invoice'] = $invoice->get_id();
+        do_action( 'getpaid_checkout_invoice_exception', $invoice );
+    }
+
+    // Do we have any errors?
+    if ( wpinv_get_errors() ) {
+        $response['data'] = getpaid_get_errors_html( true, false );
+    } else {
+        $response['data'] = __( 'An error occured while processing your payment. Please try again.', 'invoicing' );
+    }
+
+    wp_send_json( $response );
 }
 
 /**
@@ -256,7 +256,7 @@ 
  * @return string
  */
 function getpaid_get_recaptcha_site_key() {
-	return apply_filters( 'getpaid_recaptcha_site_key', wpinv_get_option( 'recaptcha_site_key', '' ) );
+    return apply_filters( 'getpaid_recaptcha_site_key', wpinv_get_option( 'recaptcha_site_key', '' ) );
 }
 
 /**
@@ -265,7 +265,7 @@ 
  * @return string
  */
 function getpaid_get_recaptcha_secret_key() {
-	return apply_filters( 'getpaid_recaptcha_secret_key', wpinv_get_option( 'recaptcha_secret_key', '' ) );
+    return apply_filters( 'getpaid_recaptcha_secret_key', wpinv_get_option( 'recaptcha_secret_key', '' ) );
 }
 
 /**
@@ -274,7 +274,7 @@ 
  * @return bool
  */
 function getpaid_is_recaptcha_enabled() {
-	return wpinv_get_option( 'enable_recaptcha', false ) && getpaid_get_recaptcha_site_key() && getpaid_get_recaptcha_secret_key();
+    return wpinv_get_option( 'enable_recaptcha', false ) && getpaid_get_recaptcha_site_key() && getpaid_get_recaptcha_secret_key();
 }
 
 /**
@@ -283,7 +283,7 @@ 
  * @return string
  */
 function getpaid_get_recaptcha_version() {
-	return apply_filters( 'getpaid_recaptcha_version', wpinv_get_option( 'recaptcha_version', 'v2' ) );
+    return apply_filters( 'getpaid_recaptcha_version', wpinv_get_option( 'recaptcha_version', 'v2' ) );
 }
 
 /**
@@ -292,42 +292,42 @@ 
  * @return array
  */
 function getpaid_get_recaptcha_settings() {
-	$settings = array(
-		'enabled' => getpaid_is_recaptcha_enabled(),
-		'version' => getpaid_get_recaptcha_version(),
-	);
-
-	if ( ! getpaid_is_recaptcha_enabled() ) {
-		return $settings;
-	}
-
-	$settings['sitekey'] = getpaid_get_recaptcha_site_key();
-
-	// Version 2 render params.
-	if ( 'v2' === getpaid_get_recaptcha_version() ) {
-		$settings['render_params'] = array(
-			'sitekey'  => getpaid_get_recaptcha_site_key(),
-			'theme'    => 'light',
-			'size'     => 'normal',
-			'tabindex' => 0,
-		);
-	}
-
-	return apply_filters( 'getpaid_recaptcha_settings', $settings );
+    $settings = array(
+        'enabled' => getpaid_is_recaptcha_enabled(),
+        'version' => getpaid_get_recaptcha_version(),
+    );
+
+    if ( ! getpaid_is_recaptcha_enabled() ) {
+        return $settings;
+    }
+
+    $settings['sitekey'] = getpaid_get_recaptcha_site_key();
+
+    // Version 2 render params.
+    if ( 'v2' === getpaid_get_recaptcha_version() ) {
+        $settings['render_params'] = array(
+            'sitekey'  => getpaid_get_recaptcha_site_key(),
+            'theme'    => 'light',
+            'size'     => 'normal',
+            'tabindex' => 0,
+        );
+    }
+
+    return apply_filters( 'getpaid_recaptcha_settings', $settings );
 }
 
 /**
  * Displays reCAPTCHA before payment button.
  */
 function getpaid_display_recaptcha_before_payment_button() {
-	if ( ! getpaid_is_recaptcha_enabled() || 'v2' !== getpaid_get_recaptcha_version() ) {
-		return;
-	}
-
-	printf(
-		'<div class="getpaid-recaptcha-wrapper"><div class="g-recaptcha mw-100 overflow-hidden my-2" id="getpaid-recaptcha-%s"></div></div>',
-		esc_attr( wp_unique_id() )
-	);
+    if ( ! getpaid_is_recaptcha_enabled() || 'v2' !== getpaid_get_recaptcha_version() ) {
+        return;
+    }
+
+    printf(
+        '<div class="getpaid-recaptcha-wrapper"><div class="g-recaptcha mw-100 overflow-hidden my-2" id="getpaid-recaptcha-%s"></div></div>',
+        esc_attr( wp_unique_id() )
+    );
 }
 add_action( 'getpaid_before_payment_form_pay_button', 'getpaid_display_recaptcha_before_payment_button' );
 
@@ -338,43 +338,43 @@ 
  */
 function getpaid_validate_recaptcha_response( $submission ) {
 
-	// Check if reCAPTCHA is enabled.
-	if ( ! getpaid_is_recaptcha_enabled() ) {
-		return;
-	}
-
-	$token = $submission->get_field( 'g-recaptcha-response' );
-
-	// Abort if no token was provided.
-	if ( empty( $token ) ) {
-		wp_send_json_error( 'v2' === getpaid_get_recaptcha_version() ? __( 'Please confirm that you are not a robot.', 'invoicing' ) : __( "Unable to verify that you're not a robot. Please try again.", 'invoicing' ) );
-	}
-
-	$result = wp_remote_post(
-		'https://www.google.com/recaptcha/api/siteverify',
-		array(
-			'body' => array(
-				'secret'   => getpaid_get_recaptcha_secret_key(),
-				'response' => $token,
-			),
-		)
-	);
-
-	// Site not reachable, give benefit of doubt.
-	if ( is_wp_error( $result ) ) {
-		return;
-	}
-
-	$result = json_decode( wp_remote_retrieve_body( $result ), true );
-
-	if ( empty( $result['success'] ) && ! in_array( 'missing-input-secret', $result['error-codes'], true ) && ! in_array( 'invalid-input-secret', $result['error-codes'], true ) ) {
-		wp_send_json_error( __( "Unable to verify that you're not a robot. Please try again.", 'invoicing' ) );
-	}
-
-	// For v3, check the score.
-	$minimum_score = apply_filters( 'getpaid_recaptcha_minimum_score', 0.4 );
-	if ( 'v3' === getpaid_get_recaptcha_version() && ( empty( $result['score'] ) || $result['score'] < $minimum_score ) ) {
-		wp_send_json_error( __( "Unable to verify that you're not a robot. Please try again.", 'invoicing' ) );
-	}
+    // Check if reCAPTCHA is enabled.
+    if ( ! getpaid_is_recaptcha_enabled() ) {
+        return;
+    }
+
+    $token = $submission->get_field( 'g-recaptcha-response' );
+
+    // Abort if no token was provided.
+    if ( empty( $token ) ) {
+        wp_send_json_error( 'v2' === getpaid_get_recaptcha_version() ? __( 'Please confirm that you are not a robot.', 'invoicing' ) : __( "Unable to verify that you're not a robot. Please try again.", 'invoicing' ) );
+    }
+
+    $result = wp_remote_post(
+        'https://www.google.com/recaptcha/api/siteverify',
+        array(
+            'body' => array(
+                'secret'   => getpaid_get_recaptcha_secret_key(),
+                'response' => $token,
+            ),
+        )
+    );
+
+    // Site not reachable, give benefit of doubt.
+    if ( is_wp_error( $result ) ) {
+        return;
+    }
+
+    $result = json_decode( wp_remote_retrieve_body( $result ), true );
+
+    if ( empty( $result['success'] ) && ! in_array( 'missing-input-secret', $result['error-codes'], true ) && ! in_array( 'invalid-input-secret', $result['error-codes'], true ) ) {
+        wp_send_json_error( __( "Unable to verify that you're not a robot. Please try again.", 'invoicing' ) );
+    }
+
+    // For v3, check the score.
+    $minimum_score = apply_filters( 'getpaid_recaptcha_minimum_score', 0.4 );
+    if ( 'v3' === getpaid_get_recaptcha_version() && ( empty( $result['score'] ) || $result['score'] < $minimum_score ) ) {
+        wp_send_json_error( __( "Unable to verify that you're not a robot. Please try again.", 'invoicing' ) );
+    }
 }
 add_action( 'getpaid_checkout_error_checks', 'getpaid_validate_recaptcha_response' );

Spacing +117 added lines, -117 removed lines

@@ -1,155 +1,155 @@ 
 <?php
-function wpinv_is_subscription_payment( $invoice = '' ) {
-	if ( empty( $invoice ) ) {
+function wpinv_is_subscription_payment($invoice = '') {
+	if (empty($invoice)) {
 		return false;
 	}
 
-	if ( ! is_object( $invoice ) && is_scalar( $invoice ) ) {
-		$invoice = wpinv_get_invoice( $invoice );
+	if (!is_object($invoice) && is_scalar($invoice)) {
+		$invoice = wpinv_get_invoice($invoice);
 	}
 
-	if ( empty( $invoice ) ) {
+	if (empty($invoice)) {
 		return false;
 	}
 
-	if ( $invoice->is_renewal() ) {
+	if ($invoice->is_renewal()) {
 		return true;
 	}
 
 	return false;
 }
 
-function wpinv_payment_link_transaction_id( $invoice = '' ) {
-	if ( empty( $invoice ) ) {
+function wpinv_payment_link_transaction_id($invoice = '') {
+	if (empty($invoice)) {
 		return false;
 	}
 
-	if ( ! is_object( $invoice ) && is_scalar( $invoice ) ) {
-		$invoice = wpinv_get_invoice( $invoice );
+	if (!is_object($invoice) && is_scalar($invoice)) {
+		$invoice = wpinv_get_invoice($invoice);
 	}
 
-	if ( empty( $invoice ) ) {
+	if (empty($invoice)) {
 		return false;
 	}
 
-	return apply_filters( 'wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice );
+	return apply_filters('wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice);
 }
 
-function wpinv_subscription_initial_payment_desc( $amount, $period, $interval, $trial_period = '', $trial_interval = 0 ) {
-	$interval   = (int)$interval > 0 ? (int)$interval : 1;
+function wpinv_subscription_initial_payment_desc($amount, $period, $interval, $trial_period = '', $trial_interval = 0) {
+	$interval = (int) $interval > 0 ? (int) $interval : 1;
 
-	if ( $trial_interval > 0 && ! empty( $trial_period ) ) {
-		$amount = __( 'Free', 'invoicing' );
+	if ($trial_interval > 0 && !empty($trial_period)) {
+		$amount = __('Free', 'invoicing');
 		$interval = $trial_interval;
 		$period = $trial_period;
 	}
 
 	$description = '';
-	switch ( $period ) {
+	switch ($period) {
 		case 'D':
 		case 'day':
-			$description = wp_sprintf( _n( '%s for the first day.', '%1$s for the first %2$d days.', $interval, 'invoicing' ), $amount, $interval );
+			$description = wp_sprintf(_n('%s for the first day.', '%1$s for the first %2$d days.', $interval, 'invoicing'), $amount, $interval);
 			break;
 		case 'W':
 		case 'week':
-			$description = wp_sprintf( _n( '%s for the first week.', '%1$s for the first %2$d weeks.', $interval, 'invoicing' ), $amount, $interval );
+			$description = wp_sprintf(_n('%s for the first week.', '%1$s for the first %2$d weeks.', $interval, 'invoicing'), $amount, $interval);
 			break;
 		case 'M':
 		case 'month':
-			$description = wp_sprintf( _n( '%s for the first month.', '%1$s for the first %2$d months.', $interval, 'invoicing' ), $amount, $interval );
+			$description = wp_sprintf(_n('%s for the first month.', '%1$s for the first %2$d months.', $interval, 'invoicing'), $amount, $interval);
 			break;
 		case 'Y':
 		case 'year':
-			$description = wp_sprintf( _n( '%s for the first year.', '%1$s for the first %2$d years.', $interval, 'invoicing' ), $amount, $interval );
+			$description = wp_sprintf(_n('%s for the first year.', '%1$s for the first %2$d years.', $interval, 'invoicing'), $amount, $interval);
 			break;
 	}
 
-	return apply_filters( 'wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval );
+	return apply_filters('wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_recurring_payment_desc( $amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0 ) {
-	$interval   = (int)$interval > 0 ? (int)$interval : 1;
-	$bill_times = (int)$bill_times > 0 ? (int)$bill_times : 0;
+function wpinv_subscription_recurring_payment_desc($amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0) {
+	$interval   = (int) $interval > 0 ? (int) $interval : 1;
+	$bill_times = (int) $bill_times > 0 ? (int) $bill_times : 0;
 
 	$description = '';
-	switch ( $period ) {
+	switch ($period) {
 		case 'D':
 		case 'day':
-			if ( (int)$bill_times > 0 ) {
-				if ( $interval > 1 ) {
-					if ( $bill_times > 1 ) {
-						$description = wp_sprintf( __( '%1$s for each %2$d days, for %3$d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+			if ((int) $bill_times > 0) {
+				if ($interval > 1) {
+					if ($bill_times > 1) {
+						$description = wp_sprintf(__('%1$s for each %2$d days, for %3$d installments.', 'invoicing'), $amount, $interval, $bill_times);
 					} else {
-						$description = wp_sprintf( __( '%1$s for %2$d days.', 'invoicing' ), $amount, $interval );
+						$description = wp_sprintf(__('%1$s for %2$d days.', 'invoicing'), $amount, $interval);
 					}
 				} else {
-					$description = wp_sprintf( _n( '%s for one day.', '%1$s for each day, for %2$d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+					$description = wp_sprintf(_n('%s for one day.', '%1$s for each day, for %2$d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
 				}
 			} else {
-				$description = wp_sprintf( _n( '%s for each day.', '%1$s for each %2$d days.', $interval, 'invoicing' ), $amount, $interval );
+				$description = wp_sprintf(_n('%s for each day.', '%1$s for each %2$d days.', $interval, 'invoicing'), $amount, $interval);
 			}
 			break;
 		case 'W':
 		case 'week':
-			if ( (int)$bill_times > 0 ) {
-				if ( $interval > 1 ) {
-					if ( $bill_times > 1 ) {
-						$description = wp_sprintf( __( '%1$s for each %2$d weeks, for %3$d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+			if ((int) $bill_times > 0) {
+				if ($interval > 1) {
+					if ($bill_times > 1) {
+						$description = wp_sprintf(__('%1$s for each %2$d weeks, for %3$d installments.', 'invoicing'), $amount, $interval, $bill_times);
 					} else {
-						$description = wp_sprintf( __( '%1$s for %2$d weeks.', 'invoicing' ), $amount, $interval );
+						$description = wp_sprintf(__('%1$s for %2$d weeks.', 'invoicing'), $amount, $interval);
 					}
 				} else {
-					$description = wp_sprintf( _n( '%s for one week.', '%1$s for each week, for %2$d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+					$description = wp_sprintf(_n('%s for one week.', '%1$s for each week, for %2$d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
 				}
 			} else {
-				$description = wp_sprintf( _n( '%s for each week.', '%1$s for each %2$d weeks.', $interval, 'invoicing' ), $amount, $interval );
+				$description = wp_sprintf(_n('%s for each week.', '%1$s for each %2$d weeks.', $interval, 'invoicing'), $amount, $interval);
 			}
 			break;
 		case 'M':
 		case 'month':
-			if ( (int)$bill_times > 0 ) {
-				if ( $interval > 1 ) {
-					if ( $bill_times > 1 ) {
-						$description = wp_sprintf( __( '%1$s for each %2$d months, for %3$d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+			if ((int) $bill_times > 0) {
+				if ($interval > 1) {
+					if ($bill_times > 1) {
+						$description = wp_sprintf(__('%1$s for each %2$d months, for %3$d installments.', 'invoicing'), $amount, $interval, $bill_times);
 					} else {
-						$description = wp_sprintf( __( '%1$s for %2$d months.', 'invoicing' ), $amount, $interval );
+						$description = wp_sprintf(__('%1$s for %2$d months.', 'invoicing'), $amount, $interval);
 					}
 				} else {
-					$description = wp_sprintf( _n( '%s for one month.', '%1$s for each month, for %2$d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+					$description = wp_sprintf(_n('%s for one month.', '%1$s for each month, for %2$d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
 				}
 			} else {
-				$description = wp_sprintf( _n( '%s for each month.', '%1$s for each %2$d months.', $interval, 'invoicing' ), $amount, $interval );
+				$description = wp_sprintf(_n('%s for each month.', '%1$s for each %2$d months.', $interval, 'invoicing'), $amount, $interval);
 			}
 			break;
 		case 'Y':
 		case 'year':
-			if ( (int)$bill_times > 0 ) {
-				if ( $interval > 1 ) {
-					if ( $bill_times > 1 ) {
-						$description = wp_sprintf( __( '%1$s for each %2$d years, for %3$d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+			if ((int) $bill_times > 0) {
+				if ($interval > 1) {
+					if ($bill_times > 1) {
+						$description = wp_sprintf(__('%1$s for each %2$d years, for %3$d installments.', 'invoicing'), $amount, $interval, $bill_times);
 					} else {
-						$description = wp_sprintf( __( '%1$s for %2$d years.', 'invoicing' ), $amount, $interval );
+						$description = wp_sprintf(__('%1$s for %2$d years.', 'invoicing'), $amount, $interval);
 					}
 				} else {
-					$description = wp_sprintf( _n( '%s for one year.', '%1$s for each year, for %2$d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+					$description = wp_sprintf(_n('%s for one year.', '%1$s for each year, for %2$d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
 				}
 			} else {
-				$description = wp_sprintf( _n( '%s for each year.', '%1$s for each %2$d years.', $interval, 'invoicing' ), $amount, $interval );
+				$description = wp_sprintf(_n('%s for each year.', '%1$s for each %2$d years.', $interval, 'invoicing'), $amount, $interval);
 			}
 			break;
 	}
 
-	return apply_filters( 'wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+	return apply_filters('wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_payment_desc( $invoice ) {
-	if ( empty( $invoice ) ) {
+function wpinv_subscription_payment_desc($invoice) {
+	if (empty($invoice)) {
 		return null;
 	}
 
 	$description = '';
-	if ( $invoice->is_parent() && $item = $invoice->get_recurring( true ) ) {
-		if ( $item->has_free_trial() ) {
+	if ($invoice->is_parent() && $item = $invoice->get_recurring(true)) {
+		if ($item->has_free_trial()) {
 			$trial_period = $item->get_trial_period();
 			$trial_interval = $item->get_trial_interval();
 		} else {
@@ -157,40 +157,40 @@ 
 			$trial_interval = 0;
 		}
 
-		$description = wpinv_get_billing_cycle( $invoice->get_total(), $invoice->get_recurring_details( 'total' ), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency() );
+		$description = wpinv_get_billing_cycle($invoice->get_total(), $invoice->get_recurring_details('total'), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency());
 	}
 
-	return apply_filters( 'wpinv_subscription_payment_desc', $description, $invoice );
+	return apply_filters('wpinv_subscription_payment_desc', $description, $invoice);
 }
 
-function wpinv_get_billing_cycle( $initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '' ) {
-	$initial_total      = wpinv_round_amount( $initial );
-	$recurring_total    = wpinv_round_amount( $recurring );
+function wpinv_get_billing_cycle($initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '') {
+	$initial_total      = wpinv_round_amount($initial);
+	$recurring_total    = wpinv_round_amount($recurring);
 
-	if ( $trial_interval > 0 && ! empty( $trial_period ) ) {
+	if ($trial_interval > 0 && !empty($trial_period)) {
 		// Free trial
 	} else {
-		if ( $bill_times == 1 ) {
+		if ($bill_times == 1) {
 			$recurring_total = $initial_total;
-		} elseif ( $bill_times > 1 && $initial_total != $recurring_total ) {
+		} elseif ($bill_times > 1 && $initial_total != $recurring_total) {
 			$bill_times--;
 		}
 	}
 
-	$initial_amount     = wpinv_price( $initial_total, $currency );
-	$recurring_amount   = wpinv_price( $recurring_total, $currency );
+	$initial_amount     = wpinv_price($initial_total, $currency);
+	$recurring_amount   = wpinv_price($recurring_total, $currency);
 
-	$recurring          = wpinv_subscription_recurring_payment_desc( $recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+	$recurring          = wpinv_subscription_recurring_payment_desc($recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
 
-	if ( $initial_total != $recurring_total ) {
-		$initial        = wpinv_subscription_initial_payment_desc( $initial_amount, $period, $interval, $trial_period, $trial_interval );
+	if ($initial_total != $recurring_total) {
+		$initial        = wpinv_subscription_initial_payment_desc($initial_amount, $period, $interval, $trial_period, $trial_interval);
 
-		$description    = wp_sprintf( __( '%1$s Then %2$s', 'invoicing' ), $initial, $recurring );
+		$description    = wp_sprintf(__('%1$s Then %2$s', 'invoicing'), $initial, $recurring);
 	} else {
 		$description    = $recurring;
 	}
 
-	return apply_filters( 'wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency );
+	return apply_filters('wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency);
 }
 
 /**
@@ -200,27 +200,27 @@ 
  * @param string $card_number Card number.
  * @return string
  */
-function getpaid_get_card_name( $card_number ) {
+function getpaid_get_card_name($card_number) {
 
 	// Known regexes.
 	$regexes = array(
-		'/^4/'                     => __( 'Visa', 'invoicing' ),
-		'/^5[1-5]/'                => __( 'Mastercard', 'invoicing' ),
-		'/^3[47]/'                 => __( 'Amex', 'invoicing' ),
-		'/^3(?:0[0-5]|[68])/'      => __( 'Diners Club', 'invoicing' ),
-		'/^6(?:011|5)/'            => __( 'Discover', 'invoicing' ),
-		'/^(?:2131|1800|35\d{3})/' => __( 'JCB', 'invoicing' ),
+		'/^4/'                     => __('Visa', 'invoicing'),
+		'/^5[1-5]/'                => __('Mastercard', 'invoicing'),
+		'/^3[47]/'                 => __('Amex', 'invoicing'),
+		'/^3(?:0[0-5]|[68])/'      => __('Diners Club', 'invoicing'),
+		'/^6(?:011|5)/'            => __('Discover', 'invoicing'),
+		'/^(?:2131|1800|35\d{3})/' => __('JCB', 'invoicing'),
 	);
 
 	// Confirm if one matches.
-	foreach ( $regexes as $regex => $card ) {
-		if ( preg_match( $regex, $card_number ) >= 1 ) {
+	foreach ($regexes as $regex => $card) {
+		if (preg_match($regex, $card_number) >= 1) {
 			return $card;
 		}
 	}
 
 	// None matched.
-	return __( 'Card', 'invoicing' );
+	return __('Card', 'invoicing');
 
 }
 
@@ -229,25 +229,25 @@ 
  *
  * @param WPInv_Invoice|int|null $invoice
  */
-function wpinv_send_back_to_checkout( $invoice = null ) {
-	$response = array( 'success' => false );
-	$invoice  = wpinv_get_invoice( $invoice );
+function wpinv_send_back_to_checkout($invoice = null) {
+	$response = array('success' => false);
+	$invoice  = wpinv_get_invoice($invoice);
 
 	// Was an invoice created?
-	if ( ! empty( $invoice ) ) {
-		$invoice             = is_scalar( $invoice ) ? new WPInv_Invoice( $invoice ) : $invoice;
+	if (!empty($invoice)) {
+		$invoice             = is_scalar($invoice) ? new WPInv_Invoice($invoice) : $invoice;
 		$response['invoice'] = $invoice->get_id();
-		do_action( 'getpaid_checkout_invoice_exception', $invoice );
+		do_action('getpaid_checkout_invoice_exception', $invoice);
 	}
 
 	// Do we have any errors?
-	if ( wpinv_get_errors() ) {
-		$response['data'] = getpaid_get_errors_html( true, false );
+	if (wpinv_get_errors()) {
+		$response['data'] = getpaid_get_errors_html(true, false);
 	} else {
-		$response['data'] = __( 'An error occured while processing your payment. Please try again.', 'invoicing' );
+		$response['data'] = __('An error occured while processing your payment. Please try again.', 'invoicing');
 	}
 
-	wp_send_json( $response );
+	wp_send_json($response);
 }
 
 /**
@@ -256,7 +256,7 @@ 
  * @return string
  */
 function getpaid_get_recaptcha_site_key() {
-	return apply_filters( 'getpaid_recaptcha_site_key', wpinv_get_option( 'recaptcha_site_key', '' ) );
+	return apply_filters('getpaid_recaptcha_site_key', wpinv_get_option('recaptcha_site_key', ''));
 }
 
 /**
@@ -265,7 +265,7 @@ 
  * @return string
  */
 function getpaid_get_recaptcha_secret_key() {
-	return apply_filters( 'getpaid_recaptcha_secret_key', wpinv_get_option( 'recaptcha_secret_key', '' ) );
+	return apply_filters('getpaid_recaptcha_secret_key', wpinv_get_option('recaptcha_secret_key', ''));
 }
 
 /**
@@ -274,7 +274,7 @@ 
  * @return bool
  */
 function getpaid_is_recaptcha_enabled() {
-	return wpinv_get_option( 'enable_recaptcha', false ) && getpaid_get_recaptcha_site_key() && getpaid_get_recaptcha_secret_key();
+	return wpinv_get_option('enable_recaptcha', false) && getpaid_get_recaptcha_site_key() && getpaid_get_recaptcha_secret_key();
 }
 
 /**
@@ -283,7 +283,7 @@ 
  * @return string
  */
 function getpaid_get_recaptcha_version() {
-	return apply_filters( 'getpaid_recaptcha_version', wpinv_get_option( 'recaptcha_version', 'v2' ) );
+	return apply_filters('getpaid_recaptcha_version', wpinv_get_option('recaptcha_version', 'v2'));
 }
 
 /**
@@ -297,14 +297,14 @@ 
 		'version' => getpaid_get_recaptcha_version(),
 	);
 
-	if ( ! getpaid_is_recaptcha_enabled() ) {
+	if (!getpaid_is_recaptcha_enabled()) {
 		return $settings;
 	}
 
 	$settings['sitekey'] = getpaid_get_recaptcha_site_key();
 
 	// Version 2 render params.
-	if ( 'v2' === getpaid_get_recaptcha_version() ) {
+	if ('v2' === getpaid_get_recaptcha_version()) {
 		$settings['render_params'] = array(
 			'sitekey'  => getpaid_get_recaptcha_site_key(),
 			'theme'    => 'light',
@@ -313,41 +313,41 @@ 
 		);
 	}
 
-	return apply_filters( 'getpaid_recaptcha_settings', $settings );
+	return apply_filters('getpaid_recaptcha_settings', $settings);
 }
 
 /**
  * Displays reCAPTCHA before payment button.
  */
 function getpaid_display_recaptcha_before_payment_button() {
-	if ( ! getpaid_is_recaptcha_enabled() || 'v2' !== getpaid_get_recaptcha_version() ) {
+	if (!getpaid_is_recaptcha_enabled() || 'v2' !== getpaid_get_recaptcha_version()) {
 		return;
 	}
 
 	printf(
 		'<div class="getpaid-recaptcha-wrapper"><div class="g-recaptcha mw-100 overflow-hidden my-2" id="getpaid-recaptcha-%s"></div></div>',
-		esc_attr( wp_unique_id() )
+		esc_attr(wp_unique_id())
 	);
 }
-add_action( 'getpaid_before_payment_form_pay_button', 'getpaid_display_recaptcha_before_payment_button' );
+add_action('getpaid_before_payment_form_pay_button', 'getpaid_display_recaptcha_before_payment_button');
 
 /**
  * Validates the reCAPTCHA response.
  *
  * @param GetPaid_Payment_Form_Submission $submission
  */
-function getpaid_validate_recaptcha_response( $submission ) {
+function getpaid_validate_recaptcha_response($submission) {
 
 	// Check if reCAPTCHA is enabled.
-	if ( ! getpaid_is_recaptcha_enabled() ) {
+	if (!getpaid_is_recaptcha_enabled()) {
 		return;
 	}
 
-	$token = $submission->get_field( 'g-recaptcha-response' );
+	$token = $submission->get_field('g-recaptcha-response');
 
 	// Abort if no token was provided.
-	if ( empty( $token ) ) {
-		wp_send_json_error( 'v2' === getpaid_get_recaptcha_version() ? __( 'Please confirm that you are not a robot.', 'invoicing' ) : __( "Unable to verify that you're not a robot. Please try again.", 'invoicing' ) );
+	if (empty($token)) {
+		wp_send_json_error('v2' === getpaid_get_recaptcha_version() ? __('Please confirm that you are not a robot.', 'invoicing') : __("Unable to verify that you're not a robot. Please try again.", 'invoicing'));
 	}
 
 	$result = wp_remote_post(
@@ -361,20 +361,20 @@ 
 	);
 
 	// Site not reachable, give benefit of doubt.
-	if ( is_wp_error( $result ) ) {
+	if (is_wp_error($result)) {
 		return;
 	}
 
-	$result = json_decode( wp_remote_retrieve_body( $result ), true );
+	$result = json_decode(wp_remote_retrieve_body($result), true);
 
-	if ( empty( $result['success'] ) && ! in_array( 'missing-input-secret', $result['error-codes'], true ) && ! in_array( 'invalid-input-secret', $result['error-codes'], true ) ) {
-		wp_send_json_error( __( "Unable to verify that you're not a robot. Please try again.", 'invoicing' ) );
+	if (empty($result['success']) && !in_array('missing-input-secret', $result['error-codes'], true) && !in_array('invalid-input-secret', $result['error-codes'], true)) {
+		wp_send_json_error(__("Unable to verify that you're not a robot. Please try again.", 'invoicing'));
 	}
 
 	// For v3, check the score.
-	$minimum_score = apply_filters( 'getpaid_recaptcha_minimum_score', 0.4 );
-	if ( 'v3' === getpaid_get_recaptcha_version() && ( empty( $result['score'] ) || $result['score'] < $minimum_score ) ) {
-		wp_send_json_error( __( "Unable to verify that you're not a robot. Please try again.", 'invoicing' ) );
+	$minimum_score = apply_filters('getpaid_recaptcha_minimum_score', 0.4);
+	if ('v3' === getpaid_get_recaptcha_version() && (empty($result['score']) || $result['score'] < $minimum_score)) {
+		wp_send_json_error(__("Unable to verify that you're not a robot. Please try again.", 'invoicing'));
 	}
 }
-add_action( 'getpaid_checkout_error_checks', 'getpaid_validate_recaptcha_response' );
+add_action('getpaid_checkout_error_checks', 'getpaid_validate_recaptcha_response');

vendor/ayecode/wp-deactivation-survey/wp-deactivation-survey.php

Indentation +77 added lines, -77 removed lines

@@ -1,103 +1,103 @@
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'AyeCode_Deactivation_Survey' ) ) {
 
-	class AyeCode_Deactivation_Survey {
+    class AyeCode_Deactivation_Survey {
 
-		/**
-		 * AyeCode_Deactivation_Survey instance.
-		 *
-		 * @access private
-		 * @since  1.0.0
-		 * @var    AyeCode_Deactivation_Survey There can be only one!
-		 */
-		private static $instance = null;
+        /**
+         * AyeCode_Deactivation_Survey instance.
+         *
+         * @access private
+         * @since  1.0.0
+         * @var    AyeCode_Deactivation_Survey There can be only one!
+         */
+        private static $instance = null;
 
-		public static $plugins;
+        public static $plugins;
 
-		public $version = "1.0.6";
+        public $version = "1.0.6";
 
-		public static function instance( $plugin = array() ) {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_Deactivation_Survey ) ) {
-				self::$instance = new AyeCode_Deactivation_Survey;
-				self::$plugins = array();
+        public static function instance( $plugin = array() ) {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_Deactivation_Survey ) ) {
+                self::$instance = new AyeCode_Deactivation_Survey;
+                self::$plugins = array();
 
-				add_action( 'admin_enqueue_scripts', array( self::$instance, 'scripts' ) );
+                add_action( 'admin_enqueue_scripts', array( self::$instance, 'scripts' ) );
 
-				do_action( 'ayecode_deactivation_survey_loaded' );
-			}
+                do_action( 'ayecode_deactivation_survey_loaded' );
+            }
 
-			if(!empty($plugin)){
-				self::$plugins[] = (object)$plugin;
-			}
+            if(!empty($plugin)){
+                self::$plugins[] = (object)$plugin;
+            }
 
-			return self::$instance;
-		}
+            return self::$instance;
+        }
 
-		public function scripts() {
-			global $pagenow;
+        public function scripts() {
+            global $pagenow;
 
-			// Bail if we are not on the plugins page
-			if ( $pagenow != "plugins.php" ) {
-				return;
-			}
+            // Bail if we are not on the plugins page
+            if ( $pagenow != "plugins.php" ) {
+                return;
+            }
 
-			// Enqueue scripts
-			add_thickbox();
-			wp_enqueue_script('ayecode-deactivation-survey', plugin_dir_url(__FILE__) . 'ayecode-ds.js');
+            // Enqueue scripts
+            add_thickbox();
+            wp_enqueue_script('ayecode-deactivation-survey', plugin_dir_url(__FILE__) . 'ayecode-ds.js');
 
-			/*
+            /*
 			 * Localized strings. Strings can be localised by plugins using this class.
 			 * We deliberately don't add textdomains here so that double textdomain warning is not given in theme review.
 			 */
-			wp_localize_script('ayecode-deactivation-survey', 'ayecodeds_deactivate_feedback_form_strings', array(
-				'quick_feedback'			=> 'Quick Feedback',
-				'foreword'					=> 'If you would be kind enough, please tell us why you\'re deactivating?',
-				'better_plugins_name'		=> 'Please tell us which plugin?',
-				'please_tell_us'			=> 'Please tell us the reason so we can improve the plugin',
-				'do_not_attach_email'		=> 'Do not send my e-mail address with this feedback',
-				'brief_description'			=> 'Please give us any feedback that could help us improve',
-				'cancel'					=> 'Cancel',
-				'skip_and_deactivate'		=> 'Skip &amp; Deactivate',
-				'submit_and_deactivate'		=> 'Submit &amp; Deactivate',
-				'please_wait'				=> 'Please wait',
-				'get_support'				=> 'Get Support',
-				'documentation'				=> 'Documentation',
-				'thank_you'					=> 'Thank you!',
-			));
-
-			// Plugins
-			$plugins = apply_filters('ayecode_deactivation_survey_plugins', self::$plugins);
-
-			// Reasons
-			$defaultReasons = array(
-				'suddenly-stopped-working'	=> 'The plugin suddenly stopped working',
-				'plugin-broke-site'			=> 'The plugin broke my site',
-				'plugin-setup-difficult'	=> 'Too difficult to setup',
-				'plugin-design-difficult'	=> 'Too difficult to get the design i want',
-				'no-longer-needed'			=> 'I don\'t need this plugin any more',
-				'found-better-plugin'		=> 'I found a better plugin',
-				'temporary-deactivation'	=> 'It\'s a temporary deactivation, I\'m troubleshooting',
-				'other'						=> 'Other',
-			);
-
-			foreach($plugins as $plugin)
-			{
-				$plugin->reasons = apply_filters('ayecode_deactivation_survey_reasons', $defaultReasons, $plugin);
-				$plugin->url = home_url();
-				$plugin->activated = 0;
-			}
-
-			// Send plugin data
-			wp_localize_script('ayecode-deactivation-survey', 'ayecodeds_deactivate_feedback_form_plugins', $plugins);
-
-		}
+            wp_localize_script('ayecode-deactivation-survey', 'ayecodeds_deactivate_feedback_form_strings', array(
+                'quick_feedback'			=> 'Quick Feedback',
+                'foreword'					=> 'If you would be kind enough, please tell us why you\'re deactivating?',
+                'better_plugins_name'		=> 'Please tell us which plugin?',
+                'please_tell_us'			=> 'Please tell us the reason so we can improve the plugin',
+                'do_not_attach_email'		=> 'Do not send my e-mail address with this feedback',
+                'brief_description'			=> 'Please give us any feedback that could help us improve',
+                'cancel'					=> 'Cancel',
+                'skip_and_deactivate'		=> 'Skip &amp; Deactivate',
+                'submit_and_deactivate'		=> 'Submit &amp; Deactivate',
+                'please_wait'				=> 'Please wait',
+                'get_support'				=> 'Get Support',
+                'documentation'				=> 'Documentation',
+                'thank_you'					=> 'Thank you!',
+            ));
+
+            // Plugins
+            $plugins = apply_filters('ayecode_deactivation_survey_plugins', self::$plugins);
+
+            // Reasons
+            $defaultReasons = array(
+                'suddenly-stopped-working'	=> 'The plugin suddenly stopped working',
+                'plugin-broke-site'			=> 'The plugin broke my site',
+                'plugin-setup-difficult'	=> 'Too difficult to setup',
+                'plugin-design-difficult'	=> 'Too difficult to get the design i want',
+                'no-longer-needed'			=> 'I don\'t need this plugin any more',
+                'found-better-plugin'		=> 'I found a better plugin',
+                'temporary-deactivation'	=> 'It\'s a temporary deactivation, I\'m troubleshooting',
+                'other'						=> 'Other',
+            );
+
+            foreach($plugins as $plugin)
+            {
+                $plugin->reasons = apply_filters('ayecode_deactivation_survey_reasons', $defaultReasons, $plugin);
+                $plugin->url = home_url();
+                $plugin->activated = 0;
+            }
+
+            // Send plugin data
+            wp_localize_script('ayecode-deactivation-survey', 'ayecodeds_deactivate_feedback_form_plugins', $plugins);
+
+        }
 		
 
-	}
+    }
 
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'AyeCode_Deactivation_Survey' ) ) {
+if (!class_exists('AyeCode_Deactivation_Survey')) {
 
 	class AyeCode_Deactivation_Survey {
 
@@ -21,18 +21,18 @@ 
 
 		public $version = "1.0.6";
 
-		public static function instance( $plugin = array() ) {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_Deactivation_Survey ) ) {
+		public static function instance($plugin = array()) {
+			if (!isset(self::$instance) && !(self::$instance instanceof AyeCode_Deactivation_Survey)) {
 				self::$instance = new AyeCode_Deactivation_Survey;
 				self::$plugins = array();
 
-				add_action( 'admin_enqueue_scripts', array( self::$instance, 'scripts' ) );
+				add_action('admin_enqueue_scripts', array(self::$instance, 'scripts'));
 
-				do_action( 'ayecode_deactivation_survey_loaded' );
+				do_action('ayecode_deactivation_survey_loaded');
 			}
 
-			if(!empty($plugin)){
-				self::$plugins[] = (object)$plugin;
+			if (!empty($plugin)) {
+				self::$plugins[] = (object) $plugin;
 			}
 
 			return self::$instance;
@@ -42,7 +42,7 @@ 
 			global $pagenow;
 
 			// Bail if we are not on the plugins page
-			if ( $pagenow != "plugins.php" ) {
+			if ($pagenow != "plugins.php") {
 				return;
 			}
 
@@ -85,7 +85,7 @@ 
 				'other'						=> 'Other',
 			);
 
-			foreach($plugins as $plugin)
+			foreach ($plugins as $plugin)
 			{
 				$plugin->reasons = apply_filters('ayecode_deactivation_survey_reasons', $defaultReasons, $plugin);
 				$plugin->url = home_url();

templates/payment-forms/form.php

Indentation +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 
         // And the optional invoice id.
         if ( ! empty( $form->invoice ) ) {
-		    getpaid_hidden_field( 'invoice_id', $form->invoice->get_id() );
+            getpaid_hidden_field( 'invoice_id', $form->invoice->get_id() );
         }
 
         // We also want to include the form id.
@@ -76,7 +76,7 @@ 
                 <?php
 
                     foreach ( $form->get_elements() as $element ) {
-					    if ( isset( $element['type'] ) ) {
+                        if ( isset( $element['type'] ) ) {
                             $grid_class = getpaid_get_form_element_grid_class( $element );
                             do_action( 'getpaid_payment_form_element_before', $element, $form );
                             do_action( "getpaid_payment_form_element_before_{$element['type']}_template", $element, $form );

Spacing +32 added lines, -32 removed lines

@@ -7,17 +7,17 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Standardize IDs.
 global $rendered_getpaid_forms;
 
 // Make sure that the form is active.
-if ( ! $form->is_active() ) {
+if (!$form->is_active()) {
     aui()->alert(
         array(
             'type'    => 'warning',
-            'content' => __( 'This payment form is no longer active', 'invoicing' ),
+            'content' => __('This payment form is no longer active', 'invoicing'),
         ),
         true
     );
@@ -25,12 +25,12 @@ 
 }
 
 // Require login to checkout.
-if ( wpinv_require_login_to_checkout() && ! get_current_user_id() ) {
+if (wpinv_require_login_to_checkout() && !get_current_user_id()) {
 
     aui()->alert(
         array(
             'type'    => 'danger',
-            'content' => __( 'You must be logged in to checkout.', 'invoicing' ),
+            'content' => __('You must be logged in to checkout.', 'invoicing'),
         ),
         true
     );
@@ -38,36 +38,36 @@ 
 
 }
 
-if ( ! is_array( $rendered_getpaid_forms ) ) {
+if (!is_array($rendered_getpaid_forms)) {
     $rendered_getpaid_forms = array();
 }
 
-$rendered_getpaid_forms[ $form->get_id() ] = isset( $rendered_getpaid_forms[ $form->get_id() ] ) ? $rendered_getpaid_forms[ $form->get_id() ] + 1 : 0;
+$rendered_getpaid_forms[$form->get_id()] = isset($rendered_getpaid_forms[$form->get_id()]) ? $rendered_getpaid_forms[$form->get_id()] + 1 : 0;
 
 // Fires before displaying a payment form.
-do_action( 'getpaid_before_payment_form', $form );
+do_action('getpaid_before_payment_form', $form);
 ?>
 
-<form class='getpaid-payment-form getpaid-payment-form-<?php echo absint( $form->get_id() ); ?> bsui position-relative' method='POST' data-key='<?php echo esc_attr( uniqid( 'gpf' ) ); ?>' data-currency='<?php echo esc_attr( empty( $form->invoice ) ? wpinv_get_currency() : $form->invoice->get_currency() ); ?>' novalidate>
+<form class='getpaid-payment-form getpaid-payment-form-<?php echo absint($form->get_id()); ?> bsui position-relative' method='POST' data-key='<?php echo esc_attr(uniqid('gpf')); ?>' data-currency='<?php echo esc_attr(empty($form->invoice) ? wpinv_get_currency() : $form->invoice->get_currency()); ?>' novalidate>
 
     <?php
 
         // Fires when printing the top of a payment form.
-        do_action( 'getpaid_payment_form_top', $form );
+        do_action('getpaid_payment_form_top', $form);
 
         // And the optional invoice id.
-        if ( ! empty( $form->invoice ) ) {
-		    getpaid_hidden_field( 'invoice_id', $form->invoice->get_id() );
+        if (!empty($form->invoice)) {
+		    getpaid_hidden_field('invoice_id', $form->invoice->get_id());
         }
 
         // We also want to include the form id.
-        getpaid_hidden_field( 'form_id', $form->get_id() );
+        getpaid_hidden_field('form_id', $form->get_id());
 
         // And an indication that this is a payment form submission.
-        getpaid_hidden_field( 'getpaid_payment_form_submission', '1' );
+        getpaid_hidden_field('getpaid_payment_form_submission', '1');
 
         // Fires before displaying payment form elements.
-        do_action( 'getpaid_payment_form_before_elements', $form );
+        do_action('getpaid_payment_form_before_elements', $form);
 
         // Display the elements.
         ?>
@@ -75,17 +75,17 @@ 
             <div class="row">
                 <?php
 
-                    foreach ( $form->get_elements() as $element ) {
-					    if ( isset( $element['type'] ) ) {
-                            $grid_class = getpaid_get_form_element_grid_class( $element );
-                            do_action( 'getpaid_payment_form_element_before', $element, $form );
-                            do_action( "getpaid_payment_form_element_before_{$element['type']}_template", $element, $form );
-                            echo "<div class='" . esc_attr( $grid_class ) . "'>";
-                            do_action( 'getpaid_payment_form_element', $element, $form );
-                            do_action( "getpaid_payment_form_element_{$element['type']}_template", $element, $form );
+                    foreach ($form->get_elements() as $element) {
+					    if (isset($element['type'])) {
+                            $grid_class = getpaid_get_form_element_grid_class($element);
+                            do_action('getpaid_payment_form_element_before', $element, $form);
+                            do_action("getpaid_payment_form_element_before_{$element['type']}_template", $element, $form);
+                            echo "<div class='" . esc_attr($grid_class) . "'>";
+                            do_action('getpaid_payment_form_element', $element, $form);
+                            do_action("getpaid_payment_form_element_{$element['type']}_template", $element, $form);
                             echo '</div>';
-                            do_action( 'getpaid_payment_form_element_after', $element, $form );
-                            do_action( "getpaid_payment_form_element_after_{$element['type']}_template", $element, $form );
+                            do_action('getpaid_payment_form_element_after', $element, $form);
+                            do_action("getpaid_payment_form_element_after_{$element['type']}_template", $element, $form);
                         }
                     }
 
@@ -95,28 +95,28 @@ 
 
         <?php
         // Fires after displaying payment form elements.
-        do_action( 'getpaid_payment_form_after_elements', $form );
+        do_action('getpaid_payment_form_after_elements', $form);
 
         echo "<div class='getpaid-payment-form-errors alert alert-danger d-none'></div>";
 
-        if ( wpinv_current_user_can_manage_invoicing() ) {
+        if (wpinv_current_user_can_manage_invoicing()) {
 
             edit_post_link(
-                __( 'Edit this form.', 'invoicing' ),
+                __('Edit this form.', 'invoicing'),
                 '<small class="form-text text-muted">',
-                '&nbsp;' . __( 'This is only visible to website administators.', 'invoicing' ) . '</small>',
+                '&nbsp;' . __('This is only visible to website administators.', 'invoicing') . '</small>',
                 $form->get_id(),
                 'text-danger'
             );
 
         }
 
-        echo wp_kses( $extra_markup, getpaid_allowed_html() );
+        echo wp_kses($extra_markup, getpaid_allowed_html());
     ?>
 
     <div class="loading_div overlay overlay-black position-absolute row m-0 rounded overflow-hidden" style="height: 100%;width: 100%;top: 0px;z-index: 2;display:none;">
         <div class="spinner-border mx-auto align-self-center text-white" role="status">
-            <span class="sr-only"><?php esc_html_e( 'Loading...', 'invoicing' ); ?></span>
+            <span class="sr-only"><?php esc_html_e('Loading...', 'invoicing'); ?></span>
         </div>
     </div>
 
@@ -125,4 +125,4 @@ 
 <?php
 
 // Fires after displaying a payment form.
-do_action( 'getpaid_after_payment_form', $form );
+do_action('getpaid_after_payment_form', $form);

templates/payment-forms/cart-totals.php

Indentation +17 added lines, -17 removed lines

@@ -11,26 +11,26 @@ 
 
 // Totals rows.
 $cart_totals = apply_filters(
-	'getpaid_payment_form_cart_table_totals',
-	array(
-		'subtotal' => __( 'Subtotal', 'invoicing' ),
-		'tax'      => __( 'Tax', 'invoicing' ),
-		'fees'     => __( 'Fee', 'invoicing' ),
-		'discount' => __( 'Discount', 'invoicing' ),
-		'total'    => __( 'Total', 'invoicing' ),
-	),
-	$form
+    'getpaid_payment_form_cart_table_totals',
+    array(
+        'subtotal' => __( 'Subtotal', 'invoicing' ),
+        'tax'      => __( 'Tax', 'invoicing' ),
+        'fees'     => __( 'Fee', 'invoicing' ),
+        'discount' => __( 'Discount', 'invoicing' ),
+        'total'    => __( 'Total', 'invoicing' ),
+    ),
+    $form
 );
 
 $currency = $form->get_currency();
 $country  = wpinv_get_default_country();
 
 if ( ! empty( $form->invoice ) ) {
-	$country  = $form->invoice->get_country();
+    $country  = $form->invoice->get_country();
 }
 
 if ( ! wpinv_use_taxes() && isset( $cart_totals['tax'] ) ) {
-	unset( $cart_totals['tax'] );
+    unset( $cart_totals['tax'] );
 }
 
 do_action( 'getpaid_before_payment_form_cart_totals', $form, $cart_totals );
@@ -61,13 +61,13 @@ 
 
 							<?php
 
-								// Total tax.
-								if ( in_array( $key, array( 'tax', 'discount', 'subtotal', 'total', 'fees' ), true ) ) {
-									wpinv_the_price( 0, $currency );
-								}
+                                // Total tax.
+                                if ( in_array( $key, array( 'tax', 'discount', 'subtotal', 'total', 'fees' ), true ) ) {
+                                    wpinv_the_price( 0, $currency );
+                                }
 
-								do_action( "getpaid_payment_form_cart_totals_$key", $form );
-							?>
+                                do_action( "getpaid_payment_form_cart_totals_$key", $form );
+                            ?>
 
 						</div>
 

Spacing +19 added lines, -19 removed lines

@@ -7,17 +7,17 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Totals rows.
 $cart_totals = apply_filters(
 	'getpaid_payment_form_cart_table_totals',
 	array(
-		'subtotal' => __( 'Subtotal', 'invoicing' ),
-		'tax'      => __( 'Tax', 'invoicing' ),
-		'fees'     => __( 'Fee', 'invoicing' ),
-		'discount' => __( 'Discount', 'invoicing' ),
-		'total'    => __( 'Total', 'invoicing' ),
+		'subtotal' => __('Subtotal', 'invoicing'),
+		'tax'      => __('Tax', 'invoicing'),
+		'fees'     => __('Fee', 'invoicing'),
+		'discount' => __('Discount', 'invoicing'),
+		'total'    => __('Total', 'invoicing'),
 	),
 	$form
 );
@@ -25,15 +25,15 @@ 
 $currency = $form->get_currency();
 $country  = wpinv_get_default_country();
 
-if ( ! empty( $form->invoice ) ) {
-	$country  = $form->invoice->get_country();
+if (!empty($form->invoice)) {
+	$country = $form->invoice->get_country();
 }
 
-if ( ! wpinv_use_taxes() && isset( $cart_totals['tax'] ) ) {
-	unset( $cart_totals['tax'] );
+if (!wpinv_use_taxes() && isset($cart_totals['tax'])) {
+	unset($cart_totals['tax']);
 }
 
-do_action( 'getpaid_before_payment_form_cart_totals', $form, $cart_totals );
+do_action('getpaid_before_payment_form_cart_totals', $form, $cart_totals);
 
 ?>
 <style>
@@ -47,26 +47,26 @@ 
 	<div class="row">
 		<div class="col-12 offset-sm-6 col-sm-6 border-sm-left pl-sm-0">
 
-			<?php foreach ( $cart_totals as $key => $label ) : ?>
+			<?php foreach ($cart_totals as $key => $label) : ?>
 
-				<div class="getpaid-form-cart-totals-col getpaid-form-cart-totals-<?php echo esc_attr( $key ); ?> font-weight-bold py-2 px-3 <?php echo 'total' == $key ? 'bg-light' : 'border-bottom'; ?>">
+				<div class="getpaid-form-cart-totals-col getpaid-form-cart-totals-<?php echo esc_attr($key); ?> font-weight-bold py-2 px-3 <?php echo 'total' == $key ? 'bg-light' : 'border-bottom'; ?>">
 
 					<div class="form-row row">
 
 						<div class="col-8 pl-sm-0 getpaid-payment-form-line-totals-label">
-							<?php echo esc_html( $label ); ?>
+							<?php echo esc_html($label); ?>
 						</div>
 
-						<div class="col-4 getpaid-payment-form-line-totals-value getpaid-form-cart-totals-total-<?php echo esc_attr( $key ); ?>">
+						<div class="col-4 getpaid-payment-form-line-totals-value getpaid-form-cart-totals-total-<?php echo esc_attr($key); ?>">
 
 							<?php
 
 								// Total tax.
-								if ( in_array( $key, array( 'tax', 'discount', 'subtotal', 'total', 'fees' ), true ) ) {
-									wpinv_the_price( 0, $currency );
+								if (in_array($key, array('tax', 'discount', 'subtotal', 'total', 'fees'), true)) {
+									wpinv_the_price(0, $currency);
 								}
 
-								do_action( "getpaid_payment_form_cart_totals_$key", $form );
+								do_action("getpaid_payment_form_cart_totals_$key", $form);
 							?>
 
 						</div>
@@ -82,4 +82,4 @@ 
 </div>
 
 <?php
-do_action( 'getpaid_payment_form_cart_totals', $form, $cart_totals );
+do_action('getpaid_payment_form_cart_totals', $form, $cart_totals);