AyeCode / invoicing

includes/class-wpinv-session-handler.php

Indentation +274 added lines, -274 removed lines

@@ -12,125 +12,125 @@ 
  */
 class WPInv_Session_Handler extends WPInv_Session {
 
-	/**
-	 * Cookie name used for the session.
-	 *
-	 * @var string cookie name
-	 */
-	protected $_cookie;
-
-	/**
-	 * Stores session expiry.
-	 *
-	 * @var int session due to expire timestamp
-	 */
-	protected $_session_expiring;
-
-	/**
-	 * Stores session due to expire timestamp.
-	 *
-	 * @var string session expiration timestamp
-	 */
-	protected $_session_expiration;
-
-	/**
-	 * True when the cookie exists.
-	 *
-	 * @var bool Based on whether a cookie exists.
-	 */
-	protected $_has_cookie = false;
-
-	/**
-	 * Table name for session data.
-	 *
-	 * @var string Custom session table name
-	 */
-	protected $_table;
-
-	/**
-	 * Constructor for the session class.
-	 */
-	public function __construct() {
-
-	    $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
+    /**
+     * Cookie name used for the session.
+     *
+     * @var string cookie name
+     */
+    protected $_cookie;
+
+    /**
+     * Stores session expiry.
+     *
+     * @var int session due to expire timestamp
+     */
+    protected $_session_expiring;
+
+    /**
+     * Stores session due to expire timestamp.
+     *
+     * @var string session expiration timestamp
+     */
+    protected $_session_expiration;
+
+    /**
+     * True when the cookie exists.
+     *
+     * @var bool Based on whether a cookie exists.
+     */
+    protected $_has_cookie = false;
+
+    /**
+     * Table name for session data.
+     *
+     * @var string Custom session table name
+     */
+    protected $_table;
+
+    /**
+     * Constructor for the session class.
+     */
+    public function __construct() {
+
+        $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
         add_action( 'init', array( $this, 'init' ), -1 );
-		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
-		add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
-		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
-
-	}
-
-	/**
-	 * Init hooks and session data.
-	 *
-	 * @since 3.3.0
-	 */
-	public function init() {
-		$this->init_session_cookie();
-
-		if ( ! is_user_logged_in() ) {
-			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ), 10, 2 );
-		}
-	}
-
-	/**
-	 * Setup cookie and customer ID.
-	 *
-	 * @since 3.6.0
-	 */
-	public function init_session_cookie() {
-		$cookie = $this->get_session_cookie();
-
-		if ( $cookie ) {
-			$this->_customer_id        = $cookie[0];
-			$this->_session_expiration = $cookie[1];
-			$this->_session_expiring   = $cookie[2];
-			$this->_has_cookie         = true;
-			$this->_data               = $this->get_session_data();
-
-			// If the user logs in, update session.
-			if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
-				$this->_customer_id = get_current_user_id();
-				$this->_dirty       = true;
-				$this->save_data();
-				$this->set_customer_session_cookie( true );
-			}
-
-			// Update session if its close to expiring.
-			if ( time() > $this->_session_expiring ) {
-				$this->set_session_expiration();
-				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
-			}
-		} else {
-			$this->set_session_expiration();
-			$this->_customer_id = $this->generate_customer_id();
-			$this->_data        = $this->get_session_data();
-		}
-	}
-
-	/**
-	 * Sets the session cookie on-demand (usually after adding an item to the cart).
-	 *
-	 * Since the cookie name (as of 2.1) is prepended with wp, cache systems like batcache will not cache pages when set.
-	 *
-	 * Warning: Cookies will only be set if this is called before the headers are sent.
-	 *
-	 * @param bool $set Should the session cookie be set.
-	 */
-	public function set_customer_session_cookie( $set ) {
-		if ( $set ) {
-			$to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
-			$cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
-			$cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
-			$this->_has_cookie = true;
-
-			if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
-				$this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
-			}
-		}
-	}
-
-	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
+        add_action( 'wp_logout', array( $this, 'destroy_session' ) );
+        add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
+        add_action( 'shutdown', array( $this, 'save_data' ), 20 );
+
+    }
+
+    /**
+     * Init hooks and session data.
+     *
+     * @since 3.3.0
+     */
+    public function init() {
+        $this->init_session_cookie();
+
+        if ( ! is_user_logged_in() ) {
+            add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ), 10, 2 );
+        }
+    }
+
+    /**
+     * Setup cookie and customer ID.
+     *
+     * @since 3.6.0
+     */
+    public function init_session_cookie() {
+        $cookie = $this->get_session_cookie();
+
+        if ( $cookie ) {
+            $this->_customer_id        = $cookie[0];
+            $this->_session_expiration = $cookie[1];
+            $this->_session_expiring   = $cookie[2];
+            $this->_has_cookie         = true;
+            $this->_data               = $this->get_session_data();
+
+            // If the user logs in, update session.
+            if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
+                $this->_customer_id = get_current_user_id();
+                $this->_dirty       = true;
+                $this->save_data();
+                $this->set_customer_session_cookie( true );
+            }
+
+            // Update session if its close to expiring.
+            if ( time() > $this->_session_expiring ) {
+                $this->set_session_expiration();
+                $this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
+            }
+        } else {
+            $this->set_session_expiration();
+            $this->_customer_id = $this->generate_customer_id();
+            $this->_data        = $this->get_session_data();
+        }
+    }
+
+    /**
+     * Sets the session cookie on-demand (usually after adding an item to the cart).
+     *
+     * Since the cookie name (as of 2.1) is prepended with wp, cache systems like batcache will not cache pages when set.
+     *
+     * Warning: Cookies will only be set if this is called before the headers are sent.
+     *
+     * @param bool $set Should the session cookie be set.
+     */
+    public function set_customer_session_cookie( $set ) {
+        if ( $set ) {
+            $to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
+            $cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+            $cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
+            $this->_has_cookie = true;
+
+            if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
+                $this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
+            }
+        }
+    }
+
+    public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
         if ( ! headers_sent() ) {
             setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
         } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
@@ -139,86 +139,86 @@ 
         }
     }
 
-	/**
-	 * Should the session cookie be secure?
-	 *
-	 * @since 3.6.0
-	 * @return bool
-	 */
-	protected function use_secure_cookie() {
+    /**
+     * Should the session cookie be secure?
+     *
+     * @since 3.6.0
+     * @return bool
+     */
+    protected function use_secure_cookie() {
         $is_https = false !== strstr( get_option( 'home' ), 'https:' );
-		return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
-	}
-
-	/**
-	 * Return true if the current user has an active session, i.e. a cookie to retrieve values.
-	 *
-	 * @return bool
-	 */
-	public function has_session() {
-		return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
-	}
-
-	/**
-	 * Set session expiration.
-	 */
-	public function set_session_expiration() {
-		$this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
-		$this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
-	}
-
-	/**
-	 * Generates session ids.
-	 *
-	 * @return string
-	 */
-	public function generate_customer_id() {
-		require_once ABSPATH . 'wp-includes/class-phpass.php';
-		$hasher      = new PasswordHash( 8, false );
-		return md5( $hasher->get_random_bytes( 32 ) );
-	}
-
-	/**
-	 * Get the session cookie, if set. Otherwise return false.
-	 *
-	 * Session cookies without a customer ID are invalid.
-	 *
-	 * @return bool|array
-	 */
-	public function get_session_cookie() {
-		$cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
-
-		if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
-			return false;
-		}
-
-		list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
-
-		if ( empty( $customer_id ) ) {
-			return false;
-		}
-
-		// Validate hash.
-		$to_hash = $customer_id . '|' . $session_expiration;
-		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
-
-		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
-			return false;
-		}
-
-		return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
-	}
-
-	/**
-	 * Get session data.
-	 *
-	 * @return array
-	 */
-	public function get_session_data() {
-		return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
-	}
-
-	public function generate_key($customer_id){
+        return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
+    }
+
+    /**
+     * Return true if the current user has an active session, i.e. a cookie to retrieve values.
+     *
+     * @return bool
+     */
+    public function has_session() {
+        return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
+    }
+
+    /**
+     * Set session expiration.
+     */
+    public function set_session_expiration() {
+        $this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
+        $this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
+    }
+
+    /**
+     * Generates session ids.
+     *
+     * @return string
+     */
+    public function generate_customer_id() {
+        require_once ABSPATH . 'wp-includes/class-phpass.php';
+        $hasher      = new PasswordHash( 8, false );
+        return md5( $hasher->get_random_bytes( 32 ) );
+    }
+
+    /**
+     * Get the session cookie, if set. Otherwise return false.
+     *
+     * Session cookies without a customer ID are invalid.
+     *
+     * @return bool|array
+     */
+    public function get_session_cookie() {
+        $cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
+
+        if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
+            return false;
+        }
+
+        list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
+
+        if ( empty( $customer_id ) ) {
+            return false;
+        }
+
+        // Validate hash.
+        $to_hash = $customer_id . '|' . $session_expiration;
+        $hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+
+        if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
+            return false;
+        }
+
+        return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
+    }
+
+    /**
+     * Get session data.
+     *
+     * @return array
+     */
+    public function get_session_data() {
+        return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
+    }
+
+    public function generate_key($customer_id){
         if(!$customer_id){
             return;
         }
@@ -226,68 +226,68 @@ 
         return 'wpi_trans_'.$customer_id;
     }
 
-	/**
-	 * Save data.
-	 */
-	public function save_data() {
-		// Dirty if something changed - prevents saving nothing new.
-		if ( $this->_dirty && $this->has_session() ) {
+    /**
+     * Save data.
+     */
+    public function save_data() {
+        // Dirty if something changed - prevents saving nothing new.
+        if ( $this->_dirty && $this->has_session() ) {
 
             set_transient( $this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
 
-			$this->_dirty = false;
-		}
-	}
-
-	/**
-	 * Destroy all session data.
-	 */
-	public function destroy_session() {
-		$this->delete_session( $this->_customer_id );
-		$this->forget_session();
-	}
-
-	/**
-	 * Forget all session data without destroying it.
-	 */
-	public function forget_session() {
-		$this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
-
-		wpinv_empty_cart();
-
-		$this->_data        = array();
-		$this->_dirty       = false;
-		$this->_customer_id = $this->generate_customer_id();
-	}
-
-	/**
-	 * When a user is logged out, ensure they have a unique nonce by using the customer/session ID.
-	 *
-	 * @param int $uid User ID.
-	 * @return string
-	 */
-	public function nonce_user_logged_out( $uid ) {
-
-		// Check if one of our nonces.
-		if ( substr( $uid, 0, 5 ) === 'wpinv' || substr( $uid, 0, 7 ) === 'getpaid' ) {
-			return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
-		}
-
-		return $uid;
-	}
-
-	/**
-	 * Returns the session.
-	 *
-	 * @param string $customer_id Customer ID.
-	 * @param mixed  $default Default session value.
-	 * @return string|array
-	 */
-	public function get_session( $customer_id, $default = false ) {
-
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
-			return array();
-		}
+            $this->_dirty = false;
+        }
+    }
+
+    /**
+     * Destroy all session data.
+     */
+    public function destroy_session() {
+        $this->delete_session( $this->_customer_id );
+        $this->forget_session();
+    }
+
+    /**
+     * Forget all session data without destroying it.
+     */
+    public function forget_session() {
+        $this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
+
+        wpinv_empty_cart();
+
+        $this->_data        = array();
+        $this->_dirty       = false;
+        $this->_customer_id = $this->generate_customer_id();
+    }
+
+    /**
+     * When a user is logged out, ensure they have a unique nonce by using the customer/session ID.
+     *
+     * @param int $uid User ID.
+     * @return string
+     */
+    public function nonce_user_logged_out( $uid ) {
+
+        // Check if one of our nonces.
+        if ( substr( $uid, 0, 5 ) === 'wpinv' || substr( $uid, 0, 7 ) === 'getpaid' ) {
+            return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
+        }
+
+        return $uid;
+    }
+
+    /**
+     * Returns the session.
+     *
+     * @param string $customer_id Customer ID.
+     * @param mixed  $default Default session value.
+     * @return string|array
+     */
+    public function get_session( $customer_id, $default = false ) {
+
+        if ( defined( 'WP_SETUP_CONFIG' ) ) {
+            return array();
+        }
 
         $key = $this->generate_key($customer_id);
         $value = get_transient($key);
@@ -296,30 +296,30 @@ 
             $value = $default;
         }
 
-		return maybe_unserialize( $value );
-	}
+        return maybe_unserialize( $value );
+    }
 
-	/**
-	 * Delete the session from the cache and database.
-	 *
-	 * @param int $customer_id Customer ID.
-	 */
-	public function delete_session( $customer_id ) {
+    /**
+     * Delete the session from the cache and database.
+     *
+     * @param int $customer_id Customer ID.
+     */
+    public function delete_session( $customer_id ) {
 
         $key = $this->generate_key($customer_id);
 
-		delete_transient($key);
-	}
+        delete_transient($key);
+    }
 
-	/**
-	 * Update the session expiry timestamp.
-	 *
-	 * @param string $customer_id Customer ID.
-	 * @param int    $timestamp Timestamp to expire the cookie.
-	 */
-	public function update_session_timestamp( $customer_id, $timestamp ) {
+    /**
+     * Update the session expiry timestamp.
+     *
+     * @param string $customer_id Customer ID.
+     * @param int    $timestamp Timestamp to expire the cookie.
+     */
+    public function update_session_timestamp( $customer_id, $timestamp ) {
 
         set_transient( $this->generate_key($customer_id), maybe_serialize( $this->_data ), $timestamp);
 
-	}
+    }
 }

Spacing +55 added lines, -55 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Session handler class.
@@ -52,11 +52,11 @@ 
 	 */
 	public function __construct() {
 
-	    $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
-        add_action( 'init', array( $this, 'init' ), -1 );
-		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
-		add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
-		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
+	    $this->_cookie = apply_filters('wpinv_cookie', 'wpinv_session_' . COOKIEHASH);
+        add_action('init', array($this, 'init'), -1);
+		add_action('wp_logout', array($this, 'destroy_session'));
+		add_action('wp', array($this, 'set_customer_session_cookie'), 10);
+		add_action('shutdown', array($this, 'save_data'), 20);
 
 	}
 
@@ -68,8 +68,8 @@ 
 	public function init() {
 		$this->init_session_cookie();
 
-		if ( ! is_user_logged_in() ) {
-			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ), 10, 2 );
+		if (!is_user_logged_in()) {
+			add_filter('nonce_user_logged_out', array($this, 'nonce_user_logged_out'), 10, 2);
 		}
 	}
 
