AyeCode / invoicing

includes/gateways/class-getpaid-paypal-api.php

Indentation +197 added lines, -197 removed lines

@@ -10,211 +10,211 @@
  */
 class GetPaid_PayPal_API {
 
-	/**
-	 * Retrieves the bearer token.
-	 *
+    /**
+     * Retrieves the bearer token.
+     *
      * @return string|\WP_Error
-	 */
-	public static function get_token( $mode = 'live' ) {
+     */
+    public static function get_token( $mode = 'live' ) {
 
-		$token = get_transient( 'getpaid_paypal_' . $mode . '_token' );
+        $token = get_transient( 'getpaid_paypal_' . $mode . '_token' );
 
-		if ( $token ) {
-			return $token;
-		}
+        if ( $token ) {
+            return $token;
+        }
 
-		$client_id  = 'live' === $mode ? wpinv_get_option( 'paypal_client_id' ) : wpinv_get_option( 'paypal_sandbox_client_id' );
-		$secret_key = 'live' === $mode ? wpinv_get_option( 'paypal_secret_key' ) : wpinv_get_option( 'paypal_sandbox_secret_key' );
-		$url        = self::get_api_url( 'v1/oauth2/token?grant_type=client_credentials', $mode );
+        $client_id  = 'live' === $mode ? wpinv_get_option( 'paypal_client_id' ) : wpinv_get_option( 'paypal_sandbox_client_id' );
+        $secret_key = 'live' === $mode ? wpinv_get_option( 'paypal_secret_key' ) : wpinv_get_option( 'paypal_sandbox_secret_key' );
+        $url        = self::get_api_url( 'v1/oauth2/token?grant_type=client_credentials', $mode );
 
         if ( empty( $client_id ) || empty( $secret_key ) ) {
             return new \WP_Error( 'invalid_request', 'Missing client id or secret key.', array( 'status' => 400 ) );
         }
 
-		$args   = array(
-			'method'  => 'POST',
-			'timeout' => 30,
-			'headers' => array(
-				'Authorization' => 'Basic ' . base64_encode( $client_id . ':' . $secret_key ), // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode
-				'Accept'        => 'application/json',
-				'Content-Type'  => 'application/x-www-form-urlencoded',
-			),
-		);
-
-		$response = self::response_or_error( wp_remote_post( $url, $args ) );
-
-		if ( is_wp_error( $response ) ) {
-			return $response;
-		}
-
-		if ( ! isset( $response->access_token ) ) {
-			return new \WP_Error( 'invalid_request', 'Could not create token.', array( 'status' => 400 ) );
-		}
-
-		set_transient( 'getpaid_paypal_' . $mode . '_token', $response->access_token, $response->expires_in - 600 );
-		return $response->access_token;
-	}
-
-	/**
-	 * Retrieves the PayPal API URL.
-	 *
-	 * @param string $endpoint
-	 * @return string
-	 */
-	public static function get_api_url( $endpoint = '', $mode = 'live'  ) {
-		$endpoint = ltrim( $endpoint, '/' );
-		return 'live' === $mode ? 'https://api-m.paypal.com/' . $endpoint : 'https://api-m.sandbox.paypal.com/' . $endpoint;
-	}
-
-	/**
-	 * Handles a post request.
-	 *
-	 * @param string $path The path to the endpoint.
-	 * @param mixed $data The data to send.
-	 * @param string $method The method to use.
-	 *
-	 * @return true|\WP_Error
-	 */
-	public static function post( $path, $data, $mode = 'live', $method = 'POST' ) {
-
-		$access_token = self::get_token( $mode );
-
-		if ( is_wp_error( $access_token ) ) {
-			return $access_token;
-		}
-
-		$url  = self::get_api_url( $path, $mode );
-		$args = array(
-			'method'  => $method,
-			'headers' => array(
-				'Authorization' => 'Bearer ' . $access_token,
-				'Content-Type'  => 'application/json',
-			),
-			'body'    => wp_json_encode( $data ),
-		);
-
-		return self::response_or_error( wp_remote_post( $url, $args ) );
-	}
-
-	/**
-	 * Handles a get request.
-	 *
-	 * @param string $path The path to the endpoint.
-	 * @param string $method
-	 * @return object|\WP_Error
-	 */
-	public static function get( $path, $mode = 'live', $method = 'GET' ) {
-
-		$access_token = self::get_token( $mode );
-
-		if ( is_wp_error( $access_token ) ) {
-			return $access_token;
-		}
-
-		$url  = self::get_api_url( $path, $mode );
-		$args = array(
-			'method'  => $method,
-			'headers' => array(
-				'Authorization' => 'Bearer ' . $access_token,
-			),
-		);
-
-		return self::response_or_error( wp_remote_get( $url, $args ) );
-	}
-
-	/**
-	 * Returns the response body
-	 *
-	 * @since 1.0.0
-	 * @version 1.0.0
-	 * @param \WP_Error|array $response
-	 * @return \WP_Error|object
-	 */
-	public static function response_or_error( $response ) {
-
-		if ( is_wp_error( $response ) ) {
-			return new \WP_Error( 'paypal_error', __( 'There was a problem connecting to the PayPal API endpoint.', 'invoicing' ) );
-		}
-
-		if ( empty( $response['body'] ) ) {
-			return true;
-		}
-
-		$response_body = json_decode( wp_remote_retrieve_body( $response ) );
-
-		if ( wp_remote_retrieve_response_code( $response ) > 299 ) {
-
-			// Normal errors.
-			if ( $response_body && isset( $response_body->message ) ) {
-				$error_message = $response_body->message;
-
-			// Identity errors.
-			} elseif ( $response_body && isset( $response_body->error_description ) ) {
-				$error_message = $response_body->error_description;
-				return new \WP_Error( 'paypal_error', wp_kses_post( $response_body->error_description ) );
-			} else {
-				$error_message = __( 'There was an error connecting to the PayPal API endpoint.', 'invoicing' );
-			}
-
-			return new \WP_Error( 'paypal_error', $error_message );
-		}
-
-		return $response_body;
-	}
-
-	/**
-	 * Fetches an order.
-	 *
-	 * @since 1.0.0
-	 * @version 1.0.0
-	 * @param string $order_id
-	 * @link https://developer.paypal.com/docs/api/orders/v2/#orders_get
-	 * @return \WP_Error|object
-	 */
-	public static function get_order( $order_id, $mode = 'live' ) {
-		return self::get( '/v2/checkout/orders/' . $order_id, $mode );
-	}
-
-	/**
-	 * Fetches a subscription.
-	 *
-	 * @since 1.0.0
-	 * @version 1.0.0
-	 * @param string $subscription_id
-	 * @link https://developer.paypal.com/docs/api/subscriptions/v1/#subscriptions_get
-	 * @return \WP_Error|object
-	 */
-	public static function get_subscription( $subscription_id, $mode = 'live' ) {
-		return self::get( '/v1/billing/subscriptions/' . $subscription_id, $mode );
-	}
-
-	/**
-	 * Fetches a subscription's latest transactions (limits search to last one day).
-	 *
-	 * @since 1.0.0
-	 * @version 1.0.0
-	 * @param string $subscription_id
-	 * @link https://developer.paypal.com/docs/api/subscriptions/v1/#subscriptions_transactions
-	 * @return \WP_Error|object
-	 */
-	public static function get_subscription_transaction( $subscription_id, $mode = 'live' ) {
-		$start_time = gmdate( 'Y-m-d\TH:i:s\Z', strtotime( '-1 day' ) );
-		$end_time   = gmdate( 'Y-m-d\TH:i:s\Z' );
-		return self::get( "/v1/billing/subscriptions/$subscription_id/transactions?start_time=$start_time&end_time=$end_time", $mode );
-	}
-
-	/**
-	 * Refunds a capture.
-	 *
-	 * @since 1.0.0
-	 * @version 1.0.0
-	 * @param string $capture_id
-	 * @param array  $args
-	 * @link https://developer.paypal.com/docs/api/payments/v2/#captures_refund
-	 * @return \WP_Error|object
-	 */
-	public static function refund_capture( $capture_id, $args = array(), $mode = 'live' ) {
-		return self::post( '/v2/payments/captures/' . $capture_id . '/refund', $args, $mode );
-	}
+        $args   = array(
+            'method'  => 'POST',
+            'timeout' => 30,
+            'headers' => array(
+                'Authorization' => 'Basic ' . base64_encode( $client_id . ':' . $secret_key ), // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode
+                'Accept'        => 'application/json',
+                'Content-Type'  => 'application/x-www-form-urlencoded',
+            ),
+        );
+
+        $response = self::response_or_error( wp_remote_post( $url, $args ) );
+
+        if ( is_wp_error( $response ) ) {
+            return $response;
+        }
+
+        if ( ! isset( $response->access_token ) ) {
+            return new \WP_Error( 'invalid_request', 'Could not create token.', array( 'status' => 400 ) );
+        }
+
+        set_transient( 'getpaid_paypal_' . $mode . '_token', $response->access_token, $response->expires_in - 600 );
+        return $response->access_token;
+    }
+
+    /**
+     * Retrieves the PayPal API URL.
+     *
+     * @param string $endpoint
+     * @return string
+     */
+    public static function get_api_url( $endpoint = '', $mode = 'live'  ) {
+        $endpoint = ltrim( $endpoint, '/' );
+        return 'live' === $mode ? 'https://api-m.paypal.com/' . $endpoint : 'https://api-m.sandbox.paypal.com/' . $endpoint;
+    }
+
+    /**
+     * Handles a post request.
+     *
+     * @param string $path The path to the endpoint.
+     * @param mixed $data The data to send.
+     * @param string $method The method to use.
+     *
+     * @return true|\WP_Error
+     */
+    public static function post( $path, $data, $mode = 'live', $method = 'POST' ) {
+
+        $access_token = self::get_token( $mode );
+
+        if ( is_wp_error( $access_token ) ) {
+            return $access_token;
+        }
+
+        $url  = self::get_api_url( $path, $mode );
+        $args = array(
+            'method'  => $method,
+            'headers' => array(
+                'Authorization' => 'Bearer ' . $access_token,
+                'Content-Type'  => 'application/json',
+            ),
+            'body'    => wp_json_encode( $data ),
+        );
+
+        return self::response_or_error( wp_remote_post( $url, $args ) );
+    }
+
+    /**
+     * Handles a get request.
+     *
+     * @param string $path The path to the endpoint.
+     * @param string $method
+     * @return object|\WP_Error
+     */
+    public static function get( $path, $mode = 'live', $method = 'GET' ) {
+
+        $access_token = self::get_token( $mode );
+
+        if ( is_wp_error( $access_token ) ) {
+            return $access_token;
+        }
+
+        $url  = self::get_api_url( $path, $mode );
+        $args = array(
+            'method'  => $method,
+            'headers' => array(
+                'Authorization' => 'Bearer ' . $access_token,
+            ),
+        );
+
+        return self::response_or_error( wp_remote_get( $url, $args ) );
+    }
+
+    /**
+     * Returns the response body
+     *
+     * @since 1.0.0
+     * @version 1.0.0
+     * @param \WP_Error|array $response
+     * @return \WP_Error|object
+     */
+    public static function response_or_error( $response ) {
+
+        if ( is_wp_error( $response ) ) {
+            return new \WP_Error( 'paypal_error', __( 'There was a problem connecting to the PayPal API endpoint.', 'invoicing' ) );
+        }
+
+        if ( empty( $response['body'] ) ) {
+            return true;
+        }
+
+        $response_body = json_decode( wp_remote_retrieve_body( $response ) );
+
+        if ( wp_remote_retrieve_response_code( $response ) > 299 ) {
+
+            // Normal errors.
+            if ( $response_body && isset( $response_body->message ) ) {
+                $error_message = $response_body->message;
+
+            // Identity errors.
+            } elseif ( $response_body && isset( $response_body->error_description ) ) {
+                $error_message = $response_body->error_description;
+                return new \WP_Error( 'paypal_error', wp_kses_post( $response_body->error_description ) );
+            } else {
+                $error_message = __( 'There was an error connecting to the PayPal API endpoint.', 'invoicing' );
+            }
+
+            return new \WP_Error( 'paypal_error', $error_message );
+        }
+
+        return $response_body;
+    }
+
+    /**
+     * Fetches an order.
+     *
+     * @since 1.0.0
+     * @version 1.0.0
+     * @param string $order_id
+     * @link https://developer.paypal.com/docs/api/orders/v2/#orders_get
+     * @return \WP_Error|object
+     */
+    public static function get_order( $order_id, $mode = 'live' ) {
+        return self::get( '/v2/checkout/orders/' . $order_id, $mode );
+    }
+
+    /**
+     * Fetches a subscription.
+     *
+     * @since 1.0.0
+     * @version 1.0.0
+     * @param string $subscription_id
+     * @link https://developer.paypal.com/docs/api/subscriptions/v1/#subscriptions_get
+     * @return \WP_Error|object
+     */
+    public static function get_subscription( $subscription_id, $mode = 'live' ) {
+        return self::get( '/v1/billing/subscriptions/' . $subscription_id, $mode );
+    }
+
+    /**
+     * Fetches a subscription's latest transactions (limits search to last one day).
+     *
+     * @since 1.0.0
+     * @version 1.0.0
+     * @param string $subscription_id
+     * @link https://developer.paypal.com/docs/api/subscriptions/v1/#subscriptions_transactions
+     * @return \WP_Error|object
+     */
+    public static function get_subscription_transaction( $subscription_id, $mode = 'live' ) {
+        $start_time = gmdate( 'Y-m-d\TH:i:s\Z', strtotime( '-1 day' ) );
+        $end_time   = gmdate( 'Y-m-d\TH:i:s\Z' );
+        return self::get( "/v1/billing/subscriptions/$subscription_id/transactions?start_time=$start_time&end_time=$end_time", $mode );
+    }
+
+    /**
+     * Refunds a capture.
+     *
+     * @since 1.0.0
+     * @version 1.0.0
+     * @param string $capture_id
+     * @param array  $args
+     * @link https://developer.paypal.com/docs/api/payments/v2/#captures_refund
+     * @return \WP_Error|object
+     */
+    public static function refund_capture( $capture_id, $args = array(), $mode = 'live' ) {
+        return self::post( '/v2/payments/captures/' . $capture_id . '/refund', $args, $mode );
+    }
 
 }

