AyeCode / invoicing

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

Indentation +267 added lines, -267 removed lines

@@ -12,301 +12,301 @@
  */
 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 );
+
+    }
+
+    /**
+     * 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(),
+
+            )
+        );
+
+    }
 
-		$texts = array(
-			'.getpaid-checkout-total-payable' => $payable,
-		);
+    /**
+     * 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
+                );
+            }
+}
 
-		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() ) );
+        $texts = array(
+            '.getpaid-checkout-total-payable' => $payable,
+        );
 
-			if ( $item->get_quantity() == 1 ) {
-				$texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = '';
-			}
+        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" ] = '';
+            }
 }
 
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
+        $this->response = array_merge( $this->response, array( 'texts' => $texts ) );
 
-	}
+    }
 
-	/**
-	 * Adds items to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_items( $submission ) {
+    /**
+     * 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();
+        // 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'] );
-		}
-
-		$this->response = array_merge(
-			$this->response,
-			array( 'discounts' => $discounts )
-		);
+            $discounts[ $name ] = $submission->format_amount( $data['initial_discount'] );
+        }
 
-	}
+        $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>";
-		}
-
-		$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>";
+        }
+
+        $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 +84 added lines, -84 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,20 +239,20 @@ 
 	 *
 	 * @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>";
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'taxes' => $taxes )
+			array('taxes' => $taxes)
 		);
 
 	}
@@ -262,27 +262,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)
 		);
 
 	}
@@ -292,7 +292,7 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_data( $submission ) {
+	public function add_data($submission) {
 
 		$this->response = array_merge(
 			$this->response,

templates/invoice/header-right-actions.php

Switch Indentation +34 added lines, -34 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 /**
  * Displays right side of the invoice header.
  *
@@ -8,56 +8,56 @@ 
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+    defined( 'ABSPATH' ) || exit;
 
-?>
+    ?>
 
     <div class="getpaid-header-right-actions">
 
         <?php
 
-            $actions   = array();
+                $actions   = array();
 
-            echo sprintf(
-                '<a href="javascript:void(0)" class="btn btn-sm m-1 d-inline-block btn-secondary text-white invoice-action-print d-none d-lg-inline-block" onclick="window.print();">%s</a>',
-                sprintf(
-                    esc_html__( 'Print %s', 'invoicing' ),
-                    esc_html( ucfirst( $invoice->get_invoice_quote_type() ) )
-                )
-            );
-
-            if ( is_user_logged_in() ) {
-
-                $actions[] = sprintf(
-                    '<a href="%s" class="btn btn-sm btn-secondary text-white m-1 d-inline-block invoice-action-history">%s</a>',
-                    esc_url( wpinv_get_history_page_uri( $invoice->get_post_type() ) ),
+                echo sprintf(
+                    '<a href="javascript:void(0)" class="btn btn-sm m-1 d-inline-block btn-secondary text-white invoice-action-print d-none d-lg-inline-block" onclick="window.print();">%s</a>',
                     sprintf(
-                        __( '%s History', 'invoicing' ),
+                        esc_html__( 'Print %s', 'invoicing' ),
                         esc_html( ucfirst( $invoice->get_invoice_quote_type() ) )
                     )
                 );
 
-            }
+                if ( is_user_logged_in() ) {
 
-            if ( wpinv_current_user_can_manage_invoicing() ) {
+                    $actions[] = sprintf(
+                        '<a href="%s" class="btn btn-sm btn-secondary text-white m-1 d-inline-block invoice-action-history">%s</a>',
+                        esc_url( wpinv_get_history_page_uri( $invoice->get_post_type() ) ),
+                        sprintf(
+                            __( '%s History', 'invoicing' ),
+                            esc_html( ucfirst( $invoice->get_invoice_quote_type() ) )
+                        )
+                    );
 
-                $actions[] = sprintf(
-                    '<a href="%s" class="btn btn-sm btn-secondary text-white m-1 d-inline-block invoice-action-edit">%s</a>',
-                    esc_url( get_edit_post_link( $invoice->get_id() ) ),
-                    sprintf(
-                        __( 'Edit %s', 'invoicing' ),
-                        esc_html( ucfirst( $invoice->get_invoice_quote_type() ) )
-                    )
-                );
+                }
+
+                if ( wpinv_current_user_can_manage_invoicing() ) {
 
-            }
+                    $actions[] = sprintf(
+                        '<a href="%s" class="btn btn-sm btn-secondary text-white m-1 d-inline-block invoice-action-edit">%s</a>',
+                        esc_url( get_edit_post_link( $invoice->get_id() ) ),
+                        sprintf(
+                            __( 'Edit %s', 'invoicing' ),
+                            esc_html( ucfirst( $invoice->get_invoice_quote_type() ) )
+                        )
+                    );
 
-            $actions = apply_filters( 'getpaid_invoice_header_right_actions_array', $actions, $invoice );
-            echo wp_kses_post( implode( '', $actions ) );
+                }
 
-        ?>
+                $actions = apply_filters( 'getpaid_invoice_header_right_actions_array', $actions, $invoice );
+                echo wp_kses_post( implode( '', $actions ) );
 
+            ?>
+    
         <?php do_action( 'wpinv_invoice_display_right_actions', $invoice ); ?>
-    </div>
+        </div>
 
-<?php
+    <?php

Spacing +15 added lines, -15 removed lines

@@ -8,7 +8,7 @@ 
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -16,48 +16,48 @@ 
 
         <?php
 
-            $actions   = array();
+            $actions = array();
 
             echo sprintf(
                 '<a href="javascript:void(0)" class="btn btn-sm m-1 d-inline-block btn-secondary text-white invoice-action-print d-none d-lg-inline-block" onclick="window.print();">%s</a>',
                 sprintf(
-                    esc_html__( 'Print %s', 'invoicing' ),
-                    esc_html( ucfirst( $invoice->get_invoice_quote_type() ) )
+                    esc_html__('Print %s', 'invoicing'),
+                    esc_html(ucfirst($invoice->get_invoice_quote_type()))
                 )
             );
 
-            if ( is_user_logged_in() ) {
+            if (is_user_logged_in()) {
 
                 $actions[] = sprintf(
                     '<a href="%s" class="btn btn-sm btn-secondary text-white m-1 d-inline-block invoice-action-history">%s</a>',
-                    esc_url( wpinv_get_history_page_uri( $invoice->get_post_type() ) ),
+                    esc_url(wpinv_get_history_page_uri($invoice->get_post_type())),
                     sprintf(
-                        __( '%s History', 'invoicing' ),
-                        esc_html( ucfirst( $invoice->get_invoice_quote_type() ) )
+                        __('%s History', 'invoicing'),
+                        esc_html(ucfirst($invoice->get_invoice_quote_type()))
                     )
                 );
 
             }
 
-            if ( wpinv_current_user_can_manage_invoicing() ) {
+            if (wpinv_current_user_can_manage_invoicing()) {
 
                 $actions[] = sprintf(
                     '<a href="%s" class="btn btn-sm btn-secondary text-white m-1 d-inline-block invoice-action-edit">%s</a>',
-                    esc_url( get_edit_post_link( $invoice->get_id() ) ),
+                    esc_url(get_edit_post_link($invoice->get_id())),
                     sprintf(
-                        __( 'Edit %s', 'invoicing' ),
-                        esc_html( ucfirst( $invoice->get_invoice_quote_type() ) )
+                        __('Edit %s', 'invoicing'),
+                        esc_html(ucfirst($invoice->get_invoice_quote_type()))
                     )
                 );
 
             }
 
-            $actions = apply_filters( 'getpaid_invoice_header_right_actions_array', $actions, $invoice );
-            echo wp_kses_post( implode( '', $actions ) );
+            $actions = apply_filters('getpaid_invoice_header_right_actions_array', $actions, $invoice);
+            echo wp_kses_post(implode('', $actions));
 
         ?>
 
-        <?php do_action( 'wpinv_invoice_display_right_actions', $invoice ); ?>
+        <?php do_action('wpinv_invoice_display_right_actions', $invoice); ?>
     </div>
 
 <?php

templates/invoice/invoice.php

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -18,7 +18,7 @@ 
         <?php
 
             // Fires when printing the header.
-            do_action( 'getpaid_invoice_header', $invoice );
+            do_action('getpaid_invoice_header', $invoice);
 
             // Print the opening wrapper.
             echo '<div class="container bg-white getpaid-print-no-border border mt-4 mb-4 p-4 position-relative flex-grow-1">';
@@ -27,16 +27,16 @@ 
             wpinv_print_errors();
 
             // Fires when printing the invoice details.
-            do_action( 'getpaid_invoice_details', $invoice );
+            do_action('getpaid_invoice_details', $invoice);
 
             // Fires when printing the invoice line items.
-            do_action( 'getpaid_invoice_line_items', $invoice );
+            do_action('getpaid_invoice_line_items', $invoice);
 
             // Print the closing wrapper.
             echo '</div>';
 
             // Fires when printing the invoice footer.
-            do_action( 'getpaid_invoice_footer', $invoice );
+            do_action('getpaid_invoice_footer', $invoice);
 
         ?>
 

Switch Indentation +18 added lines, -18 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 /**
  * Displays an invoice.
  *
@@ -7,9 +7,9 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+    defined( 'ABSPATH' ) || exit;
 
-?>
+    ?>
 
 <div class="bsui">
 
@@ -17,28 +17,28 @@ 
 
         <?php
 
-            // Fires when printing the header.
-            do_action( 'getpaid_invoice_header', $invoice );
+                // Fires when printing the header.
+                do_action( 'getpaid_invoice_header', $invoice );
 
-            // Print the opening wrapper.
-            echo '<div class="container bg-white getpaid-print-no-border border mt-4 mb-4 p-4 position-relative flex-grow-1">';
+                // Print the opening wrapper.
+                echo '<div class="container bg-white getpaid-print-no-border border mt-4 mb-4 p-4 position-relative flex-grow-1">';
 
-            // Print notifications.
-            wpinv_print_errors();
+                // Print notifications.
+                wpinv_print_errors();
 
-            // Fires when printing the invoice details.
-            do_action( 'getpaid_invoice_details', $invoice );
+                // Fires when printing the invoice details.
+                do_action( 'getpaid_invoice_details', $invoice );
 
-            // Fires when printing the invoice line items.
-            do_action( 'getpaid_invoice_line_items', $invoice );
+                // Fires when printing the invoice line items.
+                do_action( 'getpaid_invoice_line_items', $invoice );
 
-            // Print the closing wrapper.
-            echo '</div>';
+                // Print the closing wrapper.
+                echo '</div>';
 
-            // Fires when printing the invoice footer.
-            do_action( 'getpaid_invoice_footer', $invoice );
+                // Fires when printing the invoice footer.
+                do_action( 'getpaid_invoice_footer', $invoice );
 
-        ?>
+            ?>
 
     </div>
 </div>

includes/class-getpaid-customers-query.php

Indentation +497 added lines, -497 removed lines

@@ -16,502 +16,502 @@
  */
 class GetPaid_Customers_Query {
 
-	/**
-	 * Query vars, after parsing
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	public $query_vars = array();
-
-	/**
-	 * List of found customers.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	private $results;
-
-	/**
-	 * Total number of found customers for the current query
-	 *
-	 * @since 1.0.19
-	 * @var int
-	 */
-	private $total_customers = 0;
-
-	/**
-	 * The SQL query used to fetch matching customers.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $request;
-
-	// SQL clauses
-
-	/**
-	 * Contains the 'FIELDS' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_fields;
-
-	/**
-	 * Contains the 'FROM' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_from;
-
-	/**
-	 * Contains the 'WHERE' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_where;
-
-	/**
-	 * Contains the 'ORDER BY' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_orderby;
-
-	/**
-	 * Contains the 'LIMIT' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_limit;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param null|string|array $query Optional. The query variables.
-	 */
-	public function __construct( $query = null ) {
-		if ( ! is_null( $query ) ) {
-			$this->prepare_query( $query );
-			$this->query();
-		}
-	}
-
-	/**
-	 * Fills in missing query variables with default values.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param  string|array $args Query vars, as passed to `GetPaid_Subscriptions_Query`.
-	 * @return array Complete query variables with undefined ones filled in with defaults.
-	 */
-	public static function fill_query_vars( $args ) {
-		$defaults = array(
-			'include'     => array(),
-			'exclude'     => array(),
-			'orderby'     => 'id',
-			'order'       => 'DESC',
-			'offset'      => '',
-			'number'      => 10,
-			'paged'       => 1,
-			'count_total' => true,
-			'fields'      => 'all',
-			's'           => '',
-		);
-
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			$defaults[ $field ] = 'any';
-
-			if ( '%f' === $type || '%d' === $type ) {
-				$defaults[ $field . '_min' ] = '';
-				$defaults[ $field . '_max' ] = '';
-			}
-		}
-
-		return wp_parse_args( $args, $defaults );
-	}
-
-	/**
-	 * Prepare the query variables.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @see self::fill_query_vars() For allowede args and their defaults.
-	 */
-	public function prepare_query( $query = array() ) {
-		global $wpdb;
-
-		if ( empty( $this->query_vars ) || ! empty( $query ) ) {
-			$this->query_limit = null;
-			$this->query_vars  = $this->fill_query_vars( $query );
-		}
-
-		if ( ! empty( $this->query_vars['fields'] ) && 'all' !== $this->query_vars['fields'] ) {
-			$this->query_vars['fields'] = wpinv_parse_list( $this->query_vars['fields'] );
-		}
-
-		do_action( 'getpaid_pre_get_customers', array( &$this ) );
-
-		// Ensure that query vars are filled after 'getpaid_pre_get_customers'.
-		$qv                = & $this->query_vars;
-		$qv                = $this->fill_query_vars( $qv );
-		$table             = $wpdb->prefix . 'getpaid_customers';
-		$this->query_from  = "FROM $table";
-
-		// Prepare query fields.
-		$this->prepare_query_fields( $qv, $table );
-
-		// Prepare query where.
-		$this->prepare_query_where( $qv, $table );
-
-		// Prepare query order.
-		$this->prepare_query_order( $qv, $table );
-
-		// limit
-		if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
-			if ( $qv['offset'] ) {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );
-			} else {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
-			}
-		}
-
-		do_action_ref_array( 'getpaid_after_customers_query', array( &$this ) );
-	}
-
-	/**
-	 * Prepares the query fields.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $qv Query vars.
-	 * @param string $table Table name.
-	 */
-	protected function prepare_query_fields( &$qv, $table ) {
-
-		if ( is_array( $qv['fields'] ) ) {
-			$qv['fields']   = array_unique( $qv['fields'] );
-			$allowed_fields = array_keys( GetPaid_Customer_Data_Store::get_database_fields() );
-
-			$query_fields = array();
-			foreach ( $qv['fields'] as $field ) {
-				if ( ! in_array( $field, $allowed_fields ) ) {
-					continue;
-				}
-
-				$field          = sanitize_key( $field );
-				$query_fields[] = "$table.`$field`";
-			}
-			$this->query_fields = implode( ',', $query_fields );
-		} else {
-			$this->query_fields = "$table.*";
-		}
-
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
-			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
-		}
-
-	}
-
-	/**
-	 * Prepares the query where.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $qv Query vars.
-	 * @param string $table Table name.
-	 */
-	protected function prepare_query_where( &$qv, $table ) {
-		global $wpdb;
-		$this->query_where = 'WHERE 1=1';
-
-		// Fields.
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			if ( 'any' !== $qv[ $field ] ) {
-
-				// In.
-				if ( is_array( $qv[ $field ] ) ) {
-					$in                 = join( ',', array_fill( 0, count( $qv[ $field ] ), $type ) );
-					$this->query_where .= $wpdb->prepare( " AND $table.`status` IN ( $in )", $qv[ $field ] );
-				} elseif ( ! empty( $qv[ $field ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` = $type", $qv[ $field ] );
-				}
-			}
-
-			// Min/Max.
-			if ( '%f' === $type || '%d' === $type ) {
-
-				// Min.
-				if ( is_numeric( $qv[ $field . '_min' ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` >= $type", $qv[ $field . '_min' ] );
-				}
-
-				// Max.
-				if ( is_numeric( $qv[ $field . '_max' ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` <= $type", $qv[ $field . '_max' ] );
-				}
-			}
-		}
-
-		if ( ! empty( $qv['include'] ) ) {
-			$include            = implode( ',', wp_parse_id_list( $qv['include'] ) );
-			$this->query_where .= " AND $table.`id` IN ($include)";
-		} elseif ( ! empty( $qv['exclude'] ) ) {
-			$exclude            = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
-			$this->query_where .= " AND $table.`id` NOT IN ($exclude)";
-		}
-
-		// Date queries are allowed for the customer creation date.
-		if ( ! empty( $qv['date_created_query'] ) && is_array( $qv['date_created_query'] ) ) {
-			$date_created_query = new WP_Date_Query( $qv['date_created_query'], "$table.date_created" );
-			$this->query_where .= $date_created_query->get_sql();
-		}
-
-		// Search.
-		if ( ! empty( $qv['s'] ) ) {
-			$this->query_where .= $this->get_search_sql( $qv['s'] );
-		}
-	}
-
-	/**
-	 * Used internally to generate an SQL string for searching across multiple columns
-	 *
-	 * @since 1.2.7
-	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 *
-	 * @param string $string The string to search for.
-	 * @return string
-	 */
-	protected function get_search_sql( $string ) {
-		global $wpdb;
-
-		$searches = array();
-		$string   = trim( $string, '%' );
-		$like     = '%' . $wpdb->esc_like( $string ) . '%';
-
-		foreach ( array_keys( GetPaid_Customer_Data_Store::get_database_fields() ) as $col ) {
-			if ( 'id' === $col || 'user_id' === $col ) {
-				$searches[] = $wpdb->prepare( "$col = %s", $string );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-			} else {
-				$searches[] = $wpdb->prepare( "$col LIKE %s", $like );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-			}
-		}
-
-		return ' AND (' . implode( ' OR ', $searches ) . ')';
-	}
-
-	/**
-	 * Prepares the query order.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $qv Query vars.
-	 * @param string $table Table name.
-	 */
-	protected function prepare_query_order( &$qv, $table ) {
-
-		// sorting.
-		$qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
-		$order       = $this->parse_order( $qv['order'] );
-
-		// Default order is by 'id' (latest customers).
-		if ( empty( $qv['orderby'] ) ) {
-			$qv['orderby'] = array( 'id' );
-		}
-
-		// 'orderby' values may be an array, comma- or space-separated list.
-		$ordersby      = array_filter( wpinv_parse_list( $qv['orderby'] ) );
-
-		$orderby_array = array();
-		foreach ( $ordersby as $_key => $_value ) {
-
-			if ( is_int( $_key ) ) {
-				// Integer key means this is a flat array of 'orderby' fields.
-				$_orderby = $_value;
-				$_order   = $order;
-			} else {
-				// Non-integer key means that the key is the field and the value is ASC/DESC.
-				$_orderby = $_key;
-				$_order   = $_value;
-			}
-
-			$parsed = $this->parse_orderby( $_orderby, $table );
-
-			if ( $parsed ) {
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
-			}
-		}
-
-		// If no valid clauses were found, order by id.
-		if ( empty( $orderby_array ) ) {
-			$orderby_array[] = "id $order";
-		}
-
-		$this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
-
-	}
-
-	/**
-	 * Execute the query, with the current variables.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 */
-	public function query() {
-		global $wpdb;
-
-		$qv =& $this->query_vars;
-
-		// Return a non-null value to bypass the default GetPaid customers query and remember to set the
-		// total_customers property.
-		$this->results = apply_filters_ref_array( 'getpaid_customers_pre_query', array( null, &$this ) );
-
-		if ( null === $this->results ) {
-			$this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
-
-			if ( ( is_array( $qv['fields'] ) && 1 !== count( $qv['fields'] ) ) || 'all' === $qv['fields'] ) {
-				$this->results = $wpdb->get_results( $this->request );
-			} else {
-				$this->results = $wpdb->get_col( $this->request );
-			}
-
-			if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
-				$found_customers_query = apply_filters( 'getpaid_found_customers_query', 'SELECT FOUND_ROWS()', $this );
-				$this->total_customers = (int) $wpdb->get_var( $found_customers_query );
-			}
-		}
-
-		if ( 'all' === $qv['fields'] ) {
-			foreach ( $this->results as $key => $customer ) {
-				$this->set_cache( $customer->id, $customer, 'getpaid_customers' );
-				$this->set_cache( $customer->user_id, $customer->id, 'getpaid_customer_ids_by_user_id' );
-				$this->set_cache( $customer->email, $customer->id, 'getpaid_customer_ids_by_email' );
-				$this->results[ $key ] = new GetPaid_Customer( $customer );
-			}
-		}
-
-	}
-
-	/**
-	 * Set cache
-	 *
-	 * @param string  $id
-	 * @param mixed   $data
-	 * @param string  $group
-	 * @param integer $expire
-	 * @return boolean
-	 */
-	public function set_cache( $key, $data, $group = '', $expire = 0 ) {
-
-		if ( empty( $key ) ) {
-			return false;
-		}
-
-		wp_cache_set( $key, $data, $group, $expire );
-	}
-
-	/**
-	 * Retrieve query variable.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $query_var Query variable key.
-	 * @return mixed
-	 */
-	public function get( $query_var ) {
-		if ( isset( $this->query_vars[ $query_var ] ) ) {
-			return $this->query_vars[ $query_var ];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Set query variable.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $query_var Query variable key.
-	 * @param mixed $value Query variable value.
-	 */
-	public function set( $query_var, $value ) {
-		$this->query_vars[ $query_var ] = $value;
-	}
-
-	/**
-	 * Return the list of customers.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @return GetPaid_Customer[]|array Found customers.
-	 */
-	public function get_results() {
-		return $this->results;
-	}
-
-	/**
-	 * Return the total number of customers for the current query.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @return int Number of total customers.
-	 */
-	public function get_total() {
-		return $this->total_customers;
-	}
-
-	/**
-	 * Parse and sanitize 'orderby' keys passed to the customers query.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $orderby Alias for the field to order by.
-	 *  @param string $table The current table.
-	 * @return string Value to use in the ORDER clause, if `$orderby` is valid.
-	 */
-	protected function parse_orderby( $orderby, $table ) {
-
-		$_orderby = '';
-		if ( in_array( $orderby, array_keys( GetPaid_Customer_Data_Store::get_database_fields() ), true ) ) {
-			$_orderby = "$table.`$orderby`";
-		} elseif ( 'id' === strtolower( $orderby ) ) {
-			$_orderby = "$table.id";
-		} elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
-			$include     = wp_parse_id_list( $this->query_vars['include'] );
-			$include_sql = implode( ',', $include );
-			$_orderby    = "FIELD( $table.id, $include_sql )";
-		}
-
-		return $_orderby;
-	}
-
-	/**
-	 * Parse an 'order' query variable and cast it to ASC or DESC as necessary.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $order The 'order' query variable.
-	 * @return string The sanitized 'order' query variable.
-	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
-			return 'DESC';
-		}
-
-		if ( 'ASC' === strtoupper( $order ) ) {
-			return 'ASC';
-		} else {
-			return 'DESC';
-		}
-	}
+    /**
+     * Query vars, after parsing
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    public $query_vars = array();
+
+    /**
+     * List of found customers.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    private $results;
+
+    /**
+     * Total number of found customers for the current query
+     *
+     * @since 1.0.19
+     * @var int
+     */
+    private $total_customers = 0;
+
+    /**
+     * The SQL query used to fetch matching customers.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $request;
+
+    // SQL clauses
+
+    /**
+     * Contains the 'FIELDS' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_fields;
+
+    /**
+     * Contains the 'FROM' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_from;
+
+    /**
+     * Contains the 'WHERE' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_where;
+
+    /**
+     * Contains the 'ORDER BY' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_orderby;
+
+    /**
+     * Contains the 'LIMIT' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_limit;
+
+    /**
+     * Class constructor.
+     *
+     * @since 1.0.19
+     *
+     * @param null|string|array $query Optional. The query variables.
+     */
+    public function __construct( $query = null ) {
+        if ( ! is_null( $query ) ) {
+            $this->prepare_query( $query );
+            $this->query();
+        }
+    }
+
+    /**
+     * Fills in missing query variables with default values.
+     *
+     * @since 1.0.19
+     *
+     * @param  string|array $args Query vars, as passed to `GetPaid_Subscriptions_Query`.
+     * @return array Complete query variables with undefined ones filled in with defaults.
+     */
+    public static function fill_query_vars( $args ) {
+        $defaults = array(
+            'include'     => array(),
+            'exclude'     => array(),
+            'orderby'     => 'id',
+            'order'       => 'DESC',
+            'offset'      => '',
+            'number'      => 10,
+            'paged'       => 1,
+            'count_total' => true,
+            'fields'      => 'all',
+            's'           => '',
+        );
+
+        foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+            $defaults[ $field ] = 'any';
+
+            if ( '%f' === $type || '%d' === $type ) {
+                $defaults[ $field . '_min' ] = '';
+                $defaults[ $field . '_max' ] = '';
+            }
+        }
+
+        return wp_parse_args( $args, $defaults );
+    }
+
+    /**
+     * Prepare the query variables.
+     *
+     * @since 1.0.19
+     *
+     * @see self::fill_query_vars() For allowede args and their defaults.
+     */
+    public function prepare_query( $query = array() ) {
+        global $wpdb;
+
+        if ( empty( $this->query_vars ) || ! empty( $query ) ) {
+            $this->query_limit = null;
+            $this->query_vars  = $this->fill_query_vars( $query );
+        }
+
+        if ( ! empty( $this->query_vars['fields'] ) && 'all' !== $this->query_vars['fields'] ) {
+            $this->query_vars['fields'] = wpinv_parse_list( $this->query_vars['fields'] );
+        }
+
+        do_action( 'getpaid_pre_get_customers', array( &$this ) );
+
+        // Ensure that query vars are filled after 'getpaid_pre_get_customers'.
+        $qv                = & $this->query_vars;
+        $qv                = $this->fill_query_vars( $qv );
+        $table             = $wpdb->prefix . 'getpaid_customers';
+        $this->query_from  = "FROM $table";
+
+        // Prepare query fields.
+        $this->prepare_query_fields( $qv, $table );
+
+        // Prepare query where.
+        $this->prepare_query_where( $qv, $table );
+
+        // Prepare query order.
+        $this->prepare_query_order( $qv, $table );
+
+        // limit
+        if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
+            if ( $qv['offset'] ) {
+                $this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );
+            } else {
+                $this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
+            }
+        }
+
+        do_action_ref_array( 'getpaid_after_customers_query', array( &$this ) );
+    }
+
+    /**
+     * Prepares the query fields.
+     *
+     * @since 1.0.19
+     *
+     * @param array $qv Query vars.
+     * @param string $table Table name.
+     */
+    protected function prepare_query_fields( &$qv, $table ) {
+
+        if ( is_array( $qv['fields'] ) ) {
+            $qv['fields']   = array_unique( $qv['fields'] );
+            $allowed_fields = array_keys( GetPaid_Customer_Data_Store::get_database_fields() );
+
+            $query_fields = array();
+            foreach ( $qv['fields'] as $field ) {
+                if ( ! in_array( $field, $allowed_fields ) ) {
+                    continue;
+                }
+
+                $field          = sanitize_key( $field );
+                $query_fields[] = "$table.`$field`";
+            }
+            $this->query_fields = implode( ',', $query_fields );
+        } else {
+            $this->query_fields = "$table.*";
+        }
+
+        if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+            $this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+        }
+
+    }
+
+    /**
+     * Prepares the query where.
+     *
+     * @since 1.0.19
+     *
+     * @param array $qv Query vars.
+     * @param string $table Table name.
+     */
+    protected function prepare_query_where( &$qv, $table ) {
+        global $wpdb;
+        $this->query_where = 'WHERE 1=1';
+
+        // Fields.
+        foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+            if ( 'any' !== $qv[ $field ] ) {
+
+                // In.
+                if ( is_array( $qv[ $field ] ) ) {
+                    $in                 = join( ',', array_fill( 0, count( $qv[ $field ] ), $type ) );
+                    $this->query_where .= $wpdb->prepare( " AND $table.`status` IN ( $in )", $qv[ $field ] );
+                } elseif ( ! empty( $qv[ $field ] ) ) {
+                    $this->query_where .= $wpdb->prepare( " AND $table.`$field` = $type", $qv[ $field ] );
+                }
+            }
+
+            // Min/Max.
+            if ( '%f' === $type || '%d' === $type ) {
+
+                // Min.
+                if ( is_numeric( $qv[ $field . '_min' ] ) ) {
+                    $this->query_where .= $wpdb->prepare( " AND $table.`$field` >= $type", $qv[ $field . '_min' ] );
+                }
+
+                // Max.
+                if ( is_numeric( $qv[ $field . '_max' ] ) ) {
+                    $this->query_where .= $wpdb->prepare( " AND $table.`$field` <= $type", $qv[ $field . '_max' ] );
+                }
+            }
+        }
+
+        if ( ! empty( $qv['include'] ) ) {
+            $include            = implode( ',', wp_parse_id_list( $qv['include'] ) );
+            $this->query_where .= " AND $table.`id` IN ($include)";
+        } elseif ( ! empty( $qv['exclude'] ) ) {
+            $exclude            = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
+            $this->query_where .= " AND $table.`id` NOT IN ($exclude)";
+        }
+
+        // Date queries are allowed for the customer creation date.
+        if ( ! empty( $qv['date_created_query'] ) && is_array( $qv['date_created_query'] ) ) {
+            $date_created_query = new WP_Date_Query( $qv['date_created_query'], "$table.date_created" );
+            $this->query_where .= $date_created_query->get_sql();
+        }
+
+        // Search.
+        if ( ! empty( $qv['s'] ) ) {
+            $this->query_where .= $this->get_search_sql( $qv['s'] );
+        }
+    }
+
+    /**
+     * Used internally to generate an SQL string for searching across multiple columns
+     *
+     * @since 1.2.7
+     *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     *
+     * @param string $string The string to search for.
+     * @return string
+     */
+    protected function get_search_sql( $string ) {
+        global $wpdb;
+
+        $searches = array();
+        $string   = trim( $string, '%' );
+        $like     = '%' . $wpdb->esc_like( $string ) . '%';
+
+        foreach ( array_keys( GetPaid_Customer_Data_Store::get_database_fields() ) as $col ) {
+            if ( 'id' === $col || 'user_id' === $col ) {
+                $searches[] = $wpdb->prepare( "$col = %s", $string );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            } else {
+                $searches[] = $wpdb->prepare( "$col LIKE %s", $like );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            }
+        }
+
+        return ' AND (' . implode( ' OR ', $searches ) . ')';
+    }
+
+    /**
+     * Prepares the query order.
+     *
+     * @since 1.0.19
+     *
+     * @param array $qv Query vars.
+     * @param string $table Table name.
+     */
+    protected function prepare_query_order( &$qv, $table ) {
+
+        // sorting.
+        $qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
+        $order       = $this->parse_order( $qv['order'] );
+
+        // Default order is by 'id' (latest customers).
+        if ( empty( $qv['orderby'] ) ) {
+            $qv['orderby'] = array( 'id' );
+        }
+
+        // 'orderby' values may be an array, comma- or space-separated list.
+        $ordersby      = array_filter( wpinv_parse_list( $qv['orderby'] ) );
+
+        $orderby_array = array();
+        foreach ( $ordersby as $_key => $_value ) {
+
+            if ( is_int( $_key ) ) {
+                // Integer key means this is a flat array of 'orderby' fields.
+                $_orderby = $_value;
+                $_order   = $order;
+            } else {
+                // Non-integer key means that the key is the field and the value is ASC/DESC.
+                $_orderby = $_key;
+                $_order   = $_value;
+            }
+
+            $parsed = $this->parse_orderby( $_orderby, $table );
+
+            if ( $parsed ) {
+                $orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+            }
+        }
+
+        // If no valid clauses were found, order by id.
+        if ( empty( $orderby_array ) ) {
+            $orderby_array[] = "id $order";
+        }
+
+        $this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
+
+    }
+
+    /**
+     * Execute the query, with the current variables.
+     *
+     * @since 1.0.19
+     *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     */
+    public function query() {
+        global $wpdb;
+
+        $qv =& $this->query_vars;
+
+        // Return a non-null value to bypass the default GetPaid customers query and remember to set the
+        // total_customers property.
+        $this->results = apply_filters_ref_array( 'getpaid_customers_pre_query', array( null, &$this ) );
+
+        if ( null === $this->results ) {
+            $this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
+
+            if ( ( is_array( $qv['fields'] ) && 1 !== count( $qv['fields'] ) ) || 'all' === $qv['fields'] ) {
+                $this->results = $wpdb->get_results( $this->request );
+            } else {
+                $this->results = $wpdb->get_col( $this->request );
+            }
+
+            if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+                $found_customers_query = apply_filters( 'getpaid_found_customers_query', 'SELECT FOUND_ROWS()', $this );
+                $this->total_customers = (int) $wpdb->get_var( $found_customers_query );
+            }
+        }
+
+        if ( 'all' === $qv['fields'] ) {
+            foreach ( $this->results as $key => $customer ) {
+                $this->set_cache( $customer->id, $customer, 'getpaid_customers' );
+                $this->set_cache( $customer->user_id, $customer->id, 'getpaid_customer_ids_by_user_id' );
+                $this->set_cache( $customer->email, $customer->id, 'getpaid_customer_ids_by_email' );
+                $this->results[ $key ] = new GetPaid_Customer( $customer );
+            }
+        }
+
+    }
+
+    /**
+     * Set cache
+     *
+     * @param string  $id
+     * @param mixed   $data
+     * @param string  $group
+     * @param integer $expire
+     * @return boolean
+     */
+    public function set_cache( $key, $data, $group = '', $expire = 0 ) {
+
+        if ( empty( $key ) ) {
+            return false;
+        }
+
+        wp_cache_set( $key, $data, $group, $expire );
+    }
+
+    /**
+     * Retrieve query variable.
+     *
+     * @since 1.0.19
+     *
+     * @param string $query_var Query variable key.
+     * @return mixed
+     */
+    public function get( $query_var ) {
+        if ( isset( $this->query_vars[ $query_var ] ) ) {
+            return $this->query_vars[ $query_var ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Set query variable.
+     *
+     * @since 1.0.19
+     *
+     * @param string $query_var Query variable key.
+     * @param mixed $value Query variable value.
+     */
+    public function set( $query_var, $value ) {
+        $this->query_vars[ $query_var ] = $value;
+    }
+
+    /**
+     * Return the list of customers.
+     *
+     * @since 1.0.19
+     *
+     * @return GetPaid_Customer[]|array Found customers.
+     */
+    public function get_results() {
+        return $this->results;
+    }
+
+    /**
+     * Return the total number of customers for the current query.
+     *
+     * @since 1.0.19
+     *
+     * @return int Number of total customers.
+     */
+    public function get_total() {
+        return $this->total_customers;
+    }
+
+    /**
+     * Parse and sanitize 'orderby' keys passed to the customers query.
+     *
+     * @since 1.0.19
+     *
+     * @param string $orderby Alias for the field to order by.
+     *  @param string $table The current table.
+     * @return string Value to use in the ORDER clause, if `$orderby` is valid.
+     */
+    protected function parse_orderby( $orderby, $table ) {
+
+        $_orderby = '';
+        if ( in_array( $orderby, array_keys( GetPaid_Customer_Data_Store::get_database_fields() ), true ) ) {
+            $_orderby = "$table.`$orderby`";
+        } elseif ( 'id' === strtolower( $orderby ) ) {
+            $_orderby = "$table.id";
+        } elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
+            $include     = wp_parse_id_list( $this->query_vars['include'] );
+            $include_sql = implode( ',', $include );
+            $_orderby    = "FIELD( $table.id, $include_sql )";
+        }
+
+        return $_orderby;
+    }
+
+    /**
+     * Parse an 'order' query variable and cast it to ASC or DESC as necessary.
+     *
+     * @since 1.0.19
+     *
+     * @param string $order The 'order' query variable.
+     * @return string The sanitized 'order' query variable.
+     */
+    protected function parse_order( $order ) {
+        if ( ! is_string( $order ) || empty( $order ) ) {
+            return 'DESC';
+        }
+
+        if ( 'ASC' === strtoupper( $order ) ) {
+            return 'ASC';
+        } else {
+            return 'DESC';
+        }
+    }
 
 }

Spacing +108 added lines, -108 removed lines

@@ -97,9 +97,9 @@ 
 	 *
 	 * @param null|string|array $query Optional. The query variables.
 	 */
-	public function __construct( $query = null ) {
-		if ( ! is_null( $query ) ) {
-			$this->prepare_query( $query );
+	public function __construct($query = null) {
+		if (!is_null($query)) {
+			$this->prepare_query($query);
 			$this->query();
 		}
 	}
@@ -112,7 +112,7 @@ 
 	 * @param  string|array $args Query vars, as passed to `GetPaid_Subscriptions_Query`.
 	 * @return array Complete query variables with undefined ones filled in with defaults.
 	 */
-	public static function fill_query_vars( $args ) {
+	public static function fill_query_vars($args) {
 		$defaults = array(
 			'include'     => array(),
 			'exclude'     => array(),
@@ -126,16 +126,16 @@ 
 			's'           => '',
 		);
 
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			$defaults[ $field ] = 'any';
+		foreach (GetPaid_Customer_Data_Store::get_database_fields() as $field => $type) {
+			$defaults[$field] = 'any';
 
-			if ( '%f' === $type || '%d' === $type ) {
-				$defaults[ $field . '_min' ] = '';
-				$defaults[ $field . '_max' ] = '';
+			if ('%f' === $type || '%d' === $type) {
+				$defaults[$field . '_min'] = '';
+				$defaults[$field . '_max'] = '';
 			}
 		}
 
-		return wp_parse_args( $args, $defaults );
+		return wp_parse_args($args, $defaults);
 	}
 
 	/**
@@ -145,45 +145,45 @@ 
 	 *
 	 * @see self::fill_query_vars() For allowede args and their defaults.
 	 */
-	public function prepare_query( $query = array() ) {
+	public function prepare_query($query = array()) {
 		global $wpdb;
 
-		if ( empty( $this->query_vars ) || ! empty( $query ) ) {
+		if (empty($this->query_vars) || !empty($query)) {
 			$this->query_limit = null;
-			$this->query_vars  = $this->fill_query_vars( $query );
+			$this->query_vars  = $this->fill_query_vars($query);
 		}
 
-		if ( ! empty( $this->query_vars['fields'] ) && 'all' !== $this->query_vars['fields'] ) {
-			$this->query_vars['fields'] = wpinv_parse_list( $this->query_vars['fields'] );
+		if (!empty($this->query_vars['fields']) && 'all' !== $this->query_vars['fields']) {
+			$this->query_vars['fields'] = wpinv_parse_list($this->query_vars['fields']);
 		}
 
-		do_action( 'getpaid_pre_get_customers', array( &$this ) );
+		do_action('getpaid_pre_get_customers', array(&$this));
 
 		// Ensure that query vars are filled after 'getpaid_pre_get_customers'.
 		$qv                = & $this->query_vars;
-		$qv                = $this->fill_query_vars( $qv );
+		$qv                = $this->fill_query_vars($qv);
 		$table             = $wpdb->prefix . 'getpaid_customers';
 		$this->query_from  = "FROM $table";
 
 		// Prepare query fields.
-		$this->prepare_query_fields( $qv, $table );
+		$this->prepare_query_fields($qv, $table);
 
 		// Prepare query where.
-		$this->prepare_query_where( $qv, $table );
+		$this->prepare_query_where($qv, $table);
 
 		// Prepare query order.
-		$this->prepare_query_order( $qv, $table );
+		$this->prepare_query_order($qv, $table);
 
 		// limit
-		if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
-			if ( $qv['offset'] ) {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );
+		if (isset($qv['number']) && $qv['number'] > 0) {
+			if ($qv['offset']) {
+				$this->query_limit = $wpdb->prepare('LIMIT %d, %d', $qv['offset'], $qv['number']);
 			} else {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
+				$this->query_limit = $wpdb->prepare('LIMIT %d, %d', $qv['number'] * ($qv['paged'] - 1), $qv['number']);
 			}
 		}
 
-		do_action_ref_array( 'getpaid_after_customers_query', array( &$this ) );
+		do_action_ref_array('getpaid_after_customers_query', array(&$this));
 	}
 
 	/**
@@ -194,27 +194,27 @@ 
 	 * @param array $qv Query vars.
 	 * @param string $table Table name.
 	 */
-	protected function prepare_query_fields( &$qv, $table ) {
+	protected function prepare_query_fields(&$qv, $table) {
 
-		if ( is_array( $qv['fields'] ) ) {
-			$qv['fields']   = array_unique( $qv['fields'] );
-			$allowed_fields = array_keys( GetPaid_Customer_Data_Store::get_database_fields() );
+		if (is_array($qv['fields'])) {
+			$qv['fields']   = array_unique($qv['fields']);
+			$allowed_fields = array_keys(GetPaid_Customer_Data_Store::get_database_fields());
 
 			$query_fields = array();
-			foreach ( $qv['fields'] as $field ) {
-				if ( ! in_array( $field, $allowed_fields ) ) {
+			foreach ($qv['fields'] as $field) {
+				if (!in_array($field, $allowed_fields)) {
 					continue;
 				}
 
-				$field          = sanitize_key( $field );
+				$field          = sanitize_key($field);
 				$query_fields[] = "$table.`$field`";
 			}
-			$this->query_fields = implode( ',', $query_fields );
+			$this->query_fields = implode(',', $query_fields);
 		} else {
 			$this->query_fields = "$table.*";
 		}
 
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+		if (isset($qv['count_total']) && $qv['count_total']) {
 			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
 		}
 
@@ -228,55 +228,55 @@ 
 	 * @param array $qv Query vars.
 	 * @param string $table Table name.
 	 */
-	protected function prepare_query_where( &$qv, $table ) {
+	protected function prepare_query_where(&$qv, $table) {
 		global $wpdb;
 		$this->query_where = 'WHERE 1=1';
 
 		// Fields.
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			if ( 'any' !== $qv[ $field ] ) {
+		foreach (GetPaid_Customer_Data_Store::get_database_fields() as $field => $type) {
+			if ('any' !== $qv[$field]) {
 
 				// In.
-				if ( is_array( $qv[ $field ] ) ) {
-					$in                 = join( ',', array_fill( 0, count( $qv[ $field ] ), $type ) );
-					$this->query_where .= $wpdb->prepare( " AND $table.`status` IN ( $in )", $qv[ $field ] );
-				} elseif ( ! empty( $qv[ $field ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` = $type", $qv[ $field ] );
+				if (is_array($qv[$field])) {
+					$in                 = join(',', array_fill(0, count($qv[$field]), $type));
+					$this->query_where .= $wpdb->prepare(" AND $table.`status` IN ( $in )", $qv[$field]);
+				} elseif (!empty($qv[$field])) {
+					$this->query_where .= $wpdb->prepare(" AND $table.`$field` = $type", $qv[$field]);
 				}
 			}
 
 			// Min/Max.
-			if ( '%f' === $type || '%d' === $type ) {
+			if ('%f' === $type || '%d' === $type) {
 
 				// Min.
-				if ( is_numeric( $qv[ $field . '_min' ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` >= $type", $qv[ $field . '_min' ] );
+				if (is_numeric($qv[$field . '_min'])) {
+					$this->query_where .= $wpdb->prepare(" AND $table.`$field` >= $type", $qv[$field . '_min']);
 				}
 
 				// Max.
-				if ( is_numeric( $qv[ $field . '_max' ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` <= $type", $qv[ $field . '_max' ] );
+				if (is_numeric($qv[$field . '_max'])) {
+					$this->query_where .= $wpdb->prepare(" AND $table.`$field` <= $type", $qv[$field . '_max']);
 				}
 			}
 		}
 
-		if ( ! empty( $qv['include'] ) ) {
-			$include            = implode( ',', wp_parse_id_list( $qv['include'] ) );
+		if (!empty($qv['include'])) {
+			$include            = implode(',', wp_parse_id_list($qv['include']));
 			$this->query_where .= " AND $table.`id` IN ($include)";
-		} elseif ( ! empty( $qv['exclude'] ) ) {
-			$exclude            = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
+		} elseif (!empty($qv['exclude'])) {
+			$exclude            = implode(',', wp_parse_id_list($qv['exclude']));
 			$this->query_where .= " AND $table.`id` NOT IN ($exclude)";
 		}
 
 		// Date queries are allowed for the customer creation date.
-		if ( ! empty( $qv['date_created_query'] ) && is_array( $qv['date_created_query'] ) ) {
-			$date_created_query = new WP_Date_Query( $qv['date_created_query'], "$table.date_created" );
+		if (!empty($qv['date_created_query']) && is_array($qv['date_created_query'])) {
+			$date_created_query = new WP_Date_Query($qv['date_created_query'], "$table.date_created");
 			$this->query_where .= $date_created_query->get_sql();
 		}
 
 		// Search.
-		if ( ! empty( $qv['s'] ) ) {
-			$this->query_where .= $this->get_search_sql( $qv['s'] );
+		if (!empty($qv['s'])) {
+			$this->query_where .= $this->get_search_sql($qv['s']);
 		}
 	}
 
@@ -290,22 +290,22 @@ 
 	 * @param string $string The string to search for.
 	 * @return string
 	 */
-	protected function get_search_sql( $string ) {
+	protected function get_search_sql($string) {
 		global $wpdb;
 
 		$searches = array();
-		$string   = trim( $string, '%' );
-		$like     = '%' . $wpdb->esc_like( $string ) . '%';
+		$string   = trim($string, '%');
+		$like     = '%' . $wpdb->esc_like($string) . '%';
 
-		foreach ( array_keys( GetPaid_Customer_Data_Store::get_database_fields() ) as $col ) {
-			if ( 'id' === $col || 'user_id' === $col ) {
-				$searches[] = $wpdb->prepare( "$col = %s", $string );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+		foreach (array_keys(GetPaid_Customer_Data_Store::get_database_fields()) as $col) {
+			if ('id' === $col || 'user_id' === $col) {
+				$searches[] = $wpdb->prepare("$col = %s", $string); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 			} else {
-				$searches[] = $wpdb->prepare( "$col LIKE %s", $like );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+				$searches[] = $wpdb->prepare("$col LIKE %s", $like); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 			}
 		}
 
-		return ' AND (' . implode( ' OR ', $searches ) . ')';
+		return ' AND (' . implode(' OR ', $searches) . ')';
 	}
 
 	/**
@@ -316,24 +316,24 @@ 
 	 * @param array $qv Query vars.
 	 * @param string $table Table name.
 	 */
-	protected function prepare_query_order( &$qv, $table ) {
+	protected function prepare_query_order(&$qv, $table) {
 
 		// sorting.
-		$qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
-		$order       = $this->parse_order( $qv['order'] );
+		$qv['order'] = isset($qv['order']) ? strtoupper($qv['order']) : '';
+		$order       = $this->parse_order($qv['order']);
 
 		// Default order is by 'id' (latest customers).
-		if ( empty( $qv['orderby'] ) ) {
-			$qv['orderby'] = array( 'id' );
+		if (empty($qv['orderby'])) {
+			$qv['orderby'] = array('id');
 		}
 
 		// 'orderby' values may be an array, comma- or space-separated list.
-		$ordersby      = array_filter( wpinv_parse_list( $qv['orderby'] ) );
+		$ordersby      = array_filter(wpinv_parse_list($qv['orderby']));
 
 		$orderby_array = array();
-		foreach ( $ordersby as $_key => $_value ) {
+		foreach ($ordersby as $_key => $_value) {
 
-			if ( is_int( $_key ) ) {
+			if (is_int($_key)) {
 				// Integer key means this is a flat array of 'orderby' fields.
 				$_orderby = $_value;
 				$_order   = $order;
@@ -343,19 +343,19 @@ 
 				$_order   = $_value;
 			}
 
-			$parsed = $this->parse_orderby( $_orderby, $table );
+			$parsed = $this->parse_orderby($_orderby, $table);
 
-			if ( $parsed ) {
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+			if ($parsed) {
+				$orderby_array[] = $parsed . ' ' . $this->parse_order($_order);
 			}
 		}
 
 		// If no valid clauses were found, order by id.
-		if ( empty( $orderby_array ) ) {
+		if (empty($orderby_array)) {
 			$orderby_array[] = "id $order";
 		}
 
-		$this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
+		$this->query_orderby = 'ORDER BY ' . implode(', ', $orderby_array);
 
 	}
 
@@ -369,33 +369,33 @@ 
 	public function query() {
 		global $wpdb;
 
-		$qv =& $this->query_vars;
+		$qv = & $this->query_vars;
 
 		// Return a non-null value to bypass the default GetPaid customers query and remember to set the
 		// total_customers property.
-		$this->results = apply_filters_ref_array( 'getpaid_customers_pre_query', array( null, &$this ) );
+		$this->results = apply_filters_ref_array('getpaid_customers_pre_query', array(null, &$this));
 
-		if ( null === $this->results ) {
+		if (null === $this->results) {
 			$this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
 
-			if ( ( is_array( $qv['fields'] ) && 1 !== count( $qv['fields'] ) ) || 'all' === $qv['fields'] ) {
-				$this->results = $wpdb->get_results( $this->request );
+			if ((is_array($qv['fields']) && 1 !== count($qv['fields'])) || 'all' === $qv['fields']) {
+				$this->results = $wpdb->get_results($this->request);
 			} else {
-				$this->results = $wpdb->get_col( $this->request );
+				$this->results = $wpdb->get_col($this->request);
 			}
 
-			if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
-				$found_customers_query = apply_filters( 'getpaid_found_customers_query', 'SELECT FOUND_ROWS()', $this );
-				$this->total_customers = (int) $wpdb->get_var( $found_customers_query );
+			if (isset($qv['count_total']) && $qv['count_total']) {
+				$found_customers_query = apply_filters('getpaid_found_customers_query', 'SELECT FOUND_ROWS()', $this);
+				$this->total_customers = (int) $wpdb->get_var($found_customers_query);
 			}
 		}
 
-		if ( 'all' === $qv['fields'] ) {
-			foreach ( $this->results as $key => $customer ) {
-				$this->set_cache( $customer->id, $customer, 'getpaid_customers' );
-				$this->set_cache( $customer->user_id, $customer->id, 'getpaid_customer_ids_by_user_id' );
-				$this->set_cache( $customer->email, $customer->id, 'getpaid_customer_ids_by_email' );
-				$this->results[ $key ] = new GetPaid_Customer( $customer );
+		if ('all' === $qv['fields']) {
+			foreach ($this->results as $key => $customer) {
+				$this->set_cache($customer->id, $customer, 'getpaid_customers');
+				$this->set_cache($customer->user_id, $customer->id, 'getpaid_customer_ids_by_user_id');
+				$this->set_cache($customer->email, $customer->id, 'getpaid_customer_ids_by_email');
+				$this->results[$key] = new GetPaid_Customer($customer);
 			}
 		}
 
@@ -410,13 +410,13 @@ 
 	 * @param integer $expire
 	 * @return boolean
 	 */
-	public function set_cache( $key, $data, $group = '', $expire = 0 ) {
+	public function set_cache($key, $data, $group = '', $expire = 0) {
 
-		if ( empty( $key ) ) {
+		if (empty($key)) {
 			return false;
 		}
 
-		wp_cache_set( $key, $data, $group, $expire );
+		wp_cache_set($key, $data, $group, $expire);
 	}
 
 	/**
@@ -427,9 +427,9 @@ 
 	 * @param string $query_var Query variable key.
 	 * @return mixed
 	 */
-	public function get( $query_var ) {
-		if ( isset( $this->query_vars[ $query_var ] ) ) {
-			return $this->query_vars[ $query_var ];
+	public function get($query_var) {
+		if (isset($this->query_vars[$query_var])) {
+			return $this->query_vars[$query_var];
 		}
 
 		return null;
@@ -443,8 +443,8 @@ 
 	 * @param string $query_var Query variable key.
 	 * @param mixed $value Query variable value.
 	 */
-	public function set( $query_var, $value ) {
-		$this->query_vars[ $query_var ] = $value;
+	public function set($query_var, $value) {
+		$this->query_vars[$query_var] = $value;
 	}
 
 	/**
@@ -478,16 +478,16 @@ 
 	 *  @param string $table The current table.
 	 * @return string Value to use in the ORDER clause, if `$orderby` is valid.
 	 */
-	protected function parse_orderby( $orderby, $table ) {
+	protected function parse_orderby($orderby, $table) {
 
 		$_orderby = '';
-		if ( in_array( $orderby, array_keys( GetPaid_Customer_Data_Store::get_database_fields() ), true ) ) {
+		if (in_array($orderby, array_keys(GetPaid_Customer_Data_Store::get_database_fields()), true)) {
 			$_orderby = "$table.`$orderby`";
-		} elseif ( 'id' === strtolower( $orderby ) ) {
+		} elseif ('id' === strtolower($orderby)) {
 			$_orderby = "$table.id";
-		} elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
-			$include     = wp_parse_id_list( $this->query_vars['include'] );
-			$include_sql = implode( ',', $include );
+		} elseif ('include' === $orderby && !empty($this->query_vars['include'])) {
+			$include     = wp_parse_id_list($this->query_vars['include']);
+			$include_sql = implode(',', $include);
 			$_orderby    = "FIELD( $table.id, $include_sql )";
 		}
 
@@ -502,12 +502,12 @@ 
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
 	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
+	protected function parse_order($order) {
+		if (!is_string($order) || empty($order)) {
 			return 'DESC';
 		}
 
-		if ( 'ASC' === strtoupper( $order ) ) {
+		if ('ASC' === strtoupper($order)) {
 			return 'ASC';
 		} else {
 			return 'DESC';

includes/admin/class-wpinv-customers-table.php

Indentation +296 added lines, -296 removed lines

@@ -11,7 +11,7 @@ 
 
 // Load WP_List_Table if not loaded
 if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -23,303 +23,303 @@ 
  */
 class WPInv_Customers_Table extends WP_List_Table {
 
-	/**
-	 * @var int Number of items per page
-	 * @since 1.0.19
-	 */
-	public $per_page = 25;
-
-	/**
-	 * @var int Number of items
-	 * @since 1.0.19
-	 */
-	public $total_count = 0;
-
-	public $query;
-
-	/**
-	 * Get things started
-	 *
-	 * @since 1.0.19
-	 * @see WP_List_Table::__construct()
-	 */
-	public function __construct() {
-
-		// Set parent defaults
-		parent::__construct(
+    /**
+     * @var int Number of items per page
+     * @since 1.0.19
+     */
+    public $per_page = 25;
+
+    /**
+     * @var int Number of items
+     * @since 1.0.19
+     */
+    public $total_count = 0;
+
+    public $query;
+
+    /**
+     * Get things started
+     *
+     * @since 1.0.19
+     * @see WP_List_Table::__construct()
+     */
+    public function __construct() {
+
+        // Set parent defaults
+        parent::__construct(
             array(
-				'singular' => 'id',
-				'plural'   => 'ids',
-				'ajax'     => false,
+                'singular' => 'id',
+                'plural'   => 'ids',
+                'ajax'     => false,
             )
         );
 
-	}
-
-	/**
-	 * Gets the name of the primary column.
-	 *
-	 * @since 1.0.19
-	 * @access protected
-	 *
-	 * @return string Name of the primary column.
-	 */
-	protected function get_primary_column_name() {
-		return 'customer';
-	}
-
-	/**
-	 * This function renders most of the columns in the list table.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 * @param string $column_name The name of the column
-	 *
-	 * @return string Column Name
-	 */
-	public function column_default( $customer, $column_name ) {
-		$value = esc_html( $customer->get( $column_name ) );
-		return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $customer );
-	}
-
-	/**
-	 * Displays the country column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_country( $customer ) {
-		$country = wpinv_sanitize_country( $customer->get( 'country' ) );
-		if ( $country ) {
-			$country = wpinv_country_name( $country );
-		}
-		return esc_html( $country );
-	}
-
-	/**
-	 * Displays the state column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_state( $customer ) {
-		$country = wpinv_sanitize_country( $customer->get( 'country' ) );
-		$state   = $customer->get( 'state' );
-		if ( $state ) {
-			$state = wpinv_state_name( $state, $country );
-		}
-
-		return esc_html( $state );
-	}
-
-	/**
-	 * Displays the signup column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_date_created( $customer ) {
-		return getpaid_format_date_value( $customer->get( 'date_created' ) );
-	}
-
-	/**
-	 * Displays the total spent column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_purchase_value( $customer ) {
-		return wpinv_price( (float) $customer->get( 'purchase_value' ) );
-	}
-
-	/**
-	 * Displays the total spent column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_purchase_count( $customer ) {
-		$value = $customer->get( 'purchase_count' );
-		$url   = $customer->get( 'user_id' ) ? add_query_arg( array( 'post_type' => 'wpi_invoice', 'author' => $customer->get( 'user_id' ), ), admin_url( 'edit.php' ) ) : '';
-
-		return ( empty( $value ) || empty( $url ) ) ? (int) $value : '<a href="' . esc_url( $url ) . '">' . absint( $value ) . '</a>';
-
-	}
-
-	/**
-	 * Displays the customers name
-	 *
-	 * @param  GetPaid_Customer $customer customer.
-	 * @return string
-	 */
-	public function column_customer( $customer ) {
-
-		$first_name = $customer->get( 'first_name' );
-		$last_name  = $customer->get( 'last_name' );
-		$email      = $customer->get( 'email' );
-		$avatar     = get_avatar( $customer->get( 'user_id' ) ? $customer->get( 'user_id' ) : $email, 32 );
-
-		// Customer view URL.
-		$view_url    = $customer->get( 'user_id' ) ? esc_url( add_query_arg( 'user_id', $customer->get( 'user_id' ), admin_url( 'user-edit.php' ) ) ) : false;
-		$row_actions = $view_url ? $this->row_actions(
-			array(
-				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
-			)
-		) : '';
-
-		// Customer's name.
-		$name   = esc_html( trim( "$first_name $last_name" ) );
-
-		if ( ! empty( $name ) ) {
-			$name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
-		}
-
-		$email = "<div class='row-title'><a href='mailto:$email'>$email</a></div>";
-
-		return "<div style='display: flex;'><div>$avatar</div><div style='margin-left: 10px;'>$name<strong>$email</strong>$row_actions</div></div>";
-
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @since 1.0.19
-	 * @return int Current page number
-	 */
-	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Returns bulk actions.
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function bulk_actions( $which = '' ) {
-		return array();
-	}
-
-	/**
-	 *  Prepares the display query
-	 */
-	public function prepare_query() {
-
-		// Prepare query args.
-		$query = array(
-			'number' => $this->per_page,
-			'paged'  => $this->get_paged(),
-		);
-
-		foreach ( array( 'orderby', 'order', 's' ) as $field ) {
-			if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			}
-		}
-
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-
-			if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			}
-
-			// Min max.
-			if ( '%f' === $type || '%d' === $type ) {
-
-				if ( isset( $_GET[ $field . '_min' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$query[ $field . '_min' ] = floatval( $_GET[ $field . '_min' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				}
-
-				if ( isset( $_GET[ $field . '_max' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$query[ $field . '_max' ] = floatval( $_GET[ $field . '_max' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				}
-			}
-		}
-
-		// Prepare class properties.
-		$this->query       = getpaid_get_customers( $query, 'query' );
-		$this->total_count = $this->query->get_total();
-		$this->items       = $this->query->get_results();
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 */
-	public function prepare_items() {
-
-		$columns  = $this->get_columns();
-		$hidden   = array();
-		$sortable = $this->get_sortable_columns();
-		$this->prepare_query();
-
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-
-		$this->set_pagination_args(
-			array(
-				'total_items' => $this->total_count,
-				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $this->total_count / $this->per_page ),
-			)
-		);
-	}
-
-	/**
-	 * Sortable table columns.
-	 *
-	 * @return array
-	 */
-	public function get_sortable_columns() {
-		$sortable = array(
-			'customer' => array( 'first_name', true ),
-		);
-
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			$sortable[ $field ] = array( $field, true );
-		}
-
-		return apply_filters( 'manage_getpaid_customers_sortable_table_columns', $sortable );
-	}
-
-	/**
-	 * Table columns
-	 *
-	 * @return array
-	 */
-	public function get_columns() {
-		$columns = array(
-			'customer' => __( 'Customer', 'invoicing' ),
-		);
-
-		// Add address fields.
-		foreach ( getpaid_user_address_fields() as $key => $value ) {
-
-			// Skip id, user_id and email.
-			if ( ! in_array( $key, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid', 'first_name', 'last_name' ), true ) ) {
-				$columns[ $key ] = $value;
-			}
-		}
-
-		$columns['purchase_value'] = __( 'Total Spend', 'invoicing' );
-		$columns['purchase_count'] = __( 'Invoices', 'invoicing' );
-		$columns['date_created']   = __( 'Date created', 'invoicing' );
-
-		return apply_filters( 'manage_getpaid_customers_table_columns', $columns );
-	}
+    }
+
+    /**
+     * Gets the name of the primary column.
+     *
+     * @since 1.0.19
+     * @access protected
+     *
+     * @return string Name of the primary column.
+     */
+    protected function get_primary_column_name() {
+        return 'customer';
+    }
+
+    /**
+     * This function renders most of the columns in the list table.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     * @param string $column_name The name of the column
+     *
+     * @return string Column Name
+     */
+    public function column_default( $customer, $column_name ) {
+        $value = esc_html( $customer->get( $column_name ) );
+        return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $customer );
+    }
+
+    /**
+     * Displays the country column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_country( $customer ) {
+        $country = wpinv_sanitize_country( $customer->get( 'country' ) );
+        if ( $country ) {
+            $country = wpinv_country_name( $country );
+        }
+        return esc_html( $country );
+    }
+
+    /**
+     * Displays the state column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_state( $customer ) {
+        $country = wpinv_sanitize_country( $customer->get( 'country' ) );
+        $state   = $customer->get( 'state' );
+        if ( $state ) {
+            $state = wpinv_state_name( $state, $country );
+        }
+
+        return esc_html( $state );
+    }
+
+    /**
+     * Displays the signup column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_date_created( $customer ) {
+        return getpaid_format_date_value( $customer->get( 'date_created' ) );
+    }
+
+    /**
+     * Displays the total spent column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_purchase_value( $customer ) {
+        return wpinv_price( (float) $customer->get( 'purchase_value' ) );
+    }
+
+    /**
+     * Displays the total spent column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_purchase_count( $customer ) {
+        $value = $customer->get( 'purchase_count' );
+        $url   = $customer->get( 'user_id' ) ? add_query_arg( array( 'post_type' => 'wpi_invoice', 'author' => $customer->get( 'user_id' ), ), admin_url( 'edit.php' ) ) : '';
+
+        return ( empty( $value ) || empty( $url ) ) ? (int) $value : '<a href="' . esc_url( $url ) . '">' . absint( $value ) . '</a>';
+
+    }
+
+    /**
+     * Displays the customers name
+     *
+     * @param  GetPaid_Customer $customer customer.
+     * @return string
+     */
+    public function column_customer( $customer ) {
+
+        $first_name = $customer->get( 'first_name' );
+        $last_name  = $customer->get( 'last_name' );
+        $email      = $customer->get( 'email' );
+        $avatar     = get_avatar( $customer->get( 'user_id' ) ? $customer->get( 'user_id' ) : $email, 32 );
+
+        // Customer view URL.
+        $view_url    = $customer->get( 'user_id' ) ? esc_url( add_query_arg( 'user_id', $customer->get( 'user_id' ), admin_url( 'user-edit.php' ) ) ) : false;
+        $row_actions = $view_url ? $this->row_actions(
+            array(
+                'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
+            )
+        ) : '';
+
+        // Customer's name.
+        $name   = esc_html( trim( "$first_name $last_name" ) );
+
+        if ( ! empty( $name ) ) {
+            $name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
+        }
+
+        $email = "<div class='row-title'><a href='mailto:$email'>$email</a></div>";
+
+        return "<div style='display: flex;'><div>$avatar</div><div style='margin-left: 10px;'>$name<strong>$email</strong>$row_actions</div></div>";
+
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @since 1.0.19
+     * @return int Current page number
+     */
+    public function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Returns bulk actions.
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function bulk_actions( $which = '' ) {
+        return array();
+    }
+
+    /**
+     *  Prepares the display query
+     */
+    public function prepare_query() {
+
+        // Prepare query args.
+        $query = array(
+            'number' => $this->per_page,
+            'paged'  => $this->get_paged(),
+        );
+
+        foreach ( array( 'orderby', 'order', 's' ) as $field ) {
+            if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                $query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            }
+        }
+
+        foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+
+            if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                $query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            }
+
+            // Min max.
+            if ( '%f' === $type || '%d' === $type ) {
+
+                if ( isset( $_GET[ $field . '_min' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    $query[ $field . '_min' ] = floatval( $_GET[ $field . '_min' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                }
+
+                if ( isset( $_GET[ $field . '_max' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    $query[ $field . '_max' ] = floatval( $_GET[ $field . '_max' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                }
+            }
+        }
+
+        // Prepare class properties.
+        $this->query       = getpaid_get_customers( $query, 'query' );
+        $this->total_count = $this->query->get_total();
+        $this->items       = $this->query->get_results();
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     */
+    public function prepare_items() {
+
+        $columns  = $this->get_columns();
+        $hidden   = array();
+        $sortable = $this->get_sortable_columns();
+        $this->prepare_query();
+
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+
+        $this->set_pagination_args(
+            array(
+                'total_items' => $this->total_count,
+                'per_page'    => $this->per_page,
+                'total_pages' => ceil( $this->total_count / $this->per_page ),
+            )
+        );
+    }
+
+    /**
+     * Sortable table columns.
+     *
+     * @return array
+     */
+    public function get_sortable_columns() {
+        $sortable = array(
+            'customer' => array( 'first_name', true ),
+        );
+
+        foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+            $sortable[ $field ] = array( $field, true );
+        }
+
+        return apply_filters( 'manage_getpaid_customers_sortable_table_columns', $sortable );
+    }
+
+    /**
+     * Table columns
+     *
+     * @return array
+     */
+    public function get_columns() {
+        $columns = array(
+            'customer' => __( 'Customer', 'invoicing' ),
+        );
+
+        // Add address fields.
+        foreach ( getpaid_user_address_fields() as $key => $value ) {
+
+            // Skip id, user_id and email.
+            if ( ! in_array( $key, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid', 'first_name', 'last_name' ), true ) ) {
+                $columns[ $key ] = $value;
+            }
+        }
+
+        $columns['purchase_value'] = __( 'Total Spend', 'invoicing' );
+        $columns['purchase_count'] = __( 'Invoices', 'invoicing' );
+        $columns['date_created']   = __( 'Date created', 'invoicing' );
+
+        return apply_filters( 'manage_getpaid_customers_table_columns', $columns );
+    }
 }

Spacing +61 added lines, -61 removed lines

@@ -5,12 +5,12 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
@@ -78,9 +78,9 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $customer, $column_name ) {
-		$value = esc_html( $customer->get( $column_name ) );
-		return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $customer );
+	public function column_default($customer, $column_name) {
+		$value = esc_html($customer->get($column_name));
+		return apply_filters('wpinv_customers_table_column' . $column_name, $value, $customer);
 	}
 
 	/**
@@ -92,12 +92,12 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_country( $customer ) {
-		$country = wpinv_sanitize_country( $customer->get( 'country' ) );
-		if ( $country ) {
-			$country = wpinv_country_name( $country );
+	public function column_country($customer) {
+		$country = wpinv_sanitize_country($customer->get('country'));
+		if ($country) {
+			$country = wpinv_country_name($country);
 		}
-		return esc_html( $country );
+		return esc_html($country);
 	}
 
 	/**
@@ -109,14 +109,14 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_state( $customer ) {
-		$country = wpinv_sanitize_country( $customer->get( 'country' ) );
-		$state   = $customer->get( 'state' );
-		if ( $state ) {
-			$state = wpinv_state_name( $state, $country );
+	public function column_state($customer) {
+		$country = wpinv_sanitize_country($customer->get('country'));
+		$state   = $customer->get('state');
+		if ($state) {
+			$state = wpinv_state_name($state, $country);
 		}
 
-		return esc_html( $state );
+		return esc_html($state);
 	}
 
 	/**
@@ -128,8 +128,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_date_created( $customer ) {
-		return getpaid_format_date_value( $customer->get( 'date_created' ) );
+	public function column_date_created($customer) {
+		return getpaid_format_date_value($customer->get('date_created'));
 	}
 
 	/**
@@ -141,8 +141,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_purchase_value( $customer ) {
-		return wpinv_price( (float) $customer->get( 'purchase_value' ) );
+	public function column_purchase_value($customer) {
+		return wpinv_price((float) $customer->get('purchase_value'));
 	}
 
 	/**
@@ -154,11 +154,11 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_purchase_count( $customer ) {
-		$value = $customer->get( 'purchase_count' );
-		$url   = $customer->get( 'user_id' ) ? add_query_arg( array( 'post_type' => 'wpi_invoice', 'author' => $customer->get( 'user_id' ), ), admin_url( 'edit.php' ) ) : '';
+	public function column_purchase_count($customer) {
+		$value = $customer->get('purchase_count');
+		$url   = $customer->get('user_id') ? add_query_arg(array('post_type' => 'wpi_invoice', 'author' => $customer->get('user_id'),), admin_url('edit.php')) : '';
 
-		return ( empty( $value ) || empty( $url ) ) ? (int) $value : '<a href="' . esc_url( $url ) . '">' . absint( $value ) . '</a>';
+		return (empty($value) || empty($url)) ? (int) $value : '<a href="' . esc_url($url) . '">' . absint($value) . '</a>';
 
 	}
 
@@ -168,25 +168,25 @@ 
 	 * @param  GetPaid_Customer $customer customer.
 	 * @return string
 	 */
-	public function column_customer( $customer ) {
+	public function column_customer($customer) {
 
-		$first_name = $customer->get( 'first_name' );
-		$last_name  = $customer->get( 'last_name' );
-		$email      = $customer->get( 'email' );
-		$avatar     = get_avatar( $customer->get( 'user_id' ) ? $customer->get( 'user_id' ) : $email, 32 );
+		$first_name = $customer->get('first_name');
+		$last_name  = $customer->get('last_name');
+		$email      = $customer->get('email');
+		$avatar     = get_avatar($customer->get('user_id') ? $customer->get('user_id') : $email, 32);
 
 		// Customer view URL.
-		$view_url    = $customer->get( 'user_id' ) ? esc_url( add_query_arg( 'user_id', $customer->get( 'user_id' ), admin_url( 'user-edit.php' ) ) ) : false;
+		$view_url    = $customer->get('user_id') ? esc_url(add_query_arg('user_id', $customer->get('user_id'), admin_url('user-edit.php'))) : false;
 		$row_actions = $view_url ? $this->row_actions(
 			array(
-				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
+				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __('Edit Details', 'invoicing') . '</a>',
 			)
 		) : '';
 
 		// Customer's name.
-		$name   = esc_html( trim( "$first_name $last_name" ) );
+		$name = esc_html(trim("$first_name $last_name"));
 
-		if ( ! empty( $name ) ) {
+		if (!empty($name)) {
 			$name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
 		}
 
@@ -203,7 +203,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -212,7 +212,7 @@ 
 	 * @since 1.0.19
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		return array();
 	}
 
@@ -227,33 +227,33 @@ 
 			'paged'  => $this->get_paged(),
 		);
 
-		foreach ( array( 'orderby', 'order', 's' ) as $field ) {
-			if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		foreach (array('orderby', 'order', 's') as $field) {
+			if (isset($_GET[$field])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				$query[$field] = wpinv_clean(rawurlencode_deep($_GET[$field])); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			}
 		}
 
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+		foreach (GetPaid_Customer_Data_Store::get_database_fields() as $field => $type) {
 
-			if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			if (isset($_GET[$field])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				$query[$field] = wpinv_clean(rawurlencode_deep($_GET[$field])); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			}
 
 			// Min max.
-			if ( '%f' === $type || '%d' === $type ) {
+			if ('%f' === $type || '%d' === $type) {
 
-				if ( isset( $_GET[ $field . '_min' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$query[ $field . '_min' ] = floatval( $_GET[ $field . '_min' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				if (isset($_GET[$field . '_min'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					$query[$field . '_min'] = floatval($_GET[$field . '_min']); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 				}
 
-				if ( isset( $_GET[ $field . '_max' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$query[ $field . '_max' ] = floatval( $_GET[ $field . '_max' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				if (isset($_GET[$field . '_max'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					$query[$field . '_max'] = floatval($_GET[$field . '_max']); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 				}
 			}
 		}
 
 		// Prepare class properties.
-		$this->query       = getpaid_get_customers( $query, 'query' );
+		$this->query       = getpaid_get_customers($query, 'query');
 		$this->total_count = $this->query->get_total();
 		$this->items       = $this->query->get_results();
 	}
@@ -269,13 +269,13 @@ 
 		$sortable = $this->get_sortable_columns();
 		$this->prepare_query();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$this->set_pagination_args(
 			array(
 				'total_items' => $this->total_count,
 				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $this->total_count / $this->per_page ),
+				'total_pages' => ceil($this->total_count / $this->per_page),
 			)
 		);
 	}
@@ -287,14 +287,14 @@ 
 	 */
 	public function get_sortable_columns() {
 		$sortable = array(
-			'customer' => array( 'first_name', true ),
+			'customer' => array('first_name', true),
 		);
 
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			$sortable[ $field ] = array( $field, true );
+		foreach (GetPaid_Customer_Data_Store::get_database_fields() as $field => $type) {
+			$sortable[$field] = array($field, true);
 		}
 
-		return apply_filters( 'manage_getpaid_customers_sortable_table_columns', $sortable );
+		return apply_filters('manage_getpaid_customers_sortable_table_columns', $sortable);
 	}
 
 	/**
@@ -304,22 +304,22 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'customer' => __( 'Customer', 'invoicing' ),
+			'customer' => __('Customer', 'invoicing'),
 		);
 
 		// Add address fields.
-		foreach ( getpaid_user_address_fields() as $key => $value ) {
+		foreach (getpaid_user_address_fields() as $key => $value) {
 
 			// Skip id, user_id and email.
-			if ( ! in_array( $key, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid', 'first_name', 'last_name' ), true ) ) {
-				$columns[ $key ] = $value;
+			if (!in_array($key, array('id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid', 'first_name', 'last_name'), true)) {
+				$columns[$key] = $value;
 			}
 		}
 
-		$columns['purchase_value'] = __( 'Total Spend', 'invoicing' );
-		$columns['purchase_count'] = __( 'Invoices', 'invoicing' );
-		$columns['date_created']   = __( 'Date created', 'invoicing' );
+		$columns['purchase_value'] = __('Total Spend', 'invoicing');
+		$columns['purchase_count'] = __('Invoices', 'invoicing');
+		$columns['date_created']   = __('Date created', 'invoicing');
 
-		return apply_filters( 'manage_getpaid_customers_table_columns', $columns );
+		return apply_filters('manage_getpaid_customers_table_columns', $columns);
 	}
 }

templates/payment-forms-admin/edit/discount.php

Spacing +17 added lines, -17 removed lines

@@ -7,44 +7,44 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Input Label', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Input Label', 'invoicing'); ?></span>
         <input v-model='active_form_element.input_label' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Button Label', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Button Label', 'invoicing'); ?></span>
         <input v-model='active_form_element.button_label' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group mb-3'>
-    <label class="form-label" :for="active_form_element.id + '_edit_type'"><?php esc_html_e( 'Button Type', 'invoicing' ); ?></label>
+    <label class="form-label" :for="active_form_element.id + '_edit_type'"><?php esc_html_e('Button Type', 'invoicing'); ?></label>
     <select class='form-control custom-select' :id="active_form_element.id + '_edit_type'" v-model='active_form_element.class'>
-        <option disabled><?php esc_html_e( 'Select button type', 'invoicing' ); ?></option>
-        <option value='btn-primary'><?php esc_html_e( 'Primary', 'invoicing' ); ?></option>
-        <option value='btn-secondary'><?php esc_html_e( 'Secondary', 'invoicing' ); ?></option>
-        <option value='btn-success'><?php esc_html_e( 'Success', 'invoicing' ); ?></option>
-        <option value='btn-danger'><?php esc_html_e( 'Danger', 'invoicing' ); ?></option>
-        <option value='btn-warning'><?php esc_html_e( 'Warning', 'invoicing' ); ?></option>
-        <option value='btn-info'><?php esc_html_e( 'Info', 'invoicing' ); ?></option>
-        <option value='btn-light'><?php esc_html_e( 'Light', 'invoicing' ); ?></option>
-        <option value='btn-dark'><?php esc_html_e( 'Dark', 'invoicing' ); ?></option>
-        <option value='btn-link'><?php esc_html_e( 'Link', 'invoicing' ); ?></option>
+        <option disabled><?php esc_html_e('Select button type', 'invoicing'); ?></option>
+        <option value='btn-primary'><?php esc_html_e('Primary', 'invoicing'); ?></option>
+        <option value='btn-secondary'><?php esc_html_e('Secondary', 'invoicing'); ?></option>
+        <option value='btn-success'><?php esc_html_e('Success', 'invoicing'); ?></option>
+        <option value='btn-danger'><?php esc_html_e('Danger', 'invoicing'); ?></option>
+        <option value='btn-warning'><?php esc_html_e('Warning', 'invoicing'); ?></option>
+        <option value='btn-info'><?php esc_html_e('Info', 'invoicing'); ?></option>
+        <option value='btn-light'><?php esc_html_e('Light', 'invoicing'); ?></option>
+        <option value='btn-dark'><?php esc_html_e('Dark', 'invoicing'); ?></option>
+        <option value='btn-link'><?php esc_html_e('Link', 'invoicing'); ?></option>
     </select>
 </div>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Help Text', 'invoicing' ); ?></span>
-        <textarea placeholder='<?php esc_attr_e( 'Add some help text for this field', 'invoicing' ); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
-        <small class="form-text text-muted"><?php esc_html_e( 'HTML is allowed', 'invoicing' ); ?></small>
+        <span><?php esc_html_e('Help Text', 'invoicing'); ?></span>
+        <textarea placeholder='<?php esc_attr_e('Add some help text for this field', 'invoicing'); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
+        <small class="form-text text-muted"><?php esc_html_e('HTML is allowed', 'invoicing'); ?></small>
     </label>
 </div>

templates/payment-forms/elements/discount.php

Spacing +9 added lines, -9 removed lines

@@ -8,35 +8,35 @@
  * @var GetPaid_Payment_Form $form The current payment form
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-if ( ! getpaid_has_published_discount() ) {
+if (!getpaid_has_published_discount()) {
     return;
 }
 
-if ( ! empty( $description ) ) {
+if (!empty($description)) {
     $description = "<small class='form-text text-muted'>$description</small>";
 } else {
     $description = '';
 }
 
 $discount_code = '';
-if ( ! empty( $form->invoice ) ) {
+if (!empty($form->invoice)) {
     $discount_code = $form->invoice->get_discount_code();
 }
 
-$class = empty( $class ) ? 'btn-secondary' : sanitize_html_class( $class );
+$class = empty($class) ? 'btn-secondary' : sanitize_html_class($class);
 ?>
 
 <div class="form-group mb-3">
     <div class="getpaid-discount-field  border rounded p-3">
         <div class="getpaid-discount-field-inner d-flex flex-column flex-md-row">
-            <input name="discount" placeholder="<?php echo esc_attr( $input_label ); ?>" value="<?php echo esc_attr( $discount_code ); ?>" class="form-control mr-2 mb-2 getpaid-discount-field-input" style="flex: 1;" type="text">
-            <a href="#" class="btn <?php echo esc_attr( $class ); ?> submit-button mb-2 getpaid-discount-button"><?php echo esc_html( $button_label ); ?></a>
+            <input name="discount" placeholder="<?php echo esc_attr($input_label); ?>" value="<?php echo esc_attr($discount_code); ?>" class="form-control mr-2 mb-2 getpaid-discount-field-input" style="flex: 1;" type="text">
+            <a href="#" class="btn <?php echo esc_attr($class); ?> submit-button mb-2 getpaid-discount-button"><?php echo esc_html($button_label); ?></a>
         </div>
-        <?php echo wp_kses_post( $description ); ?>
+        <?php echo wp_kses_post($description); ?>
         <div class="getpaid-custom-payment-form-errors alert alert-danger d-none"></div>
-        <div class="getpaid-custom-payment-form-success alert alert-success d-none"><?php esc_html_e( 'Discount code applied!', 'invoicing' ); ?></div>
+        <div class="getpaid-custom-payment-form-success alert alert-success d-none"><?php esc_html_e('Discount code applied!', 'invoicing'); ?></div>
     </div>
 </div>
 

includes/data/email-settings.php

Spacing +243 added lines, -243 removed lines

@@ -8,24 +8,24 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Prepare the due date reminder options.
 $overdue_days_options       = array();
-$overdue_days_options['0']  = __( 'On the Due Date', 'invoicing' );
-$overdue_days_options['1']  = __( '1 day after Due Date', 'invoicing' );
+$overdue_days_options['0']  = __('On the Due Date', 'invoicing');
+$overdue_days_options['1']  = __('1 day after Due Date', 'invoicing');
 
-for ( $i = 2; $i <= 45; $i++ ) {
-    $overdue_days_options[ "$i" ] = wp_sprintf( __( '%d days after Due Date', 'invoicing' ), $i );
+for ($i = 2; $i <= 45; $i++) {
+    $overdue_days_options["$i"] = wp_sprintf(__('%d days after Due Date', 'invoicing'), $i);
 }
 
 // Prepare up coming renewal reminder options.
 $renewal_days_options       = array();
-$renewal_days_options['0']  = __( 'On the renewal date', 'invoicing' );
-$renewal_days_options['1']  = __( '1 day before the renewal date', 'invoicing' );
+$renewal_days_options['0']  = __('On the renewal date', 'invoicing');
+$renewal_days_options['1']  = __('1 day before the renewal date', 'invoicing');
 
-for ( $i = 2; $i <= 45; $i++ ) {
-    $renewal_days_options[ "$i" ]   = wp_sprintf( __( '%d days before the renewal date', 'invoicing' ), $i );
+for ($i = 2; $i <= 45; $i++) {
+    $renewal_days_options["$i"] = wp_sprintf(__('%d days before the renewal date', 'invoicing'), $i);
 }
 
 // Default, built-in gateways
@@ -34,45 +34,45 @@ 
 
         'email_new_invoice_header'  => array(
             'id'   => 'email_new_invoice_header',
-            'name' => '<h3>' . __( 'New Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to the site admin whenever there is a new invoice.', 'invoicing' ),
+            'name' => '<h3>' . __('New Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to the site admin whenever there is a new invoice.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_new_invoice_active'  => array(
             'id'   => 'email_new_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_new_invoice_subject' => array(
             'id'       => 'email_new_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] New invoice ({invoice_number}) for {invoice_total} {invoice_currency}', 'invoicing' ),
+            'std'      => __('[{site_title}] New invoice ({invoice_number}) for {invoice_total} {invoice_currency}', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_new_invoice_heading' => array(
             'id'       => 'email_new_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'New invoice', 'invoicing' ),
+            'std'      => __('New invoice', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_new_invoice_body'    => array(
             'id'    => 'email_new_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>A new invoice <a href="{invoice_link}">({invoice_number})</a> to {name} for {invoice_total} {invoice_currency} has been created on your site. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>A new invoice <a href="{invoice_link}">({invoice_number})</a> to {name} for {invoice_total} {invoice_currency} has been created on your site. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -82,53 +82,53 @@ 
 
         'email_cancelled_invoice_header'    => array(
             'id'   => 'email_cancelled_invoice_header',
-            'name' => '<h3>' . __( 'Cancelled Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers whenever invoices are cancelled.', 'invoicing' ),
+            'name' => '<h3>' . __('Cancelled Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers whenever invoices are cancelled.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_cancelled_invoice_active'    => array(
             'id'   => 'email_cancelled_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_cancelled_invoice_admin_bcc' => array(
             'id'   => 'email_cancelled_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_cancelled_invoice_subject'   => array(
             'id'       => 'email_cancelled_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Invoice ({invoice_number}) Cancelled', 'invoicing' ),
+            'std'      => __('[{site_title}] Invoice ({invoice_number}) Cancelled', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_cancelled_invoice_heading'   => array(
             'id'       => 'email_cancelled_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Invoice Cancelled', 'invoicing' ),
+            'std'      => __('Invoice Cancelled', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_cancelled_invoice_body'      => array(
             'id'    => 'email_cancelled_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>The invoice <a href="{invoice_link}">#{invoice_number}</a> created for {name} on {site_title} has been cancelled. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>The invoice <a href="{invoice_link}">#{invoice_number}</a> created for {name} on {site_title} has been cancelled. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -139,45 +139,45 @@ 
 
         'email_failed_invoice_header'  => array(
             'id'   => 'email_failed_invoice_header',
-            'name' => '<h3>' . __( 'Failed Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'Failed invoice emails are sent to the site admin when invoice payments fail.', 'invoicing' ),
+            'name' => '<h3>' . __('Failed Invoice', 'invoicing') . '</h3>',
+            'desc' => __('Failed invoice emails are sent to the site admin when invoice payments fail.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_failed_invoice_active'  => array(
             'id'   => 'email_failed_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_failed_invoice_subject' => array(
             'id'       => 'email_failed_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Invoice ({invoice_number}) Payment Failed', 'invoicing' ),
+            'std'      => __('[{site_title}] Invoice ({invoice_number}) Payment Failed', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_failed_invoice_heading' => array(
             'id'       => 'email_failed_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Invoice Payment Failed', 'invoicing' ),
+            'std'      => __('Invoice Payment Failed', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_failed_invoice_body'    => array(
             'id'    => 'email_failed_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title} has failed to go through. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title} has failed to go through. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -187,53 +187,53 @@ 
 
         'email_onhold_invoice_header'    => array(
             'id'   => 'email_onhold_invoice_header',
-            'name' => '<h3>' . __( 'On Hold Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers whenever their invoices are held.', 'invoicing' ),
+            'name' => '<h3>' . __('On Hold Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers whenever their invoices are held.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_onhold_invoice_active'    => array(
             'id'   => 'email_onhold_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_onhold_invoice_admin_bcc' => array(
             'id'   => 'email_onhold_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_onhold_invoice_subject'   => array(
             'id'       => 'email_onhold_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice is on hold', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice is on hold', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_onhold_invoice_heading'   => array(
             'id'       => 'email_onhold_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice is on hold', 'invoicing' ),
+            'std'      => __('Your invoice is on hold', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_onhold_invoice_body'      => array(
             'id'    => 'email_onhold_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>Your invoice is on-hold and will be processed when we receive your payment. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>Your invoice is on-hold and will be processed when we receive your payment. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -244,53 +244,53 @@ 
 
         'email_processing_invoice_header'    => array(
             'id'   => 'email_processing_invoice_header',
-            'name' => '<h3>' . __( 'Processing Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to users whenever payments for their invoices are processing.', 'invoicing' ),
+            'name' => '<h3>' . __('Processing Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to users whenever payments for their invoices are processing.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_processing_invoice_active'    => array(
             'id'   => 'email_processing_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_processing_invoice_admin_bcc' => array(
             'id'   => 'email_processing_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_processing_invoice_subject'   => array(
             'id'       => 'email_processing_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your payment is being processed', 'invoicing' ),
+            'std'      => __('[{site_title}] Your payment is being processed', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_processing_invoice_heading'   => array(
             'id'       => 'email_processing_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your payment is being processed', 'invoicing' ),
+            'std'      => __('Your payment is being processed', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_processing_invoice_body'      => array(
             'id'    => 'email_processing_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>I would like to let you know that we have received and are currently processing your payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title}. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>I would like to let you know that we have received and are currently processing your payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title}. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -301,61 +301,61 @@ 
 
         'email_completed_invoice_header'         => array(
             'id'   => 'email_completed_invoice_header',
-            'name' => '<h3>' . __( 'Paid Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers when their invoices are marked as paid.', 'invoicing' ),
+            'name' => '<h3>' . __('Paid Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers when their invoices are marked as paid.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_completed_invoice_active'         => array(
             'id'   => 'email_completed_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_completed_invoice_renewal_active' => array(
             'id'   => 'email_completed_invoice_renewal_active',
-            'name' => __( 'Enable renewal notification', 'invoicing' ),
-            'desc' => __( 'Should this email be sent for renewals too?', 'invoicing' ),
+            'name' => __('Enable renewal notification', 'invoicing'),
+            'desc' => __('Should this email be sent for renewals too?', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_completed_invoice_admin_bcc'      => array(
             'id'   => 'email_completed_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_completed_invoice_subject'        => array(
             'id'       => 'email_completed_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_completed_invoice_heading'        => array(
             'id'       => 'email_completed_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice has been paid', 'invoicing' ),
+            'std'      => __('Your invoice has been paid', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_completed_invoice_body'           => array(
             'id'    => 'email_completed_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -366,53 +366,53 @@ 
 
         'email_refunded_invoice_header'    => array(
             'id'   => 'email_refunded_invoice_header',
-            'name' => '<h3>' . __( 'Refunded Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to users when their invoices are marked as refunded.', 'invoicing' ),
+            'name' => '<h3>' . __('Refunded Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to users when their invoices are marked as refunded.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_refunded_invoice_active'    => array(
             'id'   => 'email_refunded_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_refunded_invoice_admin_bcc' => array(
             'id'   => 'email_refunded_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_refunded_invoice_subject'   => array(
             'id'       => 'email_refunded_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_refunded_invoice_heading'   => array(
             'id'       => 'email_refunded_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice has been refunded', 'invoicing' ),
+            'std'      => __('Your invoice has been refunded', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_refunded_invoice_body'      => array(
             'id'    => 'email_refunded_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -423,53 +423,53 @@ 
 
         'email_user_invoice_header'    => array(
             'id'   => 'email_user_invoice_header',
-            'name' => '<h3>' . __( 'Customer Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers containing their invoice information and payment links.', 'invoicing' ),
+            'name' => '<h3>' . __('Customer Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers containing their invoice information and payment links.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_user_invoice_active'    => array(
             'id'   => 'email_user_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_user_invoice_admin_bcc' => array(
             'id'   => 'email_user_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_user_invoice_subject'   => array(
             'id'       => 'email_user_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date}', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_user_invoice_heading'   => array(
             'id'       => 'email_user_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice {invoice_number} details', 'invoicing' ),
+            'std'      => __('Your invoice {invoice_number} details', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_user_invoice_body'      => array(
             'id'    => 'email_user_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>An invoice of {invoice_total} has been created for you on {site_title}. You can <a href="{invoice_link}">view</a> or <a href="{invoice_pay_link}">pay</a> the invoice. Please reply to this email if you have any questions about the invoice.', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>An invoice of {invoice_total} has been created for you on {site_title}. You can <a href="{invoice_link}">view</a> or <a href="{invoice_pay_link}">pay</a> the invoice. Please reply to this email if you have any questions about the invoice.', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -479,53 +479,53 @@ 
 
         'email_user_note_header'    => array(
             'id'   => 'email_user_note_header',
-            'name' => '<h3>' . __( 'Customer Note', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent when you add a customer note to an invoice/quote.', 'invoicing' ),
+            'name' => '<h3>' . __('Customer Note', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent when you add a customer note to an invoice/quote.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_user_note_active'    => array(
             'id'   => 'email_user_note_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_user_note_admin_bcc' => array(
             'id'   => 'email_user_note_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_user_note_subject'   => array(
             'id'       => 'email_user_note_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Note added to your {invoice_label} #{invoice_number} from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Note added to your {invoice_label} #{invoice_number} from {invoice_date}', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_user_note_heading'   => array(
             'id'       => 'email_user_note_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'A note has been added to your {invoice_label}', 'invoicing' ),
+            'std'      => __('A note has been added to your {invoice_label}', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_user_note_body'      => array(
             'id'    => 'email_user_note_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>The following note has been added to your {invoice_label} <a href="{invoice_link}">#{invoice_number}</a>:</p><blockquote class="wpinv-note">{customer_note}</blockquote><a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>The following note has been added to your {invoice_label} <a href="{invoice_link}">#{invoice_number}</a>:</p><blockquote class="wpinv-note">{customer_note}</blockquote><a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -535,63 +535,63 @@ 
 
         'email_overdue_header'    => array(
             'id'   => 'email_overdue_header',
-            'name' => '<h3>' . __( 'Payment Reminder', 'invoicing' ) . '</h3>',
-            'desc' => __( 'Payment reminder emails are sent to customers whenever their invoices are due.', 'invoicing' ),
+            'name' => '<h3>' . __('Payment Reminder', 'invoicing') . '</h3>',
+            'desc' => __('Payment reminder emails are sent to customers whenever their invoices are due.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_overdue_active'    => array(
             'id'   => 'email_overdue_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_overdue_admin_bcc' => array(
             'id'   => 'email_overdue_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_overdue_days'      => array(
             'id'       => 'email_overdue_days',
-            'name'     => __( 'When to Send', 'invoicing' ),
-            'desc'     => __( 'Check when you would like payment reminders sent out.', 'invoicing' ),
+            'name'     => __('When to Send', 'invoicing'),
+            'desc'     => __('Check when you would like payment reminders sent out.', 'invoicing'),
             'help-tip' => true,
-            'std'      => array( '1' ),
+            'std'      => array('1'),
             'type'     => 'multicheck',
             'options'  => $overdue_days_options,
         ),
 
         'email_overdue_subject'   => array(
             'id'       => 'email_overdue_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Payment Reminder', 'invoicing' ),
+            'std'      => __('[{site_title}] Payment Reminder', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_overdue_heading'   => array(
             'id'       => 'email_overdue_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Payment reminder for your invoice', 'invoicing' ),
+            'std'      => __('Payment reminder for your invoice', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_overdue_body'      => array(
             'id'    => 'email_overdue_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder that your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {full_name},</p><p>This is just a friendly reminder that your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -602,63 +602,63 @@ 
 
         'email_renewal_reminder_header'    => array(
             'id'   => 'email_renewal_reminder_header',
-            'name' => '<h3>' . __( 'Renewal Reminder', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers whenever their subscription is about to renew.', 'invoicing' ),
+            'name' => '<h3>' . __('Renewal Reminder', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers whenever their subscription is about to renew.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_renewal_reminder_active'    => array(
             'id'   => 'email_renewal_reminder_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_renewal_reminder_admin_bcc' => array(
             'id'   => 'email_renewal_reminder_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_renewal_reminder_days'      => array(
             'id'       => 'email_renewal_reminder_days',
-            'name'     => __( 'When to Send', 'invoicing' ),
-            'desc'     => __( 'Check when you would like renewal reminders sent out.', 'invoicing' ),
+            'name'     => __('When to Send', 'invoicing'),
+            'desc'     => __('Check when you would like renewal reminders sent out.', 'invoicing'),
             'help-tip' => true,
-            'std'      => array( '1', '5', '10' ),
+            'std'      => array('1', '5', '10'),
             'type'     => 'multicheck',
             'options'  => $renewal_days_options,
         ),
 
         'email_renewal_reminder_subject'   => array(
             'id'       => 'email_renewal_reminder_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Renewal Reminder', 'invoicing' ),
+            'std'      => __('[{site_title}] Renewal Reminder', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_renewal_reminder_heading'   => array(
             'id'       => 'email_renewal_reminder_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Upcoming renewal reminder', 'invoicing' ),
+            'std'      => __('Upcoming renewal reminder', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_renewal_reminder_body'      => array(
             'id'    => 'email_renewal_reminder_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder that your subscription for invoice <a href="{invoice_link}">#{invoice_number}</a> will renew on {subscription_renewal_date}.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {full_name},</p><p>This is just a friendly reminder that your subscription for invoice <a href="{invoice_link}">#{invoice_number}</a> will renew on {subscription_renewal_date}.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -669,53 +669,53 @@ 
 
         'email_subscription_active_header'    => array(
             'id'   => 'email_subscription_active_header',
-            'name' => '<h3>' . __( 'Subscription Active', 'invoicing' ) . '</h3>',
-            'desc' => __( 'This email is sent when a subscription is activated.', 'invoicing' ),
+            'name' => '<h3>' . __('Subscription Active', 'invoicing') . '</h3>',
+            'desc' => __('This email is sent when a subscription is activated.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_active_active'    => array(
             'id'   => 'email_subscription_active_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_active_admin_bcc' => array(
             'id'   => 'email_subscription_active_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_active_subject'   => array(
             'id'       => 'email_subscription_active_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription active email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription active email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your subscription #{subscription_id} has been activated', 'invoicing' ),
+            'std'      => __('[{site_title}] Your subscription #{subscription_id} has been activated', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_active_heading'   => array(
             'id'       => 'email_subscription_active_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Subscription Activated', 'invoicing' ),
+            'std'      => __('Subscription Activated', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_active_body'      => array(
             'id'    => 'email_subscription_active_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your subscription #{subscription_id} for {subscription_name} has been activated.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your subscription #{subscription_id} for {subscription_name} has been activated.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -725,53 +725,53 @@ 
 
         'email_subscription_trial_header'    => array(
             'id'   => 'email_subscription_trial_header',
-            'name' => '<h3>' . __( 'Trial Started', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent when a customer starts a subscription trial.', 'invoicing' ),
+            'name' => '<h3>' . __('Trial Started', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent when a customer starts a subscription trial.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_trial_active'    => array(
             'id'   => 'email_subscription_trial_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_subscription_trial_admin_bcc' => array(
             'id'   => 'email_subscription_trial_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_subscription_trial_subject'   => array(
             'id'       => 'email_subscription_trial_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription trial email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription trial email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Trial Started', 'invoicing' ),
+            'std'      => __('[{site_title}] Trial Started', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_trial_heading'   => array(
             'id'       => 'email_subscription_trial_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Trial Started', 'invoicing' ),
+            'std'      => __('Trial Started', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_trial_body'      => array(
             'id'    => 'email_subscription_trial_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your trial for {subscription_name} is now active and will renew on {subscription_renewal_date}.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your trial for {subscription_name} is now active and will renew on {subscription_renewal_date}.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -781,53 +781,53 @@ 
 
         'email_subscription_cancelled_header'    => array(
             'id'   => 'email_subscription_cancelled_header',
-            'name' => '<h3>' . __( 'Subscription Cancelled', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent when a customer cancels their subscription.', 'invoicing' ),
+            'name' => '<h3>' . __('Subscription Cancelled', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent when a customer cancels their subscription.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_cancelled_active'    => array(
             'id'   => 'email_subscription_cancelled_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_cancelled_admin_bcc' => array(
             'id'   => 'email_subscription_cancelled_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_cancelled_subject'   => array(
             'id'       => 'email_subscription_cancelled_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription cancelled email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription cancelled email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Cancelled', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Cancelled', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_cancelled_heading'   => array(
             'id'       => 'email_subscription_cancelled_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Subscription Cancelled', 'invoicing' ),
+            'std'      => __('Subscription Cancelled', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_cancelled_body'      => array(
             'id'    => 'email_subscription_cancelled_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has been cancelled and will no longer renew.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has been cancelled and will no longer renew.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -837,53 +837,53 @@ 
 
         'email_subscription_expired_header'    => array(
             'id'   => 'email_subscription_expired_header',
-            'name' => '<h3>' . __( 'Subscription Expired', 'invoicing' ) . '</h3>',
-            'desc' => __( "These emails are sent when a customer's subscription expires and automatic renewal fails.", 'invoicing' ),
+            'name' => '<h3>' . __('Subscription Expired', 'invoicing') . '</h3>',
+            'desc' => __("These emails are sent when a customer's subscription expires and automatic renewal fails.", 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_expired_active'    => array(
             'id'   => 'email_subscription_expired_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_expired_admin_bcc' => array(
             'id'   => 'email_subscription_expired_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_expired_subject'   => array(
             'id'       => 'email_subscription_expired_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription expired email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription expired email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Expired', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Expired', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_expired_heading'   => array(
             'id'       => 'email_subscription_expired_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'type'     => 'text',
-            'std'      => __( 'Subscription Expired', 'invoicing' ),
+            'std'      => __('Subscription Expired', 'invoicing'),
             'help-tip' => true,
             'size'     => 'large',
         ),
 
         'email_subscription_expired_body'      => array(
             'id'    => 'email_subscription_expired_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has expired.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has expired.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -893,53 +893,53 @@ 
 
         'email_subscription_complete_header'    => array(
             'id'   => 'email_subscription_complete_header',
-            'name' => '<h3>' . __( 'Subscription Complete', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent when a customer completes their subscription.', 'invoicing' ),
+            'name' => '<h3>' . __('Subscription Complete', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent when a customer completes their subscription.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_complete_active'    => array(
             'id'   => 'email_subscription_complete_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_complete_admin_bcc' => array(
             'id'   => 'email_subscription_complete_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_complete_subject'   => array(
             'id'       => 'email_subscription_complete_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription complete email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription complete email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Complete', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Complete', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_complete_heading'   => array(
             'id'       => 'email_subscription_complete_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Subscription Complete', 'invoicing' ),
+            'std'      => __('Subscription Complete', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_complete_body'      => array(
             'id'    => 'email_subscription_complete_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} is now complete.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} is now complete.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),

templates/emails/wpinv-email-subscription_active.php

Spacing +4 added lines, -4 removed lines

@@ -8,15 +8,15 @@
  * @var WPInv_Subscription $object
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $invoice = $object->get_parent_payment();
 
 // Print the email header.
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
 // Generate the custom message body.
-echo wp_kses_post( $message_body );
+echo wp_kses_post($message_body);
 
 // Print the email footer.
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);