@@ -81,7 +81,7 @@ 
 	public function init_session_cookie() {
 		$cookie = $this->get_session_cookie();
 
-		if ( $cookie ) {
+		if ($cookie) {
 			$this->_customer_id        = $cookie[0];
 			$this->_session_expiration = $cookie[1];
 			$this->_session_expiring   = $cookie[2];
@@ -89,17 +89,17 @@ 
 			$this->_data               = $this->get_session_data();
 
 			// If the user logs in, update session.
-			if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
+			if (is_user_logged_in() && get_current_user_id() != $this->_customer_id) {
 				$this->_customer_id = get_current_user_id();
 				$this->_dirty       = true;
 				$this->save_data();
-				$this->set_customer_session_cookie( true );
+				$this->set_customer_session_cookie(true);
 			}
 
 			// Update session if its close to expiring.
-			if ( time() > $this->_session_expiring ) {
+			if (time() > $this->_session_expiring) {
 				$this->set_session_expiration();
-				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
+				$this->update_session_timestamp($this->_customer_id, $this->_session_expiration);
 			}
 		} else {
 			$this->set_session_expiration();
@@ -117,25 +117,25 @@ 
 	 *
 	 * @param bool $set Should the session cookie be set.
 	 */
-	public function set_customer_session_cookie( $set ) {
-		if ( $set ) {
+	public function set_customer_session_cookie($set) {
+		if ($set) {
 			$to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
-			$cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+			$cookie_hash       = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 			$cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
 			$this->_has_cookie = true;
 
-			if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
-				$this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
+			if (!isset($_COOKIE[$this->_cookie]) || $_COOKIE[$this->_cookie] !== $cookie_value) {
+				$this->setcookie($this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true);
 			}
 		}
 	}
 
-	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
-        if ( ! headers_sent() ) {
-            setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
-        } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-            headers_sent( $file, $line );
-            trigger_error( "{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE ); // @codingStandardsIgnoreLine
+	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false) {
+        if (!headers_sent()) {
+            setcookie($name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters('wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure));
+        } elseif (defined('WP_DEBUG') && WP_DEBUG) {
+            headers_sent($file, $line);
+            trigger_error("{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE); // @codingStandardsIgnoreLine
         }
     }
 
@@ -146,8 +146,8 @@ 
 	 * @return bool
 	 */
 	protected function use_secure_cookie() {
-        $is_https = false !== strstr( get_option( 'home' ), 'https:' );
-		return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
+        $is_https = false !== strstr(get_option('home'), 'https:');
+		return apply_filters('wpinv_session_use_secure_cookie', $is_https && is_ssl());
 	}
 
 	/**
@@ -156,15 +156,15 @@ 
 	 * @return bool
 	 */
 	public function has_session() {
-		return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
+		return isset($_COOKIE[$this->_cookie]) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
 	}
 
 	/**
 	 * Set session expiration.
 	 */
 	public function set_session_expiration() {
-		$this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
-		$this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
+		$this->_session_expiring   = time() + intval(apply_filters('wpinv_session_expiring', 60 * 60 * 47)); // 47 Hours.
+		$this->_session_expiration = time() + intval(apply_filters('wpinv_session_expiration', 60 * 60 * 48)); // 48 Hours.
 	}
 
 	/**
@@ -174,8 +174,8 @@ 
 	 */
 	public function generate_customer_id() {
 		require_once ABSPATH . 'wp-includes/class-phpass.php';
-		$hasher      = new PasswordHash( 8, false );
-		return md5( $hasher->get_random_bytes( 32 ) );
+		$hasher = new PasswordHash(8, false);
+		return md5($hasher->get_random_bytes(32));
 	}
 
 	/**
@@ -186,27 +186,27 @@ 
 	 * @return bool|array
 	 */
 	public function get_session_cookie() {
-		$cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
+		$cookie_value = isset($_COOKIE[$this->_cookie]) ? wp_unslash($_COOKIE[$this->_cookie]) : false; // @codingStandardsIgnoreLine.
 
-		if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
+		if (empty($cookie_value) || !is_string($cookie_value)) {
 			return false;
 		}
 
-		list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
+		list($customer_id, $session_expiration, $session_expiring, $cookie_hash) = explode('||', $cookie_value);
 
-		if ( empty( $customer_id ) ) {
+		if (empty($customer_id)) {
 			return false;
 		}
 
 		// Validate hash.
 		$to_hash = $customer_id . '|' . $session_expiration;
-		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+		$hash    = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 
-		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
+		if (empty($cookie_hash) || !hash_equals($hash, $cookie_hash)) {
 			return false;
 		}
 
-		return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
+		return array($customer_id, $session_expiration, $session_expiring, $cookie_hash);
 	}
 
 	/**
@@ -215,15 +215,15 @@ 
 	 * @return array
 	 */
 	public function get_session_data() {
-		return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
+		return $this->has_session() ? (array) $this->get_session($this->_customer_id) : array();
 	}
 
-	public function generate_key($customer_id){
-        if(!$customer_id){
+	public function generate_key($customer_id) {
+        if (!$customer_id) {
             return;
         }
 
-        return 'wpi_trans_'.$customer_id;
+        return 'wpi_trans_' . $customer_id;
     }
 
 	/**
@@ -231,9 +231,9 @@ 
 	 */
 	public function save_data() {
 		// Dirty if something changed - prevents saving nothing new.
-		if ( $this->_dirty && $this->has_session() ) {
+		if ($this->_dirty && $this->has_session()) {
 
-            set_transient( $this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
+            set_transient($this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
 
 			$this->_dirty = false;
 		}
@@ -243,7 +243,7 @@ 
 	 * Destroy all session data.
 	 */
 	public function destroy_session() {
-		$this->delete_session( $this->_customer_id );
+		$this->delete_session($this->_customer_id);
 		$this->forget_session();
 	}
 
@@ -251,7 +251,7 @@ 
 	 * Forget all session data without destroying it.
 	 */
 	public function forget_session() {
-		$this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
+		$this->setcookie($this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true);
 
 		wpinv_empty_cart();
 
@@ -266,10 +266,10 @@ 
 	 * @param int $uid User ID.
 	 * @return string
 	 */
-	public function nonce_user_logged_out( $uid ) {
+	public function nonce_user_logged_out($uid) {
 
 		// Check if one of our nonces.
-		if ( substr( $uid, 0, 5 ) === 'wpinv' || substr( $uid, 0, 7 ) === 'getpaid' ) {
+		if (substr($uid, 0, 5) === 'wpinv' || substr($uid, 0, 7) === 'getpaid') {
 			return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
 		}
 
@@ -283,20 +283,20 @@ 
 	 * @param mixed  $default Default session value.
 	 * @return string|array
 	 */
-	public function get_session( $customer_id, $default = false ) {
+	public function get_session($customer_id, $default = false) {
 
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
+		if (defined('WP_SETUP_CONFIG')) {
 			return array();
 		}
 
         $key = $this->generate_key($customer_id);
         $value = get_transient($key);
 
-        if ( !$value ) {
+        if (!$value) {
             $value = $default;
         }
 
-		return maybe_unserialize( $value );
+		return maybe_unserialize($value);
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 	 *
 	 * @param int $customer_id Customer ID.
 	 */
-	public function delete_session( $customer_id ) {
+	public function delete_session($customer_id) {
 
         $key = $this->generate_key($customer_id);
 
@@ -317,9 +317,9 @@ 
 	 * @param string $customer_id Customer ID.
 	 * @param int    $timestamp Timestamp to expire the cookie.
 	 */
-	public function update_session_timestamp( $customer_id, $timestamp ) {
+	public function update_session_timestamp($customer_id, $timestamp) {
 
-        set_transient( $this->generate_key($customer_id), maybe_serialize( $this->_data ), $timestamp);
+        set_transient($this->generate_key($customer_id), maybe_serialize($this->_data), $timestamp);
 
 	}
 }

templates/payment-forms/cart-totals.php

Indentation +17 added lines, -17 removed lines

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

Spacing +19 added lines, -19 removed lines

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

includes/class-wpinv-privacy.php

Indentation +19 added lines, -19 removed lines

@@ -37,25 +37,25 @@
     public function get_privacy_message() {
 
         $content = '<div class="wp-suggested-text">' .
-                   '<h2>' . __( 'Invoices and checkout', 'invoicing' ) . '</h2>' .
-                   '<p class="privacy-policy-tutorial">' . __( 'Example privacy texts.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'We collect information about you during the checkout process on our site. This information may include, but is not limited to, your name, email address, phone number, address, IP and any other details that might be requested from you for the purpose of processing your payment and retaining your invoice details for legal reasons.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'Handling this data also allows us to:', 'invoicing' ) . '</p>' .
-                   '<ul>' .
-                   '<li>' . __( '- Send you important account/invoice/service information.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Estimate taxes based on your location.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Respond to your queries or complaints.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Process payments and to prevent fraudulent transactions. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Retain historical payment and invoice history. We do this on the basis of legal obligations.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
-                   '</ul>' .
-                   '<p>' . __( 'In addition to collecting information at checkout we may also use and store your contact details when manually creating invoices for require payments relating to prior contractual agreements or agreed terms.', 'invoicing' ) . '</p>' .
-                   '<h2>' . __( 'What we share with others', 'invoicing' ) . '</h2>' .
-                   '<p>' . __( 'We share information with third parties who help us provide our payment and invoicing services to you; for example --', 'invoicing' ) . '</p>' .
-                   '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list which third party payment processors you’re using to take payments since these may handle customer data. We’ve included PayPal as an example, but you should remove this if you’re not using PayPal.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'We accept payments through PayPal. When processing payments, some of your data will be passed to PayPal, including information required to process or support the payment, such as the purchase total and billing information.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'Please see the <a href="https://www.paypal.com/us/webapps/mpp/ua/privacy-full">PayPal Privacy Policy</a> for more details.', 'invoicing' ) . '</p>' .
-                   '</div>';
+                    '<h2>' . __( 'Invoices and checkout', 'invoicing' ) . '</h2>' .
+                    '<p class="privacy-policy-tutorial">' . __( 'Example privacy texts.', 'invoicing' ) . '</p>' .
+                    '<p>' . __( 'We collect information about you during the checkout process on our site. This information may include, but is not limited to, your name, email address, phone number, address, IP and any other details that might be requested from you for the purpose of processing your payment and retaining your invoice details for legal reasons.', 'invoicing' ) . '</p>' .
+                    '<p>' . __( 'Handling this data also allows us to:', 'invoicing' ) . '</p>' .
+                    '<ul>' .
+                    '<li>' . __( '- Send you important account/invoice/service information.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Estimate taxes based on your location.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Respond to your queries or complaints.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Process payments and to prevent fraudulent transactions. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Retain historical payment and invoice history. We do this on the basis of legal obligations.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
+                    '</ul>' .
+                    '<p>' . __( 'In addition to collecting information at checkout we may also use and store your contact details when manually creating invoices for require payments relating to prior contractual agreements or agreed terms.', 'invoicing' ) . '</p>' .
+                    '<h2>' . __( 'What we share with others', 'invoicing' ) . '</h2>' .
+                    '<p>' . __( 'We share information with third parties who help us provide our payment and invoicing services to you; for example --', 'invoicing' ) . '</p>' .
+                    '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list which third party payment processors you’re using to take payments since these may handle customer data. We’ve included PayPal as an example, but you should remove this if you’re not using PayPal.', 'invoicing' ) . '</p>' .
+                    '<p>' . __( 'We accept payments through PayPal. When processing payments, some of your data will be passed to PayPal, including information required to process or support the payment, such as the purchase total and billing information.', 'invoicing' ) . '</p>' .
+                    '<p>' . __( 'Please see the <a href="https://www.paypal.com/us/webapps/mpp/ua/privacy-full">PayPal Privacy Policy</a> for more details.', 'invoicing' ) . '</p>' .
+                    '</div>';
 
         return apply_filters( 'wpinv_privacy_policy_content', $content );
     }

Spacing +19 added lines, -19 removed lines

@@ -3,7 +3,7 @@ 
  * Privacy/GDPR related functionality which ties into WordPress functionality.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WPInv_Privacy Class.
@@ -26,7 +26,7 @@ 
         $this->init();
 
         // This hook registers Invoicing data exporters.
-        $this->add_exporter( 'wpinv-customer-invoices', __( 'Customer Invoices', 'invoicing' ), array( 'WPInv_Privacy_Exporters', 'customer_invoice_data_exporter' ) );
+        $this->add_exporter('wpinv-customer-invoices', __('Customer Invoices', 'invoicing'), array('WPInv_Privacy_Exporters', 'customer_invoice_data_exporter'));
     }
 
     /**
@@ -37,27 +37,27 @@ 
     public function get_privacy_message() {
 
         $content = '<div class="wp-suggested-text">' .
-                   '<h2>' . __( 'Invoices and checkout', 'invoicing' ) . '</h2>' .
-                   '<p class="privacy-policy-tutorial">' . __( 'Example privacy texts.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'We collect information about you during the checkout process on our site. This information may include, but is not limited to, your name, email address, phone number, address, IP and any other details that might be requested from you for the purpose of processing your payment and retaining your invoice details for legal reasons.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'Handling this data also allows us to:', 'invoicing' ) . '</p>' .
+                   '<h2>' . __('Invoices and checkout', 'invoicing') . '</h2>' .
+                   '<p class="privacy-policy-tutorial">' . __('Example privacy texts.', 'invoicing') . '</p>' .
+                   '<p>' . __('We collect information about you during the checkout process on our site. This information may include, but is not limited to, your name, email address, phone number, address, IP and any other details that might be requested from you for the purpose of processing your payment and retaining your invoice details for legal reasons.', 'invoicing') . '</p>' .
+                   '<p>' . __('Handling this data also allows us to:', 'invoicing') . '</p>' .
                    '<ul>' .
-                   '<li>' . __( '- Send you important account/invoice/service information.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Estimate taxes based on your location.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Respond to your queries or complaints.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Process payments and to prevent fraudulent transactions. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Retain historical payment and invoice history. We do this on the basis of legal obligations.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
+                   '<li>' . __('- Send you important account/invoice/service information.', 'invoicing') . '</li>' .
+                   '<li>' . __('- Estimate taxes based on your location.', 'invoicing') . '</li>' .
+                   '<li>' . __('- Respond to your queries or complaints.', 'invoicing') . '</li>' .
+                   '<li>' . __('- Process payments and to prevent fraudulent transactions. We do this on the basis of our legitimate business interests.', 'invoicing') . '</li>' .
+                   '<li>' . __('- Retain historical payment and invoice history. We do this on the basis of legal obligations.', 'invoicing') . '</li>' .
+                   '<li>' . __('- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'invoicing') . '</li>' .
                    '</ul>' .
-                   '<p>' . __( 'In addition to collecting information at checkout we may also use and store your contact details when manually creating invoices for require payments relating to prior contractual agreements or agreed terms.', 'invoicing' ) . '</p>' .
-                   '<h2>' . __( 'What we share with others', 'invoicing' ) . '</h2>' .
-                   '<p>' . __( 'We share information with third parties who help us provide our payment and invoicing services to you; for example --', 'invoicing' ) . '</p>' .
-                   '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list which third party payment processors you’re using to take payments since these may handle customer data. We’ve included PayPal as an example, but you should remove this if you’re not using PayPal.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'We accept payments through PayPal. When processing payments, some of your data will be passed to PayPal, including information required to process or support the payment, such as the purchase total and billing information.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'Please see the <a href="https://www.paypal.com/us/webapps/mpp/ua/privacy-full">PayPal Privacy Policy</a> for more details.', 'invoicing' ) . '</p>' .
+                   '<p>' . __('In addition to collecting information at checkout we may also use and store your contact details when manually creating invoices for require payments relating to prior contractual agreements or agreed terms.', 'invoicing') . '</p>' .
+                   '<h2>' . __('What we share with others', 'invoicing') . '</h2>' .
+                   '<p>' . __('We share information with third parties who help us provide our payment and invoicing services to you; for example --', 'invoicing') . '</p>' .
+                   '<p class="privacy-policy-tutorial">' . __('In this subsection you should list which third party payment processors you’re using to take payments since these may handle customer data. We’ve included PayPal as an example, but you should remove this if you’re not using PayPal.', 'invoicing') . '</p>' .
+                   '<p>' . __('We accept payments through PayPal. When processing payments, some of your data will be passed to PayPal, including information required to process or support the payment, such as the purchase total and billing information.', 'invoicing') . '</p>' .
+                   '<p>' . __('Please see the <a href="https://www.paypal.com/us/webapps/mpp/ua/privacy-full">PayPal Privacy Policy</a> for more details.', 'invoicing') . '</p>' .
                    '</div>';
 
-        return apply_filters( 'wpinv_privacy_policy_content', $content );
+        return apply_filters('wpinv_privacy_policy_content', $content);
     }
 
 }

includes/class-wpinv-privacy-exporters.php

Spacing +59 added lines, -59 removed lines

@@ -3,7 +3,7 @@ 
  * Personal data exporters.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WPInv_Privacy_Exporters Class.
@@ -17,39 +17,39 @@ 
      * @param int    $page  Page.
      * @return array An array of invoice data in name value pairs
      */
-    public static function customer_invoice_data_exporter( $email_address, $page ) {
+    public static function customer_invoice_data_exporter($email_address, $page) {
         $done           = false;
         $page           = (int) $page;
         $data_to_export = array();
 
-        $user           = get_user_by( 'email', $email_address );
-        if ( ! $user instanceof WP_User ) {
+        $user           = get_user_by('email', $email_address);
+        if (!$user instanceof WP_User) {
             return array(
                 'data' => $data_to_export,
                 'done' => true,
             );
         }
 
-        $args    = array(
-            'limit'    => get_option( 'posts_per_page' ),
+        $args = array(
+            'limit'    => get_option('posts_per_page'),
             'page'     => $page,
             'user'     => $user->ID,
             'paginate' => false,
         );
 
-        $invoices = wpinv_get_invoices( $args );
+        $invoices = wpinv_get_invoices($args);
 
-        if ( 0 < count( $invoices ) ) {
-            foreach ( $invoices as $invoice ) {
+        if (0 < count($invoices)) {
+            foreach ($invoices as $invoice) {
                 $data_to_export[] = array(
                     'group_id'          => 'customer_invoices',
-                    'group_label'       => __( 'GetPaid: Invoices', 'invoicing' ),
-                    'group_description' => __( 'Customer invoices.', 'invoicing' ),
+                    'group_label'       => __('GetPaid: Invoices', 'invoicing'),
+                    'group_description' => __('Customer invoices.', 'invoicing'),
                     'item_id'           => "wpinv-{$invoice->get_id()}",
-                    'data'              => self::get_customer_invoice_data( $invoice ),
+                    'data'              => self::get_customer_invoice_data($invoice),
                 );
             }
-            $done = get_option( 'posts_per_page' ) > count( $invoices );
+            $done = get_option('posts_per_page') > count($invoices);
         } else {
             $done = true;
         }
@@ -67,116 +67,116 @@ 
      * @param WPInv_Invoice $invoice invoice object.
      * @return array
      */
-    public static function get_customer_invoice_data( $invoice ) {
+    public static function get_customer_invoice_data($invoice) {
 
         // Prepare basic properties.
         $props_to_export = array(
             'number'               => array(
-                'name' => __( 'Invoice Number', 'invoicing' ),
+                'name' => __('Invoice Number', 'invoicing'),
                 'value' => $invoice->get_number(),
             ),
             'created_date'         => array(
-                'name' => __( 'Created Date', 'invoicing' ),
+                'name' => __('Created Date', 'invoicing'),
                 'value' => $invoice->get_date_created(),
             ),
             'due_date'         => array(
-                'name' => __( 'Due Date', 'invoicing' ),
+                'name' => __('Due Date', 'invoicing'),
                 'value' => $invoice->get_due_date(),
             ),
             'items'                => array(
-                'name' => __( 'Invoice Items', 'invoicing' ),
-                'value' => self::process_invoice_items( $invoice ),
+                'name' => __('Invoice Items', 'invoicing'),
+                'value' => self::process_invoice_items($invoice),
             ),
             'discount'                => array(
-                'name' => __( 'Invoice Discount', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total_discount(), $invoice->get_currency() ),
+                'name' => __('Invoice Discount', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total_discount(), $invoice->get_currency()),
             ),
             'total'                => array(
-                'name' => __( 'Invoice Total', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
+                'name' => __('Invoice Total', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total(), $invoice->get_currency()),
             ),
             'status'               => array(
-                'name' => __( 'Invoice Status', 'invoicing' ),
+                'name' => __('Invoice Status', 'invoicing'),
                 'value' => $invoice->get_status_nicename(),
             ),
             'first_name'           => array(
-                'name' => __( 'First Name', 'invoicing' ),
+                'name' => __('First Name', 'invoicing'),
                 'value' => $invoice->get_first_name(),
             ),
             'last_name'           => array(
-                'name' => __( 'Last Name', 'invoicing' ),
+                'name' => __('Last Name', 'invoicing'),
                 'value' => $invoice->get_last_name(),
             ),
             'email'           => array(
-                'name' => __( 'Email Address', 'invoicing' ),
+                'name' => __('Email Address', 'invoicing'),
                 'value' => $invoice->get_email(),
             ),
             'company'           => array(
-                'name' => __( 'Company', 'invoicing' ),
+                'name' => __('Company', 'invoicing'),
                 'value' => $invoice->get_company(),
             ),
             'phone'           => array(
-                'name' => __( 'Phone Number', 'invoicing' ),
+                'name' => __('Phone Number', 'invoicing'),
                 'value' => $invoice->get_phone(),
             ),
             'address'           => array(
-                'name' => __( 'Address', 'invoicing' ),
+                'name' => __('Address', 'invoicing'),
                 'value' => $invoice->get_address(),
             ),
             'city'           => array(
-                'name' => __( 'City', 'invoicing' ),
+                'name' => __('City', 'invoicing'),
                 'value' => $invoice->get_city(),
             ),
             'state'           => array(
-                'name' => __( 'State', 'invoicing' ),
+                'name' => __('State', 'invoicing'),
                 'value' => $invoice->get_state(),
             ),
             'zip'           => array(
-                'name' => __( 'Zip', 'invoicing' ),
+                'name' => __('Zip', 'invoicing'),
                 'value' => $invoice->get_zip(),
             ),
             'vat_number'    => array(
-                'name' => __( 'VAT Number', 'invoicing' ),
+                'name' => __('VAT Number', 'invoicing'),
                 'value' => $invoice->get_vat_number(),
             ),
             'description'   => array(
-                'name' => __( 'Description', 'invoicing' ),
+                'name' => __('Description', 'invoicing'),
                 'value' => $invoice->get_description(),
             ), 
         );
 
         // In case the invoice is paid, add the payment date and gateway.
-        if ( $invoice->is_paid() ) {
+        if ($invoice->is_paid()) {
 
             $props_to_export['completed_date'] = array(
-                'name' => __( 'Completed Date', 'invoicing' ),
+                'name' => __('Completed Date', 'invoicing'),
                 'value' => $invoice->get_completed_date(),
             );
 
             $props_to_export['gateway'] = array(
-                'name' => __( 'Paid Via', 'invoicing' ),
+                'name' => __('Paid Via', 'invoicing'),
                 'value' => $invoice->get_gateway(),
             );
 
         }
 
         // Maybe add subscription details.
-        $props_to_export = self::process_subscription( $invoice, $props_to_export );
+        $props_to_export = self::process_subscription($invoice, $props_to_export);
 
         // Add the ip address.
         $props_to_export['ip'] = array(
-            'name' => __( 'IP Address', 'invoicing' ),
+            'name' => __('IP Address', 'invoicing'),
             'value' => $invoice->get_ip(),
         );
 
         // Add the invoice url.
         $props_to_export['view_url'] = array(
-            'name' => __( 'Invoice URL', 'invoicing' ),
+            'name' => __('Invoice URL', 'invoicing'),
             'value' => $invoice->get_view_url(),
         );
 
         // Return the values.
-        return apply_filters( 'getpaid_privacy_export_invoice_personal_data', array_values( $props_to_export ), $invoice );
+        return apply_filters('getpaid_privacy_export_invoice_personal_data', array_values($props_to_export), $invoice);
 
     }
 
@@ -188,40 +188,40 @@ 
      * @param array $props invoice props.
      * @return array
      */
-    public static function process_subscription( $invoice, $props ) {
+    public static function process_subscription($invoice, $props) {
 
-        $subscription = wpinv_get_subscription( $invoice );
-        if ( ! empty( $subscription ) ) {
+        $subscription = wpinv_get_subscription($invoice);
+        if (!empty($subscription)) {
 
-            $frequency    = getpaid_get_subscription_period_label( $subscription->get_period(),$subscription->get_frequency() );
-            $period       = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() ) . ' / ' . $frequency;
-            $initial_amt  = wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() );
-            $bill_times   = $subscription->get_times_billed() . ' / ' . ( ( $subscription->get_bill_times() == 0 ) ? __( 'Until Cancelled', 'invoicing' ) : $subscription->get_bill_times() );
-            $renewal_date = getpaid_format_date_value( $subscription->get_expiration() );
+            $frequency    = getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency());
+            $period       = wpinv_price($subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency()) . ' / ' . $frequency;
+            $initial_amt  = wpinv_price($subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency());
+            $bill_times   = $subscription->get_times_billed() . ' / ' . (($subscription->get_bill_times() == 0) ? __('Until Cancelled', 'invoicing') : $subscription->get_bill_times());
+            $renewal_date = getpaid_format_date_value($subscription->get_expiration());
 
             // Billing cycle.
             $props['period'] = array(
-                'name' => __( 'Billing Cycle', 'invoicing' ),
+                'name' => __('Billing Cycle', 'invoicing'),
                 'value' => $period,
             );
 
             // Initial amount.
             $props['initial_amount'] = array(
-                'name' => __( 'Initial Amount', 'invoicing' ),
+                'name' => __('Initial Amount', 'invoicing'),
                 'value' => $initial_amt,
             );
 
             // Bill times.
             $props['bill_times'] = array(
-                'name' => __( 'Times Billed', 'invoicing' ),
+                'name' => __('Times Billed', 'invoicing'),
                 'value' => $bill_times,
             );
 
             // Add expiry date.
-            if ( $subscription->is_active() ) {
+            if ($subscription->is_active()) {
 
                 $props['renewal_date'] = array(
-                    'name' => __( 'Expires', 'invoicing' ),
+                    'name' => __('Expires', 'invoicing'),
                     'value' => $renewal_date,
                 );
 
@@ -240,19 +240,19 @@ 
      * @param WPInv_Invoice $invoice invoice object.
      * @return array
      */
-    public static function process_invoice_items( $invoice ) {
+    public static function process_invoice_items($invoice) {
 
         $item_names = array();
-        foreach ( $invoice->get_items() as $cart_item ) {
+        foreach ($invoice->get_items() as $cart_item) {
             $item_names[] = sprintf(
                 '%s x %s - %s',
                 $cart_item->get_name(),
                 $cart_item->get_quantity(),
-                wpinv_price( $invoice->is_renewal() ? $cart_item->get_recurring_sub_total() : $cart_item->get_sub_total(), $invoice->get_currency() )
+                wpinv_price($invoice->is_renewal() ? $cart_item->get_recurring_sub_total() : $cart_item->get_sub_total(), $invoice->get_currency())
             );
         }
 
-        return implode( ', ', $item_names );
+        return implode(', ', $item_names);
 
     }
 

templates/wpinv-invalid-access.php

Spacing +14 added lines, -14 removed lines

@@ -7,11 +7,11 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Fetch the invoice.
-if ( empty( $invoice ) ) {
-    $invoice = new WPInv_Invoice( $GLOBALS['post'] );
+if (empty($invoice)) {
+    $invoice = new WPInv_Invoice($GLOBALS['post']);
 }
 
 ?><!DOCTYPE html>
@@ -21,16 +21,16 @@ 
 
     <head>
 
-		<meta charset="<?php bloginfo( 'charset' ); ?>">
+		<meta charset="<?php bloginfo('charset'); ?>">
         <meta name="viewport" content="width=device-width, initial-scale=1.0" >
 
         <meta name="robots" content="noindex,nofollow">
 
 		<link rel="profile" href="https://gmpg.org/xfn/11">
 
-        <title><?php _e( 'Invalid Access', 'invoicing' ); ?></title>
+        <title><?php _e('Invalid Access', 'invoicing'); ?></title>
 
-        <?php do_action( 'wpinv_invoice_print_head', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_head', $invoice); ?>
 
     </head>
 
@@ -39,20 +39,20 @@ 
 
         <?php
 
-            if ( ! $invoice->exists() || $invoice->is_draft() ) {
-                $error = __( 'This invoice was deleted or is not visible.', 'invoicing' );
+            if (!$invoice->exists() || $invoice->is_draft()) {
+                $error = __('This invoice was deleted or is not visible.', 'invoicing');
             } else {
 
                 $user_id = get_current_user_id();
-                if ( wpinv_require_login_to_checkout() && empty( $user_id ) ) {
-                    $error  = __( 'You must be logged in to view this invoice.', 'invoicing' );
+                if (wpinv_require_login_to_checkout() && empty($user_id)) {
+                    $error  = __('You must be logged in to view this invoice.', 'invoicing');
                     $error .= sprintf(
                         ' <a href="%s">%s</a>',
-                        wp_login_url( $invoice->get_view_url() ),
-                        __( 'Login.', 'invoicing' )
+                        wp_login_url($invoice->get_view_url()),
+                        __('Login.', 'invoicing')
                     );
                 } else {
-                    $error = __( 'This invoice is only viewable by clicking on the invoice link that was sent to you via email.', 'invoicing' );
+                    $error = __('This invoice is only viewable by clicking on the invoice link that was sent to you via email.', 'invoicing');
                 }
 
             }
@@ -61,7 +61,7 @@ 
 
         <div class="container">
             <div class="alert alert-danger m-5" role="alert">
-                <h4 class="alert-heading"><?php _e( 'Access Denied', 'invoicing' ); ?></h4>
+                <h4 class="alert-heading"><?php _e('Access Denied', 'invoicing'); ?></h4>
                 <p><?php echo $error; ?></p>
             </div>
         </div>

includes/api/class-getpaid-rest-report-top-sellers-controller.php

Indentation +175 added lines, -175 removed lines

@@ -18,179 +18,179 @@
  */
 class GetPaid_REST_Report_Top_Sellers_Controller extends GetPaid_REST_Report_Sales_Controller {
 
-	/**
-	 * Route base.
-	 *
-	 * @var string
-	 */
-	protected $rest_base = 'reports/top_sellers';
-
-	/**
-	 * Get top sellers report.
-	 *
-	 * @param WP_REST_Request $request
-	 * @return array|WP_Error
-	 */
-	public function get_items( $request ) {
-
-		// Prepare items.
-		$this->report_range = $this->get_date_range( $request );
-		$report_data        = $this->get_report_data();
-
-		$top_sellers = array();
-
-		foreach ( $report_data as $item ) {
-
-			$item_obj  = new WPInv_Item( $item );
-			$item_name = $item->invoice_item_name;
-			$item_qty  = floatval( $item->invoice_item_qty );
-			$item_id   = absint( $item->invoice_item_id );
-			$price     = sanitize_text_field( wpinv_price( $item->invoice_item_price ) );
-
-			$item_obj  = new WPInv_Item( $item_id );
-
-			if ( $item_obj->exists() ) {
-				$item_name = $item_obj->get_name();
-			} else {
-				$item_id   = 0; 
-			}
-
-			$top_sellers[] = array(
-				'name'               =>sanitize_text_field( $item_name ),
-				'item_id'            => $item_id,
-				'quantity'           => $item_qty,
-				'earnings'           => wpinv_round_amount( $item->invoice_item_price ),
-				'earnings_formatted' => sanitize_text_field( wpinv_price( $price ) ),
-			);
-
-		}
-
-		$data = array();
-		foreach ( $top_sellers as $top_seller ) {
-			$item   = $this->prepare_item_for_response( (object) $top_seller, $request );
-			$data[] = $this->prepare_response_for_collection( $item );
-		}
-
-		return rest_ensure_response( $data );
-
-	}
-
-	/**
-	 * Prepare a report sales object for serialization.
-	 *
-	 * @param stdClass $top_seller
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response $response Response data.
-	 */
-	public function prepare_item_for_response( $top_seller, $request ) {
-		$data    = (array) $top_seller;
-
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $this->add_additional_fields_to_object( $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
-
-		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-		$links = array(
-			'about' => array(
-				'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
-			),
-		);
-
-		if ( ! empty( $top_seller->item_id ) ) {
-			$links['item']   = array(
-				'href'       => rest_url( sprintf( '/%s/items/%s', $this->namespace, $top_seller->item_id ) ),
-				'embeddable' => true,
-			);
-		}
-
-		$response->add_links( $links );
-		return apply_filters( 'getpaid_rest_prepare_report_' . $this->rest_base, $response, $top_seller, $request );
-	}
-
-	/**
-	 * Get all data needed for this report and store in the class.
-	 */
-	protected function query_report_data() {
-
-		$this->report_data = GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'              => array(
-					'quantity'      => array(
-						'type'            => 'invoice_item',
-						'function'        => 'SUM',
-						'name'            => 'invoice_item_qty',
-					),
-					'item_id'             => array(
-						'type'            => 'invoice_item',
-						'function'        => '',
-						'name'            => 'invoice_item_id',
-					),
-					'item_name'           => array(
-						'type'            => 'invoice_item',
-						'function'        => '',
-						'name'            => 'invoice_item_name',
-					),
-					'price'               => array(
-						'type'            => 'invoice_item',
-						'function'        => 'SUM',
-						'name'            => 'invoice_item_price',
-					),
-				),
-				'group_by'       => 'invoice_item_id',
-				'order_by'       => 'invoice_item_qty DESC',
-				'query_type'     => 'get_results',
-				'limit'          => 10,
-				'filter_range'   => $this->report_range,
-			)
-		);
-
-	}
-
-	/**
-	 * Get the Report's schema, conforming to JSON Schema.
-	 *
-	 * @return array
-	 */
-	public function get_item_schema() {
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => $this->rest_base,
-			'type'       => 'object',
-			'properties' => array(
-				'name' => array(
-					'description' => __( 'Item name.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'item_id'         => array(
-					'description' => __( 'Item ID.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'quantity' => array(
-					'description' => __( 'Total number of purchases.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'earnings' => array(
-					'description' => __( 'Total earnings for the item.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'earnings_formatted"' => array(
-					'description' => __( 'Total earnings (formatted) for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-			),
-		);
-
-		return $this->add_additional_fields_schema( $schema );
-	}
+    /**
+     * Route base.
+     *
+     * @var string
+     */
+    protected $rest_base = 'reports/top_sellers';
+
+    /**
+     * Get top sellers report.
+     *
+     * @param WP_REST_Request $request
+     * @return array|WP_Error
+     */
+    public function get_items( $request ) {
+
+        // Prepare items.
+        $this->report_range = $this->get_date_range( $request );
+        $report_data        = $this->get_report_data();
+
+        $top_sellers = array();
+
+        foreach ( $report_data as $item ) {
+
+            $item_obj  = new WPInv_Item( $item );
+            $item_name = $item->invoice_item_name;
+            $item_qty  = floatval( $item->invoice_item_qty );
+            $item_id   = absint( $item->invoice_item_id );
+            $price     = sanitize_text_field( wpinv_price( $item->invoice_item_price ) );
+
+            $item_obj  = new WPInv_Item( $item_id );
+
+            if ( $item_obj->exists() ) {
+                $item_name = $item_obj->get_name();
+            } else {
+                $item_id   = 0; 
+            }
+
+            $top_sellers[] = array(
+                'name'               =>sanitize_text_field( $item_name ),
+                'item_id'            => $item_id,
+                'quantity'           => $item_qty,
+                'earnings'           => wpinv_round_amount( $item->invoice_item_price ),
+                'earnings_formatted' => sanitize_text_field( wpinv_price( $price ) ),
+            );
+
+        }
+
+        $data = array();
+        foreach ( $top_sellers as $top_seller ) {
+            $item   = $this->prepare_item_for_response( (object) $top_seller, $request );
+            $data[] = $this->prepare_response_for_collection( $item );
+        }
+
+        return rest_ensure_response( $data );
+
+    }
+
+    /**
+     * Prepare a report sales object for serialization.
+     *
+     * @param stdClass $top_seller
+     * @param WP_REST_Request $request Request object.
+     * @return WP_REST_Response $response Response data.
+     */
+    public function prepare_item_for_response( $top_seller, $request ) {
+        $data    = (array) $top_seller;
+
+        $context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $this->add_additional_fields_to_object( $data, $request );
+        $data    = $this->filter_response_by_context( $data, $context );
+
+        // Wrap the data in a response object.
+        $response = rest_ensure_response( $data );
+        $links = array(
+            'about' => array(
+                'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
+            ),
+        );
+
+        if ( ! empty( $top_seller->item_id ) ) {
+            $links['item']   = array(
+                'href'       => rest_url( sprintf( '/%s/items/%s', $this->namespace, $top_seller->item_id ) ),
+                'embeddable' => true,
+            );
+        }
+
+        $response->add_links( $links );
+        return apply_filters( 'getpaid_rest_prepare_report_' . $this->rest_base, $response, $top_seller, $request );
+    }
+
+    /**
+     * Get all data needed for this report and store in the class.
+     */
+    protected function query_report_data() {
+
+        $this->report_data = GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'              => array(
+                    'quantity'      => array(
+                        'type'            => 'invoice_item',
+                        'function'        => 'SUM',
+                        'name'            => 'invoice_item_qty',
+                    ),
+                    'item_id'             => array(
+                        'type'            => 'invoice_item',
+                        'function'        => '',
+                        'name'            => 'invoice_item_id',
+                    ),
+                    'item_name'           => array(
+                        'type'            => 'invoice_item',
+                        'function'        => '',
+                        'name'            => 'invoice_item_name',
+                    ),
+                    'price'               => array(
+                        'type'            => 'invoice_item',
+                        'function'        => 'SUM',
+                        'name'            => 'invoice_item_price',
+                    ),
+                ),
+                'group_by'       => 'invoice_item_id',
+                'order_by'       => 'invoice_item_qty DESC',
+                'query_type'     => 'get_results',
+                'limit'          => 10,
+                'filter_range'   => $this->report_range,
+            )
+        );
+
+    }
+
+    /**
+     * Get the Report's schema, conforming to JSON Schema.
+     *
+     * @return array
+     */
+    public function get_item_schema() {
+        $schema = array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => $this->rest_base,
+            'type'       => 'object',
+            'properties' => array(
+                'name' => array(
+                    'description' => __( 'Item name.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'item_id'         => array(
+                    'description' => __( 'Item ID.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'quantity' => array(
+                    'description' => __( 'Total number of purchases.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'earnings' => array(
+                    'description' => __( 'Total earnings for the item.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'earnings_formatted"' => array(
+                    'description' => __( 'Total earnings (formatted) for the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+            ),
+        );
+
+        return $this->add_additional_fields_schema( $schema );
+    }
 }

Spacing +39 added lines, -39 removed lines

@@ -9,7 +9,7 @@ 
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST top sellers controller class.
@@ -31,47 +31,47 @@ 
 	 * @param WP_REST_Request $request
 	 * @return array|WP_Error
 	 */
-	public function get_items( $request ) {
+	public function get_items($request) {
 
 		// Prepare items.
-		$this->report_range = $this->get_date_range( $request );
+		$this->report_range = $this->get_date_range($request);
 		$report_data        = $this->get_report_data();
 
 		$top_sellers = array();
 
-		foreach ( $report_data as $item ) {
+		foreach ($report_data as $item) {
 
-			$item_obj  = new WPInv_Item( $item );
+			$item_obj  = new WPInv_Item($item);
 			$item_name = $item->invoice_item_name;
-			$item_qty  = floatval( $item->invoice_item_qty );
-			$item_id   = absint( $item->invoice_item_id );
-			$price     = sanitize_text_field( wpinv_price( $item->invoice_item_price ) );
+			$item_qty  = floatval($item->invoice_item_qty);
+			$item_id   = absint($item->invoice_item_id);
+			$price     = sanitize_text_field(wpinv_price($item->invoice_item_price));
 
-			$item_obj  = new WPInv_Item( $item_id );
+			$item_obj  = new WPInv_Item($item_id);
 
-			if ( $item_obj->exists() ) {
+			if ($item_obj->exists()) {
 				$item_name = $item_obj->get_name();
 			} else {
 				$item_id   = 0; 
 			}
 
 			$top_sellers[] = array(
-				'name'               =>sanitize_text_field( $item_name ),
+				'name'               =>sanitize_text_field($item_name),
 				'item_id'            => $item_id,
 				'quantity'           => $item_qty,
-				'earnings'           => wpinv_round_amount( $item->invoice_item_price ),
-				'earnings_formatted' => sanitize_text_field( wpinv_price( $price ) ),
+				'earnings'           => wpinv_round_amount($item->invoice_item_price),
+				'earnings_formatted' => sanitize_text_field(wpinv_price($price)),
 			);
 
 		}
 
 		$data = array();
-		foreach ( $top_sellers as $top_seller ) {
-			$item   = $this->prepare_item_for_response( (object) $top_seller, $request );
-			$data[] = $this->prepare_response_for_collection( $item );
+		foreach ($top_sellers as $top_seller) {
+			$item   = $this->prepare_item_for_response((object) $top_seller, $request);
+			$data[] = $this->prepare_response_for_collection($item);
 		}
 
-		return rest_ensure_response( $data );
+		return rest_ensure_response($data);
 
 	}
 
@@ -82,30 +82,30 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response $response Response data.
 	 */
-	public function prepare_item_for_response( $top_seller, $request ) {
+	public function prepare_item_for_response($top_seller, $request) {
 		$data    = (array) $top_seller;
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $this->add_additional_fields_to_object( $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
+		$context = !empty($request['context']) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object($data, $request);
+		$data    = $this->filter_response_by_context($data, $context);
 
 		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
+		$response = rest_ensure_response($data);
 		$links = array(
 			'about' => array(
-				'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
+				'href' => rest_url(sprintf('%s/reports', $this->namespace)),
 			),
 		);
 
-		if ( ! empty( $top_seller->item_id ) ) {
-			$links['item']   = array(
-				'href'       => rest_url( sprintf( '/%s/items/%s', $this->namespace, $top_seller->item_id ) ),
+		if (!empty($top_seller->item_id)) {
+			$links['item'] = array(
+				'href'       => rest_url(sprintf('/%s/items/%s', $this->namespace, $top_seller->item_id)),
 				'embeddable' => true,
 			);
 		}
 
-		$response->add_links( $links );
-		return apply_filters( 'getpaid_rest_prepare_report_' . $this->rest_base, $response, $top_seller, $request );
+		$response->add_links($links);
+		return apply_filters('getpaid_rest_prepare_report_' . $this->rest_base, $response, $top_seller, $request);
 	}
 
 	/**
@@ -159,38 +159,38 @@ 
 			'type'       => 'object',
 			'properties' => array(
 				'name' => array(
-					'description' => __( 'Item name.', 'invoicing' ),
+					'description' => __('Item name.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'item_id'         => array(
-					'description' => __( 'Item ID.', 'invoicing' ),
+					'description' => __('Item ID.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'quantity' => array(
-					'description' => __( 'Total number of purchases.', 'invoicing' ),
+					'description' => __('Total number of purchases.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'earnings' => array(
-					'description' => __( 'Total earnings for the item.', 'invoicing' ),
+					'description' => __('Total earnings for the item.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'earnings_formatted"' => array(
-					'description' => __( 'Total earnings (formatted) for the item.', 'invoicing' ),
+					'description' => __('Total earnings (formatted) for the item.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 			),
 		);
 
-		return $this->add_additional_fields_schema( $schema );
+		return $this->add_additional_fields_schema($schema);
 	}
 }

includes/data/invoice-schema.php

Indentation +621 added lines, -621 removed lines

@@ -13,629 +13,629 @@
 
 return array(
 
-	'id'              => array(
-		'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'parent_id'       => array(
-		'description' => __( 'Parent invoice ID.', 'invoicing' ),
-		'type'        => 'integer',
-		'minimum'     => 0,
-		'default'     => 0,
-		'context'     => array( 'view', 'edit' ),
-	),
-
-	'key'			  => array(
-		'description' => __( 'A unique key for the invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit' ),
-		'readonly'    => true,
-	),
-
-	'number'		  => array(
-		'description' => __( 'A unique number for the invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'type'			  => array(
-		'description' => __( 'Get the invoice type (e.g invoice, quote etc).', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'post_type'		  => array(
-		'description' => __( 'Get the invoice post type (e.g wpi_invoice, wpi_quote etc).', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'version'         => array(
-		'description' => __( 'Version of GetPaid/Invoicing which last updated the invoice.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit' ),
-		'readonly'    => true,
-	),
-
-	'template'        => array(
-		'description' => __( 'The invoice template.', 'invoicing' ),
-		'type'        => 'string',
-		'default'     => 'quantity',
-		'enum'        => array( 'quantity', 'hours', 'amount' ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'status'          => array(
-		'description' => __( 'Invoice status.', 'invoicing' ),
-		'type'        => 'string',
-		'default'     => 'wpi-pending',
-		'enum'        => array_keys( wpinv_get_invoice_statuses( true ) ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'status_nicename' => array(
-		'description' => __( 'A human readable name for the invoice status.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'currency'        => array(
-		'description' => __( 'The invoice currency in ISO format.', 'invoicing' ),
-		'type'        => 'string',
-		'default'     => wpinv_get_currency(),
-		'enum'        => array_keys( wpinv_get_currencies() ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'date_created'    => array(
-		'description' => __( "The date the invoice was created, in the site's timezone.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'date_created_gmt'    => array(
-		'description' => __( 'The GMT date the invoice was created.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'date_modified'   => array(
-		'description' => __( "The date the invoice was last modified, in the site's timezone.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'date_modified_gmt'    => array(
-		'description' => __( 'The GMT date the invoice was last modified.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'due_date'        => array(
-		'description' => __( "The invoice's due date, in the site's timezone.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'due_date_gmt'    => array(
-		'description' => __( 'The GMT date the invoice is/was due.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'completed_date'  => array(
-		'description' => __( "The date the invoice was paid, in the site's timezone.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'completed_date_gmt'    => array(
-		'description' => __( 'The GMT date the invoice was paid.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'total_discount'   => array(
-		'description' => __( 'Total discount amount for the invoice.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'total_tax'       => array(
-		'description' => __( 'Total tax amount for the invoice.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'total_fees'      => array(
-		'description' => __( 'Total fees amount for the invoice.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'subtotal'        => array(
-		'description' => __( 'Invoice subtotal.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'total'           => array(
-		'description' => __( 'Grand total.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'initial_total'   => array(
-		'description' => __( 'Initial total (for recurring invoices).', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'recurring_total'  => array(
-		'description' => __( 'Recurring total (for recurring invoices).', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'totals'          => array(
-		'description' => __( 'Invoice totals.', 'invoicing' ),
-		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'fees'            => array(
-		'description' => __( 'Invoice fees (Name => properties).', 'invoicing' ),
-		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'items'       => array(
-			'type'                => 'object',
-			'required'            => array( 'amount' ),
-			'properties'          => array(
-				'amount'          => array(
-					'description' => __( 'Fee amount.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'recurring'       => array(
-					'description' => __( 'Whether this is a recurring or one-time fee.', 'invoicing' ),
-					'type'        => array( 'boolean', 'integer' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-			),
-		),
-	),
-
-	'discounts'       => array(
-		'description' => __( 'Invoice discounts (Name => properties).', 'invoicing' ),
-		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'items'       => array(
-			'type'                => 'object',
-			'required'            => array( 'amount' ),
-			'properties'          => array(
-				'amount'          => array(
-					'description' => __( 'Fee amount.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'recurring'       => array(
-					'description' => __( 'Whether this is a recurring or one-time discount.', 'invoicing' ),
-					'type'        => array( 'boolean', 'integer' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-			),
-		),
-	),
-
-	'taxes'           => array(
-		'description' => __( 'Invoice taxes (Name => properties).', 'invoicing' ),
-		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'items'       => array(
-			'type'                => 'object',
-			'required'            => array( 'amount' ),
-			'properties'          => array(
-				'amount'          => array(
-					'description' => __( 'Fee amount.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'recurring'       => array(
-					'description' => __( 'Whether this is a recurring or one-time tax.', 'invoicing' ),
-					'type'        => array( 'boolean', 'integer' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-			),
-		),
-	),
-
-	'items'           => array(
-		'description' => __( 'Invoice items.', 'invoicing' ),
-		'type'        => 'array',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'items'       => array(
-			'type'                => 'object',
-			'required'            => array( 'item_id' ),
-			'properties'          => array(
-				'item_id'         => array(
-					'description' => __( 'Item ID.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'item_name'       => array(
-					'description' => __( 'Item Name.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'item_description' => array(
-					'description'  => __( 'Item Description.', 'invoicing' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit', 'embed' ),
-				),
-				'item_price'      => array(
-					'description' => __( 'Item Price.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'quantity'        => array(
-					'description' => __( 'Item Quantity.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'subtotal'        => array(
-					'description' => __( 'Item Subtotal.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-				'meta'            => array(
-					'description' => __( 'Item Meta.', 'invoicing' ),
-					'type'        => 'object',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-			),
-		),
-	),
-
-	'mode'			  => array(
-		'description' => __( 'The invoice transaction mode.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'enum'        => array( 'live', 'test' ),
-		'readonly'    => true,
-	),
+    'id'              => array(
+        'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'parent_id'       => array(
+        'description' => __( 'Parent invoice ID.', 'invoicing' ),
+        'type'        => 'integer',
+        'minimum'     => 0,
+        'default'     => 0,
+        'context'     => array( 'view', 'edit' ),
+    ),
+
+    'key'			  => array(
+        'description' => __( 'A unique key for the invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit' ),
+        'readonly'    => true,
+    ),
+
+    'number'		  => array(
+        'description' => __( 'A unique number for the invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'type'			  => array(
+        'description' => __( 'Get the invoice type (e.g invoice, quote etc).', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'post_type'		  => array(
+        'description' => __( 'Get the invoice post type (e.g wpi_invoice, wpi_quote etc).', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'version'         => array(
+        'description' => __( 'Version of GetPaid/Invoicing which last updated the invoice.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit' ),
+        'readonly'    => true,
+    ),
+
+    'template'        => array(
+        'description' => __( 'The invoice template.', 'invoicing' ),
+        'type'        => 'string',
+        'default'     => 'quantity',
+        'enum'        => array( 'quantity', 'hours', 'amount' ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'status'          => array(
+        'description' => __( 'Invoice status.', 'invoicing' ),
+        'type'        => 'string',
+        'default'     => 'wpi-pending',
+        'enum'        => array_keys( wpinv_get_invoice_statuses( true ) ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'status_nicename' => array(
+        'description' => __( 'A human readable name for the invoice status.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'currency'        => array(
+        'description' => __( 'The invoice currency in ISO format.', 'invoicing' ),
+        'type'        => 'string',
+        'default'     => wpinv_get_currency(),
+        'enum'        => array_keys( wpinv_get_currencies() ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'date_created'    => array(
+        'description' => __( "The date the invoice was created, in the site's timezone.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'date_created_gmt'    => array(
+        'description' => __( 'The GMT date the invoice was created.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'date_modified'   => array(
+        'description' => __( "The date the invoice was last modified, in the site's timezone.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'date_modified_gmt'    => array(
+        'description' => __( 'The GMT date the invoice was last modified.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'due_date'        => array(
+        'description' => __( "The invoice's due date, in the site's timezone.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'due_date_gmt'    => array(
+        'description' => __( 'The GMT date the invoice is/was due.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'completed_date'  => array(
+        'description' => __( "The date the invoice was paid, in the site's timezone.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'completed_date_gmt'    => array(
+        'description' => __( 'The GMT date the invoice was paid.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'total_discount'   => array(
+        'description' => __( 'Total discount amount for the invoice.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'total_tax'       => array(
+        'description' => __( 'Total tax amount for the invoice.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'total_fees'      => array(
+        'description' => __( 'Total fees amount for the invoice.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'subtotal'        => array(
+        'description' => __( 'Invoice subtotal.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'total'           => array(
+        'description' => __( 'Grand total.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'initial_total'   => array(
+        'description' => __( 'Initial total (for recurring invoices).', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'recurring_total'  => array(
+        'description' => __( 'Recurring total (for recurring invoices).', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'totals'          => array(
+        'description' => __( 'Invoice totals.', 'invoicing' ),
+        'type'        => 'object',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'fees'            => array(
+        'description' => __( 'Invoice fees (Name => properties).', 'invoicing' ),
+        'type'        => 'object',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'items'       => array(
+            'type'                => 'object',
+            'required'            => array( 'amount' ),
+            'properties'          => array(
+                'amount'          => array(
+                    'description' => __( 'Fee amount.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'recurring'       => array(
+                    'description' => __( 'Whether this is a recurring or one-time fee.', 'invoicing' ),
+                    'type'        => array( 'boolean', 'integer' ),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+            ),
+        ),
+    ),
+
+    'discounts'       => array(
+        'description' => __( 'Invoice discounts (Name => properties).', 'invoicing' ),
+        'type'        => 'object',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'items'       => array(
+            'type'                => 'object',
+            'required'            => array( 'amount' ),
+            'properties'          => array(
+                'amount'          => array(
+                    'description' => __( 'Fee amount.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'recurring'       => array(
+                    'description' => __( 'Whether this is a recurring or one-time discount.', 'invoicing' ),
+                    'type'        => array( 'boolean', 'integer' ),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+            ),
+        ),
+    ),
+
+    'taxes'           => array(
+        'description' => __( 'Invoice taxes (Name => properties).', 'invoicing' ),
+        'type'        => 'object',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'items'       => array(
+            'type'                => 'object',
+            'required'            => array( 'amount' ),
+            'properties'          => array(
+                'amount'          => array(
+                    'description' => __( 'Fee amount.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'recurring'       => array(
+                    'description' => __( 'Whether this is a recurring or one-time tax.', 'invoicing' ),
+                    'type'        => array( 'boolean', 'integer' ),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+            ),
+        ),
+    ),
+
+    'items'           => array(
+        'description' => __( 'Invoice items.', 'invoicing' ),
+        'type'        => 'array',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'items'       => array(
+            'type'                => 'object',
+            'required'            => array( 'item_id' ),
+            'properties'          => array(
+                'item_id'         => array(
+                    'description' => __( 'Item ID.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'item_name'       => array(
+                    'description' => __( 'Item Name.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'item_description' => array(
+                    'description'  => __( 'Item Description.', 'invoicing' ),
+                    'type'         => 'string',
+                    'context'      => array( 'view', 'edit', 'embed' ),
+                ),
+                'item_price'      => array(
+                    'description' => __( 'Item Price.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'quantity'        => array(
+                    'description' => __( 'Item Quantity.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'subtotal'        => array(
+                    'description' => __( 'Item Subtotal.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+                'meta'            => array(
+                    'description' => __( 'Item Meta.', 'invoicing' ),
+                    'type'        => 'object',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+            ),
+        ),
+    ),
+
+    'mode'			  => array(
+        'description' => __( 'The invoice transaction mode.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'enum'        => array( 'live', 'test' ),
+        'readonly'    => true,
+    ),
 	
-	'discount_code'   => array(
-		'description' => __( 'The discount code used on this invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'gateway'         => array(
-		'description' => __( 'The gateway used to pay this invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'gateway_title'   => array(
-		'description' => __( 'The title of the gateway used to pay this invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'transaction_id'  => array(
-		'description' => __( 'The transaction id for this invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
+    'discount_code'   => array(
+        'description' => __( 'The discount code used on this invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'gateway'         => array(
+        'description' => __( 'The gateway used to pay this invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'gateway_title'   => array(
+        'description' => __( 'The title of the gateway used to pay this invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'transaction_id'  => array(
+        'description' => __( 'The transaction id for this invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
 	
-	'disable_taxes'   => array(
-		'description' => __( 'Whether or not taxes should be disabled for this invoice.', 'invoicing' ),
-		'type'        => 'boolean ',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'is_viewed'       => array(
-		'description' => __( 'Whether or not this invoice has been viewed by the user.', 'invoicing' ),
-		'type'        => 'boolean ',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'email_cc'        => array(
-		'description' => __( 'A comma separated list of other emails that should receive communications for this invoice.', 'invoicing' ),
-		'type'        => 'string ',
-		'context'     => array( 'view', 'edit' ),
-	),
-
-	'subscription_id' => array(
-		'description' => __( 'The ID of the subscription associated with this invoice.', 'invoicing' ),
-		'type'        => 'string ',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'subscription_name' => array(
-		'description' => __( 'The name of the subscription associated with this invoice.', 'invoicing' ),
-		'type'        => 'string ',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'subscription_name' => array(
-		'description' => __( 'The name of the subscription associated with this invoice.', 'invoicing' ),
-		'type'        => 'string ',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_parent'		  => array(
-		'description' => __( 'Whether or not this is a parent invoice.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_renewal'      => array(
-		'description' => __( 'Whether or not this is a renewal invoice.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_recurring'    => array(
-		'description' => __( 'Whether or not this is a recurring invoice.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_free'         => array(
-		'description' => __( 'Whether or not this invoice is free.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_paid'         => array(
-		'description' => __( 'Whether or not this invoice has been paid.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'needs_payment'   => array(
-		'description' => __( 'Whether or not this invoice needs payment.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_refunded'     => array(
-		'description' => __( 'Whether or not this invoice was refunded.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_due'          => array(
-		'description' => __( 'Whether or not this invoice is due.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_held'         => array(
-		'description' => __( 'Whether or not this invoice has been held for payment confirmation.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_draft'        => array(
-		'description' => __( 'Whether or not this invoice is marked as draft (cannot be viewed on the frontend).', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'path'			  => array(
-		'description' => __( 'The invoice path/slug/name.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'description'     => array(
-		'description' => __( 'The invoice description.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'payment_form'    => array(
-		'description' => __( 'The id of the payment form used to pay for this invoice.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit' ),
-		'readonly'    => true,
-	),
-
-	'submission_id'   => array(
-		'description' => __( 'A uniques ID of the submission details used to pay for this invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit' ),
-		'readonly'    => true,
-	),
-
-	'customer_id'     => array(
-		'description' => __( 'The customer id.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'customer_ip'     => array(
-		'description' => __( "The customer's ip address.", 'invoicing' ),
-		'type'        => 'string',
-		'format'      => 'ip',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'first_name'     => array(
-		'description' => __( "The customer's first name.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'last_name'       => array(
-		'description' => __( "The customer's last name.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
+    'disable_taxes'   => array(
+        'description' => __( 'Whether or not taxes should be disabled for this invoice.', 'invoicing' ),
+        'type'        => 'boolean ',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'is_viewed'       => array(
+        'description' => __( 'Whether or not this invoice has been viewed by the user.', 'invoicing' ),
+        'type'        => 'boolean ',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'email_cc'        => array(
+        'description' => __( 'A comma separated list of other emails that should receive communications for this invoice.', 'invoicing' ),
+        'type'        => 'string ',
+        'context'     => array( 'view', 'edit' ),
+    ),
+
+    'subscription_id' => array(
+        'description' => __( 'The ID of the subscription associated with this invoice.', 'invoicing' ),
+        'type'        => 'string ',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'subscription_name' => array(
+        'description' => __( 'The name of the subscription associated with this invoice.', 'invoicing' ),
+        'type'        => 'string ',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'subscription_name' => array(
+        'description' => __( 'The name of the subscription associated with this invoice.', 'invoicing' ),
+        'type'        => 'string ',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_parent'		  => array(
+        'description' => __( 'Whether or not this is a parent invoice.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_renewal'      => array(
+        'description' => __( 'Whether or not this is a renewal invoice.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_recurring'    => array(
+        'description' => __( 'Whether or not this is a recurring invoice.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_free'         => array(
+        'description' => __( 'Whether or not this invoice is free.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_paid'         => array(
+        'description' => __( 'Whether or not this invoice has been paid.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'needs_payment'   => array(
+        'description' => __( 'Whether or not this invoice needs payment.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_refunded'     => array(
+        'description' => __( 'Whether or not this invoice was refunded.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_due'          => array(
+        'description' => __( 'Whether or not this invoice is due.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_held'         => array(
+        'description' => __( 'Whether or not this invoice has been held for payment confirmation.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_draft'        => array(
+        'description' => __( 'Whether or not this invoice is marked as draft (cannot be viewed on the frontend).', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'path'			  => array(
+        'description' => __( 'The invoice path/slug/name.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'description'     => array(
+        'description' => __( 'The invoice description.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'payment_form'    => array(
+        'description' => __( 'The id of the payment form used to pay for this invoice.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit' ),
+        'readonly'    => true,
+    ),
+
+    'submission_id'   => array(
+        'description' => __( 'A uniques ID of the submission details used to pay for this invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit' ),
+        'readonly'    => true,
+    ),
+
+    'customer_id'     => array(
+        'description' => __( 'The customer id.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'customer_ip'     => array(
+        'description' => __( "The customer's ip address.", 'invoicing' ),
+        'type'        => 'string',
+        'format'      => 'ip',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'first_name'     => array(
+        'description' => __( "The customer's first name.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'last_name'       => array(
+        'description' => __( "The customer's last name.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
 	
-	'full_name'       => array(
-		'description' => __( "The customer's full name.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'phone_number'    => array(
-		'description' => __( "The customer's phone number.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'email_address'   => array(
-		'description' => __( "The customer's email address.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'customer_country'   => array(
-		'description'    => __( "The customer's country.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-		'default'        => wpinv_get_default_country(),
-	),
-
-	'customer_state'     => array(
-		'description'    => __( "The customer's state.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'customer_city'      => array(
-		'description'    => __( "The customer's city.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'customer_zip'       => array(
-		'description'    => __( "The customer's zip/postal code.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'customer_company'   => array(
-		'description'    => __( "The customer's company name.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'vat_number'         => array(
-		'description'    => __( "The customer's VAT number.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'vat_rate'           => array(
-		'description'    => __( "The customer's VAT rate.", 'invoicing' ),
-		'type'           => 'number',
-		'context'        => array( 'view', 'edit', 'embed' ),
-		'readonly'       => true,
-	),
-
-	'customer_address'   => array(
-		'description'    => __( "The customer's address.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'address_confirmed'  => array(
-		'description'    => __( "Whether or not the customer's address is confirmed.", 'invoicing' ),
-		'type'           => 'boolean',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'meta_data'       => array(
-		'description' => __( 'Invoice meta data.', 'invoicing' ),
-		'type'        => 'array',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'items'       => array(
-			'type'                => 'object',
-			'properties'          => array(
-				'id'              => array(
-					'description' => __( 'Meta ID.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'key'             => array(
-					'description' => __( 'Meta key.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'value'           => array(
-					'description' => __( 'Meta Value.', 'invoicing' ),
-					'type'        => array( 'string', 'array', 'object', 'integer', 'null' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-			),
-		),
-	),
-
-	'view_url'        => array(
-		'description' => __( 'URL to the invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'format'      => 'uri',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'checkout_payment_url'         => array(
-		'description' => __( 'URL to the invoice checkout page.', 'invoicing' ),
-		'type'        => 'string',
-		'format'      => 'uri',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'receipt_url'     => array(
-		'description' => __( 'URL to the invoice receipt page.', 'invoicing' ),
-		'type'        => 'string',
-		'format'      => 'uri',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
+    'full_name'       => array(
+        'description' => __( "The customer's full name.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'phone_number'    => array(
+        'description' => __( "The customer's phone number.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'email_address'   => array(
+        'description' => __( "The customer's email address.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'customer_country'   => array(
+        'description'    => __( "The customer's country.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+        'default'        => wpinv_get_default_country(),
+    ),
+
+    'customer_state'     => array(
+        'description'    => __( "The customer's state.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'customer_city'      => array(
+        'description'    => __( "The customer's city.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'customer_zip'       => array(
+        'description'    => __( "The customer's zip/postal code.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'customer_company'   => array(
+        'description'    => __( "The customer's company name.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'vat_number'         => array(
+        'description'    => __( "The customer's VAT number.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'vat_rate'           => array(
+        'description'    => __( "The customer's VAT rate.", 'invoicing' ),
+        'type'           => 'number',
+        'context'        => array( 'view', 'edit', 'embed' ),
+        'readonly'       => true,
+    ),
+
+    'customer_address'   => array(
+        'description'    => __( "The customer's address.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'address_confirmed'  => array(
+        'description'    => __( "Whether or not the customer's address is confirmed.", 'invoicing' ),
+        'type'           => 'boolean',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'meta_data'       => array(
+        'description' => __( 'Invoice meta data.', 'invoicing' ),
+        'type'        => 'array',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'items'       => array(
+            'type'                => 'object',
+            'properties'          => array(
+                'id'              => array(
+                    'description' => __( 'Meta ID.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'key'             => array(
+                    'description' => __( 'Meta key.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'value'           => array(
+                    'description' => __( 'Meta Value.', 'invoicing' ),
+                    'type'        => array( 'string', 'array', 'object', 'integer', 'null' ),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+            ),
+        ),
+    ),
+
+    'view_url'        => array(
+        'description' => __( 'URL to the invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'format'      => 'uri',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'checkout_payment_url'         => array(
+        'description' => __( 'URL to the invoice checkout page.', 'invoicing' ),
+        'type'        => 'string',
+        'format'      => 'uri',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'receipt_url'     => array(
+        'description' => __( 'URL to the invoice receipt page.', 'invoicing' ),
+        'type'        => 'string',
+        'format'      => 'uri',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
 
 );

Spacing +197 added lines, -197 removed lines

@@ -9,632 +9,632 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 
 	'id'              => array(
-		'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
+		'description' => __('Unique identifier for the invoice.', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'parent_id'       => array(
-		'description' => __( 'Parent invoice ID.', 'invoicing' ),
+		'description' => __('Parent invoice ID.', 'invoicing'),
 		'type'        => 'integer',
 		'minimum'     => 0,
 		'default'     => 0,
-		'context'     => array( 'view', 'edit' ),
+		'context'     => array('view', 'edit'),
 	),
 
 	'key'			  => array(
-		'description' => __( 'A unique key for the invoice.', 'invoicing' ),
+		'description' => __('A unique key for the invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit' ),
+		'context'     => array('view', 'edit'),
 		'readonly'    => true,
 	),
 
 	'number'		  => array(
-		'description' => __( 'A unique number for the invoice.', 'invoicing' ),
+		'description' => __('A unique number for the invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'type'			  => array(
-		'description' => __( 'Get the invoice type (e.g invoice, quote etc).', 'invoicing' ),
+		'description' => __('Get the invoice type (e.g invoice, quote etc).', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'post_type'		  => array(
-		'description' => __( 'Get the invoice post type (e.g wpi_invoice, wpi_quote etc).', 'invoicing' ),
+		'description' => __('Get the invoice post type (e.g wpi_invoice, wpi_quote etc).', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'version'         => array(
-		'description' => __( 'Version of GetPaid/Invoicing which last updated the invoice.', 'invoicing' ),
+		'description' => __('Version of GetPaid/Invoicing which last updated the invoice.', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit' ),
+		'context'     => array('view', 'edit'),
 		'readonly'    => true,
 	),
 
 	'template'        => array(
-		'description' => __( 'The invoice template.', 'invoicing' ),
+		'description' => __('The invoice template.', 'invoicing'),
 		'type'        => 'string',
 		'default'     => 'quantity',
-		'enum'        => array( 'quantity', 'hours', 'amount' ),
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'enum'        => array('quantity', 'hours', 'amount'),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'status'          => array(
-		'description' => __( 'Invoice status.', 'invoicing' ),
+		'description' => __('Invoice status.', 'invoicing'),
 		'type'        => 'string',
 		'default'     => 'wpi-pending',
-		'enum'        => array_keys( wpinv_get_invoice_statuses( true ) ),
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'enum'        => array_keys(wpinv_get_invoice_statuses(true)),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'status_nicename' => array(
-		'description' => __( 'A human readable name for the invoice status.', 'invoicing' ),
+		'description' => __('A human readable name for the invoice status.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'currency'        => array(
-		'description' => __( 'The invoice currency in ISO format.', 'invoicing' ),
+		'description' => __('The invoice currency in ISO format.', 'invoicing'),
 		'type'        => 'string',
 		'default'     => wpinv_get_currency(),
-		'enum'        => array_keys( wpinv_get_currencies() ),
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'enum'        => array_keys(wpinv_get_currencies()),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'date_created'    => array(
-		'description' => __( "The date the invoice was created, in the site's timezone.", 'invoicing' ),
+		'description' => __("The date the invoice was created, in the site's timezone.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'date_created_gmt'    => array(
-		'description' => __( 'The GMT date the invoice was created.', 'invoicing' ),
+		'description' => __('The GMT date the invoice was created.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'date_modified'   => array(
-		'description' => __( "The date the invoice was last modified, in the site's timezone.", 'invoicing' ),
+		'description' => __("The date the invoice was last modified, in the site's timezone.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'date_modified_gmt'    => array(
-		'description' => __( 'The GMT date the invoice was last modified.', 'invoicing' ),
+		'description' => __('The GMT date the invoice was last modified.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'due_date'        => array(
-		'description' => __( "The invoice's due date, in the site's timezone.", 'invoicing' ),
+		'description' => __("The invoice's due date, in the site's timezone.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'due_date_gmt'    => array(
-		'description' => __( 'The GMT date the invoice is/was due.', 'invoicing' ),
+		'description' => __('The GMT date the invoice is/was due.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'completed_date'  => array(
-		'description' => __( "The date the invoice was paid, in the site's timezone.", 'invoicing' ),
+		'description' => __("The date the invoice was paid, in the site's timezone.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'completed_date_gmt'    => array(
-		'description' => __( 'The GMT date the invoice was paid.', 'invoicing' ),
+		'description' => __('The GMT date the invoice was paid.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'total_discount'   => array(
-		'description' => __( 'Total discount amount for the invoice.', 'invoicing' ),
+		'description' => __('Total discount amount for the invoice.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'total_tax'       => array(
-		'description' => __( 'Total tax amount for the invoice.', 'invoicing' ),
+		'description' => __('Total tax amount for the invoice.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'total_fees'      => array(
-		'description' => __( 'Total fees amount for the invoice.', 'invoicing' ),
+		'description' => __('Total fees amount for the invoice.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'subtotal'        => array(
-		'description' => __( 'Invoice subtotal.', 'invoicing' ),
+		'description' => __('Invoice subtotal.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'total'           => array(
-		'description' => __( 'Grand total.', 'invoicing' ),
+		'description' => __('Grand total.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'initial_total'   => array(
-		'description' => __( 'Initial total (for recurring invoices).', 'invoicing' ),
+		'description' => __('Initial total (for recurring invoices).', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'recurring_total'  => array(
-		'description' => __( 'Recurring total (for recurring invoices).', 'invoicing' ),
+		'description' => __('Recurring total (for recurring invoices).', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'totals'          => array(
-		'description' => __( 'Invoice totals.', 'invoicing' ),
+		'description' => __('Invoice totals.', 'invoicing'),
 		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'fees'            => array(
-		'description' => __( 'Invoice fees (Name => properties).', 'invoicing' ),
+		'description' => __('Invoice fees (Name => properties).', 'invoicing'),
 		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'items'       => array(
 			'type'                => 'object',
-			'required'            => array( 'amount' ),
+			'required'            => array('amount'),
 			'properties'          => array(
 				'amount'          => array(
-					'description' => __( 'Fee amount.', 'invoicing' ),
+					'description' => __('Fee amount.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'recurring'       => array(
-					'description' => __( 'Whether this is a recurring or one-time fee.', 'invoicing' ),
-					'type'        => array( 'boolean', 'integer' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'description' => __('Whether this is a recurring or one-time fee.', 'invoicing'),
+					'type'        => array('boolean', 'integer'),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 			),
 		),
 	),
 
 	'discounts'       => array(
-		'description' => __( 'Invoice discounts (Name => properties).', 'invoicing' ),
+		'description' => __('Invoice discounts (Name => properties).', 'invoicing'),
 		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'items'       => array(
 			'type'                => 'object',
-			'required'            => array( 'amount' ),
+			'required'            => array('amount'),
 			'properties'          => array(
 				'amount'          => array(
-					'description' => __( 'Fee amount.', 'invoicing' ),
+					'description' => __('Fee amount.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'recurring'       => array(
-					'description' => __( 'Whether this is a recurring or one-time discount.', 'invoicing' ),
-					'type'        => array( 'boolean', 'integer' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'description' => __('Whether this is a recurring or one-time discount.', 'invoicing'),
+					'type'        => array('boolean', 'integer'),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 			),
 		),
 	),
 
 	'taxes'           => array(
-		'description' => __( 'Invoice taxes (Name => properties).', 'invoicing' ),
+		'description' => __('Invoice taxes (Name => properties).', 'invoicing'),
 		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'items'       => array(
 			'type'                => 'object',
-			'required'            => array( 'amount' ),
+			'required'            => array('amount'),
 			'properties'          => array(
 				'amount'          => array(
-					'description' => __( 'Fee amount.', 'invoicing' ),
+					'description' => __('Fee amount.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'recurring'       => array(
-					'description' => __( 'Whether this is a recurring or one-time tax.', 'invoicing' ),
-					'type'        => array( 'boolean', 'integer' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'description' => __('Whether this is a recurring or one-time tax.', 'invoicing'),
+					'type'        => array('boolean', 'integer'),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 			),
 		),
 	),
 
 	'items'           => array(
-		'description' => __( 'Invoice items.', 'invoicing' ),
+		'description' => __('Invoice items.', 'invoicing'),
 		'type'        => 'array',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'items'       => array(
 			'type'                => 'object',
-			'required'            => array( 'item_id' ),
+			'required'            => array('item_id'),
 			'properties'          => array(
 				'item_id'         => array(
-					'description' => __( 'Item ID.', 'invoicing' ),
+					'description' => __('Item ID.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'item_name'       => array(
-					'description' => __( 'Item Name.', 'invoicing' ),
+					'description' => __('Item Name.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'item_description' => array(
-					'description'  => __( 'Item Description.', 'invoicing' ),
+					'description'  => __('Item Description.', 'invoicing'),
 					'type'         => 'string',
-					'context'      => array( 'view', 'edit', 'embed' ),
+					'context'      => array('view', 'edit', 'embed'),
 				),
 				'item_price'      => array(
-					'description' => __( 'Item Price.', 'invoicing' ),
+					'description' => __('Item Price.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'quantity'        => array(
-					'description' => __( 'Item Quantity.', 'invoicing' ),
+					'description' => __('Item Quantity.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'subtotal'        => array(
-					'description' => __( 'Item Subtotal.', 'invoicing' ),
+					'description' => __('Item Subtotal.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 				'meta'            => array(
-					'description' => __( 'Item Meta.', 'invoicing' ),
+					'description' => __('Item Meta.', 'invoicing'),
 					'type'        => 'object',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 			),
 		),
 	),
 
 	'mode'			  => array(
-		'description' => __( 'The invoice transaction mode.', 'invoicing' ),
+		'description' => __('The invoice transaction mode.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'enum'        => array( 'live', 'test' ),
+		'context'     => array('view', 'edit', 'embed'),
+		'enum'        => array('live', 'test'),
 		'readonly'    => true,
 	),
 	
 	'discount_code'   => array(
-		'description' => __( 'The discount code used on this invoice.', 'invoicing' ),
+		'description' => __('The discount code used on this invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'gateway'         => array(
-		'description' => __( 'The gateway used to pay this invoice.', 'invoicing' ),
+		'description' => __('The gateway used to pay this invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'gateway_title'   => array(
-		'description' => __( 'The title of the gateway used to pay this invoice.', 'invoicing' ),
+		'description' => __('The title of the gateway used to pay this invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'transaction_id'  => array(
-		'description' => __( 'The transaction id for this invoice.', 'invoicing' ),
+		'description' => __('The transaction id for this invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 	
 	'disable_taxes'   => array(
-		'description' => __( 'Whether or not taxes should be disabled for this invoice.', 'invoicing' ),
+		'description' => __('Whether or not taxes should be disabled for this invoice.', 'invoicing'),
 		'type'        => 'boolean ',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'is_viewed'       => array(
-		'description' => __( 'Whether or not this invoice has been viewed by the user.', 'invoicing' ),
+		'description' => __('Whether or not this invoice has been viewed by the user.', 'invoicing'),
 		'type'        => 'boolean ',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'email_cc'        => array(
-		'description' => __( 'A comma separated list of other emails that should receive communications for this invoice.', 'invoicing' ),
+		'description' => __('A comma separated list of other emails that should receive communications for this invoice.', 'invoicing'),
 		'type'        => 'string ',
-		'context'     => array( 'view', 'edit' ),
+		'context'     => array('view', 'edit'),
 	),
 
 	'subscription_id' => array(
-		'description' => __( 'The ID of the subscription associated with this invoice.', 'invoicing' ),
+		'description' => __('The ID of the subscription associated with this invoice.', 'invoicing'),
 		'type'        => 'string ',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'subscription_name' => array(
-		'description' => __( 'The name of the subscription associated with this invoice.', 'invoicing' ),
+		'description' => __('The name of the subscription associated with this invoice.', 'invoicing'),
 		'type'        => 'string ',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'subscription_name' => array(
-		'description' => __( 'The name of the subscription associated with this invoice.', 'invoicing' ),
+		'description' => __('The name of the subscription associated with this invoice.', 'invoicing'),
 		'type'        => 'string ',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_parent'		  => array(
-		'description' => __( 'Whether or not this is a parent invoice.', 'invoicing' ),
+		'description' => __('Whether or not this is a parent invoice.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_renewal'      => array(
-		'description' => __( 'Whether or not this is a renewal invoice.', 'invoicing' ),
+		'description' => __('Whether or not this is a renewal invoice.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_recurring'    => array(
-		'description' => __( 'Whether or not this is a recurring invoice.', 'invoicing' ),
+		'description' => __('Whether or not this is a recurring invoice.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_free'         => array(
-		'description' => __( 'Whether or not this invoice is free.', 'invoicing' ),
+		'description' => __('Whether or not this invoice is free.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_paid'         => array(
-		'description' => __( 'Whether or not this invoice has been paid.', 'invoicing' ),
+		'description' => __('Whether or not this invoice has been paid.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'needs_payment'   => array(
-		'description' => __( 'Whether or not this invoice needs payment.', 'invoicing' ),
+		'description' => __('Whether or not this invoice needs payment.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_refunded'     => array(
-		'description' => __( 'Whether or not this invoice was refunded.', 'invoicing' ),
+		'description' => __('Whether or not this invoice was refunded.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_due'          => array(
-		'description' => __( 'Whether or not this invoice is due.', 'invoicing' ),
+		'description' => __('Whether or not this invoice is due.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_held'         => array(
-		'description' => __( 'Whether or not this invoice has been held for payment confirmation.', 'invoicing' ),
+		'description' => __('Whether or not this invoice has been held for payment confirmation.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_draft'        => array(
-		'description' => __( 'Whether or not this invoice is marked as draft (cannot be viewed on the frontend).', 'invoicing' ),
+		'description' => __('Whether or not this invoice is marked as draft (cannot be viewed on the frontend).', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'path'			  => array(
-		'description' => __( 'The invoice path/slug/name.', 'invoicing' ),
+		'description' => __('The invoice path/slug/name.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'description'     => array(
-		'description' => __( 'The invoice description.', 'invoicing' ),
+		'description' => __('The invoice description.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'payment_form'    => array(
-		'description' => __( 'The id of the payment form used to pay for this invoice.', 'invoicing' ),
+		'description' => __('The id of the payment form used to pay for this invoice.', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit' ),
+		'context'     => array('view', 'edit'),
 		'readonly'    => true,
 	),
 
 	'submission_id'   => array(
-		'description' => __( 'A uniques ID of the submission details used to pay for this invoice.', 'invoicing' ),
+		'description' => __('A uniques ID of the submission details used to pay for this invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit' ),
+		'context'     => array('view', 'edit'),
 		'readonly'    => true,
 	),
 
 	'customer_id'     => array(
-		'description' => __( 'The customer id.', 'invoicing' ),
+		'description' => __('The customer id.', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'customer_ip'     => array(
-		'description' => __( "The customer's ip address.", 'invoicing' ),
+		'description' => __("The customer's ip address.", 'invoicing'),
 		'type'        => 'string',
 		'format'      => 'ip',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'first_name'     => array(
-		'description' => __( "The customer's first name.", 'invoicing' ),
+		'description' => __("The customer's first name.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'last_name'       => array(
-		'description' => __( "The customer's last name.", 'invoicing' ),
+		'description' => __("The customer's last name.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 	
 	'full_name'       => array(
-		'description' => __( "The customer's full name.", 'invoicing' ),
+		'description' => __("The customer's full name.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'phone_number'    => array(
-		'description' => __( "The customer's phone number.", 'invoicing' ),
+		'description' => __("The customer's phone number.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'email_address'   => array(
-		'description' => __( "The customer's email address.", 'invoicing' ),
+		'description' => __("The customer's email address.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'customer_country'   => array(
-		'description'    => __( "The customer's country.", 'invoicing' ),
+		'description'    => __("The customer's country.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 		'default'        => wpinv_get_default_country(),
 	),
 
 	'customer_state'     => array(
-		'description'    => __( "The customer's state.", 'invoicing' ),
+		'description'    => __("The customer's state.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'customer_city'      => array(
-		'description'    => __( "The customer's city.", 'invoicing' ),
+		'description'    => __("The customer's city.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'customer_zip'       => array(
-		'description'    => __( "The customer's zip/postal code.", 'invoicing' ),
+		'description'    => __("The customer's zip/postal code.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'customer_company'   => array(
-		'description'    => __( "The customer's company name.", 'invoicing' ),
+		'description'    => __("The customer's company name.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'vat_number'         => array(
-		'description'    => __( "The customer's VAT number.", 'invoicing' ),
+		'description'    => __("The customer's VAT number.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'vat_rate'           => array(
-		'description'    => __( "The customer's VAT rate.", 'invoicing' ),
+		'description'    => __("The customer's VAT rate.", 'invoicing'),
 		'type'           => 'number',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 		'readonly'       => true,
 	),
 
 	'customer_address'   => array(
-		'description'    => __( "The customer's address.", 'invoicing' ),
+		'description'    => __("The customer's address.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'address_confirmed'  => array(
-		'description'    => __( "Whether or not the customer's address is confirmed.", 'invoicing' ),
+		'description'    => __("Whether or not the customer's address is confirmed.", 'invoicing'),
 		'type'           => 'boolean',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'meta_data'       => array(
-		'description' => __( 'Invoice meta data.', 'invoicing' ),
+		'description' => __('Invoice meta data.', 'invoicing'),
 		'type'        => 'array',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'items'       => array(
 			'type'                => 'object',
 			'properties'          => array(
 				'id'              => array(
-					'description' => __( 'Meta ID.', 'invoicing' ),
+					'description' => __('Meta ID.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'key'             => array(
-					'description' => __( 'Meta key.', 'invoicing' ),
+					'description' => __('Meta key.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'value'           => array(
-					'description' => __( 'Meta Value.', 'invoicing' ),
-					'type'        => array( 'string', 'array', 'object', 'integer', 'null' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'description' => __('Meta Value.', 'invoicing'),
+					'type'        => array('string', 'array', 'object', 'integer', 'null'),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 			),
 		),
 	),
 
 	'view_url'        => array(
-		'description' => __( 'URL to the invoice.', 'invoicing' ),
+		'description' => __('URL to the invoice.', 'invoicing'),
 		'type'        => 'string',
 		'format'      => 'uri',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'checkout_payment_url'         => array(
-		'description' => __( 'URL to the invoice checkout page.', 'invoicing' ),
+		'description' => __('URL to the invoice checkout page.', 'invoicing'),
 		'type'        => 'string',
 		'format'      => 'uri',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'receipt_url'     => array(
-		'description' => __( 'URL to the invoice receipt page.', 'invoicing' ),
+		'description' => __('URL to the invoice receipt page.', 'invoicing'),
 		'type'        => 'string',
 		'format'      => 'uri',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 

includes/data-stores/class-getpaid-item-data-store.php

Indentation +209 added lines, -209 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -14,228 +14,228 @@ 
  */
 class GetPaid_Item_Data_Store extends GetPaid_Data_Store_WP {
 
-	/**
-	 * Data stored in meta keys, but not considered "meta" for an item.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $internal_meta_keys = array(
-		'_wpinv_price',
-		'_wpinv_vat_rule',
-		'_wpinv_vat_class',
-		'_wpinv_type',
-		'_wpinv_custom_id',
-		'_wpinv_custom_name',
-		'_wpinv_custom_singular_name',
-		'_wpinv_editable',
-		'_wpinv_dynamic_pricing',
-		'_minimum_price',
-		'_wpinv_is_recurring',
-		'_wpinv_recurring_period',
-		'_wpinv_recurring_interval',
-		'_wpinv_recurring_limit',
-		'_wpinv_free_trial',
-		'_wpinv_trial_period',
-		'_wpinv_trial_interval'
-	);
-
-	/**
-	 * A map of meta keys to data props.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @var array
-	 */
-	protected $meta_key_to_props = array(
-		'_wpinv_price'                => 'price',
-		'_wpinv_vat_rule'             => 'vat_rule',
-		'_wpinv_vat_class'            => 'vat_class',
-		'_wpinv_type'                 => 'type',
-		'_wpinv_custom_id'            => 'custom_id',
-		'_wpinv_custom_name'          => 'custom_name',
-		'_wpinv_custom_singular_name' => 'custom_singular_name',
-		'_wpinv_editable'             => 'is_editable',
-		'_wpinv_dynamic_pricing'      => 'is_dynamic_pricing',
-		'_minimum_price'              => 'minimum_price',
-		'_wpinv_custom_name'          => 'custom_name',
-		'_wpinv_is_recurring'         => 'is_recurring',
-		'_wpinv_recurring_period'     => 'recurring_period',
-		'_wpinv_recurring_interval'   => 'recurring_interval',
-		'_wpinv_recurring_limit'      => 'recurring_limit',
-		'_wpinv_free_trial'           => 'is_free_trial',
-		'_wpinv_trial_period'         => 'trial_period',
-		'_wpinv_trial_interval'       => 'trial_interval',
-		'_wpinv_version'              => 'version',
-	);
-
-	/*
+    /**
+     * Data stored in meta keys, but not considered "meta" for an item.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $internal_meta_keys = array(
+        '_wpinv_price',
+        '_wpinv_vat_rule',
+        '_wpinv_vat_class',
+        '_wpinv_type',
+        '_wpinv_custom_id',
+        '_wpinv_custom_name',
+        '_wpinv_custom_singular_name',
+        '_wpinv_editable',
+        '_wpinv_dynamic_pricing',
+        '_minimum_price',
+        '_wpinv_is_recurring',
+        '_wpinv_recurring_period',
+        '_wpinv_recurring_interval',
+        '_wpinv_recurring_limit',
+        '_wpinv_free_trial',
+        '_wpinv_trial_period',
+        '_wpinv_trial_interval'
+    );
+
+    /**
+     * A map of meta keys to data props.
+     *
+     * @since 1.0.19
+     *
+     * @var array
+     */
+    protected $meta_key_to_props = array(
+        '_wpinv_price'                => 'price',
+        '_wpinv_vat_rule'             => 'vat_rule',
+        '_wpinv_vat_class'            => 'vat_class',
+        '_wpinv_type'                 => 'type',
+        '_wpinv_custom_id'            => 'custom_id',
+        '_wpinv_custom_name'          => 'custom_name',
+        '_wpinv_custom_singular_name' => 'custom_singular_name',
+        '_wpinv_editable'             => 'is_editable',
+        '_wpinv_dynamic_pricing'      => 'is_dynamic_pricing',
+        '_minimum_price'              => 'minimum_price',
+        '_wpinv_custom_name'          => 'custom_name',
+        '_wpinv_is_recurring'         => 'is_recurring',
+        '_wpinv_recurring_period'     => 'recurring_period',
+        '_wpinv_recurring_interval'   => 'recurring_interval',
+        '_wpinv_recurring_limit'      => 'recurring_limit',
+        '_wpinv_free_trial'           => 'is_free_trial',
+        '_wpinv_trial_period'         => 'trial_period',
+        '_wpinv_trial_interval'       => 'trial_interval',
+        '_wpinv_version'              => 'version',
+    );
+
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Method to create a new item in the database.
-	 *
-	 * @param WPInv_Item $item Item object.
-	 */
-	public function create( &$item ) {
-		$item->set_version( WPINV_VERSION );
-		$item->set_date_created( current_time('mysql') );
-
-		// Create a new post.
-		$id = wp_insert_post(
-			apply_filters(
-				'getpaid_new_item_data',
-				array(
-					'post_date'     => $item->get_date_created( 'edit' ),
-					'post_type'     => 'wpi_item',
-					'post_status'   => $this->get_post_status( $item ),
-					'ping_status'   => 'closed',
-					'post_author'   => $item->get_author( 'edit' ),
-					'post_title'    => $item->get_name( 'edit' ),
-					'post_parent'   => 0,
-					'post_excerpt'  => $item->get_description( 'edit' ),
-				)
-			),
-			true
-		);
-
-		if ( $id && ! is_wp_error( $id ) ) {
-			$item->set_id( $id );
-			$this->update_post_meta( $item );
-			$item->save_meta_data();
-			$item->apply_changes();
-			$this->clear_caches( $item );
-			do_action( 'getpaid_new_item', $item );
-			return true;
-		}
-
-		if ( is_wp_error( $id ) ) {
-			$item->last_error = $id->get_error_message();
-		}
+    /**
+     * Method to create a new item in the database.
+     *
+     * @param WPInv_Item $item Item object.
+     */
+    public function create( &$item ) {
+        $item->set_version( WPINV_VERSION );
+        $item->set_date_created( current_time('mysql') );
+
+        // Create a new post.
+        $id = wp_insert_post(
+            apply_filters(
+                'getpaid_new_item_data',
+                array(
+                    'post_date'     => $item->get_date_created( 'edit' ),
+                    'post_type'     => 'wpi_item',
+                    'post_status'   => $this->get_post_status( $item ),
+                    'ping_status'   => 'closed',
+                    'post_author'   => $item->get_author( 'edit' ),
+                    'post_title'    => $item->get_name( 'edit' ),
+                    'post_parent'   => 0,
+                    'post_excerpt'  => $item->get_description( 'edit' ),
+                )
+            ),
+            true
+        );
+
+        if ( $id && ! is_wp_error( $id ) ) {
+            $item->set_id( $id );
+            $this->update_post_meta( $item );
+            $item->save_meta_data();
+            $item->apply_changes();
+            $this->clear_caches( $item );
+            do_action( 'getpaid_new_item', $item );
+            return true;
+        }
+
+        if ( is_wp_error( $id ) ) {
+            $item->last_error = $id->get_error_message();
+        }
 		
-		return false;
-	}
-
-	/**
-	 * Method to read an item from the database.
-	 *
-	 * @param WPInv_Item $item Item object.
-	 *
-	 */
-	public function read( &$item ) {
-
-		$item->set_defaults();
-		$item_object = get_post( $item->get_id() );
-
-		if ( ! $item->get_id() || ! $item_object || $item_object->post_type != 'wpi_item' ) {
-			$item->last_error = __( 'Invalid item.', 'invoicing' );
-			$item->set_id( 0 );
-			return false;
-		}
-
-		$item->set_props(
-			array(
-				'parent_id'     => $item_object->post_parent,
-				'date_created'  => 0 < $item_object->post_date ? $item_object->post_date : null,
-				'date_modified' => 0 < $item_object->post_modified ? $item_object->post_modified : null,
-				'status'        => $item_object->post_status,
-				'name'          => $item_object->post_title,
-				'description'   => $item_object->post_excerpt,
-				'author'        => $item_object->post_author,
-			)
-		);
-
-		$this->read_object_data( $item, $item_object );
-		$item->read_meta_data();
-		$item->set_object_read( true );
-		do_action( 'getpaid_read_item', $item );
-
-	}
-
-	/**
-	 * Method to update an item in the database.
-	 *
-	 * @param WPInv_Item $item Item object.
-	 */
-	public function update( &$item ) {
-		$item->save_meta_data();
-		$item->set_version( WPINV_VERSION );
-
-		if ( null === $item->get_date_created( 'edit' ) ) {
-			$item->set_date_created(  current_time('mysql') );
-		}
-
-		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $item->get_id() );
-
-		$changes = $item->get_changes();
-
-		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'parent_id', 'description', 'name', 'author' ), array_keys( $changes ) ) ) {
-			$post_data = array(
-				'post_date'         => $item->get_date_created( 'edit' ),
-				'post_status'       => $item->get_status( 'edit' ),
-				'post_parent'       => $item->get_parent_id( 'edit' ),
-				'post_excerpt'      => $item->get_description( 'edit' ),
-				'post_modified'     => $item->get_date_modified( 'edit' ),
-				'post_title'        => $item->get_name( 'edit' ),
-				'post_author'       => $item->get_author( 'edit' ),
-			);
-
-			/**
-			 * When updating this object, to prevent infinite loops, use $wpdb
-			 * to update data, since wp_update_post spawns more calls to the
-			 * save_post action.
-			 *
-			 * This ensures hooks are fired by either WP itself (admin screen save),
-			 * or an update purely from CRUD.
-			 */
-			if ( doing_action( 'save_post' ) ) {
-				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $item->get_id() ) );
-				clean_post_cache( $item->get_id() );
-			} else {
-				wp_update_post( array_merge( array( 'ID' => $item->get_id() ), $post_data ) );
-			}
-			$item->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
-		}
-		$this->update_post_meta( $item );
-		$item->apply_changes();
-		$this->clear_caches( $item );
-
-		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $item->get_status( 'edit' );
-
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_item', $item );
-		} else {
-			do_action( 'getpaid_update_item', $item );
-		}
-
-	}
-
-	/*
+        return false;
+    }
+
+    /**
+     * Method to read an item from the database.
+     *
+     * @param WPInv_Item $item Item object.
+     *
+     */
+    public function read( &$item ) {
+
+        $item->set_defaults();
+        $item_object = get_post( $item->get_id() );
+
+        if ( ! $item->get_id() || ! $item_object || $item_object->post_type != 'wpi_item' ) {
+            $item->last_error = __( 'Invalid item.', 'invoicing' );
+            $item->set_id( 0 );
+            return false;
+        }
+
+        $item->set_props(
+            array(
+                'parent_id'     => $item_object->post_parent,
+                'date_created'  => 0 < $item_object->post_date ? $item_object->post_date : null,
+                'date_modified' => 0 < $item_object->post_modified ? $item_object->post_modified : null,
+                'status'        => $item_object->post_status,
+                'name'          => $item_object->post_title,
+                'description'   => $item_object->post_excerpt,
+                'author'        => $item_object->post_author,
+            )
+        );
+
+        $this->read_object_data( $item, $item_object );
+        $item->read_meta_data();
+        $item->set_object_read( true );
+        do_action( 'getpaid_read_item', $item );
+
+    }
+
+    /**
+     * Method to update an item in the database.
+     *
+     * @param WPInv_Item $item Item object.
+     */
+    public function update( &$item ) {
+        $item->save_meta_data();
+        $item->set_version( WPINV_VERSION );
+
+        if ( null === $item->get_date_created( 'edit' ) ) {
+            $item->set_date_created(  current_time('mysql') );
+        }
+
+        // Grab the current status so we can compare.
+        $previous_status = get_post_status( $item->get_id() );
+
+        $changes = $item->get_changes();
+
+        // Only update the post when the post data changes.
+        if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'parent_id', 'description', 'name', 'author' ), array_keys( $changes ) ) ) {
+            $post_data = array(
+                'post_date'         => $item->get_date_created( 'edit' ),
+                'post_status'       => $item->get_status( 'edit' ),
+                'post_parent'       => $item->get_parent_id( 'edit' ),
+                'post_excerpt'      => $item->get_description( 'edit' ),
+                'post_modified'     => $item->get_date_modified( 'edit' ),
+                'post_title'        => $item->get_name( 'edit' ),
+                'post_author'       => $item->get_author( 'edit' ),
+            );
+
+            /**
+             * When updating this object, to prevent infinite loops, use $wpdb
+             * to update data, since wp_update_post spawns more calls to the
+             * save_post action.
+             *
+             * This ensures hooks are fired by either WP itself (admin screen save),
+             * or an update purely from CRUD.
+             */
+            if ( doing_action( 'save_post' ) ) {
+                $GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $item->get_id() ) );
+                clean_post_cache( $item->get_id() );
+            } else {
+                wp_update_post( array_merge( array( 'ID' => $item->get_id() ), $post_data ) );
+            }
+            $item->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+        }
+        $this->update_post_meta( $item );
+        $item->apply_changes();
+        $this->clear_caches( $item );
+
+        // Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
+        $new_status = $item->get_status( 'edit' );
+
+        if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
+            do_action( 'getpaid_new_item', $item );
+        } else {
+            do_action( 'getpaid_update_item', $item );
+        }
+
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Additional Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Helper method that updates all the post meta for an item based on it's settings in the WPInv_Item class.
-	 *
-	 * @param WPInv_Item $item WPInv_Item object.
-	 * @since 1.0.19
-	 */
-	protected function update_post_meta( &$item ) {
+    /**
+     * Helper method that updates all the post meta for an item based on it's settings in the WPInv_Item class.
+     *
+     * @param WPInv_Item $item WPInv_Item object.
+     * @since 1.0.19
+     */
+    protected function update_post_meta( &$item ) {
 
-		// Ensure that we have a custom id.
+        // Ensure that we have a custom id.
         if ( ! $item->get_custom_id() ) {
             $item->set_custom_id( $item->get_id() );
-		}
+        }
 
-		parent::update_post_meta( $item );
-	}
+        parent::update_post_meta( $item );
+    }
 
 }

Spacing +51 added lines, -51 removed lines

@@ -3,7 +3,7 @@ 
  * GetPaid_Item_Data_Store class file.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -80,39 +80,39 @@ 
 	 *
 	 * @param WPInv_Item $item Item object.
 	 */
-	public function create( &$item ) {
-		$item->set_version( WPINV_VERSION );
-		$item->set_date_created( current_time('mysql') );
+	public function create(&$item) {
+		$item->set_version(WPINV_VERSION);
+		$item->set_date_created(current_time('mysql'));
 
 		// Create a new post.
 		$id = wp_insert_post(
 			apply_filters(
 				'getpaid_new_item_data',
 				array(
-					'post_date'     => $item->get_date_created( 'edit' ),
+					'post_date'     => $item->get_date_created('edit'),
 					'post_type'     => 'wpi_item',
-					'post_status'   => $this->get_post_status( $item ),
+					'post_status'   => $this->get_post_status($item),
 					'ping_status'   => 'closed',
-					'post_author'   => $item->get_author( 'edit' ),
-					'post_title'    => $item->get_name( 'edit' ),
+					'post_author'   => $item->get_author('edit'),
+					'post_title'    => $item->get_name('edit'),
 					'post_parent'   => 0,
-					'post_excerpt'  => $item->get_description( 'edit' ),
+					'post_excerpt'  => $item->get_description('edit'),
 				)
 			),
 			true
 		);
 
-		if ( $id && ! is_wp_error( $id ) ) {
-			$item->set_id( $id );
-			$this->update_post_meta( $item );
+		if ($id && !is_wp_error($id)) {
+			$item->set_id($id);
+			$this->update_post_meta($item);
 			$item->save_meta_data();
 			$item->apply_changes();
-			$this->clear_caches( $item );
-			do_action( 'getpaid_new_item', $item );
+			$this->clear_caches($item);
+			do_action('getpaid_new_item', $item);
 			return true;
 		}
 
-		if ( is_wp_error( $id ) ) {
+		if (is_wp_error($id)) {
 			$item->last_error = $id->get_error_message();
 		}
 		
@@ -125,14 +125,14 @@ 
 	 * @param WPInv_Item $item Item object.
 	 *
 	 */
-	public function read( &$item ) {
+	public function read(&$item) {
 
 		$item->set_defaults();
-		$item_object = get_post( $item->get_id() );
+		$item_object = get_post($item->get_id());
 
-		if ( ! $item->get_id() || ! $item_object || $item_object->post_type != 'wpi_item' ) {
-			$item->last_error = __( 'Invalid item.', 'invoicing' );
-			$item->set_id( 0 );
+		if (!$item->get_id() || !$item_object || $item_object->post_type != 'wpi_item') {
+			$item->last_error = __('Invalid item.', 'invoicing');
+			$item->set_id(0);
 			return false;
 		}
 
@@ -148,10 +148,10 @@ 
 			)
 		);
 
-		$this->read_object_data( $item, $item_object );
+		$this->read_object_data($item, $item_object);
 		$item->read_meta_data();
-		$item->set_object_read( true );
-		do_action( 'getpaid_read_item', $item );
+		$item->set_object_read(true);
+		do_action('getpaid_read_item', $item);
 
 	}
 
@@ -160,29 +160,29 @@ 
 	 *
 	 * @param WPInv_Item $item Item object.
 	 */
-	public function update( &$item ) {
+	public function update(&$item) {
 		$item->save_meta_data();
-		$item->set_version( WPINV_VERSION );
+		$item->set_version(WPINV_VERSION);
 
-		if ( null === $item->get_date_created( 'edit' ) ) {
-			$item->set_date_created(  current_time('mysql') );
+		if (null === $item->get_date_created('edit')) {
+			$item->set_date_created(current_time('mysql'));
 		}
 
 		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $item->get_id() );
+		$previous_status = get_post_status($item->get_id());
 
 		$changes = $item->get_changes();
 
 		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'parent_id', 'description', 'name', 'author' ), array_keys( $changes ) ) ) {
+		if (array_intersect(array('date_created', 'date_modified', 'status', 'parent_id', 'description', 'name', 'author'), array_keys($changes))) {
 			$post_data = array(
-				'post_date'         => $item->get_date_created( 'edit' ),
-				'post_status'       => $item->get_status( 'edit' ),
-				'post_parent'       => $item->get_parent_id( 'edit' ),
-				'post_excerpt'      => $item->get_description( 'edit' ),
-				'post_modified'     => $item->get_date_modified( 'edit' ),
-				'post_title'        => $item->get_name( 'edit' ),
-				'post_author'       => $item->get_author( 'edit' ),
+				'post_date'         => $item->get_date_created('edit'),
+				'post_status'       => $item->get_status('edit'),
+				'post_parent'       => $item->get_parent_id('edit'),
+				'post_excerpt'      => $item->get_description('edit'),
+				'post_modified'     => $item->get_date_modified('edit'),
+				'post_title'        => $item->get_name('edit'),
+				'post_author'       => $item->get_author('edit'),
 			);
 
 			/**
@@ -193,25 +193,25 @@ 
 			 * This ensures hooks are fired by either WP itself (admin screen save),
 			 * or an update purely from CRUD.
 			 */
-			if ( doing_action( 'save_post' ) ) {
-				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $item->get_id() ) );
-				clean_post_cache( $item->get_id() );
+			if (doing_action('save_post')) {
+				$GLOBALS['wpdb']->update($GLOBALS['wpdb']->posts, $post_data, array('ID' => $item->get_id()));
+				clean_post_cache($item->get_id());
 			} else {
-				wp_update_post( array_merge( array( 'ID' => $item->get_id() ), $post_data ) );
+				wp_update_post(array_merge(array('ID' => $item->get_id()), $post_data));
 			}
-			$item->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+			$item->read_meta_data(true); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
 		}
-		$this->update_post_meta( $item );
+		$this->update_post_meta($item);
 		$item->apply_changes();
-		$this->clear_caches( $item );
+		$this->clear_caches($item);
 
 		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $item->get_status( 'edit' );
+		$new_status = $item->get_status('edit');
 
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_item', $item );
+		if ($new_status !== $previous_status && in_array($previous_status, array('new', 'auto-draft', 'draft'), true)) {
+			do_action('getpaid_new_item', $item);
 		} else {
-			do_action( 'getpaid_update_item', $item );
+			do_action('getpaid_update_item', $item);
 		}
 
 	}
@@ -228,14 +228,14 @@ 
 	 * @param WPInv_Item $item WPInv_Item object.
 	 * @since 1.0.19
 	 */
-	protected function update_post_meta( &$item ) {
+	protected function update_post_meta(&$item) {
 
 		// Ensure that we have a custom id.
-        if ( ! $item->get_custom_id() ) {
-            $item->set_custom_id( $item->get_id() );
+        if (!$item->get_custom_id()) {
+            $item->set_custom_id($item->get_id());
 		}
 
-		parent::update_post_meta( $item );
+		parent::update_post_meta($item);
 	}
 
 }

vendor/composer/installers/src/Composer/Installers/Installer.php

Spacing +2 added lines, -2 removed lines

@@ -165,7 +165,7 @@ 
     {
         $installPath = $this->getPackageBasePath($package);
         $io = $this->io;
-        $outputStatus = function () use ($io, $installPath) {
+        $outputStatus = function() use ($io, $installPath) {
             $io->write(sprintf('Deleting %s - %s', $installPath, !file_exists($installPath) ? '<comment>deleted</comment>' : '<error>not deleted</error>'));
         };
 
@@ -235,7 +235,7 @@ 
             $pattern = $locations ? '(' . implode('|', $locations) . ')' : false;
         }
 
-        return $pattern ? : '(\w+)';
+        return $pattern ?: '(\w+)';
     }
 
     /**