Spacing +50 added lines, -50 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * PayPal API handler.
@@ -15,43 +15,43 @@ 
 	 *
      * @return string|\WP_Error
 	 */
-	public static function get_token( $mode = 'live' ) {
+	public static function get_token($mode = 'live') {
 
-		$token = get_transient( 'getpaid_paypal_' . $mode . '_token' );
+		$token = get_transient('getpaid_paypal_' . $mode . '_token');
 
-		if ( $token ) {
+		if ($token) {
 			return $token;
 		}
 
-		$client_id  = 'live' === $mode ? wpinv_get_option( 'paypal_client_id' ) : wpinv_get_option( 'paypal_sandbox_client_id' );
-		$secret_key = 'live' === $mode ? wpinv_get_option( 'paypal_secret_key' ) : wpinv_get_option( 'paypal_sandbox_secret_key' );
-		$url        = self::get_api_url( 'v1/oauth2/token?grant_type=client_credentials', $mode );
+		$client_id  = 'live' === $mode ? wpinv_get_option('paypal_client_id') : wpinv_get_option('paypal_sandbox_client_id');
+		$secret_key = 'live' === $mode ? wpinv_get_option('paypal_secret_key') : wpinv_get_option('paypal_sandbox_secret_key');
+		$url        = self::get_api_url('v1/oauth2/token?grant_type=client_credentials', $mode);
 
-        if ( empty( $client_id ) || empty( $secret_key ) ) {
-            return new \WP_Error( 'invalid_request', 'Missing client id or secret key.', array( 'status' => 400 ) );
+        if (empty($client_id) || empty($secret_key)) {
+            return new \WP_Error('invalid_request', 'Missing client id or secret key.', array('status' => 400));
         }
 
-		$args   = array(
+		$args = array(
 			'method'  => 'POST',
 			'timeout' => 30,
 			'headers' => array(
-				'Authorization' => 'Basic ' . base64_encode( $client_id . ':' . $secret_key ), // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode
+				'Authorization' => 'Basic ' . base64_encode($client_id . ':' . $secret_key), // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode
 				'Accept'        => 'application/json',
 				'Content-Type'  => 'application/x-www-form-urlencoded',
 			),
 		);
 
-		$response = self::response_or_error( wp_remote_post( $url, $args ) );
+		$response = self::response_or_error(wp_remote_post($url, $args));
 
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			return $response;
 		}
 
-		if ( ! isset( $response->access_token ) ) {
-			return new \WP_Error( 'invalid_request', 'Could not create token.', array( 'status' => 400 ) );
+		if (!isset($response->access_token)) {
+			return new \WP_Error('invalid_request', 'Could not create token.', array('status' => 400));
 		}
 
-		set_transient( 'getpaid_paypal_' . $mode . '_token', $response->access_token, $response->expires_in - 600 );
+		set_transient('getpaid_paypal_' . $mode . '_token', $response->access_token, $response->expires_in - 600);
 		return $response->access_token;
 	}
 
@@ -61,8 +61,8 @@ 
 	 * @param string $endpoint
 	 * @return string
 	 */
-	public static function get_api_url( $endpoint = '', $mode = 'live'  ) {
-		$endpoint = ltrim( $endpoint, '/' );
+	public static function get_api_url($endpoint = '', $mode = 'live') {
+		$endpoint = ltrim($endpoint, '/');
 		return 'live' === $mode ? 'https://api-m.paypal.com/' . $endpoint : 'https://api-m.sandbox.paypal.com/' . $endpoint;
 	}
 
@@ -75,25 +75,25 @@ 
 	 *
 	 * @return true|\WP_Error
 	 */
-	public static function post( $path, $data, $mode = 'live', $method = 'POST' ) {
+	public static function post($path, $data, $mode = 'live', $method = 'POST') {
 
-		$access_token = self::get_token( $mode );
+		$access_token = self::get_token($mode);
 
-		if ( is_wp_error( $access_token ) ) {
+		if (is_wp_error($access_token)) {
 			return $access_token;
 		}
 
-		$url  = self::get_api_url( $path, $mode );
+		$url  = self::get_api_url($path, $mode);
 		$args = array(
 			'method'  => $method,
 			'headers' => array(
 				'Authorization' => 'Bearer ' . $access_token,
 				'Content-Type'  => 'application/json',
 			),
-			'body'    => wp_json_encode( $data ),
+			'body'    => wp_json_encode($data),
 		);
 
-		return self::response_or_error( wp_remote_post( $url, $args ) );
+		return self::response_or_error(wp_remote_post($url, $args));
 	}
 
 	/**
@@ -103,15 +103,15 @@ 
 	 * @param string $method
 	 * @return object|\WP_Error
 	 */
-	public static function get( $path, $mode = 'live', $method = 'GET' ) {
+	public static function get($path, $mode = 'live', $method = 'GET') {
 
-		$access_token = self::get_token( $mode );
+		$access_token = self::get_token($mode);
 
-		if ( is_wp_error( $access_token ) ) {
+		if (is_wp_error($access_token)) {
 			return $access_token;
 		}
 
-		$url  = self::get_api_url( $path, $mode );
+		$url  = self::get_api_url($path, $mode);
 		$args = array(
 			'method'  => $method,
 			'headers' => array(
@@ -119,7 +119,7 @@ 
 			),
 		);
 
-		return self::response_or_error( wp_remote_get( $url, $args ) );
+		return self::response_or_error(wp_remote_get($url, $args));
 	}
 
 	/**
@@ -130,33 +130,33 @@ 
 	 * @param \WP_Error|array $response
 	 * @return \WP_Error|object
 	 */
-	public static function response_or_error( $response ) {
+	public static function response_or_error($response) {
 
-		if ( is_wp_error( $response ) ) {
-			return new \WP_Error( 'paypal_error', __( 'There was a problem connecting to the PayPal API endpoint.', 'invoicing' ) );
+		if (is_wp_error($response)) {
+			return new \WP_Error('paypal_error', __('There was a problem connecting to the PayPal API endpoint.', 'invoicing'));
 		}
 
-		if ( empty( $response['body'] ) ) {
+		if (empty($response['body'])) {
 			return true;
 		}
 
-		$response_body = json_decode( wp_remote_retrieve_body( $response ) );
+		$response_body = json_decode(wp_remote_retrieve_body($response));
 
-		if ( wp_remote_retrieve_response_code( $response ) > 299 ) {
+		if (wp_remote_retrieve_response_code($response) > 299) {
 
 			// Normal errors.
-			if ( $response_body && isset( $response_body->message ) ) {
+			if ($response_body && isset($response_body->message)) {
 				$error_message = $response_body->message;
 
 			// Identity errors.
-			} elseif ( $response_body && isset( $response_body->error_description ) ) {
+			} elseif ($response_body && isset($response_body->error_description)) {
 				$error_message = $response_body->error_description;
-				return new \WP_Error( 'paypal_error', wp_kses_post( $response_body->error_description ) );
+				return new \WP_Error('paypal_error', wp_kses_post($response_body->error_description));
 			} else {
-				$error_message = __( 'There was an error connecting to the PayPal API endpoint.', 'invoicing' );
+				$error_message = __('There was an error connecting to the PayPal API endpoint.', 'invoicing');
 			}
 
-			return new \WP_Error( 'paypal_error', $error_message );
+			return new \WP_Error('paypal_error', $error_message);
 		}
 
 		return $response_body;
@@ -171,8 +171,8 @@ 
 	 * @link https://developer.paypal.com/docs/api/orders/v2/#orders_get
 	 * @return \WP_Error|object
 	 */
-	public static function get_order( $order_id, $mode = 'live' ) {
-		return self::get( '/v2/checkout/orders/' . $order_id, $mode );
+	public static function get_order($order_id, $mode = 'live') {
+		return self::get('/v2/checkout/orders/' . $order_id, $mode);
 	}
 
 	/**
@@ -184,8 +184,8 @@ 
 	 * @link https://developer.paypal.com/docs/api/subscriptions/v1/#subscriptions_get
 	 * @return \WP_Error|object
 	 */
-	public static function get_subscription( $subscription_id, $mode = 'live' ) {
-		return self::get( '/v1/billing/subscriptions/' . $subscription_id, $mode );
+	public static function get_subscription($subscription_id, $mode = 'live') {
+		return self::get('/v1/billing/subscriptions/' . $subscription_id, $mode);
 	}
 
 	/**
@@ -197,10 +197,10 @@ 
 	 * @link https://developer.paypal.com/docs/api/subscriptions/v1/#subscriptions_transactions
 	 * @return \WP_Error|object
 	 */
-	public static function get_subscription_transaction( $subscription_id, $mode = 'live' ) {
-		$start_time = gmdate( 'Y-m-d\TH:i:s\Z', strtotime( '-1 day' ) );
-		$end_time   = gmdate( 'Y-m-d\TH:i:s\Z' );
-		return self::get( "/v1/billing/subscriptions/$subscription_id/transactions?start_time=$start_time&end_time=$end_time", $mode );
+	public static function get_subscription_transaction($subscription_id, $mode = 'live') {
+		$start_time = gmdate('Y-m-d\TH:i:s\Z', strtotime('-1 day'));
+		$end_time   = gmdate('Y-m-d\TH:i:s\Z');
+		return self::get("/v1/billing/subscriptions/$subscription_id/transactions?start_time=$start_time&end_time=$end_time", $mode);
 	}
 
 	/**
@@ -213,8 +213,8 @@ 
 	 * @link https://developer.paypal.com/docs/api/payments/v2/#captures_refund
 	 * @return \WP_Error|object
 	 */
-	public static function refund_capture( $capture_id, $args = array(), $mode = 'live' ) {
-		return self::post( '/v2/payments/captures/' . $capture_id . '/refund', $args, $mode );
+	public static function refund_capture($capture_id, $args = array(), $mode = 'live') {
+		return self::post('/v2/payments/captures/' . $capture_id . '/refund', $args, $mode);
 	}
 
 }

includes/class-getpaid-tax.php

Indentation +192 added lines, -192 removed lines

@@ -13,199 +13,199 @@
  */
 class GetPaid_Tax {
 
-	/**
-	 * Calculates tax for a line item.
-	 *
-	 * @param  float   $price              The price to calc tax on.
-	 * @param  array   $rates              The rates to apply.
-	 * @param  boolean $price_includes_tax Whether the passed price has taxes included.
-	 * @return array                       Array of tax name => tax amount.
-	 */
-	public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
-
-		if ( $price_includes_tax ) {
-			$taxes = self::calc_inclusive_tax( $price, $rates );
-		} else {
-			$taxes = self::calc_exclusive_tax( $price, $rates );
-		}
-
-		return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
-
-	}
-
-	/**
-	 * Calc tax from inclusive price.
-	 *
-	 * @param  float $price Price to calculate tax for.
-	 * @param  array $rates Array of tax rates.
-	 * @return array
-	 */
-	public static function calc_inclusive_tax( $price, $rates ) {
-		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
-
-		// Add tax rates.
-		$tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
-
-		foreach ( $tax_rates as $name => $rate ) {
-			$the_rate       = ( $rate / 100 ) / $tax_rate;
-			$net_price      = $price - ( $the_rate * $price );
-			$tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
-			$taxes[ $name ] = $tax_amount;
-		}
-
-		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
-
-		return $taxes;
-	}
-
-	/**
-	 * Calc tax from exclusive price.
-	 *
-	 * @param  float $price Price to calculate tax for.
-	 * @param  array $rates Array of tax rates.
-	 * @return array
-	 */
-	public static function calc_exclusive_tax( $price, $rates ) {
-		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
-
-		foreach ( $tax_rates as $name => $rate ) {
-
-			$tax_amount     = $price * ( $rate / 100 );
-			$taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
-
-		}
-
-		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
-
-		return $taxes;
-	}
-
-	/**
-	 * Get's an array of all tax rates.
-	 *
-	 * @return array
-	 */
-	public static function get_all_tax_rates() {
-
-		$rates = get_option( 'wpinv_tax_rates', array() );
-
-		return apply_filters(
-			'getpaid_get_all_tax_rates',
-			array_filter( wpinv_parse_list( $rates ) )
-		);
-
-	}
-
-	/**
-	 * Get's an array of default tax rates.
-	 *
-	 * @return array
-	 */
-	public static function get_default_tax_rates() {
-
-		return apply_filters(
-			'getpaid_get_default_tax_rates',
-			array(
-				array(
-					'country' => wpinv_get_default_country(),
-					'state'   => wpinv_get_default_state(),
-					'global'  => true,
-					'rate'    => wpinv_get_default_tax_rate(),
-					'name'    => __( 'Tax', 'invoicing' ),
-				),
-			)
-		);
-
-	}
-
-	/**
-	 * Get's an array of all tax rules.
-	 *
-	 * @return array
-	 */
-	public static function get_all_tax_rules() {
-
-		$rules = get_option(
-			'wpinv_tax_rules',
-			array(
-				array(
-					'key'               => 'physical',
-					'label'             => __( 'Physical Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
-				),
-				array(
-					'key'               => 'digital',
-					'label'             => __( 'Digital Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
-				),
-        	)
-		);
-
-		return apply_filters(
-			'getpaid_tax_rules',
-			array_filter( array_values( wpinv_parse_list( $rules ) ) )
-		);
-
-	}
-
-	/**
-	 * Get's an array of tax rates for a given address.
-	 *
-	 * @param string $country
-	 * @param string $state
-	 * @return array
-	 */
-	public static function get_address_tax_rates( $country, $state ) {
-
-		$all_tax_rates  = self::get_all_tax_rates();
-		$matching_rates = array_merge(
-			wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
-			wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
-		);
-
-		foreach ( $matching_rates as $i => $rate ) {
-
-			$states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
-			if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
-				unset( $matching_rates[ $i ] );
-			}
+    /**
+     * Calculates tax for a line item.
+     *
+     * @param  float   $price              The price to calc tax on.
+     * @param  array   $rates              The rates to apply.
+     * @param  boolean $price_includes_tax Whether the passed price has taxes included.
+     * @return array                       Array of tax name => tax amount.
+     */
+    public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
+
+        if ( $price_includes_tax ) {
+            $taxes = self::calc_inclusive_tax( $price, $rates );
+        } else {
+            $taxes = self::calc_exclusive_tax( $price, $rates );
+        }
+
+        return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
+
+    }
+
+    /**
+     * Calc tax from inclusive price.
+     *
+     * @param  float $price Price to calculate tax for.
+     * @param  array $rates Array of tax rates.
+     * @return array
+     */
+    public static function calc_inclusive_tax( $price, $rates ) {
+        $taxes     = array();
+        $tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+
+        // Add tax rates.
+        $tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
+
+        foreach ( $tax_rates as $name => $rate ) {
+            $the_rate       = ( $rate / 100 ) / $tax_rate;
+            $net_price      = $price - ( $the_rate * $price );
+            $tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
+            $taxes[ $name ] = $tax_amount;
+        }
+
+        // Round all taxes to precision (4DP) before passing them back.
+        $taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+
+        return $taxes;
+    }
+
+    /**
+     * Calc tax from exclusive price.
+     *
+     * @param  float $price Price to calculate tax for.
+     * @param  array $rates Array of tax rates.
+     * @return array
+     */
+    public static function calc_exclusive_tax( $price, $rates ) {
+        $taxes     = array();
+        $tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+
+        foreach ( $tax_rates as $name => $rate ) {
+
+            $tax_amount     = $price * ( $rate / 100 );
+            $taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
+
+        }
+
+        // Round all taxes to precision (4DP) before passing them back.
+        $taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+
+        return $taxes;
+    }
+
+    /**
+     * Get's an array of all tax rates.
+     *
+     * @return array
+     */
+    public static function get_all_tax_rates() {
+
+        $rates = get_option( 'wpinv_tax_rates', array() );
+
+        return apply_filters(
+            'getpaid_get_all_tax_rates',
+            array_filter( wpinv_parse_list( $rates ) )
+        );
+
+    }
+
+    /**
+     * Get's an array of default tax rates.
+     *
+     * @return array
+     */
+    public static function get_default_tax_rates() {
+
+        return apply_filters(
+            'getpaid_get_default_tax_rates',
+            array(
+                array(
+                    'country' => wpinv_get_default_country(),
+                    'state'   => wpinv_get_default_state(),
+                    'global'  => true,
+                    'rate'    => wpinv_get_default_tax_rate(),
+                    'name'    => __( 'Tax', 'invoicing' ),
+                ),
+            )
+        );
+
+    }
+
+    /**
+     * Get's an array of all tax rules.
+     *
+     * @return array
+     */
+    public static function get_all_tax_rules() {
+
+        $rules = get_option(
+            'wpinv_tax_rules',
+            array(
+                array(
+                    'key'               => 'physical',
+                    'label'             => __( 'Physical Item', 'invoicing' ),
+                    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+                    'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+                ),
+                array(
+                    'key'               => 'digital',
+                    'label'             => __( 'Digital Item', 'invoicing' ),
+                    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+                    'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+                ),
+            )
+        );
+
+        return apply_filters(
+            'getpaid_tax_rules',
+            array_filter( array_values( wpinv_parse_list( $rules ) ) )
+        );
+
+    }
+
+    /**
+     * Get's an array of tax rates for a given address.
+     *
+     * @param string $country
+     * @param string $state
+     * @return array
+     */
+    public static function get_address_tax_rates( $country, $state ) {
+
+        $all_tax_rates  = self::get_all_tax_rates();
+        $matching_rates = array_merge(
+            wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
+            wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
+        );
+
+        foreach ( $matching_rates as $i => $rate ) {
+
+            $states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
+            if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
+                unset( $matching_rates[ $i ] );
+            }
 }
 
-		return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
-
-	}
-
-	/**
-	 * Sums a set of taxes to form a single total. Result is rounded to precision.
-	 *
-	 * @param  array $taxes Array of taxes.
-	 * @return float
-	 */
-	public static function get_tax_total( $taxes ) {
-		return self::round( array_sum( $taxes ) );
-	}
-
-	/**
-	 * Round to precision.
-	 *
-	 * Filter example: to return rounding to .5 cents you'd use:
-	 *
-	 * function euro_5cent_rounding( $in ) {
-	 *      return round( $in / 5, 2 ) * 5;
-	 * }
-	 * add_filter( 'getpaid_tax_round', 'euro_5cent_rounding' );
-	 *
-	 * @param float|int $in Value to round.
-	 * @return float
-	 */
-	public static function round( $in ) {
-		return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
-	}
+        return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
+
+    }
+
+    /**
+     * Sums a set of taxes to form a single total. Result is rounded to precision.
+     *
+     * @param  array $taxes Array of taxes.
+     * @return float
+     */
+    public static function get_tax_total( $taxes ) {
+        return self::round( array_sum( $taxes ) );
+    }
+
+    /**
+     * Round to precision.
+     *
+     * Filter example: to return rounding to .5 cents you'd use:
+     *
+     * function euro_5cent_rounding( $in ) {
+     *      return round( $in / 5, 2 ) * 5;
+     * }
+     * add_filter( 'getpaid_tax_round', 'euro_5cent_rounding' );
+     *
+     * @param float|int $in Value to round.
+     * @return float
+     */
+    public static function round( $in ) {
+        return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Class GetPaid_Tax
@@ -21,15 +21,15 @@ 
 	 * @param  boolean $price_includes_tax Whether the passed price has taxes included.
 	 * @return array                       Array of tax name => tax amount.
 	 */
-	public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
+	public static function calc_tax($price, $rates, $price_includes_tax = false) {
 
-		if ( $price_includes_tax ) {
-			$taxes = self::calc_inclusive_tax( $price, $rates );
+		if ($price_includes_tax) {
+			$taxes = self::calc_inclusive_tax($price, $rates);
 		} else {
-			$taxes = self::calc_exclusive_tax( $price, $rates );
+			$taxes = self::calc_exclusive_tax($price, $rates);
 		}
 
-		return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
+		return apply_filters('getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax);
 
 	}
 
@@ -40,22 +40,22 @@ 
 	 * @param  array $rates Array of tax rates.
 	 * @return array
 	 */
-	public static function calc_inclusive_tax( $price, $rates ) {
+	public static function calc_inclusive_tax($price, $rates) {
 		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+		$tax_rates = wp_list_pluck($rates, 'rate', 'name');
 
 		// Add tax rates.
-		$tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
+		$tax_rate  = 1 + (array_sum($tax_rates) / 100);
 
-		foreach ( $tax_rates as $name => $rate ) {
-			$the_rate       = ( $rate / 100 ) / $tax_rate;
-			$net_price      = $price - ( $the_rate * $price );
-			$tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
-			$taxes[ $name ] = $tax_amount;
+		foreach ($tax_rates as $name => $rate) {
+			$the_rate       = ($rate / 100) / $tax_rate;
+			$net_price      = $price - ($the_rate * $price);
+			$tax_amount     = apply_filters('getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price);
+			$taxes[$name] = $tax_amount;
 		}
 
 		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+		$taxes = array_map(array(__CLASS__, 'round'), $taxes);
 
 		return $taxes;
 	}
@@ -67,19 +67,19 @@ 
 	 * @param  array $rates Array of tax rates.
 	 * @return array
 	 */
-	public static function calc_exclusive_tax( $price, $rates ) {
+	public static function calc_exclusive_tax($price, $rates) {
 		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+		$tax_rates = wp_list_pluck($rates, 'rate', 'name');
 
-		foreach ( $tax_rates as $name => $rate ) {
+		foreach ($tax_rates as $name => $rate) {
 
-			$tax_amount     = $price * ( $rate / 100 );
-			$taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
+			$tax_amount     = $price * ($rate / 100);
+			$taxes[$name] = apply_filters('getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price);
 
 		}
 
 		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+		$taxes = array_map(array(__CLASS__, 'round'), $taxes);
 
 		return $taxes;
 	}
@@ -91,11 +91,11 @@ 
 	 */
 	public static function get_all_tax_rates() {
 
-		$rates = get_option( 'wpinv_tax_rates', array() );
+		$rates = get_option('wpinv_tax_rates', array());
 
 		return apply_filters(
 			'getpaid_get_all_tax_rates',
-			array_filter( wpinv_parse_list( $rates ) )
+			array_filter(wpinv_parse_list($rates))
 		);
 
 	}
@@ -115,7 +115,7 @@ 
 					'state'   => wpinv_get_default_state(),
 					'global'  => true,
 					'rate'    => wpinv_get_default_tax_rate(),
-					'name'    => __( 'Tax', 'invoicing' ),
+					'name'    => __('Tax', 'invoicing'),
 				),
 			)
 		);
@@ -134,22 +134,22 @@ 
 			array(
 				array(
 					'key'               => 'physical',
-					'label'             => __( 'Physical Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+					'label'             => __('Physical Item', 'invoicing'),
+					'tax_base'          => wpinv_get_option('tax_base', 'billing'),
+					'same_country_rule' => wpinv_get_option('vat_same_country_rule', 'vat_too'),
 				),
 				array(
 					'key'               => 'digital',
-					'label'             => __( 'Digital Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+					'label'             => __('Digital Item', 'invoicing'),
+					'tax_base'          => wpinv_get_option('tax_base', 'billing'),
+					'same_country_rule' => wpinv_get_option('vat_same_country_rule', 'vat_too'),
 				),
         	)
 		);
 
 		return apply_filters(
 			'getpaid_tax_rules',
-			array_filter( array_values( wpinv_parse_list( $rules ) ) )
+			array_filter(array_values(wpinv_parse_list($rules)))
 		);
 
 	}
@@ -161,23 +161,23 @@ 
 	 * @param string $state
 	 * @return array
 	 */
-	public static function get_address_tax_rates( $country, $state ) {
+	public static function get_address_tax_rates($country, $state) {
 
 		$all_tax_rates  = self::get_all_tax_rates();
 		$matching_rates = array_merge(
-			wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
-			wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
+			wp_list_filter($all_tax_rates, array('country' => $country)),
+			wp_list_filter($all_tax_rates, array('country' => ''))
 		);
 
-		foreach ( $matching_rates as $i => $rate ) {
+		foreach ($matching_rates as $i => $rate) {
 
-			$states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
-			if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
-				unset( $matching_rates[ $i ] );
+			$states = array_filter(wpinv_clean(explode(',', strtolower($rate['state']))));
+			if (empty($rate['global']) && !in_array(strtolower($state), $states)) {
+				unset($matching_rates[$i]);
 			}
 }
 
-		return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
+		return apply_filters('getpaid_get_address_tax_rates', $matching_rates, $country, $state);
 
 	}
 
@@ -187,8 +187,8 @@ 
 	 * @param  array $taxes Array of taxes.
 	 * @return float
 	 */
-	public static function get_tax_total( $taxes ) {
-		return self::round( array_sum( $taxes ) );
+	public static function get_tax_total($taxes) {
+		return self::round(array_sum($taxes));
 	}
 
 	/**
@@ -204,8 +204,8 @@ 
 	 * @param float|int $in Value to round.
 	 * @return float
 	 */
-	public static function round( $in ) {
-		return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
+	public static function round($in) {
+		return apply_filters('getpaid_tax_round', round($in, 4), $in);
 	}
 
 }

templates/emails/invoice-totals.php

Spacing +25 added lines, -25 removed lines

@@ -8,22 +8,22 @@ 
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Totals rows.
-$totals = getpaid_invoice_totals_rows( $invoice );
+$totals = getpaid_invoice_totals_rows($invoice);
 
-do_action( 'getpaid_before_email_line_totals', $invoice, $totals );
+do_action('getpaid_before_email_line_totals', $invoice, $totals);
 
 ?>
 
 
-<?php if ( has_action( 'wpinv_email_footer_buttons' ) ) : ?>
+<?php if (has_action('wpinv_email_footer_buttons')) : ?>
 
     <tr class="wpinv_cart_footer_row">
 
-        <td colspan="<?php echo ( (int) $column_count ); ?>">
-            <?php do_action( 'wpinv_email_footer_buttons' ); ?>
+        <td colspan="<?php echo ((int) $column_count); ?>">
+            <?php do_action('wpinv_email_footer_buttons'); ?>
         </td>
 
     </tr>
@@ -31,49 +31,49 @@ 
 <?php endif; ?>
 
 
-<?php foreach ( $totals as $key => $label ) : ?>
+<?php foreach ($totals as $key => $label) : ?>
 
-    <tr class="wpinv_cart_footer_row wpinv_cart_<?php echo esc_html( $key ); ?>_row">
+    <tr class="wpinv_cart_footer_row wpinv_cart_<?php echo esc_html($key); ?>_row">
 
-        <td colspan="<?php echo absint( ( $column_count - 1 ) ); ?>" class="wpinv_cart_<?php echo esc_html( $key ); ?>_label text-right">
-            <strong><?php echo esc_html( $label ); ?>:</strong>
+        <td colspan="<?php echo absint(($column_count - 1)); ?>" class="wpinv_cart_<?php echo esc_html($key); ?>_label text-right">
+            <strong><?php echo esc_html($label); ?>:</strong>
         </td>
 
-        <td class="wpinv_cart_<?php echo esc_html( $key ); ?> text-right">
+        <td class="wpinv_cart_<?php echo esc_html($key); ?> text-right">
 
             <?php
 
                 // Total tax.
-                if ( 'tax' == $key ) {
-                    wpinv_the_price( $invoice->get_total_tax(), $invoice->get_currency() );
+                if ('tax' == $key) {
+                    wpinv_the_price($invoice->get_total_tax(), $invoice->get_currency());
                 }
 
                 // Individual taxes.
-                if ( 0 === strpos( $key, 'tax__' ) ) {
-                    wpinv_the_price( $invoice->get_tax_total_by_name( str_replace( 'tax__', '', $key ) ), $invoice->get_currency() );
+                if (0 === strpos($key, 'tax__')) {
+                    wpinv_the_price($invoice->get_tax_total_by_name(str_replace('tax__', '', $key)), $invoice->get_currency());
                 }
 
-                if ( 'fee' == $key ) {
-                    wpinv_the_price( $invoice->get_total_fees(), $invoice->get_currency() );
+                if ('fee' == $key) {
+                    wpinv_the_price($invoice->get_total_fees(), $invoice->get_currency());
                 }
 
                 // Total discount.
-                if ( 'discount' == $key ) {
-                    wpinv_the_price( $invoice->get_total_discount(), $invoice->get_currency() );
+                if ('discount' == $key) {
+                    wpinv_the_price($invoice->get_total_discount(), $invoice->get_currency());
                 }
 
                 // Sub total.
-                if ( 'subtotal' == $key ) {
-                    wpinv_the_price( $invoice->get_subtotal(), $invoice->get_currency() );
+                if ('subtotal' == $key) {
+                    wpinv_the_price($invoice->get_subtotal(), $invoice->get_currency());
                 }
 
                 // Total.
-                if ( 'total' == $key ) {
-                    wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
+                if ('total' == $key) {
+                    wpinv_the_price($invoice->get_total(), $invoice->get_currency());
                 }
 
                 // Fires when printing a cart total in an email.
-                do_action( "getpaid_email_cart_totals_$key", $invoice );
+                do_action("getpaid_email_cart_totals_$key", $invoice);
 
             ?>
 
@@ -85,4 +85,4 @@ 
 
 <?php
 
-    do_action( 'getpaid_after_email_line_totals', $invoice, $totals );
+    do_action('getpaid_after_email_line_totals', $invoice, $totals);

includes/invoice-functions.php

Spacing +373 added lines, -373 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Retrieves the current invoice.
@@ -14,15 +14,15 @@ 
 function getpaid_get_current_invoice_id() {
 
     // Ensure that we have an invoice key.
-    if ( empty( $_GET['invoice_key'] ) ) {
+    if (empty($_GET['invoice_key'])) {
         return 0;
     }
 
     // Retrieve an invoice using the key.
-    $invoice = new WPInv_Invoice( sanitize_text_field( $_GET['invoice_key'] ) );
+    $invoice = new WPInv_Invoice(sanitize_text_field($_GET['invoice_key']));
 
     // Compare the invoice key and the parsed key.
-    if ( $invoice->get_id() != 0 && $invoice->get_key() == sanitize_text_field( $_GET['invoice_key'] ) ) {
+    if ($invoice->get_id() != 0 && $invoice->get_key() == sanitize_text_field($_GET['invoice_key'])) {
         return $invoice->get_id();
     }
 
@@ -32,42 +32,42 @@ 
 /**
  * Checks if the current user cna view an invoice.
  */
-function wpinv_user_can_view_invoice( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_user_can_view_invoice($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if the invoice does not exist.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return false;
     }
 
     // Don't allow trash, draft status
-    if ( $invoice->is_draft() ) {
+    if ($invoice->is_draft()) {
         return false;
     }
 
     // If users are not required to login to check out, compare the invoice keys.
-    if ( ! wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && sanitize_text_field( $_GET['invoice_key'] ) == $invoice->get_key() ) {
+    if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && sanitize_text_field($_GET['invoice_key']) == $invoice->get_key()) {
         return true;
     }
 
     // Always enable for admins..
-    if ( wpinv_current_user_can( 'view_invoice', array( 'invoice' => $invoice ) ) || current_user_can( 'view_invoices', $invoice->get_id() ) ) { // Admin user
+    if (wpinv_current_user_can('view_invoice', array('invoice' => $invoice)) || current_user_can('view_invoices', $invoice->get_id())) { // Admin user
         return true;
     }
 
     // Else, ensure that this is their invoice.
-    if ( is_user_logged_in() && $invoice->get_user_id() == get_current_user_id() ) {
+    if (is_user_logged_in() && $invoice->get_user_id() == get_current_user_id()) {
         return true;
     }
 
-    return apply_filters( 'wpinv_current_user_can_view_invoice', false, $invoice );
+    return apply_filters('wpinv_current_user_can_view_invoice', false, $invoice);
 }
 
 /**
  * Checks if the current user cna view an invoice receipt.
  */
-function wpinv_can_view_receipt( $invoice ) {
-	return (bool) apply_filters( 'wpinv_can_view_receipt', wpinv_user_can_view_invoice( $invoice ), $invoice );
+function wpinv_can_view_receipt($invoice) {
+	return (bool) apply_filters('wpinv_can_view_receipt', wpinv_user_can_view_invoice($invoice), $invoice);
 }
 
 /**
@@ -77,16 +77,16 @@ 
  */
 function getpaid_get_invoice_post_types() {
     $post_types = array(
-        'wpi_quote'   => __( 'Quote', 'invoicing' ),
-        'wpi_invoice' => __( 'Invoice', 'invoicing' ),
+        'wpi_quote'   => __('Quote', 'invoicing'),
+        'wpi_invoice' => __('Invoice', 'invoicing'),
     );
 
     // Ensure the quotes addon is installed.
-    if ( ! defined( 'WPINV_QUOTES_VERSION' ) ) {
-        unset( $post_types['wpi_quote'] );
+    if (!defined('WPINV_QUOTES_VERSION')) {
+        unset($post_types['wpi_quote']);
     }
 
-    return apply_filters( 'getpaid_invoice_post_types', $post_types );
+    return apply_filters('getpaid_invoice_post_types', $post_types);
 }
 
 /**
@@ -95,8 +95,8 @@ 
  *
  * @param string $post_type The post type to check for.
  */
-function getpaid_is_invoice_post_type( $post_type ) {
-    return is_scalar( $post_type ) && ! empty( $post_type ) && array_key_exists( $post_type, getpaid_get_invoice_post_types() );
+function getpaid_is_invoice_post_type($post_type) {
+    return is_scalar($post_type) && !empty($post_type) && array_key_exists($post_type, getpaid_get_invoice_post_types());
 }
 
 /**
@@ -106,9 +106,9 @@ 
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_create_invoice( $data = array(), $deprecated = null, $wp_error = false ) {
+function wpinv_create_invoice($data = array(), $deprecated = null, $wp_error = false) {
     $data['invoice_id'] = 0;
-    return wpinv_insert_invoice( $data, $wp_error );
+    return wpinv_insert_invoice($data, $wp_error);
 }
 
 /**
@@ -118,35 +118,35 @@ 
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_update_invoice( $data = array(), $wp_error = false ) {
+function wpinv_update_invoice($data = array(), $wp_error = false) {
 
     // Backwards compatibility.
-    if ( ! empty( $data['ID'] ) ) {
+    if (!empty($data['ID'])) {
         $data['invoice_id'] = $data['ID'];
     }
 
     // Do we have an invoice id?
-    if ( empty( $data['invoice_id'] ) ) {
-        return $wp_error ? new WP_Error( 'invalid_invoice_id', __( 'Invalid invoice ID.', 'invoicing' ) ) : 0;
+    if (empty($data['invoice_id'])) {
+        return $wp_error ? new WP_Error('invalid_invoice_id', __('Invalid invoice ID.', 'invoicing')) : 0;
     }
 
     // Retrieve the invoice.
-    $invoice = wpinv_get_invoice( $data['invoice_id'] );
+    $invoice = wpinv_get_invoice($data['invoice_id']);
 
     // And abort if it does not exist.
-    if ( empty( $invoice ) ) {
-        return $wp_error ? new WP_Error( 'missing_invoice', __( 'Invoice not found.', 'invoicing' ) ) : 0;
+    if (empty($invoice)) {
+        return $wp_error ? new WP_Error('missing_invoice', __('Invoice not found.', 'invoicing')) : 0;
     }
 
     // Do not update totals for paid / refunded invoices.
-    if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+    if ($invoice->is_paid() || $invoice->is_refunded()) {
 
-        if ( ! empty( $data['items'] ) || ! empty( $data['cart_details'] ) ) {
-            return $wp_error ? new WP_Error( 'paid_invoice', __( 'You can not update cart items for invoices that have already been paid for.', 'invoicing' ) ) : 0;
+        if (!empty($data['items']) || !empty($data['cart_details'])) {
+            return $wp_error ? new WP_Error('paid_invoice', __('You can not update cart items for invoices that have already been paid for.', 'invoicing')) : 0;
         }
 }
 
-    return wpinv_insert_invoice( $data, $wp_error );
+    return wpinv_insert_invoice($data, $wp_error);
 
 }
 
@@ -157,62 +157,62 @@ 
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_insert_invoice( $data = array(), $wp_error = false ) {
+function wpinv_insert_invoice($data = array(), $wp_error = false) {
 
     // Ensure that we have invoice data.
-    if ( empty( $data ) ) {
+    if (empty($data)) {
         return false;
     }
 
     // The invoice id will be provided when updating an invoice.
-    $data['invoice_id'] = ! empty( $data['invoice_id'] ) ? (int) $data['invoice_id'] : false;
+    $data['invoice_id'] = !empty($data['invoice_id']) ? (int) $data['invoice_id'] : false;
 
     // Retrieve the invoice.
-    $invoice = new WPInv_Invoice( $data['invoice_id'] );
+    $invoice = new WPInv_Invoice($data['invoice_id']);
 
     // Do we have an error?
-    if ( ! empty( $invoice->last_error ) ) {
-        return $wp_error ? new WP_Error( 'invalid_invoice_id', $invoice->last_error ) : 0;
+    if (!empty($invoice->last_error)) {
+        return $wp_error ? new WP_Error('invalid_invoice_id', $invoice->last_error) : 0;
     }
 
     // Backwards compatibility (billing address).
-    if ( ! empty( $data['user_info'] ) ) {
+    if (!empty($data['user_info'])) {
 
-        foreach ( $data['user_info'] as $key => $value ) {
+        foreach ($data['user_info'] as $key => $value) {
 
-            if ( $key == 'discounts' ) {
+            if ($key == 'discounts') {
                 $value = (array) $value;
-                $data['discount_code'] = empty( $value ) ? null : $value[0];
+                $data['discount_code'] = empty($value) ? null : $value[0];
             } else {
-                $data[ $key ] = $value;
+                $data[$key] = $value;
             }
 }
 }
 
     // Backwards compatibility.
-    if ( ! empty( $data['payment_details'] ) ) {
+    if (!empty($data['payment_details'])) {
 
-        foreach ( $data['payment_details'] as $key => $value ) {
-            $data[ $key ] = $value;
+        foreach ($data['payment_details'] as $key => $value) {
+            $data[$key] = $value;
         }
 }
 
     // Set up the owner of the invoice.
-    $user_id = ! empty( $data['user_id'] ) ? wpinv_clean( $data['user_id'] ) : get_current_user_id();
+    $user_id = !empty($data['user_id']) ? wpinv_clean($data['user_id']) : get_current_user_id();
 
     // Make sure the user exists.
-    if ( ! get_userdata( $user_id ) ) {
-        return $wp_error ? new WP_Error( 'wpinv_invalid_user', __( 'There is no user with that ID.', 'invoicing' ) ) : 0;
+    if (!get_userdata($user_id)) {
+        return $wp_error ? new WP_Error('wpinv_invalid_user', __('There is no user with that ID.', 'invoicing')) : 0;
     }
 
-    $address = wpinv_get_user_address( $user_id );
+    $address = wpinv_get_user_address($user_id);
 
-    foreach ( $address as $key => $value ) {
+    foreach ($address as $key => $value) {
 
-        if ( $value == '' ) {
-            $address[ $key ] = null;
+        if ($value == '') {
+            $address[$key] = null;
         } else {
-            $address[ $key ] = wpinv_clean( $value );
+            $address[$key] = wpinv_clean($value);
         }
 }
 
@@ -221,101 +221,101 @@ 
         array(
 
             // Basic info.
-            'template'          => isset( $data['template'] ) ? wpinv_clean( $data['template'] ) : null,
-            'email_cc'          => isset( $data['email_cc'] ) ? wpinv_clean( $data['email_cc'] ) : null,
-            'date_created'      => isset( $data['created_date'] ) ? wpinv_clean( $data['created_date'] ) : null,
-            'due_date'          => isset( $data['due_date'] ) ? wpinv_clean( $data['due_date'] ) : null,
-            'date_completed'    => isset( $data['date_completed'] ) ? wpinv_clean( $data['date_completed'] ) : null,
-            'number'            => isset( $data['number'] ) ? wpinv_clean( $data['number'] ) : null,
-            'key'               => isset( $data['key'] ) ? wpinv_clean( $data['key'] ) : null,
-            'status'            => isset( $data['status'] ) ? wpinv_clean( $data['status'] ) : null,
-            'post_type'         => isset( $data['post_type'] ) ? wpinv_clean( $data['post_type'] ) : null,
-            'user_ip'           => isset( $data['ip'] ) ? wpinv_clean( $data['ip'] ) : wpinv_get_ip(),
-            'parent_id'         => isset( $data['parent'] ) ? intval( $data['parent'] ) : null,
-            'mode'              => isset( $data['mode'] ) ? wpinv_clean( $data['mode'] ) : null,
-            'description'       => isset( $data['description'] ) ? wp_kses_post( $data['description'] ) : null,
+            'template'          => isset($data['template']) ? wpinv_clean($data['template']) : null,
+            'email_cc'          => isset($data['email_cc']) ? wpinv_clean($data['email_cc']) : null,
+            'date_created'      => isset($data['created_date']) ? wpinv_clean($data['created_date']) : null,
+            'due_date'          => isset($data['due_date']) ? wpinv_clean($data['due_date']) : null,
+            'date_completed'    => isset($data['date_completed']) ? wpinv_clean($data['date_completed']) : null,
+            'number'            => isset($data['number']) ? wpinv_clean($data['number']) : null,
+            'key'               => isset($data['key']) ? wpinv_clean($data['key']) : null,
+            'status'            => isset($data['status']) ? wpinv_clean($data['status']) : null,
+            'post_type'         => isset($data['post_type']) ? wpinv_clean($data['post_type']) : null,
+            'user_ip'           => isset($data['ip']) ? wpinv_clean($data['ip']) : wpinv_get_ip(),
+            'parent_id'         => isset($data['parent']) ? intval($data['parent']) : null,
+            'mode'              => isset($data['mode']) ? wpinv_clean($data['mode']) : null,
+            'description'       => isset($data['description']) ? wp_kses_post($data['description']) : null,
 
             // Payment info.
-            'disable_taxes'     => ! empty( $data['disable_taxes'] ),
-            'currency'          => isset( $data['currency'] ) ? wpinv_clean( $data['currency'] ) : wpinv_get_currency(),
-            'gateway'           => isset( $data['gateway'] ) ? wpinv_clean( $data['gateway'] ) : null,
-            'transaction_id'    => isset( $data['transaction_id'] ) ? wpinv_clean( $data['transaction_id'] ) : null,
-            'discount_code'     => isset( $data['discount_code'] ) ? wpinv_clean( $data['discount_code'] ) : null,
-            'payment_form'      => isset( $data['payment_form'] ) ? intval( $data['payment_form'] ) : null,
-            'submission_id'     => isset( $data['submission_id'] ) ? wpinv_clean( $data['submission_id'] ) : null,
-            'subscription_id'   => isset( $data['subscription_id'] ) ? wpinv_clean( $data['subscription_id'] ) : null,
-            'is_viewed'         => isset( $data['is_viewed'] ) ? wpinv_clean( $data['is_viewed'] ) : null,
-            'fees'              => isset( $data['fees'] ) ? wpinv_clean( $data['fees'] ) : null,
-            'discounts'         => isset( $data['discounts'] ) ? wpinv_clean( $data['discounts'] ) : null,
-            'taxes'             => isset( $data['taxes'] ) ? wpinv_clean( $data['taxes'] ) : null,
+            'disable_taxes'     => !empty($data['disable_taxes']),
+            'currency'          => isset($data['currency']) ? wpinv_clean($data['currency']) : wpinv_get_currency(),
+            'gateway'           => isset($data['gateway']) ? wpinv_clean($data['gateway']) : null,
+            'transaction_id'    => isset($data['transaction_id']) ? wpinv_clean($data['transaction_id']) : null,
+            'discount_code'     => isset($data['discount_code']) ? wpinv_clean($data['discount_code']) : null,
+            'payment_form'      => isset($data['payment_form']) ? intval($data['payment_form']) : null,
+            'submission_id'     => isset($data['submission_id']) ? wpinv_clean($data['submission_id']) : null,
+            'subscription_id'   => isset($data['subscription_id']) ? wpinv_clean($data['subscription_id']) : null,
+            'is_viewed'         => isset($data['is_viewed']) ? wpinv_clean($data['is_viewed']) : null,
+            'fees'              => isset($data['fees']) ? wpinv_clean($data['fees']) : null,
+            'discounts'         => isset($data['discounts']) ? wpinv_clean($data['discounts']) : null,
+            'taxes'             => isset($data['taxes']) ? wpinv_clean($data['taxes']) : null,
 
             // Billing details.
             'user_id'           => $data['user_id'],
-            'first_name'        => isset( $data['first_name'] ) ? wpinv_clean( $data['first_name'] ) : $address['first_name'],
-            'last_name'         => isset( $data['last_name'] ) ? wpinv_clean( $data['last_name'] ) : $address['last_name'],
-            'address'           => isset( $data['address'] ) ? wpinv_clean( $data['address'] ) : $address['address'],
-            'vat_number'        => isset( $data['vat_number'] ) ? wpinv_clean( $data['vat_number'] ) : $address['vat_number'],
-            'company'           => isset( $data['company'] ) ? wpinv_clean( $data['company'] ) : $address['company'],
-            'zip'               => isset( $data['zip'] ) ? wpinv_clean( $data['zip'] ) : $address['zip'],
-            'state'             => isset( $data['state'] ) ? wpinv_clean( $data['state'] ) : $address['state'],
-            'city'              => isset( $data['city'] ) ? wpinv_clean( $data['city'] ) : $address['city'],
-            'country'           => isset( $data['country'] ) ? wpinv_clean( $data['country'] ) : $address['country'],
-            'phone'             => isset( $data['phone'] ) ? wpinv_clean( $data['phone'] ) : $address['phone'],
-            'address_confirmed' => ! empty( $data['address_confirmed'] ),
+            'first_name'        => isset($data['first_name']) ? wpinv_clean($data['first_name']) : $address['first_name'],
+            'last_name'         => isset($data['last_name']) ? wpinv_clean($data['last_name']) : $address['last_name'],
+            'address'           => isset($data['address']) ? wpinv_clean($data['address']) : $address['address'],
+            'vat_number'        => isset($data['vat_number']) ? wpinv_clean($data['vat_number']) : $address['vat_number'],
+            'company'           => isset($data['company']) ? wpinv_clean($data['company']) : $address['company'],
+            'zip'               => isset($data['zip']) ? wpinv_clean($data['zip']) : $address['zip'],
+            'state'             => isset($data['state']) ? wpinv_clean($data['state']) : $address['state'],
+            'city'              => isset($data['city']) ? wpinv_clean($data['city']) : $address['city'],
+            'country'           => isset($data['country']) ? wpinv_clean($data['country']) : $address['country'],
+            'phone'             => isset($data['phone']) ? wpinv_clean($data['phone']) : $address['phone'],
+            'address_confirmed' => !empty($data['address_confirmed']),
 
         )
     );
 
     // Backwards compatibililty.
-    if ( ! empty( $data['cart_details'] ) && is_array( $data['cart_details'] ) ) {
+    if (!empty($data['cart_details']) && is_array($data['cart_details'])) {
         $data['items'] = array();
 
-        foreach ( $data['cart_details'] as $_item ) {
+        foreach ($data['cart_details'] as $_item) {
 
             // Ensure that we have an item id.
-            if ( empty( $_item['id'] ) ) {
+            if (empty($_item['id'])) {
                 continue;
             }
 
             // Retrieve the item.
-            $item = new GetPaid_Form_Item( $_item['id'] );
+            $item = new GetPaid_Form_Item($_item['id']);
 
             // Ensure that it is purchasable.
-            if ( ! $item->can_purchase() ) {
+            if (!$item->can_purchase()) {
                 continue;
             }
 
             // Set quantity.
-            if ( ! empty( $_item['quantity'] ) && is_numeric( $_item['quantity'] ) ) {
-                $item->set_quantity( $_item['quantity'] );
+            if (!empty($_item['quantity']) && is_numeric($_item['quantity'])) {
+                $item->set_quantity($_item['quantity']);
             }
 
             // Set price.
-            if ( isset( $_item['item_price'] ) ) {
-                $item->set_price( $_item['item_price'] );
+            if (isset($_item['item_price'])) {
+                $item->set_price($_item['item_price']);
             }
 
-            if ( isset( $_item['custom_price'] ) ) {
-                $item->set_price( $_item['custom_price'] );
+            if (isset($_item['custom_price'])) {
+                $item->set_price($_item['custom_price']);
             }
 
             // Set name.
-            if ( ! empty( $_item['name'] ) ) {
-                $item->set_name( $_item['name'] );
+            if (!empty($_item['name'])) {
+                $item->set_name($_item['name']);
             }
 
             // Set description.
-            if ( isset( $_item['description'] ) ) {
-                $item->set_custom_description( $_item['description'] );
+            if (isset($_item['description'])) {
+                $item->set_custom_description($_item['description']);
             }
 
             // Set meta.
-            if ( isset( $_item['meta'] ) && is_array( $_item['meta'] ) ) {
+            if (isset($_item['meta']) && is_array($_item['meta'])) {
 
-                $item->set_item_meta( $_item['meta'] );
+                $item->set_item_meta($_item['meta']);
 
-                if ( isset( $_item['meta']['description'] ) ) {
-                    $item->set_custom_description( $_item['meta']['description'] );
+                if (isset($_item['meta']['description'])) {
+                    $item->set_custom_description($_item['meta']['description']);
                 }
             }
 
@@ -325,14 +325,14 @@ 
     }
 
     // Add invoice items.
-    if ( ! empty( $data['items'] ) && is_array( $data['items'] ) ) {
+    if (!empty($data['items']) && is_array($data['items'])) {
 
-        $invoice->set_items( array() );
+        $invoice->set_items(array());
 
-        foreach ( $data['items'] as $item ) {
+        foreach ($data['items'] as $item) {
 
-            if ( is_object( $item ) && is_a( $item, 'GetPaid_Form_Item' ) && $item->can_purchase() ) {
-                $invoice->add_item( $item );
+            if (is_object($item) && is_a($item, 'GetPaid_Form_Item') && $item->can_purchase()) {
+                $invoice->add_item($item);
             }
 }
 }
@@ -341,30 +341,30 @@ 
     $invoice->recalculate_total();
     $invoice->save();
 
-    if ( ! $invoice->get_id() ) {
-        return $wp_error ? new WP_Error( 'wpinv_insert_invoice_error', __( 'An error occured when saving your invoice.', 'invoicing' ) ) : 0;
+    if (!$invoice->get_id()) {
+        return $wp_error ? new WP_Error('wpinv_insert_invoice_error', __('An error occured when saving your invoice.', 'invoicing')) : 0;
     }
 
     // Add private note.
-    if ( ! empty( $data['private_note'] ) ) {
-        $invoice->add_note( $data['private_note'] );
+    if (!empty($data['private_note'])) {
+        $invoice->add_note($data['private_note']);
     }
 
     // User notes.
-    if ( ! empty( $data['user_note'] ) ) {
-        $invoice->add_note( $data['user_note'], true );
+    if (!empty($data['user_note'])) {
+        $invoice->add_note($data['user_note'], true);
     }
 
     // Created via.
-    if ( isset( $data['created_via'] ) ) {
-        update_post_meta( $invoice->get_id(), 'wpinv_created_via', $data['created_via'] );
+    if (isset($data['created_via'])) {
+        update_post_meta($invoice->get_id(), 'wpinv_created_via', $data['created_via']);
     }
 
     // Backwards compatiblity.
-    if ( $invoice->is_quote() ) {
+    if ($invoice->is_quote()) {
 
-        if ( isset( $data['valid_until'] ) ) {
-            update_post_meta( $invoice->get_id(), 'wpinv_quote_valid_until', $data['valid_until'] );
+        if (isset($data['valid_until'])) {
+            update_post_meta($invoice->get_id(), 'wpinv_quote_valid_until', $data['valid_until']);
         }
 }
 
@@ -378,20 +378,20 @@ 
  * @param $bool $deprecated
  * @return WPInv_Invoice|null
  */
-function wpinv_get_invoice( $invoice = 0, $deprecated = false ) {
+function wpinv_get_invoice($invoice = 0, $deprecated = false) {
 
     // If we are retrieving the invoice from the cart...
-    if ( $deprecated && empty( $invoice ) ) {
+    if ($deprecated && empty($invoice)) {
         $invoice = (int) getpaid_get_current_invoice_id();
     }
 
     // Retrieve the invoice.
-    if ( ! is_a( $invoice, 'WPInv_Invoice' ) ) {
-        $invoice = new WPInv_Invoice( $invoice );
+    if (!is_a($invoice, 'WPInv_Invoice')) {
+        $invoice = new WPInv_Invoice($invoice);
     }
 
     // Check if it exists.
-    if ( $invoice->exists() ) {
+    if ($invoice->exists()) {
         return $invoice;
     }
 
@@ -404,15 +404,15 @@ 
  * @param array $args Args to search for.
  * @return WPInv_Invoice[]|int[]|object
  */
-function wpinv_get_invoices( $args ) {
+function wpinv_get_invoices($args) {
 
     // Prepare args.
     $args = wp_parse_args(
         $args,
         array(
-            'status' => array_keys( wpinv_get_invoice_statuses() ),
+            'status' => array_keys(wpinv_get_invoice_statuses()),
             'type'   => 'wpi_invoice',
-            'limit'  => get_option( 'posts_per_page' ),
+            'limit'  => get_option('posts_per_page'),
             'return' => 'objects',
         )
     );
@@ -430,24 +430,24 @@ 
         'post__in'       => 'include',
     );
 
-    foreach ( $map_legacy as $to => $from ) {
-        if ( isset( $args[ $from ] ) ) {
-            $args[ $to ] = $args[ $from ];
-            unset( $args[ $from ] );
+    foreach ($map_legacy as $to => $from) {
+        if (isset($args[$from])) {
+            $args[$to] = $args[$from];
+            unset($args[$from]);
         }
     }
 
     // Backwards compatibility.
-    if ( ! empty( $args['email'] ) && empty( $args['user'] ) ) {
+    if (!empty($args['email']) && empty($args['user'])) {
         $args['user'] = $args['email'];
-        unset( $args['email'] );
+        unset($args['email']);
     }
 
     // Handle cases where the user is set as an email.
-    if ( ! empty( $args['author'] ) && is_email( $args['author'] ) ) {
-        $user = get_user_by( 'email', $args['user'] );
+    if (!empty($args['author']) && is_email($args['author'])) {
+        $user = get_user_by('email', $args['user']);
 
-        if ( $user ) {
+        if ($user) {
             $args['author'] = $user->user_email;
         }
 }
@@ -457,31 +457,31 @@ 
 
     // Show all posts.
     $paginate = true;
-    if ( isset( $args['paginate'] ) ) {
+    if (isset($args['paginate'])) {
 
         $paginate = $args['paginate'];
-        $args['no_found_rows'] = empty( $args['paginate'] );
-        unset( $args['paginate'] );
+        $args['no_found_rows'] = empty($args['paginate']);
+        unset($args['paginate']);
 
     }
 
     // Whether to return objects or fields.
     $return = $args['return'];
-    unset( $args['return'] );
+    unset($args['return']);
 
     // Get invoices.
-    $invoices = new WP_Query( apply_filters( 'wpinv_get_invoices_args', $args ) );
+    $invoices = new WP_Query(apply_filters('wpinv_get_invoices_args', $args));
 
     // Prepare the results.
-    if ( 'objects' === $return ) {
-        $results = array_map( 'wpinv_get_invoice', $invoices->posts );
-    } elseif ( 'self' === $return ) {
+    if ('objects' === $return) {
+        $results = array_map('wpinv_get_invoice', $invoices->posts);
+    } elseif ('self' === $return) {
         return $invoices;
     } else {
         $results = $invoices->posts;
     }
 
-    if ( $paginate ) {
+    if ($paginate) {
         return (object) array(
             'invoices'      => $results,
             'total'         => $invoices->found_posts,
@@ -499,8 +499,8 @@ 
  * @param string $transaction_id The transaction id to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_id_by_transaction_id( $transaction_id ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $transaction_id, 'transaction_id' );
+function wpinv_get_id_by_transaction_id($transaction_id) {
+    return WPInv_Invoice::get_invoice_id_by_field($transaction_id, 'transaction_id');
 }
 
 /**
@@ -509,8 +509,8 @@ 
  * @param string $invoice_number The invoice number to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_id_by_invoice_number( $invoice_number ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $invoice_number, 'number' );
+function wpinv_get_id_by_invoice_number($invoice_number) {
+    return WPInv_Invoice::get_invoice_id_by_field($invoice_number, 'number');
 }
 
 /**
@@ -519,8 +519,8 @@ 
  * @param string $invoice_key The invoice key to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_invoice_id_by_key( $invoice_key ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $invoice_key, 'key' );
+function wpinv_get_invoice_id_by_key($invoice_key) {
+    return WPInv_Invoice::get_invoice_id_by_field($invoice_key, 'key');
 }
 
 /**
@@ -530,19 +530,19 @@ 
  * @param string $type Optionally filter by type i.e customer|system
  * @return array|null
  */
-function wpinv_get_invoice_notes( $invoice = 0, $type = '' ) {
+function wpinv_get_invoice_notes($invoice = 0, $type = '') {
 
     // Prepare the invoice.
-    $invoice = wpinv_get_invoice( $invoice );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice);
+    if (empty($invoice)) {
         return null;
     }
 
     // Fetch notes.
-    $notes = getpaid_notes()->get_invoice_notes( $invoice->get_id(), $type );
+    $notes = getpaid_notes()->get_invoice_notes($invoice->get_id(), $type);
 
     // Filter the notes.
-    return apply_filters( 'wpinv_invoice_notes', $notes, $invoice->get_id(), $type );
+    return apply_filters('wpinv_invoice_notes', $notes, $invoice->get_id(), $type);
 }
 
 /**
@@ -550,10 +550,10 @@ 
  *
  * @param string $post_type
  */
-function wpinv_get_user_invoices_columns( $post_type = 'wpi_invoice' ) {
+function wpinv_get_user_invoices_columns($post_type = 'wpi_invoice') {
 
-    $label   = getpaid_get_post_type_label( $post_type, false );
-    $label   = empty( $label ) ? __( 'Invoice', 'invoicing' ) : sanitize_text_field( $label );
+    $label   = getpaid_get_post_type_label($post_type, false);
+    $label   = empty($label) ? __('Invoice', 'invoicing') : sanitize_text_field($label);
     $columns = array(
 
 		'invoice-number'  => array(
@@ -562,22 +562,22 @@ 
 		),
 
 		'created-date'    => array(
-			'title' => __( 'Created Date', 'invoicing' ),
+			'title' => __('Created Date', 'invoicing'),
 			'class' => 'text-left',
 		),
 
 		'payment-date'    => array(
-			'title' => __( 'Payment Date', 'invoicing' ),
+			'title' => __('Payment Date', 'invoicing'),
 			'class' => 'text-left',
 		),
 
 		'invoice-status'  => array(
-			'title' => __( 'Status', 'invoicing' ),
+			'title' => __('Status', 'invoicing'),
 			'class' => 'text-center',
 		),
 
 		'invoice-total'   => array(
-			'title' => __( 'Total', 'invoicing' ),
+			'title' => __('Total', 'invoicing'),
 			'class' => 'text-right',
 		),
 
@@ -588,7 +588,7 @@ 
 
 	);
 
-    return apply_filters( 'wpinv_user_invoices_columns', $columns, $post_type );
+    return apply_filters('wpinv_user_invoices_columns', $columns, $post_type);
 }
 
 /**
@@ -598,59 +598,59 @@ 
 
     // Find the invoice.
     $invoice_id = getpaid_get_current_invoice_id();
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // Abort if non was found.
-    if ( empty( $invoice_id ) || $invoice->is_draft() ) {
+    if (empty($invoice_id) || $invoice->is_draft()) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'We could not find your invoice', 'invoicing' ),
+                'content' => __('We could not find your invoice', 'invoicing'),
             )
         );
 
     }
 
     // Can the user view this invoice?
-    if ( ! wpinv_can_view_receipt( $invoice_id ) ) {
+    if (!wpinv_can_view_receipt($invoice_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'You are not allowed to view this receipt', 'invoicing' ),
+                'content' => __('You are not allowed to view this receipt', 'invoicing'),
             )
         );
 
     }
 
     // Load the template.
-    return wpinv_get_template_html( 'invoice-receipt.php', compact( 'invoice' ) );
+    return wpinv_get_template_html('invoice-receipt.php', compact('invoice'));
 
 }
 
 /**
  * Displays the invoice history.
  */
-function getpaid_invoice_history( $user_id = 0, $post_type = 'wpi_invoice' ) {
+function getpaid_invoice_history($user_id = 0, $post_type = 'wpi_invoice') {
 
     // Ensure that we have a user id.
-    if ( empty( $user_id ) || ! is_numeric( $user_id ) ) {
+    if (empty($user_id) || !is_numeric($user_id)) {
         $user_id = get_current_user_id();
     }
 
-    $label = getpaid_get_post_type_label( $post_type );
-    $label = empty( $label ) ? __( 'Invoices', 'invoicing' ) : sanitize_text_field( $label );
+    $label = getpaid_get_post_type_label($post_type);
+    $label = empty($label) ? __('Invoices', 'invoicing') : sanitize_text_field($label);
 
     // View user id.
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
                 'content' => sprintf(
-                    __( 'You must be logged in to view your %s.', 'invoicing' ),
-                    strtolower( $label )
+                    __('You must be logged in to view your %s.', 'invoicing'),
+                    strtolower($label)
                 ),
             )
         );
@@ -660,22 +660,22 @@ 
     // Fetch invoices.
     $invoices = wpinv_get_invoices(
         array(
-            'page'     => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
+            'page'     => (get_query_var('paged')) ? absint(get_query_var('paged')) : 1,
             'user'     => $user_id,
             'paginate' => true,
             'type'     => $post_type,
-            'status'   => array_keys( wpinv_get_invoice_statuses( false, false, $post_type ) ),
+            'status'   => array_keys(wpinv_get_invoice_statuses(false, false, $post_type)),
         )
     );
 
-    if ( empty( $invoices->total ) ) {
+    if (empty($invoices->total)) {
 
         return aui()->alert(
             array(
                 'type'    => 'info',
                 'content' => sprintf(
-                    __( 'No %s found.', 'invoicing' ),
-                    strtolower( $label )
+                    __('No %s found.', 'invoicing'),
+                    strtolower($label)
                 ),
             )
         );
@@ -683,38 +683,38 @@ 
     }
 
     // Load the template.
-    return wpinv_get_template_html( 'invoice-history.php', compact( 'invoices', 'post_type' ) );
+    return wpinv_get_template_html('invoice-history.php', compact('invoices', 'post_type'));
 
 }
 
 /**
  * Formats an invoice number given an invoice type.
  */
-function wpinv_format_invoice_number( $number, $type = '' ) {
+function wpinv_format_invoice_number($number, $type = '') {
 
     // Allow other plugins to overide this.
-    $check = apply_filters( 'wpinv_pre_format_invoice_number', null, $number, $type );
-    if ( null !== $check ) {
+    $check = apply_filters('wpinv_pre_format_invoice_number', null, $number, $type);
+    if (null !== $check) {
         return $check;
     }
 
     // Ensure that we have a numeric number.
-    if ( ! is_numeric( $number ) ) {
+    if (!is_numeric($number)) {
         return $number;
     }
 
     // Format the number.
-    $padd             = absint( (int) wpinv_get_option( 'invoice_number_padd', 5 ) );
-    $prefix           = sanitize_text_field( (string) wpinv_get_option( 'invoice_number_prefix', 'INV-' ) );
-    $prefix           = sanitize_text_field( apply_filters( 'getpaid_invoice_type_prefix', $prefix, $type ) );
-    $postfix          = sanitize_text_field( (string) wpinv_get_option( 'invoice_number_postfix' ) );
-    $postfix          = sanitize_text_field( apply_filters( 'getpaid_invoice_type_postfix', $postfix, $type ) );
-    $formatted_number = zeroise( absint( $number ), $padd );
+    $padd             = absint((int) wpinv_get_option('invoice_number_padd', 5));
+    $prefix           = sanitize_text_field((string) wpinv_get_option('invoice_number_prefix', 'INV-'));
+    $prefix           = sanitize_text_field(apply_filters('getpaid_invoice_type_prefix', $prefix, $type));
+    $postfix          = sanitize_text_field((string) wpinv_get_option('invoice_number_postfix'));
+    $postfix          = sanitize_text_field(apply_filters('getpaid_invoice_type_postfix', $postfix, $type));
+    $formatted_number = zeroise(absint($number), $padd);
 
     // Add the prefix and post fix.
     $formatted_number = $prefix . $formatted_number . $postfix;
 
-    return apply_filters( 'wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd );
+    return apply_filters('wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd);
 }
 
 /**
@@ -723,58 +723,58 @@ 
  * @param string $type.
  * @return int|null|bool
  */
-function wpinv_get_next_invoice_number( $type = '' ) {
+function wpinv_get_next_invoice_number($type = '') {
 
     // Allow plugins to overide this.
-    $check = apply_filters( 'wpinv_get_pre_next_invoice_number', null, $type );
-    if ( null !== $check ) {
+    $check = apply_filters('wpinv_get_pre_next_invoice_number', null, $type);
+    if (null !== $check) {
         return $check;
     }
 
     // Ensure sequential invoice numbers is active.
-    if ( ! wpinv_sequential_number_active() ) {
+    if (!wpinv_sequential_number_active()) {
         return false;
     }
 
     // Retrieve the current number and the start number.
-    $number = (int) get_option( 'wpinv_last_invoice_number', 0 );
-    $start  = absint( (int) wpinv_get_option( 'invoice_sequence_start', 1 ) );
+    $number = (int) get_option('wpinv_last_invoice_number', 0);
+    $start  = absint((int) wpinv_get_option('invoice_sequence_start', 1));
 
     // Ensure that we are starting at a positive integer.
-    $start  = max( $start, 1 );
+    $start  = max($start, 1);
 
     // If this is the first invoice, use the start number.
-    $number = max( $start, $number );
+    $number = max($start, $number);
 
     // Format the invoice number.
-    $formatted_number = wpinv_format_invoice_number( $number, $type );
+    $formatted_number = wpinv_format_invoice_number($number, $type);
 
     // Ensure that this number is unique.
-    $invoice_id = WPInv_Invoice::get_invoice_id_by_field( $formatted_number, 'number' );
+    $invoice_id = WPInv_Invoice::get_invoice_id_by_field($formatted_number, 'number');
 
     // We found a match. Nice.
-    if ( empty( $invoice_id ) ) {
-        update_option( 'wpinv_last_invoice_number', $number );
-        return apply_filters( 'wpinv_get_next_invoice_number', $number );
+    if (empty($invoice_id)) {
+        update_option('wpinv_last_invoice_number', $number);
+        return apply_filters('wpinv_get_next_invoice_number', $number);
     }
 
-    update_option( 'wpinv_last_invoice_number', $number + 1 );
-    return wpinv_get_next_invoice_number( $type );
+    update_option('wpinv_last_invoice_number', $number + 1);
+    return wpinv_get_next_invoice_number($type);
 
 }
 
 /**
  * The prefix used for invoice paths.
  */
-function wpinv_post_name_prefix( $post_type = 'wpi_invoice' ) {
-    return apply_filters( 'wpinv_post_name_prefix', 'inv-', $post_type );
+function wpinv_post_name_prefix($post_type = 'wpi_invoice') {
+    return apply_filters('wpinv_post_name_prefix', 'inv-', $post_type);
 }
 
-function wpinv_generate_post_name( $post_ID ) {
-    $prefix = wpinv_post_name_prefix( get_post_type( $post_ID ) );
-    $post_name = sanitize_title( $prefix . $post_ID );
+function wpinv_generate_post_name($post_ID) {
+    $prefix = wpinv_post_name_prefix(get_post_type($post_ID));
+    $post_name = sanitize_title($prefix . $post_ID);
 
-    return apply_filters( 'wpinv_generate_post_name', $post_name, $post_ID, $prefix );
+    return apply_filters('wpinv_generate_post_name', $post_name, $post_ID, $prefix);
 }
 
 /**
@@ -782,8 +782,8 @@ 
  *
  * @param int|string|object|WPInv_Invoice|WPInv_Legacy_Invoice|WP_Post $invoice Invoice id, key, transaction id, number or object.
  */
-function wpinv_is_invoice_viewed( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_is_invoice_viewed($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return (bool) $invoice->get_is_viewed();
 }
 
@@ -792,17 +792,17 @@ 
  *
  * @param int|string|object|WPInv_Invoice|WPInv_Legacy_Invoice|WP_Post $invoice Invoice id, key, transaction id, number or object.
  */
-function getpaid_maybe_mark_invoice_as_viewed( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function getpaid_maybe_mark_invoice_as_viewed($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
 
-    if ( get_current_user_id() == $invoice->get_user_id() && ! $invoice->get_is_viewed() ) {
-        $invoice->set_is_viewed( true );
+    if (get_current_user_id() == $invoice->get_user_id() && !$invoice->get_is_viewed()) {
+        $invoice->set_is_viewed(true);
         $invoice->save();
     }
 
 }
-add_action( 'wpinv_invoice_print_before_display', 'getpaid_maybe_mark_invoice_as_viewed' );
-add_action( 'wpinv_before_receipt', 'getpaid_maybe_mark_invoice_as_viewed' );
+add_action('wpinv_invoice_print_before_display', 'getpaid_maybe_mark_invoice_as_viewed');
+add_action('wpinv_before_receipt', 'getpaid_maybe_mark_invoice_as_viewed');
 
 /**
  * Processes an invoice refund.
@@ -811,26 +811,26 @@ 
  * @param array $status_transition
  * @todo: descrease customer/store earnings
  */
-function getpaid_maybe_process_refund( $invoice, $status_transition ) {
+function getpaid_maybe_process_refund($invoice, $status_transition) {
 
-    if ( empty( $status_transition['from'] ) || ! in_array( $status_transition['from'], array( 'publish', 'wpi-processing', 'wpi-renewal' ) ) ) {
+    if (empty($status_transition['from']) || !in_array($status_transition['from'], array('publish', 'wpi-processing', 'wpi-renewal'))) {
         return;
     }
 
     $discount_code = $invoice->get_discount_code();
-    if ( ! empty( $discount_code ) ) {
-        $discount = wpinv_get_discount_obj( $discount_code );
+    if (!empty($discount_code)) {
+        $discount = wpinv_get_discount_obj($discount_code);
 
-        if ( $discount->exists() ) {
+        if ($discount->exists()) {
             $discount->increase_usage( -1 );
         }
 }
 
-    do_action( 'wpinv_pre_refund_invoice', $invoice, $invoice->get_id() );
-    do_action( 'wpinv_refund_invoice', $invoice, $invoice->get_id() );
-    do_action( 'wpinv_post_refund_invoice', $invoice, $invoice->get_id() );
+    do_action('wpinv_pre_refund_invoice', $invoice, $invoice->get_id());
+    do_action('wpinv_refund_invoice', $invoice, $invoice->get_id());
+    do_action('wpinv_post_refund_invoice', $invoice, $invoice->get_id());
 }
-add_action( 'getpaid_invoice_status_wpi-refunded', 'getpaid_maybe_process_refund', 10, 2 );
+add_action('getpaid_invoice_status_wpi-refunded', 'getpaid_maybe_process_refund', 10, 2);
 
 
 /**
@@ -838,47 +838,47 @@ 
  *
  * @param int $invoice_id
  */
-function getpaid_process_invoice_payment( $invoice_id ) {
+function getpaid_process_invoice_payment($invoice_id) {
 
     // Fetch the invoice.
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // We only want to do this once.
-    if ( 1 == get_post_meta( $invoice->get_id(), 'wpinv_processed_payment', true ) ) {
+    if (1 == get_post_meta($invoice->get_id(), 'wpinv_processed_payment', true)) {
         return;
     }
 
-    update_post_meta( $invoice->get_id(), 'wpinv_processed_payment', 1 );
+    update_post_meta($invoice->get_id(), 'wpinv_processed_payment', 1);
 
     // Fires when processing a payment.
-    do_action( 'getpaid_process_payment', $invoice );
+    do_action('getpaid_process_payment', $invoice);
 
     // Fire an action for each invoice item.
-    foreach ( $invoice->get_items() as $item ) {
-        do_action( 'getpaid_process_item_payment', $item, $invoice );
+    foreach ($invoice->get_items() as $item) {
+        do_action('getpaid_process_item_payment', $item, $invoice);
     }
 
     // Increase discount usage.
     $discount_code = $invoice->get_discount_code();
-    if ( ! empty( $discount_code ) && ! $invoice->is_renewal() ) {
-        $discount = wpinv_get_discount_obj( $discount_code );
+    if (!empty($discount_code) && !$invoice->is_renewal()) {
+        $discount = wpinv_get_discount_obj($discount_code);
 
-        if ( $discount->exists() ) {
+        if ($discount->exists()) {
             $discount->increase_usage();
         }
 }
 
     // Record reverse vat.
-    if ( 'invoice' === $invoice->get_type() && wpinv_use_taxes() && ! $invoice->get_disable_taxes() ) {
+    if ('invoice' === $invoice->get_type() && wpinv_use_taxes() && !$invoice->get_disable_taxes()) {
 
         $taxes = $invoice->get_total_tax();
-        if ( empty( $taxes ) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction( $invoice->get_country() ) ) {
-            $invoice->add_note( __( 'VAT was reverse charged', 'invoicing' ), false, false, true );
+        if (empty($taxes) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction($invoice->get_country())) {
+            $invoice->add_note(__('VAT was reverse charged', 'invoicing'), false, false, true);
         }
 }
 
 }
-add_action( 'getpaid_invoice_payment_status_changed', 'getpaid_process_invoice_payment' );
+add_action('getpaid_invoice_payment_status_changed', 'getpaid_process_invoice_payment');
 
 /**
  * Returns an array of invoice item columns
@@ -886,13 +886,13 @@ 
  * @param int|WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_invoice_item_columns( $invoice ) {
+function getpaid_invoice_item_columns($invoice) {
 
     // Prepare the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if there is no invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return array();
     }
 
@@ -900,52 +900,52 @@ 
     $columns = apply_filters(
         'getpaid_invoice_item_columns',
         array(
-            'name'     => __( 'Item', 'invoicing' ),
-            'price'    => __( 'Price', 'invoicing' ),
-            'tax_rate' => __( 'Tax Rate', 'invoicing' ),
-            'quantity' => __( 'Quantity', 'invoicing' ),
-            'subtotal' => __( 'Item Subtotal', 'invoicing' ),
+            'name'     => __('Item', 'invoicing'),
+            'price'    => __('Price', 'invoicing'),
+            'tax_rate' => __('Tax Rate', 'invoicing'),
+            'quantity' => __('Quantity', 'invoicing'),
+            'subtotal' => __('Item Subtotal', 'invoicing'),
         ),
         $invoice
     );
 
     // Quantities.
-    if ( isset( $columns['quantity'] ) ) {
+    if (isset($columns['quantity'])) {
 
-        if ( 'hours' == $invoice->get_template() ) {
-            $columns['quantity'] = __( 'Hours', 'invoicing' );
+        if ('hours' == $invoice->get_template()) {
+            $columns['quantity'] = __('Hours', 'invoicing');
         }
 
-        if ( ! wpinv_item_quantities_enabled() || 'amount' == $invoice->get_template() ) {
-            unset( $columns['quantity'] );
+        if (!wpinv_item_quantities_enabled() || 'amount' == $invoice->get_template()) {
+            unset($columns['quantity']);
         }
     }
 
     // Price.
-    if ( isset( $columns['price'] ) ) {
+    if (isset($columns['price'])) {
 
-        if ( 'amount' == $invoice->get_template() ) {
-            $columns['price'] = __( 'Amount', 'invoicing' );
+        if ('amount' == $invoice->get_template()) {
+            $columns['price'] = __('Amount', 'invoicing');
         }
 
-        if ( 'hours' == $invoice->get_template() ) {
-            $columns['price'] = __( 'Rate', 'invoicing' );
+        if ('hours' == $invoice->get_template()) {
+            $columns['price'] = __('Rate', 'invoicing');
         }
 }
 
     // Sub total.
-    if ( isset( $columns['subtotal'] ) ) {
+    if (isset($columns['subtotal'])) {
 
-        if ( 'amount' == $invoice->get_template() ) {
-            unset( $columns['subtotal'] );
+        if ('amount' == $invoice->get_template()) {
+            unset($columns['subtotal']);
         }
 }
 
     // Tax rates.
-    if ( isset( $columns['tax_rate'] ) ) {
+    if (isset($columns['tax_rate'])) {
 
-        if ( 0 == $invoice->get_total_tax() ) {
-            unset( $columns['tax_rate'] );
+        if (0 == $invoice->get_total_tax()) {
+            unset($columns['tax_rate']);
         }
     }
 
@@ -958,53 +958,53 @@ 
  * @param int|WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_invoice_totals_rows( $invoice ) {
+function getpaid_invoice_totals_rows($invoice) {
 
     // Prepare the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if there is no invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return array();
     }
 
     $totals = apply_filters(
         'getpaid_invoice_totals_rows',
         array(
-            'subtotal' => __( 'Subtotal', 'invoicing' ),
-            'shipping' => __( 'Shipping', 'invoicing' ),
-            'tax'      => __( 'Tax', 'invoicing' ),
-            'fee'      => __( 'Fee', 'invoicing' ),
-            'discount' => __( 'Discount', 'invoicing' ),
-            'total'    => __( 'Total', 'invoicing' ),
+            'subtotal' => __('Subtotal', 'invoicing'),
+            'shipping' => __('Shipping', 'invoicing'),
+            'tax'      => __('Tax', 'invoicing'),
+            'fee'      => __('Fee', 'invoicing'),
+            'discount' => __('Discount', 'invoicing'),
+            'total'    => __('Total', 'invoicing'),
         ),
         $invoice
     );
 
-    if ( ! $invoice->has_shipping() ) {
-        unset( $totals['shipping'] );
+    if (!$invoice->has_shipping()) {
+        unset($totals['shipping']);
     }
 
-    if ( ( $invoice->get_disable_taxes() || ! wpinv_use_taxes() ) && isset( $totals['tax'] ) ) {
-        unset( $totals['tax'] );
+    if (($invoice->get_disable_taxes() || !wpinv_use_taxes()) && isset($totals['tax'])) {
+        unset($totals['tax']);
     }
 
     // If we have taxes, display individual taxes.
-    if ( isset( $totals['tax'] ) && wpinv_display_individual_tax_rates() ) {
+    if (isset($totals['tax']) && wpinv_display_individual_tax_rates()) {
 
         $new_totals = array();
-        foreach ( $totals as $key => $label ) {
+        foreach ($totals as $key => $label) {
 
-            if ( 'tax' !== $key ) {
-                $new_totals[ $key ] = $label;
+            if ('tax' !== $key) {
+                $new_totals[$key] = $label;
                 continue;
             }
 
-            $taxes = array_keys( $invoice->get_taxes() );
-            if ( ! empty( $taxes ) ) {
+            $taxes = array_keys($invoice->get_taxes());
+            if (!empty($taxes)) {
 
-                foreach ( $taxes as $tax ) {
-                    $new_totals[ 'tax__' . $tax ] = $tax;
+                foreach ($taxes as $tax) {
+                    $new_totals['tax__' . $tax] = $tax;
                 }
             }
         }
@@ -1012,12 +1012,12 @@ 
         $totals = $new_totals;
     }
 
-    if ( 0 == $invoice->get_total_fees() && isset( $totals['fee'] ) ) {
-        unset( $totals['fee'] );
+    if (0 == $invoice->get_total_fees() && isset($totals['fee'])) {
+        unset($totals['fee']);
     }
 
-    if ( 0 == $invoice->get_total_discount() && isset( $totals['discount'] ) ) {
-        unset( $totals['discount'] );
+    if (0 == $invoice->get_total_discount() && isset($totals['discount'])) {
+        unset($totals['discount']);
     }
 
     return $totals;
@@ -1028,47 +1028,47 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_new_invoice( $invoice ) {
+function getpaid_new_invoice($invoice) {
 
-    if ( ! $invoice->get_status() ) {
+    if (!$invoice->get_status()) {
         return;
     }
 
     // Add an invoice created note.
     $invoice->add_note(
         sprintf(
-            __( '%1$s created with the status "%2$s".', 'invoicing' ),
-            ucfirst( $invoice->get_invoice_quote_type() ),
-            wpinv_status_nicename( $invoice->get_status(), $invoice )
+            __('%1$s created with the status "%2$s".', 'invoicing'),
+            ucfirst($invoice->get_invoice_quote_type()),
+            wpinv_status_nicename($invoice->get_status(), $invoice)
         )
     );
 
 }
-add_action( 'getpaid_new_invoice', 'getpaid_new_invoice' );
+add_action('getpaid_new_invoice', 'getpaid_new_invoice');
 
 /**
  * This function updates invoice caches.
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_update_invoice_caches( $invoice ) {
+function getpaid_update_invoice_caches($invoice) {
 
     // Cache invoice number.
-    wp_cache_set( $invoice->get_number(), $invoice->get_id(), 'getpaid_invoice_numbers_to_invoice_ids' );
+    wp_cache_set($invoice->get_number(), $invoice->get_id(), 'getpaid_invoice_numbers_to_invoice_ids');
 
     // Cache invoice key.
-    wp_cache_set( $invoice->get_key(), $invoice->get_id(), 'getpaid_invoice_keys_to_invoice_ids' );
+    wp_cache_set($invoice->get_key(), $invoice->get_id(), 'getpaid_invoice_keys_to_invoice_ids');
 
     // (Maybe) cache transaction id.
     $transaction_id = $invoice->get_transaction_id();
 
-    if ( ! empty( $transaction_id ) ) {
-        wp_cache_set( $transaction_id, $invoice->get_id(), 'getpaid_invoice_transaction_ids_to_invoice_ids' );
+    if (!empty($transaction_id)) {
+        wp_cache_set($transaction_id, $invoice->get_id(), 'getpaid_invoice_transaction_ids_to_invoice_ids');
     }
 
 }
-add_action( 'getpaid_new_invoice', 'getpaid_update_invoice_caches', 5 );
-add_action( 'getpaid_update_invoice', 'getpaid_update_invoice_caches', 5 );
+add_action('getpaid_new_invoice', 'getpaid_update_invoice_caches', 5);
+add_action('getpaid_update_invoice', 'getpaid_update_invoice_caches', 5);
 
 /**
  * Duplicates an invoice.
@@ -1078,7 +1078,7 @@ 
  * @param  WPInv_Invoice $old_invoice The invoice to duplicate
  * @return WPInv_Invoice The new invoice.
  */
-function getpaid_duplicate_invoice( $old_invoice ) {
+function getpaid_duplicate_invoice($old_invoice) {
 
     // Create the new invoice.
     $invoice = new WPInv_Invoice();
@@ -1138,136 +1138,136 @@ 
  * @param WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_get_invoice_meta( $invoice ) {
+function getpaid_get_invoice_meta($invoice) {
 
     // Load the invoice meta.
     $meta = array(
 
         'number'         => array(
             'label' => sprintf(
-                __( '%s Number', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('%s Number', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
-            'value' => sanitize_text_field( $invoice->get_number() ),
+            'value' => sanitize_text_field($invoice->get_number()),
         ),
 
         'status'         => array(
             'label' => sprintf(
-                __( '%s Status', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('%s Status', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
             'value' => $invoice->get_status_label_html(),
         ),
 
         'date'           => array(
             'label' => sprintf(
-                __( '%s Date', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('%s Date', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
-            'value' => getpaid_format_date( $invoice->get_created_date() ),
+            'value' => getpaid_format_date($invoice->get_created_date()),
         ),
 
         'date_paid'      => array(
-            'label' => __( 'Paid On', 'invoicing' ),
-            'value' => getpaid_format_date( $invoice->get_completed_date() ),
+            'label' => __('Paid On', 'invoicing'),
+            'value' => getpaid_format_date($invoice->get_completed_date()),
         ),
 
         'gateway'        => array(
-            'label' => __( 'Payment Method', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_gateway_title() ),
+            'label' => __('Payment Method', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_gateway_title()),
         ),
 
         'transaction_id' => array(
-            'label' => __( 'Transaction ID', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_transaction_id() ),
+            'label' => __('Transaction ID', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_transaction_id()),
         ),
 
         'due_date'       => array(
-            'label' => __( 'Due Date', 'invoicing' ),
-            'value' => getpaid_format_date( $invoice->get_due_date() ),
+            'label' => __('Due Date', 'invoicing'),
+            'value' => getpaid_format_date($invoice->get_due_date()),
         ),
 
         'vat_number'     => array(
-            'label' => __( 'VAT Number', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_vat_number() ),
+            'label' => __('VAT Number', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_vat_number()),
         ),
 
     );
 
-    $additional_meta = get_post_meta( $invoice->get_id(), 'additional_meta_data', true );
+    $additional_meta = get_post_meta($invoice->get_id(), 'additional_meta_data', true);
 
-    if ( ! empty( $additional_meta ) ) {
+    if (!empty($additional_meta)) {
 
-        foreach ( $additional_meta as $label => $value ) {
-            $meta[ sanitize_key( $label ) ] = array(
-                'label' => esc_html( $label ),
-                'value' => esc_html( $value ),
+        foreach ($additional_meta as $label => $value) {
+            $meta[sanitize_key($label)] = array(
+                'label' => esc_html($label),
+                'value' => esc_html($value),
             );
         }
 }
     // If it is not paid, remove the date of payment.
-    if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-        unset( $meta['date_paid'] );
-        unset( $meta['transaction_id'] );
+    if (!$invoice->is_paid() && !$invoice->is_refunded()) {
+        unset($meta['date_paid']);
+        unset($meta['transaction_id']);
     }
 
-    if ( ! $invoice->is_paid() || 'none' == $invoice->get_gateway() ) {
-        unset( $meta['gateway'] );
+    if (!$invoice->is_paid() || 'none' == $invoice->get_gateway()) {
+        unset($meta['gateway']);
     }
 
     // Only display the due date if due dates are enabled.
-    if ( ! $invoice->needs_payment() || ! wpinv_get_option( 'overdue_active' ) ) {
-        unset( $meta['due_date'] );
+    if (!$invoice->needs_payment() || !wpinv_get_option('overdue_active')) {
+        unset($meta['due_date']);
     }
 
     // Only display the vat number if taxes are enabled.
-    if ( ! wpinv_use_taxes() ) {
-        unset( $meta['vat_number'] );
+    if (!wpinv_use_taxes()) {
+        unset($meta['vat_number']);
     }
 
     // Link to the parent invoice.
-    if ( $invoice->get_parent_id() > 0 ) {
+    if ($invoice->get_parent_id() > 0) {
 
         $meta['parent'] = array(
 
             'label' => sprintf(
-                __( 'Parent %s', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('Parent %s', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
 
-            'value' => wpinv_invoice_link( $invoice->get_parent_id() ),
+            'value' => wpinv_invoice_link($invoice->get_parent_id()),
 
         );
 
     }
 
-    if ( $invoice->is_recurring() ) {
+    if ($invoice->is_recurring()) {
 
-        $subscription = getpaid_get_invoice_subscriptions( $invoice );
-        if ( ! empty( $subscription ) && ! is_array( $subscription ) && $subscription->exists() ) {
+        $subscription = getpaid_get_invoice_subscriptions($invoice);
+        if (!empty($subscription) && !is_array($subscription) && $subscription->exists()) {
 
             // Display the renewal date.
-            if ( $subscription->is_active() && 'cancelled' != $subscription->get_status() ) {
+            if ($subscription->is_active() && 'cancelled' != $subscription->get_status()) {
 
                 $meta['renewal_date'] = array(
-                    'label' => __( 'Renews On', 'invoicing' ),
-                    'value' => getpaid_format_date( $subscription->get_expiration() ) .
+                    'label' => __('Renews On', 'invoicing'),
+                    'value' => getpaid_format_date($subscription->get_expiration()) .
                     sprintf(
                         ' <a class="small" href="%s">%s<a>',
                         $subscription->get_view_url(),
-                        __( '(View Subscription)', 'invoicing' )
+                        __('(View Subscription)', 'invoicing')
                     ),
                 );
 
             }
 
-            if ( $invoice->is_parent() ) {
+            if ($invoice->is_parent()) {
 
                 // Display the recurring amount.
                 $meta['recurring_total'] = array(
 
-                    'label' => __( 'Recurring Amount', 'invoicing' ),
-                    'value' => wpinv_price( $subscription->get_recurring_amount(), $invoice->get_currency() ),
+                    'label' => __('Recurring Amount', 'invoicing'),
+                    'value' => wpinv_price($subscription->get_recurring_amount(), $invoice->get_currency()),
 
                 );
 
@@ -1278,13 +1278,13 @@ 
     // Add the invoice total to the meta.
     $meta['invoice_total'] = array(
 
-        'label' => __( 'Total Amount', 'invoicing' ),
-        'value' => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
+        'label' => __('Total Amount', 'invoicing'),
+        'value' => wpinv_price($invoice->get_total(), $invoice->get_currency()),
 
     );
 
     // Provide a way for third party plugins to filter the meta.
-    $meta = apply_filters( 'getpaid_invoice_meta_data', $meta, $invoice );
+    $meta = apply_filters('getpaid_invoice_meta_data', $meta, $invoice);
 
     return $meta;
 
@@ -1323,12 +1323,12 @@ 
  * @param GetPaid_Form_Item $item
  * @return float
  */
-function getpaid_get_invoice_tax_rate( $invoice, $item ) {
+function getpaid_get_invoice_tax_rate($invoice, $item) {
 
-    $rates   = getpaid_get_item_tax_rates( $item, $invoice->get_country(), $invoice->get_state() );
-	$rates   = getpaid_filter_item_tax_rates( $item, $rates );
-    $rates   = wp_list_pluck( $rates, 'rate' );
+    $rates   = getpaid_get_item_tax_rates($item, $invoice->get_country(), $invoice->get_state());
+	$rates = getpaid_filter_item_tax_rates($item, $rates);
+    $rates   = wp_list_pluck($rates, 'rate');
 
-    return array_sum( $rates );
+    return array_sum($rates);
 
 }

Indentation +37 added lines, -37 removed lines

@@ -67,7 +67,7 @@ 
  * Checks if the current user cna view an invoice receipt.
  */
 function wpinv_can_view_receipt( $invoice ) {
-	return (bool) apply_filters( 'wpinv_can_view_receipt', wpinv_user_can_view_invoice( $invoice ), $invoice );
+    return (bool) apply_filters( 'wpinv_can_view_receipt', wpinv_user_can_view_invoice( $invoice ), $invoice );
 }
 
 /**
@@ -556,37 +556,37 @@ 
     $label   = empty( $label ) ? __( 'Invoice', 'invoicing' ) : sanitize_text_field( $label );
     $columns = array(
 
-		'invoice-number'  => array(
-			'title' => $label,
-			'class' => 'text-left',
-		),
+        'invoice-number'  => array(
+            'title' => $label,
+            'class' => 'text-left',
+        ),
 
-		'created-date'    => array(
-			'title' => __( 'Created Date', 'invoicing' ),
-			'class' => 'text-left',
-		),
+        'created-date'    => array(
+            'title' => __( 'Created Date', 'invoicing' ),
+            'class' => 'text-left',
+        ),
 
-		'payment-date'    => array(
-			'title' => __( 'Payment Date', 'invoicing' ),
-			'class' => 'text-left',
-		),
+        'payment-date'    => array(
+            'title' => __( 'Payment Date', 'invoicing' ),
+            'class' => 'text-left',
+        ),
 
-		'invoice-status'  => array(
-			'title' => __( 'Status', 'invoicing' ),
-			'class' => 'text-center',
-		),
+        'invoice-status'  => array(
+            'title' => __( 'Status', 'invoicing' ),
+            'class' => 'text-center',
+        ),
 
-		'invoice-total'   => array(
-			'title' => __( 'Total', 'invoicing' ),
-			'class' => 'text-right',
-		),
+        'invoice-total'   => array(
+            'title' => __( 'Total', 'invoicing' ),
+            'class' => 'text-right',
+        ),
 
-		'invoice-actions' => array(
-			'title' => ' ',
-			'class' => 'text-center',
-		),
+        'invoice-actions' => array(
+            'title' => ' ',
+            'class' => 'text-center',
+        ),
 
-	);
+    );
 
     return apply_filters( 'wpinv_user_invoices_columns', $columns, $post_type );
 }
@@ -1297,22 +1297,22 @@ 
  */
 function getpaid_get_invoice_status_classes() {
 
-	return apply_filters(
-		'getpaid_get_invoice_status_classes',
-		array(
+    return apply_filters(
+        'getpaid_get_invoice_status_classes',
+        array(
             'wpi-quote-declined' => 'bg-danger',
             'wpi-failed'         => 'bg-danger',
-			'wpi-processing'     => 'bg-info',
-			'wpi-onhold'         => 'bg-warning text-dark',
-			'wpi-quote-accepted' => 'bg-success',
-			'publish'            => 'bg-success',
-			'wpi-renewal'        => 'bg-primary',
+            'wpi-processing'     => 'bg-info',
+            'wpi-onhold'         => 'bg-warning text-dark',
+            'wpi-quote-accepted' => 'bg-success',
+            'publish'            => 'bg-success',
+            'wpi-renewal'        => 'bg-primary',
             'wpi-cancelled'      => 'bg-secondary',
             'wpi-pending'        => 'bg-dark text-white',
             'wpi-quote-pending'  => 'bg-dark text-white',
             'wpi-refunded'       => 'bg-secondary',
-		)
-	);
+        )
+    );
 
 }
 
@@ -1326,7 +1326,7 @@ 
 function getpaid_get_invoice_tax_rate( $invoice, $item ) {
 
     $rates   = getpaid_get_item_tax_rates( $item, $invoice->get_country(), $invoice->get_state() );
-	$rates   = getpaid_filter_item_tax_rates( $item, $rates );
+    $rates   = getpaid_filter_item_tax_rates( $item, $rates );
     $rates   = wp_list_pluck( $rates, 'rate' );
 
     return array_sum( $rates );

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);
 	}
 }