AyeCode / invoicing

includes/wpinv-subscription.php

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

includes/admin/admin-pages.php

Spacing +189 added lines, -189 removed lines

@@ -1,73 +1,73 @@ 
 <?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__));
 }
 
-add_action( 'admin_menu', 'wpinv_add_options_link', 10 );
+add_action('admin_menu', 'wpinv_add_options_link', 10);
 function wpinv_add_options_link() {
     global $menu;
 
-    if ( !(current_user_can( 'manage_invoicing' ) || current_user_can( 'manage_options' )) ) {
+    if (!(current_user_can('manage_invoicing') || current_user_can('manage_options'))) {
         return;
     }
 
-    $capability = apply_filters( 'invoicing_capability', 'manage_invoicing' );
+    $capability = apply_filters('invoicing_capability', 'manage_invoicing');
 
-    if ( current_user_can( 'manage_options' ) ) {
-        $menu[] = array( '', 'read', 'separator-wpinv', '', 'wp-menu-separator wpinv' );
+    if (current_user_can('manage_options')) {
+        $menu[] = array('', 'read', 'separator-wpinv', '', 'wp-menu-separator wpinv');
     }
 
-    $wpi_invoice = get_post_type_object( 'wpi_invoice' );
+    $wpi_invoice = get_post_type_object('wpi_invoice');
 
-    add_menu_page( __( 'Invoicing', 'invoicing' ), __( 'Invoicing', 'invoicing' ), $capability, 'wpinv', null, $wpi_invoice->menu_icon, '54.123460' );
+    add_menu_page(__('Invoicing', 'invoicing'), __('Invoicing', 'invoicing'), $capability, 'wpinv', null, $wpi_invoice->menu_icon, '54.123460');
 
-    $wpi_settings_page   = add_submenu_page( 'wpinv', __( 'Invoice Settings', 'invoicing' ), __( 'Settings', 'invoicing' ), $capability, 'wpinv-settings', 'wpinv_options_page' );
+    $wpi_settings_page = add_submenu_page('wpinv', __('Invoice Settings', 'invoicing'), __('Settings', 'invoicing'), $capability, 'wpinv-settings', 'wpinv_options_page');
 }
 
-add_action( 'admin_menu', 'wpinv_remove_admin_submenus', 999 );
+add_action('admin_menu', 'wpinv_remove_admin_submenus', 999);
 function wpinv_remove_admin_submenus() {
-    remove_submenu_page( 'edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice' );
+    remove_submenu_page('edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice');
 }
 
-add_filter( 'manage_wpi_discount_posts_columns', 'wpinv_discount_columns' );
-function wpinv_discount_columns( $existing_columns ) {
+add_filter('manage_wpi_discount_posts_columns', 'wpinv_discount_columns');
+function wpinv_discount_columns($existing_columns) {
     $columns                = array();
     $columns['cb']          = $existing_columns['cb'];
-    $columns['name']        = __( 'Name', 'invoicing' );
-    $columns['code']        = __( 'Code', 'invoicing' );
-    $columns['amount']      = __( 'Amount', 'invoicing' );
-    $columns['usage']       = __( 'Usage / Limit', 'invoicing' );
-    $columns['start_date']  = __( 'Start Date', 'invoicing' );
-    $columns['expiry_date'] = __( 'Expiry Date', 'invoicing' );
-    $columns['status']      = __( 'Status', 'invoicing' );
+    $columns['name']        = __('Name', 'invoicing');
+    $columns['code']        = __('Code', 'invoicing');
+    $columns['amount']      = __('Amount', 'invoicing');
+    $columns['usage']       = __('Usage / Limit', 'invoicing');
+    $columns['start_date']  = __('Start Date', 'invoicing');
+    $columns['expiry_date'] = __('Expiry Date', 'invoicing');
+    $columns['status']      = __('Status', 'invoicing');
 
     return $columns;
 }
 
-add_action( 'manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column' );
-function wpinv_discount_custom_column( $column ) {
+add_action('manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column');
+function wpinv_discount_custom_column($column) {
     global $post;
     
     $discount = $post;
 
-    switch ( $column ) {
+    switch ($column) {
         case 'name' :
-            echo get_the_title( $discount->ID );
+            echo get_the_title($discount->ID);
         break;
         case 'code' :
-            echo wpinv_get_discount_code( $discount->ID );
+            echo wpinv_get_discount_code($discount->ID);
         break;
         case 'amount' :
-            echo wpinv_format_discount_rate( wpinv_get_discount_type( $discount->ID ), wpinv_get_discount_amount( $discount->ID ) );
+            echo wpinv_format_discount_rate(wpinv_get_discount_type($discount->ID), wpinv_get_discount_amount($discount->ID));
         break;
         case 'usage_limit' :
-            echo wpinv_get_discount_uses( $discount->ID );
+            echo wpinv_get_discount_uses($discount->ID);
         break;
         case 'usage' :
-            $usage = wpinv_get_discount_uses( $discount->ID ) . ' / ';
-            if ( wpinv_get_discount_max_uses( $discount->ID ) ) {
-                $usage .= wpinv_get_discount_max_uses( $discount->ID );
+            $usage = wpinv_get_discount_uses($discount->ID) . ' / ';
+            if (wpinv_get_discount_max_uses($discount->ID)) {
+                $usage .= wpinv_get_discount_max_uses($discount->ID);
             } else {
                 $usage .= ' &infin;';
             }
@@ -75,8 +75,8 @@ 
             echo $usage;
         break;
         case 'start_date' :
-            if ( $start_date = wpinv_get_discount_start_date( $discount->ID ) ) {
-                $value = date_i18n( get_option( 'date_format' ) . ' @ ' . get_option( 'time_format' ), strtotime( $start_date ) );
+            if ($start_date = wpinv_get_discount_start_date($discount->ID)) {
+                $value = date_i18n(get_option('date_format') . ' @ ' . get_option('time_format'), strtotime($start_date));
             } else {
                 $value = '-';
             }
@@ -84,163 +84,163 @@ 
             echo $value;
         break;
         case 'expiry_date' :
-            if ( $expiration = wpinv_get_discount_expiration( $discount->ID ) ) {
-                $value = date_i18n( get_option( 'date_format' ) . ' @ ' . get_option( 'time_format' ), strtotime( $expiration ) );
+            if ($expiration = wpinv_get_discount_expiration($discount->ID)) {
+                $value = date_i18n(get_option('date_format') . ' @ ' . get_option('time_format'), strtotime($expiration));
             } else {
-                $value = __( 'Never', 'invoicing' );
+                $value = __('Never', 'invoicing');
             }
                 
             echo $value;
         break;
         break;
         case 'description' :
-            echo wp_kses_post( $post->post_excerpt );
+            echo wp_kses_post($post->post_excerpt);
         break;
         case 'status' :
-            $status = wpinv_is_discount_expired( $discount->ID ) ? 'expired' : $discount->post_status;
+            $status = wpinv_is_discount_expired($discount->ID) ? 'expired' : $discount->post_status;
             
-            echo wpinv_discount_status( $status );
+            echo wpinv_discount_status($status);
         break;
     }
 }
 
-add_filter( 'post_row_actions', 'wpinv_post_row_actions', 9999, 2 );
-function wpinv_post_row_actions( $actions, $post ) {
-    $post_type = !empty( $post->post_type ) ? $post->post_type : '';
+add_filter('post_row_actions', 'wpinv_post_row_actions', 9999, 2);
+function wpinv_post_row_actions($actions, $post) {
+    $post_type = !empty($post->post_type) ? $post->post_type : '';
     
-    if ( $post_type == 'wpi_invoice' ) {
+    if ($post_type == 'wpi_invoice') {
         $actions = array();
     }
     
-    if ( $post_type == 'wpi_discount' ) {
-        $actions = wpinv_discount_row_actions( $post, $actions );
+    if ($post_type == 'wpi_discount') {
+        $actions = wpinv_discount_row_actions($post, $actions);
     }
     
     return $actions;
 }
 
-function wpinv_discount_row_actions( $discount, $row_actions ) {
-    $row_actions  = array();
-    $edit_link = get_edit_post_link( $discount->ID );
-    $row_actions['edit'] = '<a href="' . esc_url( $edit_link ) . '">' . __( 'Edit', 'invoicing' ) . '</a>';
+function wpinv_discount_row_actions($discount, $row_actions) {
+    $row_actions = array();
+    $edit_link = get_edit_post_link($discount->ID);
+    $row_actions['edit'] = '<a href="' . esc_url($edit_link) . '">' . __('Edit', 'invoicing') . '</a>';
 
-    if( in_array( strtolower( $discount->post_status ),  array(  'publish' ) ) ) {
-        $row_actions['deactivate'] = '<a href="' . esc_url( wp_nonce_url( add_query_arg( array( 'wpi_action' => 'deactivate_discount', 'discount' => $discount->ID ) ), 'wpinv_discount_nonce' ) ) . '">' . __( 'Deactivate', 'invoicing' ) . '</a>';
-    } elseif( in_array( strtolower( $discount->post_status ),  array( 'pending', 'draft' ) ) ) {
-        $row_actions['activate'] = '<a href="' . esc_url( wp_nonce_url( add_query_arg( array( 'wpi_action' => 'activate_discount', 'discount' => $discount->ID ) ), 'wpinv_discount_nonce' ) ) . '">' . __( 'Activate', 'invoicing' ) . '</a>';
+    if (in_array(strtolower($discount->post_status), array('publish'))) {
+        $row_actions['deactivate'] = '<a href="' . esc_url(wp_nonce_url(add_query_arg(array('wpi_action' => 'deactivate_discount', 'discount' => $discount->ID)), 'wpinv_discount_nonce')) . '">' . __('Deactivate', 'invoicing') . '</a>';
+    } elseif (in_array(strtolower($discount->post_status), array('pending', 'draft'))) {
+        $row_actions['activate'] = '<a href="' . esc_url(wp_nonce_url(add_query_arg(array('wpi_action' => 'activate_discount', 'discount' => $discount->ID)), 'wpinv_discount_nonce')) . '">' . __('Activate', 'invoicing') . '</a>';
     }
 
-    if ( wpinv_get_discount_uses( $discount->ID ) > 0 ) {
-        if ( isset( $row_actions['delete'] ) ) {
-            unset( $row_actions['delete'] ); // Don't delete used discounts.
+    if (wpinv_get_discount_uses($discount->ID) > 0) {
+        if (isset($row_actions['delete'])) {
+            unset($row_actions['delete']); // Don't delete used discounts.
         }
     } else {
-        $row_actions['delete'] = '<a href="' . esc_url( wp_nonce_url( add_query_arg( array( 'wpi_action' => 'delete_discount', 'discount' => $discount->ID ) ), 'wpinv_discount_nonce' ) ) . '">' . __( 'Delete', 'invoicing' ) . '</a>';
+        $row_actions['delete'] = '<a href="' . esc_url(wp_nonce_url(add_query_arg(array('wpi_action' => 'delete_discount', 'discount' => $discount->ID)), 'wpinv_discount_nonce')) . '">' . __('Delete', 'invoicing') . '</a>';
     }
     
 
-    $row_actions = apply_filters( 'wpinv_discount_row_actions', $row_actions, $discount );
+    $row_actions = apply_filters('wpinv_discount_row_actions', $row_actions, $discount);
 
     return $row_actions;
 }
 
-add_filter( 'list_table_primary_column', 'wpinv_table_primary_column', 10, 2 );
-function wpinv_table_primary_column( $default, $screen_id ) {
-    if ( 'edit-wpi_invoice' === $screen_id ) {
+add_filter('list_table_primary_column', 'wpinv_table_primary_column', 10, 2);
+function wpinv_table_primary_column($default, $screen_id) {
+    if ('edit-wpi_invoice' === $screen_id) {
         return 'name';
     }
     
     return $default;
 }
 
-function wpinv_discount_bulk_actions( $actions, $display = false ) {    
-    if ( !$display ) {
+function wpinv_discount_bulk_actions($actions, $display = false) {    
+    if (!$display) {
         return array();
     }
     
     $actions = array(
-        'activate'   => __( 'Activate', 'invoicing' ),
-        'deactivate' => __( 'Deactivate', 'invoicing' ),
-        'delete'     => __( 'Delete', 'invoicing' ),
+        'activate'   => __('Activate', 'invoicing'),
+        'deactivate' => __('Deactivate', 'invoicing'),
+        'delete'     => __('Delete', 'invoicing'),
     );
     $two = '';
     $which = 'top';
     echo '</div><div class="alignleft actions bulkactions">';
-    echo '<label for="bulk-action-selector-' . esc_attr( $which ) . '" class="screen-reader-text">' . __( 'Select bulk action' ) . '</label>';
-    echo '<select name="action' . $two . '" id="bulk-action-selector-' . esc_attr( $which ) . "\">";
-    echo '<option value="-1">' . __( 'Bulk Actions' ) . "</option>";
+    echo '<label for="bulk-action-selector-' . esc_attr($which) . '" class="screen-reader-text">' . __('Select bulk action') . '</label>';
+    echo '<select name="action' . $two . '" id="bulk-action-selector-' . esc_attr($which) . "\">";
+    echo '<option value="-1">' . __('Bulk Actions') . "</option>";
 
-    foreach ( $actions as $name => $title ) {
+    foreach ($actions as $name => $title) {
         $class = 'edit' === $name ? ' class="hide-if-no-js"' : '';
 
         echo "" . '<option value="' . $name . '"' . $class . '>' . $title . "</option>";
     }
     echo "</select>";
 
-    submit_button( __( 'Apply' ), 'action', '', false, array( 'id' => "doaction$two" ) );
+    submit_button(__('Apply'), 'action', '', false, array('id' => "doaction$two"));
     
     echo '</div><div class="alignleft actions">';
 }
-add_filter( 'bulk_actions-edit-wpi_discount', 'wpinv_discount_bulk_actions', 10 );
+add_filter('bulk_actions-edit-wpi_discount', 'wpinv_discount_bulk_actions', 10);
 
-function wpinv_disable_months_dropdown( $disable, $post_type ) {
-    if ( $post_type == 'wpi_discount' ) {
+function wpinv_disable_months_dropdown($disable, $post_type) {
+    if ($post_type == 'wpi_discount') {
         $disable = true;
     }
     
     return $disable;
 }
-add_filter( 'disable_months_dropdown', 'wpinv_disable_months_dropdown', 10, 2 );
+add_filter('disable_months_dropdown', 'wpinv_disable_months_dropdown', 10, 2);
 
 function wpinv_restrict_manage_posts() {
     global $typenow;
 
-    if( 'wpi_discount' == $typenow ) {
+    if ('wpi_discount' == $typenow) {
         wpinv_discount_filters();
     }
 }
-add_action( 'restrict_manage_posts', 'wpinv_restrict_manage_posts', 10 );
+add_action('restrict_manage_posts', 'wpinv_restrict_manage_posts', 10);
 
 function wpinv_discount_filters() {
-    echo wpinv_discount_bulk_actions( array(), true );
+    echo wpinv_discount_bulk_actions(array(), true);
     
     ?>
     <select name="discount_type" id="dropdown_wpinv_discount_type">
-        <option value=""><?php _e( 'Show all types', 'invoicing' ); ?></option>
+        <option value=""><?php _e('Show all types', 'invoicing'); ?></option>
         <?php
             $types = wpinv_get_discount_types();
 
-            foreach ( $types as $name => $type ) {
-                echo '<option value="' . esc_attr( $name ) . '"';
+            foreach ($types as $name => $type) {
+                echo '<option value="' . esc_attr($name) . '"';
 
-                if ( isset( $_GET['discount_type'] ) )
-                    selected( $name, $_GET['discount_type'] );
+                if (isset($_GET['discount_type']))
+                    selected($name, $_GET['discount_type']);
 
-                echo '>' . esc_html__( $type, 'invoicing' ) . '</option>';
+                echo '>' . esc_html__($type, 'invoicing') . '</option>';
             }
         ?>
     </select>
     <?php
 }
 
-function wpinv_request( $vars ) {
+function wpinv_request($vars) {
     global $typenow, $wp_query, $wp_post_statuses;
 
-    if ( 'wpi_invoice' === $typenow ) {
-        if ( !isset( $vars['post_status'] ) ) {
+    if ('wpi_invoice' === $typenow) {
+        if (!isset($vars['post_status'])) {
             $post_statuses = wpinv_get_invoice_statuses();
 
-            foreach ( $post_statuses as $status => $value ) {
-                if ( isset( $wp_post_statuses[ $status ] ) && false === $wp_post_statuses[ $status ]->show_in_admin_all_list ) {
-                    unset( $post_statuses[ $status ] );
+            foreach ($post_statuses as $status => $value) {
+                if (isset($wp_post_statuses[$status]) && false === $wp_post_statuses[$status]->show_in_admin_all_list) {
+                    unset($post_statuses[$status]);
                 }
             }
 
-            $vars['post_status'] = array_keys( $post_statuses );
+            $vars['post_status'] = array_keys($post_statuses);
         }
         
-        if ( isset( $vars['orderby'] ) ) {
-            if ( 'amount' == $vars['orderby'] ) {
+        if (isset($vars['orderby'])) {
+            if ('amount' == $vars['orderby']) {
                 $vars = array_merge(
                     $vars,
                     array(
@@ -248,7 +248,7 @@ 
                         'orderby'  => 'meta_value_num'
                     )
                 );
-            } else if ( 'customer' == $vars['orderby'] ) {
+            } else if ('customer' == $vars['orderby']) {
                 $vars = array_merge(
                     $vars,
                     array(
@@ -256,7 +256,7 @@ 
                         'orderby'  => 'meta_value'
                     )
                 );
-            } else if ( 'number' == $vars['orderby'] ) {
+            } else if ('number' == $vars['orderby']) {
                 $vars = array_merge(
                     $vars,
                     array(
@@ -264,7 +264,7 @@ 
                         'orderby'  => 'meta_value'
                     )
                 );
-            } else if ( 'payment_date' == $vars['orderby'] ) {
+            } else if ('payment_date' == $vars['orderby']) {
                 $vars = array_merge(
                     $vars,
                     array(
@@ -274,9 +274,9 @@ 
                 );
             }
         }
-    } else if ( 'wpi_item' == $typenow ) {
+    } else if ('wpi_item' == $typenow) {
         // Check if 'orderby' is set to "price"
-        if ( isset( $vars['orderby'] ) && 'price' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'price' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -287,7 +287,7 @@ 
         }
 
         // Check if "orderby" is set to "vat_rule"
-        if ( isset( $vars['orderby'] ) && 'vat_rule' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'vat_rule' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -298,7 +298,7 @@ 
         }
 
         // Check if "orderby" is set to "vat_class"
-        if ( isset( $vars['orderby'] ) && 'vat_class' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'vat_class' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -309,7 +309,7 @@ 
         }
         
         // Check if "orderby" is set to "type"
-        if ( isset( $vars['orderby'] ) && 'type' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'type' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -320,7 +320,7 @@ 
         }
         
         // Check if "orderby" is set to "recurring"
-        if ( isset( $vars['orderby'] ) && 'recurring' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'recurring' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -330,120 +330,120 @@ 
             );
         }
 
-        $meta_query = !empty( $vars['meta_query'] ) ? $vars['meta_query'] : array();
+        $meta_query = !empty($vars['meta_query']) ? $vars['meta_query'] : array();
         // Filter vat rule type
-        if ( isset( $_GET['vat_rule'] ) && $_GET['vat_rule'] !== '' ) {
+        if (isset($_GET['vat_rule']) && $_GET['vat_rule'] !== '') {
             $meta_query[] = array(
                     'key'   => '_wpinv_vat_rule',
-                    'value' => sanitize_text_field( $_GET['vat_rule'] ),
+                    'value' => sanitize_text_field($_GET['vat_rule']),
                     'compare' => '='
                 );
         }
         
         // Filter vat class
-        if ( isset( $_GET['vat_class'] ) && $_GET['vat_class'] !== '' ) {
+        if (isset($_GET['vat_class']) && $_GET['vat_class'] !== '') {
             $meta_query[] = array(
                     'key'   => '_wpinv_vat_class',
-                    'value' => sanitize_text_field( $_GET['vat_class'] ),
+                    'value' => sanitize_text_field($_GET['vat_class']),
                     'compare' => '='
                 );
         }
         
         // Filter item type
-        if ( isset( $_GET['type'] ) && $_GET['type'] !== '' ) {
+        if (isset($_GET['type']) && $_GET['type'] !== '') {
             $meta_query[] = array(
                     'key'   => '_wpinv_type',
-                    'value' => sanitize_text_field( $_GET['type'] ),
+                    'value' => sanitize_text_field($_GET['type']),
                     'compare' => '='
                 );
         }
         
-        if ( !empty( $meta_query ) ) {
+        if (!empty($meta_query)) {
             $vars['meta_query'] = $meta_query;
         }
-    } else if ( 'wpi_discount' == $typenow ) {
-        $meta_query = !empty( $vars['meta_query'] ) ? $vars['meta_query'] : array();
+    } else if ('wpi_discount' == $typenow) {
+        $meta_query = !empty($vars['meta_query']) ? $vars['meta_query'] : array();
         // Filter vat rule type
-        if ( isset( $_GET['discount_type'] ) && $_GET['discount_type'] !== '' ) {
+        if (isset($_GET['discount_type']) && $_GET['discount_type'] !== '') {
             $meta_query[] = array(
                     'key'   => '_wpi_discount_type',
-                    'value' => sanitize_text_field( $_GET['discount_type'] ),
+                    'value' => sanitize_text_field($_GET['discount_type']),
                     'compare' => '='
                 );
         }
         
-        if ( !empty( $meta_query ) ) {
+        if (!empty($meta_query)) {
             $vars['meta_query'] = $meta_query;
         }
     }
 
     return $vars;
 }
-add_filter( 'request', 'wpinv_request' );
+add_filter('request', 'wpinv_request');
 
 function wpinv_options_page() {
-    $page       = isset( $_GET['page'] )                ? strtolower( $_GET['page'] )               : false;
+    $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
     
-    if ( $page !== 'wpinv-settings' ) {
+    if ($page !== 'wpinv-settings') {
         return;
     }
     
     $settings_tabs = wpinv_get_settings_tabs();
     $settings_tabs = empty($settings_tabs) ? array() : $settings_tabs;
-    $active_tab    = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $settings_tabs ) ? sanitize_text_field( $_GET['tab'] ) : 'general';
-    $sections      = wpinv_get_settings_tab_sections( $active_tab );
+    $active_tab    = isset($_GET['tab']) && array_key_exists($_GET['tab'], $settings_tabs) ? sanitize_text_field($_GET['tab']) : 'general';
+    $sections      = wpinv_get_settings_tab_sections($active_tab);
     $key           = 'main';
 
-    if ( is_array( $sections ) ) {
-        $key = key( $sections );
+    if (is_array($sections)) {
+        $key = key($sections);
     }
 
-    $registered_sections = wpinv_get_settings_tab_sections( $active_tab );
-    $section             = isset( $_GET['section'] ) && ! empty( $registered_sections ) && array_key_exists( $_GET['section'], $registered_sections ) ? $_GET['section'] : $key;
+    $registered_sections = wpinv_get_settings_tab_sections($active_tab);
+    $section             = isset($_GET['section']) && !empty($registered_sections) && array_key_exists($_GET['section'], $registered_sections) ? $_GET['section'] : $key;
     ob_start();
     ?>
     <div class="wrap">
         <h1 class="nav-tab-wrapper">
             <?php
-            foreach( wpinv_get_settings_tabs() as $tab_id => $tab_name ) {
-                $tab_url = add_query_arg( array(
+            foreach (wpinv_get_settings_tabs() as $tab_id => $tab_name) {
+                $tab_url = add_query_arg(array(
                     'settings-updated' => false,
                     'tab' => $tab_id,
-                ) );
+                ));
 
                 // Remove the section from the tabs so we always end up at the main section
-                $tab_url = remove_query_arg( 'section', $tab_url );
-                $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                $tab_url = remove_query_arg('section', $tab_url);
+                $tab_url = remove_query_arg('wpi_sub', $tab_url);
 
                 $active = $active_tab == $tab_id ? ' nav-tab-active' : '';
 
-                echo '<a href="' . esc_url( $tab_url ) . '" title="' . esc_attr( $tab_name ) . '" class="nav-tab' . $active . '">';
-                    echo esc_html( $tab_name );
+                echo '<a href="' . esc_url($tab_url) . '" title="' . esc_attr($tab_name) . '" class="nav-tab' . $active . '">';
+                    echo esc_html($tab_name);
                 echo '</a>';
             }
             ?>
         </h1>
         <?php
-        $number_of_sections = count( $sections );
+        $number_of_sections = count($sections);
         $number = 0;
-        if ( $number_of_sections > 1 ) {
+        if ($number_of_sections > 1) {
             echo '<div><ul class="subsubsub">';
-            foreach( $sections as $section_id => $section_name ) {
+            foreach ($sections as $section_id => $section_name) {
                 echo '<li>';
                 $number++;
-                $tab_url = add_query_arg( array(
+                $tab_url = add_query_arg(array(
                     'settings-updated' => false,
                     'tab' => $active_tab,
                     'section' => $section_id
-                ) );
-                $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                ));
+                $tab_url = remove_query_arg('wpi_sub', $tab_url);
                 $class = '';
-                if ( $section == $section_id ) {
+                if ($section == $section_id) {
                     $class = 'current';
                 }
-                echo '<a class="' . $class . '" href="' . esc_url( $tab_url ) . '">' . $section_name . '</a>';
+                echo '<a class="' . $class . '" href="' . esc_url($tab_url) . '">' . $section_name . '</a>';
 
-                if ( $number != $number_of_sections ) {
+                if ($number != $number_of_sections) {
                     echo ' | ';
                 }
                 echo '</li>';
@@ -455,19 +455,19 @@ 
             <form method="post" action="options.php">
                 <table class="form-table">
                 <?php
-                settings_fields( 'wpinv_settings' );
+                settings_fields('wpinv_settings');
 
-                if ( 'main' === $section ) {
-                    do_action( 'wpinv_settings_tab_top', $active_tab );
+                if ('main' === $section) {
+                    do_action('wpinv_settings_tab_top', $active_tab);
                 }
 
-                do_action( 'wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section );
-                do_settings_sections( 'wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section );
-                do_action( 'wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section );
+                do_action('wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section);
+                do_settings_sections('wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section);
+                do_action('wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section);
 
                 // For backwards compatibility
-                if ( 'main' === $section ) {
-                    do_action( 'wpinv_settings_tab_bottom', $active_tab );
+                if ('main' === $section) {
+                    do_action('wpinv_settings_tab_bottom', $active_tab);
                 }
                 ?>
                 </table>
@@ -480,53 +480,53 @@ 
     echo $content;
 }
 
-function wpinv_item_type_class( $classes, $class, $post_id ) {
+function wpinv_item_type_class($classes, $class, $post_id) {
     global $pagenow, $typenow;
 
-    if ( $pagenow == 'edit.php' && $typenow == 'wpi_item' && get_post_type( $post_id ) == $typenow ) {
-        if ( $type = get_post_meta( $post_id, '_wpinv_type', true ) ) {
-            $classes[] = 'wpi-type-' . sanitize_html_class( $type );
+    if ($pagenow == 'edit.php' && $typenow == 'wpi_item' && get_post_type($post_id) == $typenow) {
+        if ($type = get_post_meta($post_id, '_wpinv_type', true)) {
+            $classes[] = 'wpi-type-' . sanitize_html_class($type);
         }
         
-        if ( !wpinv_item_is_editable( $post_id ) ) {
+        if (!wpinv_item_is_editable($post_id)) {
             $classes[] = 'wpi-editable-n';
         }
     }
     return $classes;
 }
-add_filter( 'post_class', 'wpinv_item_type_class', 10, 3 );
+add_filter('post_class', 'wpinv_item_type_class', 10, 3);
 
 function wpinv_check_quick_edit() {
     global $pagenow, $current_screen, $wpinv_item_screen;
 
-    if ( $pagenow == 'edit.php' && !empty( $current_screen->post_type ) ) {
-        if ( empty( $wpinv_item_screen ) ) {
-            if ( $current_screen->post_type == 'wpi_item' ) {
+    if ($pagenow == 'edit.php' && !empty($current_screen->post_type)) {
+        if (empty($wpinv_item_screen)) {
+            if ($current_screen->post_type == 'wpi_item') {
                 $wpinv_item_screen = 'y';
             } else {
                 $wpinv_item_screen = 'n';
             }
         }
 
-        if ( $wpinv_item_screen == 'y' && $pagenow == 'edit.php' ) {
-            add_filter( 'post_row_actions', 'wpinv_item_disable_quick_edit', 10, 2 );
-            add_filter( 'page_row_actions', 'wpinv_item_disable_quick_edit', 10, 2 );
+        if ($wpinv_item_screen == 'y' && $pagenow == 'edit.php') {
+            add_filter('post_row_actions', 'wpinv_item_disable_quick_edit', 10, 2);
+            add_filter('page_row_actions', 'wpinv_item_disable_quick_edit', 10, 2);
         }
     }
 }
-add_action( 'admin_head', 'wpinv_check_quick_edit', 10 );
+add_action('admin_head', 'wpinv_check_quick_edit', 10);
 
-function wpinv_item_disable_quick_edit( $actions = array(), $row = null ) {
-    if ( isset( $actions['inline hide-if-no-js'] ) ) {
-        unset( $actions['inline hide-if-no-js'] );
+function wpinv_item_disable_quick_edit($actions = array(), $row = null) {
+    if (isset($actions['inline hide-if-no-js'])) {
+        unset($actions['inline hide-if-no-js']);
     }
     
-    if ( !empty( $row->post_type ) && $row->post_type == 'wpi_item' && !wpinv_item_is_editable( $row ) ) {
-        if ( isset( $actions['trash'] ) ) {
-            unset( $actions['trash'] );
+    if (!empty($row->post_type) && $row->post_type == 'wpi_item' && !wpinv_item_is_editable($row)) {
+        if (isset($actions['trash'])) {
+            unset($actions['trash']);
         }
-        if ( isset( $actions['delete'] ) ) {
-            unset( $actions['delete'] );
+        if (isset($actions['delete'])) {
+            unset($actions['delete']);
         }
     }
 
@@ -543,19 +543,19 @@ 
  * @param int $post_parent (default: 0) Parent for the new page
  * @return int page ID
  */
-function wpinv_create_page( $slug, $option = '', $page_title = '', $page_content = '', $post_parent = 0 ) {
+function wpinv_create_page($slug, $option = '', $page_title = '', $page_content = '', $post_parent = 0) {
     global $wpdb;
 
-    $option_value = wpinv_get_option( $option );
+    $option_value = wpinv_get_option($option);
 
-    if ( $option_value > 0 && ( $page_object = get_post( $option_value ) ) ) {
-        if ( 'page' === $page_object->post_type && ! in_array( $page_object->post_status, array( 'pending', 'trash', 'future', 'auto-draft' ) ) ) {
+    if ($option_value > 0 && ($page_object = get_post($option_value))) {
+        if ('page' === $page_object->post_type && !in_array($page_object->post_status, array('pending', 'trash', 'future', 'auto-draft'))) {
             // Valid page is already in place
             return $page_object->ID;
         }
     }
 
-    if(!empty($post_parent)){
+    if (!empty($post_parent)) {
         $page = get_page_by_path($post_parent);
         if ($page) {
             $post_parent = $page->ID;
@@ -564,40 +564,40 @@ 
         }
     }
 
-    if ( strlen( $page_content ) > 0 ) {
+    if (strlen($page_content) > 0) {
         // Search for an existing page with the specified page content (typically a shortcode)
-        $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_content LIKE %s LIMIT 1;", "%{$page_content}%" ) );
+        $valid_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_content LIKE %s LIMIT 1;", "%{$page_content}%"));
     } else {
         // Search for an existing page with the specified page slug
-        $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' )  AND post_name = %s LIMIT 1;", $slug ) );
+        $valid_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' )  AND post_name = %s LIMIT 1;", $slug));
     }
 
-    $valid_page_found = apply_filters( 'wpinv_create_page_id', $valid_page_found, $slug, $page_content );
+    $valid_page_found = apply_filters('wpinv_create_page_id', $valid_page_found, $slug, $page_content);
 
-    if ( $valid_page_found ) {
-        if ( $option ) {
-            wpinv_update_option( $option, $valid_page_found );
+    if ($valid_page_found) {
+        if ($option) {
+            wpinv_update_option($option, $valid_page_found);
         }
         return $valid_page_found;
     }
 
     // Search for a matching valid trashed page
-    if ( strlen( $page_content ) > 0 ) {
+    if (strlen($page_content) > 0) {
         // Search for an existing page with the specified page content (typically a shortcode)
-        $trashed_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_content LIKE %s LIMIT 1;", "%{$page_content}%" ) );
+        $trashed_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_content LIKE %s LIMIT 1;", "%{$page_content}%"));
     } else {
         // Search for an existing page with the specified page slug
-        $trashed_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_name = %s LIMIT 1;", $slug ) );
+        $trashed_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_name = %s LIMIT 1;", $slug));
     }
 
-    if ( $trashed_page_found ) {
+    if ($trashed_page_found) {
         $page_id   = $trashed_page_found;
         $page_data = array(
             'ID'             => $page_id,
             'post_status'    => 'publish',
             'post_parent'    => $post_parent,
         );
-        wp_update_post( $page_data );
+        wp_update_post($page_data);
     } else {
         $page_data = array(
             'post_status'    => 'publish',
@@ -609,11 +609,11 @@ 
             'post_parent'    => $post_parent,
             'comment_status' => 'closed',
         );
-        $page_id = wp_insert_post( $page_data );
+        $page_id = wp_insert_post($page_data);
     }
 
-    if ( $option ) {
-        wpinv_update_option( $option, (int)$page_id );
+    if ($option) {
+        wpinv_update_option($option, (int)$page_id);
     }
 
     return $page_id;

includes/admin/class-wpinv-subscriptions-list-table.php

Spacing +83 added lines, -83 removed lines

@@ -8,11 +8,11 @@ 
 
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 
 // Load WP_List_Table if not loaded
-if( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
@@ -35,7 +35,7 @@ 
 	public $pending_count   = 0;
 	public $expired_count   = 0;
 	public $completed_count = 0;
-	public $trialling_count  = 0;
+	public $trialling_count = 0;
 	public $cancelled_count = 0;
 	public $failing_count   = 0;
 
@@ -46,15 +46,15 @@ 
 	 * @since       1.0.0
 	 * @return      void
 	 */
-	function __construct(){
+	function __construct() {
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
+		parent::__construct(array(
 			'singular'  => 'subscription',
 			'plural'    => 'subscriptions',
 			'ajax'      => false
-		) );
+		));
 
 		$this->get_subscription_counts();
 
@@ -69,28 +69,28 @@ 
 	 */
 	public function get_views() {
 
-		$current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
-		$total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
+		$current         = isset($_GET['status']) ? $_GET['status'] : '';
+		$total_count     = '&nbsp;<span class="count">(' . $this->total_count . ')</span>';
 		$active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
 		$pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
-		$expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
+		$expired_count   = '&nbsp;<span class="count">(' . $this->expired_count . ')</span>';
 		$completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
-		$trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
-		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
-		$failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
+		$trialling_count = '&nbsp;<span class="count">(' . $this->trialling_count . ')</span>';
+		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count . ')</span>';
+		$failing_count   = '&nbsp;<span class="count">(' . $this->failing_count . ')</span>';
 
 		$views = array(
-			'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
-			'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
-			'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
-			'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
-			'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
-			'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
-			'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
-			'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
+			'all'       => sprintf('<a href="%s"%s>%s</a>', remove_query_arg(array('status', 'paged')), $current === 'all' || $current == '' ? ' class="current"' : '', __('All', 'invoicing') . $total_count),
+			'active'    => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'active', 'paged' => FALSE)), $current === 'active' ? ' class="current"' : '', __('Active', 'invoicing') . $active_count),
+			'pending'   => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'pending', 'paged' => FALSE)), $current === 'pending' ? ' class="current"' : '', __('Pending', 'invoicing') . $pending_count),
+			'expired'   => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'expired', 'paged' => FALSE)), $current === 'expired' ? ' class="current"' : '', __('Expired', 'invoicing') . $expired_count),
+			'completed' => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'completed', 'paged' => FALSE)), $current === 'completed' ? ' class="current"' : '', __('Completed', 'invoicing') . $completed_count),
+			'trialling'  => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'trialling', 'paged' => FALSE)), $current === 'trialling' ? ' class="current"' : '', __('Trialling', 'invoicing') . $trialling_count),
+			'cancelled' => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'cancelled', 'paged' => FALSE)), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled', 'invoicing') . $cancelled_count),
+			'failing'   => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'failing', 'paged' => FALSE)), $current === 'failing' ? ' class="current"' : '', __('Failing', 'invoicing') . $failing_count),
 		);
 
-		return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
+		return apply_filters('wpinv_recurring_subscriptions_table_views', $views);
 	}
 
 	/**
@@ -104,27 +104,27 @@ 
 	 *
 	 * @return void
 	 */
-	public function search_box( $text, $input_id ) {
+	public function search_box($text, $input_id) {
 
-		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+		if (empty($_REQUEST['s']) && !$this->has_items()) {
 			return;
 		}
 
 		$input_id = $input_id . '-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		if (!empty($_REQUEST['orderby'])) {
+			echo '<input type="hidden" name="orderby" value="' . esc_attr($_REQUEST['orderby']) . '" />';
 		}
 
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		if (!empty($_REQUEST['order'])) {
+			echo '<input type="hidden" name="order" value="' . esc_attr($_REQUEST['order']) . '" />';
 		}
 ?>
 		<p class="search-box">
-			<?php do_action( 'wpinv_recurring_subscription_search_box' ); ?>
+			<?php do_action('wpinv_recurring_subscription_search_box'); ?>
 			<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 			<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-			<?php submit_button( $text, 'button', false, false, array('ID' => 'search-submit') ); ?><br/>
+			<?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?><br/>
 		</p>
 <?php
 	}
@@ -136,7 +136,7 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_default( $item, $column_name ) {
+	function column_default($item, $column_name) {
 		return $item->$column_name;
 	}
 
@@ -147,8 +147,8 @@ 
      * @since       1.0.0
      * @return      string
      */
-    function column_sub_id( $item ) {
-        return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" target="_blank">' . $item->id . '</a>';
+    function column_sub_id($item) {
+        return '<a href="' . esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . $item->id)) . '" target="_blank">' . $item->id . '</a>';
     }
 
 	/**
@@ -158,11 +158,11 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_customer_id( $item ) {
-		$subscriber = get_userdata( $item->customer_id );
-		$customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
+	function column_customer_id($item) {
+		$subscriber = get_userdata($item->customer_id);
+		$customer   = !empty($subscriber->display_name) ? $subscriber->display_name : $subscriber->user_email;
 
-		return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
+		return '<a href="' . esc_url(get_edit_user_link($item->customer_id)) . '" target="_blank">' . $customer . '</a>';
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_status( $item ) {
+	function column_status($item) {
 		return $item->get_status_label();
 	}
 
@@ -183,11 +183,11 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_period( $item ) {
+	function column_period($item) {
 
-		$period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
+		$period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency($item->period, $item->frequency);
 
-		return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
+		return wpinv_price(wpinv_format_amount($item->recurring_amount), wpinv_get_invoice_currency_code($item->parent_payment_id)) . ' / ' . $period;
 	}
 
 	/**
@@ -197,8 +197,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_bill_times( $item ) {
-		return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? 'Until Cancelled' : $item->bill_times );
+	function column_bill_times($item) {
+		return $item->get_times_billed() . ' / ' . (($item->bill_times == 0) ? 'Until Cancelled' : $item->bill_times);
 	}
 
 	/**
@@ -208,8 +208,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_initial_amount( $item ) {
-		return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
+	function column_initial_amount($item) {
+		return wpinv_price(wpinv_format_amount($item->initial_amount), wpinv_get_invoice_currency_code($item->parent_payment_id));
 	}
 
 	/**
@@ -219,8 +219,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_renewal_date( $item ) {
-		return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
+	function column_renewal_date($item) {
+		return $renewal_date = !empty($item->expiration) ? date_i18n(get_option('date_format'), strtotime($item->expiration)) : __('N/A', 'invoicing');
 	}
 
 	/**
@@ -230,8 +230,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_parent_payment_id( $item ) {
-		return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . wpinv_get_invoice_number( $item->parent_payment_id ) . '</a>';
+	function column_parent_payment_id($item) {
+		return '<a href="' . get_edit_post_link($item->parent_payment_id) . '" target="_blank">' . wpinv_get_invoice_number($item->parent_payment_id) . '</a>';
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_product_id( $item ) {
-		return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
+	function column_product_id($item) {
+		return '<a href="' . esc_url(admin_url('post.php?action=edit&post=' . $item->product_id)) . '" target="_blank">' . get_the_title($item->product_id) . '</a>';
 	}
 
 	/**
@@ -252,8 +252,8 @@ 
 	 * @since       2.0
 	 * @return      string
 	 */
-	function column_actions( $item ) {
-		return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
+	function column_actions($item) {
+		return '<a href="' . esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . $item->id)) . '" title="' . esc_attr(__('View or edit subscription', 'invoicing')) . '" target="_blank">' . __('View', 'invoicing') . '</a>';
 	}
 
 
@@ -265,21 +265,21 @@ 
 	 * @return      array
 	 */
 
-	function get_columns(){
+	function get_columns() {
 		$columns = array(
-			'sub_id'            => __( 'ID', 'invoicing' ),
-			'customer_id'       => __( 'Customer', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
-			'period'            => __( 'Billing Cycle', 'invoicing' ),
-			'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
-			'bill_times'        => __( 'Times Billed', 'invoicing' ),
-			'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
-			'parent_payment_id' => __( 'Invoice', 'invoicing' ),
-			'product_id'        => __( 'Item', 'invoicing' ),
-			'actions'           => __( 'Actions', 'invoicing' ),
+			'sub_id'            => __('ID', 'invoicing'),
+			'customer_id'       => __('Customer', 'invoicing'),
+			'status'            => __('Status', 'invoicing'),
+			'period'            => __('Billing Cycle', 'invoicing'),
+			'initial_amount'    => __('Initial Amount', 'invoicing'),
+			'bill_times'        => __('Times Billed', 'invoicing'),
+			'renewal_date'      => __('Renewal Date', 'invoicing'),
+			'parent_payment_id' => __('Invoice', 'invoicing'),
+			'product_id'        => __('Item', 'invoicing'),
+			'actions'           => __('Actions', 'invoicing'),
 		);
 
-		return apply_filters( 'wpinv_report_subscription_columns', $columns );
+		return apply_filters('wpinv_report_subscription_columns', $columns);
 	}
 
 	/**
@@ -290,7 +290,7 @@ 
 	 * @return      int
 	 */
 	function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -306,16 +306,16 @@ 
 
 		$db = new WPInv_Subscriptions_DB;
 
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+		$search = !empty($_GET['s']) ? sanitize_text_field($_GET['s']) : '';
 
 		$this->total_count     = $db->count();
-		$this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
-		$this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
-		$this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
-		$this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
-		$this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
-		$this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
-		$this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
+		$this->active_count    = $db->count(array('status' => 'active', 'search' => $search));
+		$this->pending_count   = $db->count(array('status' => 'pending', 'search' => $search));
+		$this->expired_count   = $db->count(array('status' => 'expired', 'search' => $search));
+		$this->trialling_count = $db->count(array('status' => 'trialling', 'search' => $search));
+		$this->cancelled_count = $db->count(array('status' => 'cancelled', 'search' => $search));
+		$this->completed_count = $db->count(array('status' => 'completed', 'search' => $search));
+		$this->failing_count   = $db->count(array('status' => 'failing', 'search' => $search));
 
 	}
 
@@ -336,28 +336,28 @@ 
 
 		$columns  = $this->get_columns();
 		$hidden   = array(); // No hidden columns
-		$status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
+		$status   = isset($_GET['status']) ? $_GET['status'] : 'any';
 		$sortable = $this->get_sortable_columns();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$current_page = $this->get_pagenum();
 
 		$db     = new WPInv_Subscriptions_DB;
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+		$search = !empty($_GET['s']) ? sanitize_text_field($_GET['s']) : '';
 		$args   = array(
 			'number' => $this->per_page,
-			'offset' => $this->per_page * ( $this->get_paged() - 1 ),
+			'offset' => $this->per_page * ($this->get_paged() - 1),
 			'search' => $search
 		);
 
-		if ( 'any' !== $status ) {
+		if ('any' !== $status) {
 			$args['status'] = $status;
 		}
 
-		$this->items = $db->get_subscriptions( $args );
+		$this->items = $db->get_subscriptions($args);
 
-		switch ( $status ) {
+		switch ($status) {
 			case 'active':
 				$total_items = $this->active_count;
 				break;
@@ -385,10 +385,10 @@ 
 				break;
 		}
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $total_items / $this->per_page )
-		) );
+			'total_pages' => ceil($total_items / $this->per_page)
+		));
 	}
 }

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/class-wpinv-bp-core.php

Spacing +122 added lines, -122 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -11,60 +11,60 @@ 
     public function __construct() {
         global $bp;
         
-        if ( !defined( 'WPINV_BP_SLUG' ) ) {
-            define( 'WPINV_BP_SLUG', 'invoices' );
+        if (!defined('WPINV_BP_SLUG')) {
+            define('WPINV_BP_SLUG', 'invoices');
         }
         
-        $position       = wpinv_get_option( 'wpinv_menu_position' );
+        $position       = wpinv_get_option('wpinv_menu_position');
         $position       = $position !== '' && $position !== false ? $position : 91;
-        $this->position = apply_filters( 'wpinv_bp_nav_position', $position );
+        $this->position = apply_filters('wpinv_bp_nav_position', $position);
         $this->slug     = WPINV_BP_SLUG;
         
         parent::start(
             'invoicing',
-            _x( 'Invoices', 'Invoices screen page <title>', 'invoicing' ),
-            trailingslashit( dirname( __FILE__ ) ),
+            _x('Invoices', 'Invoices screen page <title>', 'invoicing'),
+            trailingslashit(dirname(__FILE__)),
             array(
                 'adminbar_myaccount_order' => $this->position
             )
         );
     }
     
-    public function includes( $includes = array() ) {
-        parent::includes( $includes );
+    public function includes($includes = array()) {
+        parent::includes($includes);
     }
     
-    public function setup_globals( $args = array() ) {
+    public function setup_globals($args = array()) {
         global $bp;
 
         $args = array(
             'slug' => $this->slug,
         );
 
-        parent::setup_globals( $args );
+        parent::setup_globals($args);
     }
     
-    public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-        if ( !bp_is_my_profile() ) {
+    public function setup_nav($main_nav = array(), $sub_nav = array()) {
+        if (!bp_is_my_profile()) {
             return;
         }
         
-        if ( wpinv_get_option( 'wpinv_bp_hide_menu' ) ) {
+        if (wpinv_get_option('wpinv_bp_hide_menu')) {
             return;
         }
         
         $this->setup_invoice_count();
 
         $user_domain    = bp_loggedin_user_domain();
-        $invoices_link  = trailingslashit( $user_domain . $this->slug );
-        $class          = ( 0 === $this->count ) ? 'no-count' : 'count';
+        $invoices_link  = trailingslashit($user_domain . $this->slug);
+        $class          = (0 === $this->count) ? 'no-count' : 'count';
 
         $main_nav_name = sprintf(
-            __( 'My Invoices %s', 'invoicing' ),
+            __('My Invoices %s', 'invoicing'),
             sprintf(
                 '<span class="%s">%s</span>',
-                esc_attr( $class ),
-                bp_core_number_format( $this->count )
+                esc_attr($class),
+                bp_core_number_format($this->count)
             )
         );
 
@@ -72,54 +72,54 @@ 
             'name'                => $main_nav_name,
             'slug'                => $this->slug,
             'position'            => $this->position,
-            'screen_function'     => array( $this, 'invoices_screen' ),
+            'screen_function'     => array($this, 'invoices_screen'),
             'default_subnav_slug' => 'invoices',
             'item_css_id'         => $this->id
         );
         
         $sub_nav[] = array(
-            'name'            => _x( 'My Invoices', 'Invoices screen sub nav', 'invoicing' ),
+            'name'            => _x('My Invoices', 'Invoices screen sub nav', 'invoicing'),
             'slug'            => 'invoices',
             'parent_url'      => $invoices_link,
             'parent_slug'     => $this->slug,
-            'screen_function' => array( $this, 'invoices_screen' ),
+            'screen_function' => array($this, 'invoices_screen'),
             'position'        => 10,
             'item_css_id'     => 'invoices-my-invoices'
         );
 
-        parent::setup_nav( $main_nav, $sub_nav );
+        parent::setup_nav($main_nav, $sub_nav);
     }
     
     public function setup_title() {
         // Adjust title.
-        if ( (bool)bp_is_current_component( 'invoicing' ) ) {
+        if ((bool)bp_is_current_component('invoicing')) {
             global $bp;
             
-            $bp->bp_options_title = __( 'My Invoices', 'invoicing' );
+            $bp->bp_options_title = __('My Invoices', 'invoicing');
         }
 
         parent::setup_title();
     }
     
     public function invoices_screen() {
-        if ( wpinv_get_option( 'wpinv_bp_hide_menu' ) ) {
+        if (wpinv_get_option('wpinv_bp_hide_menu')) {
             return;
         }
         
         global $bp;
         
-        add_action( 'bp_template_content', array( $this, 'invoices_content' ) );
+        add_action('bp_template_content', array($this, 'invoices_content'));
 
-        $template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
+        $template = apply_filters('bp_core_template_plugin', 'members/single/plugins');
         
-        bp_core_load_template( apply_filters( 'wpinv_bp_core_template_plugin', $template ) );
+        bp_core_load_template(apply_filters('wpinv_bp_core_template_plugin', $template));
     }
     
     public function invoices_content() {
-        if ( $this->has_invoices( bp_ajax_querystring( 'invoices' ) ) ) {
+        if ($this->has_invoices(bp_ajax_querystring('invoices'))) {
             global $invoices_template;
             
-            do_action( 'wpinv_bp_invoices_before_content' );
+            do_action('wpinv_bp_invoices_before_content');
             ?>
             <div class="wpi-bp-invoices invoices invoicing" style="position:relative">
                 <div id="pag-top" class="pagination">
@@ -133,61 +133,61 @@ 
                 <table class="table table-bordered table-hover wpi-user-invoices" style="margin:0">
                     <thead>
                         <tr>
-                            <?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-                                <th class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>"><span class="nobr"><?php echo esc_html( $column_name['title'] ); ?></span></th>
+                            <?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+                                <th class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>"><span class="nobr"><?php echo esc_html($column_name['title']); ?></span></th>
                             <?php endforeach; ?>
                         </tr>
                     </thead>
                     <tbody>
-                        <?php foreach ( $invoices_template->invoices as $invoice ) {
+                        <?php foreach ($invoices_template->invoices as $invoice) {
                             ?>
                             <tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
-                                <?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-                                    <td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>">
-                                        <?php if ( has_action( 'wpinv_user_invoices_column_' . $column_id ) ) : ?>
-                                            <?php do_action( 'wpinv_user_invoices_column_' . $column_id, $invoice ); ?>
-
-                                        <?php elseif ( 'invoice-number' === $column_id ) : ?>
-                                            <a href="<?php echo esc_url( $invoice->get_view_url() ); ?>">
-                                                <?php echo _x( '#', 'hash before invoice number', 'invoicing' ) . $invoice->get_number(); ?>
+                                <?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+                                    <td class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>" data-title="<?php echo esc_attr($column_name['title']); ?>">
+                                        <?php if (has_action('wpinv_user_invoices_column_' . $column_id)) : ?>
+                                            <?php do_action('wpinv_user_invoices_column_' . $column_id, $invoice); ?>
+
+                                        <?php elseif ('invoice-number' === $column_id) : ?>
+                                            <a href="<?php echo esc_url($invoice->get_view_url()); ?>">
+                                                <?php echo _x('#', 'hash before invoice number', 'invoicing') . $invoice->get_number(); ?>
                                             </a>
 
-                                        <?php elseif ( 'created-date' === $column_id ) : $date = wpinv_get_date_created( $invoice->ID ); $dateYMD = wpinv_get_date_created( $invoice->ID, 'Y-m-d H:i:s' ); ?>
-                                            <time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+                                        <?php elseif ('created-date' === $column_id) : $date = wpinv_get_date_created($invoice->ID); $dateYMD = wpinv_get_date_created($invoice->ID, 'Y-m-d H:i:s'); ?>
+                                            <time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
 
-                                        <?php elseif ( 'payment-date' === $column_id ) : $date = wpinv_get_invoice_date( $invoice->ID, '', false ); $dateYMD = wpinv_get_invoice_date( $invoice->ID, 'Y-m-d H:i:s', false ); ?>
-                                            <time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+                                        <?php elseif ('payment-date' === $column_id) : $date = wpinv_get_invoice_date($invoice->ID, '', false); $dateYMD = wpinv_get_invoice_date($invoice->ID, 'Y-m-d H:i:s', false); ?>
+                                            <time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
 
-                                        <?php elseif ( 'invoice-status' === $column_id ) : ?>
-                                            <?php echo wpinv_invoice_status_label( $invoice_status, $invoice->get_status( true ) ) ; ?>
+                                        <?php elseif ('invoice-status' === $column_id) : ?>
+                                            <?php echo wpinv_invoice_status_label($invoice_status, $invoice->get_status(true)); ?>
 
-                                        <?php elseif ( 'invoice-total' === $column_id ) : ?>
-                                            <?php echo $invoice->get_total( true ); ?>
+                                        <?php elseif ('invoice-total' === $column_id) : ?>
+                                            <?php echo $invoice->get_total(true); ?>
 
-                                        <?php elseif ( 'invoice-actions' === $column_id ) : ?>
+                                        <?php elseif ('invoice-actions' === $column_id) : ?>
                                             <?php
                                                 $actions = array(
                                                     'pay'    => array(
                                                         'url'  => $invoice->get_checkout_payment_url(),
-                                                        'name' => __( 'Pay Now', 'invoicing' ),
+                                                        'name' => __('Pay Now', 'invoicing'),
                                                         'class' => 'btn-success'
                                                     ),
                                                     'print'   => array(
                                                         'url'  => $invoice->get_view_url(),
-                                                        'name' => __( 'Print', 'invoicing' ),
+                                                        'name' => __('Print', 'invoicing'),
                                                         'class' => 'btn-primary',
                                                         'attrs' => 'target="_blank"'
                                                     )
                                                 );
 
-                                                if ( ! $invoice->needs_payment() ) {
-                                                    unset( $actions['pay'] );
+                                                if (!$invoice->needs_payment()) {
+                                                    unset($actions['pay']);
                                                 }
 
-                                                if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
-                                                    foreach ( $actions as $key => $action ) {
+                                                if ($actions = apply_filters('wpinv_user_invoices_actions', $actions, $invoice)) {
+                                                    foreach ($actions as $key => $action) {
                                                         $class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
-                                                        echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
+                                                        echo '<a href="' . esc_url($action['url']) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class($key) . '" ' . (!empty($action['attrs']) ? $action['attrs'] : '') . '>' . $action['name'] . '</a>';
                                                     }
                                                 }
                                             ?>
@@ -215,64 +215,64 @@ 
             </div>
             <?php
         
-            do_action( 'wpinv_bp_invoices_after_content' );
+            do_action('wpinv_bp_invoices_after_content');
         } else {
             ?>
             <div id="message" class="info">
-                <p><?php _e( 'No invoice has been made yet.', 'invoicing' ); ?></p>
+                <p><?php _e('No invoice has been made yet.', 'invoicing'); ?></p>
             </div>
             <?php
         }
         
-        if ( defined( 'DOING_AJAX' ) ) {
+        if (defined('DOING_AJAX')) {
             exit;
         }
     }
     
-    public function has_invoices( $args = '' ) {
+    public function has_invoices($args = '') {
         global $invoices_template;
 
-        $per_page = absint( wpinv_get_option( 'wpinv_bp_per_page' ) );
+        $per_page = absint(wpinv_get_option('wpinv_bp_per_page'));
         // Parse arguments.
-        $r = bp_parse_args( $args, array(
+        $r = bp_parse_args($args, array(
             'status'            => 'all',
             'page_arg'          => 'bpage',
             'page'              => 1,
             'per_page'          => $per_page > 0 ? $per_page : 20,
             'max'               => false,
             'user_id'           => bp_loggedin_user_id(),
-        ), 'has_invoices' );
+        ), 'has_invoices');
 
 
-        if ( ! empty( $r['max'] ) && ( (int)$r['per_page'] > (int)$r['max'] ) ) {
+        if (!empty($r['max']) && ((int)$r['per_page'] > (int)$r['max'])) {
             $r['per_page'] = (int)$r['max'];
         }
 
         // Get the invoices.
-        $invoices_template = new WPInv_BP_Invoices_Template( $r['status'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['page_arg'] );
+        $invoices_template = new WPInv_BP_Invoices_Template($r['status'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['page_arg']);
 
-        return apply_filters( 'wpinv_bp_has_invoices', $invoices_template->has_invoices(), $invoices_template, $r );
+        return apply_filters('wpinv_bp_has_invoices', $invoices_template->has_invoices(), $invoices_template, $r);
     }
     
     public function setup_invoice_count() {
-        $query      = apply_filters( 'wpinv_user_invoices_count_query', array( 'user' => bp_loggedin_user_id(), 'limit' => '-1', 'return' => 'ids', 'paginate' => false ) );
-        $invoices   = wpinv_get_invoices( $query );
+        $query      = apply_filters('wpinv_user_invoices_count_query', array('user' => bp_loggedin_user_id(), 'limit' => '-1', 'return' => 'ids', 'paginate' => false));
+        $invoices   = wpinv_get_invoices($query);
         
-        $this->count = !empty( $invoices ) ? count( $invoices ) : 0;
+        $this->count = !empty($invoices) ? count($invoices) : 0;
     }
     
     public function pagination_count() {
         global $invoices_template;
 
-        $start_num = intval( ( $invoices_template->pag_page - 1 ) * $invoices_template->pag_num ) + 1;
-        $from_num  = bp_core_number_format( $start_num );
-        $to_num    = bp_core_number_format( ( $start_num + ( $invoices_template->pag_num - 1 ) > $invoices_template->total_invoice_count ) ? $invoices_template->total_invoice_count : $start_num + ( $invoices_template->pag_num - 1 ) );
-        $total     = bp_core_number_format( $invoices_template->total_invoice_count );
+        $start_num = intval(($invoices_template->pag_page - 1) * $invoices_template->pag_num) + 1;
+        $from_num  = bp_core_number_format($start_num);
+        $to_num    = bp_core_number_format(($start_num + ($invoices_template->pag_num - 1) > $invoices_template->total_invoice_count) ? $invoices_template->total_invoice_count : $start_num + ($invoices_template->pag_num - 1));
+        $total     = bp_core_number_format($invoices_template->total_invoice_count);
 
-        if ( 1 == $invoices_template->total_invoice_count ) {
-            $message = __( 'Viewing 1 invoice', 'invoicing' );
+        if (1 == $invoices_template->total_invoice_count) {
+            $message = __('Viewing 1 invoice', 'invoicing');
         } else {
-            $message = sprintf( _n( 'Viewing %1$s - %2$s of %3$s invoice', 'Viewing %1$s - %2$s of %3$s invoices', $invoices_template->total_invoice_count, 'invoicing' ), $from_num, $to_num, $total );
+            $message = sprintf(_n('Viewing %1$s - %2$s of %3$s invoice', 'Viewing %1$s - %2$s of %3$s invoices', $invoices_template->total_invoice_count, 'invoicing'), $from_num, $to_num, $total);
         }
 
         return $message;
@@ -281,32 +281,32 @@ 
     function pagination_links() {
         global $invoices_template;
 
-        return apply_filters( 'wpinv_bp_get_pagination_links', $invoices_template->pag_links );
+        return apply_filters('wpinv_bp_get_pagination_links', $invoices_template->pag_links);
     }
     
-    public function bp_section( $settings = array() ) {
-        $settings['wpinv_bp'] = __( 'BuddyPress Integration', 'invoicing' );
+    public function bp_section($settings = array()) {
+        $settings['wpinv_bp'] = __('BuddyPress Integration', 'invoicing');
         return $settings;
     }
     
-    public function bp_settings( $settings = array() ) {
+    public function bp_settings($settings = array()) {
         $settings['wpinv_bp'] = array(
             'wpinv_bp_labels' => array(
                 'id'   => 'wpinv_bp_settings',
-                'name' => '<h3>' . __( 'BuddyPress Integration', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('BuddyPress Integration', 'invoicing') . '</h3>',
                 'desc' => '',
                 'type' => 'header',
             ),
             'wpinv_bp_hide_menu' => array(
                 'id'   => 'wpinv_bp_hide_menu',
-                'name' => __( 'Hide Invoices link', 'invoicing' ),
-                'desc' => __( 'Hide Invoices link from BP Profile menu.', 'invoicing' ),
+                'name' => __('Hide Invoices link', 'invoicing'),
+                'desc' => __('Hide Invoices link from BP Profile menu.', 'invoicing'),
                 'type' => 'checkbox',
             ),
             'wpinv_menu_position' => array(
                 'id'   => 'wpinv_menu_position',
-                'name' => __( 'Menu position', 'invoicing' ),
-                'desc' => __( 'Menu position for the Invoices link in BP Profile menu.', 'invoicing' ),
+                'name' => __('Menu position', 'invoicing'),
+                'desc' => __('Menu position for the Invoices link in BP Profile menu.', 'invoicing'),
                 'type' => 'number',
                 'size' => 'small',
                 'min'  => '1',
@@ -316,8 +316,8 @@ 
             ),
             'wpinv_bp_per_page' => array(
                 'id'   => 'wpinv_bp_per_page',
-                'name' => __( 'Max invoices per page', 'invoicing' ),
-                'desc' => __( 'Enter a number to lists the invoices for each page.', 'invoicing' ),
+                'name' => __('Max invoices per page', 'invoicing'),
+                'desc' => __('Enter a number to lists the invoices for each page.', 'invoicing'),
                 'type' => 'number',
                 'size' => 'small',
                 'min'  => '1',
@@ -342,25 +342,25 @@ 
     public $pag_links = '';
     public $total_invoice_count = 0;
     
-    public function __construct( $status, $page, $per_page, $max, $user_id, $page_arg = 'bpage' ) {
-        $this->invoices = array( 'invoices' => array(), 'total' => 0 );
+    public function __construct($status, $page, $per_page, $max, $user_id, $page_arg = 'bpage') {
+        $this->invoices = array('invoices' => array(), 'total' => 0);
         
-        $this->pag_arg  = sanitize_key( $page_arg );
-        $this->pag_page = bp_sanitize_pagination_arg( $this->pag_arg, $page );
-        $this->pag_num  = bp_sanitize_pagination_arg( 'num', $per_page );
+        $this->pag_arg  = sanitize_key($page_arg);
+        $this->pag_page = bp_sanitize_pagination_arg($this->pag_arg, $page);
+        $this->pag_num  = bp_sanitize_pagination_arg('num', $per_page);
 
-        $query_args     = array( 'user' => $user_id, 'page' => $this->pag_page, 'limit' => $this->pag_num, 'return' => 'self', 'paginate' => true );
-        if ( !empty( $status ) && $status != 'all' ) {
+        $query_args     = array('user' => $user_id, 'page' => $this->pag_page, 'limit' => $this->pag_num, 'return' => 'self', 'paginate' => true);
+        if (!empty($status) && $status != 'all') {
            $query_args['status'] = $status;
         }
-        $invoices  = wpinv_get_invoices( apply_filters( 'wpinv_bp_user_invoices_query', $query_args ) );
+        $invoices = wpinv_get_invoices(apply_filters('wpinv_bp_user_invoices_query', $query_args));
         
-        if ( !empty( $invoices ) && !empty( $invoices->found_posts ) ) {
-            $this->invoices['invoices'] = array_map( 'wpinv_get_invoice', $invoices->posts );
+        if (!empty($invoices) && !empty($invoices->found_posts)) {
+            $this->invoices['invoices'] = array_map('wpinv_get_invoice', $invoices->posts);
             $this->invoices['total']    = $invoices->found_posts;
         }
 
-        if ( empty( $max ) || ( $max >= (int)$this->invoices['total'] ) ) {
+        if (empty($max) || ($max >= (int)$this->invoices['total'])) {
             $this->total_invoice_count = (int)$this->invoices['total'];
         } else {
             $this->total_invoice_count = (int)$max;
@@ -368,52 +368,52 @@ 
 
         $this->invoices = $this->invoices['invoices'];
 
-        $invoice_count = count( $this->invoices );
+        $invoice_count = count($this->invoices);
 
-        if ( empty( $max ) || ( $max >= (int)$invoice_count ) ) {
+        if (empty($max) || ($max >= (int)$invoice_count)) {
             $this->invoice_count = (int)$invoice_count;
         } else {
             $this->invoice_count = (int)$max;
         }
         
-        if ( ! empty( $this->total_invoice_count ) && ! empty( $this->pag_num ) ) {
-            $this->pag_links = paginate_links( array(
-                'base'      => add_query_arg( $this->pag_arg, '%#%' ),
+        if (!empty($this->total_invoice_count) && !empty($this->pag_num)) {
+            $this->pag_links = paginate_links(array(
+                'base'      => add_query_arg($this->pag_arg, '%#%'),
                 'format'    => '',
-                'total'     => ceil( (int)$this->total_invoice_count / (int)$this->pag_num ),
+                'total'     => ceil((int)$this->total_invoice_count / (int)$this->pag_num),
                 'current'   => (int)$this->pag_page,
-                'prev_text' => _x( '&larr;', 'Invoice pagination previous text', 'invoicing' ),
-                'next_text' => _x( '&rarr;', 'Invoice pagination next text',     'invoicing' ),
+                'prev_text' => _x('&larr;', 'Invoice pagination previous text', 'invoicing'),
+                'next_text' => _x('&rarr;', 'Invoice pagination next text', 'invoicing'),
                 'mid_size'  => 1,
                 'add_args'  => array(),
-            ) );
+            ));
         }
     }
 
     public function has_invoices() {
-        return (bool) ! empty( $this->invoice_count );
+        return (bool)!empty($this->invoice_count);
     }
 
     public function next_invoice() {
         $this->current_invoice++;
-        $this->invoice = $this->invoices[ $this->current_invoice ];
+        $this->invoice = $this->invoices[$this->current_invoice];
 
         return $this->invoice;
     }
 
     public function rewind_invoices() {
         $this->current_invoice = -1;
-        if ( $this->invoice_count > 0 ) {
+        if ($this->invoice_count > 0) {
             $this->invoice = $this->invoices[0];
         }
     }
 
     public function invoices() {
-        if ( ( $this->current_invoice + 1 ) < $this->invoice_count ) {
+        if (($this->current_invoice + 1) < $this->invoice_count) {
             return true;
-        } elseif ( ( $this->current_invoice + 1 ) === $this->invoice_count ) {
+        } elseif (($this->current_invoice + 1) === $this->invoice_count) {
 
-            do_action( 'wpinv_bp_invoice_loop_end' );
+            do_action('wpinv_bp_invoice_loop_end');
             
             $this->rewind_invoices();
         }
@@ -427,8 +427,8 @@ 
         $this->in_the_loop = true;
         $this->invoice     = $this->next_invoice();
 
-        if ( 0 === $this->current_invoice ) {
-            do_action( 'wpinv_bp_invoice_loop_start' );
+        if (0 === $this->current_invoice) {
+            do_action('wpinv_bp_invoice_loop_start');
         }
     }
 }
@@ -438,9 +438,9 @@ 
 
     $bp->invoicing = new WPInv_BP_Component();
     
-    add_action( 'wp_ajax_invoicing_filter', array( $bp->invoicing, 'invoices_content' ) );
-    add_action( 'wp_ajax_nopriv_invoicing_filter', array( $bp->invoicing, 'invoices_content' ) );
-    add_filter( 'wpinv_settings_sections_general', array( $bp->invoicing, 'bp_section' ), 10, 1 );
-    add_filter( 'wpinv_settings_general', array( $bp->invoicing, 'bp_settings' ), 10, 1 );
+    add_action('wp_ajax_invoicing_filter', array($bp->invoicing, 'invoices_content'));
+    add_action('wp_ajax_nopriv_invoicing_filter', array($bp->invoicing, 'invoices_content'));
+    add_filter('wpinv_settings_sections_general', array($bp->invoicing, 'bp_section'), 10, 1);
+    add_filter('wpinv_settings_general', array($bp->invoicing, 'bp_settings'), 10, 1);
 }
-add_action( 'bp_loaded', 'wpinv_bp_setup_component' );
\ No newline at end of file
+add_action('bp_loaded', 'wpinv_bp_setup_component');
\ No newline at end of file

includes/class-wpinv-ajax.php

Spacing +238 added lines, -238 removed lines

@@ -7,28 +7,28 @@ 
  */
  
 // 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_Ajax {
     public static function init() {
-        add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
-        add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
+        add_action('init', array(__CLASS__, 'define_ajax'), 0);
+        add_action('template_redirect', array(__CLASS__, 'do_wpinv_ajax'), 0);
         self::add_ajax_events();
     }
 
     public static function define_ajax() {
-        if ( !empty( $_GET['wpinv-ajax'] ) ) {
-            if ( ! defined( 'DOING_AJAX' ) ) {
-                define( 'DOING_AJAX', true );
+        if (!empty($_GET['wpinv-ajax'])) {
+            if (!defined('DOING_AJAX')) {
+                define('DOING_AJAX', true);
             }
-            if ( ! defined( 'WC_DOING_AJAX' ) ) {
-                define( 'WC_DOING_AJAX', true );
+            if (!defined('WC_DOING_AJAX')) {
+                define('WC_DOING_AJAX', true);
             }
             // Turn off display_errors during AJAX events to prevent malformed JSON
-            if ( ! WP_DEBUG || ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
-                @ini_set( 'display_errors', 0 );
+            if (!WP_DEBUG || (WP_DEBUG && !WP_DEBUG_DISPLAY)) {
+                @ini_set('display_errors', 0);
             }
             $GLOBALS['wpdb']->hide_errors();
         }
@@ -37,24 +37,24 @@ 
     public static function do_wpinv_ajax() {
         global $wp_query;
 
-        if ( !empty( $_GET['wpinv-ajax'] ) ) {
-            $wp_query->set( 'wpinv-ajax', sanitize_text_field( $_GET['wpinv-ajax'] ) );
+        if (!empty($_GET['wpinv-ajax'])) {
+            $wp_query->set('wpinv-ajax', sanitize_text_field($_GET['wpinv-ajax']));
         }
 
-        if ( $action = $wp_query->get( 'wpinv-ajax' ) ) {
+        if ($action = $wp_query->get('wpinv-ajax')) {
             self::wpinv_ajax_headers();
-            do_action( 'wpinv_ajax_' . sanitize_text_field( $action ) );
+            do_action('wpinv_ajax_' . sanitize_text_field($action));
             die();
         }
     }
     
     private static function wpinv_ajax_headers() {
         send_origin_headers();
-        @header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-        @header( 'X-Robots-Tag: noindex' );
+        @header('Content-Type: text/html; charset=' . get_option('blog_charset'));
+        @header('X-Robots-Tag: noindex');
         send_nosniff_header();
         nocache_headers();
-        status_header( 200 );
+        status_header(200);
     }
     
     public static function add_ajax_events() {
@@ -77,39 +77,39 @@ 
             'buy_items' => true,
         );
 
-        foreach ( $ajax_events as $ajax_event => $nopriv ) {
-            add_action( 'wp_ajax_wpinv_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+        foreach ($ajax_events as $ajax_event => $nopriv) {
+            add_action('wp_ajax_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
             
-            if ( !defined( 'WPI_AJAX_' . strtoupper( $nopriv ) ) ) {
-                define( 'WPI_AJAX_' . strtoupper( $nopriv ), 1 );
+            if (!defined('WPI_AJAX_' . strtoupper($nopriv))) {
+                define('WPI_AJAX_' . strtoupper($nopriv), 1);
             }
 
-            if ( $nopriv ) {
-                add_action( 'wp_ajax_nopriv_wpinv_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+            if ($nopriv) {
+                add_action('wp_ajax_nopriv_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
 
-                add_action( 'wpinv_ajax_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+                add_action('wpinv_ajax_' . $ajax_event, array(__CLASS__, $ajax_event));
             }
         }
     }
     
     public static function add_note() {
-        check_ajax_referer( 'add-invoice-note', '_nonce' );
+        check_ajax_referer('add-invoice-note', '_nonce');
 
-        if ( !current_user_can( 'manage_options' ) ) {
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
 
-        $post_id   = absint( $_POST['post_id'] );
-        $note      = wp_kses_post( trim( stripslashes( $_POST['note'] ) ) );
-        $note_type = sanitize_text_field( $_POST['note_type'] );
+        $post_id   = absint($_POST['post_id']);
+        $note      = wp_kses_post(trim(stripslashes($_POST['note'])));
+        $note_type = sanitize_text_field($_POST['note_type']);
 
         $is_customer_note = $note_type == 'customer' ? 1 : 0;
 
-        if ( $post_id > 0 ) {
-            $note_id = wpinv_insert_payment_note( $post_id, $note, $is_customer_note );
+        if ($post_id > 0) {
+            $note_id = wpinv_insert_payment_note($post_id, $note, $is_customer_note);
 
-            if ( $note_id > 0 && !is_wp_error( $note_id ) ) {
-                wpinv_get_invoice_note_line_item( $note_id );
+            if ($note_id > 0 && !is_wp_error($note_id)) {
+                wpinv_get_invoice_note_line_item($note_id);
             }
         }
 
@@ -117,16 +117,16 @@ 
     }
 
     public static function delete_note() {
-        check_ajax_referer( 'delete-invoice-note', '_nonce' );
+        check_ajax_referer('delete-invoice-note', '_nonce');
 
-        if ( !current_user_can( 'manage_options' ) ) {
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
 
         $note_id = (int)$_POST['note_id'];
 
-        if ( $note_id > 0 ) {
-            wp_delete_comment( $note_id, true );
+        if ($note_id > 0) {
+            wp_delete_comment($note_id, true);
         }
 
         die();
@@ -139,8 +139,8 @@ 
     }
     
     public static function checkout() {
-        if ( ! defined( 'WPINV_CHECKOUT' ) ) {
-            define( 'WPINV_CHECKOUT', true );
+        if (!defined('WPINV_CHECKOUT')) {
+            define('WPINV_CHECKOUT', true);
         }
 
         wpinv_process_checkout();
@@ -149,53 +149,53 @@ 
     
     public static function add_invoice_item() {
         global $wpi_userID, $wpinv_ip_address_country;
-        check_ajax_referer( 'invoice-item', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('invoice-item', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $item_id    = sanitize_text_field( $_POST['item_id'] );
-        $invoice_id = absint( $_POST['invoice_id'] );
+        $item_id    = sanitize_text_field($_POST['item_id']);
+        $invoice_id = absint($_POST['invoice_id']);
         
-        if ( !is_numeric( $invoice_id ) || !is_numeric( $item_id ) ) {
+        if (!is_numeric($invoice_id) || !is_numeric($item_id)) {
             die();
         }
         
-        $invoice    = wpinv_get_invoice( $invoice_id );
-        if ( empty( $invoice ) ) {
+        $invoice = wpinv_get_invoice($invoice_id);
+        if (empty($invoice)) {
             die();
         }
         
-        if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+        if ($invoice->is_paid() || $invoice->is_refunded()) {
             die(); // Don't allow modify items for paid invoice.
         }
         
-        if ( !empty( $_POST['user_id'] ) ) {
-            $wpi_userID = absint( $_POST['user_id'] ); 
+        if (!empty($_POST['user_id'])) {
+            $wpi_userID = absint($_POST['user_id']); 
         }
 
-        $item = new WPInv_Item( $item_id );
-        if ( !( !empty( $item ) && $item->post_type == 'wpi_item' ) ) {
+        $item = new WPInv_Item($item_id);
+        if (!(!empty($item) && $item->post_type == 'wpi_item')) {
             die();
         }
         
         // Validate item before adding to invoice because recurring item must be paid individually.
-        if ( !empty( $invoice->cart_details ) ) {
+        if (!empty($invoice->cart_details)) {
             $valid = true;
             
-            if ( $recurring_item = $invoice->get_recurring() ) {
-                if ( $recurring_item != $item_id ) {
+            if ($recurring_item = $invoice->get_recurring()) {
+                if ($recurring_item != $item_id) {
                     $valid = false;
                 }
-            } else if ( wpinv_is_recurring_item( $item_id ) ) {
+            } else if (wpinv_is_recurring_item($item_id)) {
                 $valid = false;
             }
             
-            if ( !$valid ) {
+            if (!$valid) {
                 $response               = array();
                 $response['success']    = false;
-                $response['msg']        = __( 'You can not add item because recurring item must be paid individually!', 'invoicing' );
-                wp_send_json( $response );
+                $response['msg']        = __('You can not add item because recurring item must be paid individually!', 'invoicing');
+                wp_send_json($response);
             }
         }
         
@@ -203,9 +203,9 @@ 
         
         $data                   = array();
         $data['invoice_id']     = $invoice_id;
-        $data['cart_discounts'] = $invoice->get_discounts( true );
+        $data['cart_discounts'] = $invoice->get_discounts(true);
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
         
         $quantity = wpinv_item_quantities_enabled() && !empty($_POST['qty']) && (int)$_POST['qty'] > 0 ? (int)$_POST['qty'] : 1;
 
@@ -220,21 +220,21 @@ 
             'fees'          => array()
         );
 
-        $invoice->add_item( $item_id, $args );
+        $invoice->add_item($item_id, $args);
         $invoice->save();
         
-        if ( empty( $_POST['country'] ) ) {
+        if (empty($_POST['country'])) {
             $_POST['country'] = !empty($invoice->country) ? $invoice->country : wpinv_get_default_country();
         }
-        if ( empty( $_POST['state'] ) ) {
+        if (empty($_POST['state'])) {
             $_POST['state'] = $invoice->state;
         }
          
-        $invoice->country   = sanitize_text_field( $_POST['country'] );
-        $invoice->state     = sanitize_text_field( $_POST['state'] );
+        $invoice->country   = sanitize_text_field($_POST['country']);
+        $invoice->state     = sanitize_text_field($_POST['state']);
         
-        $invoice->set( 'country', sanitize_text_field( $_POST['country'] ) );
-        $invoice->set( 'state', sanitize_text_field( $_POST['state'] ) );
+        $invoice->set('country', sanitize_text_field($_POST['country']));
+        $invoice->set('state', sanitize_text_field($_POST['state']));
         
         $wpinv_ip_address_country = $invoice->country;
 
@@ -242,7 +242,7 @@ 
         
         $response                       = array();
         $response['success']            = true;
-        $response['data']['items']      = wpinv_admin_get_line_items( $invoice );
+        $response['data']['items']      = wpinv_admin_get_line_items($invoice);
         $response['data']['subtotal']   = $invoice->get_subtotal();
         $response['data']['subtotalf']  = $invoice->get_subtotal(true);
         $response['data']['tax']        = $invoice->get_tax();
@@ -254,40 +254,40 @@ 
         
         wpinv_set_checkout_session($checkout_session);
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function remove_invoice_item() {
         global $wpi_userID, $wpinv_ip_address_country;
         
-        check_ajax_referer( 'invoice-item', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('invoice-item', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $item_id    = sanitize_text_field( $_POST['item_id'] );
-        $invoice_id = absint( $_POST['invoice_id'] );
-        $cart_index = isset( $_POST['index'] ) && $_POST['index'] >= 0 ? $_POST['index'] : false;
+        $item_id    = sanitize_text_field($_POST['item_id']);
+        $invoice_id = absint($_POST['invoice_id']);
+        $cart_index = isset($_POST['index']) && $_POST['index'] >= 0 ? $_POST['index'] : false;
         
-        if ( !is_numeric( $invoice_id ) || !is_numeric( $item_id ) ) {
+        if (!is_numeric($invoice_id) || !is_numeric($item_id)) {
             die();
         }
 
-        $invoice    = wpinv_get_invoice( $invoice_id );
-        if ( empty( $invoice ) ) {
+        $invoice = wpinv_get_invoice($invoice_id);
+        if (empty($invoice)) {
             die();
         }
         
-        if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+        if ($invoice->is_paid() || $invoice->is_refunded()) {
             die(); // Don't allow modify items for paid invoice.
         }
         
-        if ( !empty( $_POST['user_id'] ) ) {
-            $wpi_userID = absint( $_POST['user_id'] ); 
+        if (!empty($_POST['user_id'])) {
+            $wpi_userID = absint($_POST['user_id']); 
         }
 
-        $item       = new WPInv_Item( $item_id );
-        if ( !( !empty( $item ) && $item->post_type == 'wpi_item' ) ) {
+        $item = new WPInv_Item($item_id);
+        if (!(!empty($item) && $item->post_type == 'wpi_item')) {
             die();
         }
         
@@ -295,9 +295,9 @@ 
         
         $data                   = array();
         $data['invoice_id']     = $invoice_id;
-        $data['cart_discounts'] = $invoice->get_discounts( true );
+        $data['cart_discounts'] = $invoice->get_discounts(true);
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
 
         $args = array(
             'id'         => $item_id,
@@ -305,21 +305,21 @@ 
             'cart_index' => $cart_index
         );
 
-        $invoice->remove_item( $item_id, $args );
+        $invoice->remove_item($item_id, $args);
         $invoice->save();
         
-        if ( empty( $_POST['country'] ) ) {
+        if (empty($_POST['country'])) {
             $_POST['country'] = !empty($invoice->country) ? $invoice->country : wpinv_get_default_country();
         }
-        if ( empty( $_POST['state'] ) ) {
+        if (empty($_POST['state'])) {
             $_POST['state'] = $invoice->state;
         }
          
-        $invoice->country   = sanitize_text_field( $_POST['country'] );
-        $invoice->state     = sanitize_text_field( $_POST['state'] );
+        $invoice->country   = sanitize_text_field($_POST['country']);
+        $invoice->state     = sanitize_text_field($_POST['state']);
         
-        $invoice->set( 'country', sanitize_text_field( $_POST['country'] ) );
-        $invoice->set( 'state', sanitize_text_field( $_POST['state'] ) );
+        $invoice->set('country', sanitize_text_field($_POST['country']));
+        $invoice->set('state', sanitize_text_field($_POST['state']));
         
         $wpinv_ip_address_country = $invoice->country;
         
@@ -327,7 +327,7 @@ 
         
         $response                       = array();
         $response['success']            = true;
-        $response['data']['items']      = wpinv_admin_get_line_items( $invoice );
+        $response['data']['items']      = wpinv_admin_get_line_items($invoice);
         $response['data']['subtotal']   = $invoice->get_subtotal();
         $response['data']['subtotalf']  = $invoice->get_subtotal(true);
         $response['data']['tax']        = $invoice->get_tax();
@@ -339,40 +339,40 @@ 
         
         wpinv_set_checkout_session($checkout_session);
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function create_invoice_item() {
-        check_ajax_referer( 'invoice-item', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('invoice-item', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $invoice_id = absint( $_POST['invoice_id'] );
+        $invoice_id = absint($_POST['invoice_id']);
 
         // Find the item
-        if ( !is_numeric( $invoice_id ) ) {
+        if (!is_numeric($invoice_id)) {
             die();
         }        
         
-        $invoice     = wpinv_get_invoice( $invoice_id );
-        if ( empty( $invoice ) ) {
+        $invoice = wpinv_get_invoice($invoice_id);
+        if (empty($invoice)) {
             die();
         }
         
         // Validate item before adding to invoice because recurring item must be paid individually.
-        if ( !empty( $invoice->cart_details ) && $invoice->get_recurring() ) {
+        if (!empty($invoice->cart_details) && $invoice->get_recurring()) {
             $response               = array();
             $response['success']    = false;
-            $response['msg']        = __( 'You can not add item because recurring item must be paid individually!', 'invoicing' );
-            wp_send_json( $response );
+            $response['msg']        = __('You can not add item because recurring item must be paid individually!', 'invoicing');
+            wp_send_json($response);
         }        
         
         $save_item = $_POST['_wpinv_quick'];
         
         $meta               = array();
         $meta['type']       = !empty($save_item['type']) ? sanitize_text_field($save_item['type']) : 'custom';
-        $meta['price']      = !empty($save_item['price']) ? wpinv_sanitize_amount( $save_item['price'] ) : 0;
+        $meta['price']      = !empty($save_item['price']) ? wpinv_sanitize_amount($save_item['price']) : 0;
         $meta['vat_rule']   = !empty($save_item['vat_rule']) ? sanitize_text_field($save_item['vat_rule']) : 'digital';
         $meta['vat_class']  = !empty($save_item['vat_class']) ? sanitize_text_field($save_item['vat_class']) : '_standard';
         
@@ -382,9 +382,9 @@ 
         $data['meta']           = $meta;
         
         $item = new WPInv_Item();
-        $item->create( $data );
+        $item->create($data);
         
-        if ( !empty( $item ) ) {
+        if (!empty($item)) {
             $_POST['item_id']   = $item->ID;
             $_POST['qty']       = !empty($save_item['qty']) && $save_item['qty'] > 0 ? (int)$save_item['qty'] : 1;
             
@@ -394,15 +394,15 @@ 
     }
     
     public static function get_billing_details() {
-        check_ajax_referer( 'get-billing-details', '_nonce' );
+        check_ajax_referer('get-billing-details', '_nonce');
         
-        if ( !current_user_can( 'manage_options' ) ) {
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
 
         $user_id            = (int)$_POST['user_id'];
         $billing_details    = wpinv_get_user_address($user_id);
-        $billing_details    = apply_filters( 'wpinv_fill_billing_details', $billing_details, $user_id );
+        $billing_details    = apply_filters('wpinv_fill_billing_details', $billing_details, $user_id);
         
         if (isset($billing_details['user_id'])) {
             unset($billing_details['user_id']);
@@ -416,20 +416,20 @@ 
         $response['success']                    = true;
         $response['data']['billing_details']    = $billing_details;
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function admin_recalculate_totals() {
         global $wpi_userID, $wpinv_ip_address_country;
         
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $invoice_id = absint( $_POST['invoice_id'] );        
-        $invoice    = wpinv_get_invoice( $invoice_id );
-        if ( empty( $invoice ) ) {
+        $invoice_id = absint($_POST['invoice_id']);        
+        $invoice    = wpinv_get_invoice($invoice_id);
+        if (empty($invoice)) {
             die();
         }
         
@@ -437,23 +437,23 @@ 
         
         $data                   = array();
         $data['invoice_id']     = $invoice_id;
-        $data['cart_discounts'] = $invoice->get_discounts( true );
+        $data['cart_discounts'] = $invoice->get_discounts(true);
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
         
-        if ( !empty( $_POST['user_id'] ) ) {
-            $wpi_userID = absint( $_POST['user_id'] ); 
+        if (!empty($_POST['user_id'])) {
+            $wpi_userID = absint($_POST['user_id']); 
         }
         
-        if ( empty( $_POST['country'] ) ) {
+        if (empty($_POST['country'])) {
             $_POST['country'] = !empty($invoice->country) ? $invoice->country : wpinv_get_default_country();
         }
             
-        $invoice->country = sanitize_text_field( $_POST['country'] );
-        $invoice->set( 'country', sanitize_text_field( $_POST['country'] ) );
-        if ( isset( $_POST['state'] ) ) {
-            $invoice->state = sanitize_text_field( $_POST['state'] );
-            $invoice->set( 'state', sanitize_text_field( $_POST['state'] ) );
+        $invoice->country = sanitize_text_field($_POST['country']);
+        $invoice->set('country', sanitize_text_field($_POST['country']));
+        if (isset($_POST['state'])) {
+            $invoice->state = sanitize_text_field($_POST['state']);
+            $invoice->set('state', sanitize_text_field($_POST['state']));
         }
         
         $wpinv_ip_address_country = $invoice->country;
@@ -462,7 +462,7 @@ 
         
         $response                       = array();
         $response['success']            = true;
-        $response['data']['items']      = wpinv_admin_get_line_items( $invoice );
+        $response['data']['items']      = wpinv_admin_get_line_items($invoice);
         $response['data']['subtotal']   = $invoice->get_subtotal();
         $response['data']['subtotalf']  = $invoice->get_subtotal(true);
         $response['data']['tax']        = $invoice->get_tax();
@@ -474,25 +474,25 @@ 
         
         wpinv_set_checkout_session($checkout_session);
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function admin_apply_discount() {
         global $wpi_userID;
         
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $invoice_id = absint( $_POST['invoice_id'] );
-        $discount_code = sanitize_text_field( $_POST['code'] );
-        if ( empty( $invoice_id ) || empty( $discount_code ) ) {
+        $invoice_id = absint($_POST['invoice_id']);
+        $discount_code = sanitize_text_field($_POST['code']);
+        if (empty($invoice_id) || empty($discount_code)) {
             die();
         }
         
-        $invoice = wpinv_get_invoice( $invoice_id );
-        if ( empty( $invoice ) || ( !empty( $invoice ) && ( $invoice->is_paid() || $invoice->is_refunded() ) ) ) {
+        $invoice = wpinv_get_invoice($invoice_id);
+        if (empty($invoice) || (!empty($invoice) && ($invoice->is_paid() || $invoice->is_refunded()))) {
             die();
         }
         
@@ -500,49 +500,49 @@ 
         
         $data                   = array();
         $data['invoice_id']     = $invoice_id;
-        $data['cart_discounts'] = $invoice->get_discounts( true );
+        $data['cart_discounts'] = $invoice->get_discounts(true);
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
         
         $response               = array();
         $response['success']    = false;
-        $response['msg']        = __( 'This discount is invalid.', 'invoicing' );
+        $response['msg']        = __('This discount is invalid.', 'invoicing');
         $response['data']['code'] = $discount_code;
         
-        if ( wpinv_is_discount_valid( $discount_code, $invoice->get_user_id() ) ) {
-            $discounts = wpinv_set_cart_discount( $discount_code );
+        if (wpinv_is_discount_valid($discount_code, $invoice->get_user_id())) {
+            $discounts = wpinv_set_cart_discount($discount_code);
             
             $response['success'] = true;
-            $response['msg'] = __( 'Discount has been applied successfully.', 'invoicing' );
-        }  else {
+            $response['msg'] = __('Discount has been applied successfully.', 'invoicing');
+        } else {
             $errors = wpinv_get_errors();
-            if ( !empty( $errors['wpinv-discount-error'] ) ) {
+            if (!empty($errors['wpinv-discount-error'])) {
                 $response['msg'] = $errors['wpinv-discount-error'];
             }
-            wpinv_unset_error( 'wpinv-discount-error' );
+            wpinv_unset_error('wpinv-discount-error');
         }
         
         wpinv_set_checkout_session($checkout_session);
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function admin_remove_discount() {
         global $wpi_userID;
         
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $invoice_id = absint( $_POST['invoice_id'] );
-        $discount_code = sanitize_text_field( $_POST['code'] );
-        if ( empty( $invoice_id ) || empty( $discount_code ) ) {
+        $invoice_id = absint($_POST['invoice_id']);
+        $discount_code = sanitize_text_field($_POST['code']);
+        if (empty($invoice_id) || empty($discount_code)) {
             die();
         }
         
-        $invoice = wpinv_get_invoice( $invoice_id );
-        if ( empty( $invoice ) || ( !empty( $invoice ) && ( $invoice->is_paid() || $invoice->is_refunded() ) ) ) {
+        $invoice = wpinv_get_invoice($invoice_id);
+        if (empty($invoice) || (!empty($invoice) && ($invoice->is_paid() || $invoice->is_refunded()))) {
             die();
         }
         
@@ -550,38 +550,38 @@ 
         
         $data                   = array();
         $data['invoice_id']     = $invoice_id;
-        $data['cart_discounts'] = $invoice->get_discounts( true );
+        $data['cart_discounts'] = $invoice->get_discounts(true);
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
         
         $response               = array();
         $response['success']    = false;
         $response['msg']        = NULL;
         
-        $discounts  = wpinv_unset_cart_discount( $discount_code );
+        $discounts = wpinv_unset_cart_discount($discount_code);
         $response['success'] = true;
-        $response['msg'] = __( 'Discount has been removed successfully.', 'invoicing' );
+        $response['msg'] = __('Discount has been removed successfully.', 'invoicing');
         
         wpinv_set_checkout_session($checkout_session);
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function check_email() {
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $email = sanitize_text_field( $_POST['email'] );
+        $email = sanitize_text_field($_POST['email']);
         
         $response = array();
-        if ( is_email( $email ) && email_exists( $email ) && $user_data = get_user_by( 'email', $email ) ) {
+        if (is_email($email) && email_exists($email) && $user_data = get_user_by('email', $email)) {
             $user_id            = $user_data->ID;
             $user_login         = $user_data->user_login;
             $display_name       = $user_data->display_name ? $user_data->display_name : $user_login;
             $billing_details    = wpinv_get_user_address($user_id);
-            $billing_details    = apply_filters( 'wpinv_fill_billing_details', $billing_details, $user_id );
+            $billing_details    = apply_filters('wpinv_fill_billing_details', $billing_details, $user_id);
             
             if (isset($billing_details['user_id'])) {
                 unset($billing_details['user_id']);
@@ -597,54 +597,54 @@ 
             $response['data']['billing_details']    = $billing_details;
         }
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function run_tool() {
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $tool = sanitize_text_field( $_POST['tool'] );
+        $tool = sanitize_text_field($_POST['tool']);
         
-        do_action( 'wpinv_run_tool' );
+        do_action('wpinv_run_tool');
         
-        if ( !empty( $tool ) ) {
-            do_action( 'wpinv_tool_' . $tool );
+        if (!empty($tool)) {
+            do_action('wpinv_tool_' . $tool);
         }
     }
     
     public static function apply_discount() {
         global $wpi_userID;
         
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
+        check_ajax_referer('wpinv-nonce', '_nonce');
         
         $response = array();
         
-        if ( isset( $_POST['code'] ) ) {
-            $discount_code = sanitize_text_field( $_POST['code'] );
+        if (isset($_POST['code'])) {
+            $discount_code = sanitize_text_field($_POST['code']);
 
             $response['success']        = false;
             $response['msg']            = '';
             $response['data']['code']   = $discount_code;
             
             $invoice = wpinv_get_invoice_cart();
-            if ( empty( $invoice->ID ) ) {
-                $response['msg'] = __( 'Invalid checkout request.', 'invoicing' );
-                wp_send_json( $response );
+            if (empty($invoice->ID)) {
+                $response['msg'] = __('Invalid checkout request.', 'invoicing');
+                wp_send_json($response);
             }
 
             $wpi_userID = $invoice->get_user_id();
 
-            if ( wpinv_is_discount_valid( $discount_code, $wpi_userID ) ) {
-                $discount       = wpinv_get_discount_by_code( $discount_code );
-                $discounts      = wpinv_set_cart_discount( $discount_code );
-                $amount         = wpinv_format_discount_rate( wpinv_get_discount_type( $discount->ID ), wpinv_get_discount_amount( $discount->ID ) );
-                $total          = wpinv_get_cart_total( null, $discounts );
-                $cart_totals    = wpinv_recalculate_tax( true );
+            if (wpinv_is_discount_valid($discount_code, $wpi_userID)) {
+                $discount       = wpinv_get_discount_by_code($discount_code);
+                $discounts      = wpinv_set_cart_discount($discount_code);
+                $amount         = wpinv_format_discount_rate(wpinv_get_discount_type($discount->ID), wpinv_get_discount_amount($discount->ID));
+                $total          = wpinv_get_cart_total(null, $discounts);
+                $cart_totals    = wpinv_recalculate_tax(true);
             
-                if ( !empty( $cart_totals ) ) {
+                if (!empty($cart_totals)) {
                     $response['success']        = true;
                     $response['data']           = $cart_totals;
                     $response['data']['code']   = $discount_code;
@@ -653,29 +653,29 @@ 
                 }
             } else {
                 $errors = wpinv_get_errors();
-                $response['msg']  = $errors['wpinv-discount-error'];
-                wpinv_unset_error( 'wpinv-discount-error' );
+                $response['msg'] = $errors['wpinv-discount-error'];
+                wpinv_unset_error('wpinv-discount-error');
             }
 
             // Allow for custom discount code handling
-            $response = apply_filters( 'wpinv_ajax_discount_response', $response );
+            $response = apply_filters('wpinv_ajax_discount_response', $response);
         }
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function remove_discount() {
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
+        check_ajax_referer('wpinv-nonce', '_nonce');
         
         $response = array();
         
-        if ( isset( $_POST['code'] ) ) {
-            $discount_code  = sanitize_text_field( $_POST['code'] );
-            $discounts      = wpinv_unset_cart_discount( $discount_code );
-            $total          = wpinv_get_cart_total( null, $discounts );
-            $cart_totals    = wpinv_recalculate_tax( true );
+        if (isset($_POST['code'])) {
+            $discount_code  = sanitize_text_field($_POST['code']);
+            $discounts      = wpinv_unset_cart_discount($discount_code);
+            $total          = wpinv_get_cart_total(null, $discounts);
+            $cart_totals    = wpinv_recalculate_tax(true);
             
-            if ( !empty( $cart_totals ) ) {
+            if (!empty($cart_totals)) {
                 $response['success']        = true;
                 $response['data']           = $cart_totals;
                 $response['data']['code']   = $discount_code;
@@ -684,10 +684,10 @@ 
             }
             
             // Allow for custom discount code handling
-            $response = apply_filters( 'wpinv_ajax_discount_response', $response );
+            $response = apply_filters('wpinv_ajax_discount_response', $response);
         }
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
 
 
@@ -699,53 +699,53 @@ 
     public static function buy_items() {
         $user_id = get_current_user_id();
 
-        if ( empty( $user_id ) ) { // If not logged in then lets redirect to the login page
-            wp_send_json( array(
-                'success' => wp_login_url( wp_get_referer() )
-            ) );
+        if (empty($user_id)) { // If not logged in then lets redirect to the login page
+            wp_send_json(array(
+                'success' => wp_login_url(wp_get_referer())
+            ));
         } else {
             // Only check nonce if logged in as it could be cached when logged out.
-            if ( ! isset( $_POST['wpinv_buy_nonce'] ) || ! wp_verify_nonce( $_POST['wpinv_buy_nonce'], 'wpinv_buy_items' ) ) {
-                wp_send_json( array(
-                    'error' => __( 'Security checks failed.', 'invoicing' )
-                ) );
+            if (!isset($_POST['wpinv_buy_nonce']) || !wp_verify_nonce($_POST['wpinv_buy_nonce'], 'wpinv_buy_items')) {
+                wp_send_json(array(
+                    'error' => __('Security checks failed.', 'invoicing')
+                ));
                 wp_die();
             }
 
             // allow to set a custom price through post_id
             $items = $_POST['items'];
-            $related_post_id = isset( $_POST['post_id'] ) ? (int)$_POST['post_id'] : 0;
-            $custom_item_price = $related_post_id ? abs( get_post_meta( $related_post_id, '_wpi_custom_price', true ) ) : 0;
+            $related_post_id = isset($_POST['post_id']) ? (int)$_POST['post_id'] : 0;
+            $custom_item_price = $related_post_id ? abs(get_post_meta($related_post_id, '_wpi_custom_price', true)) : 0;
 
             $cart_items = array();
-            if ( $items ) {
-                $items = explode( ',', $items );
+            if ($items) {
+                $items = explode(',', $items);
 
-                foreach( $items as $item ) {
+                foreach ($items as $item) {
                     $item_id = $item;
                     $quantity = 1;
 
-                    if ( strpos( $item, '|' ) !== false ) {
-                        $item_parts = explode( '|', $item );
+                    if (strpos($item, '|') !== false) {
+                        $item_parts = explode('|', $item);
                         $item_id = $item_parts[0];
                         $quantity = $item_parts[1];
                     }
 
-                    if ( $item_id && $quantity ) {
+                    if ($item_id && $quantity) {
                         $cart_items_arr = array(
                             'id'            => (int)$item_id,
                             'quantity'      => (int)$quantity
                         );
 
                         // If there is a related post id then add it to meta
-                        if ( $related_post_id ) {
+                        if ($related_post_id) {
                             $cart_items_arr['meta'] = array(
                                 'post_id'   => $related_post_id
                             );
                         }
 
                         // If there is a custom price then set it.
-                        if ( $custom_item_price ) {
+                        if ($custom_item_price) {
                             $cart_items_arr['custom_price'] = $custom_item_price;
                         }
 
@@ -761,37 +761,37 @@ 
              * @param int $related_post_id The related post id if any.
              * @since 1.0.0
              */
-            $cart_items = apply_filters( 'wpinv_buy_cart_items', $cart_items, $related_post_id );
+            $cart_items = apply_filters('wpinv_buy_cart_items', $cart_items, $related_post_id);
 
             // Make sure its not in the cart already, if it is then redirect to checkout.
             $cart_invoice = wpinv_get_invoice_cart();
 
-            if ( isset( $cart_invoice->items ) && !empty( $cart_invoice->items ) && !empty( $cart_items ) && serialize( $cart_invoice->items ) == serialize( $cart_items ) ) {
-                wp_send_json( array(
+            if (isset($cart_invoice->items) && !empty($cart_invoice->items) && !empty($cart_items) && serialize($cart_invoice->items) == serialize($cart_items)) {
+                wp_send_json(array(
                     'success' =>  $cart_invoice->get_checkout_payment_url()
-                ) );
+                ));
                 wp_die();
             }
 
             // Check if user has invoice with same items waiting to be paid.
-            $user_invoices = wpinv_get_users_invoices( $user_id , 10 , false , 'wpi-pending' );
-            if ( !empty( $user_invoices ) ) {
-                foreach( $user_invoices as $user_invoice ) {
+            $user_invoices = wpinv_get_users_invoices($user_id, 10, false, 'wpi-pending');
+            if (!empty($user_invoices)) {
+                foreach ($user_invoices as $user_invoice) {
                     $user_cart_details = array();
-                    $invoice  = wpinv_get_invoice( $user_invoice->ID );
+                    $invoice = wpinv_get_invoice($user_invoice->ID);
                     $cart_details = $invoice->get_cart_details();
 
-                    if ( !empty( $cart_details ) ) {
-                        foreach ( $cart_details as $invoice_item ) {
+                    if (!empty($cart_details)) {
+                        foreach ($cart_details as $invoice_item) {
                             $ii_arr = array();
                             $ii_arr['id'] = (int)$invoice_item['id'];
                             $ii_arr['quantity'] = (int)$invoice_item['quantity'];
 
-                            if (isset( $invoice_item['meta'] ) && !empty( $invoice_item['meta'] ) ) {
+                            if (isset($invoice_item['meta']) && !empty($invoice_item['meta'])) {
                                 $ii_arr['meta'] = $invoice_item['meta'];
                             }
 
-                            if ( isset( $invoice_item['custom_price'] ) && !empty( $invoice_item['custom_price'] ) ) {
+                            if (isset($invoice_item['custom_price']) && !empty($invoice_item['custom_price'])) {
                                 $ii_arr['custom_price'] = $invoice_item['custom_price'];
                             }
 
@@ -799,17 +799,17 @@ 
                         }
                     }
 
-                    if ( !empty( $user_cart_details ) && serialize( $cart_items ) == serialize( $user_cart_details ) ) {
-                        wp_send_json( array(
+                    if (!empty($user_cart_details) && serialize($cart_items) == serialize($user_cart_details)) {
+                        wp_send_json(array(
                             'success' =>  $invoice->get_checkout_payment_url()
-                        ) );
+                        ));
                         wp_die();
                     }
                 }
             }
 
             // Create invoice and send user to checkout
-            if ( !empty( $cart_items ) ) {
+            if (!empty($cart_items)) {
                 $invoice_data = array(
                     'status'        =>  'wpi-pending',
                     'created_via'   =>  'wpi',
@@ -817,21 +817,21 @@ 
                     'cart_details'  =>  $cart_items,
                 );
 
-                $invoice = wpinv_insert_invoice( $invoice_data, true );
+                $invoice = wpinv_insert_invoice($invoice_data, true);
 
-                if ( !empty( $invoice ) && isset( $invoice->ID ) ) {
-                    wp_send_json( array(
+                if (!empty($invoice) && isset($invoice->ID)) {
+                    wp_send_json(array(
                         'success' =>  $invoice->get_checkout_payment_url()
-                    ) );
+                    ));
                 } else {
-                    wp_send_json( array(
-                        'error' => __( 'Invoice failed to create', 'invoicing' )
-                    ) );
+                    wp_send_json(array(
+                        'error' => __('Invoice failed to create', 'invoicing')
+                    ));
                 }
             } else {
-                wp_send_json( array(
-                    'error' => __( 'Items not valid.', 'invoicing' )
-                ) );
+                wp_send_json(array(
+                    'error' => __('Items not valid.', 'invoicing')
+                ));
             }
         }
 

templates/emails/wpinv-email-cancelled_invoice.php

Spacing +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
-if ( ! empty( $message_body ) ) {
-    echo wpautop( wptexturize( $message_body ) );
+if (!empty($message_body)) {
+    echo wpautop(wptexturize($message_body));
 }
 
-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
\ No newline at end of file
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
\ No newline at end of file

templates/emails/wpinv-email-new_invoice.php

Spacing +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
-if ( ! empty( $message_body ) ) {
-    echo wpautop( wptexturize( $message_body ) );
+if (!empty($message_body)) {
+    echo wpautop(wptexturize($message_body));
 }
 
-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
\ No newline at end of file
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
\ No newline at end of file

templates/emails/wpinv-email-refunded_invoice.php

Spacing +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
-if ( ! empty( $message_body ) ) {
-    echo wpautop( wptexturize( $message_body ) );
+if (!empty($message_body)) {
+    echo wpautop(wptexturize($message_body));
 }
 
-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
\ No newline at end of file
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
\ No newline at end of file