AyeCode / invoicing

includes/wpinv-subscription.php

Doc Comments +5 added lines, -5 removed lines

@@ -370,7 +370,7 @@ 
 	 * Retrieves the transaction ID from the subscription
 	 *
 	 * @since  1.0.0
-	 * @return bool
+	 * @return string
 	 */
 	public function get_transaction_id() {
 
@@ -392,7 +392,7 @@ 
 	 * Stores the transaction ID for the subscription purchase
 	 *
 	 * @since  1.0.0.4
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function set_transaction_id( $txn_id = '' ) {
 		$this->update( array( 'transaction_id' => $txn_id ) );
@@ -403,7 +403,7 @@ 
 	 * Renews a subscription
 	 *
 	 * @since  1.0.0
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function renew() {
 
@@ -492,7 +492,7 @@ 
 	 *
 	 * @since  1.0.0
 	 * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
-	 * @return void
+	 * @return false|null
 	 */
 	public function expire( $check_expiration = false ) {
 
@@ -744,7 +744,7 @@ 
 	 * Retrieves the subscription status
 	 *
 	 * @since  1.0.0
-	 * @return int
+	 * @return string
 	 */
 	public function get_status() {
 

Indentation +454 added lines, -454 removed lines

@@ -2,7 +2,7 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 
@@ -13,183 +13,183 @@ 
  */
 class WPInv_Subscription {
 
-	private $subs_db;
+    private $subs_db;
+
+    public $id                = 0;
+    public $customer_id       = 0;
+    public $period            = '';
+    public $initial_amount    = '';
+    public $recurring_amount  = '';
+    public $bill_times        = 0;
+    public $transaction_id    = '';
+    public $parent_payment_id = 0;
+    public $product_id        = 0;
+    public $created           = '0000-00-00 00:00:00';
+    public $expiration        = '0000-00-00 00:00:00';
+    public $trial_period      = '';
+    public $status            = 'pending';
+    public $profile_id        = '';
+    public $gateway           = '';
+    public $customer;
 
-	public $id                = 0;
-	public $customer_id       = 0;
-	public $period            = '';
-	public $initial_amount    = '';
-	public $recurring_amount  = '';
-	public $bill_times        = 0;
-	public $transaction_id    = '';
-	public $parent_payment_id = 0;
-	public $product_id        = 0;
-	public $created           = '0000-00-00 00:00:00';
-	public $expiration        = '0000-00-00 00:00:00';
-	public $trial_period      = '';
-	public $status            = 'pending';
-	public $profile_id        = '';
-	public $gateway           = '';
-	public $customer;
-
-	/**
-	 * Get us started
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
+    /**
+     * Get us started
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
 
-		$this->subs_db = new WPInv_Subscriptions_DB;
+        $this->subs_db = new WPInv_Subscriptions_DB;
 
-		if( $_by_profile_id ) {
+        if( $_by_profile_id ) {
 
-			$_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
+            $_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
 
-			if( empty( $_sub ) ) {
-				return false;
-			}
+            if( empty( $_sub ) ) {
+                return false;
+            }
 
-			$_id_or_object = $_sub;
+            $_id_or_object = $_sub;
 
-		}
+        }
 
-		return $this->setup_subscription( $_id_or_object );
-	}
+        return $this->setup_subscription( $_id_or_object );
+    }
 
-	/**
-	 * Setup the subscription object
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	private function setup_subscription( $id_or_object = 0 ) {
+    /**
+     * Setup the subscription object
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    private function setup_subscription( $id_or_object = 0 ) {
 
-		if( empty( $id_or_object ) ) {
-			return false;
-		}
+        if( empty( $id_or_object ) ) {
+            return false;
+        }
 
-		if( is_numeric( $id_or_object ) ) {
+        if( is_numeric( $id_or_object ) ) {
 
-			$sub = $this->subs_db->get( $id_or_object );
+            $sub = $this->subs_db->get( $id_or_object );
 
-		} elseif( is_object( $id_or_object ) ) {
+        } elseif( is_object( $id_or_object ) ) {
 
-			$sub = $id_or_object;
+            $sub = $id_or_object;
 
-		}
+        }
 
-		if( empty( $sub ) ) {
-			return false;
-		}
+        if( empty( $sub ) ) {
+            return false;
+        }
 
-		foreach( $sub as $key => $value ) {
-			$this->$key = $value;
-		}
+        foreach( $sub as $key => $value ) {
+            $this->$key = $value;
+        }
 
-		$this->customer = get_userdata( $this->customer_id );
-		$this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
+        $this->customer = get_userdata( $this->customer_id );
+        $this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
 
-		do_action( 'wpinv_recurring_setup_subscription', $this );
+        do_action( 'wpinv_recurring_setup_subscription', $this );
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Magic __get function to dispatch a call to retrieve a private property
-	 *
-	 * @since 1.0.0
-	 */
-	public function __get( $key ) {
+    /**
+     * Magic __get function to dispatch a call to retrieve a private property
+     *
+     * @since 1.0.0
+     */
+    public function __get( $key ) {
 
-		if( method_exists( $this, 'get_' . $key ) ) {
+        if( method_exists( $this, 'get_' . $key ) ) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+            return call_user_func( array( $this, 'get_' . $key ) );
 
-		} else {
+        } else {
 
-			return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+            return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Creates a subscription
-	 *
-	 * @since  1.0.0
-	 * @param  array  $data Array of attributes for a subscription
-	 * @return mixed  false if data isn't passed and class not instantiated for creation
-	 */
-	public function create( $data = array() ) {
+    /**
+     * Creates a subscription
+     *
+     * @since  1.0.0
+     * @param  array  $data Array of attributes for a subscription
+     * @return mixed  false if data isn't passed and class not instantiated for creation
+     */
+    public function create( $data = array() ) {
 
-		if ( $this->id != 0 ) {
-			return false;
-		}
+        if ( $this->id != 0 ) {
+            return false;
+        }
 
-		$defaults = array(
-			'customer_id'       => 0,
-			'frequency'         => '',
-			'period'            => '',
-			'initial_amount'    => '',
-			'recurring_amount'  => '',
-			'bill_times'        => 0,
-			'parent_payment_id' => 0,
-			'product_id'        => 0,
-			'created'           => '',
-			'expiration'        => '',
-			'status'            => '',
-			'profile_id'        => '',
-		);
+        $defaults = array(
+            'customer_id'       => 0,
+            'frequency'         => '',
+            'period'            => '',
+            'initial_amount'    => '',
+            'recurring_amount'  => '',
+            'bill_times'        => 0,
+            'parent_payment_id' => 0,
+            'product_id'        => 0,
+            'created'           => '',
+            'expiration'        => '',
+            'status'            => '',
+            'profile_id'        => '',
+        );
 
-		$args = wp_parse_args( $data, $defaults );
+        $args = wp_parse_args( $data, $defaults );
 
-		if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
+        if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
 
-			if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
+            if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
 
-				// Force an active subscription to expired if expiration date is in the past
-				$args['status'] = 'expired';
+                // Force an active subscription to expired if expiration date is in the past
+                $args['status'] = 'expired';
 
-			}
-		}
+            }
+        }
 
-		do_action( 'wpinv_subscription_pre_create', $args );
+        do_action( 'wpinv_subscription_pre_create', $args );
 
-		$id = $this->subs_db->insert( $args, 'subscription' );
+        $id = $this->subs_db->insert( $args, 'subscription' );
 
-		do_action( 'wpinv_subscription_post_create', $id, $args );
+        do_action( 'wpinv_subscription_post_create', $id, $args );
 
-		return $this->setup_subscription( $id );
+        return $this->setup_subscription( $id );
 
-	}
+    }
 
-	/**
-	 * Updates a subscription
-	 *
-	 * @since  1.0.0
-	 * @param  array $args Array of fields to update
-	 * @return bool
-	 */
-	public function update( $args = array() ) {
+    /**
+     * Updates a subscription
+     *
+     * @since  1.0.0
+     * @param  array $args Array of fields to update
+     * @return bool
+     */
+    public function update( $args = array() ) {
 
-		$ret = $this->subs_db->update( $this->id, $args );
+        $ret = $this->subs_db->update( $this->id, $args );
 
-		do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
+        do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
 
-		return $ret;
+        return $ret;
 
-	}
+    }
 
-	/**
-	 * Delete the subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function delete() {
-		return $this->subs_db->delete( $this->id );
-	}
+    /**
+     * Delete the subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function delete() {
+        return $this->subs_db->delete( $this->id );
+    }
 
     /**
      * Retrieves the parent payment ID
@@ -366,185 +366,185 @@ 
         return false;
     }
 
-	/**
-	 * Retrieves the transaction ID from the subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function get_transaction_id() {
+    /**
+     * Retrieves the transaction ID from the subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function get_transaction_id() {
 
-		if( empty( $this->transaction_id ) ) {
+        if( empty( $this->transaction_id ) ) {
 
-			$txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
+            $txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
 
-			if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
-				$this->set_transaction_id( $txn_id );
-			}
+            if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
+                $this->set_transaction_id( $txn_id );
+            }
 
-		}
+        }
 
-		return $this->transaction_id;
+        return $this->transaction_id;
 
-	}
+    }
 
-	/**
-	 * Stores the transaction ID for the subscription purchase
-	 *
-	 * @since  1.0.0.4
-	 * @return bool
-	 */
-	public function set_transaction_id( $txn_id = '' ) {
-		$this->update( array( 'transaction_id' => $txn_id ) );
-		$this->transaction_id = $txn_id;
-	}
+    /**
+     * Stores the transaction ID for the subscription purchase
+     *
+     * @since  1.0.0.4
+     * @return bool
+     */
+    public function set_transaction_id( $txn_id = '' ) {
+        $this->update( array( 'transaction_id' => $txn_id ) );
+        $this->transaction_id = $txn_id;
+    }
 
-	/**
-	 * Renews a subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function renew() {
+    /**
+     * Renews a subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function renew() {
 
-		$expires = $this->get_expiration_time();
+        $expires = $this->get_expiration_time();
 
 
-		// Determine what date to use as the start for the new expiration calculation
-		if( $expires > current_time( 'timestamp' ) && $this->is_active() ) {
+        // Determine what date to use as the start for the new expiration calculation
+        if( $expires > current_time( 'timestamp' ) && $this->is_active() ) {
 
-			$base_date  = $expires;
+            $base_date  = $expires;
 
-		} else {
+        } else {
 
-			$base_date  = current_time( 'timestamp' );
+            $base_date  = current_time( 'timestamp' );
 
-		}
+        }
 
-		$last_day = wpinv_cal_days_in_month( CAL_GREGORIAN, date( 'n', $base_date ), date( 'Y', $base_date ) );
+        $last_day = wpinv_cal_days_in_month( CAL_GREGORIAN, date( 'n', $base_date ), date( 'Y', $base_date ) );
 
 
-		$frequency = isset($this->frequency) ? $this->frequency : 1;
-		$expiration = date( 'Y-m-d H:i:s', strtotime( '+' . $frequency . ' ' . $this->period  . ' 23:59:59', $base_date ) );
+        $frequency = isset($this->frequency) ? $this->frequency : 1;
+        $expiration = date( 'Y-m-d H:i:s', strtotime( '+' . $frequency . ' ' . $this->period  . ' 23:59:59', $base_date ) );
 
-		if( date( 'j', $base_date ) == $last_day && 'day' != $this->period ) {
-			$expiration = date( 'Y-m-d H:i:s', strtotime( $expiration . ' +2 days' ) );
-		}
+        if( date( 'j', $base_date ) == $last_day && 'day' != $this->period ) {
+            $expiration = date( 'Y-m-d H:i:s', strtotime( $expiration . ' +2 days' ) );
+        }
 
-		$expiration  = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->id, $this );
+        $expiration  = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->id, $this );
 
-		do_action( 'wpinv_subscription_pre_renew', $this->id, $expiration, $this );
+        do_action( 'wpinv_subscription_pre_renew', $this->id, $expiration, $this );
 
-		$this->status = 'active';
-		$times_billed = $this->get_times_billed();
+        $this->status = 'active';
+        $times_billed = $this->get_times_billed();
 
-		// Complete subscription if applicable
-		if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
-			$this->complete();
-			$this->status = 'completed';
-		}
+        // Complete subscription if applicable
+        if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
+            $this->complete();
+            $this->status = 'completed';
+        }
 
-		$args = array(
-			'expiration' => $expiration,
-			'status'     => $this->status,
-		);
+        $args = array(
+            'expiration' => $expiration,
+            'status'     => $this->status,
+        );
 
         $this->subs_db->update( $this->id, $args );
 
-		do_action( 'wpinv_subscription_post_renew', $this->id, $expiration, $this );
-		do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
+        do_action( 'wpinv_subscription_post_renew', $this->id, $expiration, $this );
+        do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as completed
-	 *
-	 * Subscription is completed when the number of payments matches the billing_times field
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function complete() {
+    /**
+     * Marks a subscription as completed
+     *
+     * Subscription is completed when the number of payments matches the billing_times field
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function complete() {
 
-		// Only mark a subscription as complete if it's not already cancelled.
-		if ( 'cancelled' === $this->status ) {
-			return;
-		}
+        // Only mark a subscription as complete if it's not already cancelled.
+        if ( 'cancelled' === $this->status ) {
+            return;
+        }
 
-		$args = array(
-			'status' => 'completed'
-		);
+        $args = array(
+            'status' => 'completed'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'completed';
+            $this->status = 'completed';
 
-			do_action( 'wpinv_subscription_completed', $this->id, $this );
+            do_action( 'wpinv_subscription_completed', $this->id, $this );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as expired
-	 *
-	 * Subscription is completed when the billing times is reached
-	 *
-	 * @since  1.0.0
-	 * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
-	 * @return void
-	 */
-	public function expire( $check_expiration = false ) {
+    /**
+     * Marks a subscription as expired
+     *
+     * Subscription is completed when the billing times is reached
+     *
+     * @since  1.0.0
+     * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
+     * @return void
+     */
+    public function expire( $check_expiration = false ) {
 
-		$expiration = $this->expiration;
+        $expiration = $this->expiration;
 
-		if( $check_expiration ) {
+        if( $check_expiration ) {
 
-			// check_expiration() updates $this->expiration so compare to $expiration above
+            // check_expiration() updates $this->expiration so compare to $expiration above
 
-			if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
+            if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
 
-				return false; // Do not mark as expired since real expiration date is in the future
-			}
+                return false; // Do not mark as expired since real expiration date is in the future
+            }
 
-		}
+        }
 
-		$args = array(
-			'status' => 'expired'
-		);
+        $args = array(
+            'status' => 'expired'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'expired';
+            $this->status = 'expired';
 
-			do_action( 'wpinv_subscription_expired', $this->id, $this );
+            do_action( 'wpinv_subscription_expired', $this->id, $this );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as failing
-	 *
-	 * @since  2.4.2
-	 * @return void
-	 */
-	public function failing() {
+    /**
+     * Marks a subscription as failing
+     *
+     * @since  2.4.2
+     * @return void
+     */
+    public function failing() {
 
-		$args = array(
-			'status' => 'failing'
-		);
+        $args = array(
+            'status' => 'failing'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'failing';
+            $this->status = 'failing';
 
-			do_action( 'wpinv_subscription_failing', $this->id, $this );
+            do_action( 'wpinv_subscription_failing', $this->id, $this );
 
 
-		}
+        }
 
-	}
+    }
 
     /**
      * Marks a subscription as cancelled
@@ -578,22 +578,22 @@ 
         }
     }
 
-	/**
-	 * Determines if subscription can be cancelled
-	 *
-	 * This method is filtered by payment gateways in order to return true on subscriptions
-	 * that can be cancelled with a profile ID through the merchant processor
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function can_cancel() {
+    /**
+     * Determines if subscription can be cancelled
+     *
+     * This method is filtered by payment gateways in order to return true on subscriptions
+     * that can be cancelled with a profile ID through the merchant processor
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function can_cancel() {
         $ret = false;
-	    if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
+        if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
             $ret = true;
         }
-		return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
-	}
+        return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
+    }
 
     /**
      * Returns an array of subscription statuses that can be cancelled
@@ -606,197 +606,197 @@ 
         return apply_filters( 'wpinv_recurring_cancellable_statuses', array( 'active', 'trialling', 'failing' ) );
     }
 
-	/**
-	 * Retrieves the URL to cancel subscription
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_cancel_url() {
+    /**
+     * Retrieves the URL to cancel subscription
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_cancel_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
+        $url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
 
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
-	}
+        return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+    }
 
-	/**
-	 * Determines if subscription can be manually renewed
-	 *
-	 * This method is filtered by payment gateways in order to return true on subscriptions
-	 * that can be renewed manually
-	 *
-	 * @since  2.5
-	 * @return bool
-	 */
-	public function can_renew() {
+    /**
+     * Determines if subscription can be manually renewed
+     *
+     * This method is filtered by payment gateways in order to return true on subscriptions
+     * that can be renewed manually
+     *
+     * @since  2.5
+     * @return bool
+     */
+    public function can_renew() {
 
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
-	}
-
-	/**
-	 * Retrieves the URL to renew a subscription
-	 *
-	 * @since  2.5
-	 * @return string
-	 */
-	public function get_renew_url() {
-
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
-
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
-	}
-
-	/**
-	 * Determines if subscription can have their payment method updated
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function can_update() {
-		return apply_filters( 'wpinv_subscription_can_update', false, $this );
-	}
-
-	/**
-	 * Retrieves the URL to update subscription
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function get_update_url() {
-
-		$url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
-
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
-	}
-
-	/**
-	 * Determines if subscription is active
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function is_active() {
-
-		$ret = false;
-
-		if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
-			$ret = true;
-		}
-
-		return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
-
-	}
-
-	/**
-	 * Determines if subscription is expired
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function is_expired() {
-
-		$ret = false;
-
-		if ( $this->status == 'expired' ) {
-
-			$ret = true;
-
-		} elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
-
-			$ret        = false;
-			$expiration = $this->get_expiration_time();
-
-			if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
-				$ret = true;
-
-				if ( 'active' === $this->status || $this->status == 'trialling'  ) {
-					$this->expire();
-				}
-			}
-
-		}
-
-		return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
-
-	}
-
-	/**
-	 * Retrieves the expiration date
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_expiration() {
-		return $this->expiration;
-	}
-
-	/**
-	 * Retrieves the expiration date in a timestamp
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_expiration_time() {
-		return strtotime( $this->expiration, current_time( 'timestamp' ) );
-	}
-
-	/**
-	 * Retrieves the subscription status
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_status() {
-
-		// Monitor for page load delays on pages with large subscription lists (IE: Subscriptions table in admin)
-		$this->is_expired();
-		return $this->status;
-	}
-
-	/**
-	 * Retrieves the subscription status label
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_status_label() {
-
-		switch( $this->get_status() ) {
-			case 'active' :
-				$status = __( 'Active', 'invoicing' );
-				break;
-
-			case 'cancelled' :
-				$status = __( 'Cancelled', 'invoicing' );
-				break;
-
-			case 'expired' :
-				$status = __( 'Expired', 'invoicing' );
-				break;
-
-			case 'pending' :
-				$status = __( 'Pending', 'invoicing' );
-				break;
-
-			case 'failing' :
-				$status = __( 'Failing', 'invoicing' );
-				break;
-
-			case 'trialling' :
-				$status = __( 'Trialling', 'invoicing' );
-				break;
-
-			case 'completed' :
-				$status = __( 'Completed', 'invoicing' );
-				break;
-
-			default:
-				$status = ucfirst( $this->get_status() );
-				break;
-		}
-
-		return $status;
-	}
+        return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+    }
+
+    /**
+     * Retrieves the URL to renew a subscription
+     *
+     * @since  2.5
+     * @return string
+     */
+    public function get_renew_url() {
+
+        $url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
+
+        return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+    }
+
+    /**
+     * Determines if subscription can have their payment method updated
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function can_update() {
+        return apply_filters( 'wpinv_subscription_can_update', false, $this );
+    }
+
+    /**
+     * Retrieves the URL to update subscription
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function get_update_url() {
+
+        $url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
+
+        return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+    }
+
+    /**
+     * Determines if subscription is active
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function is_active() {
+
+        $ret = false;
+
+        if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
+            $ret = true;
+        }
+
+        return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
+
+    }
+
+    /**
+     * Determines if subscription is expired
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function is_expired() {
+
+        $ret = false;
+
+        if ( $this->status == 'expired' ) {
+
+            $ret = true;
+
+        } elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
+
+            $ret        = false;
+            $expiration = $this->get_expiration_time();
+
+            if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
+                $ret = true;
+
+                if ( 'active' === $this->status || $this->status == 'trialling'  ) {
+                    $this->expire();
+                }
+            }
+
+        }
+
+        return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
+
+    }
+
+    /**
+     * Retrieves the expiration date
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_expiration() {
+        return $this->expiration;
+    }
+
+    /**
+     * Retrieves the expiration date in a timestamp
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_expiration_time() {
+        return strtotime( $this->expiration, current_time( 'timestamp' ) );
+    }
+
+    /**
+     * Retrieves the subscription status
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_status() {
+
+        // Monitor for page load delays on pages with large subscription lists (IE: Subscriptions table in admin)
+        $this->is_expired();
+        return $this->status;
+    }
+
+    /**
+     * Retrieves the subscription status label
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_status_label() {
+
+        switch( $this->get_status() ) {
+            case 'active' :
+                $status = __( 'Active', 'invoicing' );
+                break;
+
+            case 'cancelled' :
+                $status = __( 'Cancelled', 'invoicing' );
+                break;
+
+            case 'expired' :
+                $status = __( 'Expired', 'invoicing' );
+                break;
+
+            case 'pending' :
+                $status = __( 'Pending', 'invoicing' );
+                break;
+
+            case 'failing' :
+                $status = __( 'Failing', 'invoicing' );
+                break;
+
+            case 'trialling' :
+                $status = __( 'Trialling', 'invoicing' );
+                break;
+
+            case 'completed' :
+                $status = __( 'Completed', 'invoicing' );
+                break;
+
+            default:
+                $status = ucfirst( $this->get_status() );
+                break;
+        }
+
+        return $status;
+    }
 
     /**
      * Retrieves the subscription status label

Spacing +167 added lines, -167 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,15 +38,15 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
+	function __construct($_id_or_object = 0, $_by_profile_id = false) {
 
 		$this->subs_db = new WPInv_Subscriptions_DB;
 
-		if( $_by_profile_id ) {
+		if ($_by_profile_id) {
 
-			$_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
+			$_sub = $this->subs_db->get_by('profile_id', $_id_or_object);
 
-			if( empty( $_sub ) ) {
+			if (empty($_sub)) {
 				return false;
 			}
 
@@ -54,7 +54,7 @@ 
 
 		}
 
-		return $this->setup_subscription( $_id_or_object );
+		return $this->setup_subscription($_id_or_object);
 	}
 
 	/**
@@ -63,34 +63,34 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	private function setup_subscription( $id_or_object = 0 ) {
+	private function setup_subscription($id_or_object = 0) {
 
-		if( empty( $id_or_object ) ) {
+		if (empty($id_or_object)) {
 			return false;
 		}
 
-		if( is_numeric( $id_or_object ) ) {
+		if (is_numeric($id_or_object)) {
 
-			$sub = $this->subs_db->get( $id_or_object );
+			$sub = $this->subs_db->get($id_or_object);
 
-		} elseif( is_object( $id_or_object ) ) {
+		} elseif (is_object($id_or_object)) {
 
 			$sub = $id_or_object;
 
 		}
 
-		if( empty( $sub ) ) {
+		if (empty($sub)) {
 			return false;
 		}
 
-		foreach( $sub as $key => $value ) {
+		foreach ($sub as $key => $value) {
 			$this->$key = $value;
 		}
 
-		$this->customer = get_userdata( $this->customer_id );
-		$this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
+		$this->customer = get_userdata($this->customer_id);
+		$this->gateway  = wpinv_get_payment_gateway($this->parent_payment_id);
 
-		do_action( 'wpinv_recurring_setup_subscription', $this );
+		do_action('wpinv_recurring_setup_subscription', $this);
 
 		return $this;
 	}
@@ -100,15 +100,15 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function __get( $key ) {
+	public function __get($key) {
 
-		if( method_exists( $this, 'get_' . $key ) ) {
+		if (method_exists($this, 'get_' . $key)) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+			return call_user_func(array($this, 'get_' . $key));
 
 		} else {
 
-			return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+			return new WP_Error('wpinv-subscription-invalid-property', sprintf(__('Can\'t get property %s', 'invoicing'), $key));
 
 		}
 
@@ -121,9 +121,9 @@ 
 	 * @param  array  $data Array of attributes for a subscription
 	 * @return mixed  false if data isn't passed and class not instantiated for creation
 	 */
-	public function create( $data = array() ) {
+	public function create($data = array()) {
 
-		if ( $this->id != 0 ) {
+		if ($this->id != 0) {
 			return false;
 		}
 
@@ -142,11 +142,11 @@ 
 			'profile_id'        => '',
 		);
 
-		$args = wp_parse_args( $data, $defaults );
+		$args = wp_parse_args($data, $defaults);
 
-		if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
+		if ($args['expiration'] && strtotime('NOW', current_time('timestamp')) > strtotime($args['expiration'], current_time('timestamp'))) {
 
-			if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
+			if ('active' == $args['status'] || 'trialling' == $args['status']) {
 
 				// Force an active subscription to expired if expiration date is in the past
 				$args['status'] = 'expired';
@@ -154,13 +154,13 @@ 
 			}
 		}
 
-		do_action( 'wpinv_subscription_pre_create', $args );
+		do_action('wpinv_subscription_pre_create', $args);
 
-		$id = $this->subs_db->insert( $args, 'subscription' );
+		$id = $this->subs_db->insert($args, 'subscription');
 
-		do_action( 'wpinv_subscription_post_create', $id, $args );
+		do_action('wpinv_subscription_post_create', $id, $args);
 
-		return $this->setup_subscription( $id );
+		return $this->setup_subscription($id);
 
 	}
 
@@ -171,11 +171,11 @@ 
 	 * @param  array $args Array of fields to update
 	 * @return bool
 	 */
-	public function update( $args = array() ) {
+	public function update($args = array()) {
 
-		$ret = $this->subs_db->update( $this->id, $args );
+		$ret = $this->subs_db->update($this->id, $args);
 
-		do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
+		do_action('wpinv_recurring_update_subscription', $this->id, $args, $this);
 
 		return $ret;
 
@@ -188,7 +188,7 @@ 
 	 * @return bool
 	 */
 	public function delete() {
-		return $this->subs_db->delete( $this->id );
+		return $this->subs_db->delete($this->id);
 	}
 
     /**
@@ -208,14 +208,14 @@ 
      * @return array
      */
     public function get_child_payments() {
-        $payments = get_posts( array(
-            'post_parent'    => (int) $this->parent_payment_id,
+        $payments = get_posts(array(
+            'post_parent'    => (int)$this->parent_payment_id,
             'posts_per_page' => '999',
-            'post_status'    => array( 'publish', 'wpi-processing', 'wpi-renewal' ),
+            'post_status'    => array('publish', 'wpi-processing', 'wpi-renewal'),
             'orderby'           => 'ID',
             'order'             => 'DESC',
             'post_type'      => 'wpi_invoice'
-        ) );
+        ));
 
         return $payments;
     }
@@ -228,9 +228,9 @@ 
      */
     public function get_total_payments() {
         $child_payments = $this->get_child_payments();
-        $total_payments = !empty( $child_payments ) ? count( $child_payments ) : 0;
+        $total_payments = !empty($child_payments) ? count($child_payments) : 0;
 
-        if ( 'pending' != $this->status ) {
+        if ('pending' != $this->status) {
                 $total_payments++;
         }
 
@@ -246,7 +246,7 @@ 
     public function get_times_billed() {
         $times_billed = (int)$this->get_total_payments();
 
-        if ( ! empty( $this->trial_period ) && $times_billed > 0 ) {
+        if (!empty($this->trial_period) && $times_billed > 0) {
             $times_billed--;
         }
 
@@ -260,51 +260,51 @@ 
      * @param  array $args Array of values for the payment, including amount and transaction ID
      * @return bool
      */
-    public function add_payment( $args = array() ) {
-        if ( ! $this->parent_payment_id ) {
+    public function add_payment($args = array()) {
+        if (!$this->parent_payment_id) {
             return false;
         }
 
-        $args = wp_parse_args( $args, array(
+        $args = wp_parse_args($args, array(
             'amount'         => '',
             'transaction_id' => '',
             'gateway'        => ''
-        ) );
+        ));
         
-        if ( empty( $args['transaction_id'] ) || $this->payment_exists( $args['transaction_id'] ) ) {
+        if (empty($args['transaction_id']) || $this->payment_exists($args['transaction_id'])) {
             return false;
         }
         
-        $parent_invoice = wpinv_get_invoice( $this->parent_payment_id );
-        if ( empty( $parent_invoice->ID ) ) {
+        $parent_invoice = wpinv_get_invoice($this->parent_payment_id);
+        if (empty($parent_invoice->ID)) {
             return false;
         }
 
         $invoice = new WPInv_Invoice();
-        $invoice->set( 'post_type', 'wpi_invoice' );
-        $invoice->set( 'parent_invoice', $this->parent_payment_id );
-        $invoice->set( 'currency', $parent_invoice->get_currency() );
-        $invoice->set( 'transaction_id', $args['transaction_id'] );
-        $invoice->set( 'key', $parent_invoice->generate_key() );
-        $invoice->set( 'ip', $parent_invoice->ip );
-        $invoice->set( 'user_id', $parent_invoice->get_user_id() );
-        $invoice->set( 'first_name', $parent_invoice->get_first_name() );
-        $invoice->set( 'last_name', $parent_invoice->get_last_name() );
-        $invoice->set( 'phone', $parent_invoice->phone );
-        $invoice->set( 'address', $parent_invoice->address );
-        $invoice->set( 'city', $parent_invoice->city );
-        $invoice->set( 'country', $parent_invoice->country );
-        $invoice->set( 'state', $parent_invoice->state );
-        $invoice->set( 'zip', $parent_invoice->zip );
-        $invoice->set( 'company', $parent_invoice->company );
-        $invoice->set( 'vat_number', $parent_invoice->vat_number );
-        $invoice->set( 'vat_rate', $parent_invoice->vat_rate );
-        $invoice->set( 'adddress_confirmed', $parent_invoice->adddress_confirmed );
-
-        if ( empty( $args['gateway'] ) ) {
-            $invoice->set( 'gateway', $parent_invoice->get_gateway() );
+        $invoice->set('post_type', 'wpi_invoice');
+        $invoice->set('parent_invoice', $this->parent_payment_id);
+        $invoice->set('currency', $parent_invoice->get_currency());
+        $invoice->set('transaction_id', $args['transaction_id']);
+        $invoice->set('key', $parent_invoice->generate_key());
+        $invoice->set('ip', $parent_invoice->ip);
+        $invoice->set('user_id', $parent_invoice->get_user_id());
+        $invoice->set('first_name', $parent_invoice->get_first_name());
+        $invoice->set('last_name', $parent_invoice->get_last_name());
+        $invoice->set('phone', $parent_invoice->phone);
+        $invoice->set('address', $parent_invoice->address);
+        $invoice->set('city', $parent_invoice->city);
+        $invoice->set('country', $parent_invoice->country);
+        $invoice->set('state', $parent_invoice->state);
+        $invoice->set('zip', $parent_invoice->zip);
+        $invoice->set('company', $parent_invoice->company);
+        $invoice->set('vat_number', $parent_invoice->vat_number);
+        $invoice->set('vat_rate', $parent_invoice->vat_rate);
+        $invoice->set('adddress_confirmed', $parent_invoice->adddress_confirmed);
+
+        if (empty($args['gateway'])) {
+            $invoice->set('gateway', $parent_invoice->get_gateway());
         } else {
-            $invoice->set( 'gateway', $args['gateway'] );
+            $invoice->set('gateway', $args['gateway']);
         }
         
         $recurring_details = $parent_invoice->get_recurring_details();
@@ -312,11 +312,11 @@ 
         // increase the earnings for each item in the subscription
         $items = $recurring_details['cart_details'];
         
-        if ( $items ) {        
+        if ($items) {        
             $add_items      = array();
             $cart_details   = array();
             
-            foreach ( $items as $item ) {
+            foreach ($items as $item) {
                 $add_item             = array();
                 $add_item['id']       = $item['id'];
                 $add_item['quantity'] = $item['quantity'];
@@ -326,7 +326,7 @@ 
                 break;
             }
             
-            $invoice->set( 'items', $add_items );
+            $invoice->set('items', $add_items);
             $invoice->cart_details = $cart_details;
         }
         
@@ -336,29 +336,29 @@ 
         $tax                = $recurring_details['tax'];
         $discount           = $recurring_details['discount'];
         
-        if ( $discount > 0 ) {
-            $invoice->set( 'discount_code', $parent_invoice->discount_code );
+        if ($discount > 0) {
+            $invoice->set('discount_code', $parent_invoice->discount_code);
         }
         
-        $invoice->subtotal = wpinv_round_amount( $subtotal );
-        $invoice->tax      = wpinv_round_amount( $tax );
-        $invoice->discount = wpinv_round_amount( $discount );
-        $invoice->total    = wpinv_round_amount( $total );
+        $invoice->subtotal = wpinv_round_amount($subtotal);
+        $invoice->tax      = wpinv_round_amount($tax);
+        $invoice->discount = wpinv_round_amount($discount);
+        $invoice->total    = wpinv_round_amount($total);
 
-        $invoice  = apply_filters( 'wpinv_subscription_add_payment_save', $invoice, $this, $args );
+        $invoice = apply_filters('wpinv_subscription_add_payment_save', $invoice, $this, $args);
 
         $invoice->save();
-        $invoice->update_meta( '_wpinv_subscription_id', $this->id );
+        $invoice->update_meta('_wpinv_subscription_id', $this->id);
         
-        if ( !empty( $invoice->ID ) ) {
-            wpinv_update_payment_status( $invoice->ID, 'publish' );
+        if (!empty($invoice->ID)) {
+            wpinv_update_payment_status($invoice->ID, 'publish');
             sleep(1);
-            wpinv_update_payment_status( $invoice->ID, 'wpi-renewal' );
+            wpinv_update_payment_status($invoice->ID, 'wpi-renewal');
             
-            $invoice = wpinv_get_invoice( $invoice->ID );
+            $invoice = wpinv_get_invoice($invoice->ID);
 
-            do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $this );
-            do_action( 'wpinv_recurring_record_payment', $invoice->ID, $this->parent_payment_id, $args['amount'], $args['transaction_id'] );
+            do_action('wpinv_recurring_add_subscription_payment', $invoice, $this);
+            do_action('wpinv_recurring_record_payment', $invoice->ID, $this->parent_payment_id, $args['amount'], $args['transaction_id']);
             
             return $invoice->ID;
         }
@@ -374,12 +374,12 @@ 
 	 */
 	public function get_transaction_id() {
 
-		if( empty( $this->transaction_id ) ) {
+		if (empty($this->transaction_id)) {
 
-			$txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
+			$txn_id = wpinv_get_payment_transaction_id($this->parent_payment_id);
 
-			if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
-				$this->set_transaction_id( $txn_id );
+			if (!empty($txn_id) && (int)$this->parent_payment_id !== (int)$txn_id) {
+				$this->set_transaction_id($txn_id);
 			}
 
 		}
@@ -394,8 +394,8 @@ 
 	 * @since  1.0.0.4
 	 * @return bool
 	 */
-	public function set_transaction_id( $txn_id = '' ) {
-		$this->update( array( 'transaction_id' => $txn_id ) );
+	public function set_transaction_id($txn_id = '') {
+		$this->update(array('transaction_id' => $txn_id));
 		$this->transaction_id = $txn_id;
 	}
 
@@ -411,35 +411,35 @@ 
 
 
 		// Determine what date to use as the start for the new expiration calculation
-		if( $expires > current_time( 'timestamp' ) && $this->is_active() ) {
+		if ($expires > current_time('timestamp') && $this->is_active()) {
 
-			$base_date  = $expires;
+			$base_date = $expires;
 
 		} else {
 
-			$base_date  = current_time( 'timestamp' );
+			$base_date = current_time('timestamp');
 
 		}
 
-		$last_day = wpinv_cal_days_in_month( CAL_GREGORIAN, date( 'n', $base_date ), date( 'Y', $base_date ) );
+		$last_day = wpinv_cal_days_in_month(CAL_GREGORIAN, date('n', $base_date), date('Y', $base_date));
 
 
 		$frequency = isset($this->frequency) ? $this->frequency : 1;
-		$expiration = date( 'Y-m-d H:i:s', strtotime( '+' . $frequency . ' ' . $this->period  . ' 23:59:59', $base_date ) );
+		$expiration = date('Y-m-d H:i:s', strtotime('+' . $frequency . ' ' . $this->period . ' 23:59:59', $base_date));
 
-		if( date( 'j', $base_date ) == $last_day && 'day' != $this->period ) {
-			$expiration = date( 'Y-m-d H:i:s', strtotime( $expiration . ' +2 days' ) );
+		if (date('j', $base_date) == $last_day && 'day' != $this->period) {
+			$expiration = date('Y-m-d H:i:s', strtotime($expiration . ' +2 days'));
 		}
 
-		$expiration  = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->id, $this );
+		$expiration  = apply_filters('wpinv_subscription_renewal_expiration', $expiration, $this->id, $this);
 
-		do_action( 'wpinv_subscription_pre_renew', $this->id, $expiration, $this );
+		do_action('wpinv_subscription_pre_renew', $this->id, $expiration, $this);
 
 		$this->status = 'active';
 		$times_billed = $this->get_times_billed();
 
 		// Complete subscription if applicable
-		if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
+		if ($this->bill_times > 0 && $times_billed >= $this->bill_times) {
 			$this->complete();
 			$this->status = 'completed';
 		}
@@ -449,10 +449,10 @@ 
 			'status'     => $this->status,
 		);
 
-        $this->subs_db->update( $this->id, $args );
+        $this->subs_db->update($this->id, $args);
 
-		do_action( 'wpinv_subscription_post_renew', $this->id, $expiration, $this );
-		do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
+		do_action('wpinv_subscription_post_renew', $this->id, $expiration, $this);
+		do_action('wpinv_recurring_set_subscription_status', $this->id, $this->status, $this);
 
 	}
 
@@ -467,7 +467,7 @@ 
 	public function complete() {
 
 		// Only mark a subscription as complete if it's not already cancelled.
-		if ( 'cancelled' === $this->status ) {
+		if ('cancelled' === $this->status) {
 			return;
 		}
 
@@ -475,11 +475,11 @@ 
 			'status' => 'completed'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'completed';
 
-			do_action( 'wpinv_subscription_completed', $this->id, $this );
+			do_action('wpinv_subscription_completed', $this->id, $this);
 
 		}
 
@@ -494,15 +494,15 @@ 
 	 * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
 	 * @return void
 	 */
-	public function expire( $check_expiration = false ) {
+	public function expire($check_expiration = false) {
 
 		$expiration = $this->expiration;
 
-		if( $check_expiration ) {
+		if ($check_expiration) {
 
 			// check_expiration() updates $this->expiration so compare to $expiration above
 
-			if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
+			if ($expiration < $this->get_expiration() && current_time('timestamp') < $this->get_expiration_time()) {
 
 				return false; // Do not mark as expired since real expiration date is in the future
 			}
@@ -513,11 +513,11 @@ 
 			'status' => 'expired'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'expired';
 
-			do_action( 'wpinv_subscription_expired', $this->id, $this );
+			do_action('wpinv_subscription_expired', $this->id, $this);
 
 		}
 
@@ -535,11 +535,11 @@ 
 			'status' => 'failing'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'failing';
 
-			do_action( 'wpinv_subscription_failing', $this->id, $this );
+			do_action('wpinv_subscription_failing', $this->id, $this);
 
 
 		}
@@ -553,7 +553,7 @@ 
      * @return void
      */
     public function cancel() {
-        if ( 'cancelled' === $this->status ) {
+        if ('cancelled' === $this->status) {
             return; // Already cancelled
         }
 
@@ -561,20 +561,20 @@ 
             'status' => 'cancelled'
         );
 
-        if ( $this->subs_db->update( $this->id, $args ) ) {
-            if ( is_user_logged_in() ) {
-                $userdata = get_userdata( get_current_user_id() );
+        if ($this->subs_db->update($this->id, $args)) {
+            if (is_user_logged_in()) {
+                $userdata = get_userdata(get_current_user_id());
                 $user     = $userdata->display_name;
             } else {
-                $user = __( 'gateway', 'invoicing' );
+                $user = __('gateway', 'invoicing');
             }
 
-            $note = sprintf( __( 'Subscription has been cancelled by %s', 'invoicing' ), $this->parent_payment_id, $user );
-            wpinv_insert_payment_note( $this->parent_payment_id, $note, '', '', true );
+            $note = sprintf(__('Subscription has been cancelled by %s', 'invoicing'), $this->parent_payment_id, $user);
+            wpinv_insert_payment_note($this->parent_payment_id, $note, '', '', true);
 
             $this->status = 'cancelled';
 
-            do_action( 'wpinv_subscription_cancelled', $this->id, $this );
+            do_action('wpinv_subscription_cancelled', $this->id, $this);
         }
     }
 
@@ -589,10 +589,10 @@ 
 	 */
 	public function can_cancel() {
         $ret = false;
-	    if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
+	    if ($this->gateway === 'manual' || in_array($this->status, $this->get_cancellable_statuses())) {
             $ret = true;
         }
-		return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
+		return apply_filters('wpinv_subscription_can_cancel', $ret, $this);
 	}
 
     /**
@@ -603,7 +603,7 @@ 
      * @return      array
      */
     public function get_cancellable_statuses() {
-        return apply_filters( 'wpinv_recurring_cancellable_statuses', array( 'active', 'trialling', 'failing' ) );
+        return apply_filters('wpinv_recurring_cancellable_statuses', array('active', 'trialling', 'failing'));
     }
 
 	/**
@@ -614,9 +614,9 @@ 
 	 */
 	public function get_cancel_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
+		$url = wp_nonce_url(add_query_arg(array('wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id)), 'wpinv-recurring-cancel');
 
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+		return apply_filters('wpinv_subscription_cancel_url', $url, $this);
 	}
 
 	/**
@@ -630,7 +630,7 @@ 
 	 */
 	public function can_renew() {
 
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+		return apply_filters('wpinv_subscription_can_renew', true, $this);
 	}
 
 	/**
@@ -641,9 +641,9 @@ 
 	 */
 	public function get_renew_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
+		$url = wp_nonce_url(add_query_arg(array('wpinv_action' => 'renew_subscription', 'sub_id' => $this->id)), 'wpinv-recurring-renew');
 
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+		return apply_filters('wpinv_subscription_renew_url', $url, $this);
 	}
 
 	/**
@@ -653,7 +653,7 @@ 
 	 * @return bool
 	 */
 	public function can_update() {
-		return apply_filters( 'wpinv_subscription_can_update', false, $this );
+		return apply_filters('wpinv_subscription_can_update', false, $this);
 	}
 
 	/**
@@ -664,9 +664,9 @@ 
 	 */
 	public function get_update_url() {
 
-		$url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
+		$url = add_query_arg(array('action' => 'update', 'subscription_id' => $this->id));
 
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+		return apply_filters('wpinv_subscription_update_url', $url, $this);
 	}
 
 	/**
@@ -679,11 +679,11 @@ 
 
 		$ret = false;
 
-		if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
+		if (!$this->is_expired() && ($this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling')) {
 			$ret = true;
 		}
 
-		return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
+		return apply_filters('wpinv_subscription_is_active', $ret, $this->id, $this);
 
 	}
 
@@ -697,26 +697,26 @@ 
 
 		$ret = false;
 
-		if ( $this->status == 'expired' ) {
+		if ($this->status == 'expired') {
 
 			$ret = true;
 
-		} elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
+		} elseif ('active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling') {
 
 			$ret        = false;
 			$expiration = $this->get_expiration_time();
 
-			if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
+			if ($expiration && strtotime('NOW', current_time('timestamp')) > $expiration) {
 				$ret = true;
 
-				if ( 'active' === $this->status || $this->status == 'trialling'  ) {
+				if ('active' === $this->status || $this->status == 'trialling') {
 					$this->expire();
 				}
 			}
 
 		}
 
-		return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
+		return apply_filters('wpinv_subscription_is_expired', $ret, $this->id, $this);
 
 	}
 
@@ -737,7 +737,7 @@ 
 	 * @return int
 	 */
 	public function get_expiration_time() {
-		return strtotime( $this->expiration, current_time( 'timestamp' ) );
+		return strtotime($this->expiration, current_time('timestamp'));
 	}
 
 	/**
@@ -761,37 +761,37 @@ 
 	 */
 	public function get_status_label() {
 
-		switch( $this->get_status() ) {
+		switch ($this->get_status()) {
 			case 'active' :
-				$status = __( 'Active', 'invoicing' );
+				$status = __('Active', 'invoicing');
 				break;
 
 			case 'cancelled' :
-				$status = __( 'Cancelled', 'invoicing' );
+				$status = __('Cancelled', 'invoicing');
 				break;
 
 			case 'expired' :
-				$status = __( 'Expired', 'invoicing' );
+				$status = __('Expired', 'invoicing');
 				break;
 
 			case 'pending' :
-				$status = __( 'Pending', 'invoicing' );
+				$status = __('Pending', 'invoicing');
 				break;
 
 			case 'failing' :
-				$status = __( 'Failing', 'invoicing' );
+				$status = __('Failing', 'invoicing');
 				break;
 
 			case 'trialling' :
-				$status = __( 'Trialling', 'invoicing' );
+				$status = __('Trialling', 'invoicing');
 				break;
 
 			case 'completed' :
-				$status = __( 'Completed', 'invoicing' );
+				$status = __('Completed', 'invoicing');
 				break;
 
 			default:
-				$status = ucfirst( $this->get_status() );
+				$status = ucfirst($this->get_status());
 				break;
 		}
 
@@ -806,51 +806,51 @@ 
      */
     public function get_status_label_html() {
 
-        switch( $get_status = $this->get_status() ) {
+        switch ($get_status = $this->get_status()) {
             case 'active' :
-                $status = __( 'Active', 'invoicing' );
+                $status = __('Active', 'invoicing');
                 $class = 'label-info';
                 break;
 
             case 'cancelled' :
-                $status = __( 'Cancelled', 'invoicing' );
+                $status = __('Cancelled', 'invoicing');
                 $class = 'label-danger';
                 break;
 
             case 'expired' :
-                $status = __( 'Expired', 'invoicing' );
+                $status = __('Expired', 'invoicing');
                 $class = 'label-default';
                 break;
 
             case 'pending' :
-                $status = __( 'Pending', 'invoicing' );
+                $status = __('Pending', 'invoicing');
                 $class = 'label-primary';
                 break;
 
             case 'failing' :
-                $status = __( 'Failing', 'invoicing' );
+                $status = __('Failing', 'invoicing');
                 $class = 'label-danger';
                 break;
 
             case 'trialling' :
-                $status = __( 'Trialling', 'invoicing' );
+                $status = __('Trialling', 'invoicing');
                 $class = 'label-info';
                 break;
 
             case 'completed' :
-                $status = __( 'Completed', 'invoicing' );
+                $status = __('Completed', 'invoicing');
                 $class = 'label-success';
                 break;
 
             default:
-                $status = ucfirst( $this->get_status() );
+                $status = ucfirst($this->get_status());
                 $class = 'label-default';
                 break;
         }
 
         $label = '<span class="sub-status label label-sub-' . $get_status . ' ' . $class . '">' . $status . '</span>';
 
-        return apply_filters( 'wpinv_subscription_status_label_html', $label, $get_status, $status );
+        return apply_filters('wpinv_subscription_status_label_html', $label, $get_status, $status);
     }
 
     /**
@@ -860,18 +860,18 @@ 
      * @param  string $txn_id The transaction ID from the merchant processor
      * @return bool
      */
-    public function payment_exists( $txn_id = '' ) {
+    public function payment_exists($txn_id = '') {
         global $wpdb;
 
-        if ( empty( $txn_id ) ) {
+        if (empty($txn_id)) {
             return false;
         }
 
-        $txn_id = esc_sql( $txn_id );
+        $txn_id = esc_sql($txn_id);
 
-        $purchase = $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1" );
+        $purchase = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1");
 
-        if ( $purchase != null ) {
+        if ($purchase != null) {
             return true;
         }
 

templates/wpinv-subscriptions-history.php

Spacing +10 added lines, -10 removed lines

@@ -29,16 +29,16 @@
     <table class="table table-bordered table-hover table-responsive wpi-user-subscriptions">
         <thead>
         <tr>
-            <th class="sub-no"><span class="nobr"><?php _e( 'No.', 'invoicing' ); ?></span></th>
-            <th class="sub-amount"><span class="nobr"><?php _e( 'Initial Amount', 'invoicing' ); ?></span></th>
-            <th class="sub-cycle"><span class="nobr"><?php _e( 'Billing Cycle', 'invoicing' ); ?></span></th>
-            <th class="sub-billed"><span class="nobr"><?php _e( 'Times Billed', 'invoicing' ); ?></span></th>
-            <th class="sub-status"><span class="nobr"><?php _e( 'Status', 'invoicing' ); ?></span></th>
-            <th class="sub-invoice"><span class="nobr"><?php _e( 'Invoice', 'invoicing' ); ?></span></th>
-            <th class="sub-item"><span class="nobr"><?php _e( 'Item', 'invoicing' ); ?></span></th>
-            <th class="sub-gateway"><span class="nobr"><?php _e( 'Gateway', 'invoicing' ); ?></span></th>
-            <th class="sub-expiry"><span class="nobr"><?php _e( 'Expires On', 'invoicing' ); ?></span></th>
-            <th class="sub-actions"><span class="nobr"><?php _e( 'Actions', 'invoicing' ); ?></span></th>
+            <th class="sub-no"><span class="nobr"><?php _e('No.', 'invoicing'); ?></span></th>
+            <th class="sub-amount"><span class="nobr"><?php _e('Initial Amount', 'invoicing'); ?></span></th>
+            <th class="sub-cycle"><span class="nobr"><?php _e('Billing Cycle', 'invoicing'); ?></span></th>
+            <th class="sub-billed"><span class="nobr"><?php _e('Times Billed', 'invoicing'); ?></span></th>
+            <th class="sub-status"><span class="nobr"><?php _e('Status', 'invoicing'); ?></span></th>
+            <th class="sub-invoice"><span class="nobr"><?php _e('Invoice', 'invoicing'); ?></span></th>
+            <th class="sub-item"><span class="nobr"><?php _e('Item', 'invoicing'); ?></span></th>
+            <th class="sub-gateway"><span class="nobr"><?php _e('Gateway', 'invoicing'); ?></span></th>
+            <th class="sub-expiry"><span class="nobr"><?php _e('Expires On', 'invoicing'); ?></span></th>
+            <th class="sub-actions"><span class="nobr"><?php _e('Actions', 'invoicing'); ?></span></th>
         </tr>
         </thead>
 

includes/class-wpinv-cache-helper.php

Spacing +36 added lines, -36 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -14,18 +14,18 @@ 
      * Hook in methods.
      */
     public static function init() {
-        add_action( 'init', array( __CLASS__, 'init_hooks' ), 0 );
-        add_action( 'admin_notices', array( __CLASS__, 'notices' ) );
+        add_action('init', array(__CLASS__, 'init_hooks'), 0);
+        add_action('admin_notices', array(__CLASS__, 'notices'));
     }
 
     public static function init_hooks() {
-        if ( false === ( $page_uris = get_transient( 'wpinv_cache_excluded_uris' ) ) ) {
-            $checkout_page = wpinv_get_option( 'checkout_page', '' );
-            $success_page  = wpinv_get_option( 'success_page', '' );
-            $failure_page  = wpinv_get_option( 'failure_page', '' );
-            $history_page  = wpinv_get_option( 'invoice_history_page', '' );
-            $subscr_page   = wpinv_get_option( 'invoice_subscription_page', '' );
-            if ( empty( $checkout_page ) || empty( $success_page ) || empty( $failure_page ) || empty( $history_page ) || empty( $subscr_page ) ) {
+        if (false === ($page_uris = get_transient('wpinv_cache_excluded_uris'))) {
+            $checkout_page = wpinv_get_option('checkout_page', '');
+            $success_page  = wpinv_get_option('success_page', '');
+            $failure_page  = wpinv_get_option('failure_page', '');
+            $history_page  = wpinv_get_option('invoice_history_page', '');
+            $subscr_page   = wpinv_get_option('invoice_subscription_page', '');
+            if (empty($checkout_page) || empty($success_page) || empty($failure_page) || empty($history_page) || empty($subscr_page)) {
                 return;
             }
 
@@ -39,34 +39,34 @@ 
             $page_uris[] = 'p=' . $subscr_page;
 
             // Exclude permalinks
-            $checkout_page  = get_post( $checkout_page );
-            $success_page   = get_post( $success_page );
-            $failure_page   = get_post( $failure_page );
-            $history_page   = get_post( $history_page );
-            $subscr_page    = get_post( $subscr_page );
+            $checkout_page  = get_post($checkout_page);
+            $success_page   = get_post($success_page);
+            $failure_page   = get_post($failure_page);
+            $history_page   = get_post($history_page);
+            $subscr_page    = get_post($subscr_page);
 
-            if ( ! is_null( $checkout_page ) ) {
+            if (!is_null($checkout_page)) {
                 $page_uris[] = '/' . $checkout_page->post_name;
             }
-            if ( ! is_null( $success_page ) ) {
+            if (!is_null($success_page)) {
                 $page_uris[] = '/' . $success_page->post_name;
             }
-            if ( ! is_null( $failure_page ) ) {
+            if (!is_null($failure_page)) {
                 $page_uris[] = '/' . $failure_page->post_name;
             }
-            if ( ! is_null( $history_page ) ) {
+            if (!is_null($history_page)) {
                 $page_uris[] = '/' . $history_page->post_name;
             }
-            if ( ! is_null( $subscr_page ) ) {
+            if (!is_null($subscr_page)) {
                 $page_uris[] = '/' . $subscr_page->post_name;
             }
 
-            set_transient( 'wpinv_cache_excluded_uris', $page_uris );
+            set_transient('wpinv_cache_excluded_uris', $page_uris);
         }
 
-        if ( is_array( $page_uris ) ) {
-            foreach( $page_uris as $uri ) {
-                if ( strstr( $_SERVER['REQUEST_URI'], $uri ) ) {
+        if (is_array($page_uris)) {
+            foreach ($page_uris as $uri) {
+                if (strstr($_SERVER['REQUEST_URI'], $uri)) {
                     self::nocache();
                     break;
                 }
@@ -79,14 +79,14 @@ 
      * @access private
      */
     private static function nocache() {
-        if ( ! defined( 'DONOTCACHEPAGE' ) ) {
-            define( "DONOTCACHEPAGE", true );
+        if (!defined('DONOTCACHEPAGE')) {
+            define("DONOTCACHEPAGE", true);
         }
-        if ( ! defined( 'DONOTCACHEOBJECT' ) ) {
-            define( "DONOTCACHEOBJECT", true );
+        if (!defined('DONOTCACHEOBJECT')) {
+            define("DONOTCACHEOBJECT", true);
         }
-        if ( ! defined( 'DONOTCACHEDB' ) ) {
-            define( "DONOTCACHEDB", true );
+        if (!defined('DONOTCACHEDB')) {
+            define("DONOTCACHEDB", true);
         }
         nocache_headers();
     }
@@ -95,18 +95,18 @@ 
      * notices function.
      */
     public static function notices() {
-        if ( ! function_exists( 'w3tc_pgcache_flush' ) || ! function_exists( 'w3_instance' ) ) {
+        if (!function_exists('w3tc_pgcache_flush') || !function_exists('w3_instance')) {
             return;
         }
 
-        $config   = w3_instance( 'W3_Config' );
-        $enabled  = $config->get_integer( 'dbcache.enabled' );
-        $settings = array_map( 'trim', $config->get_array( 'dbcache.reject.sql' ) );
+        $config   = w3_instance('W3_Config');
+        $enabled  = $config->get_integer('dbcache.enabled');
+        $settings = array_map('trim', $config->get_array('dbcache.reject.sql'));
 
-        if ( $enabled && ! in_array( '_wp_session_', $settings ) ) {
+        if ($enabled && !in_array('_wp_session_', $settings)) {
             ?>
             <div class="error">
-                <p><?php printf( __( 'In order for <strong>database caching</strong> to work with Invoicing you must add %1$s to the "Ignored Query Strings" option in <a href="%2$s">W3 Total Cache settings</a>.', 'invoicing' ), '<code>_wp_session_</code>', admin_url( 'admin.php?page=w3tc_dbcache' ) ); ?></p>
+                <p><?php printf(__('In order for <strong>database caching</strong> to work with Invoicing you must add %1$s to the "Ignored Query Strings" option in <a href="%2$s">W3 Total Cache settings</a>.', 'invoicing'), '<code>_wp_session_</code>', admin_url('admin.php?page=w3tc_dbcache')); ?></p>
             </div>
             <?php
         }

includes/admin/meta-boxes/class-mb-invoice-items.php

Spacing +154 added lines, -154 removed lines

@@ -1,47 +1,47 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Meta_Box_Items {
-    public static function output( $post ) {
+    public static function output($post) {
         global $wpinv_euvat, $ajax_cart_details;
 
-        $post_id            = !empty( $post->ID ) ? $post->ID : 0;
-        $invoice            = new WPInv_Invoice( $post_id );
+        $post_id            = !empty($post->ID) ? $post->ID : 0;
+        $invoice            = new WPInv_Invoice($post_id);
         $ajax_cart_details  = $invoice->get_cart_details();
-        $subtotal           = $invoice->get_subtotal( true );
+        $subtotal           = $invoice->get_subtotal(true);
         $discount_raw       = $invoice->get_discount();
-        $discount           = wpinv_price( $discount_raw, $invoice->get_currency() );
+        $discount           = wpinv_price($discount_raw, $invoice->get_currency());
         $discounts          = $discount_raw > 0 ? $invoice->get_discounts() : '';
-        $tax                = $invoice->get_tax( true );
-        $total              = $invoice->get_total( true );
+        $tax                = $invoice->get_tax(true);
+        $total              = $invoice->get_total(true);
         $item_quantities    = wpinv_item_quantities_enabled();
         $use_taxes          = wpinv_use_taxes();
-        if ( !$use_taxes && (float)$invoice->get_tax() > 0 ) {
+        if (!$use_taxes && (float)$invoice->get_tax() > 0) {
             $use_taxes = true;
         }
-        $item_types         = apply_filters( 'wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post );
+        $item_types         = apply_filters('wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post);
         $is_recurring       = $invoice->is_recurring();
         $post_type_object   = get_post_type_object($invoice->post_type);
         $type_title         = $post_type_object->labels->singular_name;
 
         $cols = 5;
-        if ( $item_quantities ) {
+        if ($item_quantities) {
             $cols++;
         }
-        if ( $use_taxes ) {
+        if ($use_taxes) {
             $cols++;
         }
         $class = '';
-        if ( $invoice->is_paid() ) {
+        if ($invoice->is_paid()) {
             $class .= ' wpinv-paid';
         }
-        if ( $invoice->is_refunded() ) {
+        if ($invoice->is_refunded()) {
             $class .= ' wpinv-refunded';
         }
-        if ( $is_recurring ) {
+        if ($is_recurring) {
             $class .= ' wpi-recurring';
         }
         ?>
@@ -49,21 +49,21 @@ 
             <table id="wpinv_items" class="wpinv-items" cellspacing="0" cellpadding="0">
                 <thead>
                     <tr>
-                        <th class="id"><?php _e( 'ID', 'invoicing' );?></th>
-                        <th class="title"><?php _e( 'Item', 'invoicing' );?></th>
-                        <th class="price"><?php _e( 'Price', 'invoicing' );?></th>
-                        <?php if ( $item_quantities ) { ?>
-                        <th class="qty"><?php _e( 'Qty', 'invoicing' );?></th>
+                        <th class="id"><?php _e('ID', 'invoicing'); ?></th>
+                        <th class="title"><?php _e('Item', 'invoicing'); ?></th>
+                        <th class="price"><?php _e('Price', 'invoicing'); ?></th>
+                        <?php if ($item_quantities) { ?>
+                        <th class="qty"><?php _e('Qty', 'invoicing'); ?></th>
                         <?php } ?>
-                        <th class="total"><?php _e( 'Total', 'invoicing' );?></th>
-                        <?php if ( $use_taxes ) { ?>
-                        <th class="tax"><?php _e( 'Tax (%)', 'invoicing' );?></th>
+                        <th class="total"><?php _e('Total', 'invoicing'); ?></th>
+                        <?php if ($use_taxes) { ?>
+                        <th class="tax"><?php _e('Tax (%)', 'invoicing'); ?></th>
                         <?php } ?>
                         <th class="action"></th>
                     </tr>
                 </thead>
                 <tbody class="wpinv-line-items">
-                    <?php echo wpinv_admin_get_line_items( $invoice ); ?>
+                    <?php echo wpinv_admin_get_line_items($invoice); ?>
                 </tbody>
                 <tfoot class="wpinv-totals">
                     <tr>
@@ -75,44 +75,44 @@ 
                                         </td>
                                         <td class="title">
                                             <input type="text" class="regular-text" placeholder="Item name" value="" name="_wpinv_quick[name]">
-                                            <?php if ( $wpinv_euvat->allow_vat_rules() ) { ?>
+                                            <?php if ($wpinv_euvat->allow_vat_rules()) { ?>
                                             <div class="wp-clearfix">
                                                 <label class="wpi-vat-rule">
-                                                    <span class="title"><?php _e( 'VAT rule type', 'invoicing' );?></span>
+                                                    <span class="title"><?php _e('VAT rule type', 'invoicing'); ?></span>
                                                     <span class="input-text-wrap">
-                                                        <?php echo wpinv_html_select( array(
+                                                        <?php echo wpinv_html_select(array(
                                                             'options'          => $wpinv_euvat->get_rules(),
                                                             'name'             => '_wpinv_quick[vat_rule]',
                                                             'id'               => '_wpinv_quick_vat_rule',
                                                             'show_option_all'  => false,
                                                             'show_option_none' => false,
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-vat-rule',
-                                                        ) ); ?>
+                                                        )); ?>
                                                     </span>
                                                 </label>
                                             </div>
-                                            <?php } if ( $wpinv_euvat->allow_vat_classes() ) { ?>
+                                            <?php } if ($wpinv_euvat->allow_vat_classes()) { ?>
                                             <div class="wp-clearfix">
                                                 <label class="wpi-vat-class">
-                                                    <span class="title"><?php _e( 'VAT class', 'invoicing' );?></span>
+                                                    <span class="title"><?php _e('VAT class', 'invoicing'); ?></span>
                                                     <span class="input-text-wrap">
-                                                        <?php echo wpinv_html_select( array(
+                                                        <?php echo wpinv_html_select(array(
                                                             'options'          => $wpinv_euvat->get_all_classes(),
                                                             'name'             => '_wpinv_quick[vat_class]',
                                                             'id'               => '_wpinv_quick_vat_class',
                                                             'show_option_all'  => false,
                                                             'show_option_none' => false,
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-vat-class',
-                                                        ) ); ?>
+                                                        )); ?>
                                                     </span>
                                                 </label>
                                             </div>
                                             <?php } ?>
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-type">
-                                                    <span class="title"><?php _e( 'Item type', 'invoicing' );?></span>
+                                                    <span class="title"><?php _e('Item type', 'invoicing'); ?></span>
                                                     <span class="input-text-wrap">
-                                                        <?php echo wpinv_html_select( array(
+                                                        <?php echo wpinv_html_select(array(
                                                             'options'          => $item_types,
                                                             'name'             => '_wpinv_quick[type]',
                                                             'id'               => '_wpinv_quick_type',
@@ -120,7 +120,7 @@ 
                                                             'show_option_all'  => false,
                                                             'show_option_none' => false,
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-type',
-                                                        ) ); ?>
+                                                        )); ?>
                                                     </span>
                                                 </label>
                                             </div>
@@ -133,11 +133,11 @@ 
                                             </div>
                                         </td>
                                         <td class="price"><input type="text" placeholder="0.00" class="wpi-field-price wpi-price" name="_wpinv_quick[price]" /></td>
-                                        <?php if ( $item_quantities ) { ?>
+                                        <?php if ($item_quantities) { ?>
                                         <td class="qty"><input type="number" class="small-text" step="1" min="1" value="1" name="_wpinv_quick[qty]" /></td>
                                         <?php } ?>
                                         <td class="total"></td>
-                                        <?php if ( $use_taxes ) { ?>
+                                        <?php if ($use_taxes) { ?>
                                         <td class="tax"></td>
                                         <?php } ?>
                                         <td class="action"></td>
@@ -150,29 +150,29 @@ 
                         <td colspan="<?php echo $cols; ?>"></td>
                     </tr>
                     <tr class="totals">
-                        <td colspan="<?php echo ( $cols - 4 ); ?>"></td>
+                        <td colspan="<?php echo ($cols - 4); ?>"></td>
                         <td colspan="4">
                             <table cellspacing="0" cellpadding="0">
                                 <tr class="subtotal">
-                                    <td class="name"><?php _e( 'Sub Total:', 'invoicing' );?></td>
-                                    <td class="total"><?php echo $subtotal;?></td>
+                                    <td class="name"><?php _e('Sub Total:', 'invoicing'); ?></td>
+                                    <td class="total"><?php echo $subtotal; ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <tr class="discount">
-                                    <td class="name"><?php wpinv_get_discount_label( wpinv_discount_code( $invoice->ID ) ); ?>:</td>
-                                    <td class="total"><?php echo wpinv_discount( $invoice->ID, true, true ); ?></td>
+                                    <td class="name"><?php wpinv_get_discount_label(wpinv_discount_code($invoice->ID)); ?>:</td>
+                                    <td class="total"><?php echo wpinv_discount($invoice->ID, true, true); ?></td>
                                     <td class="action"></td>
                                 </tr>
-                                <?php if ( $use_taxes ) { ?>
+                                <?php if ($use_taxes) { ?>
                                 <tr class="tax">
-                                    <td class="name"><?php _e( 'Tax:', 'invoicing' );?></td>
-                                    <td class="total"><?php echo $tax;?></td>
+                                    <td class="name"><?php _e('Tax:', 'invoicing'); ?></td>
+                                    <td class="total"><?php echo $tax; ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <?php } ?>
                                 <tr class="total">
-                                    <td class="name"><?php echo apply_filters( 'wpinv_invoice_items_total_label', __( 'Invoice Total:', 'invoicing' ), $invoice );?></td>
-                                    <td class="total"><?php echo $total;?></td>
+                                    <td class="name"><?php echo apply_filters('wpinv_invoice_items_total_label', __('Invoice Total:', 'invoicing'), $invoice); ?></td>
+                                    <td class="total"><?php echo $total; ?></td>
                                     <td class="action"></td>
                                 </tr>
                             </table>
@@ -183,89 +183,89 @@ 
             <div class="wpinv-actions">
                 <?php ob_start(); ?>
                 <?php
-                    if ( !$invoice->is_paid() && !$invoice->is_refunded() ) {
-                        if ( !$invoice->is_recurring() ) {
-                            echo wpinv_item_dropdown( array(
+                    if (!$invoice->is_paid() && !$invoice->is_refunded()) {
+                        if (!$invoice->is_recurring()) {
+                            echo wpinv_item_dropdown(array(
                                 'name'             => 'wpinv_invoice_item',
                                 'id'               => 'wpinv_invoice_item',
                                 'show_recurring'   => true,
-                            ) );
+                            ));
                     ?>
-                <input type="button" value="<?php echo sprintf(esc_attr__( 'Add item to %s', 'invoicing'), $type_title); ?>" class="button button-primary" id="wpinv-add-item"><input type="button" value="<?php esc_attr_e( 'Create new item', 'invoicing' );?>" class="button button-primary" id="wpinv-new-item"><?php } ?><input type="button" value="<?php esc_attr_e( 'Recalculate Totals', 'invoicing' );?>" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">
+                <input type="button" value="<?php echo sprintf(esc_attr__('Add item to %s', 'invoicing'), $type_title); ?>" class="button button-primary" id="wpinv-add-item"><input type="button" value="<?php esc_attr_e('Create new item', 'invoicing'); ?>" class="button button-primary" id="wpinv-new-item"><?php } ?><input type="button" value="<?php esc_attr_e('Recalculate Totals', 'invoicing'); ?>" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">
                     <?php } ?>
-                <?php do_action( 'wpinv_invoice_items_actions', $invoice ); ?>
-                <?php $item_actions = ob_get_clean(); echo apply_filters( 'wpinv_invoice_items_actions_content', $item_actions, $invoice, $post ); ?>
+                <?php do_action('wpinv_invoice_items_actions', $invoice); ?>
+                <?php $item_actions = ob_get_clean(); echo apply_filters('wpinv_invoice_items_actions_content', $item_actions, $invoice, $post); ?>
             </div>
         </div>
         <?php
     }
 
-    public static function prices( $post ) {        
+    public static function prices($post) {        
         $symbol         = wpinv_currency_symbol();
         $position       = wpinv_currency_position();
-        $item           = new WPInv_Item( $post->ID );
+        $item           = new WPInv_Item($post->ID);
 
         $price          = $item->get_price();
         $is_recurring   = $item->is_recurring();
         $period         = $item->get_recurring_period();
-        $interval       = absint( $item->get_recurring_interval() );
-        $times          = absint( $item->get_recurring_limit() );
+        $interval       = absint($item->get_recurring_interval());
+        $times          = absint($item->get_recurring_limit());
         $free_trial     = $item->has_free_trial();
         $trial_interval = $item->get_trial_interval();
         $trial_period   = $item->get_trial_period();
 
         $intervals      = array();
-        for ( $i = 1; $i <= 90; $i++ ) {
+        for ($i = 1; $i <= 90; $i++) {
             $intervals[$i] = $i;
         }
 
-        $interval       = $interval > 0 ? $interval : 1;
+        $interval = $interval > 0 ? $interval : 1;
 
         $class = $is_recurring ? 'wpinv-recurring-y' : 'wpinv-recurring-n';
         ?>
-        <p class="wpinv-row-prices"><?php echo ( $position != 'right' ? $symbol . '&nbsp;' : '' );?><input type="text" maxlength="12" placeholder="<?php echo wpinv_sanitize_amount( 0 ); ?>" value="<?php echo $price;?>" id="wpinv_item_price" name="wpinv_item_price" class="medium-text wpi-field-price wpi-price" <?php disabled( $item->is_editable(), false ); ?> /><?php echo ( $position == 'right' ? '&nbsp;' . $symbol : '' );?><input type="hidden" name="wpinv_vat_meta_box_nonce" value="<?php echo wp_create_nonce( 'wpinv_item_meta_box_save' ) ;?>" />
-        <?php do_action( 'wpinv_prices_metabox_price', $item ); ?>
+        <p class="wpinv-row-prices"><?php echo ($position != 'right' ? $symbol . '&nbsp;' : ''); ?><input type="text" maxlength="12" placeholder="<?php echo wpinv_sanitize_amount(0); ?>" value="<?php echo $price; ?>" id="wpinv_item_price" name="wpinv_item_price" class="medium-text wpi-field-price wpi-price" <?php disabled($item->is_editable(), false); ?> /><?php echo ($position == 'right' ? '&nbsp;' . $symbol : ''); ?><input type="hidden" name="wpinv_vat_meta_box_nonce" value="<?php echo wp_create_nonce('wpinv_item_meta_box_save'); ?>" />
+        <?php do_action('wpinv_prices_metabox_price', $item); ?>
         </p>
         <p class="wpinv-row-is-recurring">
             <label for="wpinv_is_recurring">
-                <input type="checkbox" name="wpinv_is_recurring" id="wpinv_is_recurring" value="1" <?php checked( 1, $is_recurring ); ?> />
-                <?php echo apply_filters( 'wpinv_is_recurring_toggle_text', __( 'Is Recurring Item?', 'invoicing' ) ); ?>
+                <input type="checkbox" name="wpinv_is_recurring" id="wpinv_is_recurring" value="1" <?php checked(1, $is_recurring); ?> />
+                <?php echo apply_filters('wpinv_is_recurring_toggle_text', __('Is Recurring Item?', 'invoicing')); ?>
             </label>
-            <?php do_action( 'wpinv_prices_metabox_is_recurring_field', $item ); ?>
+            <?php do_action('wpinv_prices_metabox_is_recurring_field', $item); ?>
         </p>
-        <p class="wpinv-row-recurring-fields <?php echo $class;?>">
-            <label class="wpinv-period" for="wpinv_recurring_period"><?php _e( 'Recurring', 'invoicing' );?> <select class="wpinv-select " id="wpinv_recurring_period" name="wpinv_recurring_period"><option value="D" data-text="<?php esc_attr_e( 'day(s)', 'invoicing' ); ?>" <?php selected( 'D', $period );?>><?php _e( 'Daily', 'invoicing' ); ?></option><option value="W" data-text="<?php esc_attr_e( 'week(s)', 'invoicing' ); ?>" <?php selected( 'W', $period );?>><?php _e( 'Weekly', 'invoicing' ); ?></option><option value="M" data-text="<?php esc_attr_e( 'month(s)', 'invoicing' ); ?>" <?php selected( 'M', $period );?>><?php _e( 'Monthly', 'invoicing' ); ?></option><option value="Y" data-text="<?php esc_attr_e( 'year(s)', 'invoicing' ); ?>" <?php selected( 'Y', $period );?>><?php _e( 'Yearly', 'invoicing' ); ?></option></select></label>
-            <label class="wpinv-interval" for="wpinv_recurring_interval"> <?php _e( 'at every', 'invoicing' );?> <?php echo wpinv_html_select( array(
+        <p class="wpinv-row-recurring-fields <?php echo $class; ?>">
+            <label class="wpinv-period" for="wpinv_recurring_period"><?php _e('Recurring', 'invoicing'); ?> <select class="wpinv-select " id="wpinv_recurring_period" name="wpinv_recurring_period"><option value="D" data-text="<?php esc_attr_e('day(s)', 'invoicing'); ?>" <?php selected('D', $period); ?>><?php _e('Daily', 'invoicing'); ?></option><option value="W" data-text="<?php esc_attr_e('week(s)', 'invoicing'); ?>" <?php selected('W', $period); ?>><?php _e('Weekly', 'invoicing'); ?></option><option value="M" data-text="<?php esc_attr_e('month(s)', 'invoicing'); ?>" <?php selected('M', $period); ?>><?php _e('Monthly', 'invoicing'); ?></option><option value="Y" data-text="<?php esc_attr_e('year(s)', 'invoicing'); ?>" <?php selected('Y', $period); ?>><?php _e('Yearly', 'invoicing'); ?></option></select></label>
+            <label class="wpinv-interval" for="wpinv_recurring_interval"> <?php _e('at every', 'invoicing'); ?> <?php echo wpinv_html_select(array(
                 'options'          => $intervals,
                 'name'             => 'wpinv_recurring_interval',
                 'id'               => 'wpinv_recurring_interval',
                 'selected'         => $interval,
                 'show_option_all'  => false,
                 'show_option_none' => false
-            ) ); ?> <span id="wpinv_interval_text"><?php _e( 'day(s)', 'invoicing' );?></span></label>
-            <label class="wpinv-times" for="wpinv_recurring_limit"> <?php _e( 'for', 'invoicing' );?> <input class="small-text" type="number" value="<?php echo $times;?>" size="4" id="wpinv_recurring_limit" name="wpinv_recurring_limit" step="1" min="0"> <?php _e( 'time(s) <i>(select 0 for recurring forever until cancelled</i>)', 'invoicing' );?></label>
+            )); ?> <span id="wpinv_interval_text"><?php _e('day(s)', 'invoicing'); ?></span></label>
+            <label class="wpinv-times" for="wpinv_recurring_limit"> <?php _e('for', 'invoicing'); ?> <input class="small-text" type="number" value="<?php echo $times; ?>" size="4" id="wpinv_recurring_limit" name="wpinv_recurring_limit" step="1" min="0"> <?php _e('time(s) <i>(select 0 for recurring forever until cancelled</i>)', 'invoicing'); ?></label>
             <span class="clear wpi-trial-clr"></span>
             <label class="wpinv-free-trial" for="wpinv_free_trial">
-                <input type="checkbox" name="wpinv_free_trial" id="wpinv_free_trial" value="1" <?php checked( true, (bool)$free_trial ); ?> /> 
-                <?php echo __( 'Offer free trial for', 'invoicing' ); ?>
+                <input type="checkbox" name="wpinv_free_trial" id="wpinv_free_trial" value="1" <?php checked(true, (bool)$free_trial); ?> /> 
+                <?php echo __('Offer free trial for', 'invoicing'); ?>
             </label>
             <label class="wpinv-trial-interval" for="wpinv_trial_interval">
-                <input class="small-text" type="number" value="<?php echo $trial_interval;?>" size="4" id="wpinv_trial_interval" name="wpinv_trial_interval" step="1" min="1"> <select class="wpinv-select" id="wpinv_trial_period" name="wpinv_trial_period"><option value="D" <?php selected( 'D', $trial_period );?>><?php _e( 'day(s)', 'invoicing' ); ?></option><option value="W" <?php selected( 'W', $trial_period );?>><?php _e( 'week(s)', 'invoicing' ); ?></option><option value="M" <?php selected( 'M', $trial_period );?>><?php _e( 'month(s)', 'invoicing' ); ?></option><option value="Y" <?php selected( 'Y', $trial_period );?>><?php _e( 'year(s)', 'invoicing' ); ?></option></select>
+                <input class="small-text" type="number" value="<?php echo $trial_interval; ?>" size="4" id="wpinv_trial_interval" name="wpinv_trial_interval" step="1" min="1"> <select class="wpinv-select" id="wpinv_trial_period" name="wpinv_trial_period"><option value="D" <?php selected('D', $trial_period); ?>><?php _e('day(s)', 'invoicing'); ?></option><option value="W" <?php selected('W', $trial_period); ?>><?php _e('week(s)', 'invoicing'); ?></option><option value="M" <?php selected('M', $trial_period); ?>><?php _e('month(s)', 'invoicing'); ?></option><option value="Y" <?php selected('Y', $trial_period); ?>><?php _e('year(s)', 'invoicing'); ?></option></select>
             </label>
-            <?php do_action( 'wpinv_prices_metabox_recurring_fields', $item ); ?>
+            <?php do_action('wpinv_prices_metabox_recurring_fields', $item); ?>
         </p>
-        <input type="hidden" id="_wpi_current_type" value="<?php echo wpinv_get_item_type( $post->ID ); ?>" />
-        <?php do_action( 'wpinv_item_price_field', $post->ID ); ?>
+        <input type="hidden" id="_wpi_current_type" value="<?php echo wpinv_get_item_type($post->ID); ?>" />
+        <?php do_action('wpinv_item_price_field', $post->ID); ?>
         <?php
     }
 
-    public static function vat_rules( $post ) {
+    public static function vat_rules($post) {
         global $wpinv_euvat;
 
-        $rule_type = $wpinv_euvat->get_item_rule( $post->ID );
+        $rule_type = $wpinv_euvat->get_item_rule($post->ID);
         ?>
-        <p><label for="wpinv_vat_rules"><strong><?php _e( 'Select how VAT rules will be applied:', 'invoicing' );?></strong></label>&nbsp;&nbsp;&nbsp;
-        <?php echo wpinv_html_select( array(
+        <p><label for="wpinv_vat_rules"><strong><?php _e('Select how VAT rules will be applied:', 'invoicing'); ?></strong></label>&nbsp;&nbsp;&nbsp;
+        <?php echo wpinv_html_select(array(
                     'options'          => $wpinv_euvat->get_rules(),
                     'name'             => 'wpinv_vat_rules',
                     'id'               => 'wpinv_vat_rules',
@@ -273,19 +273,19 @@ 
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpinv-vat-rules',
-                ) ); ?>
+                )); ?>
         </p>
-        <p class="wpi-m0"><?php _e( 'When you select physical product rules, only consumers and businesses in your country will be charged VAT.  The VAT rate used will be the rate in your country.', 'invoicing' ); ?></p>
-        <p class="wpi-m0"><?php _e( 'If you select Digital product rules, VAT will be charged at the rate that applies in the country of the consumer.  Only businesses in your country will be charged VAT.', 'invoicing' ); ?></p>
+        <p class="wpi-m0"><?php _e('When you select physical product rules, only consumers and businesses in your country will be charged VAT.  The VAT rate used will be the rate in your country.', 'invoicing'); ?></p>
+        <p class="wpi-m0"><?php _e('If you select Digital product rules, VAT will be charged at the rate that applies in the country of the consumer.  Only businesses in your country will be charged VAT.', 'invoicing'); ?></p>
         <?php
     }
 
-    public static function vat_classes( $post ) {
+    public static function vat_classes($post) {
         global $wpinv_euvat;
         
-        $vat_class = $wpinv_euvat->get_item_class( $post->ID );
+        $vat_class = $wpinv_euvat->get_item_class($post->ID);
         ?>
-        <p><?php echo wpinv_html_select( array(
+        <p><?php echo wpinv_html_select(array(
                     'options'          => $wpinv_euvat->get_all_classes(),
                     'name'             => 'wpinv_vat_class',
                     'id'               => 'wpinv_vat_class',
@@ -293,18 +293,18 @@ 
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpinv-vat-class',
-                ) ); ?>
+                )); ?>
         </p>
-        <p class="wpi-m0"><?php _e( 'Select the VAT rate class to use for this invoice item.', 'invoicing' ); ?></p>
+        <p class="wpi-m0"><?php _e('Select the VAT rate class to use for this invoice item.', 'invoicing'); ?></p>
         <?php
     }
 
-    public static function item_info( $post ) {
-        $item_type = wpinv_get_item_type( $post->ID );
-        do_action( 'wpinv_item_info_metabox_before', $post );
+    public static function item_info($post) {
+        $item_type = wpinv_get_item_type($post->ID);
+        do_action('wpinv_item_info_metabox_before', $post);
         ?>
-        <p><label for="wpinv_item_type"><strong><?php _e( 'Type:', 'invoicing' );?></strong></label>&nbsp;&nbsp;&nbsp;
-        <?php echo wpinv_html_select( array(
+        <p><label for="wpinv_item_type"><strong><?php _e('Type:', 'invoicing'); ?></strong></label>&nbsp;&nbsp;&nbsp;
+        <?php echo wpinv_html_select(array(
                     'options'          => wpinv_get_item_types(),
                     'name'             => 'wpinv_item_type',
                     'id'               => 'wpinv_item_type',
@@ -312,114 +312,114 @@ 
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpinv-item-type',
-                ) ); ?>
+                )); ?>
         </p>
-        <p class="wpi-m0"><?php _e( 'Select item type.', 'invoicing' );?><br><?php _e( '<b>Standard:</b> Standard item type', 'invoicing' );?><br><?php _e( '<b>Fee:</b> Like Registration Fee, Sign up Fee etc.', 'invoicing' );?></p>
+        <p class="wpi-m0"><?php _e('Select item type.', 'invoicing'); ?><br><?php _e('<b>Standard:</b> Standard item type', 'invoicing'); ?><br><?php _e('<b>Fee:</b> Like Registration Fee, Sign up Fee etc.', 'invoicing'); ?></p>
         <?php
-        do_action( 'wpinv_item_info_metabox_after', $post );
+        do_action('wpinv_item_info_metabox_after', $post);
     }
 
-    public static function meta_values( $post ) {
-        $meta_keys = apply_filters( 'wpinv_show_meta_values_for_keys', array(
+    public static function meta_values($post) {
+        $meta_keys = apply_filters('wpinv_show_meta_values_for_keys', array(
             'type',
             'custom_id'
-        ) );
+        ));
 
-        if ( empty( $meta_keys ) ) {
+        if (empty($meta_keys)) {
             return;
         }
 
-        do_action( 'wpinv_meta_values_metabox_before', $post );
+        do_action('wpinv_meta_values_metabox_before', $post);
 
-        foreach ( $meta_keys as $meta_key ) {
+        foreach ($meta_keys as $meta_key) {
             ?>
-            <p class="wpi-mtb05"><label><strong><?php echo $meta_key; ?></strong>: <?php echo get_post_meta( $post->ID, '_wpinv_' . $meta_key, true ); ?></label></p>
+            <p class="wpi-mtb05"><label><strong><?php echo $meta_key; ?></strong>: <?php echo get_post_meta($post->ID, '_wpinv_' . $meta_key, true); ?></label></p>
             <?php 
         }
 
-        do_action( 'wpinv_meta_values_metabox_after', $post );
+        do_action('wpinv_meta_values_metabox_after', $post);
     }
 
-    public static function save( $post_id, $data, $post ) {
-        $invoice        = new WPInv_Invoice( $post_id );
+    public static function save($post_id, $data, $post) {
+        $invoice        = new WPInv_Invoice($post_id);
 
         // Billing
-        $first_name     = sanitize_text_field( $data['wpinv_first_name'] );
-        $last_name      = sanitize_text_field( $data['wpinv_last_name'] );
-        $company        = sanitize_text_field( $data['wpinv_company'] );
-        $vat_number     = sanitize_text_field( $data['wpinv_vat_number'] );
-        $phone          = sanitize_text_field( $data['wpinv_phone'] );
-        $address        = sanitize_text_field( $data['wpinv_address'] );
-        $city           = sanitize_text_field( $data['wpinv_city'] );
-        $zip            = sanitize_text_field( $data['wpinv_zip'] );
-        $country        = sanitize_text_field( $data['wpinv_country'] );
-        $state          = sanitize_text_field( $data['wpinv_state'] );
+        $first_name     = sanitize_text_field($data['wpinv_first_name']);
+        $last_name      = sanitize_text_field($data['wpinv_last_name']);
+        $company        = sanitize_text_field($data['wpinv_company']);
+        $vat_number     = sanitize_text_field($data['wpinv_vat_number']);
+        $phone          = sanitize_text_field($data['wpinv_phone']);
+        $address        = sanitize_text_field($data['wpinv_address']);
+        $city           = sanitize_text_field($data['wpinv_city']);
+        $zip            = sanitize_text_field($data['wpinv_zip']);
+        $country        = sanitize_text_field($data['wpinv_country']);
+        $state          = sanitize_text_field($data['wpinv_state']);
 
         // Details
-        $status         = sanitize_text_field( $data['wpinv_status'] );
-        $old_status     = !empty( $data['original_post_status'] ) ? sanitize_text_field( $data['original_post_status'] ) : $status;
-        $number         = sanitize_text_field( $data['wpinv_number'] );
-        $due_date       = isset( $data['wpinv_due_date'] ) ? sanitize_text_field( $data['wpinv_due_date'] ) : '';
+        $status         = sanitize_text_field($data['wpinv_status']);
+        $old_status     = !empty($data['original_post_status']) ? sanitize_text_field($data['original_post_status']) : $status;
+        $number         = sanitize_text_field($data['wpinv_number']);
+        $due_date       = isset($data['wpinv_due_date']) ? sanitize_text_field($data['wpinv_due_date']) : '';
         //$discounts      = sanitize_text_field( $data['wpinv_discounts'] );
         //$discount       = sanitize_text_field( $data['wpinv_discount'] );
 
-        $ip             = $invoice->get_ip() ? $invoice->get_ip() : wpinv_get_ip();
+        $ip = $invoice->get_ip() ? $invoice->get_ip() : wpinv_get_ip();
 
-        $invoice->set( 'due_date', $due_date );
-        $invoice->set( 'first_name', $first_name );
-        $invoice->set( 'last_name', $last_name );
-        $invoice->set( 'company', $company );
-        $invoice->set( 'vat_number', $vat_number );
-        $invoice->set( 'phone', $phone );
-        $invoice->set( 'address', $address );
-        $invoice->set( 'city', $city );
-        $invoice->set( 'zip', $zip );
-        $invoice->set( 'country', $country );
-        $invoice->set( 'state', $state );
-        $invoice->set( 'status', $status );
+        $invoice->set('due_date', $due_date);
+        $invoice->set('first_name', $first_name);
+        $invoice->set('last_name', $last_name);
+        $invoice->set('company', $company);
+        $invoice->set('vat_number', $vat_number);
+        $invoice->set('phone', $phone);
+        $invoice->set('address', $address);
+        $invoice->set('city', $city);
+        $invoice->set('zip', $zip);
+        $invoice->set('country', $country);
+        $invoice->set('state', $state);
+        $invoice->set('status', $status);
         //$invoice->set( 'number', $number );
         //$invoice->set( 'discounts', $discounts );
         //$invoice->set( 'discount', $discount );
-        $invoice->set( 'ip', $ip );
+        $invoice->set('ip', $ip);
         $invoice->old_status = $_POST['original_post_status'];
         $invoice->currency = wpinv_get_currency();
-        if ( !empty( $data['wpinv_gateway'] ) ) {
-            $invoice->set( 'gateway', sanitize_text_field( $data['wpinv_gateway'] ) );
+        if (!empty($data['wpinv_gateway'])) {
+            $invoice->set('gateway', sanitize_text_field($data['wpinv_gateway']));
         }
         $saved = $invoice->save();
 
         // Check for payment notes
-        if ( !empty( $data['invoice_note'] ) ) {
-            $note               = wp_kses( $data['invoice_note'], array() );
-            $note_type          = sanitize_text_field( $data['invoice_note_type'] );
+        if (!empty($data['invoice_note'])) {
+            $note               = wp_kses($data['invoice_note'], array());
+            $note_type          = sanitize_text_field($data['invoice_note_type']);
             $is_customer_note   = $note_type == 'customer' ? 1 : 0;
 
-            wpinv_insert_payment_note( $invoice->ID, $note, $is_customer_note );
+            wpinv_insert_payment_note($invoice->ID, $note, $is_customer_note);
         }
 
         // Update user address if empty.
-        if ( $saved && !empty( $invoice ) ) {
-            if ( $user_id = $invoice->get_user_id() ) {
-                $user_address = wpinv_get_user_address( $user_id, false );
+        if ($saved && !empty($invoice)) {
+            if ($user_id = $invoice->get_user_id()) {
+                $user_address = wpinv_get_user_address($user_id, false);
 
                 if (empty($user_address['first_name'])) {
-                    update_user_meta( $user_id, '_wpinv_first_name', $first_name );
-                    update_user_meta( $user_id, '_wpinv_last_name', $last_name );
+                    update_user_meta($user_id, '_wpinv_first_name', $first_name);
+                    update_user_meta($user_id, '_wpinv_last_name', $last_name);
                 } else if (empty($user_address['last_name']) && $user_address['first_name'] == $first_name) {
-                    update_user_meta( $user_id, '_wpinv_last_name', $last_name );
+                    update_user_meta($user_id, '_wpinv_last_name', $last_name);
                 }
 
                 if (empty($user_address['address']) || empty($user_address['city']) || empty($user_address['state']) || empty($user_address['country'])) {
-                    update_user_meta( $user_id, '_wpinv_address', $address );
-                    update_user_meta( $user_id, '_wpinv_city', $city );
-                    update_user_meta( $user_id, '_wpinv_state', $state );
-                    update_user_meta( $user_id, '_wpinv_country', $country );
-                    update_user_meta( $user_id, '_wpinv_zip', $zip );
-                    update_user_meta( $user_id, '_wpinv_phone', $phone );
+                    update_user_meta($user_id, '_wpinv_address', $address);
+                    update_user_meta($user_id, '_wpinv_city', $city);
+                    update_user_meta($user_id, '_wpinv_state', $state);
+                    update_user_meta($user_id, '_wpinv_country', $country);
+                    update_user_meta($user_id, '_wpinv_zip', $zip);
+                    update_user_meta($user_id, '_wpinv_phone', $phone);
                 }
             }
 
-            do_action( 'wpinv_invoice_metabox_saved', $invoice );
+            do_action('wpinv_invoice_metabox_saved', $invoice);
         }
 
         return $saved;

includes/admin/subscriptions.php

Braces +14 added lines, -5 removed lines

@@ -180,8 +180,11 @@ 
 											<label for="tablecell">
 												<?php if( 'trialling' == $sub->status ) : ?>
 													<?php _e( 'Trialling Until:', 'invoicing' ); ?>
-												<?php else: ?>
-													<?php _e( 'Expiration Date:', 'invoicing' ); ?>
+												<?php else {
+    : ?>
+													<?php _e( 'Expiration Date:', 'invoicing' );
+}
+?>
 												<?php endif; ?>
 											</label>
 										</td>
@@ -251,7 +254,10 @@ 
 						</thead>
 						<tbody>
 						<?php if ( ! empty( $payments ) ) : ?>
-							<?php foreach ( $payments as $payment ) : $invoice = wpinv_get_invoice( $payment->ID ); if ( empty( $invoice->ID ) ) continue; ?>
+							<?php foreach ( $payments as $payment ) : $invoice = wpinv_get_invoice( $payment->ID ); if ( empty( $invoice->ID ) ) {
+    continue;
+}
+?>
 								<tr>
 									<td><?php echo $payment->ID; ?></td>
 									<td><?php echo $invoice->get_total( true ); ?></td>
@@ -268,9 +274,12 @@ 
 									</td>
 								</tr>
 							<?php endforeach; ?>
-						<?php else: ?>
+						<?php else {
+    : ?>
 							<tr>
-								<td colspan="5"><?php _e( 'No Invoices Found.', 'invoicing' ); ?></td>
+								<td colspan="5"><?php _e( 'No Invoices Found.', 'invoicing' );
+}
+?></td>
 							</tr>
 						<?php endif; ?>
 						</tbody>

Indentation +80 added lines, -80 removed lines

@@ -8,23 +8,23 @@ 
  */
 function wpinv_subscriptions_page() {
 
-	if ( ! empty( $_GET['id'] ) ) {
+    if ( ! empty( $_GET['id'] ) ) {
 
         wpinv_recurring_subscription_details();
 
-		return;
+        return;
 
-	}
-	?>
+    }
+    ?>
 	<div class="wrap">
 
 		<h1>
 			<?php _e( 'Subscriptions', 'invoicing' ); ?>
 		</h1>
 		<?php
-		$subscribers_table = new WPInv_Subscription_Reports_Table();
-		$subscribers_table->prepare_items();
-		?>
+        $subscribers_table = new WPInv_Subscription_Reports_Table();
+        $subscribers_table->prepare_items();
+        ?>
 
 		<form id="subscribers-filter" method="get">
 
@@ -47,24 +47,24 @@ 
  */
 function wpinv_recurring_subscription_details() {
 
-	$render = true;
+    $render = true;
 
-	if ( ! current_user_can( 'manage_invoicing' ) ) {
-		die( __( 'You are not permitted to view this data.', 'invoicing' ) );
-	}
+    if ( ! current_user_can( 'manage_invoicing' ) ) {
+        die( __( 'You are not permitted to view this data.', 'invoicing' ) );
+    }
 
-	if ( ! isset( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
+    if ( ! isset( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
         die( __( 'Invalid subscription ID Provided.', 'invoicing' ) );
-	}
+    }
 
-	$sub_id  = (int) $_GET['id'];
-	$sub     = new WPInv_Subscription( $sub_id );
+    $sub_id  = (int) $_GET['id'];
+    $sub     = new WPInv_Subscription( $sub_id );
 
-	if ( empty( $sub ) ) {
-		die( __( 'Invalid subscription ID Provided.', 'invoicing' ) );
-	}
+    if ( empty( $sub ) ) {
+        die( __( 'Invalid subscription ID Provided.', 'invoicing' ) );
+    }
 
-	?>
+    ?>
 	<div class="wrap">
 		<h2><?php _e( 'Subscription Details', 'invoicing' ); ?></h2>
 
@@ -88,11 +88,11 @@ 
 										</td>
 										<td>
 											<?php
-											$frequency = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $sub->period, $sub->frequency );
-											$billing   = wpinv_price( wpinv_format_amount( $sub->recurring_amount ), wpinv_get_invoice_currency_code( $sub->parent_payment_id ) ) . ' / ' . $frequency;
-											$initial   = wpinv_price( wpinv_format_amount( $sub->initial_amount ), wpinv_get_invoice_currency_code( $sub->parent_payment_id ) );
-											printf( _x( '%s then %s', 'Initial subscription amount then billing cycle and amount', 'invoicing' ), $initial, $billing );
-											?>
+                                            $frequency = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $sub->period, $sub->frequency );
+                                            $billing   = wpinv_price( wpinv_format_amount( $sub->recurring_amount ), wpinv_get_invoice_currency_code( $sub->parent_payment_id ) ) . ' / ' . $frequency;
+                                            $initial   = wpinv_price( wpinv_format_amount( $sub->initial_amount ), wpinv_get_invoice_currency_code( $sub->parent_payment_id ) );
+                                            printf( _x( '%s then %s', 'Initial subscription amount then billing cycle and amount', 'invoicing' ), $initial, $billing );
+                                            ?>
 										</td>
 									</tr>
 									<tr>
@@ -134,9 +134,9 @@ 
 
                                             ?>
 											<a href="<?php echo esc_url( add_query_arg( array(
-													'post'   => $sub->product_id,
-													'action' => 'edit'
-												), admin_url( 'post.php' ) ) ); ?>" target="_blank"><?php _e( 'View Item', 'invoicing' ) ; ?></a>
+                                                    'post'   => $sub->product_id,
+                                                    'action' => 'edit'
+                                                ), admin_url( 'post.php' ) ) ); ?>" target="_blank"><?php _e( 'View Item', 'invoicing' ) ; ?></a>
 										</td>
 									</tr>
 									<tr>
@@ -299,56 +299,56 @@ 
  */
 function wpinv_recurring_process_subscription_update() {
 
-	if( empty( $_POST['sub_id'] ) ) {
-		return;
-	}
+    if( empty( $_POST['sub_id'] ) ) {
+        return;
+    }
 
-	if( empty( $_POST['wpinv_update_subscription'] ) ) {
-		return;
-	}
+    if( empty( $_POST['wpinv_update_subscription'] ) ) {
+        return;
+    }
 
-	if( ! current_user_can( 'manage_invoicing') ) {
-		return;
-	}
+    if( ! current_user_can( 'manage_invoicing') ) {
+        return;
+    }
 
-	if( ! wp_verify_nonce( $_POST['wpinv-recurring-update-nonce'], 'wpinv-recurring-update' ) ) {
-		wp_die( __( 'Nonce verification failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
-	}
+    if( ! wp_verify_nonce( $_POST['wpinv-recurring-update-nonce'], 'wpinv-recurring-update' ) ) {
+        wp_die( __( 'Nonce verification failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    }
 
-	$profile_id      = sanitize_text_field( $_POST['profile_id'] );
-	$transaction_id  = sanitize_text_field( $_POST['transaction_id'] );
-	$product_id      = absint( $_POST['product_id'] );
-	$subscription    = new WPInv_Subscription( absint( $_POST['sub_id'] ) );
-	$subscription->update( array(
-		'status'         => sanitize_text_field( $_POST['status'] ),
-		'profile_id'     => $profile_id,
-		'product_id'     => $product_id,
-		'transaction_id' => $transaction_id,
-	) );
+    $profile_id      = sanitize_text_field( $_POST['profile_id'] );
+    $transaction_id  = sanitize_text_field( $_POST['transaction_id'] );
+    $product_id      = absint( $_POST['product_id'] );
+    $subscription    = new WPInv_Subscription( absint( $_POST['sub_id'] ) );
+    $subscription->update( array(
+        'status'         => sanitize_text_field( $_POST['status'] ),
+        'profile_id'     => $profile_id,
+        'product_id'     => $product_id,
+        'transaction_id' => $transaction_id,
+    ) );
 
-	$status = sanitize_text_field( $_POST['status'] );
+    $status = sanitize_text_field( $_POST['status'] );
 
-	switch( $status ) {
+    switch( $status ) {
 
-		case 'cancelled' :
+        case 'cancelled' :
 
-			$subscription->cancel();
-			break;
+            $subscription->cancel();
+            break;
 
-		case 'expired' :
+        case 'expired' :
 
-			$subscription->expire();
-			break;
+            $subscription->expire();
+            break;
 
-		case 'completed' :
+        case 'completed' :
 
-			$subscription->complete();
-			break;
+            $subscription->complete();
+            break;
 
-	}
+    }
 
-	wp_redirect( admin_url( 'admin.php?page=wpinv-subscriptions&wpinv-message=updated&id=' . $subscription->id ) );
-	exit;
+    wp_redirect( admin_url( 'admin.php?page=wpinv-subscriptions&wpinv-message=updated&id=' . $subscription->id ) );
+    exit;
 
 }
 add_action( 'admin_init', 'wpinv_recurring_process_subscription_update', 1 );
@@ -362,30 +362,30 @@ 
  */
 function wpinv_recurring_process_subscription_deletion() {
 
-	if( empty( $_POST['sub_id'] ) ) {
-		return;
-	}
+    if( empty( $_POST['sub_id'] ) ) {
+        return;
+    }
 
-	if( empty( $_POST['wpinv_delete_subscription'] ) ) {
-		return;
-	}
+    if( empty( $_POST['wpinv_delete_subscription'] ) ) {
+        return;
+    }
 
-	if( ! current_user_can( 'manage_invoicing') ) {
-		return;
-	}
+    if( ! current_user_can( 'manage_invoicing') ) {
+        return;
+    }
 
-	if( ! wp_verify_nonce( $_POST['wpinv-recurring-update-nonce'], 'wpinv-recurring-update' ) ) {
-		wp_die( __( 'Nonce verification failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
-	}
+    if( ! wp_verify_nonce( $_POST['wpinv-recurring-update-nonce'], 'wpinv-recurring-update' ) ) {
+        wp_die( __( 'Nonce verification failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    }
 
-	$subscription = new WPInv_Subscription( absint( $_POST['sub_id'] ) );
+    $subscription = new WPInv_Subscription( absint( $_POST['sub_id'] ) );
 
-	delete_post_meta( $subscription->parent_payment_id, '_wpinv_subscription_payment' );
+    delete_post_meta( $subscription->parent_payment_id, '_wpinv_subscription_payment' );
 
-	$subscription->delete();
+    $subscription->delete();
 
-	wp_redirect( admin_url( 'admin.php?page=wpinv-subscriptions&wpinv-message=deleted' ) );
-	exit;
+    wp_redirect( admin_url( 'admin.php?page=wpinv-subscriptions&wpinv-message=deleted' ) );
+    exit;
 
 }
 add_action( 'admin_init', 'wpinv_recurring_process_subscription_deletion', 2 );

Spacing +112 added lines, -112 removed lines

@@ -8,7 +8,7 @@ 
  */
 function wpinv_subscriptions_page() {
 
-	if ( ! empty( $_GET['id'] ) ) {
+	if (!empty($_GET['id'])) {
 
         wpinv_recurring_subscription_details();
 
@@ -19,7 +19,7 @@ 
 	<div class="wrap">
 
 		<h1>
-			<?php _e( 'Subscriptions', 'invoicing' ); ?>
+			<?php _e('Subscriptions', 'invoicing'); ?>
 		</h1>
 		<?php
 		$subscribers_table = new WPInv_Subscription_Reports_Table();
@@ -31,7 +31,7 @@ 
 			<input type="hidden" name="post_type" value="download" />
 			<input type="hidden" name="page" value="wpinv-subscriptions" />
 			<?php $subscribers_table->views(); ?>
-			<?php $subscribers_table->search_box( __( 'Search', 'wpinvoicing' ), 'subscriptions' ); ?>
+			<?php $subscribers_table->search_box(__('Search', 'wpinvoicing'), 'subscriptions'); ?>
 			<?php $subscribers_table->display(); ?>
 
 		</form>
@@ -49,34 +49,34 @@ 
 
 	$render = true;
 
-	if ( ! current_user_can( 'manage_invoicing' ) ) {
-		die( __( 'You are not permitted to view this data.', 'invoicing' ) );
+	if (!current_user_can('manage_invoicing')) {
+		die(__('You are not permitted to view this data.', 'invoicing'));
 	}
 
-	if ( ! isset( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
-        die( __( 'Invalid subscription ID Provided.', 'invoicing' ) );
+	if (!isset($_GET['id']) || !is_numeric($_GET['id'])) {
+        die(__('Invalid subscription ID Provided.', 'invoicing'));
 	}
 
-	$sub_id  = (int) $_GET['id'];
-	$sub     = new WPInv_Subscription( $sub_id );
+	$sub_id  = (int)$_GET['id'];
+	$sub     = new WPInv_Subscription($sub_id);
 
-	if ( empty( $sub ) ) {
-		die( __( 'Invalid subscription ID Provided.', 'invoicing' ) );
+	if (empty($sub)) {
+		die(__('Invalid subscription ID Provided.', 'invoicing'));
 	}
 
 	?>
 	<div class="wrap">
-		<h2><?php _e( 'Subscription Details', 'invoicing' ); ?></h2>
+		<h2><?php _e('Subscription Details', 'invoicing'); ?></h2>
 
-		<?php if ( $sub ) : ?>
+		<?php if ($sub) : ?>
 
 			<div id="wpinv-item-card-wrapper">
 
-				<?php do_action( 'wpinv_subscription_card_top', $sub ); ?>
+				<?php do_action('wpinv_subscription_card_top', $sub); ?>
 
 				<div class="info-wrapper item-section">
 
-					<form id="edit-item-info" method="post" action="<?php echo admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $sub->id ); ?>">
+					<form id="edit-item-info" method="post" action="<?php echo admin_url('admin.php?page=wpinv-subscriptions&id=' . $sub->id); ?>">
 
 						<div class="item-info">
 
@@ -84,124 +84,124 @@ 
 								<tbody>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Billing Cycle:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Billing Cycle:', 'invoicing'); ?></label>
 										</td>
 										<td>
 											<?php
-											$frequency = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $sub->period, $sub->frequency );
-											$billing   = wpinv_price( wpinv_format_amount( $sub->recurring_amount ), wpinv_get_invoice_currency_code( $sub->parent_payment_id ) ) . ' / ' . $frequency;
-											$initial   = wpinv_price( wpinv_format_amount( $sub->initial_amount ), wpinv_get_invoice_currency_code( $sub->parent_payment_id ) );
-											printf( _x( '%s then %s', 'Initial subscription amount then billing cycle and amount', 'invoicing' ), $initial, $billing );
+											$frequency = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency($sub->period, $sub->frequency);
+											$billing   = wpinv_price(wpinv_format_amount($sub->recurring_amount), wpinv_get_invoice_currency_code($sub->parent_payment_id)) . ' / ' . $frequency;
+											$initial   = wpinv_price(wpinv_format_amount($sub->initial_amount), wpinv_get_invoice_currency_code($sub->parent_payment_id));
+											printf(_x('%s then %s', 'Initial subscription amount then billing cycle and amount', 'invoicing'), $initial, $billing);
 											?>
 										</td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Times Billed:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Times Billed:', 'invoicing'); ?></label>
 										</td>
-										<td><?php echo $sub->get_times_billed() . ' / ' . ( ( $sub->bill_times == 0 ) ? 'Until Cancelled' : $sub->bill_times ); ?></td>
+										<td><?php echo $sub->get_times_billed() . ' / ' . (($sub->bill_times == 0) ? 'Until Cancelled' : $sub->bill_times); ?></td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Customer:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Customer:', 'invoicing'); ?></label>
 										</td>
 										<td>
-											<?php $subscriber = get_userdata( $sub->customer_id ); ?>
-											<a href="<?php echo esc_url( get_edit_user_link( $sub->customer_id ) ); ?>" target="_blank"><?php echo ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email; ?></a>
+											<?php $subscriber = get_userdata($sub->customer_id); ?>
+											<a href="<?php echo esc_url(get_edit_user_link($sub->customer_id)); ?>" target="_blank"><?php echo !empty($subscriber->display_name) ? $subscriber->display_name : $subscriber->user_email; ?></a>
 										</td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Initial Invoice:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Initial Invoice:', 'invoicing'); ?></label>
 										</td>
 										<td>
-                                            <a target="_blank" title="<?php _e( 'View invoice', 'invoicing' ); ?>" href="<?php echo esc_url( get_permalink( $sub->parent_payment_id ) ); ?>"><?php echo wpinv_get_invoice_number( $sub->parent_payment_id ); ?></a>&nbsp;&nbsp;&nbsp;<?php echo wp_sprintf( __( '( ID: %s )', 'invoicing' ), '<a title="' . esc_attr( __( 'View invoice details', 'invoicing' ) ) . '" href="' . get_edit_post_link( $sub->parent_payment_id ) . '" target="_blank">' . $sub->parent_payment_id . '</a>' ); ?></td>
+                                            <a target="_blank" title="<?php _e('View invoice', 'invoicing'); ?>" href="<?php echo esc_url(get_permalink($sub->parent_payment_id)); ?>"><?php echo wpinv_get_invoice_number($sub->parent_payment_id); ?></a>&nbsp;&nbsp;&nbsp;<?php echo wp_sprintf(__('( ID: %s )', 'invoicing'), '<a title="' . esc_attr(__('View invoice details', 'invoicing')) . '" href="' . get_edit_post_link($sub->parent_payment_id) . '" target="_blank">' . $sub->parent_payment_id . '</a>'); ?></td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Item:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Item:', 'invoicing'); ?></label>
 										</td>
 										<td>
 											<?php
-                                            echo wpinv_item_dropdown( array(
+                                            echo wpinv_item_dropdown(array(
                                                 'name'              => 'product_id',
                                                 'id'                => 'wpinv_invoice_item',
                                                 'with_packages'     => false,
                                                 'show_recurring'    => true,
                                                 'selected'          => $sub->product_id,
                                                 'class'             => 'wpinv-sub-product-id',
-                                            ) );
+                                            ));
 
                                             ?>
-											<a href="<?php echo esc_url( add_query_arg( array(
+											<a href="<?php echo esc_url(add_query_arg(array(
 													'post'   => $sub->product_id,
 													'action' => 'edit'
-												), admin_url( 'post.php' ) ) ); ?>" target="_blank"><?php _e( 'View Item', 'invoicing' ) ; ?></a>
+												), admin_url('post.php'))); ?>" target="_blank"><?php _e('View Item', 'invoicing'); ?></a>
 										</td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Payment Method:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Payment Method:', 'invoicing'); ?></label>
 										</td>
-										<td><?php echo wpinv_get_gateway_admin_label( wpinv_get_payment_gateway( $sub->parent_payment_id ) ); ?></td>
+										<td><?php echo wpinv_get_gateway_admin_label(wpinv_get_payment_gateway($sub->parent_payment_id)); ?></td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Profile ID:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Profile ID:', 'invoicing'); ?></label>
 										</td>
 										<td>
 											<span class="wpinv-sub-profile-id">
-												<?php echo apply_filters( 'wpinv_subscription_profile_link_' . $sub->gateway, $sub->profile_id, $sub ); ?>
+												<?php echo apply_filters('wpinv_subscription_profile_link_' . $sub->gateway, $sub->profile_id, $sub); ?>
 											</span>
-											<input type="text" name="profile_id" class="hidden wpinv-sub-profile-id" value="<?php echo esc_attr( $sub->profile_id ); ?>" />
+											<input type="text" name="profile_id" class="hidden wpinv-sub-profile-id" value="<?php echo esc_attr($sub->profile_id); ?>" />
 											<span>&nbsp;&ndash;&nbsp;</span>
-											<a href="#" class="wpinv-edit-sub-profile-id"><?php _e( 'Edit', 'invoicing' ); ?></a>
+											<a href="#" class="wpinv-edit-sub-profile-id"><?php _e('Edit', 'invoicing'); ?></a>
 										</td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Transaction ID:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Transaction ID:', 'invoicing'); ?></label>
 										</td>
 										<td>
-											<span class="wpinv-sub-transaction-id"><?php echo apply_filters( 'wpinv_subscription_transaction_link_' . $sub->gateway, $sub->get_transaction_id(), $sub ); ?></span>
-											<input type="text" name="transaction_id" class="hidden wpinv-sub-transaction-id" value="<?php echo esc_attr( $sub->get_transaction_id() ); ?>" />
+											<span class="wpinv-sub-transaction-id"><?php echo apply_filters('wpinv_subscription_transaction_link_' . $sub->gateway, $sub->get_transaction_id(), $sub); ?></span>
+											<input type="text" name="transaction_id" class="hidden wpinv-sub-transaction-id" value="<?php echo esc_attr($sub->get_transaction_id()); ?>" />
 											<span>&nbsp;&ndash;&nbsp;</span>
-											<a href="#" class="wpinv-edit-sub-transaction-id"><?php _e( 'Edit', 'invoicing' ); ?></a>
+											<a href="#" class="wpinv-edit-sub-transaction-id"><?php _e('Edit', 'invoicing'); ?></a>
 										</td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Date Created:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Date Created:', 'invoicing'); ?></label>
 										</td>
-										<td><?php echo date_i18n( get_option( 'date_format' ), strtotime( $sub->created, current_time( 'timestamp' ) ) ); ?></td>
+										<td><?php echo date_i18n(get_option('date_format'), strtotime($sub->created, current_time('timestamp'))); ?></td>
 									</tr>
 									<tr>
 										<td class="row-title">
 											<label for="tablecell">
-												<?php if( 'trialling' == $sub->status ) : ?>
-													<?php _e( 'Trialling Until:', 'invoicing' ); ?>
+												<?php if ('trialling' == $sub->status) : ?>
+													<?php _e('Trialling Until:', 'invoicing'); ?>
 												<?php else: ?>
-													<?php _e( 'Expiration Date:', 'invoicing' ); ?>
+													<?php _e('Expiration Date:', 'invoicing'); ?>
 												<?php endif; ?>
 											</label>
 										</td>
 										<td>
-											<span class="wpinv-sub-expiration"><?php echo date_i18n( get_option( 'date_format' ), strtotime( $sub->expiration, current_time( 'timestamp' ) ) ); ?></span>
+											<span class="wpinv-sub-expiration"><?php echo date_i18n(get_option('date_format'), strtotime($sub->expiration, current_time('timestamp'))); ?></span>
 										</td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Subscription Status:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Subscription Status:', 'invoicing'); ?></label>
 										</td>
 										<td>
 											<select name="status">
-												<option value="pending"<?php selected( 'pending', $sub->status ); ?>><?php _e( 'Pending', 'invoicing' ); ?></option>
-												<option value="active"<?php selected( 'active', $sub->status ); ?>><?php _e( 'Active', 'invoicing' ); ?></option>
-												<option value="cancelled"<?php selected( 'cancelled', $sub->status ); ?>><?php _e( 'Cancelled', 'invoicing' ); ?></option>
-												<option value="expired"<?php selected( 'expired', $sub->status ); ?>><?php _e( 'Expired', 'invoicing' ); ?></option>
-												<option value="trialling"<?php selected( 'trialling', $sub->status ); ?>><?php _e( 'Trialling', 'invoicing' ); ?></option>
-												<option value="failing"<?php selected( 'failing', $sub->status ); ?>><?php _e( 'Failing', 'invoicing' ); ?></option>
-												<option value="completed"<?php selected( 'completed', $sub->status ); ?>><?php _e( 'Completed', 'invoicing' ); ?></option>
+												<option value="pending"<?php selected('pending', $sub->status); ?>><?php _e('Pending', 'invoicing'); ?></option>
+												<option value="active"<?php selected('active', $sub->status); ?>><?php _e('Active', 'invoicing'); ?></option>
+												<option value="cancelled"<?php selected('cancelled', $sub->status); ?>><?php _e('Cancelled', 'invoicing'); ?></option>
+												<option value="expired"<?php selected('expired', $sub->status); ?>><?php _e('Expired', 'invoicing'); ?></option>
+												<option value="trialling"<?php selected('trialling', $sub->status); ?>><?php _e('Trialling', 'invoicing'); ?></option>
+												<option value="failing"<?php selected('failing', $sub->status); ?>><?php _e('Failing', 'invoicing'); ?></option>
+												<option value="completed"<?php selected('completed', $sub->status); ?>><?php _e('Completed', 'invoicing'); ?></option>
 											</select>
 										</td>
 									</tr>
@@ -209,79 +209,79 @@ 
 							</table>
 						</div>
 						<div id="wpinv-sub-notices">
-							<div class="notice notice-info inline hidden" id="wpinv-sub-product-update-notice"><p><?php _e( 'Changing the product assigned will not automatically adjust any pricing.', 'invoicing' ); ?></p></div>
-							<div class="notice notice-warning inline hidden" id="wpinv-sub-profile-id-update-notice"><p><?php _e( 'Changing the profile ID can result in renewals not being processed. Do this with caution.', 'invoicing' ); ?></p></div>
+							<div class="notice notice-info inline hidden" id="wpinv-sub-product-update-notice"><p><?php _e('Changing the product assigned will not automatically adjust any pricing.', 'invoicing'); ?></p></div>
+							<div class="notice notice-warning inline hidden" id="wpinv-sub-profile-id-update-notice"><p><?php _e('Changing the profile ID can result in renewals not being processed. Do this with caution.', 'invoicing'); ?></p></div>
 						</div>
 						<div id="item-edit-actions" class="edit-item" style="float:right; margin: 10px 0 0; display: block;">
-							<?php wp_nonce_field( 'wpinv-recurring-update', 'wpinv-recurring-update-nonce', false, true ); ?>
-							<input type="submit" name="wpinv_update_subscription" id="wpinv_update_subscription" class="button button-primary" value="<?php _e( 'Update Subscription', 'invoicing' ); ?>"/>
-							<input type="hidden" name="sub_id" value="<?php echo absint( $sub->id ); ?>" />
-							<?php if( $sub->can_cancel() ) : ?>
-								<a class="button button-primary" href="<?php echo $sub->get_cancel_url(); ?>" ><?php _e( 'Cancel Subscription', 'invoicing' ); ?></a>
+							<?php wp_nonce_field('wpinv-recurring-update', 'wpinv-recurring-update-nonce', false, true); ?>
+							<input type="submit" name="wpinv_update_subscription" id="wpinv_update_subscription" class="button button-primary" value="<?php _e('Update Subscription', 'invoicing'); ?>"/>
+							<input type="hidden" name="sub_id" value="<?php echo absint($sub->id); ?>" />
+							<?php if ($sub->can_cancel()) : ?>
+								<a class="button button-primary" href="<?php echo $sub->get_cancel_url(); ?>" ><?php _e('Cancel Subscription', 'invoicing'); ?></a>
 							<?php endif; ?>
-							&nbsp;<input type="submit" name="wpinv_delete_subscription" class="wpinv-delete-subscription button" value="<?php _e( 'Delete Subscription', 'invoicing' ); ?>"/>
+							&nbsp;<input type="submit" name="wpinv_delete_subscription" class="wpinv-delete-subscription button" value="<?php _e('Delete Subscription', 'invoicing'); ?>"/>
 						</div>
 
 					</form>
 				</div>
 
-				<?php do_action( 'wpinv_subscription_before_stats', $sub ); ?>
+				<?php do_action('wpinv_subscription_before_stats', $sub); ?>
 
-				<?php do_action( 'wpinv_subscription_before_tables_wrapper', $sub ); ?>
+				<?php do_action('wpinv_subscription_before_tables_wrapper', $sub); ?>
 
 				<div id="item-tables-wrapper" class="item-section">
 
-					<?php do_action( 'wpinv_subscription_before_tables', $sub ); ?>
+					<?php do_action('wpinv_subscription_before_tables', $sub); ?>
 
-					<h3><?php _e( 'Renewal Payments:', 'invoicing' ); ?></h3>
+					<h3><?php _e('Renewal Payments:', 'invoicing'); ?></h3>
 					<?php $payments = $sub->get_child_payments(); ?>
-					<?php if ( 'manual' == $sub->gateway ) : ?>
-						<p><strong><?php _e( 'Note:', 'invoicing' ); ?></strong> <?php _e( 'Subscriptions purchased with the Test Payment gateway will not renew automatically.', 'invoicing' ); ?></p>
+					<?php if ('manual' == $sub->gateway) : ?>
+						<p><strong><?php _e('Note:', 'invoicing'); ?></strong> <?php _e('Subscriptions purchased with the Test Payment gateway will not renew automatically.', 'invoicing'); ?></p>
 					<?php endif; ?>
 					<table class="wp-list-table widefat striped payments">
 						<thead>
 						<tr>
-							<th><?php _e( 'ID', 'invoicing' ); ?></th>
-							<th><?php _e( 'Amount', 'invoicing' ); ?></th>
-							<th><?php _e( 'Date', 'invoicing' ); ?></th>
-							<th><?php _e( 'Status', 'invoicing' ); ?></th>
-                            <th><?php _e( 'Invoice', 'invoicing' ); ?></th>
-							<th class="column-wpi_actions"><?php _e( 'Actions', 'invoicing' ); ?></th>
+							<th><?php _e('ID', 'invoicing'); ?></th>
+							<th><?php _e('Amount', 'invoicing'); ?></th>
+							<th><?php _e('Date', 'invoicing'); ?></th>
+							<th><?php _e('Status', 'invoicing'); ?></th>
+                            <th><?php _e('Invoice', 'invoicing'); ?></th>
+							<th class="column-wpi_actions"><?php _e('Actions', 'invoicing'); ?></th>
 						</tr>
 						</thead>
 						<tbody>
-						<?php if ( ! empty( $payments ) ) : ?>
-							<?php foreach ( $payments as $payment ) : $invoice = wpinv_get_invoice( $payment->ID ); if ( empty( $invoice->ID ) ) continue; ?>
+						<?php if (!empty($payments)) : ?>
+							<?php foreach ($payments as $payment) : $invoice = wpinv_get_invoice($payment->ID); if (empty($invoice->ID)) continue; ?>
 								<tr>
 									<td><?php echo $payment->ID; ?></td>
-									<td><?php echo $invoice->get_total( true ); ?></td>
+									<td><?php echo $invoice->get_total(true); ?></td>
 									<td><?php echo $invoice->get_invoice_date(); ?></td>
-									<td><?php echo $invoice->get_status( true ); ?></td>
+									<td><?php echo $invoice->get_status(true); ?></td>
 									<td>
-										<a target="_blank" title="<?php _e( 'View invoice', 'invoicing' ); ?>" href="<?php echo esc_url( get_permalink( $payment->ID ) ); ?>"><?php echo $invoice->get_number(); ?></a>
-										<?php do_action( 'wpinv_subscription_payments_actions', $sub, $payment ); ?>
+										<a target="_blank" title="<?php _e('View invoice', 'invoicing'); ?>" href="<?php echo esc_url(get_permalink($payment->ID)); ?>"><?php echo $invoice->get_number(); ?></a>
+										<?php do_action('wpinv_subscription_payments_actions', $sub, $payment); ?>
 									</td>
 									<td class="column-wpi_actions">
-										<a title="<?php echo esc_attr( wp_sprintf( __( 'View details for invoice: %s', 'invoicing' ), $invoice->get_number() ) ); ?>" href="<?php echo get_edit_post_link( $payment->ID ); ?>"><?php _e( 'View Details', 'invoicing' ); ?>
+										<a title="<?php echo esc_attr(wp_sprintf(__('View details for invoice: %s', 'invoicing'), $invoice->get_number())); ?>" href="<?php echo get_edit_post_link($payment->ID); ?>"><?php _e('View Details', 'invoicing'); ?>
 										</a>
-										<?php do_action( 'wpinv_subscription_payments_actions', $sub, $payment ); ?>
+										<?php do_action('wpinv_subscription_payments_actions', $sub, $payment); ?>
 									</td>
 								</tr>
 							<?php endforeach; ?>
 						<?php else: ?>
 							<tr>
-								<td colspan="5"><?php _e( 'No Invoices Found.', 'invoicing' ); ?></td>
+								<td colspan="5"><?php _e('No Invoices Found.', 'invoicing'); ?></td>
 							</tr>
 						<?php endif; ?>
 						</tbody>
 						<tfoot></tfoot>
 					</table>
 
-					<?php do_action( 'wpinv_subscription_after_tables', $sub ); ?>
+					<?php do_action('wpinv_subscription_after_tables', $sub); ?>
 
 				</div>
 
-				<?php do_action( 'wpinv_subscription_card_bottom', $sub ); ?>
+				<?php do_action('wpinv_subscription_card_bottom', $sub); ?>
 			</div>
 
 		<?php endif; ?>
@@ -299,36 +299,36 @@ 
  */
 function wpinv_recurring_process_subscription_update() {
 
-	if( empty( $_POST['sub_id'] ) ) {
+	if (empty($_POST['sub_id'])) {
 		return;
 	}
 
-	if( empty( $_POST['wpinv_update_subscription'] ) ) {
+	if (empty($_POST['wpinv_update_subscription'])) {
 		return;
 	}
 
-	if( ! current_user_can( 'manage_invoicing') ) {
+	if (!current_user_can('manage_invoicing')) {
 		return;
 	}
 
-	if( ! wp_verify_nonce( $_POST['wpinv-recurring-update-nonce'], 'wpinv-recurring-update' ) ) {
-		wp_die( __( 'Nonce verification failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+	if (!wp_verify_nonce($_POST['wpinv-recurring-update-nonce'], 'wpinv-recurring-update')) {
+		wp_die(__('Nonce verification failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
 	}
 
-	$profile_id      = sanitize_text_field( $_POST['profile_id'] );
-	$transaction_id  = sanitize_text_field( $_POST['transaction_id'] );
-	$product_id      = absint( $_POST['product_id'] );
-	$subscription    = new WPInv_Subscription( absint( $_POST['sub_id'] ) );
-	$subscription->update( array(
-		'status'         => sanitize_text_field( $_POST['status'] ),
+	$profile_id      = sanitize_text_field($_POST['profile_id']);
+	$transaction_id  = sanitize_text_field($_POST['transaction_id']);
+	$product_id      = absint($_POST['product_id']);
+	$subscription    = new WPInv_Subscription(absint($_POST['sub_id']));
+	$subscription->update(array(
+		'status'         => sanitize_text_field($_POST['status']),
 		'profile_id'     => $profile_id,
 		'product_id'     => $product_id,
 		'transaction_id' => $transaction_id,
-	) );
+	));
 
-	$status = sanitize_text_field( $_POST['status'] );
+	$status = sanitize_text_field($_POST['status']);
 
-	switch( $status ) {
+	switch ($status) {
 
 		case 'cancelled' :
 
@@ -347,11 +347,11 @@ 
 
 	}
 
-	wp_redirect( admin_url( 'admin.php?page=wpinv-subscriptions&wpinv-message=updated&id=' . $subscription->id ) );
+	wp_redirect(admin_url('admin.php?page=wpinv-subscriptions&wpinv-message=updated&id=' . $subscription->id));
 	exit;
 
 }
-add_action( 'admin_init', 'wpinv_recurring_process_subscription_update', 1 );
+add_action('admin_init', 'wpinv_recurring_process_subscription_update', 1);
 
 /**
  * Handles subscription deletion
@@ -362,30 +362,30 @@ 
  */
 function wpinv_recurring_process_subscription_deletion() {
 
-	if( empty( $_POST['sub_id'] ) ) {
+	if (empty($_POST['sub_id'])) {
 		return;
 	}
 
-	if( empty( $_POST['wpinv_delete_subscription'] ) ) {
+	if (empty($_POST['wpinv_delete_subscription'])) {
 		return;
 	}
 
-	if( ! current_user_can( 'manage_invoicing') ) {
+	if (!current_user_can('manage_invoicing')) {
 		return;
 	}
 
-	if( ! wp_verify_nonce( $_POST['wpinv-recurring-update-nonce'], 'wpinv-recurring-update' ) ) {
-		wp_die( __( 'Nonce verification failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+	if (!wp_verify_nonce($_POST['wpinv-recurring-update-nonce'], 'wpinv-recurring-update')) {
+		wp_die(__('Nonce verification failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
 	}
 
-	$subscription = new WPInv_Subscription( absint( $_POST['sub_id'] ) );
+	$subscription = new WPInv_Subscription(absint($_POST['sub_id']));
 
-	delete_post_meta( $subscription->parent_payment_id, '_wpinv_subscription_payment' );
+	delete_post_meta($subscription->parent_payment_id, '_wpinv_subscription_payment');
 
 	$subscription->delete();
 
-	wp_redirect( admin_url( 'admin.php?page=wpinv-subscriptions&wpinv-message=deleted' ) );
+	wp_redirect(admin_url('admin.php?page=wpinv-subscriptions&wpinv-message=deleted'));
 	exit;
 
 }
-add_action( 'admin_init', 'wpinv_recurring_process_subscription_deletion', 2 );
+add_action('admin_init', 'wpinv_recurring_process_subscription_deletion', 2);

includes/admin/admin-meta-boxes.php

Spacing +148 added lines, -148 removed lines

@@ -1,65 +1,65 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-function wpinv_add_meta_boxes( $post_type, $post ) {
+function wpinv_add_meta_boxes($post_type, $post) {
     global $wpi_mb_invoice;
-    if ( $post_type == 'wpi_invoice' && !empty( $post->ID ) ) {
-        $wpi_mb_invoice = wpinv_get_invoice( $post->ID );
+    if ($post_type == 'wpi_invoice' && !empty($post->ID)) {
+        $wpi_mb_invoice = wpinv_get_invoice($post->ID);
     }
     
-    if ( !empty( $wpi_mb_invoice ) && !$wpi_mb_invoice->has_status( array( 'draft', 'auto-draft' ) ) ) {
-        add_meta_box( 'wpinv-mb-resend-invoice', __( 'Resend Invoice', 'invoicing' ), 'WPInv_Meta_Box_Details::resend_invoice', 'wpi_invoice', 'side', 'high' );
+    if (!empty($wpi_mb_invoice) && !$wpi_mb_invoice->has_status(array('draft', 'auto-draft'))) {
+        add_meta_box('wpinv-mb-resend-invoice', __('Resend Invoice', 'invoicing'), 'WPInv_Meta_Box_Details::resend_invoice', 'wpi_invoice', 'side', 'high');
     }
     
-    if ( !empty( $wpi_mb_invoice ) && $wpi_mb_invoice->is_recurring() && $wpi_mb_invoice->is_parent() ) {
-        add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscriptions', 'invoicing' ), 'WPInv_Meta_Box_Details::subscriptions', 'wpi_invoice', 'side', 'high' );
+    if (!empty($wpi_mb_invoice) && $wpi_mb_invoice->is_recurring() && $wpi_mb_invoice->is_parent()) {
+        add_meta_box('wpinv-mb-subscriptions', __('Subscriptions', 'invoicing'), 'WPInv_Meta_Box_Details::subscriptions', 'wpi_invoice', 'side', 'high');
     }
     
-    if ( wpinv_is_subscription_payment( $wpi_mb_invoice ) ) {
-        add_meta_box( 'wpinv-mb-renewals', __( 'Renewal Payment', 'invoicing' ), 'WPInv_Meta_Box_Details::renewals', 'wpi_invoice', 'side', 'high' );
+    if (wpinv_is_subscription_payment($wpi_mb_invoice)) {
+        add_meta_box('wpinv-mb-renewals', __('Renewal Payment', 'invoicing'), 'WPInv_Meta_Box_Details::renewals', 'wpi_invoice', 'side', 'high');
     }
     
-    add_meta_box( 'wpinv-details', __( 'Invoice Details', 'invoicing' ), 'WPInv_Meta_Box_Details::output', 'wpi_invoice', 'side', 'default' );
-    add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'WPInv_Meta_Box_Details::payment_meta', 'wpi_invoice', 'side', 'default' );
+    add_meta_box('wpinv-details', __('Invoice Details', 'invoicing'), 'WPInv_Meta_Box_Details::output', 'wpi_invoice', 'side', 'default');
+    add_meta_box('wpinv-payment-meta', __('Payment Meta', 'invoicing'), 'WPInv_Meta_Box_Details::payment_meta', 'wpi_invoice', 'side', 'default');
    
-    add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'WPInv_Meta_Box_Billing_Details::output', 'wpi_invoice', 'normal', 'high' );
-    add_meta_box( 'wpinv-items', __( 'Invoice Items', 'invoicing' ), 'WPInv_Meta_Box_Items::output', 'wpi_invoice', 'normal', 'high' );
-    add_meta_box( 'wpinv-notes', __( 'Invoice Notes', 'invoicing' ), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'normal', 'high' );
+    add_meta_box('wpinv-address', __('Billing Details', 'invoicing'), 'WPInv_Meta_Box_Billing_Details::output', 'wpi_invoice', 'normal', 'high');
+    add_meta_box('wpinv-items', __('Invoice Items', 'invoicing'), 'WPInv_Meta_Box_Items::output', 'wpi_invoice', 'normal', 'high');
+    add_meta_box('wpinv-notes', __('Invoice Notes', 'invoicing'), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'normal', 'high');
 }
-add_action( 'add_meta_boxes', 'wpinv_add_meta_boxes', 30, 2 );
+add_action('add_meta_boxes', 'wpinv_add_meta_boxes', 30, 2);
 
-function wpinv_save_meta_boxes( $post_id, $post, $update = false ) {
-    remove_action( 'save_post', __FUNCTION__ );
+function wpinv_save_meta_boxes($post_id, $post, $update = false) {
+    remove_action('save_post', __FUNCTION__);
     
     // $post_id and $post are required
-    if ( empty( $post_id ) || empty( $post ) ) {
+    if (empty($post_id) || empty($post)) {
         return;
     }
         
-    if ( !current_user_can( 'edit_post', $post_id ) || empty( $post->post_type ) ) {
+    if (!current_user_can('edit_post', $post_id) || empty($post->post_type)) {
         return;
     }
     
     // Dont' save meta boxes for revisions or autosaves
-    if ( defined( 'DOING_AUTOSAVE' ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+    if (defined('DOING_AUTOSAVE') || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
         return;
     }
         
-    if ( $post->post_type == 'wpi_invoice' or $post->post_type == 'wpi_quote' ) {
-        if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+    if ($post->post_type == 'wpi_invoice' or $post->post_type == 'wpi_quote') {
+        if ((defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
             return;
         }
     
-        if ( isset( $_POST['wpinv_save_invoice'] ) && wp_verify_nonce( $_POST['wpinv_save_invoice'], 'wpinv_save_invoice' ) ) {
-            WPInv_Meta_Box_Items::save( $post_id, $_POST, $post );
+        if (isset($_POST['wpinv_save_invoice']) && wp_verify_nonce($_POST['wpinv_save_invoice'], 'wpinv_save_invoice')) {
+            WPInv_Meta_Box_Items::save($post_id, $_POST, $post);
         }
-    } else if ( $post->post_type == 'wpi_item' ) {
+    } else if ($post->post_type == 'wpi_item') {
         // verify nonce
-        if ( isset( $_POST['wpinv_vat_meta_box_nonce'] ) && wp_verify_nonce( $_POST['wpinv_vat_meta_box_nonce'], 'wpinv_item_meta_box_save' ) ) {
-            $fields                                 = array();
+        if (isset($_POST['wpinv_vat_meta_box_nonce']) && wp_verify_nonce($_POST['wpinv_vat_meta_box_nonce'], 'wpinv_item_meta_box_save')) {
+            $fields = array();
             $fields['_wpinv_price']              = 'wpinv_item_price';
             $fields['_wpinv_vat_class']          = 'wpinv_vat_class';
             $fields['_wpinv_vat_rule']           = 'wpinv_vat_rules';
@@ -72,92 +72,92 @@ 
             $fields['_wpinv_trial_period']       = 'wpinv_trial_period';
             $fields['_wpinv_trial_interval']     = 'wpinv_trial_interval';
             
-            if ( !isset( $_POST['wpinv_is_recurring'] ) ) {
+            if (!isset($_POST['wpinv_is_recurring'])) {
                 $_POST['wpinv_is_recurring'] = 0;
             }
             
-            if ( !isset( $_POST['wpinv_free_trial'] ) || empty( $_POST['wpinv_is_recurring'] ) ) {
+            if (!isset($_POST['wpinv_free_trial']) || empty($_POST['wpinv_is_recurring'])) {
                 $_POST['wpinv_free_trial'] = 0;
             }
             
-            foreach ( $fields as $field => $name ) {
-                if ( isset( $_POST[ $name ] ) ) {
-                    $allowed = apply_filters( 'wpinv_item_allowed_save_meta_value', true, $field, $post_id );
+            foreach ($fields as $field => $name) {
+                if (isset($_POST[$name])) {
+                    $allowed = apply_filters('wpinv_item_allowed_save_meta_value', true, $field, $post_id);
 
-                    if ( !$allowed ) {
+                    if (!$allowed) {
                         continue;
                     }
 
-                    if ( $field == '_wpinv_price' ) {
-                        $value = wpinv_sanitize_amount( $_POST[ $name ] );
+                    if ($field == '_wpinv_price') {
+                        $value = wpinv_sanitize_amount($_POST[$name]);
                     } else {
-                        $value = is_string( $_POST[ $name ] ) ? sanitize_text_field( $_POST[ $name ] ) : $_POST[ $name ];
+                        $value = is_string($_POST[$name]) ? sanitize_text_field($_POST[$name]) : $_POST[$name];
                     }
                     
-                    $value = apply_filters( 'wpinv_item_metabox_save_' . $field, $value, $name );
-                    update_post_meta( $post_id, $field, $value );
+                    $value = apply_filters('wpinv_item_metabox_save_' . $field, $value, $name);
+                    update_post_meta($post_id, $field, $value);
                 }
             }
             
-            if ( !get_post_meta( $post_id, '_wpinv_custom_id', true ) ) {
-                update_post_meta( $post_id, '_wpinv_custom_id', $post_id );
+            if (!get_post_meta($post_id, '_wpinv_custom_id', true)) {
+                update_post_meta($post_id, '_wpinv_custom_id', $post_id);
             }
         }
     }
 }
-add_action( 'save_post', 'wpinv_save_meta_boxes', 10, 3 );
+add_action('save_post', 'wpinv_save_meta_boxes', 10, 3);
 
 function wpinv_register_item_meta_boxes() {    
     global $wpinv_euvat;
     
-    add_meta_box( 'wpinv_field_prices', __( 'Item Price', 'invoicing' ), 'WPInv_Meta_Box_Items::prices', 'wpi_item', 'normal', 'high' );
+    add_meta_box('wpinv_field_prices', __('Item Price', 'invoicing'), 'WPInv_Meta_Box_Items::prices', 'wpi_item', 'normal', 'high');
 
-    if ( $wpinv_euvat->allow_vat_rules() ) {
-        add_meta_box( 'wpinv_field_vat_rules', __( 'VAT rules type to use', 'invoicing' ), 'WPInv_Meta_Box_Items::vat_rules', 'wpi_item', 'normal', 'high' );
+    if ($wpinv_euvat->allow_vat_rules()) {
+        add_meta_box('wpinv_field_vat_rules', __('VAT rules type to use', 'invoicing'), 'WPInv_Meta_Box_Items::vat_rules', 'wpi_item', 'normal', 'high');
     }
     
-    if ( $wpinv_euvat->allow_vat_classes() ) {
-        add_meta_box( 'wpinv_field_vat_classes', __( 'VAT rates class to use', 'invoicing' ), 'WPInv_Meta_Box_Items::vat_classes', 'wpi_item', 'normal', 'high' );
+    if ($wpinv_euvat->allow_vat_classes()) {
+        add_meta_box('wpinv_field_vat_classes', __('VAT rates class to use', 'invoicing'), 'WPInv_Meta_Box_Items::vat_classes', 'wpi_item', 'normal', 'high');
     }
     
-    add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'WPInv_Meta_Box_Items::item_info', 'wpi_item', 'side', 'core' );
-    add_meta_box( 'wpinv_field_meta_values', __( 'Item Meta Values', 'invoicing' ), 'WPInv_Meta_Box_Items::meta_values', 'wpi_item', 'side', 'core' );
+    add_meta_box('wpinv_field_item_info', __('Item info', 'invoicing'), 'WPInv_Meta_Box_Items::item_info', 'wpi_item', 'side', 'core');
+    add_meta_box('wpinv_field_meta_values', __('Item Meta Values', 'invoicing'), 'WPInv_Meta_Box_Items::meta_values', 'wpi_item', 'side', 'core');
 }
 
 function wpinv_register_discount_meta_boxes() {
-    add_meta_box( 'wpinv_discount_fields', __( 'Discount Details', 'invoicing' ), 'wpinv_discount_metabox_details', 'wpi_discount', 'normal', 'high' );
+    add_meta_box('wpinv_discount_fields', __('Discount Details', 'invoicing'), 'wpinv_discount_metabox_details', 'wpi_discount', 'normal', 'high');
 }
 
-function wpinv_discount_metabox_details( $post ) {
+function wpinv_discount_metabox_details($post) {
     $discount_id    = $post->ID;
-    $discount       = wpinv_get_discount( $discount_id );
+    $discount       = wpinv_get_discount($discount_id);
     
-    $type               = wpinv_get_discount_type( $discount_id );
-    $item_reqs          = wpinv_get_discount_item_reqs( $discount_id );
-    $excluded_items     = wpinv_get_discount_excluded_items( $discount_id );
-    $min_total          = wpinv_get_discount_min_total( $discount_id );
-    $max_total          = wpinv_get_discount_max_total( $discount_id );
-    $max_uses           = wpinv_get_discount_max_uses( $discount_id );
-    $single_use         = wpinv_discount_is_single_use( $discount_id );
-    $recurring          = (bool)wpinv_discount_is_recurring( $discount_id );
-    $start_date         = wpinv_get_discount_start_date( $discount_id );
-    $expiration_date    = wpinv_get_discount_expiration( $discount_id );
+    $type               = wpinv_get_discount_type($discount_id);
+    $item_reqs          = wpinv_get_discount_item_reqs($discount_id);
+    $excluded_items     = wpinv_get_discount_excluded_items($discount_id);
+    $min_total          = wpinv_get_discount_min_total($discount_id);
+    $max_total          = wpinv_get_discount_max_total($discount_id);
+    $max_uses           = wpinv_get_discount_max_uses($discount_id);
+    $single_use         = wpinv_discount_is_single_use($discount_id);
+    $recurring          = (bool)wpinv_discount_is_recurring($discount_id);
+    $start_date         = wpinv_get_discount_start_date($discount_id);
+    $expiration_date    = wpinv_get_discount_expiration($discount_id);
     
-    if ( ! empty( $start_date ) && strpos( $start_date, '0000' ) === false ) {
-        $start_time         = strtotime( $start_date );
-        $start_h            = date_i18n( 'H', $start_time );
-        $start_m            = date_i18n( 'i', $start_time );
-        $start_date         = date_i18n( 'Y-m-d', $start_time );
+    if (!empty($start_date) && strpos($start_date, '0000') === false) {
+        $start_time         = strtotime($start_date);
+        $start_h            = date_i18n('H', $start_time);
+        $start_m            = date_i18n('i', $start_time);
+        $start_date         = date_i18n('Y-m-d', $start_time);
     } else {
         $start_h            = '00';
         $start_m            = '00';
     }
 
-    if ( ! empty( $expiration_date ) && strpos( $expiration_date, '0000' ) === false ) {
-        $expiration_time    = strtotime( $expiration_date );
-        $expiration_h       = date_i18n( 'H', $expiration_time );
-        $expiration_m       = date_i18n( 'i', $expiration_time );
-        $expiration_date    = date_i18n( 'Y-m-d', $expiration_time );
+    if (!empty($expiration_date) && strpos($expiration_date, '0000') === false) {
+        $expiration_time    = strtotime($expiration_date);
+        $expiration_h       = date_i18n('H', $expiration_time);
+        $expiration_m       = date_i18n('i', $expiration_time);
+        $expiration_date    = date_i18n('Y-m-d', $expiration_time);
     } else {
         $expiration_h       = '23';
         $expiration_m       = '59';
@@ -167,207 +167,207 @@ 
     $max_total          = $max_total > 0 ? $max_total : '';
     $max_uses           = $max_uses > 0 ? $max_uses : '';
 ?>
-<?php do_action( 'wpinv_discount_form_top', $post ); ?>
-<?php wp_nonce_field( 'wpinv_discount_metabox_nonce', 'wpinv_discount_metabox_nonce' ); ;?>
+<?php do_action('wpinv_discount_form_top', $post); ?>
+<?php wp_nonce_field('wpinv_discount_metabox_nonce', 'wpinv_discount_metabox_nonce'); ;?>
 <table class="form-table wpi-form-table">
     <tbody>
-        <?php do_action( 'wpinv_discount_form_first', $post ); ?>
-        <?php do_action( 'wpinv_discount_form_before_code', $post ); ?>
+        <?php do_action('wpinv_discount_form_first', $post); ?>
+        <?php do_action('wpinv_discount_form_before_code', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_code"><?php _e( 'Discount Code', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_code"><?php _e('Discount Code', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" name="code" id="wpinv_discount_code" class="medium-text" value="<?php echo esc_attr( wpinv_get_discount_code( $discount_id ) ); ?>" required>
-                <p class="description"><?php _e( 'Enter a code for this discount, such as 10OFF', 'invoicing' ); ?></p>
+                <input type="text" name="code" id="wpinv_discount_code" class="medium-text" value="<?php echo esc_attr(wpinv_get_discount_code($discount_id)); ?>" required>
+                <p class="description"><?php _e('Enter a code for this discount, such as 10OFF', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_type', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_type', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_type"><?php _e( 'Discount Type', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_type"><?php _e('Discount Type', 'invoicing'); ?></label>
             </th>
             <td>
                 <select id="wpinv_discount_type" name="type" class="medium-text">
-                    <?php foreach ( wpinv_get_discount_types() as $value => $label ) { ?>
-                    <option value="<?php echo $value ;?>" <?php selected( $type, $value ); ?>><?php echo $label; ?></option>
+                    <?php foreach (wpinv_get_discount_types() as $value => $label) { ?>
+                    <option value="<?php echo $value; ?>" <?php selected($type, $value); ?>><?php echo $label; ?></option>
                     <?php } ?>
                 </select>
-                <p class="description"><?php _e( 'The kind of discount to apply for this discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('The kind of discount to apply for this discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_amount', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_amount', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_amount"><?php _e( 'Amount', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_amount"><?php _e('Amount', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" name="amount" id="wpinv_discount_amount" class="wpi-field-price wpi-price" value="<?php echo esc_attr( wpinv_get_discount_amount( $discount_id ) ); ?>" required> <font class="wpi-discount-p">%</font><font class="wpi-discount-f" style="display:none;"><?php echo wpinv_currency_symbol() ;?></font>
-                <p style="display:none;" class="description"><?php _e( 'Enter the discount amount in USD', 'invoicing' ); ?></p>
-                <p class="description"><?php _e( 'Enter the discount value. Ex: 10', 'invoicing' ); ?></p>
+                <input type="text" name="amount" id="wpinv_discount_amount" class="wpi-field-price wpi-price" value="<?php echo esc_attr(wpinv_get_discount_amount($discount_id)); ?>" required> <font class="wpi-discount-p">%</font><font class="wpi-discount-f" style="display:none;"><?php echo wpinv_currency_symbol(); ?></font>
+                <p style="display:none;" class="description"><?php _e('Enter the discount amount in USD', 'invoicing'); ?></p>
+                <p class="description"><?php _e('Enter the discount value. Ex: 10', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_items', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_items', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_items"><?php _e( 'Items', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_items"><?php _e('Items', 'invoicing'); ?></label>
             </th>
             <td>
-                <p><?php echo wpinv_item_dropdown( array(
+                <p><?php echo wpinv_item_dropdown(array(
                         'name'              => 'items[]',
                         'id'                => 'items',
                         'selected'          => $item_reqs,
                         'multiple'          => true,
                         'class'             => 'medium-text',
-                        'placeholder'       => __( 'Select one or more Items', 'invoicing' ),
+                        'placeholder'       => __('Select one or more Items', 'invoicing'),
                         'show_recurring'    => true,
-                    ) ); ?>
+                    )); ?>
                 </p>
-                <p class="description"><?php _e( 'Items which need to be in the cart to use this discount or, for "Item Discounts", which items are discounted. If left blank, this discount can be used on any item.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Items which need to be in the cart to use this discount or, for "Item Discounts", which items are discounted. If left blank, this discount can be used on any item.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_excluded_items', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_excluded_items', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_excluded_items"><?php _e( 'Excluded Items', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_excluded_items"><?php _e('Excluded Items', 'invoicing'); ?></label>
             </th>
             <td>
-                <p><?php echo wpinv_item_dropdown( array(
+                <p><?php echo wpinv_item_dropdown(array(
                         'name'              => 'excluded_items[]',
                         'id'                => 'excluded_items',
                         'selected'          => $excluded_items,
                         'multiple'          => true,
                         'class'             => 'medium-text',
-                        'placeholder'       => __( 'Select one or more Items', 'invoicing' ),
+                        'placeholder'       => __('Select one or more Items', 'invoicing'),
                         'show_recurring'    => true,
-                    ) ); ?>
+                    )); ?>
                 </p>
-                <p class="description"><?php _e( 'Items which are NOT allowed to use this discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Items which are NOT allowed to use this discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_start', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_start', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_start"><?php _e( 'Start Date', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_start"><?php _e('Start Date', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" class="w120 wpiDatepicker" id="wpinv_discount_start" data-dateFormat="yy-mm-dd" name="start" value="<?php echo esc_attr( $start_date ); ?>"> @ <select id="wpinv_discount_start_h" name="start_h">
-                    <?php for ( $i = 0; $i <= 23; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>" <?php selected( $value, $start_h ); ?>><?php echo $value;?></option>
+                <input type="text" class="w120 wpiDatepicker" id="wpinv_discount_start" data-dateFormat="yy-mm-dd" name="start" value="<?php echo esc_attr($start_date); ?>"> @ <select id="wpinv_discount_start_h" name="start_h">
+                    <?php for ($i = 0; $i <= 23; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>" <?php selected($value, $start_h); ?>><?php echo $value; ?></option>
                     <?php } ?>
                 </select> : <select id="wpinv_discount_start_m" name="start_m">
-                    <?php for ( $i = 0; $i <= 59; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>" <?php selected( $value, $start_m ); ?>><?php echo $value;?></option>
+                    <?php for ($i = 0; $i <= 59; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>" <?php selected($value, $start_m); ?>><?php echo $value; ?></option>
                     <?php } ?>
                 </select>
-                <p class="description"><?php _e( 'Enter the start date for this discount code in the format of yyyy-mm-dd. For no start date, leave blank. If entered, the discount can only be used after or on this date.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Enter the start date for this discount code in the format of yyyy-mm-dd. For no start date, leave blank. If entered, the discount can only be used after or on this date.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_expiration', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_expiration', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_expiration"><?php _e( 'Expiration Date', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_expiration"><?php _e('Expiration Date', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" class="w120 wpiDatepicker" id="wpinv_discount_expiration" data-dateFormat="yy-mm-dd" name="expiration" value="<?php echo esc_attr( $expiration_date ); ?>"> @ <select id="wpinv_discount_expiration_h" name="expiration_h">
-                    <?php for ( $i = 0; $i <= 23; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>" <?php selected( $value, $expiration_h ); ?>><?php echo $value;?></option>
+                <input type="text" class="w120 wpiDatepicker" id="wpinv_discount_expiration" data-dateFormat="yy-mm-dd" name="expiration" value="<?php echo esc_attr($expiration_date); ?>"> @ <select id="wpinv_discount_expiration_h" name="expiration_h">
+                    <?php for ($i = 0; $i <= 23; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>" <?php selected($value, $expiration_h); ?>><?php echo $value; ?></option>
                     <?php } ?>
                 </select> : <select id="wpinv_discount_expiration_m" name="expiration_m">
-                    <?php for ( $i = 0; $i <= 59; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>" <?php selected( $value, $expiration_m ); ?>><?php echo $value;?></option>
+                    <?php for ($i = 0; $i <= 59; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>" <?php selected($value, $expiration_m); ?>><?php echo $value; ?></option>
                     <?php } ?>
                 </select>
-                <p class="description"><?php _e( 'Enter the expiration date for this discount code in the format of yyyy-mm-dd. Leave blank for no expiration.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Enter the expiration date for this discount code in the format of yyyy-mm-dd. Leave blank for no expiration.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_min_total', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_min_total', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_min_total"><?php _e( 'Minimum Amount', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_min_total"><?php _e('Minimum Amount', 'invoicing'); ?></label>
             </th>
             <td>
                 <input type="text" name="min_total" id="wpinv_discount_min_total" class="wpi-field-price wpi-price" value="<?php echo $min_total; ?>">
-                <p class="description"><?php _e( 'This allows you to set the minimum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('This allows you to set the minimum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_max_total', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_max_total', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_max_total"><?php _e( 'Maximum Amount', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_max_total"><?php _e('Maximum Amount', 'invoicing'); ?></label>
             </th>
             <td>
                 <input type="text" name="max_total" id="wpinv_discount_max_total" class="wpi-field-price wpi-price" value="<?php echo $max_total; ?>">
-                <p class="description"><?php _e( 'This allows you to set the maximum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('This allows you to set the maximum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_recurring', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_recurring', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_recurring"><?php _e( 'For recurring apply to', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_recurring"><?php _e('For recurring apply to', 'invoicing'); ?></label>
             </th>
             <td>
                 <select id="wpinv_discount_recurring" name="recurring" class="medium-text">
-                    <option value="0" <?php selected( false, $recurring ); ?>><?php _e( 'All payments', 'invoicing' ); ?></option>
-                    <option value="1" <?php selected( true, $recurring ); ?>><?php _e( 'First payment only', 'invoicing' ); ?></option>
+                    <option value="0" <?php selected(false, $recurring); ?>><?php _e('All payments', 'invoicing'); ?></option>
+                    <option value="1" <?php selected(true, $recurring); ?>><?php _e('First payment only', 'invoicing'); ?></option>
                 </select>
-                <p class="description"><?php _e( '<b>All payments:</b> Apply this discount to all recurring payments of the recurring invoice. <br><b>First payment only:</b> Apply this discount to only first payment of the recurring invoice.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('<b>All payments:</b> Apply this discount to all recurring payments of the recurring invoice. <br><b>First payment only:</b> Apply this discount to only first payment of the recurring invoice.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_max_uses', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_max_uses', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_max_uses"><?php _e( 'Max Uses', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_max_uses"><?php _e('Max Uses', 'invoicing'); ?></label>
             </th>
             <td>
                 <input type="number" min="0" step="1" id="wpinv_discount_max_uses" name="max_uses" class="medium-text" value="<?php echo $max_uses; ?>">
-                <p class="description"><?php _e( 'The maximum number of times this discount can be used. Leave blank for unlimited.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('The maximum number of times this discount can be used. Leave blank for unlimited.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_single_use', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_single_use', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_single_use"><?php _e( 'Use Once Per User', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_single_use"><?php _e('Use Once Per User', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="checkbox" value="1" name="single_use" id="wpinv_discount_single_use" <?php checked( true, $single_use ); ?>>
-                <span class="description"><?php _e( 'Limit this discount to a single use per user?', 'invoicing' ); ?></span>
+                <input type="checkbox" value="1" name="single_use" id="wpinv_discount_single_use" <?php checked(true, $single_use); ?>>
+                <span class="description"><?php _e('Limit this discount to a single use per user?', 'invoicing'); ?></span>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_last', $post ); ?>
+        <?php do_action('wpinv_discount_form_last', $post); ?>
     </tbody>
 </table>
-<?php do_action( 'wpinv_discount_form_bottom', $post ); ?>
+<?php do_action('wpinv_discount_form_bottom', $post); ?>
     <?php
 }
 
-function wpinv_discount_metabox_save( $post_id, $post, $update = false ) {
-    $post_type = !empty( $post ) ? $post->post_type : '';
+function wpinv_discount_metabox_save($post_id, $post, $update = false) {
+    $post_type = !empty($post) ? $post->post_type : '';
     
-    if ( $post_type != 'wpi_discount' ) {
+    if ($post_type != 'wpi_discount') {
         return;
     }
     
-    if ( !isset( $_POST['wpinv_discount_metabox_nonce'] ) || ( isset( $_POST['wpinv_discount_metabox_nonce'] ) && !wp_verify_nonce( $_POST['wpinv_discount_metabox_nonce'], 'wpinv_discount_metabox_nonce' ) ) ) {
+    if (!isset($_POST['wpinv_discount_metabox_nonce']) || (isset($_POST['wpinv_discount_metabox_nonce']) && !wp_verify_nonce($_POST['wpinv_discount_metabox_nonce'], 'wpinv_discount_metabox_nonce'))) {
         return;
     }
     
-    if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+    if ((defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) || (defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
         return;
     }
     
-    if ( !current_user_can( 'manage_options', $post_id ) ) {
+    if (!current_user_can('manage_options', $post_id)) {
         return;
     }
     
-    if ( !empty( $_POST['start'] ) && isset( $_POST['start_h'] ) && isset( $_POST['start_m'] ) && $_POST['start_h'] !== '' && $_POST['start_m'] !== '' ) {
+    if (!empty($_POST['start']) && isset($_POST['start_h']) && isset($_POST['start_m']) && $_POST['start_h'] !== '' && $_POST['start_m'] !== '') {
         $_POST['start'] = $_POST['start'] . ' ' . $_POST['start_h'] . ':' . $_POST['start_m'];
     }
 
-    if ( !empty( $_POST['expiration'] ) && isset( $_POST['expiration_h'] ) && isset( $_POST['expiration_m'] ) ) {
+    if (!empty($_POST['expiration']) && isset($_POST['expiration_h']) && isset($_POST['expiration_m'])) {
         $_POST['expiration'] = $_POST['expiration'] . ' ' . $_POST['expiration_h'] . ':' . $_POST['expiration_m'];
     }
     
-    return wpinv_store_discount( $post_id, $_POST, $post, $update );
+    return wpinv_store_discount($post_id, $_POST, $post, $update);
 }
-add_action( 'save_post', 'wpinv_discount_metabox_save', 10, 3 );
\ No newline at end of file
+add_action('save_post', 'wpinv_discount_metabox_save', 10, 3);
\ No newline at end of file

includes/admin/wpinv-admin-functions.php

Indentation +42 added lines, -42 removed lines

@@ -176,69 +176,69 @@ 
 }
 
 function wpinv_admin_messages() {
-	global $wpinv_options, $pagenow, $post;
+    global $wpinv_options, $pagenow, $post;
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_added' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-added', __( 'Discount code added.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_added' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+            add_settings_error( 'wpinv-notices', 'wpinv-discount-added', __( 'Discount code added.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_add_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-add-fail', __( 'There was a problem adding your discount code, please try again.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_add_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-discount-add-fail', __( 'There was a problem adding your discount code, please try again.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_exists' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-exists', __( 'A discount with that code already exists, please use a different code.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_exists' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-discount-exists', __( 'A discount with that code already exists, please use a different code.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_updated' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-updated', __( 'Discount code updated.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_updated' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+            add_settings_error( 'wpinv-notices', 'wpinv-discount-updated', __( 'Discount code updated.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_update_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-updated-fail', __( 'There was a problem updating your discount code, please try again.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_update_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-discount-updated-fail', __( 'There was a problem updating your discount code, please try again.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice_deleted' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-deleted', __( 'The invoice has been deleted.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'invoice_deleted' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-deleted', __( 'The invoice has been deleted.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_disabled' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Email notification is disabled. Please check settings.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'email_disabled' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Email notification is disabled. Please check settings.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_sent' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent', __( 'The email has been sent to customer.', 'invoicing' ), 'updated' );
+    if ( isset( $_GET['wpinv-message'] ) && 'email_sent' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-sent', __( 'The email has been sent to customer.', 'invoicing' ), 'updated' );
     }
     
     if ( isset( $_GET['wpinv-message'] ) && 'email_fail' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Fail to send email to the customer.', 'invoicing' ), 'error' );
+        add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Fail to send email to the customer.', 'invoicing' ), 'error' );
     }
 
     if ( isset( $_GET['wpinv-message'] ) && 'invoice-note-deleted' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
         add_settings_error( 'wpinv-notices', 'wpinv-note-deleted', __( 'The invoice note has been deleted.', 'invoicing' ), 'updated' );
     }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'settings-imported' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-settings-imported', __( 'The settings have been imported.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'settings-imported' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-settings-imported', __( 'The settings have been imported.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'note-added' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-note-added', __( 'The invoice note has been added successfully.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'note-added' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-note-added', __( 'The invoice note has been added successfully.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice-updated' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-updated', __( 'The invoice has been successfully updated.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'invoice-updated' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-updated', __( 'The invoice has been successfully updated.', 'invoicing' ), 'updated' );
+    }
     
-	if ( $pagenow == 'post.php' && !empty( $post->post_type ) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable( $post ) ) {
-		$message = apply_filters( 'wpinv_item_non_editable_message', __( 'This item in not editable.', 'invoicing' ), $post->ID );
+    if ( $pagenow == 'post.php' && !empty( $post->post_type ) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable( $post ) ) {
+        $message = apply_filters( 'wpinv_item_non_editable_message', __( 'This item in not editable.', 'invoicing' ), $post->ID );
 
-		if ( !empty( $message ) ) {
-			add_settings_error( 'wpinv-notices', 'wpinv-edit-n', $message, 'updated' );
-		}
-	}
+        if ( !empty( $message ) ) {
+            add_settings_error( 'wpinv-notices', 'wpinv-edit-n', $message, 'updated' );
+        }
+    }
 
-	settings_errors( 'wpinv-notices' );
+    settings_errors( 'wpinv-notices' );
 }
 add_action( 'admin_notices', 'wpinv_admin_messages' );
 
@@ -301,7 +301,7 @@ 
         break;
         case 'id' :
            echo $post->ID;
-           echo '<div class="hidden" id="wpinv_inline-' . $post->ID . '">
+            echo '<div class="hidden" id="wpinv_inline-' . $post->ID . '">
                     <div class="price">' . wpinv_get_item_price( $post->ID ) . '</div>';
                     if ( $wpinv_euvat->allow_vat_rules() ) {
                         echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule( $post->ID ) . '</div>';

Spacing +220 added lines, -220 removed lines

@@ -7,262 +7,262 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-function wpinv_columns( $columns ) {
+function wpinv_columns($columns) {
     $columns = array(
         'cb'                => $columns['cb'],
-        'number'            => __( 'Number', 'invoicing' ),
-        'customer'          => __( 'Customer', 'invoicing' ),
-        'amount'            => __( 'Amount', 'invoicing' ),
-        'invoice_date'      => __( 'Created Date', 'invoicing' ),
-        'payment_date'      => __( 'Payment Date', 'invoicing' ),
-        'status'            => __( 'Status', 'invoicing' ),
-        'ID'                => __( 'ID', 'invoicing' ),
-        'wpi_actions'       => __( 'Actions', 'invoicing' ),
+        'number'            => __('Number', 'invoicing'),
+        'customer'          => __('Customer', 'invoicing'),
+        'amount'            => __('Amount', 'invoicing'),
+        'invoice_date'      => __('Created Date', 'invoicing'),
+        'payment_date'      => __('Payment Date', 'invoicing'),
+        'status'            => __('Status', 'invoicing'),
+        'ID'                => __('ID', 'invoicing'),
+        'wpi_actions'       => __('Actions', 'invoicing'),
     );
 
-    return apply_filters( 'wpi_invoice_table_columns', $columns );
+    return apply_filters('wpi_invoice_table_columns', $columns);
 }
-add_filter( 'manage_wpi_invoice_posts_columns', 'wpinv_columns' );
+add_filter('manage_wpi_invoice_posts_columns', 'wpinv_columns');
 
-function wpinv_bulk_actions( $actions ) {
-    if ( isset( $actions['edit'] ) ) {
-        unset( $actions['edit'] );
+function wpinv_bulk_actions($actions) {
+    if (isset($actions['edit'])) {
+        unset($actions['edit']);
     }
 
     return $actions;
 }
-add_filter( 'bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions' );
-add_filter( 'bulk_actions-edit-wpi_item', 'wpinv_bulk_actions' );
+add_filter('bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions');
+add_filter('bulk_actions-edit-wpi_item', 'wpinv_bulk_actions');
 
-function wpinv_sortable_columns( $columns ) {
+function wpinv_sortable_columns($columns) {
     $columns = array(
-        'ID'            => array( 'ID', true ),
-        'number'        => array( 'number', false ),
-        'amount'        => array( 'amount', false ),
-        'invoice_date'  => array( 'date', false ),
-        'payment_date'  => array( 'payment_date', true ),
-        'customer'      => array( 'customer', false ),
-        'status'        => array( 'status', false ),
+        'ID'            => array('ID', true),
+        'number'        => array('number', false),
+        'amount'        => array('amount', false),
+        'invoice_date'  => array('date', false),
+        'payment_date'  => array('payment_date', true),
+        'customer'      => array('customer', false),
+        'status'        => array('status', false),
     );
     
-    return apply_filters( 'wpi_invoice_table_sortable_columns', $columns );
+    return apply_filters('wpi_invoice_table_sortable_columns', $columns);
 }
-add_filter( 'manage_edit-wpi_invoice_sortable_columns', 'wpinv_sortable_columns' );
+add_filter('manage_edit-wpi_invoice_sortable_columns', 'wpinv_sortable_columns');
 
-add_action( 'manage_wpi_invoice_posts_custom_column', 'wpinv_posts_custom_column');
-function wpinv_posts_custom_column( $column_name, $post_id = 0 ) {
+add_action('manage_wpi_invoice_posts_custom_column', 'wpinv_posts_custom_column');
+function wpinv_posts_custom_column($column_name, $post_id = 0) {
     global $post, $wpi_invoice;
     
-    if ( empty( $wpi_invoice ) || ( !empty( $wpi_invoice ) && $post->ID != $wpi_invoice->ID ) ) {
-        $wpi_invoice = new WPInv_Invoice( $post->ID );
+    if (empty($wpi_invoice) || (!empty($wpi_invoice) && $post->ID != $wpi_invoice->ID)) {
+        $wpi_invoice = new WPInv_Invoice($post->ID);
     }
 
     $value = NULL;
     
-    switch ( $column_name ) {
+    switch ($column_name) {
         case 'email' :
-            $value   = $wpi_invoice->get_email();
+            $value = $wpi_invoice->get_email();
             break;
         case 'customer' :
             $customer_name = $wpi_invoice->get_user_full_name();
-            $customer_name = $customer_name != '' ? $customer_name : __( 'Customer', 'invoicing' );
-            $value = '<a href="' . esc_url( get_edit_user_link( $wpi_invoice->get_user_id() ) ) . '">' . $customer_name . '</a>';
-            if ( $email = $wpi_invoice->get_email() ) {
+            $customer_name = $customer_name != '' ? $customer_name : __('Customer', 'invoicing');
+            $value = '<a href="' . esc_url(get_edit_user_link($wpi_invoice->get_user_id())) . '">' . $customer_name . '</a>';
+            if ($email = $wpi_invoice->get_email()) {
                 $value .= '<br><a class="email" href="mailto:' . $email . '">' . $email . '</a>';
             }
             break;
         case 'amount' :
-            echo $wpi_invoice->get_total( true );
+            echo $wpi_invoice->get_total(true);
             break;
         case 'invoice_date' :
-            $date_format = get_option( 'date_format' );
-            $time_format = get_option( 'time_format' );
-            $date_time_format = $date_format . ' '. $time_format;
+            $date_format = get_option('date_format');
+            $time_format = get_option('time_format');
+            $date_time_format = $date_format . ' ' . $time_format;
             
             $m_time = $post->post_date;
-            $h_time = mysql2date( $date_format, $m_time );
+            $h_time = mysql2date($date_format, $m_time);
             
-            $value   = '<abbr title="' . $m_time . '">' . $h_time . '</abbr>';
+            $value = '<abbr title="' . $m_time . '">' . $h_time . '</abbr>';
             break;
         case 'payment_date' :
-            if ( $date_completed = $wpi_invoice->get_meta( '_wpinv_completed_date', true ) ) {
-                $date_format = get_option( 'date_format' );
-                $time_format = get_option( 'time_format' );
-                $date_time_format = $date_format . ' '. $time_format;
+            if ($date_completed = $wpi_invoice->get_meta('_wpinv_completed_date', true)) {
+                $date_format = get_option('date_format');
+                $time_format = get_option('time_format');
+                $date_time_format = $date_format . ' ' . $time_format;
                 
                 $m_time = $date_completed;
-                $h_time = mysql2date( $date_format, $m_time );
+                $h_time = mysql2date($date_format, $m_time);
                 
-                $value   = '<abbr title="' . $m_time . '">' . $h_time . '</abbr>';
+                $value = '<abbr title="' . $m_time . '">' . $h_time . '</abbr>';
             } else {
                 $value = '-';
             }
             break;
         case 'status' :
-            $value   = $wpi_invoice->get_status( true ) . ( $wpi_invoice->is_recurring() && $wpi_invoice->is_parent() ? ' <span class="wpi-suffix">' . __( '(r)', 'invoicing' ) . '</span>' : '' );
-            $is_viewed = wpinv_is_invoice_viewed( $wpi_invoice->ID );
-            if ( 1 == $is_viewed ) {
-                $value .= '&nbsp;&nbsp;<i class="fa fa-eye" title="'.__( 'Viewed by Customer', 'invoicing' ).'"></i>';
+            $value = $wpi_invoice->get_status(true) . ($wpi_invoice->is_recurring() && $wpi_invoice->is_parent() ? ' <span class="wpi-suffix">' . __('(r)', 'invoicing') . '</span>' : '');
+            $is_viewed = wpinv_is_invoice_viewed($wpi_invoice->ID);
+            if (1 == $is_viewed) {
+                $value .= '&nbsp;&nbsp;<i class="fa fa-eye" title="' . __('Viewed by Customer', 'invoicing') . '"></i>';
             }
-            if ( ( $wpi_invoice->is_paid() || $wpi_invoice->is_refunded() ) && ( $gateway_title = wpinv_get_gateway_admin_label( $wpi_invoice->get_gateway() ) ) ) {
-                $value .= '<br><small class="meta gateway">' . wp_sprintf( __( 'Via %s', 'invoicing' ), $gateway_title ) . '</small>';
+            if (($wpi_invoice->is_paid() || $wpi_invoice->is_refunded()) && ($gateway_title = wpinv_get_gateway_admin_label($wpi_invoice->get_gateway()))) {
+                $value .= '<br><small class="meta gateway">' . wp_sprintf(__('Via %s', 'invoicing'), $gateway_title) . '</small>';
             }
             break;
         case 'number' :
-            $edit_link = get_edit_post_link( $post->ID );
-            $value = '<a title="' . esc_attr__( 'View Invoice Details', 'invoicing' ) . '" href="' . esc_url( $edit_link ) . '">' . $wpi_invoice->get_number() . '</a>';
+            $edit_link = get_edit_post_link($post->ID);
+            $value = '<a title="' . esc_attr__('View Invoice Details', 'invoicing') . '" href="' . esc_url($edit_link) . '">' . $wpi_invoice->get_number() . '</a>';
             break;
         case 'wpi_actions' :
             $value = '';
-            if ( !empty( $post->post_name ) ) {
-                $value .= '<a title="' . esc_attr__( 'Print invoice', 'invoicing' ) . '" href="' . esc_url( get_permalink( $post->ID ) ) . '" class="button ui-tip column-act-btn" title="" target="_blank"><span class="dashicons dashicons-print"><i style="" class="fa fa-print"></i></span></a>';
+            if (!empty($post->post_name)) {
+                $value .= '<a title="' . esc_attr__('Print invoice', 'invoicing') . '" href="' . esc_url(get_permalink($post->ID)) . '" class="button ui-tip column-act-btn" title="" target="_blank"><span class="dashicons dashicons-print"><i style="" class="fa fa-print"></i></span></a>';
             }
             
-            if ( $email = $wpi_invoice->get_email() ) {
-                $value .= '<a title="' . esc_attr__( 'Send invoice to customer', 'invoicing' ) . '" href="' . esc_url( add_query_arg( array( 'wpi_action' => 'send_invoice', 'invoice_id' => $post->ID ) ) ) . '" class="button ui-tip column-act-btn"><span class="dashicons dashicons-email-alt"></span></a>';
+            if ($email = $wpi_invoice->get_email()) {
+                $value .= '<a title="' . esc_attr__('Send invoice to customer', 'invoicing') . '" href="' . esc_url(add_query_arg(array('wpi_action' => 'send_invoice', 'invoice_id' => $post->ID))) . '" class="button ui-tip column-act-btn"><span class="dashicons dashicons-email-alt"></span></a>';
             }
             
             break;
         default:
-            $value = isset( $post->$column_name ) ? $post->$column_name : '';
+            $value = isset($post->$column_name) ? $post->$column_name : '';
             break;
 
     }
-    $value = apply_filters( 'wpinv_payments_table_column', $value, $post->ID, $column_name );
+    $value = apply_filters('wpinv_payments_table_column', $value, $post->ID, $column_name);
     
-    if ( $value !== NULL ) {
+    if ($value !== NULL) {
         echo $value;
     }
 }
 
-function wpinv_admin_post_id( $id = 0 ) {
+function wpinv_admin_post_id($id = 0) {
     global $post;
 
-    if ( isset( $id ) && ! empty( $id ) ) {
+    if (isset($id) && !empty($id)) {
         return (int)$id;
-    } else if ( get_the_ID() ) {
-        return (int) get_the_ID();
-    } else if ( isset( $post->ID ) && !empty( $post->ID ) ) {
-        return (int) $post->ID;
-    } else if ( isset( $_GET['post'] ) && !empty( $_GET['post'] ) ) {
-        return (int) $_GET['post'];
-    } else if ( isset( $_GET['id'] ) && !empty( $_GET['id'] ) ) {
-        return (int) $_GET['id'];
-    } else if ( isset( $_POST['id'] ) && !empty( $_POST['id'] ) ) {
-        return (int) $_POST['id'];
+    } else if (get_the_ID()) {
+        return (int)get_the_ID();
+    } else if (isset($post->ID) && !empty($post->ID)) {
+        return (int)$post->ID;
+    } else if (isset($_GET['post']) && !empty($_GET['post'])) {
+        return (int)$_GET['post'];
+    } else if (isset($_GET['id']) && !empty($_GET['id'])) {
+        return (int)$_GET['id'];
+    } else if (isset($_POST['id']) && !empty($_POST['id'])) {
+        return (int)$_POST['id'];
     } 
 
     return null;
 }
     
-function wpinv_admin_post_type( $id = 0 ) {
-    if ( !$id ) {
+function wpinv_admin_post_type($id = 0) {
+    if (!$id) {
         $id = wpinv_admin_post_id();
     }
     
-    $type = get_post_type( $id );
+    $type = get_post_type($id);
     
-    if ( !$type ) {
-        $type = isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) ? $_GET['post_type'] : null;
+    if (!$type) {
+        $type = isset($_GET['post_type']) && !empty($_GET['post_type']) ? $_GET['post_type'] : null;
     }
     
-    return apply_filters( 'wpinv_admin_post_type', $type, $id );
+    return apply_filters('wpinv_admin_post_type', $type, $id);
 }
 
 function wpinv_admin_messages() {
 	global $wpinv_options, $pagenow, $post;
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_added' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-added', __( 'Discount code added.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'discount_added' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		 add_settings_error('wpinv-notices', 'wpinv-discount-added', __('Discount code added.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_add_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-add-fail', __( 'There was a problem adding your discount code, please try again.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'discount_add_failed' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-discount-add-fail', __('There was a problem adding your discount code, please try again.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_exists' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-exists', __( 'A discount with that code already exists, please use a different code.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'discount_exists' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-discount-exists', __('A discount with that code already exists, please use a different code.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_updated' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-updated', __( 'Discount code updated.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'discount_updated' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		 add_settings_error('wpinv-notices', 'wpinv-discount-updated', __('Discount code updated.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_update_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-updated-fail', __( 'There was a problem updating your discount code, please try again.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'discount_update_failed' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-discount-updated-fail', __('There was a problem updating your discount code, please try again.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice_deleted' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-deleted', __( 'The invoice has been deleted.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'invoice_deleted' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-deleted', __('The invoice has been deleted.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_disabled' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Email notification is disabled. Please check settings.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'email_disabled' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-sent-fail', __('Email notification is disabled. Please check settings.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_sent' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent', __( 'The email has been sent to customer.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'email_sent' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-sent', __('The email has been sent to customer.', 'invoicing'), 'updated');
     }
     
-    if ( isset( $_GET['wpinv-message'] ) && 'email_fail' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Fail to send email to the customer.', 'invoicing' ), 'error' );
+    if (isset($_GET['wpinv-message']) && 'email_fail' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-sent-fail', __('Fail to send email to the customer.', 'invoicing'), 'error');
     }
 
-    if ( isset( $_GET['wpinv-message'] ) && 'invoice-note-deleted' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-        add_settings_error( 'wpinv-notices', 'wpinv-note-deleted', __( 'The invoice note has been deleted.', 'invoicing' ), 'updated' );
+    if (isset($_GET['wpinv-message']) && 'invoice-note-deleted' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+        add_settings_error('wpinv-notices', 'wpinv-note-deleted', __('The invoice note has been deleted.', 'invoicing'), 'updated');
     }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'settings-imported' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-settings-imported', __( 'The settings have been imported.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'settings-imported' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-settings-imported', __('The settings have been imported.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'note-added' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-note-added', __( 'The invoice note has been added successfully.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'note-added' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-note-added', __('The invoice note has been added successfully.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice-updated' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-updated', __( 'The invoice has been successfully updated.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'invoice-updated' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-updated', __('The invoice has been successfully updated.', 'invoicing'), 'updated');
 	}
     
-	if ( $pagenow == 'post.php' && !empty( $post->post_type ) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable( $post ) ) {
-		$message = apply_filters( 'wpinv_item_non_editable_message', __( 'This item in not editable.', 'invoicing' ), $post->ID );
+	if ($pagenow == 'post.php' && !empty($post->post_type) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable($post)) {
+		$message = apply_filters('wpinv_item_non_editable_message', __('This item in not editable.', 'invoicing'), $post->ID);
 
-		if ( !empty( $message ) ) {
-			add_settings_error( 'wpinv-notices', 'wpinv-edit-n', $message, 'updated' );
+		if (!empty($message)) {
+			add_settings_error('wpinv-notices', 'wpinv-edit-n', $message, 'updated');
 		}
 	}
 
-	settings_errors( 'wpinv-notices' );
+	settings_errors('wpinv-notices');
 }
-add_action( 'admin_notices', 'wpinv_admin_messages' );
+add_action('admin_notices', 'wpinv_admin_messages');
 
-function wpinv_items_columns( $existing_columns ) {
+function wpinv_items_columns($existing_columns) {
     global $wpinv_euvat;
     
     $columns                = array();
     $columns['cb']          = $existing_columns['cb'];
-    $columns['title']       = __( 'Title', 'invoicing' );
-    $columns['price']       = __( 'Price', 'invoicing' );
-    if ( $wpinv_euvat->allow_vat_rules() ) {
-        $columns['vat_rule']    = __( 'VAT rule type', 'invoicing' );
+    $columns['title']       = __('Title', 'invoicing');
+    $columns['price']       = __('Price', 'invoicing');
+    if ($wpinv_euvat->allow_vat_rules()) {
+        $columns['vat_rule']    = __('VAT rule type', 'invoicing');
     }
-    if ( $wpinv_euvat->allow_vat_classes() ) {
-        $columns['vat_class']   = __( 'VAT class', 'invoicing' );
+    if ($wpinv_euvat->allow_vat_classes()) {
+        $columns['vat_class']   = __('VAT class', 'invoicing');
     }
-    $columns['type']        = __( 'Type', 'invoicing' );
-    $columns['recurring']   = __( 'Recurring', 'invoicing' );
-    $columns['date']        = __( 'Date', 'invoicing' );
-    $columns['id']          = __( 'ID', 'invoicing' );
+    $columns['type']        = __('Type', 'invoicing');
+    $columns['recurring']   = __('Recurring', 'invoicing');
+    $columns['date']        = __('Date', 'invoicing');
+    $columns['id']          = __('ID', 'invoicing');
 
-    return apply_filters( 'wpinv_items_columns', $columns );
+    return apply_filters('wpinv_items_columns', $columns);
 }
-add_filter( 'manage_wpi_item_posts_columns', 'wpinv_items_columns' );
+add_filter('manage_wpi_item_posts_columns', 'wpinv_items_columns');
 
-function wpinv_items_sortable_columns( $columns ) {
+function wpinv_items_sortable_columns($columns) {
     $columns['price']       = 'price';
     $columns['vat_rule']    = 'vat_rule';
     $columns['vat_class']   = 'vat_class';
@@ -272,151 +272,151 @@ 
 
     return $columns;
 }
-add_filter( 'manage_edit-wpi_item_sortable_columns', 'wpinv_items_sortable_columns' );
+add_filter('manage_edit-wpi_item_sortable_columns', 'wpinv_items_sortable_columns');
 
-function wpinv_items_table_custom_column( $column ) {
+function wpinv_items_table_custom_column($column) {
     global $wpinv_euvat, $post, $wpi_item;
     
-    if ( empty( $wpi_item ) || ( !empty( $wpi_item ) && $post->ID != $wpi_item->ID ) ) {
-        $wpi_item = new WPInv_Item( $post->ID );
+    if (empty($wpi_item) || (!empty($wpi_item) && $post->ID != $wpi_item->ID)) {
+        $wpi_item = new WPInv_Item($post->ID);
     }
 
-    switch ( $column ) {
+    switch ($column) {
         case 'price' :
-            echo wpinv_item_price( $post->ID );
+            echo wpinv_item_price($post->ID);
         break;
         case 'vat_rule' :
-            echo $wpinv_euvat->item_rule_label( $post->ID );
+            echo $wpinv_euvat->item_rule_label($post->ID);
         break;
         case 'vat_class' :
-            echo $wpinv_euvat->item_class_label( $post->ID );
+            echo $wpinv_euvat->item_class_label($post->ID);
         break;
         case 'type' :
-            echo wpinv_item_type( $post->ID ) . '<span class="meta">' . $wpi_item->get_custom_singular_name() . '</span>';
+            echo wpinv_item_type($post->ID) . '<span class="meta">' . $wpi_item->get_custom_singular_name() . '</span>';
         break;
         case 'recurring' :
-            echo ( wpinv_is_recurring_item( $post->ID ) ? '<i class="fa fa-check fa-recurring-y"></i>' : '<i class="fa fa-close fa-recurring-n"></i>' );
+            echo (wpinv_is_recurring_item($post->ID) ? '<i class="fa fa-check fa-recurring-y"></i>' : '<i class="fa fa-close fa-recurring-n"></i>');
         break;
         case 'id' :
            echo $post->ID;
            echo '<div class="hidden" id="wpinv_inline-' . $post->ID . '">
-                    <div class="price">' . wpinv_get_item_price( $post->ID ) . '</div>';
-                    if ( $wpinv_euvat->allow_vat_rules() ) {
-                        echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule( $post->ID ) . '</div>';
+                    <div class="price">' . wpinv_get_item_price($post->ID) . '</div>';
+                    if ($wpinv_euvat->allow_vat_rules()) {
+                        echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule($post->ID) . '</div>';
                     }
-                    if ( $wpinv_euvat->allow_vat_classes() ) {
-                        echo '<div class="vat_class">' . $wpinv_euvat->get_item_class( $post->ID ) . '</div>';
+                    if ($wpinv_euvat->allow_vat_classes()) {
+                        echo '<div class="vat_class">' . $wpinv_euvat->get_item_class($post->ID) . '</div>';
                     }
-                    echo '<div class="type">' . wpinv_get_item_type( $post->ID ) . '</div>
+                    echo '<div class="type">' . wpinv_get_item_type($post->ID) . '</div>
                 </div>';
         break;
     }
     
-    do_action( 'wpinv_items_table_column_item_' . $column, $wpi_item, $post );
+    do_action('wpinv_items_table_column_item_' . $column, $wpi_item, $post);
 }
-add_action( 'manage_wpi_item_posts_custom_column', 'wpinv_items_table_custom_column' );
+add_action('manage_wpi_item_posts_custom_column', 'wpinv_items_table_custom_column');
 
 function wpinv_add_items_filters() {
     global $wpinv_euvat, $typenow;
 
     // Checks if the current post type is 'item'
-    if ( $typenow == 'wpi_item') {
-        if ( $wpinv_euvat->allow_vat_rules() ) {
-            echo wpinv_html_select( array(
-                    'options'          => array_merge( array( '' => __( 'All VAT rules', 'invoicing' ) ), $wpinv_euvat->get_rules() ),
+    if ($typenow == 'wpi_item') {
+        if ($wpinv_euvat->allow_vat_rules()) {
+            echo wpinv_html_select(array(
+                    'options'          => array_merge(array('' => __('All VAT rules', 'invoicing')), $wpinv_euvat->get_rules()),
                     'name'             => 'vat_rule',
                     'id'               => 'vat_rule',
-                    'selected'         => ( isset( $_GET['vat_rule'] ) ? $_GET['vat_rule'] : '' ),
+                    'selected'         => (isset($_GET['vat_rule']) ? $_GET['vat_rule'] : ''),
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium',
-                ) );
+                ));
         }
         
-        if ( $wpinv_euvat->allow_vat_classes() ) {
-            echo wpinv_html_select( array(
-                    'options'          => array_merge( array( '' => __( 'All VAT classes', 'invoicing' ) ), $wpinv_euvat->get_all_classes() ),
+        if ($wpinv_euvat->allow_vat_classes()) {
+            echo wpinv_html_select(array(
+                    'options'          => array_merge(array('' => __('All VAT classes', 'invoicing')), $wpinv_euvat->get_all_classes()),
                     'name'             => 'vat_class',
                     'id'               => 'vat_class',
-                    'selected'         => ( isset( $_GET['vat_class'] ) ? $_GET['vat_class'] : '' ),
+                    'selected'         => (isset($_GET['vat_class']) ? $_GET['vat_class'] : ''),
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium',
-                ) );
+                ));
         }
             
-        echo wpinv_html_select( array(
-                'options'          => array_merge( array( '' => __( 'All item types', 'invoicing' ) ), wpinv_get_item_types() ),
+        echo wpinv_html_select(array(
+                'options'          => array_merge(array('' => __('All item types', 'invoicing')), wpinv_get_item_types()),
                 'name'             => 'type',
                 'id'               => 'type',
-                'selected'         => ( isset( $_GET['type'] ) ? $_GET['type'] : '' ),
+                'selected'         => (isset($_GET['type']) ? $_GET['type'] : ''),
                 'show_option_all'  => false,
                 'show_option_none' => false,
                 'class'            => 'gdmbx2-text-medium',
-            ) );
+            ));
 
-        if ( isset( $_REQUEST['all_posts'] ) && '1' === $_REQUEST['all_posts'] ) {
+        if (isset($_REQUEST['all_posts']) && '1' === $_REQUEST['all_posts']) {
             echo '<input type="hidden" name="all_posts" value="1" />';
         }
     }
 }
-add_action( 'restrict_manage_posts', 'wpinv_add_items_filters', 100 );
+add_action('restrict_manage_posts', 'wpinv_add_items_filters', 100);
 
-function wpinv_send_invoice_after_save( $invoice ) {
-    if ( empty( $_POST['wpi_save_send'] ) ) {
+function wpinv_send_invoice_after_save($invoice) {
+    if (empty($_POST['wpi_save_send'])) {
         return;
     }
     
-    if ( !empty( $invoice->ID ) && !empty( $invoice->post_type ) && 'wpi_invoice' == $invoice->post_type ) {
-        wpinv_user_invoice_notification( $invoice->ID );
+    if (!empty($invoice->ID) && !empty($invoice->post_type) && 'wpi_invoice' == $invoice->post_type) {
+        wpinv_user_invoice_notification($invoice->ID);
     }
 }
-add_action( 'wpinv_invoice_metabox_saved', 'wpinv_send_invoice_after_save', 100, 1 );
+add_action('wpinv_invoice_metabox_saved', 'wpinv_send_invoice_after_save', 100, 1);
 
-function wpinv_send_register_new_user( $data, $postarr ) {
-    if ( current_user_can( 'manage_options' ) && !empty( $data['post_type'] ) && ( 'wpi_invoice' == $data['post_type'] || 'wpi_quote' == $data['post_type'] ) ) {
-        $is_new_user = !empty( $postarr['wpinv_new_user'] ) ? true : false;
-        $email = !empty( $postarr['wpinv_email'] ) && $postarr['wpinv_email'] && is_email( $postarr['wpinv_email'] ) ? $postarr['wpinv_email'] : NULL;
+function wpinv_send_register_new_user($data, $postarr) {
+    if (current_user_can('manage_options') && !empty($data['post_type']) && ('wpi_invoice' == $data['post_type'] || 'wpi_quote' == $data['post_type'])) {
+        $is_new_user = !empty($postarr['wpinv_new_user']) ? true : false;
+        $email = !empty($postarr['wpinv_email']) && $postarr['wpinv_email'] && is_email($postarr['wpinv_email']) ? $postarr['wpinv_email'] : NULL;
         
-        if ( $is_new_user && $email && !email_exists( $email ) ) {
-            $first_name = !empty( $postarr['wpinv_first_name'] ) ? sanitize_text_field( $postarr['wpinv_first_name'] ) : '';
-            $last_name = !empty( $postarr['wpinv_last_name'] ) ? sanitize_text_field( $postarr['wpinv_last_name'] ) : '';
-            $display_name = $first_name || $last_name ? trim( $first_name . ' ' . $last_name ) : '';
-            $user_nicename = $display_name ? trim( $display_name ) : $email;
-            $user_company = !empty( $postarr['wpinv_company'] ) ? sanitize_text_field( $postarr['wpinv_company'] ) : '';
+        if ($is_new_user && $email && !email_exists($email)) {
+            $first_name = !empty($postarr['wpinv_first_name']) ? sanitize_text_field($postarr['wpinv_first_name']) : '';
+            $last_name = !empty($postarr['wpinv_last_name']) ? sanitize_text_field($postarr['wpinv_last_name']) : '';
+            $display_name = $first_name || $last_name ? trim($first_name . ' ' . $last_name) : '';
+            $user_nicename = $display_name ? trim($display_name) : $email;
+            $user_company = !empty($postarr['wpinv_company']) ? sanitize_text_field($postarr['wpinv_company']) : '';
             
-            $user_login = sanitize_user( str_replace( ' ', '', $display_name ), true );
-            if ( !( validate_username( $user_login ) && !username_exists( $user_login ) ) ) {
+            $user_login = sanitize_user(str_replace(' ', '', $display_name), true);
+            if (!(validate_username($user_login) && !username_exists($user_login))) {
                 $new_user_login = strstr($email, '@', true);
-                if ( validate_username( $user_login ) && username_exists( $user_login ) ) {
-                    $user_login = sanitize_user($new_user_login, true );
+                if (validate_username($user_login) && username_exists($user_login)) {
+                    $user_login = sanitize_user($new_user_login, true);
                 }
-                if ( validate_username( $user_login ) && username_exists( $user_login ) ) {
-                    $user_append_text = rand(10,1000);
-                    $user_login = sanitize_user($new_user_login.$user_append_text, true );
+                if (validate_username($user_login) && username_exists($user_login)) {
+                    $user_append_text = rand(10, 1000);
+                    $user_login = sanitize_user($new_user_login . $user_append_text, true);
                 }
                 
-                if ( !( validate_username( $user_login ) && !username_exists( $user_login ) ) ) {
+                if (!(validate_username($user_login) && !username_exists($user_login))) {
                     $user_login = $email;
                 }
             }
             
             $userdata = array(
                 'user_login' => $user_login,
-                'user_pass' => wp_generate_password( 12, false ),
-                'user_email' => sanitize_text_field( $email ),
+                'user_pass' => wp_generate_password(12, false),
+                'user_email' => sanitize_text_field($email),
                 'first_name' => $first_name,
                 'last_name' => $last_name,
-                'user_nicename' => wpinv_utf8_substr( $user_nicename, 0, 50 ),
+                'user_nicename' => wpinv_utf8_substr($user_nicename, 0, 50),
                 'nickname' => $display_name,
                 'display_name' => $display_name,
             );
 
-            $userdata = apply_filters( 'wpinv_register_new_user_data', $userdata );
+            $userdata = apply_filters('wpinv_register_new_user_data', $userdata);
             
-            $new_user_id = wp_insert_user( $userdata );
+            $new_user_id = wp_insert_user($userdata);
             
-            if ( !is_wp_error( $new_user_id ) ) {
+            if (!is_wp_error($new_user_id)) {
                 $data['post_author'] = $new_user_id;
                 $_POST['post_author'] = $new_user_id;
                 $_POST['post_author_override'] = $new_user_id;
@@ -437,69 +437,69 @@ 
                 
                 $meta = array();
                 ///$meta['_wpinv_user_id'] = $new_user_id;
-                foreach ( $meta_fields as $field ) {
-                    $meta['_wpinv_' . $field] = isset( $postarr['wpinv_' . $field] ) ? sanitize_text_field( $postarr['wpinv_' . $field] ) : '';
+                foreach ($meta_fields as $field) {
+                    $meta['_wpinv_' . $field] = isset($postarr['wpinv_' . $field]) ? sanitize_text_field($postarr['wpinv_' . $field]) : '';
                 }
                 
-                $meta = apply_filters( 'wpinv_register_new_user_meta', $meta, $new_user_id );
+                $meta = apply_filters('wpinv_register_new_user_meta', $meta, $new_user_id);
 
                 // Update user meta.
-                foreach ( $meta as $key => $value ) {
-                    update_user_meta( $new_user_id, $key, $value );
+                foreach ($meta as $key => $value) {
+                    update_user_meta($new_user_id, $key, $value);
                 }
                 
-                if ( function_exists( 'wp_send_new_user_notifications' ) ) {
+                if (function_exists('wp_send_new_user_notifications')) {
                     // Send email notifications related to the creation of new user.
-                    wp_send_new_user_notifications( $new_user_id, 'user' );
+                    wp_send_new_user_notifications($new_user_id, 'user');
                 }
             } else {
-                wpinv_error_log( $new_user_id->get_error_message(), 'Invoice add new user', __FILE__, __LINE__ );
+                wpinv_error_log($new_user_id->get_error_message(), 'Invoice add new user', __FILE__, __LINE__);
             }
         }
     }
     
     return $data;
 }
-add_filter( 'wp_insert_post_data', 'wpinv_send_register_new_user', 10, 2 );
+add_filter('wp_insert_post_data', 'wpinv_send_register_new_user', 10, 2);
 
-function wpinv_show_recurring_supported_gateways( $item_ID ) {
+function wpinv_show_recurring_supported_gateways($item_ID) {
     $all_gateways = wpinv_get_payment_gateways();
 
-    if ( !empty( $all_gateways ) ) {
+    if (!empty($all_gateways)) {
         $gateways = array();
 
-        foreach ( $all_gateways as $key => $gateway ) {
-            if ( wpinv_gateway_support_subscription( $key ) ) {
+        foreach ($all_gateways as $key => $gateway) {
+            if (wpinv_gateway_support_subscription($key)) {
                 $gateways[] = $gateway['admin_label'];
             }
         }
 
-        if ( !empty( $gateways ) ) {
+        if (!empty($gateways)) {
             ?>
-            <span class="description"><?php echo wp_sprintf( __( 'Recurring payments only supported by: %s', 'invoicing' ), implode( ', ', $gateways ) ); ?></span>
+            <span class="description"><?php echo wp_sprintf(__('Recurring payments only supported by: %s', 'invoicing'), implode(', ', $gateways)); ?></span>
             <?php
         }
     }
 }
-add_action( 'wpinv_item_price_field', 'wpinv_show_recurring_supported_gateways', -10, 1 );
+add_action('wpinv_item_price_field', 'wpinv_show_recurring_supported_gateways', -10, 1);
 
-function wpinv_post_updated_messages( $messages ) {
+function wpinv_post_updated_messages($messages) {
     global $post, $post_ID;
 
     $messages['wpi_discount'] = array(
         0   => '',
-        1   => __( 'Discount updated.', 'invoicing' ),
-        2   => __( 'Custom field updated.', 'invoicing' ),
-        3   => __( 'Custom field deleted.', 'invoicing' ),
-        4   => __( 'Discount updated.', 'invoicing' ),
-        5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-        6   => __( 'Discount updated.', 'invoicing' ),
-        7   => __( 'Discount saved.', 'invoicing' ),
-        8   => __( 'Discount submitted.', 'invoicing' ),
-        9   => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-        10  => __( 'Discount draft updated.', 'invoicing' ),
+        1   => __('Discount updated.', 'invoicing'),
+        2   => __('Custom field updated.', 'invoicing'),
+        3   => __('Custom field deleted.', 'invoicing'),
+        4   => __('Discount updated.', 'invoicing'),
+        5   => isset($_GET['revision']) ? wp_sprintf(__('Discount restored to revision from %s', 'invoicing'), wp_post_revision_title((int)$_GET['revision'], false)) : false,
+        6   => __('Discount updated.', 'invoicing'),
+        7   => __('Discount saved.', 'invoicing'),
+        8   => __('Discount submitted.', 'invoicing'),
+        9   => wp_sprintf(__('Discount scheduled for: <strong>%1$s</strong>.', 'invoicing'), date_i18n(__('M j, Y @ G:i', 'invoicing'), strtotime($post->post_date))),
+        10  => __('Discount draft updated.', 'invoicing'),
     );
 
     return $messages;
 }
-add_filter( 'post_updated_messages', 'wpinv_post_updated_messages', 10, 1 );
\ No newline at end of file
+add_filter('post_updated_messages', 'wpinv_post_updated_messages', 10, 1);
\ No newline at end of file

invoicing.php

Spacing +7 added lines, -7 removed lines

@@ -10,19 +10,19 @@
 */
 
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-if ( !defined( 'WPINV_VERSION' ) ) {
-    define( 'WPINV_VERSION', '1.0.4' );
+if (!defined('WPINV_VERSION')) {
+    define('WPINV_VERSION', '1.0.4');
 }
 
-if ( !defined( 'WPINV_PLUGIN_FILE' ) ) {
-    define( 'WPINV_PLUGIN_FILE', __FILE__ );
+if (!defined('WPINV_PLUGIN_FILE')) {
+    define('WPINV_PLUGIN_FILE', __FILE__);
 }
 
-require plugin_dir_path( __FILE__ ) . 'includes/class-wpinv.php';
+require plugin_dir_path(__FILE__) . 'includes/class-wpinv.php';
 
 function wpinv_run() {
     global $invoicing;

includes/class-wpinv.php

Spacing +178 added lines, -178 removed lines

@@ -7,15 +7,15 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Plugin {
     private static $instance;
     
     public static function run() {
-        if ( !isset( self::$instance ) && !( self::$instance instanceof WPInv_Plugin ) ) {
+        if (!isset(self::$instance) && !(self::$instance instanceof WPInv_Plugin)) {
             self::$instance = new WPInv_Plugin;
             self::$instance->includes();
             self::$instance->actions();
@@ -31,31 +31,31 @@ 
     }
     
     public function define_constants() {
-        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+        define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
     }
     
     private function actions() {
         /* Internationalize the text strings used. */
-        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+        add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
         
         /* Perform actions on admin initialization. */
-        add_action( 'admin_init', array( &$this, 'admin_init') );
-        add_action( 'init', array( &$this, 'init' ), 3 );
-        add_action( 'init', array( 'WPInv_Shortcodes', 'init' ) );
-        add_action( 'init', array( &$this, 'wpinv_actions' ) );
+        add_action('admin_init', array(&$this, 'admin_init'));
+        add_action('init', array(&$this, 'init'), 3);
+        add_action('init', array('WPInv_Shortcodes', 'init'));
+        add_action('init', array(&$this, 'wpinv_actions'));
         
-        if ( class_exists( 'BuddyPress' ) ) {
-            add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+        if (class_exists('BuddyPress')) {
+            add_action('bp_include', array(&$this, 'bp_invoicing_init'));
         }
 
-        add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
+        add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
         
-        if ( is_admin() ) {
-            add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
-            add_action( 'admin_body_class', array( &$this, 'admin_body_class' ) );
+        if (is_admin()) {
+            add_action('admin_enqueue_scripts', array(&$this, 'admin_enqueue_scripts'));
+            add_action('admin_body_class', array(&$this, 'admin_body_class'));
         } else {
-            add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+            add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
         }
         
         /**
@@ -65,16 +65,16 @@ 
          *
          * @param WPInv_Plugin $this. Current WPInv_Plugin instance. Passed by reference.
          */
-        do_action_ref_array( 'wpinv_actions', array( &$this ) );
+        do_action_ref_array('wpinv_actions', array(&$this));
 
-        add_action( 'admin_init', array( &$this, 'activation_redirect') );
+        add_action('admin_init', array(&$this, 'activation_redirect'));
     }
     
     public function plugins_loaded() {
         /* Internationalize the text strings used. */
         $this->load_textdomain();
 
-        do_action( 'wpinv_loaded' );
+        do_action('wpinv_loaded');
     }
     
     /**
@@ -82,209 +82,209 @@ 
      *
      * @since 1.0
      */
-    public function load_textdomain( $locale = NULL ) {
-        if ( empty( $locale ) ) {
-            $locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+    public function load_textdomain($locale = NULL) {
+        if (empty($locale)) {
+            $locale = is_admin() && function_exists('get_user_locale') ? get_user_locale() : get_locale();
         }
 
-        $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+        $locale = apply_filters('plugin_locale', $locale, 'invoicing');
         
-        unload_textdomain( 'invoicing' );
-        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+        unload_textdomain('invoicing');
+        load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
+        load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
         
         /**
          * Define language constants.
          */
-        require_once( WPINV_PLUGIN_DIR . 'language.php' );
+        require_once(WPINV_PLUGIN_DIR . 'language.php');
     }
         
     public function includes() {
         global $wpinv_options;
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
         $wpinv_options = wpinv_get_settings();
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-shortcodes.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php' );
-        if ( !class_exists( 'WPInv_EUVat' ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-shortcodes.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php');
+        if (!class_exists('WPInv_EUVat')) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php');
         }
         
-        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
-        if ( !empty( $gateways ) ) {
-            foreach ( $gateways as $gateway ) {
-                if ( $gateway == 'manual' ) {
+        $gateways = array_keys(wpinv_get_enabled_payment_gateways());
+        if (!empty($gateways)) {
+            foreach ($gateways as $gateway) {
+                if ($gateway == 'manual') {
                     continue;
                 }
                 
                 $gateway_file = WPINV_PLUGIN_DIR . 'includes/gateways/' . $gateway . '.php';
                 
-                if ( file_exists( $gateway_file ) ) {
-                    require_once( $gateway_file );
+                if (file_exists($gateway_file)) {
+                    require_once($gateway_file);
                 }
             }
         }
-        require_once( WPINV_PLUGIN_DIR . 'includes/gateways/manual.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/gateways/manual.php');
         
-        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php' );
+        if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-recurring-admin.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
         }
         
         // include css inliner
-        if ( ! class_exists( 'Emogrifier' ) && class_exists( 'DOMDocument' ) ) {
-            include_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php' );
+        if (!class_exists('Emogrifier') && class_exists('DOMDocument')) {
+            include_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php');
         }
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');
     }
     
     public function init() {
     }
     
     public function admin_init() {
-        if (!(defined( 'DOING_AJAX' ) && DOING_AJAX)) {
+        if (!(defined('DOING_AJAX') && DOING_AJAX)) {
         }
         
-        add_action( 'admin_print_scripts-edit.php', array( &$this, 'admin_print_scripts_edit_php' ) );
+        add_action('admin_print_scripts-edit.php', array(&$this, 'admin_print_scripts_edit_php'));
     }
 
     public function activation_redirect() {
         // Bail if no activation redirect
-        if ( !get_transient( '_wpinv_activation_redirect' ) ) {
+        if (!get_transient('_wpinv_activation_redirect')) {
             return;
         }
 
         // Delete the redirect transient
-        delete_transient( '_wpinv_activation_redirect' );
+        delete_transient('_wpinv_activation_redirect');
 
         // Bail if activating from network, or bulk
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+        if (is_network_admin() || isset($_GET['activate-multi'])) {
             return;
         }
 
-        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
         exit;
     }
     
     public function enqueue_scripts() {
-        $suffix       = '';//defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = ''; //defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
         
-        wp_deregister_style( 'font-awesome' );
-        wp_register_style( 'font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0' );
-        wp_enqueue_style( 'font-awesome' );
+        wp_deregister_style('font-awesome');
+        wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0');
+        wp_enqueue_style('font-awesome');
         
-        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_front_style' );
+        wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_front_style');
                
         // Register scripts
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-        wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front' . $suffix . '.js', array( 'jquery', 'wpinv-vat-script' ),  WPINV_VERSION );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
+        wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front' . $suffix . '.js', array('jquery', 'wpinv-vat-script'), WPINV_VERSION);
         
         $localize                         = array();
-        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['ajax_url']             = admin_url('admin-ajax.php');
+        $localize['nonce']                = wp_create_nonce('wpinv-nonce');
         $localize['currency_symbol']      = wpinv_currency_symbol();
         $localize['currency_pos']         = wpinv_currency_position();
         $localize['thousand_sep']         = wpinv_thousands_separator();
         $localize['decimal_sep']          = wpinv_decimal_separator();
         $localize['decimals']             = wpinv_decimals();
-        $localize['txtComplete']          = __( 'Complete', 'invoicing' );
+        $localize['txtComplete']          = __('Complete', 'invoicing');
         
-        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+        $localize = apply_filters('wpinv_front_js_localize', $localize);
         
-        wp_enqueue_script( 'jquery-blockui' );
+        wp_enqueue_script('jquery-blockui');
         $autofill_api = wpinv_get_option('address_autofill_api');
         $autofill_active = wpinv_get_option('address_autofill_active');
-        if ( isset( $autofill_active ) && 1 == $autofill_active && !empty( $autofill_api ) && wpinv_is_checkout() ) {
-            if ( wp_script_is( 'google-maps-api', 'enqueued' ) ) {
-                wp_dequeue_script( 'google-maps-api' );
+        if (isset($autofill_active) && 1 == $autofill_active && !empty($autofill_api) && wpinv_is_checkout()) {
+            if (wp_script_is('google-maps-api', 'enqueued')) {
+                wp_dequeue_script('google-maps-api');
             }
-            wp_enqueue_script( 'google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array( 'jquery' ), '', false );
-            wp_enqueue_script( 'google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array( 'jquery', 'google-maps-api' ), '', true );
+            wp_enqueue_script('google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array('jquery'), '', false);
+            wp_enqueue_script('google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array('jquery', 'google-maps-api'), '', true);
         }
-        wp_enqueue_script( 'wpinv-front-script' );
-        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+        wp_enqueue_script('wpinv-front-script');
+        wp_localize_script('wpinv-front-script', 'WPInv', $localize);
     }
 
     public function admin_enqueue_scripts() {
         global $post, $pagenow;
         
         $post_type  = wpinv_admin_post_type();
-        $suffix     = '';//defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-        $page       = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : '';
+        $suffix     = ''; //defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $page       = isset($_GET['page']) ? strtolower($_GET['page']) : '';
 
-        wp_deregister_style( 'font-awesome' );
-        wp_register_style( 'font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0' );
-        wp_enqueue_style( 'font-awesome' );
+        wp_deregister_style('font-awesome');
+        wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0');
+        wp_enqueue_style('font-awesome');
         
         $jquery_ui_css = false;
-        if ( ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount' ) && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) ) {
+        if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $jquery_ui_css = true;
-        } else if ( $page == 'wpinv-settings' || $page == 'wpinv-reports' ) {
+        } else if ($page == 'wpinv-settings' || $page == 'wpinv-reports') {
             $jquery_ui_css = true;
         }
-        if ( $jquery_ui_css ) {
-            wp_register_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16' );
-            wp_enqueue_style( 'jquery-ui-css' );
+        if ($jquery_ui_css) {
+            wp_register_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16');
+            wp_enqueue_style('jquery-ui-css');
         }
 
-        wp_register_style( 'wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_meta_box_style' );
+        wp_register_style('wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_meta_box_style');
         
-        wp_register_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_admin_style' );
+        wp_register_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_admin_style');
 
-        $enqueue = ( $post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) );
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        $enqueue = ($post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ($pagenow == 'post-new.php' || $pagenow == 'post.php'));
+        if ($page == 'wpinv-subscriptions') {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
-        $enqueue_datepicker = apply_filters( 'wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue );
+        $enqueue_datepicker = apply_filters('wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue);
         
-        if ( $enqueue_datepicker = apply_filters( 'wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if ($enqueue_datepicker = apply_filters('wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue)) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
 
-        wp_enqueue_style( 'wp-color-picker' );
-        wp_enqueue_script( 'wp-color-picker' );
+        wp_enqueue_style('wp-color-picker');
+        wp_enqueue_script('wp-color-picker');
         
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
 
         if ($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $autofill_api = wpinv_get_option('address_autofill_api');
@@ -295,17 +295,17 @@ 
             }
         }
 
-        wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin' . $suffix . '.js', array( 'jquery', 'jquery-blockui','jquery-ui-tooltip' ),  WPINV_VERSION );
-        wp_enqueue_script( 'wpinv-admin-script' );
+        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin' . $suffix . '.js', array('jquery', 'jquery-blockui', 'jquery-ui-tooltip'), WPINV_VERSION);
+        wp_enqueue_script('wpinv-admin-script');
         
         $localize                               = array();
-        $localize['ajax_url']                   = admin_url( 'admin-ajax.php' );
-        $localize['post_ID']                    = isset( $post->ID ) ? $post->ID : '';
-        $localize['wpinv_nonce']                = wp_create_nonce( 'wpinv-nonce' );
-        $localize['add_invoice_note_nonce']     = wp_create_nonce( 'add-invoice-note' );
-        $localize['delete_invoice_note_nonce']  = wp_create_nonce( 'delete-invoice-note' );
-        $localize['invoice_item_nonce']         = wp_create_nonce( 'invoice-item' );
-        $localize['billing_details_nonce']      = wp_create_nonce( 'get-billing-details' );
+        $localize['ajax_url']                   = admin_url('admin-ajax.php');
+        $localize['post_ID']                    = isset($post->ID) ? $post->ID : '';
+        $localize['wpinv_nonce']                = wp_create_nonce('wpinv-nonce');
+        $localize['add_invoice_note_nonce']     = wp_create_nonce('add-invoice-note');
+        $localize['delete_invoice_note_nonce']  = wp_create_nonce('delete-invoice-note');
+        $localize['invoice_item_nonce']         = wp_create_nonce('invoice-item');
+        $localize['billing_details_nonce']      = wp_create_nonce('get-billing-details');
         $localize['tax']                        = wpinv_tax_amount();
         $localize['discount']                   = wpinv_discount_amount();
         $localize['currency_symbol']            = wpinv_currency_symbol();
@@ -313,69 +313,69 @@ 
         $localize['thousand_sep']               = wpinv_thousands_separator();
         $localize['decimal_sep']                = wpinv_decimal_separator();
         $localize['decimals']                   = wpinv_decimals();
-        $localize['save_invoice']               = __( 'Save Invoice', 'invoicing' );
-        $localize['status_publish']             = wpinv_status_nicename( 'publish' );
-        $localize['status_pending']             = wpinv_status_nicename( 'wpi-pending' );
-        $localize['delete_tax_rate']            = __( 'Are you sure you wish to delete this tax rate?', 'invoicing' );
-        $localize['OneItemMin']                 = __( 'Invoice must contain at least one item', 'invoicing' );
-        $localize['DeleteInvoiceItem']          = __( 'Are you sure you wish to delete this item?', 'invoicing' );
-        $localize['FillBillingDetails']         = __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' );
-        $localize['confirmCalcTotals']          = __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' );
-        $localize['AreYouSure']                 = __( 'Are you sure?', 'invoicing' );
-        $localize['emptyInvoice']               = __( 'Add at least one item to save invoice!', 'invoicing' );
-        $localize['errDeleteItem']              = __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' );
-        $localize['delete_subscription']        = __( 'Are you sure you want to delete this subscription?', 'invoicing' );
-        $localize['action_edit']                = __( 'Edit', 'invoicing' );
-        $localize['action_cancel']              = __( 'Cancel', 'invoicing' );
+        $localize['save_invoice']               = __('Save Invoice', 'invoicing');
+        $localize['status_publish']             = wpinv_status_nicename('publish');
+        $localize['status_pending']             = wpinv_status_nicename('wpi-pending');
+        $localize['delete_tax_rate']            = __('Are you sure you wish to delete this tax rate?', 'invoicing');
+        $localize['OneItemMin']                 = __('Invoice must contain at least one item', 'invoicing');
+        $localize['DeleteInvoiceItem']          = __('Are you sure you wish to delete this item?', 'invoicing');
+        $localize['FillBillingDetails']         = __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing');
+        $localize['confirmCalcTotals']          = __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing');
+        $localize['AreYouSure']                 = __('Are you sure?', 'invoicing');
+        $localize['emptyInvoice']               = __('Add at least one item to save invoice!', 'invoicing');
+        $localize['errDeleteItem']              = __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing');
+        $localize['delete_subscription']        = __('Are you sure you want to delete this subscription?', 'invoicing');
+        $localize['action_edit']                = __('Edit', 'invoicing');
+        $localize['action_cancel']              = __('Cancel', 'invoicing');
 
-        $localize = apply_filters( 'wpinv_admin_js_localize', $localize );
+        $localize = apply_filters('wpinv_admin_js_localize', $localize);
 
-        wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', $localize );
+        wp_localize_script('wpinv-admin-script', 'WPInv_Admin', $localize);
 
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions' . $suffix . '.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
-            wp_enqueue_script( 'wpinv-sub-admin-script' );
+        if ($page == 'wpinv-subscriptions') {
+            wp_register_script('wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions' . $suffix . '.js', array('wpinv-admin-script'), WPINV_VERSION);
+            wp_enqueue_script('wpinv-sub-admin-script');
         }
     }
     
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
         global $pagenow, $post, $current_screen;
         
-        if ( !empty( $current_screen->post_type ) && ( $current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote' ) ) {
+        if (!empty($current_screen->post_type) && ($current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote')) {
             $classes .= ' wpinv-cpt';
         }
         
-        $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
-        $add_class = $page && $pagenow == 'admin.php' && strpos( $page, 'wpinv-' ) === 0 ? true : false;
-        if ( $add_class ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( $page );
+        $add_class = $page && $pagenow == 'admin.php' && strpos($page, 'wpinv-') === 0 ? true : false;
+        if ($add_class) {
+            $classes .= ' wpi-' . wpinv_sanitize_key($page);
         }
         
         $settings_class = array();
-        if ( $page == 'wpinv-settings' ) {
-            if ( !empty( $_REQUEST['tab'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['tab'] );
+        if ($page == 'wpinv-settings') {
+            if (!empty($_REQUEST['tab'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['tab']);
             }
             
-            if ( !empty( $_REQUEST['section'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['section'] );
+            if (!empty($_REQUEST['section'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['section']);
             }
             
-            $settings_class[] = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field( $_REQUEST['wpi_sub'] ) : 'main';
+            $settings_class[] = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field($_REQUEST['wpi_sub']) : 'main';
         }
         
-        if ( !empty( $settings_class ) ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( implode( $settings_class, '-' ) );
+        if (!empty($settings_class)) {
+            $classes .= ' wpi-' . wpinv_sanitize_key(implode($settings_class, '-'));
         }
         
         $post_type = wpinv_admin_post_type();
 
-        if ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false ) {
+        if ($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false) {
             return $classes .= ' wpinv';
         }
         
-        if ( $pagenow == 'post.php' && $post_type == 'wpi_item' && !empty( $post ) && !wpinv_item_is_editable( $post ) ) {
+        if ($pagenow == 'post.php' && $post_type == 'wpi_item' && !empty($post) && !wpinv_item_is_editable($post)) {
             $classes .= ' wpi-editable-n';
         }
 
@@ -387,20 +387,20 @@ 
     }
     
     public function wpinv_actions() {
-        if ( isset( $_REQUEST['wpi_action'] ) ) {
-            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        if (isset($_REQUEST['wpi_action'])) {
+            do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
         }
     }
     
-    public function pre_get_posts( $wp_query ) {
-        if ( !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
+    public function pre_get_posts($wp_query) {
+        if (!empty($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+            $wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses());
         }
         
         return $wp_query;
     }
     
     public function bp_invoicing_init() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');
     }
 }
\ No newline at end of file